Fix pkg-config handling with libdvd{nav,read} #410189.

(Portage version: 2.2.0_alpha95/cvs/Linux x86_64)

3 files changed, 86 insertions, 3 deletions

diff --git a/media-video/mplayer/ChangeLog b/media-video/mplayer/ChangeLog
index c9c89b9d1df5..255e3a777033 100644
--- a/media-video/mplayer/ChangeLog
+++ b/media-video/mplayer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/mplayer
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.846 2012/04/05 12:02:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/ChangeLog,v 1.847 2012/04/05 18:42:48 vapier Exp $
+
+  05 Apr 2012; Mike Frysinger <vapier@gentoo.org>
+  mplayer-1.0_rc4_p20120405.ebuild, +files/mplayer-1.0_rc4-pkg-config.patch:
+  Fix pkg-config handling with libdvd{nav,read} #410189.
 
   05 Apr 2012; Alexis Ballier <aballier@gentoo.org>
   mplayer-1.0_rc4_p20120405.ebuild, mplayer-9999.ebuild:
diff --git a/media-video/mplayer/files/mplayer-1.0_rc4-pkg-config.patch b/media-video/mplayer/files/mplayer-1.0_rc4-pkg-config.patch
new file mode 100644
index 000000000000..a93136cf8671
--- /dev/null
+++ b/media-video/mplayer/files/mplayer-1.0_rc4-pkg-config.patch
@@ -0,0 +1,74 @@
+respect $PKG_CONFIG, and use pkg-config for libdvdnav/libdvdread by
+default rather than the ugly xxx-config scripts
+
+https://bugs.gentoo.org/410189
+
+hassle vapier@gentoo.org if this causes issues
+
+--- configure
++++ configure
+@@ -4042,7 +4042,7 @@ echores "$_apple_ir"
+ fi #if linux
+ 
+ echocheck "pkg-config"
+-_pkg_config=pkg-config
++_pkg_config=${PKG_CONFIG:-pkg-config}
+ if $($_pkg_config --version > /dev/null 2>&1); then
+   if test "$ld_static"; then
+     _pkg_config="$_pkg_config --static"
+@@ -5740,8 +5740,13 @@ if test "$_dvdread_internal" = auto ; th
+ elif test "$_dvdread" = auto ; then
+   _dvdread=no
+   if test "$_dl" = yes; then
+-    _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
+-    _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null)
++    if ! $_pkg_config --exists dvdread ; then
++      _dvdreadcflags=$($_pkgconfig dvdread --cflags)
++      _dvdreadlibs=$($_pkgconfig dvdread --libs)
++    else
++      _dvdreadcflags=$($_dvdreadconfig --cflags 2> /dev/null)
++      _dvdreadlibs=$($_dvdreadconfig --libs 2> /dev/null)
++    fi
+     if header_check dvdread/dvd_reader.h $_dvdreadcflags $_dvdreadlibs $ld_dl ; then
+       _dvdread=yes
+       extra_cflags="$extra_cflags $_dvdreadcflags"
+@@ -7721,13 +7726,20 @@ if test "$_dvdnav" = auto ; then
+     dvdnav_internal=yes
+     res_comment="internal"
+   else
+-    $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
++    if ! $_pkg_config --exists dvdnavmini ; then
++      $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
++    fi
+   fi
+ fi
+ if test "$_dvdnav" = auto ; then
+   _dvdnav=no
+-  _dvdnavdir=$($_dvdnavconfig --cflags)
+-  _dvdnavlibs=$($_dvdnavconfig --libs)
++  if $_pkg_config --exists dvdnavmini ; then
++    _dvdnavdir=$($_pkg_config --cflags dvdnavmini)
++    _dvdnavlibs=$($_pkg_config --libs dvdnavmini)
++  else
++    _dvdnavdir=$($_dvdnavconfig --cflags)
++    _dvdnavlibs=$($_dvdnavconfig --libs)
++  fi
+   statement_check_broken stdint.h dvdnav/dvdnav.h 'dvdnav_t *dvd = 0' $_dvdnavdir $_dvdnavlibs $ld_dl $ld_pthread && _dvdnav=yes
+ fi
+ if test "$_dvdnav" = yes ; then
+@@ -7736,8 +7748,13 @@ if test "$_dvdnav" = yes ; then
+     cflags_libdvdnav="-Ilibdvdnav"
+     inputmodules="dvdnav(internal) $inputmodules"
+   else
+-    extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
+-    extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
++    if $_pkg_config --exists dvdnavmini ; then
++      extra_cflags="$extra_cflags $($_pkg_config --cflags dvdnavmini)"
++      extra_ldflags="$extra_ldflags $($_pkg_config --libs dvdnavmini)"
++    else
++      extra_cflags="$extra_cflags $($_dvdnavconfig --cflags)"
++      extra_ldflags="$extra_ldflags $($_dvdnavconfig --minilibs)"
++    fi
+     inputmodules="dvdnav $inputmodules"
+   fi
+ else
diff --git a/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild b/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild
index f2edd0bc0298..1e91fbe0bca0 100644
--- a/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild
+++ b/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild,v 1.2 2012/04/05 12:02:56 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/mplayer/mplayer-1.0_rc4_p20120405.ebuild,v 1.3 2012/04/05 18:42:48 vapier Exp $
 
 EAPI=4
 
@@ -187,7 +187,11 @@ REQUIRED_USE="bindist? ( !faac !win32codecs )
 	xv? ( X )
 	xvmc? ( xv )"
 
-PATCHES=( "${FILESDIR}/ffmpeg.patch" "${FILESDIR}/ffmpeg2.patch" )
+PATCHES=(
+	"${FILESDIR}/ffmpeg.patch"
+	"${FILESDIR}/ffmpeg2.patch"
+	"${FILESDIR}/${PN}-1.0_rc4-pkg-config.patch"
+)
 
 pkg_setup() {
 	if [[ ${PV} == *9999* ]]; then
@@ -529,6 +533,7 @@ src_configure() {
 		"
 	fi
 
+	tc-export PKG_CONFIG
 	./configure \
 		--cc="$(tc-getCC)" \
 		--host-cc="$(tc-getBUILD_CC)" \