CVS commit: pkgsrc/graphics/openjpeg

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/openjpeg
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Mon, 26 Feb 2024 18:15:43 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Mon Feb 26 18:15:43 UTC 2024

Modified Files:
        pkgsrc/graphics/openjpeg: Makefile PLIST distinfo
        pkgsrc/graphics/openjpeg/patches: patch-CMakeLists.txt
            patch-src_bin_jp2_CMakeLists.txt
            patch-src_lib_openjp2_CMakeLists.txt
            patch-src_lib_openjp2_opj__config__private.h.cmake.in

Log Message:
openjpeg: updated to 2.5.1

OpenJPEG 2.5.1 (Feb 2024)

No API/ABI break compared to v2.5.0

CMake: drop support for cmake < 3.5
Several bugfixes, including CVE-2021-3575
Significant speed-up rate allocation by rate/distoratio ratio


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/graphics/openjpeg/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/graphics/openjpeg/PLIST
cvs rdiff -u -r1.22 -r1.23 pkgsrc/graphics/openjpeg/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/graphics/openjpeg/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt \
    pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/openjpeg/Makefile
diff -u pkgsrc/graphics/openjpeg/Makefile:1.27 pkgsrc/graphics/openjpeg/Makefile:1.28
--- pkgsrc/graphics/openjpeg/Makefile:1.27      Sat Oct 21 17:10:37 2023
+++ pkgsrc/graphics/openjpeg/Makefile   Mon Feb 26 18:15:43 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2023/10/21 17:10:37 gdt Exp $
+# $NetBSD: Makefile,v 1.28 2024/02/26 18:15:43 adam Exp $
 
-DISTNAME=      openjpeg-2.5.0
-PKGREVISION=   2
+DISTNAME=      openjpeg-2.5.1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=uclouvain/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -11,8 +10,8 @@ HOMEPAGE=     https://www.openjpeg.org/
 COMMENT=       JPEG 2000 library
 LICENSE=       2-clause-bsd
 
-USE_LANGUAGES= c99 c++
-CMAKE_ARGS+=   -DOPENJPEG_INSTALL_MAN_DIR=${PKGMANDIR}
+USE_CC_FEATURES=       c99
+USE_LANGUAGES=         c c++
 
 .include "../../devel/cmake/build.mk"
 .include "../../devel/zlib/buildlink3.mk"

Index: pkgsrc/graphics/openjpeg/PLIST
diff -u pkgsrc/graphics/openjpeg/PLIST:1.9 pkgsrc/graphics/openjpeg/PLIST:1.10
--- pkgsrc/graphics/openjpeg/PLIST:1.9  Sun May 15 19:24:10 2022
+++ pkgsrc/graphics/openjpeg/PLIST      Mon Feb 26 18:15:43 2024
@@ -1,17 +1,17 @@
-@comment $NetBSD: PLIST,v 1.9 2022/05/15 19:24:10 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2024/02/26 18:15:43 adam Exp $
 bin/opj_compress
 bin/opj_decompress
 bin/opj_dump
 include/openjpeg-2.5/openjpeg.h
 include/openjpeg-2.5/opj_config.h
-include/openjpeg-2.5/opj_stdint.h
+lib/cmake/openjpeg-2.5/OpenJPEGConfig.cmake
+lib/cmake/openjpeg-2.5/OpenJPEGConfigVersion.cmake
+lib/cmake/openjpeg-2.5/OpenJPEGTargets-noconfig.cmake
+lib/cmake/openjpeg-2.5/OpenJPEGTargets.cmake
 lib/libopenjp2.a
 lib/libopenjp2.so
 lib/libopenjp2.so.${PKGVERSION}
 lib/libopenjp2.so.7
-lib/openjpeg-2.5/OpenJPEGConfig.cmake
-lib/openjpeg-2.5/OpenJPEGTargets-noconfig.cmake
-lib/openjpeg-2.5/OpenJPEGTargets.cmake
 lib/pkgconfig/libopenjp2.pc
 man/man1/opj_compress.1
 man/man1/opj_decompress.1

Index: pkgsrc/graphics/openjpeg/distinfo
diff -u pkgsrc/graphics/openjpeg/distinfo:1.22 pkgsrc/graphics/openjpeg/distinfo:1.23
--- pkgsrc/graphics/openjpeg/distinfo:1.22      Sun May 15 19:24:10 2022
+++ pkgsrc/graphics/openjpeg/distinfo   Mon Feb 26 18:15:43 2024
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2022/05/15 19:24:10 adam Exp $
+$NetBSD: distinfo,v 1.23 2024/02/26 18:15:43 adam Exp $
 
-BLAKE2s (openjpeg-2.5.0.tar.gz) = 8a0fa90f83fd3bfcb890a44ceaab0b3d13a9985abc09efd42783c43d3f6a0ff6
-SHA512 (openjpeg-2.5.0.tar.gz) = 08975a2dd79f1e29fd1824249a5fbe66026640ed787b3a3aa8807c2c69f994240ff33e2132f8bf15bbc2202bef7001f98e42d487231d4eebc8e503538658049a
-Size (openjpeg-2.5.0.tar.gz) = 1867111 bytes
-SHA1 (patch-CMakeLists.txt) = 3738946db63df4d623c6ce486bd22fa4d57336e2
-SHA1 (patch-src_bin_jp2_CMakeLists.txt) = c9f709c23d6bab7a3c705640d66a00ec90ddabc7
-SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = 49e66815ddbca5d01f3ff1c1b8208448e19e2a0c
-SHA1 (patch-src_lib_openjp2_opj__config__private.h.cmake.in) = fc0c170789dbe0a2ebc9dce0ef0d21aa6b2edd49
+BLAKE2s (openjpeg-2.5.1.tar.gz) = 9a824f53a475635d457a2aa782b2af799d880dd166e42c95bdca0e63bbd77bef
+SHA512 (openjpeg-2.5.1.tar.gz) = 7cb0b67e67b3e2799577a6b6f5d60c67c6ce12d16c307e01129b763a48e272eeaf029504dc52b5cc380e562c2db5220f335449b52eacc3784763f95524e4a8d9
+Size (openjpeg-2.5.1.tar.gz) = 1871681 bytes
+SHA1 (patch-CMakeLists.txt) = f9cbfae0f2ff780c6f5250d1a1930d8e8961380d
+SHA1 (patch-src_bin_jp2_CMakeLists.txt) = 2ad64fbd7ce8c084b3d5882d353ae5f6110da183
+SHA1 (patch-src_lib_openjp2_CMakeLists.txt) = 55dccb61e492a7b6b2eca5d91081b2d33ab03ea1
+SHA1 (patch-src_lib_openjp2_opj__config__private.h.cmake.in) = 6d7a88300b29c9bab7fe8c89276d907593961e59

Index: pkgsrc/graphics/openjpeg/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/openjpeg/patches/patch-CMakeLists.txt:1.1 pkgsrc/graphics/openjpeg/patches/patch-CMakeLists.txt:1.2
--- pkgsrc/graphics/openjpeg/patches/patch-CMakeLists.txt:1.1   Fri Jan 23 17:15:09 2015
+++ pkgsrc/graphics/openjpeg/patches/patch-CMakeLists.txt       Mon Feb 26 18:15:43 2024
@@ -1,7 +1,7 @@
-$NetBSD: patch-CMakeLists.txt,v 1.1 2015/01/23 17:15:09 pho Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.2 2024/02/26 18:15:43 adam Exp $
 
 Move checks for aligned malloc function from opj_malloc.h to cmake.
-See also patch-aa
+See also patch-src_lib_openjp2_opj__config__private.h.cmake.in.
 
 --- CMakeLists.txt.orig        2015-01-23 16:40:21.000000000 +0000
 +++ CMakeLists.txt

Index: pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt
diff -u pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt:1.2 pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt:1.3
--- pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt:1.2       Thu Jul 14 15:41:44 2016
+++ pkgsrc/graphics/openjpeg/patches/patch-src_bin_jp2_CMakeLists.txt   Mon Feb 26 18:15:43 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-src_bin_jp2_CMakeLists.txt,v 1.2 2016/07/14 15:41:44 wiz Exp $
+$NetBSD: patch-src_bin_jp2_CMakeLists.txt,v 1.3 2024/02/26 18:15:43 adam Exp $
 
 Install man pages without building other docs.
 
---- src/bin/jp2/CMakeLists.txt.orig    2016-07-05 14:54:17.000000000 +0000
+--- src/bin/jp2/CMakeLists.txt.orig    2024-02-26 14:17:28.000000000 +0000
 +++ src/bin/jp2/CMakeLists.txt
-@@ -71,7 +71,6 @@ foreach(exe opj_decompress opj_compress 
+@@ -75,7 +75,6 @@ foreach(exe opj_decompress opj_compress
    endif()
  endforeach()
  
@@ -12,8 +12,8 @@ Install man pages without building other
  # Install man pages
  install(
    FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_compress.1
-@@ -79,4 +78,3 @@ install(
+@@ -83,4 +82,3 @@ install(
                ${OPENJPEG_SOURCE_DIR}/doc/man/man1/opj_dump.1
-   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man1)
+   DESTINATION ${CMAKE_INSTALL_MANDIR}/man1)
  #
 -endif()
Index: pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in
diff -u pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in:1.2 pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in:1.3
--- pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in:1.2  Thu Jul 14 15:41:44 2016
+++ pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_opj__config__private.h.cmake.in      Mon Feb 26 18:15:43 2024
@@ -1,13 +1,13 @@
-$NetBSD: patch-src_lib_openjp2_opj__config__private.h.cmake.in,v 1.2 2016/07/14 15:41:44 wiz Exp $
+$NetBSD: patch-src_lib_openjp2_opj__config__private.h.cmake.in,v 1.3 2024/02/26 18:15:43 adam Exp $
 
 Add #cmakedefine for aligned malloc functions.
 See also patch-CMakeLists.txt
 
---- src/lib/openjp2/opj_config_private.h.cmake.in.orig 2016-07-05 14:54:17.000000000 +0000
+--- src/lib/openjp2/opj_config_private.h.cmake.in.orig 2024-02-26 14:17:28.000000000 +0000
 +++ src/lib/openjp2/opj_config_private.h.cmake.in
-@@ -12,6 +12,10 @@
- /*#cmakedefine HAVE_SYS_TYPES_H @HAVE_SYS_TYPES_H@ */
- /*#cmakedefine HAVE_UNISTD_H @HAVE_UNISTD_H@*/
+@@ -13,6 +13,10 @@
+ /*#cmakedefine HAVE_INTTYPES_H @HAVE_INTTYPES_H@ */
+ /*#cmakedefine HAVE_STDINT_H @HAVE_STDINT_H@ */
  
 +#cmakedefine HAVE_MM_MALLOC
 +#cmakedefine HAVE_MEMALIGN

Index: pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt
diff -u pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt:1.3 pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt:1.4
--- pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt:1.3   Sun May 15 19:24:11 2022
+++ pkgsrc/graphics/openjpeg/patches/patch-src_lib_openjp2_CMakeLists.txt       Mon Feb 26 18:15:43 2024
@@ -1,18 +1,18 @@
-$NetBSD: patch-src_lib_openjp2_CMakeLists.txt,v 1.3 2022/05/15 19:24:11 adam Exp $
+$NetBSD: patch-src_lib_openjp2_CMakeLists.txt,v 1.4 2024/02/26 18:15:43 adam Exp $
 
 Install man pages without building other docs.
 
---- src/lib/openjp2/CMakeLists.txt.orig        2022-05-13 16:54:29.000000000 +0000
+--- src/lib/openjp2/CMakeLists.txt.orig        2024-02-26 14:17:28.000000000 +0000
 +++ src/lib/openjp2/CMakeLists.txt
-@@ -127,12 +127,10 @@ install(FILES openjpeg.h opj_stdint.h
-   DESTINATION ${OPENJPEG_INSTALL_INCLUDE_DIR} COMPONENT Headers
+@@ -124,12 +124,10 @@ install(FILES openjpeg.h
+   DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENJPEG_INSTALL_SUBDIR} COMPONENT Headers
  )
  
 -if(BUILD_DOC)
  # install man page of the library
  install(
    FILES       ${OPENJPEG_SOURCE_DIR}/doc/man/man3/libopenjp2.3
-   DESTINATION ${OPENJPEG_INSTALL_MAN_DIR}/man3)
+   DESTINATION ${CMAKE_INSTALL_MANDIR}/man3)
 -endif()
  
  if(BUILD_LUTS_GENERATOR)

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/math/py-bottleneck
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/math/py-bottleneck
Indexes:

Home | Main Index | Thread Index | Old Index