From owner-dev-commits-ports-main@freebsd.org Sat Aug 7 14:10:08 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 5F4AA66C0D5; Sat, 7 Aug 2021 14:10:08 +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 4Ghkkm20KFz3k9d; Sat, 7 Aug 2021 14:10:08 +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 2DDEB22953; Sat, 7 Aug 2021 14:10:08 +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 177EA8xi039619; Sat, 7 Aug 2021 14:10:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 177EA8qK039616; Sat, 7 Aug 2021 14:10:08 GMT (envelope-from git) Date: Sat, 7 Aug 2021 14:10:08 GMT Message-Id: <202108071410.177EA8qK039616@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: 3dfca06aeabf - main - audio/komposter: prepare for freetype2 upgrade 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: 3dfca06aeabfee173047a5a050eaca7f5b031e75 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 14:10:08 -0000 The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=3dfca06aeabfee173047a5a050eaca7f5b031e75 commit 3dfca06aeabfee173047a5a050eaca7f5b031e75 Author: Tobias C. Berner AuthorDate: 2021-08-07 14:07:24 +0000 Commit: Tobias C. Berner CommitDate: 2021-08-07 14:09:05 +0000 audio/komposter: prepare for freetype2 upgrade - 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 --- audio/komposter/files/patch-acinclude.m4 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/audio/komposter/files/patch-acinclude.m4 b/audio/komposter/files/patch-acinclude.m4 new file mode 100644 index 000000000000..a5a0175f4464 --- /dev/null +++ b/audio/komposter/files/patch-acinclude.m4 @@ -0,0 +1,14 @@ +--- acinclude.m4.orig 2021-08-07 13:54:37 UTC ++++ acinclude.m4 +@@ -601,10 +601,7 @@ dnl Incorporate Freetype2. + dnl AC_INCORPORATE_FREETYPE2([version], [define on found], [obligatory]) + AC_DEFUN([AC_INCORPORATE_FREETYPE2], + [ +- AC_CHECK_FT2([$1], +- freetype2=[yes], +- freetype2=[no]) +- AC_INCORPORATE([Freetype2], [$freetype2], [$FT2_CFLAGS], [$FT2_LIBS], [$2], [$3]) ++ AC_INCORPORATE_PKGCONFIG([freetype2],[$1],[$2],[no]) + ]) + + dnl Incorporate GLEW.