From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 08:16:48 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 8107B666ECC; Sat, 7 Aug 2021 08:16:48 +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 4GhZv42whmz4qSY; Sat, 7 Aug 2021 08:16:48 +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 4CA091DB40; Sat, 7 Aug 2021 08:16:48 +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 1778Gm5b069778; Sat, 7 Aug 2021 08:16:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1778Gml8069777; Sat, 7 Aug 2021 08:16:48 GMT (envelope-from git) Date: Sat, 7 Aug 2021 08:16:48 GMT Message-Id: <202108070816.1778Gml8069777@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: 8252bf7bd5a9 - main - graphics/sswf: prepare for freetype2 update MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8252bf7bd5a92e6bf5b11a9785625e8b1fca19f8 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Aug 2021 08:16:48 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=8252bf7bd5a92e6bf5b11a9785625e8b1fca19f8 commit 8252bf7bd5a92e6bf5b11a9785625e8b1fca19f8 Author: Tobias C. Berner AuthorDate: 2021-08-07 08:08:15 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-07 08:12:37 +0000 graphics/sswf: prepare for freetype2 update - freetype2 will no longer ship freetype-config (which was a pkg-config wrapper) in the near future -- use pkg-config to gather the required flags. PR: 251512 --- graphics/sswf/Makefile | 2 ++ graphics/sswf/files/patch-configure | 13 +++++++++++++ 2 files changed, 15 insertions(+) diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile index 14bc992c7535..40dceeb8a830 100644 --- a/graphics/sswf/Makefile +++ b/graphics/sswf/Makefile @@ -29,6 +29,8 @@ OPTIONS_DEFINE= DEBUG DEBUG_CONFIGURE_OFF= --disable-debug --disable-yydebug +BINARY_ALIAS= freetype-config=true + .include .if empty(ICONV_LIB) diff --git a/graphics/sswf/files/patch-configure b/graphics/sswf/files/patch-configure new file mode 100644 index 000000000000..5a00dfb7b7a3 --- /dev/null +++ b/graphics/sswf/files/patch-configure @@ -0,0 +1,13 @@ +--- configure.orig 2021-08-07 08:00:57 UTC ++++ configure +@@ -22421,8 +22421,8 @@ fi + if test "x$FREETYPE_CONFIG" != "xno" ; then + { echo "$as_me:$LINENO: checking for freetype libraries" >&5 + echo $ECHO_N "checking for freetype libraries... $ECHO_C" >&6; } +- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` +- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` ++ FREETYPE_LIBS=`pkg-config freetype2 --libs` ++ FREETYPE_CFLAGS=`pkg-config freetype2 --cflags` + { echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 + echo "${ECHO_T}$FREETYPE_LIBS" >&6; } + fi