diff options
| author |   Georgy Yakovlev <ya@sysdump.net> | 2018-05-08 07:25:46 -0700 |
|---|---|---|
| committer |   Lars Wendler <polynomial-c@gentoo.org> | 2018-05-09 07:54:49 +0200 |
| commit | fbe832b17dfaac3584e5623b61de68b37d4948f0 (patch) | |
| tree | cf5d0320f6161a5dc0f00cdb4edc9d6e8beec909 | |
| parent | games-emulation/advancemame: Use pkg-config to find freetype and sdl (diff) | |
| download | gentoo-fbe832b1.tar.gz gentoo-fbe832b1.tar.bz2 gentoo-fbe832b1.zip | |
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
| -rw-r--r-- | media-video/mplayer/files/mplayer-1.3.0-freetype_pkgconfig.patch | 14 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.3.0-r3.ebuild | 1 | ||||
| -rw-r--r-- | media-video/mplayer/mplayer-1.3.0-r5.ebuild | 1 |
3 files changed, 16 insertions, 0 deletions
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 000000000000..4bd67ca185aa --- /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 c52e83c38b30..c48e3a8e79db 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 1e14de1f1ea4..6b515f5212dc 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 |