| 1 |
commit: fbe832b17dfaac3584e5623b61de68b37d4948f0 |
| 2 |
Author: Georgy Yakovlev <ya <AT> sysdump <DOT> net> |
| 3 |
AuthorDate: Tue May 8 14:25:46 2018 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed May 9 05:54:49 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe832b1 |
| 7 |
|
| 8 |
media-video/mplayer: Use pkg-config to find freetype |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/655240 |
| 11 |
Package-Manager: Portage-2.3.36, Repoman-2.3.9 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/8313 |
| 13 |
|
| 14 |
.../mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch | 14 ++++++++++++++ |
| 15 |
media-video/mplayer/mplayer-1.3.0-r3.ebuild | 1 + |
| 16 |
media-video/mplayer/mplayer-1.3.0-r5.ebuild | 1 + |
| 17 |
3 files changed, 16 insertions(+) |
| 18 |
|
| 19 |
diff --git a/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..4bd67ca185a |
| 22 |
--- /dev/null |
| 23 |
+++ b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch |
| 24 |
@@ -0,0 +1,14 @@ |
| 25 |
+Index: configure |
| 26 |
+=================================================================== |
| 27 |
+--- a/configure (revision 38020) |
| 28 |
++++ b/configure (revision 38021) |
| 29 |
+@@ -839,7 +839,8 @@ |
| 30 |
+ _macosx_finder=no |
| 31 |
+ _macosx_bundle=auto |
| 32 |
+ _sortsub=yes |
| 33 |
+-_freetypeconfig='freetype-config' |
| 34 |
++_freetypeconfig='pkg-config freetype2' |
| 35 |
++type freetype-config >/dev/null 2>&1 && _freetypeconfig=freetype-config |
| 36 |
+ _fribidi=auto |
| 37 |
+ _enca=auto |
| 38 |
+ _inet6=auto |
| 39 |
|
| 40 |
diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild |
| 41 |
index c52e83c38b3..c48e3a8e79d 100644 |
| 42 |
--- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild |
| 43 |
+++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild |
| 44 |
@@ -242,6 +242,7 @@ src_prepare() { |
| 45 |
subversion_wc_info |
| 46 |
printf "${ESVN_WC_REVISION}" > $svf |
| 47 |
else |
| 48 |
+ epatch "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 |
| 49 |
epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch |
| 50 |
fi |
| 51 |
if [ ! -f VERSION ] ; then |
| 52 |
|
| 53 |
diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild |
| 54 |
index 1e14de1f1ea..6b515f5212d 100644 |
| 55 |
--- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild |
| 56 |
+++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild |
| 57 |
@@ -243,6 +243,7 @@ src_prepare() { |
| 58 |
subversion_wc_info |
| 59 |
printf "${ESVN_WC_REVISION}" > $svf |
| 60 |
else |
| 61 |
+ eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 |
| 62 |
eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch |
| 63 |
has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch |
| 64 |
fi |
Archives