libjxl: update to 0.11.1.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libjxl: update to 0.11.1.
From: Thomas Klausner (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Tue, 4 Feb 2025 10:46:59 +0000
Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%NetBSD.org@localhost>
Pushed By:	wiz
Date:		Tue Feb 4 11:46:16 2025 +0100
Changeset:	46266ef9b754a4d7eadd4576f476f0db34aa5816

Modified Files:
	libjxl/Makefile.common
	libjxl/PLIST
	libjxl/distinfo
Removed Files:
	libjxl/patches/patch-lib_jxl__cms.cmake

Log Message:
libjxl: update to 0.11.1.

  - Huffman lookup table size fix (#3871 -
    [CVE-2024-11403](https://www.cve.org/cverecord?id=CVE-2024-11403))
  - Check height limit in modular trees. (#3943 -
    [CVE-2024-11498](https://www.cve.org/cverecord?id=CVE-2024-11498))

  - Gain Map API (#3552 and #3628):  `JxlGainMapBundle` struct and API functions
    to read and write gain map bundles`JxlGainMapWriteBundle` and
    `JxlGainMapReadBundle` as well as handling compressed ICC profiles:
    `JxlICCProfileEncode` and `JxlICCProfileDecode`.
  - decoder API: added `JXL_DEC_BOX_COMPLETE` event to signal that the output
    buffer for the current box has received all contents. Previously, this was
    to be determined from the fact that the decoder had moved on either to
    `JXL_DEC_SUCCESS` or to another subsequent `JXL_DEC_BOX`. This change is
    made backward-compatible by the fact that the new event must be explicitly
    subscribed to, and that `JXL_DEC_SUCCESS` / `JXL_DEC_BOX` still occur
    afterwards and still imply that the previous box must be complete.

  - avoiding abort in release build (#3631 and #3639)

  - bugs in (lossless) encoding (#3367, #3359 and #3386)
  - re-enable installation of MIME file (#3375)
  - bugs in streaming mode (#3379 and #3380)

 - reduce allocations (#3336 and #3339),
   fixing a significant speed regression present since 0.9.0
 - bug in streaming encoding (#3331)

 - decoder API: added `JxlDecoderGetBoxSizeContents` for getting the size of the
   content of a box without the headers.
 - encoder API: implemented new api functions for streaming encoding.

 - decoder/encoder API: return failure when surface allocation fail
 - encoder API / cjxl: updated modular effort levels to faster settings; the
   effort range is now 1-10, with 11 available in advanced mode.

 - bugs in the gdk-pixbuf plugin
 - some build issues

 - multiple build issues

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=46266ef9b754a4d7eadd4576f476f0db34aa5816

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

diffstat:
 libjxl/Makefile.common                  |  2 +-
 libjxl/PLIST                            | 12 +++++------
 libjxl/distinfo                         |  7 +++----
 libjxl/patches/patch-lib_jxl__cms.cmake | 35 ---------------------------------
 4 files changed, 10 insertions(+), 46 deletions(-)

diffs:
diff --git a/libjxl/Makefile.common b/libjxl/Makefile.common
index 953361c7f6..72e17ad927 100644
--- a/libjxl/Makefile.common
+++ b/libjxl/Makefile.common
@@ -1,7 +1,7 @@
 # $NetBSD$
 # used by wip/gdk-pixbuf-jxl/Makefile
 
-DISTNAME=	libjxl-0.9.0
+DISTNAME=	libjxl-0.11.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libjxl/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/libjxl/PLIST b/libjxl/PLIST
index 4c503c6d44..a943be509f 100644
--- a/libjxl/PLIST
+++ b/libjxl/PLIST
@@ -7,10 +7,12 @@ include/jxl/cms.h
 include/jxl/cms_interface.h
 include/jxl/codestream_header.h
 include/jxl/color_encoding.h
+include/jxl/compressed_icc.h
 include/jxl/decode.h
 include/jxl/decode_cxx.h
 include/jxl/encode.h
 include/jxl/encode_cxx.h
+include/jxl/gain_map.h
 include/jxl/jxl_cms_export.h
 include/jxl/jxl_export.h
 include/jxl/jxl_threads_export.h
@@ -24,16 +26,14 @@ include/jxl/thread_parallel_runner_cxx.h
 include/jxl/types.h
 include/jxl/version.h
 lib/libjxl.so
-lib/libjxl.so.0.9
+lib/libjxl.so.0.11
 lib/libjxl.so.${PKGVERSION}
 lib/libjxl_cms.so
-lib/libjxl_cms.so.0.9
+lib/libjxl_cms.so.0.11
 lib/libjxl_cms.so.${PKGVERSION}
-lib/libjxl_extras_codec.so
-lib/libjxl_extras_codec.so.0.9
-lib/libjxl_extras_codec.so.${PKGVERSION}
+lib/libjxl_extras_codec.a
 lib/libjxl_threads.so
-lib/libjxl_threads.so.0.9
+lib/libjxl_threads.so.0.11
 lib/libjxl_threads.so.${PKGVERSION}
 lib/pkgconfig/libjxl.pc
 lib/pkgconfig/libjxl_cms.pc
diff --git a/libjxl/distinfo b/libjxl/distinfo
index e5f44d1b94..a75052fb4d 100644
--- a/libjxl/distinfo
+++ b/libjxl/distinfo
@@ -1,9 +1,8 @@
 $NetBSD$
 
-BLAKE2s (libjxl-0.9.0.tar.gz) = d4b097befbcc7fb10c739785e2c5e1c87d71d7b0ead24418e6b060f5596b5411
-SHA512 (libjxl-0.9.0.tar.gz) = b10e2c495a9624ba404c031087eaa24cc5ae80c1b86d5cde14f80ef2b445752375eec479b41d935bac69273d4ee0f7f3d42f7bd1605c865b88c2be7c29d01d21
-Size (libjxl-0.9.0.tar.gz) = 1871551 bytes
+BLAKE2s (libjxl-0.11.1.tar.gz) = 0bdaeca1d628578a46553cf81843707011c8eed31a482a9646c6f3155a0bcf33
+SHA512 (libjxl-0.11.1.tar.gz) = 0cfd81d9d3b783f96bd04f244d73ffbc12186c89993d46064a2751bef0a446a5e86be05add5c10f60d4482d39333d9bf3f9a866d6eb84f8fa0d4e8b5828fd74c
+Size (libjxl-0.11.1.tar.gz) = 1876134 bytes
 SHA1 (patch-lib_jxl.cmake) = f4111e8818bbcbd9ef43b30643557fd6411afb9f
-SHA1 (patch-lib_jxl__cms.cmake) = 297ce261c76a3cded73fe135d99b6cacce754819
 SHA1 (patch-lib_jxl__threads.cmake) = d4f0bdcda4f1207797f28c2c671c679ee0eaa1d0
 SHA1 (patch-plugins_gdk-pixbuf_CMakeLists.txt) = b37e6d4f0e414c3eb4d1542d732873eb1425a0b2
diff --git a/libjxl/patches/patch-lib_jxl__cms.cmake b/libjxl/patches/patch-lib_jxl__cms.cmake
deleted file mode 100644
index 41c1c8a515..0000000000
--- a/libjxl/patches/patch-lib_jxl__cms.cmake
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD$
-
-Don't link to lcms2 in the pkgconfig file when
-using shared linking only link to it when using
-static linking.
-From upstream:
-https://github.com/libjxl/libjxl/pull/3045
-
---- lib/jxl_cms.cmake.orig	2024-01-05 18:01:47.652697091 +0000
-+++ lib/jxl_cms.cmake
-@@ -23,14 +23,14 @@ generate_export_header(jxl_cms
- target_include_directories(jxl_cms PUBLIC
-   "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}>")
- 
--set(JXL_CMS_PK_LIBS "")
-+set(JPEGXL_CMS_LIBRARY_REQUIRES "")
- 
- if (JPEGXL_ENABLE_SKCMS)
-   target_link_libraries(jxl_cms PRIVATE skcms)
- else()
-   target_link_libraries(jxl_cms PRIVATE lcms2)
-   if (JPEGXL_FORCE_SYSTEM_LCMS2)
--    set(JXL_CMS_PK_LIBS "-llcms2")
-+    set(JPEGXL_CMS_LIBRARY_REQUIRES "lcms2")
-   endif()
- endif()
- 
-@@ -63,7 +63,6 @@ else()
-   set(JPEGXL_REQUIRES_TYPE "Requires")
- endif()
- 
--set(JPEGXL_CMS_LIBRARY_REQUIRES "")
- configure_file("${CMAKE_CURRENT_SOURCE_DIR}/jxl/libjxl_cms.pc.in"
-                "libjxl_cms.pc" @ONLY)
- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libjxl_cms.pc"
Prev by Date: TODO: - libjxl, done
Next by Date: libjxl: convert to cmake/build.mk
Previous by Thread: TODO: - libjxl, done
Next by Thread: libjxl: convert to cmake/build.mk
Indexes:
Home | Main Index | Thread Index | Old Index