diff --git a/dvgrab-3.1-gcc43-fix.patch b/dvgrab-3.1-gcc43-fix.patch new file mode 100644 index 0000000..1513942 --- /dev/null +++ b/dvgrab-3.1-gcc43-fix.patch @@ -0,0 +1,103 @@ +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 ace9f71..2bdcfd4 100644 --- a/dvgrab.spec +++ b/dvgrab.spec @@ -1,11 +1,12 @@ Summary: Utility to capture video from a DV camera Name: dvgrab Version: 3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Multimedia URL: http://www.kinodv.org/ Source: http://dl.sf.net/kino/dvgrab-%{version}.tar.gz +Patch: dvgrab-3.1-gcc43-fix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libraw1394-devel libavc1394-devel libdv-devel BuildRequires: libiec61883-devel libjpeg-devel @@ -17,6 +18,7 @@ The dvgrab utility will capture digital video from a DV source on the firewire %prep %setup -q +%patch -p1 %build %configure @@ -36,6 +38,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/dvgrab.1* %changelog +* Wed Feb 13 2008 Jarod Wilson - 3.1-2 +- Fix build with gcc 4.3 + * Wed Dec 12 2007 Jarod Wilson - 3.1-1 - New upstream release - Drop libpng, libogg and libvorbis BRs, since dvgrab has