hi,
here's the update for libjxl 0.10.0, gdal & sdl2-image both build fine
with it, there might only be a WANTLIB to tweak:
sdl2-image-2.8.2(devel/sdl2-image):
Missing: jxl_cms.0 from libjxl-0.10.0
(/usr/local/lib/libSDL2_image.so.1.1)
WANTLIB += jxl_cms
regress looks good:
test-0.10.0-amd64.log:99% tests passed, 2 tests failed out of 4835
test-0.10.0-i38.log:99% tests passed, 2 tests failed out of 5083
build tests welcome on exotic archs. probably going to commit along
highway.
Landry
? libjxl-0.8.1-libjxl.so.0.0
? libjxl-0.8.1-libjxl_threads.so.0.0
? libjxl-0.8.2-libjxl.so.0.0
? libjxl-0.8.2-libjxl_threads.so.0.0
? notes.txt
? test-0.10.0-amd64.log
? test-0.10.0-i38.log
? test-0.7.0-amd64.log
? test-0.8.1-amd64.log
? test-0.8.1-i386.log
? tests-all-0.8.1-amd64.log
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/libjxl/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- Makefile 26 Sep 2023 17:58:07 -0000 1.8
+++ Makefile 25 Feb 2024 14:58:51 -0000
@@ -2,16 +2,19 @@
GH_ACCOUNT = libjxl
GH_PROJECT = libjxl
-GH_TAGNAME = v0.8.2
-GH_TESTDATA_COMMIT=98b37ee31189f1a31bb384191de0ea4b0358e0a0
+GH_TAGNAME = v0.10.0
+GH_TESTDATA_COMMIT=ff8d743aaba05b3014f17e5475e576242fa979fc
CATEGORIES = graphics
# add external test data
DISTFILES.t =
libjxl-testdata-${GH_TAGNAME}{${GH_TESTDATA_COMMIT}}${EXTRACT_SUFX}
SITES.t = https://github.com/libjxl/testdata/archive/
-SHARED_LIBS += jxl 0.0 # 0.0
-SHARED_LIBS += jxl_threads 0.0 # 0.0
+SHARED_LIBS += jxl 1.0 # 0.0
+SHARED_LIBS += jxl_threads 1.0 # 0.0
+SHARED_LIBS += jxl_cms 0.0 # 0.0
+SHARED_LIBS += jxl_extras_codec 0.0 # 0.0
+
HOMEPAGE = https://jpegxl.info/
MAINTAINER = Landry Breuil <lan...@openbsd.org>
@@ -30,7 +33,7 @@
LIB_DEPENDS += graphics/lcms2>=2.13 \
graphics/png \
graphics/giflib \
- devel/highway \
+ devel/highway>=1.0.7 \
archivers/brotli
WANTLIB += ${COMPILER_LIBCXX} brotlicommon brotlidec
@@ -50,7 +53,9 @@
-DJPEGXL_FORCE_SYSTEM_HWY:BOOL=ON \
-DJPEGXL_FORCE_SYSTEM_LCMS2:BOOL=ON \
-DJPEGXL_ENABLE_BENCHMARK:BOOL=OFF \
+ -DJPEGXL_ENABLE_JPEGLI=OFF \
-DJPEGXL_TEST_DATA_PATH:STRING=${WRKDIR}/testdata-${GH_TESTDATA_COMMIT}
\
-DGMOCK_INCLUDE_DIR:STRING=${LOCALBASE}/include
+#https://github.com/libjxl/libjxl/issues/3069
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/libjxl/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo 15 Jun 2023 06:35:38 -0000 1.2
+++ distinfo 25 Feb 2024 14:58:51 -0000
@@ -1,4 +1,4 @@
-SHA256 (libjxl-0.8.2.tar.gz) = xwkW+z7UN4TrhA+C8F05AFOlWOLaEG5AhjkZI4+ntCA=
-SHA256 (libjxl-testdata-v0.8.2.tar.gz) =
iwAbA1ITeRo9FW1OXiaWdeGNdg0zcyFGeuBN1n8DdbU=
-SIZE (libjxl-0.8.2.tar.gz) = 1612062
-SIZE (libjxl-testdata-v0.8.2.tar.gz) = 67790076
+SHA256 (libjxl-0.10.0.tar.gz) = qzLVKwM8gU0kdi20lCo7RTFdnbN79cipdBzMG7ClLZc=
+SHA256 (libjxl-testdata-v0.10.0.tar.gz) =
nEWhCN8yoAKmlGXfiW0zrPd9l8iPtZ3/oN/1YoNw6W8=
+SIZE (libjxl-0.10.0.tar.gz) = 1910132
+SIZE (libjxl-testdata-v0.10.0.tar.gz) = 69105882
Index: patches/patch-lib_jpegli_cmake
===================================================================
RCS file: patches/patch-lib_jpegli_cmake
diff -N patches/patch-lib_jpegli_cmake
--- patches/patch-lib_jpegli_cmake 4 Mar 2023 08:00:49 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-https://github.com/libjxl/libjxl/issues/2167
-
-Index: lib/jpegli.cmake
---- lib/jpegli.cmake.orig
-+++ lib/jpegli.cmake
-@@ -127,6 +127,7 @@ set(JPEGLI_LIBJPEG_OBJ_COMPILE_DEFINITIONS
- )
-
- add_library(jpegli-libjpeg-obj OBJECT jpegli/libjpeg_wrapper.cc)
-+target_include_directories(jpegli-libjpeg-obj PUBLIC "${JPEG_INCLUDE_DIRS}")
- target_compile_options(jpegli-libjpeg-obj PRIVATE ${JPEGXL_INTERNAL_FLAGS})
- target_compile_options(jpegli-libjpeg-obj PUBLIC ${JPEGXL_COVERAGE_FLAGS})
- set_property(TARGET jpegli-libjpeg-obj PROPERTY POSITION_INDEPENDENT_CODE ON)
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/graphics/libjxl/pkg/PLIST,v
retrieving revision 1.2
diff -u -r1.2 PLIST
--- pkg/PLIST 4 Mar 2023 15:52:24 -0000 1.2
+++ pkg/PLIST 25 Feb 2024 14:58:51 -0000
@@ -1,10 +1,8 @@
-@bin bin/cjpeg_hdr
@bin bin/cjxl
@bin bin/djxl
@bin bin/jxlinfo
include/jxl/
-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
@@ -12,22 +10,24 @@
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
-@static-lib lib/libjxl.a
@lib lib/libjxl.so.${LIBjxl_VERSION}
-@static-lib lib/libjxl_dec.a
-@static-lib lib/libjxl_threads.a
+@lib lib/libjxl_cms.so.${LIBjxl_cms_VERSION}
+@lib lib/libjxl_extras_codec.so.${LIBjxl_extras_codec_VERSION}
@lib lib/libjxl_threads.so.${LIBjxl_threads_VERSION}
lib/pkgconfig/libjxl.pc
+lib/pkgconfig/libjxl_cms.pc
lib/pkgconfig/libjxl_threads.pc
@man man/man1/cjxl.1
@man man/man1/djxl.1
