| 1 |
commit: 59bd97f12ae21d1a47dae7ca0d0ea77569ebca65 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 8 18:31:58 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 8 18:32:58 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59bd97f1 |
| 7 |
|
| 8 |
media-video/gpac: Use pkg-config to find freetype |
| 9 |
|
| 10 |
Thanks to Bernd Feige who reported the issue and provided a patch. |
| 11 |
|
| 12 |
Bug: https://bugs.gentoo.org/655272 |
| 13 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 14 |
|
| 15 |
media-video/gpac/files/gpac-freetype.patch | 15 +++++++++++++++ |
| 16 |
media-video/gpac/gpac-0.7.1.ebuild | 4 +++- |
| 17 |
2 files changed, 18 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/media-video/gpac/files/gpac-freetype.patch b/media-video/gpac/files/gpac-freetype.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..98224aff30e |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-video/gpac/files/gpac-freetype.patch |
| 24 |
@@ -0,0 +1,15 @@ |
| 25 |
+Index: gpac-0.7.1/configure |
| 26 |
+=================================================================== |
| 27 |
+--- gpac-0.7.1.orig/configure |
| 28 |
++++ gpac-0.7.1/configure |
| 29 |
+@@ -1117,8 +1117,8 @@ if docc $CFLAGS_DIR $ft_cflags $ft_lflag |
| 30 |
+ fi |
| 31 |
+ if test "$cross_prefix" = "" ; then |
| 32 |
+ if test "$has_ft" = "no" ; then |
| 33 |
+- ft_cflags="`freetype-config --cflags 2>>$logs`" |
| 34 |
+- ft_lflags="`freetype-config --libs 2>>$logs`" |
| 35 |
++ ft_cflags="`pkg-config --cflags freetype2 2>>$logs`" |
| 36 |
++ ft_lflags="`pkg-config --libs freetype2 2>>$logs`" |
| 37 |
+ if docc $ft_cflags $ft_lflags $LDFLAGS ; then |
| 38 |
+ has_ft="system" |
| 39 |
+ fi |
| 40 |
|
| 41 |
diff --git a/media-video/gpac/gpac-0.7.1.ebuild b/media-video/gpac/gpac-0.7.1.ebuild |
| 42 |
index ca4acbd586e..ed5c090d045 100644 |
| 43 |
--- a/media-video/gpac/gpac-0.7.1.ebuild |
| 44 |
+++ b/media-video/gpac/gpac-0.7.1.ebuild |
| 45 |
@@ -56,12 +56,14 @@ RDEPEND=" |
| 46 |
" |
| 47 |
# disabled upstream, see applications/Makefile |
| 48 |
# wxwidgets? ( =x11-libs/wxGTK-2.8* ) |
| 49 |
-DEPEND="${RDEPEND}" |
| 50 |
+DEPEND="${RDEPEND} |
| 51 |
+ virtual/pkgconfig" |
| 52 |
|
| 53 |
# DOCS="AUTHORS BUGS Changelog README.md TODO doc/CODING_STYLE doc/*.doc doc/*.bt doc/SceneGenerators doc/ipmpx_syntax.bt doc/*.txt" |
| 54 |
PATCHES=( |
| 55 |
"${FILESDIR}/${PN}-0.7.1-configure.patch" |
| 56 |
"${FILESDIR}/ffmpeg4.patch" |
| 57 |
+ "${FILESDIR}/${PN}-freetype.patch" |
| 58 |
) |
| 59 |
|
| 60 |
DOCS=( |
Archives