Patch acidrip to work with newer mplayer, bug 168012

(Portage version: 2.1.5.3)

3 files changed, 54 insertions, 1 deletions

diff --git a/media-video/acidrip/ChangeLog b/media-video/acidrip/ChangeLog
index 4e468b01baec..fb76df281c22 100644
--- a/media-video/acidrip/ChangeLog
+++ b/media-video/acidrip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/acidrip
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/ChangeLog,v 1.25 2008/06/10 02:23:14 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/ChangeLog,v 1.26 2008/06/10 13:51:31 beandog Exp $
+
+*acidrip-0.14-r2 (10 Jun 2008)
+
+  10 Jun 2008; Steve Dibb <beandog@gentoo.org> +files/acidrip-mplayer.patch,
+  +acidrip-0.14-r2.ebuild:
+  Patch acidrip to work with newer mplayer, bug 168012
 
   10 Jun 2008; Steve Dibb <beandog@gentoo.org> acidrip-0.14-r1.ebuild:
   Host tarball on Gentoo's mirrors
diff --git a/media-video/acidrip/acidrip-0.14-r2.ebuild b/media-video/acidrip/acidrip-0.14-r2.ebuild
new file mode 100644
index 000000000000..926b4db3f55f
--- /dev/null
+++ b/media-video/acidrip/acidrip-0.14-r2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/acidrip/acidrip-0.14-r2.ebuild,v 1.1 2008/06/10 13:51:31 beandog Exp $
+
+inherit perl-app
+
+DESCRIPTION="A gtk-perl mplayer/mencoder frontend for ripping DVDs"
+HOMEPAGE="http://untrepid.com/acidrip/"
+SRC_URI="mirror://gentoo/acidrip/${P}.tar.gz"
+RESTRICT="mirror"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="encode"
+
+DEPEND="dev-lang/perl
+	dev-perl/gtk2-perl
+	media-video/lsdvd
+	media-video/mplayer
+	encode? ( >=media-sound/lame-3.92 )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bug 168012
+	epatch "${FILESDIR}/${PN}-mplayer.patch"
+}
diff --git a/media-video/acidrip/files/acidrip-mplayer.patch b/media-video/acidrip/files/acidrip-mplayer.patch
new file mode 100644
index 000000000000..2937db939402
--- /dev/null
+++ b/media-video/acidrip/files/acidrip-mplayer.patch
@@ -0,0 +1,20 @@
+--- AcidRip/acidrip.pm.orig	2008-06-10 07:33:00.000000000 -0600
++++ AcidRip/acidrip.pm	2008-06-10 07:34:40.000000000 -0600
+@@ -680,7 +680,7 @@
+     message( "Running " . get_command("cropdetect") );
+     open( CROP, get_command("cropdetect") . " 2>&1 |" );
+     while (<CROP>) {
+-      if ( $_ =~ /crop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ }
++      if ( $_ =~ /Crop area.*\s(crop=\d*:\d*:\d*:\d*)/ ) { $crop{$1}++ }
+       $crop_output .= $_;
+       gui_check($_);
+     }
+@@ -863,7 +863,7 @@
+     if ( $::settings->{'mencoder_pid'} = open( MENCODER, "$menc 2>&1 |" ) ) {
+       $/ = "\r";
+ 			while (<MENCODER>) {
+-        if (/^Pos:\s*(\d+).\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+(\d+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) {
++	 if (/^Pos:\s*(\d+).\ds\s+(\d+)f\s+\(\s*(\d+)%\)\s+(\d+.\d+fps)\sTrem:\s+(\d+min)\s+(\d+mb).+\[([\d:]+)\]/) {
+           if ( $1 ne $sec )  { $sec  = $1; $::widgets->{'menc_seconds'}->set_text( hhmmss($1) ) }
+           if ( $4 ne $fps )  { $fps  = $4; $::widgets->{'menc_fps'}->set_text($4) }
+           if ( $6 ne $size ) { $size = $6; $::widgets->{'menc_filesize'}->set_text($6) }