libjxl and gdk-pixbuf-jxl: update to version 0.9.0 libjxl now builds without the need to download deps. Remove patch-deps.sh since it is unused. Remove patch-lib_jxl_base_os__macros.h since JXL_OS* isn't used for posix os:s anyway.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: libjxl and gdk-pixbuf-jxl: update to version 0.9.0 libjxl now builds without the need to download deps. Remove patch-deps.sh since it is unused. Remove patch-lib_jxl_base_os__macros.h since JXL_OS* isn't used for posix os:s anyway.
From: Niclas Rosenvik <nros%pkgsrc.org@localhost>
Date: Fri, 05 Jan 2024 20:32:02 +0000
Module Name:	pkgsrc-wip
Committed By:	Niclas Rosenvik <nros%pkgsrc.org@localhost>
Pushed By:	nros
Date:		Fri Jan 5 21:32:02 2024 +0100
Changeset:	02c7dd05adb348134c8aec8517df81b4db47c40e

Modified Files:
	gdk-pixbuf-jxl/Makefile
	libjxl/Makefile
	libjxl/Makefile.common
	libjxl/PLIST
	libjxl/TODO
	libjxl/distinfo
	libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt
Added Files:
	libjxl/patches/patch-lib_jxl.cmake
	libjxl/patches/patch-lib_jxl__cms.cmake
	libjxl/patches/patch-lib_jxl__threads.cmake
Removed Files:
	libjxl/patches/patch-deps.sh
	libjxl/patches/patch-lib_jxl_base_os__macros.h

Log Message:
libjxl and gdk-pixbuf-jxl: update to version 0.9.0
libjxl now builds without the need to download deps.
Remove patch-deps.sh since it is unused.
Remove patch-lib_jxl_base_os__macros.h since JXL_OS*
isn't used for posix os:s anyway.

changes from releasenotes:
Added
 encoder API: add JxlEncoderSetExtraChannelDistance to
 adjust the quality of extra channels (like alpha) separately.
 encoder API: new api functions for streaming encoding:
 JxlEncoderSetOutputProcessor
 JxlEncoderFlushInput
 JxlEncoderOutputProcessor struct
 JxlEncoderSetOutputCallback
 JxlChunkedFrameInputSource struct
 JxlEncoderAddChunkedFrame
 encoder API: new options for more fine-grained control over
 metadata preservation when using JxlEncoderAddJPEGFrame:
 JXL_ENC_FRAME_SETTING_JPEG_KEEP_EXIF
 JXL_ENC_FRAME_SETTING_JPEG_KEEP_XMP
 JXL_ENC_FRAME_SETTING_JPEG_KEEP_JUMBF
 encoder API: new function JxlEncoderSetUpsamplingMode to change
 the upsampling method, e.g. to use nearest-neighbor upsampling for
 pixel art
 decoder API: implemented JxlDecoderSetOutputColorProfile and
 JxlDecoderSetCms to enable decoding to desired colorspace.
 cjxl can now be used to explicitly add/update/strip Exif/XMP/JUMBF
 metadata using the decoder-hints syntax, e.g.
 cjxl input.ppm -x exif=input.exif output.jxl
 djxl can now be used to extract Exif/XMP/JUMBF metadata
 encoder API: new function JxlEncoderDistanceFromQuality for
 convenience to calculate a distance given a quality

Removed
 API: the Butteraugli API (jxl/butteraugli.h) was removed.
 encoder and decoder API: all deprecated functions were removed:
 JxlDecoderDefaultPixelFormat, JxlEncoderOptionsSetLossless,
 JxlEncoderOptionsSetEffort, JxlEncoderOptionsSetDecodingSpeed,
 JxlEncoderOptionsSetDistance, JxlEncoderOptionsCreate, as well as
 the deprecated enumerator values JXL_DEC_EXTENSIONS,
 JXL_ENC_NOT_SUPPORTED, JXL_TYPE_BOOLEAN, JXL_TYPE_UINT32, and
 deprecated type JxlEncoderOptions.
 decoder API: the signature of JxlDecoderGetColorAsEncodedProfile,
 JxlDecoderGetICCProfileSize, and JxlDecoderGetColorAsICCProfile
 changed: a deprecated unused argument was removed.

Changed / clarified
 changed the name of the cjxl flag photon_noise to photon_noise_iso
 fixed how large boxes are decoded
 fixed encoding files with unreadable patches

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

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

diffstat:
 gdk-pixbuf-jxl/Makefile                            | 11 +------
 libjxl/Makefile                                    | 17 +++++------
 libjxl/Makefile.common                             |  2 +-
 libjxl/PLIST                                       | 20 ++++++++-----
 libjxl/TODO                                        |  3 +-
 libjxl/distinfo                                    | 13 ++++----
 libjxl/patches/patch-deps.sh                       | 24 ---------------
 libjxl/patches/patch-lib_jxl.cmake                 | 29 ++++++++++++++++++
 libjxl/patches/patch-lib_jxl__cms.cmake            | 35 ++++++++++++++++++++++
 libjxl/patches/patch-lib_jxl__threads.cmake        | 17 +++++++++++
 libjxl/patches/patch-lib_jxl_base_os__macros.h     | 17 -----------
 .../patch-plugins_gdk-pixbuf_CMakeLists.txt        | 23 +++++---------
 12 files changed, 117 insertions(+), 94 deletions(-)

diffs:
diff --git a/gdk-pixbuf-jxl/Makefile b/gdk-pixbuf-jxl/Makefile
index 8489f6b166..a3a08831f8 100644
--- a/gdk-pixbuf-jxl/Makefile
+++ b/gdk-pixbuf-jxl/Makefile
@@ -7,7 +7,7 @@ COMMENT=	JpegXL GDK pixbuf loader
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
-USE_TOOLS+=	bash pkg-config realpath
+USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 
@@ -22,15 +22,6 @@ SUBST_MESSAGE.gpt=	Fixing path to gdk-pixbuf-thumbnailer
 SUBST_FILES.gpt=	plugins/gdk-pixbuf/jxl.thumbnailer
 SUBST_SED.gpt=		-e 's,/usr,${PREFIX},g'
 
-CMAKE_USE_GNU_INSTALL_DIRS=	no
-
-# TODO:
-# The dependencies installed using deps.sh should be packaged
-# and buildlink3ed 
-# the next version 0.9 depends on lcms2 instead of skcms
-pre-configure:
-	cd ${WRKSRC} && ./deps.sh
-
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../graphics/gdk-pixbuf2/loaders.mk"
 .include "../../wip/libjxl/buildlink3.mk"
diff --git a/libjxl/Makefile b/libjxl/Makefile
index 9b96691595..6f766f44ef 100644
--- a/libjxl/Makefile
+++ b/libjxl/Makefile
@@ -5,33 +5,30 @@ COMMENT=	JpegXL reference codec
 
 TOOL_DEPENDS+=	asciidoc-[0-9]*:../../textproc/asciidoc
 
-USE_TOOLS+=	bash pkg-config realpath
+USE_TOOLS+=	pkg-config
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 
 CMAKE_ARGS+=	-DJPEGXL_VERSION=${PKGVERSION_NOREV}
 CMAKE_ARGS+=	-DJPEGXL_FORCE_SYSTEM_BROTLI=ON
-CMAKE_ARGS+=	-DJPEGXL_FORCE_SYSTEM_GTEST=ON
 CMAKE_ARGS+=	-DJPEGXL_FORCE_SYSTEM_HWY=ON
 CMAKE_ARGS+=	-DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+CMAKE_ARGS+=	-DJPEGXL_ENABLE_DOXYGEN=OFF
+CMAKE_ARGS+=	-DJPEGXL_ENABLE_JPEGLI=OFF
 CMAKE_ARGS+=	-DJPEGXL_ENABLE_SJPEG=OFF
 CMAKE_ARGS+=	-DJPEGXL_ENABLE_SKCMS=OFF
 CMAKE_ARGS+=	-DJPEGXL_ENABLE_PLUGINS=OFF
+# test are run during the build stage
+CMAKE_ARGS+=	-DBUILD_TESTING=OFF
 
 REPLACE_BASH=	deps.sh
 
 PKGCONFIG_OVERRIDE+=	lib/jxl/libjxl.pc.in
+PKGCONFIG_OVERRIDE+=	lib/jxl/libjxl_cms.pc.in
 PKGCONFIG_OVERRIDE+=	lib/threads/libjxl_threads.pc.in
 
-# TODO:
-# The dependencies installed using deps.sh should be packaged
-# and buildlink3ed instead:
-# lodepng, sjpeg, skcms
-#pre-configure:
-#	cd ${WRKSRC} && ./deps.sh
-
 .include "../../archivers/brotli/buildlink3.mk"
-.include "../../devel/googletest/buildlink3.mk"
+.include "../../graphics/libavif/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"
 .include "../../graphics/openexr/buildlink3.mk"
 .include "../../graphics/lcms2/buildlink3.mk"
diff --git a/libjxl/Makefile.common b/libjxl/Makefile.common
index 3270d4cff7..953361c7f6 100644
--- a/libjxl/Makefile.common
+++ b/libjxl/Makefile.common
@@ -1,7 +1,7 @@
 # $NetBSD$
 # used by wip/gdk-pixbuf-jxl/Makefile
 
-DISTNAME=	libjxl-0.8.2
+DISTNAME=	libjxl-0.9.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_GITHUB:=libjxl/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
diff --git a/libjxl/PLIST b/libjxl/PLIST
index 12cbd7b3a1..4c503c6d44 100644
--- a/libjxl/PLIST
+++ b/libjxl/PLIST
@@ -1,11 +1,9 @@
 @comment $NetBSD$
 bin/benchmark_xl
-bin/cjpeg_hdr
 bin/cjxl
 bin/djxl
 bin/jxlinfo
-include/jxl/butteraugli.h
-include/jxl/butteraugli_cxx.h
+include/jxl/cms.h
 include/jxl/cms_interface.h
 include/jxl/codestream_header.h
 include/jxl/color_encoding.h
@@ -13,26 +11,32 @@ include/jxl/decode.h
 include/jxl/decode_cxx.h
 include/jxl/encode.h
 include/jxl/encode_cxx.h
+include/jxl/jxl_cms_export.h
 include/jxl/jxl_export.h
 include/jxl/jxl_threads_export.h
 include/jxl/memory_manager.h
 include/jxl/parallel_runner.h
 include/jxl/resizable_parallel_runner.h
 include/jxl/resizable_parallel_runner_cxx.h
+include/jxl/stats.h
 include/jxl/thread_parallel_runner.h
 include/jxl/thread_parallel_runner_cxx.h
 include/jxl/types.h
 include/jxl/version.h
-lib/libjxl.a
 lib/libjxl.so
-lib/libjxl.so.0.8
+lib/libjxl.so.0.9
 lib/libjxl.so.${PKGVERSION}
-lib/libjxl_dec.a
-lib/libjxl_threads.a
+lib/libjxl_cms.so
+lib/libjxl_cms.so.0.9
+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_threads.so
-lib/libjxl_threads.so.0.8
+lib/libjxl_threads.so.0.9
 lib/libjxl_threads.so.${PKGVERSION}
 lib/pkgconfig/libjxl.pc
+lib/pkgconfig/libjxl_cms.pc
 lib/pkgconfig/libjxl_threads.pc
 man/man1/cjxl.1
 man/man1/djxl.1
diff --git a/libjxl/TODO b/libjxl/TODO
index 5fac02b89c..4d89dfb62a 100644
--- a/libjxl/TODO
+++ b/libjxl/TODO
@@ -1,2 +1 @@
-Some dependencies need to be packaged and used before this can be
-imported.
+Don't link correctly on SunOS, missing __extendhfdf2
diff --git a/libjxl/distinfo b/libjxl/distinfo
index 306bd955de..e5f44d1b94 100644
--- a/libjxl/distinfo
+++ b/libjxl/distinfo
@@ -1,8 +1,9 @@
 $NetBSD$
 
-BLAKE2s (libjxl-0.8.2.tar.gz) = d76b602ecf1714635d063d52cda1389936181f239c108b44f54f1279718bd8a7
-SHA512 (libjxl-0.8.2.tar.gz) = 769f102c46755d11a705ce47ae9e2ef49627ae708f416693bf1293aeeb713934baf4466e45b9c70b04ec1fc8b4a00d5ca7688c8ca03f0a91c9a15252c522a887
-Size (libjxl-0.8.2.tar.gz) = 1612062 bytes
-SHA1 (patch-deps.sh) = 5dcdb36e97f612d921d5bf95211ba19dc57a389a
-SHA1 (patch-lib_jxl_base_os__macros.h) = 083d97beeec362271fa1ce515204332f1d8938e6
-SHA1 (patch-plugins_gdk-pixbuf_CMakeLists.txt) = 6aac2ff940087d453ddcd74f2a18436ca0146508
+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
+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-deps.sh b/libjxl/patches/patch-deps.sh
deleted file mode 100644
index cb9479c12c..0000000000
--- a/libjxl/patches/patch-deps.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD$
-
-* don't require git
-
---- deps.sh.orig	2023-08-18 15:54:41.998155227 +0000
-+++ deps.sh
-@@ -59,17 +59,6 @@ download_github() {
- 
- 
- main() {
--  if git -C "${MYDIR}" rev-parse; then
--    cat >&2 <<EOF
--Current directory is a git repository, downloading dependencies via git:
--
--  git submodule update --init --recursive
--
--EOF
--    git -C "${MYDIR}" submodule update --init --recursive --depth 1 --recommend-shallow
--    return 0
--  fi
--
-   # Sources downloaded from a tarball.
-   download_github third_party/brotli google/brotli
-   download_github third_party/highway google/highway
diff --git a/libjxl/patches/patch-lib_jxl.cmake b/libjxl/patches/patch-lib_jxl.cmake
new file mode 100644
index 0000000000..4d1d4528ce
--- /dev/null
+++ b/libjxl/patches/patch-lib_jxl.cmake
@@ -0,0 +1,29 @@
+$NetBSD$
+
+All linkers do not support --version-script, so test for it
+
+--- lib/jxl.cmake.orig	2024-01-05 16:54:25.540798120 +0000
++++ lib/jxl.cmake
+@@ -216,6 +216,11 @@ list(APPEND CMAKE_EXE_LINKER_FLAGS ${LIN
+ check_c_source_compiles("int main(){return 0;}" LINKER_SUPPORT_EXCLUDE_LIBS)
+ list(REMOVE_ITEM CMAKE_EXE_LINKER_FLAGS ${LINKER_EXCLUDE_LIBS_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})
++check_c_source_compiles("int main(){return 0;}" LINKER_VERSION_SCRIPT)
++list(REMOVE_ITEM CMAKE_EXE_LINKER_FLAGS ${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)
+   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()  # APPLE
+   # This hides the default visibility symbols from static libraries bundled into
+   # the shared library. In particular this prevents exposing symbols from hwy
diff --git a/libjxl/patches/patch-lib_jxl__cms.cmake b/libjxl/patches/patch-lib_jxl__cms.cmake
new file mode 100644
index 0000000000..41c1c8a515
--- /dev/null
+++ b/libjxl/patches/patch-lib_jxl__cms.cmake
@@ -0,0 +1,35 @@
+$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"
diff --git a/libjxl/patches/patch-lib_jxl__threads.cmake b/libjxl/patches/patch-lib_jxl__threads.cmake
new file mode 100644
index 0000000000..29dcea9a26
--- /dev/null
+++ b/libjxl/patches/patch-lib_jxl__threads.cmake
@@ -0,0 +1,17 @@
+$NetBSD$
+
+All linkers do not support --version-script, so test for it
+
+--- lib/jxl_threads.cmake.orig	2024-01-05 17:14:55.908788800 +0000
++++ lib/jxl_threads.cmake
+@@ -46,8 +46,10 @@ if(APPLE)
+ elseif(WIN32)
+ # Nothing needed here, we use __declspec(dllexport) (jxl_threads_export.h)
+ else()
++  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()  # APPLE
+ 
+ # Compile the shared library such that the JXL_THREADS_EXPORT symbols are
diff --git a/libjxl/patches/patch-lib_jxl_base_os__macros.h b/libjxl/patches/patch-lib_jxl_base_os__macros.h
deleted file mode 100644
index d503405b0f..0000000000
--- a/libjxl/patches/patch-lib_jxl_base_os__macros.h
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD$
-
-* add NetBSD support
-
---- lib/jxl/base/os_macros.h.orig	2021-10-04 18:02:44.000000000 +0000
-+++ lib/jxl/base/os_macros.h
-@@ -47,4 +47,10 @@
- #define JXL_OS_HAIKU 0
- #endif
- 
-+#ifdef __NetBSD__
-+#define JXL_OS_NETBSD 1
-+#else
-+#define JXL_OS_NETBSD 0
-+#endif
-+
- #endif  // LIB_JXL_BASE_OS_MACROS_H_
diff --git a/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt b/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt
index f50134d788..f838887e5c 100644
--- a/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt
+++ b/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt
@@ -2,9 +2,9 @@ $NetBSD$
 
 * adapt to make gdk-pixbuf plugin a separate package
 
---- plugins/gdk-pixbuf/CMakeLists.txt.orig	2023-06-14 07:49:21.000000000 +0000
+--- plugins/gdk-pixbuf/CMakeLists.txt.orig	2024-01-05 13:15:08.412618939 +0000
 +++ plugins/gdk-pixbuf/CMakeLists.txt
-@@ -2,9 +2,12 @@
+@@ -2,9 +2,13 @@
  #
  # Use of this source code is governed by a BSD-style
  # license that can be found in the LICENSE file.
@@ -14,25 +14,16 @@ $NetBSD$
  find_package(PkgConfig)
  pkg_check_modules(Gdk-Pixbuf IMPORTED_TARGET gdk-pixbuf-2.0>=2.36)
 +pkg_check_modules(JXL IMPORTED_TARGET libjxl libjxl_threads)
++pkg_check_modules(LCMS2 IMPORTED_TARGET lcms2)
  
- if (NOT Gdk-Pixbuf_FOUND)
-   message(WARNING "GDK Pixbuf development libraries not found, \
-@@ -12,7 +15,7 @@ if (NOT Gdk-Pixbuf_FOUND)
-   return ()
- endif ()
+ include(GNUInstallDirs)
  
--add_library(pixbufloader-jxl MODULE pixbufloader-jxl.c)
-+add_library(pixbufloader-jxl MODULE pixbufloader-jxl.c ../../third_party/skcms/skcms.cc)
- 
- # Mark all symbols as hidden by default. The PkgConfig::Gdk-Pixbuf dependency
- # will cause fill_info and fill_vtable entry points to be made public.
-@@ -23,7 +26,8 @@ set_target_properties(pixbufloader-jxl P
+@@ -25,7 +29,7 @@ set_target_properties(pixbufloader-jxl P
  
  # Note: This only needs the decoder library, but we don't install the decoder
  # shared library.
--target_link_libraries(pixbufloader-jxl jxl jxl_threads skcms-interface PkgConfig::Gdk-Pixbuf)
-+target_link_libraries(pixbufloader-jxl PkgConfig::JXL PkgConfig::Gdk-Pixbuf)
-+target_include_directories(pixbufloader-jxl PRIVATE "../../third_party/skcms")
+-target_link_libraries(pixbufloader-jxl jxl jxl_threads lcms2 PkgConfig::Gdk-Pixbuf)
++target_link_libraries(pixbufloader-jxl PkgConfig::JXL PkgConfig::LCMS2 PkgConfig::Gdk-Pixbuf)
  
  execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} gdk-pixbuf-2.0 --variable gdk_pixbuf_moduledir --define-variable=prefix=${CMAKE_INSTALL_PREFIX} OUTPUT_VARIABLE GDK_PIXBUF_MODULEDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
  install(TARGETS pixbufloader-jxl DESTINATION "${GDK_PIXBUF_MODULEDIR}")
Prev by Date: py-joblib: Improve patch documentation
Next by Date: (math/R) Add SUBST_MESSAGE.strtoi, reduce pkglint flags
Previous by Thread: py-joblib: Improve patch documentation
Next by Thread: (math/R) Add SUBST_MESSAGE.strtoi, reduce pkglint flags
Indexes:
Home | Main Index | Thread Index | Old Index