commit: fbe832b17dfaac3584e5623b61de68b37d4948f0 Author: Georgy Yakovlev <ya <AT> sysdump <DOT> net> AuthorDate: Tue May 8 14:25:46 2018 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Wed May 9 05:54:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbe832b1
media-video/mplayer: Use pkg-config to find freetype Bug: https://bugs.gentoo.org/655240 Package-Manager: Portage-2.3.36, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/8313 .../mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch | 14 ++++++++++++++ media-video/mplayer/mplayer-1.3.0-r3.ebuild | 1 + media-video/mplayer/mplayer-1.3.0-r5.ebuild | 1 + 3 files changed, 16 insertions(+) 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 new file mode 100644 index 00000000000..4bd67ca185a --- /dev/null +++ b/media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch @@ -0,0 +1,14 @@ +Index: configure +=================================================================== +--- a/configure (revision 38020) ++++ b/configure (revision 38021) +@@ -839,7 +839,8 @@ + _macosx_finder=no + _macosx_bundle=auto + _sortsub=yes +-_freetypeconfig='freetype-config' ++_freetypeconfig='pkg-config freetype2' ++type freetype-config >/dev/null 2>&1 && _freetypeconfig=freetype-config + _fribidi=auto + _enca=auto + _inet6=auto diff --git a/media-video/mplayer/mplayer-1.3.0-r3.ebuild b/media-video/mplayer/mplayer-1.3.0-r3.ebuild index c52e83c38b3..c48e3a8e79d 100644 --- a/media-video/mplayer/mplayer-1.3.0-r3.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r3.ebuild @@ -242,6 +242,7 @@ src_prepare() { subversion_wc_info printf "${ESVN_WC_REVISION}" > $svf else + epatch "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 epatch "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch fi if [ ! -f VERSION ] ; then diff --git a/media-video/mplayer/mplayer-1.3.0-r5.ebuild b/media-video/mplayer/mplayer-1.3.0-r5.ebuild index 1e14de1f1ea..6b515f5212d 100644 --- a/media-video/mplayer/mplayer-1.3.0-r5.ebuild +++ b/media-video/mplayer/mplayer-1.3.0-r5.ebuild @@ -243,6 +243,7 @@ src_prepare() { subversion_wc_info printf "${ESVN_WC_REVISION}" > $svf else + eapply "${FILESDIR}"/${PN}-1.3.0-freetype_pkgconfig.patch #655240 eapply "${FILESDIR}"/${PN}-1.3-CVE-2016-4352.patch has_version '>media-video/ffmpeg-3.5' && eapply "${FILESDIR}"/${PN}-1.3-ffmpeg4.patch fi
