diff --git a/.gitignore b/.gitignore index 6164462..2a26e1a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /jasper-1.900.28.tar.gz /jasper-2.0.14.tar.gz /jasper-2.0.16.tar.gz +/jasper-2.0.17.tar.gz diff --git a/jasper-1.900.1-sleep.patch b/jasper-1.900.1-sleep.patch index 917a2cb..6497d32 100644 --- a/jasper-1.900.1-sleep.patch +++ b/jasper-1.900.1-sleep.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference jasper-version-2.0.16/src/appl/tmrdemo.c jasper-version-2.0.16-new/src/appl/tmrdemo.c ---- jasper-version-2.0.16/src/appl/tmrdemo.c 2019-03-12 19:04:35.000000000 +0100 -+++ jasper-version-2.0.16-new/src/appl/tmrdemo.c 2019-10-04 22:32:39.793955661 +0200 +diff -rupN --no-dereference jasper-version-2.0.17/src/appl/tmrdemo.c jasper-version-2.0.17-new/src/appl/tmrdemo.c +--- jasper-version-2.0.17/src/appl/tmrdemo.c 2020-07-18 18:34:43.000000000 +0200 ++++ jasper-version-2.0.17-new/src/appl/tmrdemo.c 2020-07-20 17:27:47.656934167 +0200 @@ -1,4 +1,5 @@ #include +#include diff --git a/jasper-exports.patch b/jasper-exports.patch index 38ba995..9b98b65 100644 --- a/jasper-exports.patch +++ b/jasper-exports.patch @@ -1,7 +1,7 @@ -diff -rupN jasper-version-2.0.16/src/libjasper/include/jasper/jas_image.h jasper-version-2.0.16-new/src/libjasper/include/jasper/jas_image.h ---- jasper-version-2.0.16/src/libjasper/include/jasper/jas_image.h 2019-03-12 19:04:35.000000000 +0100 -+++ jasper-version-2.0.16-new/src/libjasper/include/jasper/jas_image.h 2019-11-13 23:00:10.758921703 +0100 -@@ -496,10 +496,10 @@ int jas_image_ishomosamp(jas_image_t *im +diff -rupN --no-dereference jasper-version-2.0.17/src/libjasper/include/jasper/jas_image.h jasper-version-2.0.17-new/src/libjasper/include/jasper/jas_image.h +--- jasper-version-2.0.17/src/libjasper/include/jasper/jas_image.h 2020-07-18 18:34:43.000000000 +0200 ++++ jasper-version-2.0.17-new/src/libjasper/include/jasper/jas_image.h 2020-07-20 17:27:47.688934136 +0200 +@@ -507,10 +507,10 @@ int jas_image_ishomosamp(const jas_image int jas_image_sampcmpt(jas_image_t *image, int cmptno, int newcmptno, jas_image_coord_t ho, jas_image_coord_t vo, jas_image_coord_t hs, jas_image_coord_t vs, int sgnd, int prec); @@ -14,7 +14,7 @@ diff -rupN jasper-version-2.0.16/src/libjasper/include/jasper/jas_image.h jasper jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height, long *buf); -@@ -549,23 +549,23 @@ int bmp_validate(jas_stream_t *in); +@@ -560,23 +560,23 @@ int bmp_validate(jas_stream_t *in); #if !defined(EXCLUDE_JP2_SUPPORT) /* Format-dependent operations for JP2 support. */ @@ -47,10 +47,10 @@ diff -rupN jasper-version-2.0.16/src/libjasper/include/jasper/jas_image.h jasper #endif #ifdef __cplusplus -diff -rupN jasper-version-2.0.16/src/libjasper/jp2/jp2_cod.h jasper-version-2.0.16-new/src/libjasper/jp2/jp2_cod.h ---- jasper-version-2.0.16/src/libjasper/jp2/jp2_cod.h 2019-03-12 19:04:35.000000000 +0100 -+++ jasper-version-2.0.16-new/src/libjasper/jp2/jp2_cod.h 2019-11-13 23:08:53.183292862 +0100 -@@ -284,10 +284,10 @@ typedef struct jp2_boxinfo_s { +diff -rupN --no-dereference jasper-version-2.0.17/src/libjasper/jp2/jp2_cod.h jasper-version-2.0.17-new/src/libjasper/jp2/jp2_cod.h +--- jasper-version-2.0.17/src/libjasper/jp2/jp2_cod.h 2020-07-18 18:34:43.000000000 +0200 ++++ jasper-version-2.0.17-new/src/libjasper/jp2/jp2_cod.h 2020-07-20 17:27:47.688934136 +0200 +@@ -287,10 +287,10 @@ typedef struct jp2_boxinfo_s { * Box class. \******************************************************************************/ diff --git a/jasper-libversion.patch b/jasper-libversion.patch index a634d50..ca6aba1 100644 --- a/jasper-libversion.patch +++ b/jasper-libversion.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference jasper-version-2.0.16/src/libjasper/CMakeLists.txt jasper-version-2.0.16-new/src/libjasper/CMakeLists.txt ---- jasper-version-2.0.16/src/libjasper/CMakeLists.txt 2019-03-12 19:04:35.000000000 +0100 -+++ jasper-version-2.0.16-new/src/libjasper/CMakeLists.txt 2019-10-04 22:32:39.762955662 +0200 +diff -rupN --no-dereference jasper-version-2.0.17/src/libjasper/CMakeLists.txt jasper-version-2.0.17-new/src/libjasper/CMakeLists.txt +--- jasper-version-2.0.17/src/libjasper/CMakeLists.txt 2020-07-18 18:34:43.000000000 +0200 ++++ jasper-version-2.0.17-new/src/libjasper/CMakeLists.txt 2020-07-20 17:27:47.623934199 +0200 @@ -151,10 +151,11 @@ if (MSVC) target_compile_definitions(libjasper PRIVATE "-D_CRT_NONSTDC_NO_DEPRECATE") endif() diff --git a/mingw-jasper.spec b/mingw-jasper.spec index ef89662..4301c2b 100644 --- a/mingw-jasper.spec +++ b/mingw-jasper.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-jasper -Version: 2.0.16 -Release: 6%{?dist} +Version: 2.0.17 +Release: 1%{?dist} Summary: MinGW Windows Jasper library License: JasPer @@ -77,15 +77,15 @@ Static version of the MinGW Windows Jasper library. jasper_cmake_args="-DJAS_ENABLE_DOC=OFF -DJAS_ENABLE_OPENGL=OFF -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF" # Build static MINGW_BUILDDIR_SUFFIX=-static %mingw_cmake -DJAS_ENABLE_SHARED=OFF $jasper_cmake_args -MINGW_BUILDDIR_SUFFIX=-static %mingw_make %{?_smp_mflags} +MINGW_BUILDDIR_SUFFIX=-static %mingw_make_build # Build shared MINGW_BUILDDIR_SUFFIX=-shared %mingw_cmake -DJAS_ENABLE_SHARED=ON $jasper_cmake_args -MINGW_BUILDDIR_SUFFIX=-shared %mingw_make %{?_smp_mflags} +MINGW_BUILDDIR_SUFFIX=-shared %mingw_make_build %install -MINGW_BUILDDIR_SUFFIX=-static %mingw_make DESTDIR=%{buildroot} install -MINGW_BUILDDIR_SUFFIX=-shared %mingw_make DESTDIR=%{buildroot} install +MINGW_BUILDDIR_SUFFIX=-static %mingw_make_install +MINGW_BUILDDIR_SUFFIX=-shared %mingw_make_install # Remove documentation rm -rf %{buildroot}%{mingw32_mandir} @@ -124,6 +124,9 @@ rmdir %{buildroot}%{mingw64_datadir} %changelog +* Mon Jul 20 2020 Sandro Mani - 2.0.17-1 +- Update to 2.0.17 + * Wed Jan 29 2020 Fedora Release Engineering - 2.0.16-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 935ff33..93866d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jasper-2.0.16.tar.gz) = b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee +SHA512 (jasper-2.0.17.tar.gz) = adbf8920602f6e81103e65001f3642c0d6f865a1673c8f7df1037d21190da91fd04cfaa563c3733bd8dc1a3485573c582c8047b667a1a92f57c4b72813e1b104