From b216cc3b0b8701af2d85b94fc86cace792ced240 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Jul 03 2022 20:52:17 +0000 Subject: Update to 3.0.5 --- diff --git a/.gitignore b/.gitignore index fa16e51..4231389 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /jasper-2.0.28.tar.gz /jasper-2.0.32.tar.gz /jasper-2.0.33.tar.gz +/jasper-3.0.5.tar.gz diff --git a/jasper-1.900.1-sleep.patch b/jasper-1.900.1-sleep.patch deleted file mode 100644 index 9b96d44..0000000 --- a/jasper-1.900.1-sleep.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -rupN --no-dereference jasper-version-2.0.33/src/appl/tmrdemo.c jasper-version-2.0.33-new/src/appl/tmrdemo.c ---- jasper-version-2.0.33/src/appl/tmrdemo.c 2021-08-01 22:50:31.000000000 +0200 -+++ jasper-version-2.0.33-new/src/appl/tmrdemo.c 2021-09-01 21:42:55.298370592 +0200 -@@ -1,4 +1,5 @@ - #include -+#include - - int main(int argc, char **argv) - { -@@ -43,7 +44,7 @@ int main(int argc, char **argv) - printf("zero time %.3f us\n", t * 1e6); - - jas_tmr_start(&tmr); -- sleep(1); -+ Sleep(1); - jas_tmr_stop(&tmr); - t = jas_tmr_get(&tmr); - printf("time delay %.8f s\n", t); diff --git a/jasper-exports.patch b/jasper-exports.patch index e27ff75..d2a03c3 100644 --- a/jasper-exports.patch +++ b/jasper-exports.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference jasper-version-2.0.33/src/libjasper/jp2/jp2_cod.h jasper-version-2.0.33-new/src/libjasper/jp2/jp2_cod.h ---- jasper-version-2.0.33/src/libjasper/jp2/jp2_cod.h 2021-08-01 22:50:31.000000000 +0200 -+++ jasper-version-2.0.33-new/src/libjasper/jp2/jp2_cod.h 2021-09-01 21:42:55.332371002 +0200 +diff -rupN --no-dereference jasper-version-3.0.5/src/libjasper/jp2/jp2_cod.h jasper-version-3.0.5-new/src/libjasper/jp2/jp2_cod.h +--- jasper-version-3.0.5/src/libjasper/jp2/jp2_cod.h 2022-06-23 15:58:55.000000000 +0200 ++++ jasper-version-3.0.5-new/src/libjasper/jp2/jp2_cod.h 2022-07-03 18:53:37.644007016 +0200 @@ -288,10 +288,10 @@ typedef struct jp2_boxinfo_s { * Box class. \******************************************************************************/ diff --git a/jasper-libversion.patch b/jasper-libversion.patch index 69f5b1c..c320da8 100644 --- a/jasper-libversion.patch +++ b/jasper-libversion.patch @@ -1,19 +1,17 @@ -diff -rupN --no-dereference jasper-version-2.0.33/src/libjasper/CMakeLists.txt jasper-version-2.0.33-new/src/libjasper/CMakeLists.txt ---- jasper-version-2.0.33/src/libjasper/CMakeLists.txt 2021-08-01 22:50:31.000000000 +0200 -+++ jasper-version-2.0.33-new/src/libjasper/CMakeLists.txt 2021-09-01 21:42:55.264370182 +0200 -@@ -176,10 +176,11 @@ if (MSVC) - target_compile_definitions(libjasper PRIVATE "-D_CRT_NONSTDC_NO_DEPRECATE") +diff -rupN --no-dereference jasper-version-3.0.5/src/libjasper/CMakeLists.txt jasper-version-3.0.5-new/src/libjasper/CMakeLists.txt +--- jasper-version-3.0.5/src/libjasper/CMakeLists.txt 2022-06-23 15:58:55.000000000 +0200 ++++ jasper-version-3.0.5-new/src/libjasper/CMakeLists.txt 2022-07-03 18:53:37.611007015 +0200 +@@ -188,9 +188,12 @@ if(MSVC) + target_compile_definitions(libjasper PRIVATE _CRT_NONSTDC_NO_DEPRECATE) endif() --if (UNIX) -- set_target_properties(libjasper PROPERTIES -- VERSION ${JAS_SO_NAME} SOVERSION ${JAS_SO_VERSION}) --endif() -+set_target_properties(libjasper PROPERTIES -+ VERSION ${JAS_SO_NAME} SOVERSION ${JAS_SO_VERSION}) -+if(MINGW AND JAS_ENABLE_SHARED) -+ set_target_properties(libjasper PROPERTIES SUFFIX "-${JAS_SO_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") -+endif(MINGW AND JAS_ENABLE_SHARED) - - if (JAS_ENABLE_SHARED) +-if(UNIX) ++if(UNIX OR MINGW) set_target_properties(libjasper PROPERTIES + VERSION ${JAS_SO_NAME} SOVERSION ${JAS_SO_VERSION}) ++ if(MINGW AND JAS_ENABLE_SHARED) ++ set_target_properties(libjasper PROPERTIES SUFFIX "-${JAS_SO_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}") ++ endif(MINGW AND JAS_ENABLE_SHARED) + endif() + + if(JAS_ENABLE_SHARED) diff --git a/mingw-jasper.spec b/mingw-jasper.spec index fcde956..fcfe7e1 100644 --- a/mingw-jasper.spec +++ b/mingw-jasper.spec @@ -1,8 +1,8 @@ %{?mingw_package_header} Name: mingw-jasper -Version: 2.0.33 -Release: 3%{?dist} +Version: 3.0.5 +Release: 1%{?dist} Summary: MinGW Windows Jasper library License: JasPer @@ -12,25 +12,22 @@ Source0: https://github.com/mdadams/jasper/archive/version-%{version}/jas # MinGW-specific patches. # Version the library -Patch1000: jasper-libversion.patch -# This patch is a bit of a hack, but it's just there to fix a demo program: -Patch1001: jasper-1.900.1-sleep.patch +Patch1: jasper-libversion.patch # Add some missing exports, needed by mingw-gdal -Patch1002: jasper-exports.patch +Patch2: jasper-exports.patch BuildArch: noarch -BuildRequires: make +BuildRequires: make + +BuildRequires: cmake BuildRequires: mingw32-filesystem >= 95 -BuildRequires: mingw64-filesystem >= 95 BuildRequires: mingw32-gcc -BuildRequires: mingw64-gcc -BuildRequires: mingw32-binutils -BuildRequires: mingw64-binutils BuildRequires: mingw32-libjpeg -BuildRequires: mingw64-libjpeg -BuildRequires: cmake +BuildRequires: mingw64-filesystem >= 95 +BuildRequires: mingw64-gcc +BuildRequires: mingw64-libjpeg %description @@ -75,7 +72,7 @@ Static version of the MinGW Windows Jasper library. %build -jasper_cmake_args="-DJAS_ENABLE_DOC=OFF -DJAS_ENABLE_OPENGL=OFF -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF" +jasper_cmake_args="-DJAS_ENABLE_DOC=OFF -DJAS_ENABLE_OPENGL=OFF -DJAS_ENABLE_AUTOMATIC_DEPENDENCIES=OFF -DJAS_STDC_VERSION=201112L" # Build static MINGW_BUILDDIR_SUFFIX=-static %mingw_cmake -DJAS_ENABLE_SHARED=OFF $jasper_cmake_args MINGW_BUILDDIR_SUFFIX=-static %mingw_make_build @@ -98,11 +95,11 @@ rmdir %{buildroot}%{mingw64_datadir} %files -n mingw32-jasper -%license COPYRIGHT LICENSE +%license COPYRIGHT.txt LICENSE.txt %{mingw32_bindir}/imgcmp.exe %{mingw32_bindir}/imginfo.exe %{mingw32_bindir}/jasper.exe -%{mingw32_bindir}/libjasper-4.dll +%{mingw32_bindir}/libjasper-6.dll %{mingw32_libdir}/libjasper.dll.a %{mingw32_libdir}/pkgconfig/jasper.pc %{mingw32_includedir}/jasper/ @@ -111,11 +108,11 @@ rmdir %{buildroot}%{mingw64_datadir} %{mingw32_libdir}/libjasper.a %files -n mingw64-jasper -%license COPYRIGHT LICENSE +%license COPYRIGHT.txt LICENSE.txt %{mingw64_bindir}/imgcmp.exe %{mingw64_bindir}/imginfo.exe %{mingw64_bindir}/jasper.exe -%{mingw64_bindir}/libjasper-4.dll +%{mingw64_bindir}/libjasper-6.dll %{mingw64_libdir}/libjasper.dll.a %{mingw64_libdir}/pkgconfig/jasper.pc %{mingw64_includedir}/jasper/ @@ -125,6 +122,9 @@ rmdir %{buildroot}%{mingw64_datadir} %changelog +* Sun Jul 03 2022 Sandro Mani - 3.0.5-1 +- Update to 3.0.5 + * Fri Mar 25 2022 Sandro Mani - 2.0.33-3 - Rebuild with mingw-gcc-12 diff --git a/sources b/sources index d4e5c42..f3c7616 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jasper-2.0.33.tar.gz) = ff88c4b55d52803786520e4f0db10f7cb7cd7642694c866ea7859bc79e409590469fc2c63afe522c7f8b0c00062c155c0fe3b83b8928e319173a3ec9fea3e09e +SHA512 (jasper-3.0.5.tar.gz) = bd14e5475720c7b9a86e29ffdad15fb7e725cd2750f0b41514317ab3de6c57381b956627c6e6e3a84f85e0cda9508a693c0f8a1873ae59b5080e4592ba16f982