Index: branches/2021Q1/graphics/jpeg-xl/Makefile =================================================================== --- branches/2021Q1/graphics/jpeg-xl/Makefile (revision 568697) +++ branches/2021Q1/graphics/jpeg-xl/Makefile (revision 568698) @@ -1,76 +1,76 @@ # $FreeBSD$ PORTNAME= jpeg-xl DISTVERSIONPREFIX= v -DISTVERSION= 0.3.3 +DISTVERSION= 0.3.4 CATEGORIES= graphics MAINTAINER= jbeich@FreeBSD.org COMMENT= JPEG XL reference encoder/decoder LICENSE= APACHE20 BSD3CLAUSE ZLIB LICENSE_COMB= multi LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/third_party/skcms/LICENSE LICENSE_FILE_ZLIB= ${WRKSRC}/third_party/lodepng/LICENSE LIB_DEPENDS= libbrotlienc.so:archivers/brotli USES= cmake compiler:c++11-lib pkgconfig shared-mime-info USE_GITHUB= nodefault USE_GITLAB= yes USE_LDCONFIG= yes GH_TUPLE= barmco:skcms:6437475:skcms/third_party/skcms \ google:highway:0.11.1:highway/third_party/highway \ lvandeve:lodepng:48e5364:lodepng/third_party/lodepng \ webmproject:sjpeg:868ab55:sjpeg/third_party/sjpeg \ ${NULL} GL_ACCOUNT= wg1 -GL_COMMIT= 65825c8629f181dbe8bdd432b15576735af29701 +GL_COMMIT= f2aeba7e3d091314eaccb64748791e1f4e2cf0a6 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 LDFLAGS+= -Wl,--as-needed # brotlicommon, GIMP/OPENEXR/PNG deps OPTIONS_DEFINE= GIF GIMP JPEG OPENEXR PIXBUF PNG TEST OPTIONS_DEFAULT=GIF GIMP JPEG OPENEXR PIXBUF PNG 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_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 OPENEXR_LIB_DEPENDS= libHalf.so:graphics/ilmbase \ libIlmImf.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 TEST_BUILD_DEPENDS= googletest>0:devel/googletest TEST_USES= localbase:ldflags TEST_CMAKE_BOOL= BUILD_TESTING TEST_TEST_TARGET= test 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 pre-install-TEST-on: do-test .include Index: branches/2021Q1/graphics/jpeg-xl/distinfo =================================================================== --- branches/2021Q1/graphics/jpeg-xl/distinfo (revision 568697) +++ branches/2021Q1/graphics/jpeg-xl/distinfo (revision 568698) @@ -1,11 +1,11 @@ -TIMESTAMP = 1614973437 +TIMESTAMP = 1615894553 SHA256 (barmco-skcms-6437475_GH0.tar.gz) = 6818ea7aa053a964d1795d6d1d3c5e2aad5d30dff9817c8e604e324ef643ec01 SIZE (barmco-skcms-6437475_GH0.tar.gz) = 9200034 SHA256 (google-highway-0.11.1_GH0.tar.gz) = 4c4bb9501c02b27a0944afde8923aaab554384690d37e5b2a7f97553426ea641 SIZE (google-highway-0.11.1_GH0.tar.gz) = 1444575 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 (wg1-jpeg-xl-65825c8629f181dbe8bdd432b15576735af29701_GL0.tar.gz) = 70d187b80491cc68eae01e7eadb7cab30d46711d9dfd31f93d83a82ef7b9175d -SIZE (wg1-jpeg-xl-65825c8629f181dbe8bdd432b15576735af29701_GL0.tar.gz) = 14537336 +SHA256 (wg1-jpeg-xl-f2aeba7e3d091314eaccb64748791e1f4e2cf0a6_GL0.tar.gz) = 83606a892dbd20438e711e12184fedbea9e97480b61153b1dabb5f3b90b02224 +SIZE (wg1-jpeg-xl-f2aeba7e3d091314eaccb64748791e1f4e2cf0a6_GL0.tar.gz) = 14548960 Index: branches/2021Q1/graphics/jpeg-xl/pkg-plist =================================================================== --- branches/2021Q1/graphics/jpeg-xl/pkg-plist (revision 568697) +++ branches/2021Q1/graphics/jpeg-xl/pkg-plist (revision 568698) @@ -1,33 +1,34 @@ 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/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.3.3 +lib/libjxl.so.0.3.4 +lib/libjxl_dec.a lib/libjxl_threads.a lib/libjxl_threads.so lib/libjxl_threads.so.0 -lib/libjxl_threads.so.0.3.3 +lib/libjxl_threads.so.0.3.4 libdata/pkgconfig/libjxl.pc libdata/pkgconfig/libjxl_threads.pc %%GIMP%%libexec/gimp/2.2/plug-ins/file-jxl/file-jxl 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 Index: branches/2021Q1 =================================================================== --- branches/2021Q1 (revision 568697) +++ branches/2021Q1 (revision 568698) Property changes on: branches/2021Q1 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r568697