CVS commit: pkgsrc/graphics/libjxl

["Greg Troxel" <gdt%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   gdt
Date:           Thu Feb 20 14:53:50 UTC 2025

Modified Files:
        pkgsrc/graphics/libjxl: Makefile PLIST distinfo
Added Files:
        pkgsrc/graphics/libjxl/patches: patch-CMakeLists.txt

Log Message:
graphics/libjxl: Remediate upstream's approach to a2x

To accomodate Windows, they find python and use it run a2x instead
of...  invoking a2x.  If 3.13 is installed while 3.12 is default, that
fails, and it's wrong anyway.  Excise lots of special cases and just
invoke a2x.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/libjxl/Makefile \
    pkgsrc/graphics/libjxl/PLIST pkgsrc/graphics/libjxl/distinfo
cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/libjxl/patches/patch-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/libjxl/Makefile
diff -u pkgsrc/graphics/libjxl/Makefile:1.3 pkgsrc/graphics/libjxl/Makefile:1.4
--- pkgsrc/graphics/libjxl/Makefile:1.3 Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/Makefile     Thu Feb 20 14:53:50 2025
@@ -1,6 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2025/02/04 11:22:48 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2025/02/20 14:53:50 gdt Exp $
 
 .include "Makefile.common"
+
+PKGREVISION=   1
+
 COMMENT=       JpegXL reference codec
 
 TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
Index: pkgsrc/graphics/libjxl/PLIST
diff -u pkgsrc/graphics/libjxl/PLIST:1.3 pkgsrc/graphics/libjxl/PLIST:1.4
--- pkgsrc/graphics/libjxl/PLIST:1.3    Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/PLIST        Thu Feb 20 14:53:50 2025
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2025/02/04 11:22:48 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2025/02/20 14:53:50 gdt Exp $
 bin/benchmark_xl
 bin/cjxl
 bin/djxl
Index: pkgsrc/graphics/libjxl/distinfo
diff -u pkgsrc/graphics/libjxl/distinfo:1.3 pkgsrc/graphics/libjxl/distinfo:1.4
--- pkgsrc/graphics/libjxl/distinfo:1.3 Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/distinfo     Thu Feb 20 14:53:50 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.3 2025/02/04 11:22:48 wiz Exp $
+$NetBSD: distinfo,v 1.4 2025/02/20 14:53:50 gdt Exp $
 
 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-CMakeLists.txt) = 9c23c2d137fe4f554abe8dc11ef50b6526444bcb
 SHA1 (patch-lib_jxl.cmake) = f4111e8818bbcbd9ef43b30643557fd6411afb9f
 SHA1 (patch-lib_jxl__threads.cmake) = d4f0bdcda4f1207797f28c2c671c679ee0eaa1d0
 SHA1 (patch-plugins_gdk-pixbuf_CMakeLists.txt) = b37e6d4f0e414c3eb4d1542d732873eb1425a0b2

Added files:

Index: pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt:1.3
--- /dev/null   Thu Feb 20 14:53:50 2025
+++ pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt Thu Feb 20 14:53:50 2025
@@ -0,0 +1,47 @@
+n$NetBSD: patch-CMakeLists.txt,v 1.3 2025/02/20 14:53:50 gdt Exp $
+
+Remediate upstream having hard-to-follow code to find a python
+interpreter for a2x instead of just running it.  While it probably
+helps on Windows as they say, it results in finding the wrong python
+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
+@@ -459,32 +459,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)
+-      set(ASCIIDOC_PY_FOUND ON)
+-      # Run the program directly and set ASCIIDOC as empty.
+-      set(ASCIIDOC_PY "${ASCIIDOC}")
+-      set(ASCIIDOC "")
+-    elseif(ASCIIDOC_SHEBANG MATCHES "python2")
+-      find_package(Python2 COMPONENTS Interpreter)
+-      set(ASCIIDOC_PY_FOUND "${Python2_Interpreter_FOUND}")
+-      set(ASCIIDOC_PY Python2::Interpreter)
+-    elseif(ASCIIDOC_SHEBANG MATCHES "python3")
+-      find_package(Python3 COMPONENTS Interpreter)
+-      set(ASCIIDOC_PY_FOUND "${Python3_Interpreter_FOUND}")
+-      set(ASCIIDOC_PY Python3::Interpreter)
+-    else()
+-      find_package(Python COMPONENTS Interpreter QUIET)
+-      if(NOT Python_Interpreter_FOUND)
+-        find_program(ASCIIDOC_PY python)
+-        if(ASCIIDOC_PY)
+-          set(ASCIIDOC_PY_FOUND ON)
+-        endif()
+-      else()
+-        set(ASCIIDOC_PY_FOUND "${Python_Interpreter_FOUND}")
+-        set(ASCIIDOC_PY Python::Interpreter)
+-      endif()
+-    endif()
++    set(ASCIIDOC_PY "${ASCIIDOC}")
++    set(ASCIIDOC "")
++    set(ASCIIDOC_PY_FOUND ON) 
+
+     if (ASCIIDOC_PY_FOUND)
+       set(MANPAGE_FILES "")