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: gentoo#8313
hanetzer · May 9, 2018 · fbe832b · fbe832b
1 parent 9b02569
commit fbe832b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 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
@@ -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
@@ -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
@@ -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