MPlayer + dts patch, thanks to upstream, bug 190675

(Portage version: 2.1.2.12)

3 files changed, 73 insertions, 3 deletions

diff --git a/media-video/ogmrip/ChangeLog b/media-video/ogmrip/ChangeLog
index add60b8e8fb3..af2c916ada04 100644
--- a/media-video/ogmrip/ChangeLog
+++ b/media-video/ogmrip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/ogmrip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.24 2007/04/18 19:42:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ChangeLog,v 1.25 2007/08/30 01:32:11 beandog Exp $
+
+  29 Aug 2007; Steve Dibb <beandog@gentoo.org>
+  +files/ogmrip-0.10.3-mplayer-dts.patch, ogmrip-0.10.3.ebuild:
+  MPlayer + dts patch, thanks to upstream, bug 190675
 
   18 Apr 2007; Steve Dibb <beandog@gentoo.org> ogmrip-0.10.3.ebuild:
   Remove dts use flag, dep
diff --git a/media-video/ogmrip/files/ogmrip-0.10.3-mplayer-dts.patch b/media-video/ogmrip/files/ogmrip-0.10.3-mplayer-dts.patch
new file mode 100644
index 000000000000..361994013a1c
--- /dev/null
+++ b/media-video/ogmrip/files/ogmrip-0.10.3-mplayer-dts.patch
@@ -0,0 +1,59 @@
+--- configure.in.orig	2007-08-27 20:04:18.000000000 +0200
++++ configure.in	2007-08-27 20:10:52.000000000 +0200
+@@ -189,26 +189,33 @@
+   AC_MSG_ERROR(Unable to find mplayer in the PATH. You need mplayer to use OGMRip. Find it on http://www.mplayerhq.hu)
+ fi
+ 
+-if $MPLAYER_PROG 2> /dev/null | grep -q "MPlayer dev-\(CVS\|SVN\)"; then
+-  have_mplayer_dev=yes
+-  MPLAYER_MAJOR_VERSION=99
+-  MPLAYER_MINOR_VERSION=99
+-  MPLAYER_PRE_VERSION=99
+-  MPLAYER_RC_VERSION=99
+-  AC_MSG_WARN(Mplayer SVN/CVS detected - USE AT YOUR OWN RISK)
+-else
++MPLAYER_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer"`
++
++if echo $MPLAYER_VERSION | grep -q "MPlayer [[0-1]]\.[[0-9]]\+\(\(rc\|pre\)[[0-9]]\+\)\?"; then
+   have_mplayer_dev=no
+-  MPLAYER_MAJOR_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer \([[0-1]]\).*%\1%'`
+-  MPLAYER_MINOR_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.\([[0-9]]\).*%\1%'`
++  MPLAYER_MAJOR_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer \([[0-1]]\).*%\1%'`
++  MPLAYER_MINOR_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.\([[0-9]]\).*%\1%'`
+   MPLAYER_PRE_VERSION=0
+   MPLAYER_RC_VERSION=0
+ 
+-  if $MPLAYER_PROG 2> /dev/null | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then
+-    MPLAYER_PRE_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'`
++  if echo $MPLAYER_VERSION | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+pre[[0-9]]\+.*"; then
++    MPLAYER_PRE_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+pre\([[0-9]]\+\).*%\1%'`
+   fi
+ 
+-  if $MPLAYER_PROG 2> /dev/null | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+rc[[0-9]]\+.*"; then
+-    MPLAYER_RC_VERSION=`$MPLAYER_PROG 2> /dev/null | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+rc\([[0-9]]\+\).*%\1%'`
++  if echo $MPLAYER_VERSION | grep -q "^MPlayer [[0-1]]\.[[0-9]]\+rc[[0-9]]\+.*"; then
++    MPLAYER_RC_VERSION=`echo $MPLAYER_VERSION | grep "^MPlayer" | $SED_PROG -e 's%^MPlayer [[0-1]]\.[[0-9]]\+rc\([[0-9]]\+\).*%\1%'`
++  fi
++else
++  if echo $MPLAYER_VERSION | grep -q "dev-\(CVS\|SVN\)" || \
++     echo $MPLAYER_VERSION | grep -q "SVN-"; then
++    have_mplayer_dev=yes
++    MPLAYER_MAJOR_VERSION=99
++    MPLAYER_MINOR_VERSION=99
++    MPLAYER_PRE_VERSION=99
++    MPLAYER_RC_VERSION=99
++    AC_MSG_WARN(Mplayer SVN/CVS detected - USE AT YOUR OWN RISK)
++  else
++    AC_MSG_ERROR(Unable to determine the version number of mplayer or the version number you specified with --with-version-number is invalid.)
+   fi
+ fi
+ 
+@@ -315,7 +322,7 @@
+ dnl **************************************************************
+ 
+ AC_MSG_CHECKING([for DTS support])
+-if $MPLAYER_PROG -ac help 2> /dev/null | grep -q "^ffdts.*working.*$"; then
++if $MPLAYER_PROG -ac help 2> /dev/null | grep -q "^\(ffdts\|ffdca\|dts\).*working.*$"; then
+   have_dts_support=yes
+ else
+   have_dts_support=no
diff --git a/media-video/ogmrip/ogmrip-0.10.3.ebuild b/media-video/ogmrip/ogmrip-0.10.3.ebuild
index 6982d0b18ffd..cdc8e1c3c184 100644
--- a/media-video/ogmrip/ogmrip-0.10.3.ebuild
+++ b/media-video/ogmrip/ogmrip-0.10.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.10.3.ebuild,v 1.2 2007/04/18 19:42:37 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ogmrip/ogmrip-0.10.3.ebuild,v 1.3 2007/08/30 01:32:11 beandog Exp $
 
-inherit gnome2 eutils
+inherit gnome2 eutils autotools
 
 DESCRIPTION="Graphical frontend and libraries for ripping DVDs and encoding to AVI/OGM/MKV/MP4"
 HOMEPAGE="http://ogmrip.sourceforge.net/"
@@ -43,6 +43,13 @@ G2CONF="${G2CONF}
 
 DOCS="AUTHORS ChangeLog README NEWS TODO"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-mplayer-dts.patch"
+	eautoreconf
+}
+
 pkg_setup() {
 	if ! built_with_use -a media-video/mplayer dvd encode xvid; then
 		eerror "Please, check that your USE flags contain 'dvd', 'encode' and"