diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2022-02-18 19:52:58 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2022-02-18 20:39:27 +0000 |
| commit | fcb1353a347a5badae497c663cc6b5c6378e44cc (patch) | |
| tree | 8126f6dbf7c54bfae523638ad2b3f1885a591bc4 | |
| parent | 00e47df9ed1a51872ebac971f615489e051ce6ed (diff) | |
| download | ports-fcb1353a347a5badae497c663cc6b5c6378e44cc.tar.gz ports-fcb1353a347a5badae497c663cc6b5c6378e44cc.zip | |
devel/highway: switch to shared library after 00e47df9ed1a
PR: 261003
| -rw-r--r-- | devel/highway/Makefile | 3 | ||||
| -rw-r--r-- | devel/highway/pkg-plist | 12 | ||||
| -rw-r--r-- | graphics/libjxl/Makefile | 6 | ||||
| -rw-r--r-- | graphics/libjxl/files/patch-private-libhwy | 22 |
4 files changed, 14 insertions, 29 deletions
diff --git a/devel/highway/Makefile b/devel/highway/Makefile index 01c76bafb889..7840ed567517 100644 --- a/devel/highway/Makefile +++ b/devel/highway/Makefile @@ -1,5 +1,6 @@ PORTNAME= highway DISTVERSION= 0.16.0 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org @@ -12,7 +13,7 @@ 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 <bsd.port.mk> 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 @@ -31,9 +31,15 @@ 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,7 +1,7 @@ PORTNAME= libjxl DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -20,8 +20,8 @@ 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 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} |