From nobody Fri Feb 18 20:43:31 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2295719D1A93; Fri, 18 Feb 2022 20:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4K0kDg72x6z4rQ3; Fri, 18 Feb 2022 20:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645217012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iHMXZAea58tsr9hjLXPp8xiJHoOWeBlT6LQOxDO0Ry4=; b=gXgYgpgRIgVV5EKXw35aNEiukjadlbpXbkgAuIZapT9GagZGgCMR0gQ3c9lZ4v4PBpzfim vCkLNBOHwJdCDgbNRXM+Q9tRMfPoDYf1t5R/CT8Hh4sSBVhlCW7B48yRKuUGQ6OXIvEAgE TFs9XhMCjy1DP84FSIfh1TQ+vn1DjB7DbUSfG4euj5e6sDLd2UUIZzMNL+G3oNbEwIeaX0 mXok0b+2SwrIHtR80t4ScWVbHIyb4m2NfFN9nVY2/0lFAg5OwisfUaa5G/L2oZXjnkZHj9 TqnDBrYSrFsl3HkTnF0SPc6Bsnz748ZUyzohmObnKM2OTQcvJKynIu3Ltb5SWQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7AD7D24176; Fri, 18 Feb 2022 20:43:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21IKhVs0049037; Fri, 18 Feb 2022 20:43:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21IKhVFf049036; Fri, 18 Feb 2022 20:43:31 GMT (envelope-from git) Date: Fri, 18 Feb 2022 20:43:31 GMT Message-Id: <202202182043.21IKhVFf049036@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: fcb1353a347a - main - devel/highway: switch to shared library after 00e47df9ed1a List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fcb1353a347a5badae497c663cc6b5c6378e44cc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645217012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iHMXZAea58tsr9hjLXPp8xiJHoOWeBlT6LQOxDO0Ry4=; b=RqkXo0QYEozTFtg/4Ez5IAtdm+XVeQrJOvk73FnChEx2pTGATRYXw5lXgwUfJnNE9PRAi/ ABlBWuhdgMnkQW3zU60304nr+60TfOWaslW4G1V/5Sb8buzQhoLv7VkDLUyskMxzaEE/Dp /xGJxPEvXBM0+o/ib+zUBYrqNTaLV4wD5mnGVX+VKfQzY24PMe9tClZYP6m9uJGZqf34Cw aiaNlxrkNR6E27XuYGYMLhXRT4VxGy/FdpGeOgm1f2NeoyR1m4kzxrmkVZ9CmDUmNIA0ZQ iBi6q4EIp0AkbEJwy8ULpNcLFscHb6m1aBrPnLB2qkBiqHSUeGyUXkKw45yQBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645217012; a=rsa-sha256; cv=none; b=bdNom7RX0mMCaCFGXoZuxQwjww3K0it2QQ6oI9a8MirboMSBKbtds4dLf8BqR/rYyEKIwn MXsZjokDRHcQAJUpMm0gx9PjAMaOG7U0n165P7iyJvGfFMcwNRuJr91aipJEwuiWSW1odZ 50rz4pQCMtVKOul0yF9gFVYygpR+1OahjtPfNB7tOtxgGtqUnsmMeoQAPechyJj93zP7Tc s+Bk8E2IPBWGmF/4NsnHrY5kg6+kC+HdCAuGhh4vnS2cSkMtSNwR2PGW0mYmWIgfPQKoB/ a93AbcbE65JUaB1zHfJeDRQGsqyR0L2Vqwa/vz4hmzEsFW152+4hZA57Gj2FDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=fcb1353a347a5badae497c663cc6b5c6378e44cc commit fcb1353a347a5badae497c663cc6b5c6378e44cc Author: Jan Beich AuthorDate: 2022-02-18 19:52:58 +0000 Commit: Jan Beich CommitDate: 2022-02-18 20:39:27 +0000 devel/highway: switch to shared library after 00e47df9ed1a PR: 261003 --- devel/highway/Makefile | 3 ++- devel/highway/pkg-plist | 12 +++++++++--- graphics/libjxl/Makefile | 6 +++--- 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 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}