From nobody Sat Jan 08 18:13:44 2022 X-Original-To: dev-commits-ports-all@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 2EDF8194501B; Sat, 8 Jan 2022 18:13:45 +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 4JWSrm6VzNz3KfF; Sat, 8 Jan 2022 18:13:44 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 BF130235C4; Sat, 8 Jan 2022 18:13:44 +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 208IDiAc027599; Sat, 8 Jan 2022 18:13:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 208IDif8027597; Sat, 8 Jan 2022 18:13:44 GMT (envelope-from git) Date: Sat, 8 Jan 2022 18:13:44 GMT Message-Id: <202201081813.208IDif8027597@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: afbd51f05283 - main - graphics/libjxl: unbreak pkg-config support List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: afbd51f052833f7a152390a6a7b80af14e14fe53 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641665624; 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=vpu0wm/xVsXY/ftAyxsJgxfzCIXiqfxDyc2bMM3kbiI=; b=GHSzp7ua8X+fehoj6yQ+C6UP+DB3PQrMOa02EiSFX8QMpAFzhvPr5j9+a7bcNbUUsGr8RI 4g3G7UrUZ9YB/kBJEOHcsBsUxRuAqeAny9Wi26zQuo4PGVQ/4yvBP90EZmYswzyfARbpg0 HwoUZxJXfyPxLIdPpaZExWKlPmOTJ+673WMCaof8iQnXxRDNcN/oXgF5s3YMUw2ZpH4vw1 MOJALEqEEpkzPT12v8xh3/AJTYefDHp/SIn+hA+TM0z+X+I/upqBDji/ZfbaYUSvLbzHTD OQz9yMgrJl8HHaGB+x+jak+D83aFV4cjtfNaI+adMDDkbrDPd8NcsaO1E/LJCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641665624; a=rsa-sha256; cv=none; b=X3zwi6yHc6ED2sqAm4gqau9AS/uwiVuQZUZHdxemTIMQMn+u3Zd4j0nIPBB2qO78dbkyRt QEOl11ZvxYW4ZuH+ZaaPEo2MSncWisFPhNTjgRv3S1l/Q3kZlQy14zc7KJwqwVM4LfabGY Y3J7WDO+/FiTqSVAt0fFO7Glfeig+NpaeEB/5Y9s2juDOxbEkRQg8mj1nfd+Thwd7PGQw+ XIU8dC176VhiACzNH/KEuDcYlZbWSPyOuRw43qw3h4mkxVLp2JwPY1ihgq5ei4kVsiIynD c3UHcMpecMBQjCAlYN94wwBtjDzx+rAqxaaGITsEsZYbTHIDy+DnitqC6VVHbg== 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=afbd51f052833f7a152390a6a7b80af14e14fe53 commit afbd51f052833f7a152390a6a7b80af14e14fe53 Author: Jan Beich AuthorDate: 2022-01-08 17:57:59 +0000 Commit: Jan Beich CommitDate: 2022-01-08 18:13:31 +0000 graphics/libjxl: unbreak pkg-config support Convert static libhwy from package to LDFLAGS, so pkgconf doesn't try to expand missing package in Requires.private outside of --static. $ pkg-config --cflags libjxl Package libhwy was not found in the pkg-config search path. Perhaps you should add the directory containing `libhwy.pc' to the PKG_CONFIG_PATH environment variable Package 'libhwy', required by 'libjxl', not found PR: 261003 Reported by: Greg V --- graphics/libjxl/Makefile | 1 + graphics/libjxl/files/patch-private-libs | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/graphics/libjxl/Makefile b/graphics/libjxl/Makefile index 7c2405e2faaf..2bc9513c9222 100644 --- a/graphics/libjxl/Makefile +++ b/graphics/libjxl/Makefile @@ -1,6 +1,7 @@ PORTNAME= libjxl DISTVERSIONPREFIX= v DISTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= graphics PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/graphics/libjxl/files/patch-private-libs b/graphics/libjxl/files/patch-private-libs index 4da786d74277..b1b13b911f85 100644 --- a/graphics/libjxl/files/patch-private-libs +++ b/graphics/libjxl/files/patch-private-libs @@ -1,6 +1,26 @@ highway is untagged and have no other consumers. Keep it private to libjxl package for now. +--- 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} --- third_party/CMakeLists.txt.orig 2020-11-14 00:52:03 UTC +++ third_party/CMakeLists.txt @@ -83,7 +83,7 @@ endif() # BUILD_TESTING