CVS commit: pkgsrc/graphics/libjxl

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/graphics/libjxl
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Tue, 4 Feb 2025 11:22:48 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb  4 11:22:48 UTC 2025

Added Files:
        pkgsrc/graphics/libjxl: DESCR Makefile Makefile.common PLIST
            buildlink3.mk distinfo
        pkgsrc/graphics/libjxl/patches: patch-lib_jxl.cmake
            patch-lib_jxl__threads.cmake
            patch-plugins_gdk-pixbuf_CMakeLists.txt

Log Message:
graphics/libjxl: import libjxl-0.11.1

Packaged in wip by nros and myself.

Library for reading and writing JPEG XL images.
JPEG XL (.jxl) is the next generation , general-purpose
image compression codec by the JPEG committee.


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/libjxl/DESCR \
    pkgsrc/graphics/libjxl/Makefile pkgsrc/graphics/libjxl/Makefile.common \
    pkgsrc/graphics/libjxl/PLIST pkgsrc/graphics/libjxl/buildlink3.mk \
    pkgsrc/graphics/libjxl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake \
    pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/graphics/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt

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

Added files:

Index: pkgsrc/graphics/libjxl/DESCR
diff -u /dev/null pkgsrc/graphics/libjxl/DESCR:1.3
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/DESCR        Tue Feb  4 11:22:48 2025
@@ -0,0 +1,3 @@
+Library for reading and writing JPEG XL images.
+JPEG XL (.jxl) is the next generation , general-purpose
+image compression codec by the JPEG committee.
Index: pkgsrc/graphics/libjxl/Makefile
diff -u /dev/null pkgsrc/graphics/libjxl/Makefile:1.3
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/Makefile     Tue Feb  4 11:22:48 2025
@@ -0,0 +1,39 @@
+# $NetBSD: Makefile,v 1.3 2025/02/04 11:22:48 wiz Exp $
+
+.include "Makefile.common"
+COMMENT=       JpegXL reference codec
+
+TOOL_DEPENDS+= asciidoc-[0-9]*:../../textproc/asciidoc
+
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES= c c++
+
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_VERSION=${PKGVERSION_NOREV}
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_BROTLI=ON
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_HWY=ON
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_FORCE_SYSTEM_LCMS2=ON
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_DOXYGEN=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_JPEGLI=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_SJPEG=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_SKCMS=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_PLUGINS=OFF
+# test are run during the build stage
+CMAKE_CONFIGURE_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
+
+.include "../../devel/cmake/build.mk"
+.include "../../archivers/brotli/buildlink3.mk"
+.include "../../graphics/libavif/buildlink3.mk"
+.include "../../graphics/giflib/buildlink3.mk"
+.include "../../graphics/openexr/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.include "../../graphics/libwebp/buildlink3.mk"
+.include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/libhighway/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/libjxl/Makefile.common
diff -u /dev/null pkgsrc/graphics/libjxl/Makefile.common:1.3
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/Makefile.common      Tue Feb  4 11:22:48 2025
@@ -0,0 +1,14 @@
+# $NetBSD: Makefile.common,v 1.3 2025/02/04 11:22:48 wiz Exp $
+# used by wip/gdk-pixbuf-jxl/Makefile
+
+DISTNAME=      libjxl-0.11.1
+CATEGORIES=    graphics
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=libjxl/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://jpegxl.info/
+LICENSE=       modified-bsd
+
+PATCHDIR?=     ${.CURDIR}/../../graphics/libjxl/patches
+DISTINFO_FILE?=        ${.CURDIR}/../../graphics/libjxl/distinfo
Index: pkgsrc/graphics/libjxl/PLIST
diff -u /dev/null pkgsrc/graphics/libjxl/PLIST:1.3
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/PLIST        Tue Feb  4 11:22:48 2025
@@ -0,0 +1,42 @@
+@comment $NetBSD: PLIST,v 1.3 2025/02/04 11:22:48 wiz Exp $
+bin/benchmark_xl
+bin/cjxl
+bin/djxl
+bin/jxlinfo
+include/jxl/cms.h
+include/jxl/cms_interface.h
+include/jxl/codestream_header.h
+include/jxl/color_encoding.h
+include/jxl/compressed_icc.h
+include/jxl/decode.h
+include/jxl/decode_cxx.h
+include/jxl/encode.h
+include/jxl/encode_cxx.h
+include/jxl/gain_map.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.so
+lib/libjxl.so.0.11
+lib/libjxl.so.${PKGVERSION}
+lib/libjxl_cms.so
+lib/libjxl_cms.so.0.11
+lib/libjxl_cms.so.${PKGVERSION}
+lib/libjxl_extras_codec.a
+lib/libjxl_threads.so
+lib/libjxl_threads.so.0.11
+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
Index: pkgsrc/graphics/libjxl/buildlink3.mk
diff -u /dev/null pkgsrc/graphics/libjxl/buildlink3.mk:1.3
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/buildlink3.mk        Tue Feb  4 11:22:48 2025
@@ -0,0 +1,16 @@
+# $NetBSD: buildlink3.mk,v 1.3 2025/02/04 11:22:48 wiz Exp $
+
+BUILDLINK_TREE+=       libjxl
+
+.if !defined(LIBJXL_BUILDLINK3_MK)
+LIBJXL_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.libjxl+= libjxl>=0.8.2
+BUILDLINK_PKGSRCDIR.libjxl?=   ../../graphics/libjxl
+
+.include "../../archivers/brotli/buildlink3.mk"
+.include "../../graphics/libhighway/buildlink3.mk"
+.include "../../graphics/lcms2/buildlink3.mk"
+.endif # LIBJXL_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -libjxl
Index: pkgsrc/graphics/libjxl/distinfo
diff -u /dev/null pkgsrc/graphics/libjxl/distinfo:1.3
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/distinfo     Tue Feb  4 11:22:48 2025
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.3 2025/02/04 11:22:48 wiz 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-lib_jxl.cmake) = f4111e8818bbcbd9ef43b30643557fd6411afb9f
+SHA1 (patch-lib_jxl__threads.cmake) = d4f0bdcda4f1207797f28c2c671c679ee0eaa1d0
+SHA1 (patch-plugins_gdk-pixbuf_CMakeLists.txt) = b37e6d4f0e414c3eb4d1542d732873eb1425a0b2

Index: pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake
diff -u /dev/null pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake:1.1
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/patches/patch-lib_jxl.cmake  Tue Feb  4 11:22:48 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-lib_jxl.cmake,v 1.1 2025/02/04 11:22:48 wiz Exp $
+
+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
Index: pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake
diff -u /dev/null pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake:1.1
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/patches/patch-lib_jxl__threads.cmake Tue Feb  4 11:22:48 2025
@@ -0,0 +1,17 @@
+$NetBSD: patch-lib_jxl__threads.cmake,v 1.1 2025/02/04 11:22:48 wiz Exp $
+
+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

Index: pkgsrc/graphics/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt:1.3
--- /dev/null   Tue Feb  4 11:22:48 2025
+++ pkgsrc/graphics/libjxl/patches/patch-plugins_gdk-pixbuf_CMakeLists.txt      Tue Feb  4 11:22:48 2025
@@ -0,0 +1,29 @@
+$NetBSD: patch-plugins_gdk-pixbuf_CMakeLists.txt,v 1.3 2025/02/04 11:22:48 wiz Exp $
+
+* adapt to make gdk-pixbuf plugin a separate package
+
+--- plugins/gdk-pixbuf/CMakeLists.txt.orig     2024-01-05 13:15:08.412618939 +0000
++++ plugins/gdk-pixbuf/CMakeLists.txt
+@@ -2,9 +2,13 @@
+ #
+ # Use of this source code is governed by a BSD-style
+ # license that can be found in the LICENSE file.
++cmake_minimum_required(VERSION 3.10)
++project(gdl-pixbuf-jxl LANGUAGES C CXX)
+ 
+ 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)
+ 
+ include(GNUInstallDirs)
+ 
+@@ -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 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: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/graphics
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/graphics
Indexes:

Home | Main Index | Thread Index | Old Index