diff --git a/devel/highway/Makefile b/devel/highway/Makefile index 01c76bafb889..7840ed567517 100644 --- a/devel/highway/Makefile +++ b/devel/highway/Makefile @@ -1,18 +1,19 @@ PORTNAME= highway DISTVERSION= 0.16.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Performance-portable, length-agnostic SIMD with runtime dispatch LICENSE= APACHE20 TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= google -CMAKE_ON= HWY_SYSTEM_GTEST +CMAKE_ON= BUILD_SHARED_LIBS HWY_SYSTEM_GTEST CMAKE_OFF+= ${CMAKE_TESTING_ON} .include diff --git a/devel/highway/pkg-plist b/devel/highway/pkg-plist index 75edb2b7cf87..8d03f85f5928 100644 --- a/devel/highway/pkg-plist +++ b/devel/highway/pkg-plist @@ -1,39 +1,45 @@ include/hwy/aligned_allocator.h include/hwy/base.h include/hwy/cache_control.h include/hwy/contrib/dot/dot-inl.h include/hwy/contrib/image/image.h include/hwy/contrib/math/math-inl.h include/hwy/contrib/sort/disabled_targets.h include/hwy/contrib/sort/shared-inl.h include/hwy/contrib/sort/sorting_networks-inl.h include/hwy/contrib/sort/traits-inl.h include/hwy/contrib/sort/traits128-inl.h include/hwy/contrib/sort/vqsort-inl.h include/hwy/contrib/sort/vqsort.h include/hwy/detect_compiler_arch.h include/hwy/detect_targets.h include/hwy/foreach_target.h include/hwy/highway.h include/hwy/highway_export.h include/hwy/nanobenchmark.h include/hwy/ops/arm_neon-inl.h include/hwy/ops/arm_sve-inl.h include/hwy/ops/generic_ops-inl.h include/hwy/ops/scalar-inl.h include/hwy/ops/set_macros-inl.h include/hwy/ops/shared-inl.h include/hwy/ops/wasm_128-inl.h include/hwy/ops/x86_128-inl.h include/hwy/ops/x86_256-inl.h include/hwy/ops/x86_512-inl.h include/hwy/targets.h include/hwy/tests/hwy_gtest.h include/hwy/tests/test_util-inl.h include/hwy/tests/test_util.h -lib/libhwy.a -lib/libhwy_contrib.a -lib/libhwy_test.a +lib/libhwy.so +lib/libhwy.so.0 +lib/libhwy.so.0.16.0 +lib/libhwy_contrib.so +lib/libhwy_contrib.so.0 +lib/libhwy_contrib.so.0.16.0 +lib/libhwy_test.so +lib/libhwy_test.so.0 +lib/libhwy_test.so.0.16.0 libdata/pkgconfig/libhwy-contrib.pc libdata/pkgconfig/libhwy-test.pc libdata/pkgconfig/libhwy.pc diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index 5d3914ad027b..eb3f09e2f210 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -1,87 +1,87 @@ PORTNAME= libjxl DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 3 +PORTREVISION= 4 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 PATCHFILES+= 0b70567432ab.patch:-p1 # https://github.com/libjxl/libjxl/pull/797 PATCHFILES+= e0107a6ca637.patch:-p1 # https://github.com/libjxl/libjxl/pull/847 PATCHFILES+= e903d53a58b4.patch:-p1 # https://github.com/libjxl/libjxl/pull/1071 PATCHFILES+= 600b59153882.patch:-p1 # https://github.com/libjxl/libjxl/pull/1156 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 -BUILD_DEPENDS= highway>0:devel/highway -LIB_DEPENDS= libbrotlienc.so:archivers/brotli +LIB_DEPENDS= libbrotlienc.so:archivers/brotli \ + libhwy.so:devel/highway TEST_DEPENDS= googletest>0:devel/googletest USES= cmake:testing compiler:c++11-lib cpe localbase:ldflags pkgconfig shared-mime-info CPE_VENDOR= ${PORTNAME}_project USE_GITHUB= yes USE_LDCONFIG= yes GH_TUPLE= jbeich:skcms:6437475:skcms/third_party/skcms \ 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:} # https://github.com/llvm/llvm-project/issues/46697 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/files/patch-private-libhwy b/graphics/libjxl/files/patch-private-libhwy deleted file mode 100644 index c9b5add67ac0..000000000000 --- a/graphics/libjxl/files/patch-private-libhwy +++ /dev/null @@ -1,22 +0,0 @@ -Avoid depending on static libhwy for shared libjxl consumers - ---- lib/jxl.cmake.orig 2021-10-04 18:02:44 UTC -+++ lib/jxl.cmake -@@ -557,7 +557,7 @@ endif() # TARGET_SUPPORTS_SHARED_LIBS AND NOT JPEGXL_ - - # Add a pkg-config file for libjxl. - set(JPEGXL_LIBRARY_REQUIRES -- "libhwy libbrotlicommon libbrotlienc libbrotlidec") -+ "libbrotlicommon libbrotlienc libbrotlidec") - if(NOT JPEGXL_ENABLE_SKCMS) - set(JPEGXL_LIBRARY_REQUIRES "${JPEGXL_LIBRARY_REQUIRES} lcms2") - endif() ---- lib/jxl/libjxl.pc.in.orig 2021-10-04 18:02:44 UTC -+++ lib/jxl/libjxl.pc.in -@@ -8,5 +8,5 @@ Description: Loads and saves JPEG XL files - Version: @JPEGXL_LIBRARY_VERSION@ - Requires.private: @JPEGXL_LIBRARY_REQUIRES@ - Libs: -L${libdir} -ljxl --Libs.private: -lm -+Libs.private: -lhwy -lm - Cflags: -I${includedir}