From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B4F521382C5 for ; Tue, 8 May 2018 18:33:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CC5CEE0AA0; Tue, 8 May 2018 18:33:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A663DE0AA0 for ; Tue, 8 May 2018 18:33:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 70210335C43 for ; Tue, 8 May 2018 18:33:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1A62037 for ; Tue, 8 May 2018 18:33:05 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1525804378.59bd97f12ae21d1a47dae7ca0d0ea77569ebca65.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/, media-video/gpac/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/gpac/files/gpac-freetype.patch media-video/gpac/gpac-0.7.1.ebuild X-VCS-Directories: media-video/gpac/ media-video/gpac/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 59bd97f12ae21d1a47dae7ca0d0ea77569ebca65 X-VCS-Branch: master Date: Tue, 8 May 2018 18:33:05 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3a51d929-d7f4-429a-a1ee-b29e15ce1070 X-Archives-Hash: 6faa6b7c22a4a596c8367d791023d31c commit: 59bd97f12ae21d1a47dae7ca0d0ea77569ebca65 Author: Lars Wendler gentoo org> AuthorDate: Tue May 8 18:31:58 2018 +0000 Commit: Lars Wendler gentoo org> CommitDate: Tue May 8 18:32:58 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59bd97f1 media-video/gpac: Use pkg-config to find freetype Thanks to Bernd Feige who reported the issue and provided a patch. Bug: https://bugs.gentoo.org/655272 Package-Manager: Portage-2.3.36, Repoman-2.3.9 media-video/gpac/files/gpac-freetype.patch | 15 +++++++++++++++ media-video/gpac/gpac-0.7.1.ebuild | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/media-video/gpac/files/gpac-freetype.patch b/media-video/gpac/files/gpac-freetype.patch new file mode 100644 index 00000000000..98224aff30e --- /dev/null +++ b/media-video/gpac/files/gpac-freetype.patch @@ -0,0 +1,15 @@ +Index: gpac-0.7.1/configure +=================================================================== +--- gpac-0.7.1.orig/configure ++++ gpac-0.7.1/configure +@@ -1117,8 +1117,8 @@ if docc $CFLAGS_DIR $ft_cflags $ft_lflag + fi + if test "$cross_prefix" = "" ; then + if test "$has_ft" = "no" ; then +- ft_cflags="`freetype-config --cflags 2>>$logs`" +- ft_lflags="`freetype-config --libs 2>>$logs`" ++ ft_cflags="`pkg-config --cflags freetype2 2>>$logs`" ++ ft_lflags="`pkg-config --libs freetype2 2>>$logs`" + if docc $ft_cflags $ft_lflags $LDFLAGS ; then + has_ft="system" + fi diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild index ca4acbd586e..ed5c090d045 100644 --- a/media-video/gpac/gpac-0.7.1.ebuild +++ b/media-video/gpac/gpac-0.7.1.ebuild @@ -56,12 +56,14 @@ RDEPEND=" " # disabled upstream, see applications/Makefile # wxwidgets? ( =x11-libs/wxGTK-2.8* ) -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + virtual/pkgconfig" # DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt" PATCHES=( "${FILESDIR}/${PN}-0.7.1-configure.patch" "${FILESDIR}/ffmpeg4.patch" + "${FILESDIR}/${PN}-freetype.patch" ) DOCS=(