CVS commit: pkgsrc/graphics/libjxl

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed May  7 17:53:41 UTC 2025

Modified Files:
        pkgsrc/graphics/libjxl: Makefile PLIST

Log Message:
libjxl: don't buildbenchmark tool. Drop libwebp bl3.mk. Bump.

The benchmark tool is the only thing that requires the libwebp
dependency, and it's not something a regular user needs.

Prompted by this build failure:
bin/benchmark_xl:
ld: libsharpyuv.a(libsharpyuv_la-sharpyuv_csp.o):
relocation R_X86_64_32S against `.rodata' can not be used when making a PIE object; recompile with -fPIE

Which can alternatively be solved with
CMAKE_CONFIGURE_ARGS+=  -DWebP_STATIC_LINK_LIBRARY=OFF


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/graphics/libjxl/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/graphics/libjxl/PLIST

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/Makefile
diff -u pkgsrc/graphics/libjxl/Makefile:1.6 pkgsrc/graphics/libjxl/Makefile:1.7
--- pkgsrc/graphics/libjxl/Makefile:1.6 Thu May  1 18:43:10 2025
+++ pkgsrc/graphics/libjxl/Makefile     Wed May  7 17:53:41 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2025/05/01 18:43:10 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2025/05/07 17:53:41 tnn Exp $
 
 .include "Makefile.common"
 
-PKGREVISION=   2
+PKGREVISION=   3
 
 COMMENT=       JpegXL reference codec
 
@@ -21,6 +21,7 @@ CMAKE_CONFIGURE_ARGS+=        -DJPEGXL_ENABLE_J
 CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_SJPEG=OFF
 CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_SKCMS=OFF
 CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_PLUGINS=OFF
+CMAKE_CONFIGURE_ARGS+= -DJPEGXL_ENABLE_BENCHMARK=OFF
 # test are run during the build stage
 CMAKE_CONFIGURE_ARGS+= -DBUILD_TESTING=OFF
 
@@ -36,7 +37,6 @@ PKGCONFIG_OVERRIDE+=  lib/threads/libjxl_
 .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"

Index: pkgsrc/graphics/libjxl/PLIST
diff -u pkgsrc/graphics/libjxl/PLIST:1.4 pkgsrc/graphics/libjxl/PLIST:1.5
--- pkgsrc/graphics/libjxl/PLIST:1.4    Thu Feb 20 14:53:50 2025
+++ pkgsrc/graphics/libjxl/PLIST        Wed May  7 17:53:41 2025
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2025/02/20 14:53:50 gdt Exp $
-bin/benchmark_xl
+@comment $NetBSD: PLIST,v 1.5 2025/05/07 17:53:41 tnn Exp $
 bin/cjxl
 bin/djxl
 bin/jxlinfo