media-video/gpac: Use pkg-config to find freetype
authorLars Wendler <polynomial-c@gentoo.org>
Tue, 8 May 2018 18:31:58 +0000 (20:31 +0200)
committerLars Wendler <polynomial-c@gentoo.org>
Tue, 8 May 2018 18:32:58 +0000 (20:32 +0200)
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 [new file with mode: 0644]
media-video/gpac/gpac-0.7.1.ebuild

diff --git a/media-video/gpac/files/gpac-freetype.patch b/media-video/gpac/files/gpac-freetype.patch
new file mode 100644 (file)
index 0000000..98224af
--- /dev/null
@@ -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
index ca4acbd586ef9394c5344d8542c33b310ffa3a83..ed5c090d045f77722bc5f953fc9253c96a78a9ab 100644 (file)
@@ -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=(