test

Author: System233

build.sh

@@ -90,6 +90,7 @@ if [ -n "$ENABLE_LIBJXL" ]; then
     else
         JPEGXL_STATIC=ON
     fi
+    git -C libjxl apply ../libjxl.patch || true
     ./build-cmake-dep.sh openexr -DOPENEXR_INSTALL_TOOLS=OFF -DOPENEXR_BUILD_TOOLS=OFF -DBUILD_TESTING=OFF -DOPENEXR_IS_SUBPROJECT=ON
     ./build-cmake-dep.sh libjxl -DBUILD_TESTING=OFF -DJPEGXL_ENABLE_BENCHMARK=OFF -DJPEGXL_ENABLE_JNI=OFF -DJPEGXL_BUNDLE_LIBPNG=OFF -DJPEGXL_ENABLE_TOOLS=OFF -DJPEGXL_ENABLE_EXAMPLES=OFF -DJPEGXL_STATIC=$JPEGXL_STATIC
 fi

libjxl.patch

@@ -0,0 +1,45 @@
+diff --git a/lib/jxl.cmake b/lib/jxl.cmake
+index 59b2cca4..94481f21 100644
+--- a/lib/jxl.cmake
++++ b/lib/jxl.cmake
+@@ -271,10 +271,10 @@ set(JPEGXL_LIBRARY_REQUIRES
+ 
+ if (BUILD_SHARED_LIBS)
+   set(JPEGXL_REQUIRES_TYPE "Requires.private")
+-  set(JPEGXL_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
++  set(JPEGXL_PRIVATE_LIBS "${PKGCONFIG_CXX_LIB}")
+ else()
+   set(JPEGXL_REQUIRES_TYPE "Requires")
+-  set(JPEGXL_PUBLIC_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
++  set(JPEGXL_PUBLIC_LIBS "${PKGCONFIG_CXX_LIB}")
+ endif()
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/jxl/libjxl.pc.in"
+diff --git a/lib/jxl_cms.cmake b/lib/jxl_cms.cmake
+index 62d5b651..e8e4f368 100644
+--- a/lib/jxl_cms.cmake
++++ b/lib/jxl_cms.cmake
+@@ -62,10 +62,10 @@ install(TARGETS jxl_cms
+ 
+ if (BUILD_SHARED_LIBS)
+   set(JPEGXL_REQUIRES_TYPE "Requires.private")
+-  set(JPEGXL_CMS_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
++  set(JPEGXL_CMS_PRIVATE_LIBS "${PKGCONFIG_CXX_LIB}")
+ else()
+   set(JPEGXL_REQUIRES_TYPE "Requires")
+-  set(JPEGXL_CMS_PRIVATE_LIBS "-lm ${PKGCONFIG_CXX_LIB}")
++  set(JPEGXL_CMS_PRIVATE_LIBS "${PKGCONFIG_CXX_LIB}")
+ endif()
+ 
+ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/jxl/libjxl_cms.pc.in"
+diff --git a/lib/threads/libjxl_threads.pc.in b/lib/threads/libjxl_threads.pc.in
+index dfbaa3ff..0af6239d 100644
+--- a/lib/threads/libjxl_threads.pc.in
++++ b/lib/threads/libjxl_threads.pc.in
+@@ -8,6 +8,5 @@ Description: JPEG XL multi-thread runner using std::threads.
+ Version: @JPEGXL_LIBRARY_VERSION@
+ @JPEGXL_REQUIRES_TYPE@: @JPEGXL_THREADS_LIBRARY_REQUIRES@
+ Libs: -L${libdir} -ljxl_threads
+-Libs.private: -lm
+ Cflags: -I${includedir}
+ Cflags.private: -DJXL_THREADS_STATIC_DEFINE