[svn] r5265 - trunk/rpms/dvdrip

[packagers at lists.rpmforge.net]

Author: thias
Date: 2007-04-02 10:33:46 +0200 (Mon, 02 Apr 2007)
New Revision: 5265

Added:
   trunk/rpms/dvdrip/dvdrip-0.98.4-grab-preview-ffmpeg.patch
   trunk/rpms/dvdrip/dvdrip-0.98.4-subpreview-patch
Modified:
   trunk/rpms/dvdrip/dvdrip.spec
Log:
Include two dvdrip fixes from J?\195?\182rn.


Added: trunk/rpms/dvdrip/dvdrip-0.98.4-grab-preview-ffmpeg.patch
===================================================================
--- trunk/rpms/dvdrip/dvdrip-0.98.4-grab-preview-ffmpeg.patch	                        (rev 0)
+++ trunk/rpms/dvdrip/dvdrip-0.98.4-grab-preview-ffmpeg.patch	2007-04-02 08:33:46 UTC (rev 5265)
@@ -0,0 +1,16 @@
+Index: lib/Video/DVDRip/JobPlanner.pm
+===================================================================
+RCS file: /home/cvsroot/dvdrip/lib/Video/DVDRip/JobPlanner.pm,v
+retrieving revision 1.14.2.2
+diff -u -r1.14.2.2 JobPlanner.pm
+--- lib/Video/DVDRip/JobPlanner.pm	24 Mar 2007 11:01:07 -0000	1.14.2.2
++++ lib/Video/DVDRip/JobPlanner.pm	1 Apr 2007 14:13:43 -0000
+@@ -498,7 +498,7 @@
+                     );
+                 }
+             }
+-            if ( $self->exists("ffmpeg") and $buffer =~ /frame=\s*1\s*q=/ ) {
++            if ( $self->exists("ffmpeg") and $buffer =~ /frame=\s*1.*?q\s*=/ ) {
+                 $got_frame_with_ffmpeg = 1;
+             }
+         },

Added: trunk/rpms/dvdrip/dvdrip-0.98.4-subpreview-patch
===================================================================
--- trunk/rpms/dvdrip/dvdrip-0.98.4-subpreview-patch	                        (rev 0)
+++ trunk/rpms/dvdrip/dvdrip-0.98.4-subpreview-patch	2007-04-02 08:33:46 UTC (rev 5265)
@@ -0,0 +1,16 @@
+Index: lib/Video/DVDRip/GUI/Preview.pm
+===================================================================
+RCS file: /home/cvsroot/dvdrip/lib/Video/DVDRip/GUI/Preview.pm,v
+retrieving revision 1.21.2.1
+diff -u -r1.21.2.1 Preview.pm
+--- lib/Video/DVDRip/GUI/Preview.pm	24 Mar 2007 10:42:11 -0000	1.21.2.1
++++ lib/Video/DVDRip/GUI/Preview.pm	30 Mar 2007 08:29:16 -0000
+@@ -62,7 +62,7 @@
+ sub open {
+     my $self = shift;
+ 
+-    return if $self->get_transcode_pipe;
++    return if $self->transcode_pipe;
+ 
+     my $socket_file
+         = "/tmp/tc.$$." . time . ( int( rand(100000) ) ) . ".sock";

Modified: trunk/rpms/dvdrip/dvdrip.spec
===================================================================
--- trunk/rpms/dvdrip/dvdrip.spec	2007-04-01 15:14:36 UTC (rev 5264)
+++ trunk/rpms/dvdrip/dvdrip.spec	2007-04-02 08:33:46 UTC (rev 5265)
@@ -12,12 +12,14 @@
 Summary: Graphical DVD ripping and encoding tool based on transcode
 Name: dvdrip
 Version: 0.98.4
-Release: 1
+Release: 2
 License: Artistic or GPL
 Group: Applications/Multimedia
 URL: http://www.exit1.org/dvdrip/
 Source: http://www.exit1.org/dvdrip/dist/dvdrip-%{version}.tar.gz
 Patch0: Video-DVDRip-0.97.8-nontplworkaround.patch
+Patch1: dvdrip-0.98.4-subpreview-patch
+Patch2: dvdrip-0.98.4-grab-preview-ffmpeg.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Requires: transcode >= 0.6.13
 Requires: ImageMagick, ogmtools, subtitleripper, vcdimager, lsdvd
@@ -39,6 +41,8 @@
 %prep
 %setup
 %patch0 -p1 -b .nontplworkaround
+%patch1 -p0 -b .subpreview
+%patch2 -p0 -b .grab-preview-ffmpeg
 
 
 %build
@@ -110,6 +114,9 @@
 
 
 %changelog
+* Mon Apr  2 2007 Matthias Saou <http://freshrpms.net/> 0.98.4-2
+- Include two fixes from Jörn.
+
 * Mon Mar 26 2007 Matthias Saou <http://freshrpms.net/> 0.98.4-1
 - Update to 0.98.4.