Hi,
here's an update to openjp2 2.5.0, cf
http://www.openjpeg.org/2022/05/13/OpenJPEG-2.5.0-released - even if
only some funcs were added to the api i've bumped the major to be on the
safe side since some subcomponents/formats were dropped upstream.
all tests but two pass, and it seems we're not the only ones seeing the
failure per https://github.com/uclouvain/openjpeg/issues/1367
the added patch ensures tiff & lcms2 are properly found, cf
https://github.com/uclouvain/openjpeg/issues/1430
if anyone can put the diff in their next bulk build (along devel/swig
tweak for php) that would be nice !!
Landry
? openjp2-2.3.1-libopenjp2.so.3.1
? openjp2-2.4.0-libopenjp2.so.3.1
? openjp2-2.4.0-libopenjp2.so.4.0
? openjp2-2.5.0-libopenjp2.so.4.0
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/openjp2/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile 11 Mar 2022 19:22:57 -0000 1.18
+++ Makefile 27 Jun 2022 08:49:34 -0000
@@ -2,10 +2,10 @@
GH_ACCOUNT= uclouvain
GH_PROJECT= openjpeg
-GH_TAGNAME= v2.4.0
+GH_TAGNAME= v2.5.0
DISTNAME= openjp2-${GH_TAGNAME:S/v//}
-SHARED_LIBS += openjp2 4.0
+SHARED_LIBS += openjp2 5.0
CATEGORIES= graphics
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/openjp2/distinfo,v
retrieving revision 1.8
diff -u -r1.8 distinfo
--- distinfo 23 Feb 2021 14:24:40 -0000 1.8
+++ distinfo 27 Jun 2022 08:49:34 -0000
@@ -1,2 +1,2 @@
-SHA256 (openjp2-2.4.0.tar.gz) = hwK6aLRCZX8RqusrM4RDyo1fuVsNhFdXlop74x738W0=
-SIZE (openjp2-2.4.0.tar.gz) = 2233229
+SHA256 (openjp2-2.5.0.tar.gz) = AzOAbWrezG96kSQ7K4Of9NIFOCNjTU9u16WbyHQJEio=
+SIZE (openjp2-2.5.0.tar.gz) = 1867111
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/openjp2/patches/patch-CMakeLists_txt,v
retrieving revision 1.9
diff -u -r1.9 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 11 Mar 2022 19:22:57 -0000 1.9
+++ patches/patch-CMakeLists_txt 27 Jun 2022 08:49:34 -0000
@@ -1,7 +1,7 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -108,7 +108,10 @@ endif()
+@@ -109,7 +109,10 @@ endif()
option(BUILD_DOC "Build the HTML documentation (with doxygen if available)."
OFF)
string(TOLOWER ${PROJECT_NAME} projectname)
Index: patches/patch-src_bin_jp2_convert_c
===================================================================
RCS file: /cvs/ports/graphics/openjp2/patches/patch-src_bin_jp2_convert_c,v
retrieving revision 1.5
diff -u -r1.5 patch-src_bin_jp2_convert_c
--- patches/patch-src_bin_jp2_convert_c 11 Mar 2022 19:22:57 -0000 1.5
+++ patches/patch-src_bin_jp2_convert_c 27 Jun 2022 08:49:34 -0000
@@ -1,7 +1,7 @@
Index: src/bin/jp2/convert.c
--- src/bin/jp2/convert.c.orig
+++ src/bin/jp2/convert.c
-@@ -664,7 +664,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits
+@@ -662,7 +662,7 @@ static int tga_readheader(FILE *fp, unsigned int *bits
return 1;
}
Index: patches/patch-src_lib_openmj2_opj_malloc_h
===================================================================
RCS file: patches/patch-src_lib_openmj2_opj_malloc_h
diff -N patches/patch-src_lib_openmj2_opj_malloc_h
--- patches/patch-src_lib_openmj2_opj_malloc_h 11 Mar 2022 19:22:57 -0000
1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-Index: src/lib/openmj2/opj_malloc.h
---- src/lib/openmj2/opj_malloc.h.orig
-+++ src/lib/openmj2/opj_malloc.h
-@@ -86,7 +86,7 @@ Allocate memory aligned to a 16 byte boundary
- #elif defined(__FreeBSD__)
- #define HAVE_POSIX_MEMALIGN
- /* Linux x86_64 and OSX always align allocations to 16 bytes */
--#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX)
-+#elif !defined(__amd64__) && !defined(__APPLE__) && !defined(_AIX) &&
!defined(__OpenBSD__)
- #define HAVE_MEMALIGN
- #include <malloc.h>
- #endif
Index: patches/patch-thirdparty_CMakeLists_txt
===================================================================
RCS file: patches/patch-thirdparty_CMakeLists_txt
diff -N patches/patch-thirdparty_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-thirdparty_CMakeLists_txt 27 Jun 2022 08:49:34 -0000
@@ -0,0 +1,23 @@
+https://github.com/uclouvain/openjpeg/issues/1430
+
+Index: thirdparty/CMakeLists.txt
+--- thirdparty/CMakeLists.txt.orig
++++ thirdparty/CMakeLists.txt
+@@ -89,7 +89,7 @@ else(BUILD_THIRDPARTY)
+ message(STATUS "Your system seems to have a TIFF lib available, we will
use it")
+ set(OPJ_HAVE_TIFF_H 1 PARENT_SCOPE)
+ set(OPJ_HAVE_LIBTIFF 1 PARENT_SCOPE)
+- set(TIFF_LIBNAME ${TIFF_LIBRARIES} ${PC_TIFF_STATIC_LIBRARIES}
PARENT_SCOPE)
++ set(TIFF_LIBNAME ${TIFF_LIBRARIES} PARENT_SCOPE)
+ set(TIFF_INCLUDE_DIRNAME ${TIFF_INCLUDE_DIR}
${PC_TIFF_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
+ else(TIFF_FOUND) # not found
+ set(OPJ_HAVE_TIFF_H 0 PARENT_SCOPE)
+@@ -124,7 +124,7 @@ else(BUILD_THIRDPARTY)
+ message(STATUS "Your system seems to have a LCMS2 lib available, we will
use it")
+ set(OPJ_HAVE_LCMS2_H 1 PARENT_SCOPE)
+ set(OPJ_HAVE_LIBLCMS2 1 PARENT_SCOPE)
+- set(LCMS_LIBNAME ${LCMS2_LIBRARIES} ${PC_LCMS2_STATIC_LIBRARIES}
PARENT_SCOPE)
++ set(LCMS_LIBNAME ${LCMS2_LIBRARIES} PARENT_SCOPE)
+ set(LCMS_INCLUDE_DIRNAME ${LCMS2_INCLUDE_DIRS}
${PC_LCMS2_STATIC_INCLUDE_DIRS} PARENT_SCOPE)
+ else(LCMS2_FOUND) # not found lcms2
+ # try to find LCMS
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/openjp2/pkg/PLIST,v
retrieving revision 1.9
diff -u -r1.9 PLIST
--- pkg/PLIST 11 Mar 2022 19:22:57 -0000 1.9
+++ pkg/PLIST 27 Jun 2022 08:49:34 -0000
@@ -2,16 +2,16 @@
@bin bin/opj_compress
@bin bin/opj_decompress
@bin bin/opj_dump
-include/openjpeg-2.4/
-include/openjpeg-2.4/openjpeg.h
-include/openjpeg-2.4/opj_config.h
-include/openjpeg-2.4/opj_stdint.h
+include/openjpeg-2.5/
+include/openjpeg-2.5/openjpeg.h
+include/openjpeg-2.5/opj_config.h
+include/openjpeg-2.5/opj_stdint.h
@static-lib lib/libopenjp2.a
@lib lib/libopenjp2.so.${LIBopenjp2_VERSION}
-lib/openjpeg-2.4/
-lib/openjpeg-2.4/OpenJPEGConfig.cmake
-lib/openjpeg-2.4/OpenJPEGTargets${MODCMAKE_BUILD_SUFFIX}
-lib/openjpeg-2.4/OpenJPEGTargets.cmake
+lib/openjpeg-2.5/
+lib/openjpeg-2.5/OpenJPEGConfig.cmake
+lib/openjpeg-2.5/OpenJPEGTargets${MODCMAKE_BUILD_SUFFIX}
+lib/openjpeg-2.5/OpenJPEGTargets.cmake
lib/pkgconfig/libopenjp2.pc
@man man/man1/opj_compress.1
@man man/man1/opj_decompress.1
