mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-09 06:51:44 +00:00
Code Issues Releases Activity

devel/highway: switch to shared library after 00e47df9ed

Browse Source 
PR:		261003
This commit is contained in:
Jan Beich 2022-02-18 19:52:58 +00:00
parent 00e47df9ed
commit fcb1353a34
4 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/highway/Makefile
View File

@ -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>

12
devel/highway/pkg-plist
View File

@ -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

6
graphics/libjxl/Makefile
View File

@ -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

22
graphics/libjxl/files/patch-private-libhwy
View File

@ -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}