rpms/dvgrab/devel dvgrab-3.1-gcc43-fix.patch, NONE, 1.1 dvgrab.spec, 1.22, 1.23

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/dvgrab/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3279

Modified Files:
	dvgrab.spec 
Added Files:
	dvgrab-3.1-gcc43-fix.patch 
Log Message:
Fix build with gcc 4.3

dvgrab-3.1-gcc43-fix.patch:

--- NEW FILE dvgrab-3.1-gcc43-fix.patch ---
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 <config.h>
 #endif
+#include <string.h>
 
 // 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 <string.h>
 #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 <string.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <unistd.h>
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 <string.h>
 #include <stdio.h>
 #include <signal.h>
 #include <unistd.h>
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 <string.h>
 #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 <string>
 using std::string;
 
+#include <string.h>
 #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 <deque>
 #include <iostream>
+#include <typeinfo>
 
 using std::endl;
 
+#include <string.h>
 #include <assert.h>
 #include <unistd.h>
 #include <fcntl.h>
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 <string.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <stdlib.h>
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 <string>
 
+#include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>


Index: dvgrab.spec
===================================================================
RCS file: /cvs/pkgs/rpms/dvgrab/devel/dvgrab.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- dvgrab.spec	12 Dec 2007 15:55:00 -0000	1.22
+++ dvgrab.spec	13 Feb 2008 19:09:52 -0000	1.23
@@ -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 @@
 
 %prep
 %setup -q
+%patch -p1
 
 %build
 %configure
@@ -36,6 +38,9 @@
 %{_mandir}/man1/dvgrab.1*
 
 %changelog
+* Wed Feb 13 2008 Jarod Wilson <jwilson at redhat.com> - 3.1-2
+- Fix build with gcc 4.3
+
 * Wed Dec 12 2007 Jarod Wilson <jwilson at redhat.com> - 3.1-1
 - New upstream release
 - Drop libpng, libogg and libvorbis BRs, since dvgrab has