Fix building with GCC 4.3 wrt #220749, thanks to Peter Alfredsen.

(Portage version: 2.1.5_rc6)

3 files changed, 128 insertions, 11 deletions

diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog
index d755e8becbb1..84cf814ab6d1 100644
--- a/media-video/dvgrab/ChangeLog
+++ b/media-video/dvgrab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvgrab
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.29 2008/03/10 13:51:09 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.30 2008/05/07 20:32:23 drac Exp $
+
+  07 May 2008; Samuli Suominen <drac@gentoo.org>
+  +files/dvgrab-3.1-gcc43.patch, dvgrab-3.1.ebuild:
+  Fix building with GCC 4.3 wrt #220749, thanks to Peter Alfredsen.
 
   10 Mar 2008; Steve Dibb <beandog@gentoo.org> dvgrab-3.0.ebuild:
   amd64 stable, bug 203045
diff --git a/media-video/dvgrab/dvgrab-3.1.ebuild b/media-video/dvgrab/dvgrab-3.1.ebuild
index e18da2362ba4..e847e8dd9ca0 100644
--- a/media-video/dvgrab/dvgrab-3.1.ebuild
+++ b/media-video/dvgrab/dvgrab-3.1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-3.1.ebuild,v 1.1 2008/01/09 16:32:17 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-3.1.ebuild,v 1.2 2008/05/07 20:32:23 drac Exp $
+
+inherit eutils
 
 DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -11,23 +13,27 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
 IUSE="jpeg quicktime"
 
-DEPEND=">=sys-libs/libraw1394-1.1.0
+RDEPEND=">=sys-libs/libraw1394-1.1
 	>=media-libs/libdv-0.103
-	>=media-libs/libiec61883-1.0.0
+	>=media-libs/libiec61883-1
 	sys-libs/libavc1394
 	jpeg? ( media-libs/jpeg )
 	quicktime? ( media-libs/libquicktime )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
 
-RDEPEND="${DEPEND}"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gcc43.patch
+}
 
 src_compile() {
-	econf $(use_with quicktime libquicktime) \
-		$(use_with jpeg libjpeg) \
-		|| die "econf failed"
-	emake || die "emake failed"
+	econf $(use_with quicktime libquicktime) $(use_with jpeg libjpeg)
+	emake || die "emake failed."
 }
 
 src_install () {
-	emake DESTDIR="${D}" install || die "make install failed"
-	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog NEWS README TODO
 }
diff --git a/media-video/dvgrab/files/dvgrab-3.1-gcc43.patch b/media-video/dvgrab/files/dvgrab-3.1-gcc43.patch
new file mode 100644
index 000000000000..560e1793d873
--- /dev/null
+++ b/media-video/dvgrab/files/dvgrab-3.1-gcc43.patch
@@ -0,0 +1,107 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10_cstring_include.dpatch by  <eriks@debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Add include that is needed with g++-4.3
+
+@DPATCH@
+diff -urNad dvgrab-3.1~/avi.cc dvgrab-3.1/avi.cc
+--- dvgrab-3.1~/avi.cc	2007-07-06 21:00:36.000000000 +0200
++++ dvgrab-3.1/avi.cc	2008-01-30 22:20:55.130770072 +0100
+@@ -24,6 +24,7 @@
+ // C++ includes
+ 
+ #include <string>
++#include <cstring>
+ #include <iostream>
+ #include <iomanip>
+ 
+diff -urNad dvgrab-3.1~/dvframe.cc dvgrab-3.1/dvframe.cc
+--- dvgrab-3.1~/dvframe.cc	2007-07-06 21:00:36.000000000 +0200
++++ dvgrab-3.1/dvframe.cc	2008-01-30 22:20:55.130770072 +0100
+@@ -26,6 +26,7 @@
+ */
+ 
+ #include "dvframe.h"
++#include <cstring>
+ 
+ VideoInfo::VideoInfo() : width( 0 ), height( 0 ), isPAL( false )
+ {}
+diff -urNad dvgrab-3.1~/dvgrab.cc dvgrab-3.1/dvgrab.cc
+--- dvgrab-3.1~/dvgrab.cc	2007-12-10 07:57:15.000000000 +0100
++++ dvgrab-3.1/dvgrab.cc	2008-01-30 22:20:55.130770072 +0100
+@@ -26,6 +26,7 @@
+ #include <iostream>
+ #include <sstream>
+ #include <iomanip>
++#include <cstring>
+ using std::cerr;
+ using std::endl;
+ 
+diff -urNad dvgrab-3.1~/filehandler.cc dvgrab-3.1/filehandler.cc
+--- dvgrab-3.1~/filehandler.cc	2007-12-10 07:57:15.000000000 +0100
++++ dvgrab-3.1/filehandler.cc	2008-01-30 22:20:55.134770037 +0100
+@@ -24,6 +24,7 @@
+ #endif
+ 
+ #include <string>
++#include <cstring>
+ #include <iostream>
+ #include <sstream>
+ #include <iomanip>
+diff -urNad dvgrab-3.1~/hdvframe.cc dvgrab-3.1/hdvframe.cc
+--- dvgrab-3.1~/hdvframe.cc	2007-12-10 07:16:10.000000000 +0100
++++ dvgrab-3.1/hdvframe.cc	2008-01-30 22:20:55.134770037 +0100
+@@ -19,6 +19,7 @@
+ */
+ 
+ #include "hdvframe.h"
++#include <cstring>
+ 
+ HDVFrame::HDVFrame( HDVStreamParams *p )
+ {
+diff -urNad dvgrab-3.1~/iec13818-1.cc dvgrab-3.1/iec13818-1.cc
+--- dvgrab-3.1~/iec13818-1.cc	2007-12-10 07:16:10.000000000 +0100
++++ dvgrab-3.1/iec13818-1.cc	2008-01-30 22:20:55.134770037 +0100
+@@ -18,6 +18,7 @@
+ */
+ 
+ #include <string>
++#include <cstring>
+ using std::string;
+ 
+ #include "hdvframe.h"
+diff -urNad dvgrab-3.1~/ieee1394io.cc dvgrab-3.1/ieee1394io.cc
+--- dvgrab-3.1~/ieee1394io.cc	2007-12-10 07:16:10.000000000 +0100
++++ dvgrab-3.1/ieee1394io.cc	2008-01-30 22:20:55.134770037 +0100
+@@ -49,6 +49,8 @@
+ 
+ #include <deque>
+ #include <iostream>
++#include <cstring>
++#include <typeinfo>
+ 
+ using std::endl;
+ 
+diff -urNad dvgrab-3.1~/main.cc dvgrab-3.1/main.cc
+--- dvgrab-3.1~/main.cc	2007-07-06 21:08:17.000000000 +0200
++++ dvgrab-3.1/main.cc	2008-01-30 22:20:55.134770037 +0100
+@@ -30,6 +30,7 @@
+ // C++ includes
+ 
+ #include <string>
++#include <cstring>
+ #include <iostream>
+ using std::cout;
+ using std::endl;
+diff -urNad dvgrab-3.1~/v4l2reader.cc dvgrab-3.1/v4l2reader.cc
+--- dvgrab-3.1~/v4l2reader.cc	2007-11-22 05:22:08.000000000 +0100
++++ dvgrab-3.1/v4l2reader.cc	2008-01-30 22:20:55.134770037 +0100
+@@ -23,6 +23,7 @@
+ #ifdef HAVE_LINUX_VIDEODEV2_H
+ 
+ #include <string>
++#include <cstring>
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>