CVS commit: pkgsrc/graphics/libjxl

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/libjxl
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Sat, 1 Mar 2025 12:16:44 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Sat Mar  1 12:16:44 UTC 2025

Modified Files:
        pkgsrc/graphics/libjxl: distinfo
        pkgsrc/graphics/libjxl/patches: patch-CMakeLists.txt
            patch-lib_jxl.cmake patch-lib_jxl__threads.cmake
Added Files:
        pkgsrc/graphics/libjxl/patches: patch-lib_jxl__cms.cmake

Log Message:
Fix linker flags detection


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/libjxl/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake \
    pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/libjxl/patches/patch-lib_jxl__cms.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/distinfo
diff -u pkgsrc/graphics/libjxl/distinfo:1.4 pkgsrc/graphics/libjxl/distinfo:1.5
--- pkgsrc/graphics/libjxl/distinfo:1.4 Thu Feb 20 14:53:50 2025
+++ pkgsrc/graphics/libjxl/distinfo     Sat Mar  1 12:16:43 2025
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.4 2025/02/20 14:53:50 gdt Exp $
+$NetBSD: distinfo,v 1.5 2025/03/01 12:16:43 adam 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-lib_jxl.cmake) = 80edf776f9abc31f972daf081bddd313643ddf19
+SHA1 (patch-lib_jxl__cms.cmake) = 071732162728c9a426dcfd207dc088b42463455b
+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.3 pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt:1.4
--- pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt:1.3     Thu Feb 20 14:53:50 2025
+++ pkgsrc/graphics/libjxl/patches/patch-CMakeLists.txt Sat Mar  1 12:16:44 2025
@@ -1,4 +1,4 @@
-n$NetBSD: patch-CMakeLists.txt,v 1.3 2025/02/20 14:53:50 gdt Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.4 2025/03/01 12:16:44 adam Exp $
 
 Remediate upstream having hard-to-follow code to find a python
 interpreter for a2x instead of just running it.  While it probably

Index: pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake
diff -u pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake:1.1 pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake:1.2
--- pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake:1.1      Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake  Sat Mar  1 12:16:44 2025
@@ -1,29 +1,37 @@
-$NetBSD: patch-lib_jxl.cmake,v 1.1 2025/02/04 11:22:48 wiz Exp $
+$NetBSD: patch-lib_jxl.cmake,v 1.2 2025/03/01 12:16:44 adam Exp $
 
-All linkers do not support --version-script, so test for it
+CMAKE_REQUIRED_LINK_OPTIONS is better suited for tests than CMAKE_EXE_LINKER_FLAGS.
+https://github.com/libjxl/libjxl/pull/4133
 
---- lib/jxl.cmake.orig 2024-01-05 16:54:25.540798120 +0000
+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
-@@ -216,6 +216,11 @@ list(APPEND CMAKE_EXE_LINKER_FLAGS ${LIN
+@@ -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_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_FLAG})
++list(REMOVE_ITEM CMAKE_REQUIRED_LINK_OPTIONS ${LINKER_VERSION_SCRIPT_FLAG})
++
 +set(LINKER_VERSION_SCRIPT_FLAG "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
-+list(APPEND CMAKE_EXE_LINKER_FLAGS ${LINKER_VERSION_SCRIPT_FLAG})
++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_EXE_LINKER_FLAGS ${LINKER_VERSION_SCRIPT_FLAG})
-+
++list(REMOVE_ITEM CMAKE_REQUIRED_LINK_OPTIONS ${LINKER_VERSION_SCRIPT_FLAG})
+ 
  if(NOT BUILD_SHARED_LIBS)
    target_compile_definitions(jxl PUBLIC -DJXL_STATIC_DEFINE)
-   target_compile_definitions(jxl_dec PUBLIC -DJXL_STATIC_DEFINE)
-@@ -233,8 +238,10 @@ foreach(target IN ITEMS jxl jxl_dec)
+@@ -245,8 +250,10 @@ foreach(target IN ITEMS jxl jxl_dec)
    elseif(WIN32)
      # Nothing needed here, we use __declspec(dllexport) (jxl_export.h)
    else()
 +  if(LINKER_VERSION_SCRIPT)
    set_property(TARGET ${target} APPEND_STRING PROPERTY
        LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
-+  endif()  # LINKER_VERSION_SCRIPT
++  endif(LINKER_VERSION_SCRIPT)
    endif()  # APPLE
    # This hides the default visibility symbols from static libraries bundled into
    # the shared library. In particular this prevents exposing symbols from hwy
Index: pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake
diff -u pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake:1.1 pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake:1.2
--- pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake:1.1     Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake Sat Mar  1 12:16:44 2025
@@ -1,6 +1,6 @@
-$NetBSD: patch-lib_jxl__threads.cmake,v 1.1 2025/02/04 11:22:48 wiz Exp $
+$NetBSD: patch-lib_jxl__threads.cmake,v 1.2 2025/03/01 12:16:44 adam Exp $
 
-All linkers do not support --version-script, so test for it
+Not all linkers support --version-script, so test for it.
 
 --- lib/jxl_threads.cmake.orig 2024-01-05 17:14:55.908788800 +0000
 +++ lib/jxl_threads.cmake
@@ -11,7 +11,7 @@ All linkers do not support --version-scr
 +  if(LINKER_VERSION_SCRIPT)
    set_property(TARGET jxl_threads APPEND_STRING PROPERTY
        LINK_FLAGS " -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/jxl/jxl.version")
-+  endif() # LINKER_VERSION_SCRIPT
++  endif(LINKER_VERSION_SCRIPT)
  endif()  # APPLE
  
  # Compile the shared library such that the JXL_THREADS_EXPORT symbols are

Added files:

Index: pkgsrc/graphics/libjxl/patches/patch-lib_jxl__cms.cmake
diff -u /dev/null pkgsrc/graphics/libjxl/patches/patch-lib_jxl__cms.cmake:1.1
--- /dev/null   Sat Mar  1 12:16:44 2025
+++ pkgsrc/graphics/libjxl/patches/patch-lib_jxl__cms.cmake     Sat Mar  1 12:16:44 2025
@@ -0,0 +1,19 @@
+$NetBSD: patch-lib_jxl__cms.cmake,v 1.1 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
+
+--- lib/jxl_cms.cmake.orig     2025-03-01 11:49:41.937461307 +0000
++++ lib/jxl_cms.cmake
+@@ -46,9 +46,9 @@ set_target_properties(jxl_cms 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_EXCLUDE_LIBS_FLAG})
+ 
+ if(LINKER_SUPPORT_EXCLUDE_LIBS)
+   set_property(TARGET jxl_cms APPEND_STRING PROPERTY

Prev by Date: CVS commit: pkgsrc/emulators/qemu
Next by Date: CVS commit: pkgsrc/textproc/ruby-nokogiri
Previous by Thread: CVS commit: pkgsrc/emulators/qemu
Next by Thread: CVS commit: pkgsrc/textproc/ruby-nokogiri
Indexes:

Home | Main Index | Thread Index | Old Index