diff --git a/jasper-1.900.1-sleep.patch b/jasper-1.900.1-sleep.patch index 0997066..cf998c3 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.22/src/appl/tmrdemo.c jasper-version-2.0.22-new/src/appl/tmrdemo.c --- jasper-version-2.0.22/src/appl/tmrdemo.c 2020-10-05 18:41:38.000000000 +0200 -+++ jasper-version-2.0.22-new/src/appl/tmrdemo.c 2020-10-07 15:51:59.542421555 +0200 ++++ jasper-version-2.0.22-new/src/appl/tmrdemo.c 2020-10-16 22:00:25.914264934 +0200 @@ -1,4 +1,5 @@ #include +#include diff --git a/jasper-exports.patch b/jasper-exports.patch index 9b98b65..a212f96 100644 --- a/jasper-exports.patch +++ b/jasper-exports.patch @@ -1,56 +1,7 @@ -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); --int jas_image_writecmpt2(jas_image_t *image, int cmptno, jas_image_coord_t x, -+JAS_DLLEXPORT int jas_image_writecmpt2(jas_image_t *image, int cmptno, jas_image_coord_t x, - jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height, - long *buf); --int jas_image_readcmpt2(jas_image_t *image, int cmptno, jas_image_coord_t x, -+JAS_DLLEXPORT int jas_image_readcmpt2(jas_image_t *image, int cmptno, jas_image_coord_t x, - jas_image_coord_t y, jas_image_coord_t width, jas_image_coord_t height, - long *buf); - -@@ -560,23 +560,23 @@ int bmp_validate(jas_stream_t *in); - - #if !defined(EXCLUDE_JP2_SUPPORT) - /* Format-dependent operations for JP2 support. */ --jas_image_t *jp2_decode(jas_stream_t *in, const char *optstr); --int jp2_encode(jas_image_t *image, jas_stream_t *out, const char *optstr); --int jp2_validate(jas_stream_t *in); -+JAS_DLLEXPORT jas_image_t *jp2_decode(jas_stream_t *in, const char *optstr); -+JAS_DLLEXPORT int jp2_encode(jas_image_t *image, jas_stream_t *out, const char *optstr); -+JAS_DLLEXPORT int jp2_validate(jas_stream_t *in); - #endif - - #if !defined(EXCLUDE_JPC_SUPPORT) - /* Format-dependent operations for JPEG-2000 code stream support. */ --jas_image_t *jpc_decode(jas_stream_t *in, const char *optstr); --int jpc_encode(jas_image_t *image, jas_stream_t *out, const char *optstr); --int jpc_validate(jas_stream_t *in); -+JAS_DLLEXPORT jas_image_t *jpc_decode(jas_stream_t *in, const char *optstr); -+JAS_DLLEXPORT int jpc_encode(jas_image_t *image, jas_stream_t *out, const char *optstr); -+JAS_DLLEXPORT int jpc_validate(jas_stream_t *in); - #endif - - #if !defined(EXCLUDE_PGX_SUPPORT) - /* Format-dependent operations for PGX support. */ --jas_image_t *pgx_decode(jas_stream_t *in, const char *optstr); --int pgx_encode(jas_image_t *image, jas_stream_t *out, const char *optstr); --int pgx_validate(jas_stream_t *in); -+JAS_DLLEXPORT jas_image_t *pgx_decode(jas_stream_t *in, const char *optstr); -+JAS_DLLEXPORT int pgx_encode(jas_image_t *image, jas_stream_t *out, const char *optstr); -+JAS_DLLEXPORT int pgx_validate(jas_stream_t *in); - #endif - - #ifdef __cplusplus -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 { +diff -rupN jasper-version-2.0.22/src/libjasper/jp2/jp2_cod.h jasper-version-2.0.22-new/src/libjasper/jp2/jp2_cod.h +--- jasper-version-2.0.22/src/libjasper/jp2/jp2_cod.h 2020-10-05 18:41:38.000000000 +0200 ++++ jasper-version-2.0.22-new/src/libjasper/jp2/jp2_cod.h 2020-10-16 22:00:25.943264902 +0200 +@@ -288,10 +288,10 @@ typedef struct jp2_boxinfo_s { * Box class. \******************************************************************************/ @@ -63,5 +14,5 @@ diff -rupN --no-dereference jasper-version-2.0.17/src/libjasper/jp2/jp2_cod.h ja +JAS_DLLEXPORT jp2_box_t *jp2_box_get(jas_stream_t *in); +JAS_DLLEXPORT int jp2_box_put(jp2_box_t *box, jas_stream_t *out); - #define JP2_DTYPETOBPC(dtype) \ - ((JAS_IMAGE_CDT_GETSGND(dtype) << 7) | (JAS_IMAGE_CDT_GETPREC(dtype) - 1)) + JAS_ATTRIBUTE_CONST + static inline uint_least8_t JP2_DTYPETOBPC(uint_least8_t dtype) diff --git a/jasper-libversion.patch b/jasper-libversion.patch index a062a35..a7f87b6 100644 --- a/jasper-libversion.patch +++ b/jasper-libversion.patch @@ -1,6 +1,6 @@ diff -rupN --no-dereference jasper-version-2.0.22/src/libjasper/CMakeLists.txt jasper-version-2.0.22-new/src/libjasper/CMakeLists.txt --- jasper-version-2.0.22/src/libjasper/CMakeLists.txt 2020-10-05 18:41:38.000000000 +0200 -+++ jasper-version-2.0.22-new/src/libjasper/CMakeLists.txt 2020-10-07 15:51:59.513421549 +0200 ++++ jasper-version-2.0.22-new/src/libjasper/CMakeLists.txt 2020-10-16 22:00:25.886264964 +0200 @@ -176,10 +176,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 4d6f767..2e8a618 100644 --- a/mingw-jasper.spec +++ b/mingw-jasper.spec @@ -2,7 +2,7 @@ Name: mingw-jasper Version: 2.0.22 -Release: 1%{?dist} +Release: 2%{?dist} Summary: MinGW Windows Jasper library License: JasPer @@ -15,6 +15,8 @@ Source0: https://github.com/mdadams/jasper/archive/version-%{version}/jas 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 +# Add some missing exports, needed by mingw-gdal +Patch1002: jasper-exports.patch BuildArch: noarch @@ -122,6 +124,9 @@ rmdir %{buildroot}%{mingw64_datadir} %changelog +* Fri Oct 16 2020 Sandro Mani - 2.0.22-2 +- Export symbols needed by mingw-gdal + * Wed Oct 07 2020 Sandro Mani - 2.0.22-1 - Update to 2.0.22