MPlayer + dts patch, thanks to upstream, bug 190675

Package-Manager: portage-2.1.2.12

4 files changed, 85 insertions, 11 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/Manifest b/media-video/ogmrip/Manifest
index 35252bd0b2a1..f2101915a76b 100644
--- a/media-video/ogmrip/Manifest
+++ b/media-video/ogmrip/Manifest
@@ -1,12 +1,16 @@
+AUX ogmrip-0.10.3-mplayer-dts.patch 3014 RMD160 e5b091510eb10a8f50f84e91d90761e84179c4b9 SHA1 4e57f7094fd8e4cec351353750e1e2b7ed2900dd SHA256 35905d2dcdc24a5f6395bc26a0d385514a651d63d295d890725a8294b7a9d6a8
+MD5 39f4e6b7fbd729e5587afd03bd3b1661 files/ogmrip-0.10.3-mplayer-dts.patch 3014
+RMD160 e5b091510eb10a8f50f84e91d90761e84179c4b9 files/ogmrip-0.10.3-mplayer-dts.patch 3014
+SHA256 35905d2dcdc24a5f6395bc26a0d385514a651d63d295d890725a8294b7a9d6a8 files/ogmrip-0.10.3-mplayer-dts.patch 3014
 DIST ogmrip-0.10.3.tar.gz 627658 RMD160 6dda1b5cc9bb52d43ab18e17d4c915ba899e6518 SHA1 5191d5b6f67925967e41432d601c3837ffd3dc89 SHA256 b72ce8f41f7692d3704dccf9e6cf0fff19853b4b98281c5892f3387ec84fd517
-EBUILD ogmrip-0.10.3.ebuild 1718 RMD160 4b336c0fb5dc080e23dcf893f3f7092949c77e43 SHA1 162c3e2d6179b443433077750e0f37e7abd79c8b SHA256 989bd35d20208b88e69146c7c18dc53431a1423a5398811f793fe0f167e1c0e1
-MD5 f92e3429003e810fc1b604ee0db38800 ogmrip-0.10.3.ebuild 1718
-RMD160 4b336c0fb5dc080e23dcf893f3f7092949c77e43 ogmrip-0.10.3.ebuild 1718
-SHA256 989bd35d20208b88e69146c7c18dc53431a1423a5398811f793fe0f167e1c0e1 ogmrip-0.10.3.ebuild 1718
-MISC ChangeLog 4917 RMD160 d87c54b088a926651cd8e4dc9dbfbb3f2f5edd63 SHA1 c8bc14432fdc7f57f57d091079df391b9c820ca8 SHA256 c6ff0d1a8ed4407ba2a2d08a4cf3c6a3d219b62f639fd5d2c5ff64b7b0049ea4
-MD5 6fd6f419e3ff7e4b3bb49e4e29307a48 ChangeLog 4917
-RMD160 d87c54b088a926651cd8e4dc9dbfbb3f2f5edd63 ChangeLog 4917
-SHA256 c6ff0d1a8ed4407ba2a2d08a4cf3c6a3d219b62f639fd5d2c5ff64b7b0049ea4 ChangeLog 4917
+EBUILD ogmrip-0.10.3.ebuild 1828 RMD160 1553c285d18f84b4484b2ba178fb49c5fdd6c81e SHA1 8e5b53575adaf382706ea2be4f6f1a7afa46ef68 SHA256 456716da54a7639196270736b18427ab9941410635fc1eff89cd69e80dcb3145
+MD5 e7b140adde3f2f1df4ca321150e340de ogmrip-0.10.3.ebuild 1828
+RMD160 1553c285d18f84b4484b2ba178fb49c5fdd6c81e ogmrip-0.10.3.ebuild 1828
+SHA256 456716da54a7639196270736b18427ab9941410635fc1eff89cd69e80dcb3145 ogmrip-0.10.3.ebuild 1828
+MISC ChangeLog 5083 RMD160 7e0fda165f94e57eff792c9089a5c82683631537 SHA1 a9351da68684cf601ebd6ba7da973a9bd5c6fc73 SHA256 aba181b66c5b4792f39a2ea7e2bd40ccd46d516d9d040f551cd08b5f75b985ab
+MD5 e1ad9b1223d252099c00a2058396ad08 ChangeLog 5083
+RMD160 7e0fda165f94e57eff792c9089a5c82683631537 ChangeLog 5083
+SHA256 aba181b66c5b4792f39a2ea7e2bd40ccd46d516d9d040f551cd08b5f75b985ab ChangeLog 5083
 MISC metadata.xml 380 RMD160 d2b63fc7b96b0de1978f06fd8f70a8a55f9c80e7 SHA1 8709d1b5015b382503025066890eecee94efffc7 SHA256 70617929adf4909735883031a2a9c86ea5e808f4bee7037ecca3c490d68c74bd
 MD5 949f6911677e3fd917e59df12a09905c metadata.xml 380
 RMD160 d2b63fc7b96b0de1978f06fd8f70a8a55f9c80e7 metadata.xml 380
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"