From 02be3957ead2ac4fe1c0d50aa2f4adb54d66c923 Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Aug 05 2008 14:46:11 +0000 Subject: - New upstream release --- diff --git a/.cvsignore b/.cvsignore index eda72cc..9e35951 100644 --- a/.cvsignore +++ b/.cvsignore @@ -2,3 +2,4 @@ dvgrab-2.0.tar.gz dvgrab-2.1.tar.gz dvgrab-3.0.tar.gz dvgrab-3.1.tar.gz +dvgrab-3.2.tar.gz diff --git a/dvgrab-3.1-bad-timecode-handling.patch b/dvgrab-3.1-bad-timecode-handling.patch deleted file mode 100644 index 45dc12b..0000000 --- a/dvgrab-3.1-bad-timecode-handling.patch +++ /dev/null @@ -1,48 +0,0 @@ -Date: 2008-04-13 18:42 -From: Patrick Mansfield -Subject: fix segfault when timecodes are bad - -Hi - - -I am also hitting bug 1865787 "dvgrab-3.x -autosplit segfaults', this: - -http://sourceforge.net/tracker/index.php?func=detail&aid=1865787&group_id=14103&atid=114103 - -Large timecode values are causing a stack overflow in DVgrab::sendCaptureStatus, -the printf precision for integers specifies the minimum number of digits, -not the maximum, so the tc_str can be longer than 32 bytes. - -I don't know WHY the timecodes are so large, but at least it doesn't -segfault with this patch. - -With the fix (or while debugging), I am seeing status lines like this: - -"again-2003.12.24_09-06-53.avi": 36.91 MiB 322 frames timecode 00:07:56.14 date 2003.12.24 09:07:04 -"again-2003.12.24_09-08-20.avi": 74.57 MiB 651 frames timecode 167058900:-1319513512:-1291087864.163713312 date 2008.04.13 11:23:17 -"again-2004.01.14_11-32-20.avi": 10.02 MiB 87 frames timecode 00:00:03.15 date 2004.01.14 11:32:23 - -Without the fix, we segfault before the second line above can be output. - -I have a test file if someone wants it, but it is 200Mb in size. - -The strings should fit into 47 and 77 bytes respectively, but the fix -allows for some extra space and uses 64 and 128 bytes for the strings in -DVgrab::sendCaptureStatus (even though it is the timecode that was causing -the segfault, we should be safe and increase the size of both strings). - -Index: dvgrab/dvgrab.cc -=================================================================== -RCS file: /cvsroot/kino/dvgrab/dvgrab.cc,v -retrieving revision 1.61 -diff -u -r1.61 dvgrab.cc ---- dvgrab/dvgrab.cc 27 Feb 2008 05:09:48 -0000 1.61 -+++ dvgrab/dvgrab.cc 13 Apr 2008 18:27:11 -0000 -@@ -779,7 +779,7 @@ - - void DVgrab::sendCaptureStatus( const char *name, float size, int frames, TimeCode *tc, struct tm *rd, bool newline ) - { -- char tc_str[32], rd_str[32]; -+ char tc_str[64], rd_str[128]; - - if ( tc ) - sprintf( tc_str, "%2.2d:%2.2d:%2.2d.%2.2d", diff --git a/dvgrab-3.1-gcc43-fix.patch b/dvgrab-3.1-gcc43-fix.patch deleted file mode 100644 index 1513942..0000000 --- a/dvgrab-3.1-gcc43-fix.patch +++ /dev/null @@ -1,103 +0,0 @@ -diff -Naurp dvgrab-3.1.orig/avi.cc dvgrab-3.1/avi.cc ---- dvgrab-3.1.orig/avi.cc 2007-07-06 15:00:36.000000000 -0400 -+++ dvgrab-3.1/avi.cc 2008-02-13 14:07:35.000000000 -0500 -@@ -20,6 +20,7 @@ - #ifdef HAVE_CONFIG_H - #include - #endif -+#include - - // C++ includes - -diff -Naurp dvgrab-3.1.orig/dvframe.cc dvgrab-3.1/dvframe.cc ---- dvgrab-3.1.orig/dvframe.cc 2007-07-06 15:00:36.000000000 -0400 -+++ dvgrab-3.1/dvframe.cc 2008-02-13 14:08:41.000000000 -0500 -@@ -25,6 +25,7 @@ - \file dvframe.cc - */ - -+#include - #include "dvframe.h" - - VideoInfo::VideoInfo() : width( 0 ), height( 0 ), isPAL( false ) -diff -Naurp dvgrab-3.1.orig/dvgrab.cc dvgrab-3.1/dvgrab.cc ---- dvgrab-3.1.orig/dvgrab.cc 2007-12-10 01:57:15.000000000 -0500 -+++ dvgrab-3.1/dvgrab.cc 2008-02-13 14:00:08.000000000 -0500 -@@ -29,6 +29,7 @@ - using std::cerr; - using std::endl; - -+#include - #include - #include - #include -diff -Naurp dvgrab-3.1.orig/filehandler.cc dvgrab-3.1/filehandler.cc ---- dvgrab-3.1.orig/filehandler.cc 2007-12-10 01:57:15.000000000 -0500 -+++ dvgrab-3.1/filehandler.cc 2008-02-13 14:00:03.000000000 -0500 -@@ -34,6 +34,7 @@ using std::ostringstream; - using std::setw; - using std::setfill; - -+#include - #include - #include - #include -diff -Naurp dvgrab-3.1.orig/hdvframe.cc dvgrab-3.1/hdvframe.cc ---- dvgrab-3.1.orig/hdvframe.cc 2007-12-10 01:16:10.000000000 -0500 -+++ dvgrab-3.1/hdvframe.cc 2008-02-13 14:00:40.000000000 -0500 -@@ -18,6 +18,7 @@ - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -+#include - #include "hdvframe.h" - - HDVFrame::HDVFrame( HDVStreamParams *p ) -diff -Naurp dvgrab-3.1.orig/iec13818-1.cc dvgrab-3.1/iec13818-1.cc ---- dvgrab-3.1.orig/iec13818-1.cc 2007-12-10 01:16:10.000000000 -0500 -+++ dvgrab-3.1/iec13818-1.cc 2008-02-13 14:00:30.000000000 -0500 -@@ -20,6 +20,7 @@ - #include - using std::string; - -+#include - #include "hdvframe.h" - #include "iec13818-1.h" - -diff -Naurp dvgrab-3.1.orig/ieee1394io.cc dvgrab-3.1/ieee1394io.cc ---- dvgrab-3.1.orig/ieee1394io.cc 2007-12-10 01:16:10.000000000 -0500 -+++ dvgrab-3.1/ieee1394io.cc 2008-02-13 14:01:56.000000000 -0500 -@@ -49,9 +49,11 @@ - - #include - #include -+#include - - using std::endl; - -+#include - #include - #include - #include -diff -Naurp dvgrab-3.1.orig/main.cc dvgrab-3.1/main.cc ---- dvgrab-3.1.orig/main.cc 2007-07-06 15:08:17.000000000 -0400 -+++ dvgrab-3.1/main.cc 2008-02-13 14:02:55.000000000 -0500 -@@ -36,6 +36,7 @@ using std::endl; - - // C includes - -+#include - #include - #include - #include -diff -Naurp dvgrab-3.1.orig/v4l2reader.cc dvgrab-3.1/v4l2reader.cc ---- dvgrab-3.1.orig/v4l2reader.cc 2007-11-21 23:22:08.000000000 -0500 -+++ dvgrab-3.1/v4l2reader.cc 2008-02-13 14:03:07.000000000 -0500 -@@ -24,6 +24,7 @@ - - #include - -+#include - #include - #include - #include diff --git a/dvgrab.spec b/dvgrab.spec index 778c61a..ce7c9fd 100644 --- a/dvgrab.spec +++ b/dvgrab.spec @@ -1,13 +1,11 @@ Summary: Utility to capture video from a DV camera Name: dvgrab -Version: 3.1 -Release: 5%{?dist} +Version: 3.2 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.kinodv.org/ Source: http://dl.sf.net/kino/dvgrab-%{version}.tar.gz -Patch1: dvgrab-3.1-gcc43-fix.patch -Patch2: dvgrab-3.1-bad-timecode-handling.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libraw1394-devel libavc1394-devel libdv-devel BuildRequires: libiec61883-devel libjpeg-devel @@ -19,8 +17,6 @@ The dvgrab utility will capture digital video from a DV source on the firewire %prep %setup -q -%patch1 -p1 -%patch2 -p1 %build %configure @@ -40,6 +36,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/dvgrab.1* %changelog +* Tue Aug 05 2008 Jarod Wilson - 3.2-1 +- New upstream release + * Wed Jul 23 2008 Jarod Wilson - 3.1-5 - Bump and rebuild for libraw1394 v2.0.0 diff --git a/sources b/sources index e4b796b..5de2c35 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1356223d2b444b824a80bce33390687d dvgrab-3.1.tar.gz +3c2af59a3b8b76473b557adf4793cebd dvgrab-3.2.tar.gz