Use pkg-config for finding libdvdread.

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

4 files changed, 66 insertions, 8 deletions

diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog
index 793a8e118ae6..8eca98ce570b 100644
--- a/media-libs/libdvdnav/ChangeLog
+++ b/media-libs/libdvdnav/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/libdvdnav
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.66 2012/02/20 06:06:37 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.67 2012/04/12 23:40:17 vapier Exp $
+
+  12 Apr 2012; Mike Frysinger <vapier@gentoo.org> libdvdnav-4.2.0.ebuild,
+  +files/libdvdnav-4.2.0-pkgconfig.patch, libdvdnav-9999.ebuild:
+  Use pkg-config for finding libdvdread.
 
   20 Feb 2012; Samuli Suominen <ssuominen@gentoo.org>
   -libdvdnav-4.1.3_p1168.ebuild:
diff --git a/media-libs/libdvdnav/files/libdvdnav-4.2.0-pkgconfig.patch b/media-libs/libdvdnav/files/libdvdnav-4.2.0-pkgconfig.patch
new file mode 100644
index 000000000000..0edcab9d7fba
--- /dev/null
+++ b/media-libs/libdvdnav/files/libdvdnav-4.2.0-pkgconfig.patch
@@ -0,0 +1,54 @@
+http://lists.mplayerhq.hu/pipermail/dvdnav-discuss/2012-March/001672.html
+
+use pkg-config for libdvdread by default rather than the ugly xxx-config scripts
+
+https://bugs.gentoo.org/410189
+
+hassle vapier@gentoo.org if this causes issues
+
+--- configure.ac	(revision 1243)
++++ configure.ac	(working copy)
+@@ -89,6 +89,7 @@ AC_PROG_CC
+ AC_PROG_MAKE_SET
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++PKG_PROG_PKG_CONFIG
+ 
+ dnl --------------------------------------------------------------
+ dnl Libtool
+@@ -185,15 +186,26 @@ AC_ARG_WITH([dvdread-config],
+   [AS_HELP_STRING([--with-dvdread-config=PROG],
+     [dvdread-config program to use @<:@default=from PATH@:>@])],
+   [DVDREAD_CONFIG="$withval"],
+-  [dnl User didn't specify program, search PATH
+-  AC_PATH_PROG([DVDREAD_CONFIG], [dvdread-config], [no])
+-  test "x$DVDREAD_CONFIG" = xno && \
+-    AC_MSG_ERROR([dvdread-config required to link with libdvdread])
+-  ])
+-DVDREAD_CFLAGS=`$DVDREAD_CONFIG --cflags` || \
+-  AC_MSG_ERROR([Could not get libdvdread CFLAGS from $DVDREAD_CONFIG])
+-DVDREAD_LIBS=`$DVDREAD_CONFIG --libs` || \
+-  AC_MSG_ERROR([Could not get libdvdread LIBS from $DVDREAD_CONFIG])
++  [DVDREAD_CONFIG=""])
++
++dnl by default, search pkg-config, and then fall back to dvdread-config
++DVDREAD_PKG_CONFIG="no"
++if test "x$DVDREAD_CONFIG" = "x"; then
++  PKG_CHECK_MODULES([DVDREAD], [dvdread],
++    [DVDREAD_PKG_CONFIG="yes"],
++    [dnl User didn't specify program, search PATH
++      AC_PATH_PROG([DVDREAD_CONFIG], [dvdread-config], [no])
++      test "x$DVDREAD_CONFIG" = xno && \
++      AC_MSG_ERROR([dvdread-config required to link with libdvdread])
++    ])
++fi
++if test "x$DVDREAD_PKG_CONFIG" != "xyes"; then
++  DVDREAD_CFLAGS=`$DVDREAD_CONFIG --cflags` || \
++    AC_MSG_ERROR([Could not get libdvdread CFLAGS from $DVDREAD_CONFIG])
++  DVDREAD_LIBS=`$DVDREAD_CONFIG --libs` || \
++    AC_MSG_ERROR([Could not get libdvdread LIBS from $DVDREAD_CONFIG])
++fi
++
+ AC_SUBST([DVDREAD_CFLAGS])
+ AC_SUBST([DVDREAD_LIBS])
+ 
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild b/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
index 7585a75d714d..25f51c11c031 100644
--- a/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild,v 1.6 2012/02/12 19:39:12 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-4.2.0.ebuild,v 1.7 2012/04/12 23:40:17 vapier Exp $
 
 EAPI=4
-inherit autotools libtool
+inherit autotools
 
 DESCRIPTION="Library for DVD navigation tools"
 HOMEPAGE="http://dvdnav.mplayerhq.hu/"
@@ -21,7 +21,7 @@ DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt doc/dvd_structures NEWS README T
 
 src_prepare() {
 	sed -i -e '/^CFLAGS/s:-O3::' configure.ac || die
-	elibtoolize
+	epatch "${FILESDIR}"/${PN}-4.2.0-pkgconfig.patch
 	eautoreconf
 }
 
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index b36ff79a56a0..2dd3a009ded0 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-9999.ebuild,v 1.4 2011/10/10 23:03:33 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-9999.ebuild,v 1.5 2012/04/12 23:40:17 vapier Exp $
 
 EAPI=4
 WANT_AUTOCONF=2.5
 
-inherit autotools libtool multilib subversion
+inherit autotools subversion
 
 DESCRIPTION="Library for DVD navigation tools"
 HOMEPAGE="http://dvdnav.mplayerhq.hu/"
@@ -22,7 +22,7 @@ ESVN_PROJECT="libdvdnav"
 
 src_prepare() {
 	subversion_src_prepare
-	elibtoolize
+	epatch "${FILESDIR}"/${PN}-4.2.0-pkgconfig.patch
 	eautoreconf
 }