summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wendler <polynomial-c@gentoo.org>2018-05-08 20:31:58 +0200
committerLars Wendler <polynomial-c@gentoo.org>2018-05-08 20:32:58 +0200
commit59bd97f12ae21d1a47dae7ca0d0ea77569ebca65 (patch)
tree12cc2e911758e24b1e8359faf01230e59a83f963
parentdev-lang/php: Fix freetype patch to make sure functions are available (diff)
downloadgentoo-59bd97f12ae21d1a47dae7ca0d0ea77569ebca65.tar.gz
gentoo-59bd97f12ae21d1a47dae7ca0d0ea77569ebca65.tar.bz2
gentoo-59bd97f12ae21d1a47dae7ca0d0ea77569ebca65.zip
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
-rw-r--r--media-video/gpac/files/gpac-freetype.patch15
-rw-r--r--media-video/gpac/gpac-0.7.1.ebuild4
2 files changed, 18 insertions, 1 deletions
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=(