diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index 9fd160a145e7..c97c50002dcd 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -1,80 +1,81 @@ PORTNAME= libjxl DISTVERSIONPREFIX= v -DISTVERSION= 0.5 -PORTREVISION= 1 +DISTVERSION= 0.6 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= adb32f3f8f37.patch:-p1 # https://github.com/libjxl/libjxl/pull/193 PATCHFILES+= c31dca74e68f.patch:-p1 # https://github.com/libjxl/libjxl/pull/678 MAINTAINER= jbeich@FreeBSD.org COMMENT= JPEG XL reference encoder/decoder LICENSE= BSD3CLAUSE ZLIB LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC}/third_party/lodepng/LICENSE LIB_DEPENDS= libbrotlienc.so:archivers/brotli TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++11-lib localbase:ldflags pkgconfig shared-mime-info USE_GITHUB= yes USE_LDCONFIG= yes GH_TUPLE= barmco:skcms:6437475:skcms/third_party/skcms \ google:highway:0.12.2-4-ge239774:highway/third_party/highway \ lvandeve:lodepng:48e5364:lodepng/third_party/lodepng \ webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \ ${NULL} CMAKE_ON= JPEGXL_ENABLE_PLUGINS CMAKE_OFF= JPEGXL_WARNINGS_AS_ERRORS ${BENCHMARK FUZZERS TCMALLOC:L:S/^/JPEGXL_ENABLE_/} CMAKE_OFF+= ${OpenGL GLUT:L:S/^/CMAKE_DISABLE_FIND_PACKAGE_/} # sjpeg CMAKE_OFF+= ${CMAKE_TESTING_ON} LDFLAGS+= -Wl,--as-needed # brotlicommon, GIMP/OPENEXR/PNG deps OPTIONS_DEFINE= GIF GIMP JPEG LTO MANPAGES OPENEXR PIXBUF PNG OPTIONS_DEFAULT=GIF GIMP JPEG LTO MANPAGES OPENEXR PIXBUF PNG OPTIONS_EXCLUDE_i386= LTO # ConvolutionWithTranspose(): JXL_CHECK: out->xsize() == in.ysize() OPTIONS_EXCLUDE_powerpc64= ${"${/usr/bin/ld:L:tA}"==/usr/bin/ld.lld:?LTO:} # LLVM bug 47353 OPTIONS_SUB= yes GIF_LIB_DEPENDS= libgif.so:graphics/giflib GIF_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_GIF GIMP_DESC= GIMP plugin support +GIMP_USES= gnome +GIMP_USE= GNOME=gtk20 GIMP_LIB_DEPENDS= libgegl-0.4.so:graphics/gegl \ libgimp-2.0.so:graphics/gimp-app \ libbabl-0.1.so:x11/babl JPEG_USES= jpeg JPEG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_JPEG LTO_CMAKE_BOOL= CMAKE_INTERPROCEDURAL_OPTIMIZATION LTO_CMAKE_ON= -DCMAKE_POLICY_DEFAULT_CMP0069:STRING=NEW MANPAGES_BUILD_DEPENDS= a2x:textproc/asciidoc MANPAGES_USES= python:build MANPAGES_CMAKE_BOOL= JPEGXL_ENABLE_MANPAGES OPENEXR_LIB_DEPENDS= libImath.so:math/Imath \ libOpenEXR.so:graphics/openexr OPENEXR_CMAKE_BOOL= JPEGXL_ENABLE_OPENEXR PIXBUF_USES= gnome PIXBUF_USE= GNOME=gdkpixbuf2 PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CMAKE_BOOL_OFF= CMAKE_DISABLE_FIND_PACKAGE_PNG post-patch: @${REINPLACE_CMD} 's,/usr,${LOCALBASE},' \ ${WRKSRC}/plugins/gdk-pixbuf/jxl.thumbnailer # pkg_check_modules doesn't support CMAKE_DISABLE_* post-patch-GIMP-off: @${REINPLACE_CMD} -i.nogimp '/gimp/d' ${WRKSRC}/plugins/CMakeLists.txt post-patch-PIXBUF-off: @${REINPLACE_CMD} -i.nopixbuf '/gdk-pixbuf/d' ${WRKSRC}/plugins/CMakeLists.txt .include diff --git a/graphics/libjxl/distinfo b/graphics/libjxl/distinfo index 5423c2969adb..19a6b350e947 100644 --- a/graphics/libjxl/distinfo +++ b/graphics/libjxl/distinfo @@ -1,15 +1,15 @@ -TIMESTAMP = 1627921201 -SHA256 (libjxl-libjxl-v0.5_GH0.tar.gz) = 911cb4b50eb621131ca22382166f40d4914a4ff4453dd299ade1e3292f311f89 -SIZE (libjxl-libjxl-v0.5_GH0.tar.gz) = 16868006 +TIMESTAMP = 1633370564 +SHA256 (libjxl-libjxl-v0.6_GH0.tar.gz) = 89584e20c6e537d8d65d286fd6ae48d5d6abb087ca89f3207238d8d7e6ced4dc +SIZE (libjxl-libjxl-v0.6_GH0.tar.gz) = 16953410 SHA256 (barmco-skcms-6437475_GH0.tar.gz) = 6818ea7aa053a964d1795d6d1d3c5e2aad5d30dff9817c8e604e324ef643ec01 SIZE (barmco-skcms-6437475_GH0.tar.gz) = 9200034 SHA256 (google-highway-0.12.2-4-ge239774_GH0.tar.gz) = 27ae8a40f82874cb30bd62ef8f5567cc27838ee258ed0af47745685a15b23a8e SIZE (google-highway-0.12.2-4-ge239774_GH0.tar.gz) = 1488138 SHA256 (lvandeve-lodepng-48e5364_GH0.tar.gz) = 41e0bcc686e31ee2d51a6c87c0089045f4805e4053d39026ad02e8aa90c782c1 SIZE (lvandeve-lodepng-48e5364_GH0.tar.gz) = 239988 SHA256 (webmproject-sjpeg-868ab55_GH0.tar.gz) = ffe757b376fed2fd94473f8625c25f82a3a23aa317fb1bbf1ac8159b6e0a7726 SIZE (webmproject-sjpeg-868ab55_GH0.tar.gz) = 2472084 SHA256 (adb32f3f8f37.patch) = 52e4fd7e1bce238731a9a1a0b1c9124624c6f85766d3debaf2d2e0f017471692 SIZE (adb32f3f8f37.patch) = 5664 SHA256 (c31dca74e68f.patch) = c6a1412d73f1ee156d4cc978fde7e5ec91e62bae9946ebb38a5e78be7f93a253 SIZE (c31dca74e68f.patch) = 767 diff --git a/graphics/libjxl/pkg-plist b/graphics/libjxl/pkg-plist index bc49bbad0bfa..44b9d8552846 100644 --- a/graphics/libjxl/pkg-plist +++ b/graphics/libjxl/pkg-plist @@ -1,38 +1,38 @@ bin/cjxl bin/djxl include/jxl/butteraugli.h include/jxl/butteraugli_cxx.h include/jxl/codestream_header.h include/jxl/color_encoding.h include/jxl/decode.h include/jxl/decode_cxx.h include/jxl/encode.h include/jxl/encode_cxx.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/thread_parallel_runner.h include/jxl/thread_parallel_runner_cxx.h include/jxl/types.h %%PIXBUF%%lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders/libpixbufloader-jxl.so lib/libjxl.a lib/libjxl.so -lib/libjxl.so.0 -lib/libjxl.so.0.5.0 +lib/libjxl.so.0.6 +lib/libjxl.so.0.6.0 lib/libjxl_dec.a lib/libjxl_threads.a lib/libjxl_threads.so -lib/libjxl_threads.so.0 -lib/libjxl_threads.so.0.5.0 +lib/libjxl_threads.so.0.6 +lib/libjxl_threads.so.0.6.0 libdata/pkgconfig/libjxl.pc libdata/pkgconfig/libjxl_threads.pc %%GIMP%%libexec/gimp/2.2/plug-ins/file-jxl/file-jxl %%MANPAGES%%share/man/man1/cjxl.1.gz %%MANPAGES%%share/man/man1/djxl.1.gz share/mime/packages/image-jxl.xml %%PIXBUF%%share/thumbnailers/jxl.thumbnailer %%PIXBUF%%@postexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true %%PIXBUF%%@postunexec %D/bin/gdk-pixbuf-query-loaders > /dev/null 2>&1 && %D/bin/gdk-pixbuf-query-loaders > %D/lib/gdk-pixbuf-2.0/%%GTK2_VERSION%%/loaders.cache 2>/dev/null || /usr/bin/true