CVS commit: pkgsrc/graphics/libjxl

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jul  2 03:13:36 UTC 2026

Modified Files:
        pkgsrc/graphics/libjxl: Makefile Makefile.common PLIST distinfo
        pkgsrc/graphics/libjxl/patches: patch-CMakeLists.txt
            patch-lib_jxl.cmake
Removed Files:
        pkgsrc/graphics/libjxl/patches: patch-lib_extras_dec_pnm.cc
            patch-lib_jxl__cms.cmake

Log Message:
libjxl: updated to 0.12.0

0.12.0

Added

A new buffering flag is now available in the CLI, alongside support for
streaming input with buffered output.
Introduced the new jxltran tool, which supports extracting codestreams from
jxlp boxes and packing raw codestreams into jxlc boxes.
Added the --reconstruct_jpeg flag to djxl to losslessly reconstruct a
JPEG and fail if impossible (mutually exclusive with --pixels_to_jpeg and
--jpeg_quality).
Added JXL_DEC_UNSUPPORTED (kUnsupported) status code to the core API to
better indicate when requested features or operations are not supported by
the decoder.
tools: added support for ProPhoto
color space names in CLI arguments (cjxl / djxl).
decoder API: support for out-of-order jxlp boxes (ftyp minor version 1).
encoder API: JXL_ENC_FRAME_SETTING_OUTPUT_MODE frame setting to control how
the codestream is written to the output. Mode 0 (default) buffers the output
internally and produces a normally ordered, progressively decodable
codestream. Mode 1 uses seek-based streaming (reduces peak memory for large
images, requires a seekable output stream). Mode 2 uses out-of-order jxlp
boxes (reduces peak memory without requiring seeking, but requires a decoder
that supports ftyp minor version 1).

https://github.com/libjxl/libjxl/releases/tag/v0.12.0


To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 pkgsrc/graphics/libjxl/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/libjxl/Makefile.common \
    pkgsrc/graphics/libjxl/PLIST
cvs rdiff -u -r1.7 -r1.8 pkgsrc/graphics/libjxl/distinfo
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/graphics/libjxl/patches/patch-lib_extras_dec_pnm.cc \
    pkgsrc/graphics/libjxl/patches/patch-lib_jxl__cms.cmake
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake

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

Modified files:

Index: pkgsrc/graphics/libjxl/Makefile
diff -u pkgsrc/graphics/libjxl/Makefile:1.15 pkgsrc/graphics/libjxl/Makefile:1.16
--- pkgsrc/graphics/libjxl/Makefile:1.15        Tue Jun 23 09:37:00 2026
+++ pkgsrc/graphics/libjxl/Makefile     Thu Jul  2 03:13:36 2026
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.15 2026/06/23 09:37:00 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2026/07/02 03:13:36 adam Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   3
-
 COMMENT=       JpegXL reference codec
 
 TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc

Index: pkgsrc/graphics/libjxl/Makefile.common
diff -u pkgsrc/graphics/libjxl/Makefile.common:1.5 pkgsrc/graphics/libjxl/Makefile.common:1.6
--- pkgsrc/graphics/libjxl/Makefile.common:1.5  Tue Feb 10 18:53:11 2026
+++ pkgsrc/graphics/libjxl/Makefile.common      Thu Jul  2 03:13:36 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.5 2026/02/10 18:53:11 adam Exp $
+# $NetBSD: Makefile.common,v 1.6 2026/07/02 03:13:36 adam Exp $
 # used by graphics/gdk-pixbuf2-jxl/Makefile
 
-DISTNAME=      libjxl-0.11.2
+DISTNAME=      libjxl-0.12.0
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=libjxl/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
Index: pkgsrc/graphics/libjxl/PLIST
diff -u pkgsrc/graphics/libjxl/PLIST:1.5 pkgsrc/graphics/libjxl/PLIST:1.6
--- pkgsrc/graphics/libjxl/PLIST:1.5    Wed May  7 17:53:41 2025
+++ pkgsrc/graphics/libjxl/PLIST        Thu Jul  2 03:13:36 2026
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.5 2025/05/07 17:53:41 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2026/07/02 03:13:36 adam Exp $
 bin/cjxl
 bin/djxl
 bin/jxlinfo
+bin/jxltran
 include/jxl/cms.h
 include/jxl/cms_interface.h
 include/jxl/codestream_header.h
@@ -25,15 +26,15 @@ include/jxl/thread_parallel_runner_cxx.h
 include/jxl/types.h
 include/jxl/version.h
 lib/libjxl.so
-lib/libjxl.so.0.11
 lib/libjxl.so.${PKGVERSION}
+lib/libjxl.so.0.12
 lib/libjxl_cms.so
-lib/libjxl_cms.so.0.11
 lib/libjxl_cms.so.${PKGVERSION}
+lib/libjxl_cms.so.0.12
 lib/libjxl_extras_codec.a
 lib/libjxl_threads.so
-lib/libjxl_threads.so.0.11
 lib/libjxl_threads.so.${PKGVERSION}
+lib/libjxl_threads.so.0.12
 lib/pkgconfig/libjxl.pc
 lib/pkgconfig/libjxl_cms.pc
 lib/pkgconfig/libjxl_threads.pc

Index: pkgsrc/graphics/libjxl/distinfo
diff -u pkgsrc/graphics/libjxl/distinfo:1.7 pkgsrc/graphics/libjxl/distinfo:1.8
--- pkgsrc/graphics/libjxl/distinfo:1.7 Mon Jun  1 14:14:20 2026
+++ pkgsrc/graphics/libjxl/distinfo     Thu Jul  2 03:13:36 2026
@@ -1,11 +1,9 @@
-$NetBSD: distinfo,v 1.7 2026/06/01 14:14:20 wiz Exp $
+$NetBSD: distinfo,v 1.8 2026/07/02 03:13:36 adam Exp $
 
-BLAKE2s (libjxl-0.11.2.tar.gz) = 8ff719e98e85811e64a66f12755180436baeaab1bc99d2cc9acfd8e49d5dda55
-SHA512 (libjxl-0.11.2.tar.gz) = a7e1f7d060b358f4382e84367d66aa2850aef3b4524a0fdfe3f22dd258fb9e35dda7540f859d8bf4c32f31c61a7a03db677f4490a9f472cd25869a9d00797336
-Size (libjxl-0.11.2.tar.gz) = 1882762 bytes
-SHA1 (patch-CMakeLists.txt) = 9c23c2d137fe4f554abe8dc11ef50b6526444bcb
-SHA1 (patch-lib_extras_dec_pnm.cc) = f1d95b16477702942968bf18c318cf6f2423cc82
-SHA1 (patch-lib_jxl.cmake) = 80edf776f9abc31f972daf081bddd313643ddf19
-SHA1 (patch-lib_jxl__cms.cmake) = 071732162728c9a426dcfd207dc088b42463455b
+BLAKE2s (libjxl-0.12.0.tar.gz) = 975f06d153d23eefc6184e4afebfb9c9746ad2f2ffb9a9c8f377f28b0d26242a
+SHA512 (libjxl-0.12.0.tar.gz) = 71d45123e47588c8028c0e01a7820c7a18d98df05c29b5318ab6858eaff5f249879763907201ba19a93f817c6ef75c393c1974d2a0cc8e461c4e2709ca6fa45f
+Size (libjxl-0.12.0.tar.gz) = 1698757 bytes
+SHA1 (patch-CMakeLists.txt) = 61a53fd1bd533f8c488b8e8c3db04fba3373a617
+SHA1 (patch-lib_jxl.cmake) = a0ddd494e1d7a4992ce22161602c44aae2c44267
 SHA1 (patch-lib_jxl__threads.cmake) = a18c85c6ab0111bad03eaa52b005d8f3204fcf58
 SHA1 (patch-plugins_gdk-pixbuf_CMakeLists.txt) = b37e6d4f0e414c3eb4d1542d732873eb1425a0b2

Index: pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt
diff -u pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt:1.4 pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt:1.5
--- pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt:1.4     Sat Mar  1 12:16:44 2025
+++ pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt Thu Jul  2 03:13:36 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.4 2025/03/01 12:16:44 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.5 2026/07/02 03:13:36 adam Exp $
 
 Remediate upstream having hard-to-follow code to find a python
 interpreter for a2x instead of just running it.  While it probably
@@ -7,14 +7,14 @@ on non-broken systems.
 
 Not sent upstream because this is a philosophical choice.
 
---- CMakeLists.txt.orig        2025-02-20 14:38:12.758394187 +0000
+--- CMakeLists.txt.orig        2026-07-01 16:36:59.000000000 +0000
 +++ CMakeLists.txt
-@@ -459,32 +459,9 @@ endif() # JPEGXL_ENABLE_DOXYGEN
+@@ -446,32 +446,9 @@ endif() # JPEGXL_ENABLE_DOXYGEN
  if(JPEGXL_ENABLE_MANPAGES)
    find_program(ASCIIDOC a2x)
    if(ASCIIDOC)
 -    file(STRINGS "${ASCIIDOC}" ASCIIDOC_SHEBANG LIMIT_COUNT 1)
--    if(ASCIIDOC_SHEBANG MATCHES "sh$" OR ASCIIDOC_SHEBANG MATCHES "libexec/bin/python$" OR MINGW)
+-    if(ASCIIDOC_SHEBANG MATCHES "sh( -e)?$" OR ASCIIDOC_SHEBANG MATCHES "libexec/bin/python$" OR MINGW)
 -      set(ASCIIDOC_PY_FOUND ON)
 -      # Run the program directly and set ASCIIDOC as empty.
 -      set(ASCIIDOC_PY "${ASCIIDOC}")
@@ -42,6 +42,6 @@ Not sent upstream because this is a phil
 +    set(ASCIIDOC_PY "${ASCIIDOC}")
 +    set(ASCIIDOC "")
 +    set(ASCIIDOC_PY_FOUND ON) 
-
+ 
      if (ASCIIDOC_PY_FOUND)
        set(MANPAGE_FILES "")

Index: pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake
diff -u pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake:1.2 pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake:1.3
--- pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake:1.2      Sat Mar  1 12:16:44 2025
+++ pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake  Thu Jul  2 03:13:36 2026
@@ -1,30 +1,22 @@
-$NetBSD: patch-lib_jxl.cmake,v 1.2 2025/03/01 12:16:44 adam Exp $
-
-CMAKE_REQUIRED_LINK_OPTIONS is better suited for tests than CMAKE_EXE_LINKER_FLAGS.
-https://github.com/libjxl/libjxl/pull/4133
+$NetBSD: patch-lib_jxl.cmake,v 1.3 2026/07/02 03:13:36 adam Exp $
 
 Not all linkers support --version-script, so test for it
 
---- lib/jxl.cmake.orig 2024-11-26 13:02:35.000000000 +0000
+--- lib/jxl.cmake.orig 2026-07-01 16:36:59.000000000 +0000
 +++ lib/jxl.cmake
-@@ -224,9 +224,14 @@ set_target_properties(jxl_dec PROPERTIES
- # Check whether the linker support excluding libs
- set(LINKER_EXCLUDE_LIBS_FLAG "-Wl,--exclude-libs=ALL")
- include(CheckCSourceCompiles)
--list(APPEND CMAKE_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_FLAG})
-+list(APPEND CMAKE_REQUIRED_LINK_OPTIONS ${LINKER_EXCLUDE_LIBS_FLAG})
- check_c_source_compiles("int main(){return 0;}" LINKER_SUPPORT_EXCLUDE_LIBS)
--list(REMOVE_ITEM CMAKE_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_FLAG})
-+list(REMOVE_ITEM CMAKE_REQUIRED_LINK_OPTIONS ${LINKER_VERSION_SCRIPT_FLAG})
-+
+@@ -244,6 +244,11 @@ else()
+   list(REMOVE_ITEM CMAKE_REQUIRED_LINK_OPTIONS ${LINKER_EXCLUDE_LIBS_FLAG})
+ endif()
+ 
 +set(LINKER_VERSION_SCRIPT_FLAG "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
 +list(APPEND CMAKE_REQUIRED_LINK_OPTIONS ${LINKER_VERSION_SCRIPT_FLAG})
 +check_c_source_compiles("int main(){return 0;}" LINKER_VERSION_SCRIPT)
 +list(REMOVE_ITEM CMAKE_REQUIRED_LINK_OPTIONS ${LINKER_VERSION_SCRIPT_FLAG})
- 
- if(NOT BUILD_SHARED_LIBS)
-   target_compile_definitions(jxl PUBLIC -DJXL_STATIC_DEFINE)
-@@ -245,8 +250,10 @@ foreach(target IN ITEMS jxl jxl_dec)
++
+ # Add a jxl.version file as a version script to tag symbols with the
+ # appropriate version number. This script is also used to limit what's exposed
+ # in the shared library from the static dependencies bundled here.
+@@ -256,8 +261,10 @@ foreach(target IN ITEMS jxl jxl_dec)
    elseif(WIN32)
      # Nothing needed here, we use __declspec(dllexport) (jxl_export.h)
    else()