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

Package-Manager: portage-2.1.5_rc6

4 files changed, 131 insertions, 13 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/Manifest b/media-video/dvgrab/Manifest
index c391179fd0e7..cb0116182a61 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -1,5 +1,6 @@
 AUX dvgrab-1.8-configure.patch 2624 RMD160 848a9e7091a804fea8469e5aab9fb4e9b73581a6 SHA1 473e4542ac365f40e1eb5d16f38face70ccd1240 SHA256 1ce0ef77765e18294b85b4f024f85e0a8eadce643c36b414ec06f72a4cff745f
 AUX dvgrab-2.1-automagic.patch 1124 RMD160 a33ea37d923428620a774c97e5e180b28350a151 SHA1 68361486c48800ebe3d1c2bf7e722ac96bef8347 SHA256 b7226b6aeab77a888e7c7b5e04a92641d99bab4b52e11d98a12c9649f78835ef
+AUX dvgrab-3.1-gcc43.patch 3021 RMD160 e61ed150e7a428b1a11bfcccde887e2c8e1cc94e SHA1 cc784df2ba12789bc0d3b129393439bb85438062 SHA256 5d908e953ba0646f051621de1f4799e7b35671f61bba378ef7caa21ca8a5b94a
 AUX dvgrab-libquicktime-compat.patch 661 RMD160 5140ed6816e0ca172cf093b9e3f945b427c44b47 SHA1 2dee03a02cdde9ea52fd2a32187962cf92471ef3 SHA256 906aa54cd5e1eefa134a7c9032eba536e1215b646457de82e5fef099084ad4c8
 DIST dvgrab-1.8.tar.gz 163695 RMD160 7db4fbd5341458d43f6d762a0c985a9beab923b8 SHA1 c73292c8f19a581883f1c0a536e06f646feb421f SHA256 b0a6d519307bacc95fb6a73f9ac359aa4c0b1fafd84a9c5fec57562b431aee4d
 DIST dvgrab-2.1.tar.gz 165807 RMD160 5c058a06083b2f0afc2dd36c75f28c6c8ce046ed SHA1 d7ad5c0aa91429754783a3cb3782adf08f27c4a8 SHA256 4ddf1fbc04b5f148af5dd1aebaaebee51e628bd3360547bf5c26702134bfdb1a
@@ -8,6 +9,6 @@ DIST dvgrab-3.1.tar.gz 188640 RMD160 0c2b159b03de017a2c0e5346cfdce2413a344ee7 SH
 EBUILD dvgrab-1.8.ebuild 1038 RMD160 a044a1577291b85e8753754734d01112eeea5698 SHA1 8fabd6105cd5f72a29c1d43ebcf7d325cc1b6577 SHA256 8f1b1647d5eda771ec3a3e77922f6aeb335b070580cc11010e6318b6eed9f564
 EBUILD dvgrab-2.1.ebuild 1092 RMD160 0751df6d0edef5b54db34ed773d66abc040dfec4 SHA1 1788042b3a76793f6e838a1c585b69c849f3eb82 SHA256 7baf5d9d4bf4374000499ca09c75075bc538ffe1b39504b73af2ebbbc21c6fe5
 EBUILD dvgrab-3.0.ebuild 1106 RMD160 eea1604056b1c8a4d3b7b924f0e1c41848b52f9b SHA1 66bb958cb6d3dcefcbf98844f0652a5edc90c779 SHA256 38aebeaf976da12ceae6513261e96a7e7b07e1ee381e88b7f1be1e3b742f3933
-EBUILD dvgrab-3.1.ebuild 934 RMD160 46d1ec27b8c1cf8f4fe1101f5fb926b908cc32ae SHA1 0734b584ba5051e8b65581c86cfebd9f2890c3d5 SHA256 660a27fccbb87857971e665970bfa492a58a1cd2e1800e9f801e4f5a0392b7c3
-MISC ChangeLog 4101 RMD160 38894fc2915573048b8d554a65de69ee4e227c84 SHA1 798065e3160a973d1d49884f8f4d9534da3ee7d4 SHA256 919f34e62e009e9900bcafbda6b56328d2ea65813e34af418bd7be12275612e6
+EBUILD dvgrab-3.1.ebuild 992 RMD160 62b18d4c6cf5e2b16373e4c87cee16d2675cfca2 SHA1 f41f39cd3b858c4f560c4fe3edbe7c2da1d80810 SHA256 98c659ef6a1bea1f24b859c274aa341bc84a95008a4ca3e671f20a624d42d765
+MISC ChangeLog 4268 RMD160 4592ddd83b7f0c45d265c179611ad888ba6f4c10 SHA1 d12d216fa73fb955b052b5b5515e6bfd8e77497f SHA256 4f5fe28fefcb128349614aaa6777f10c9159cfba6f59a0d9fa8ceec9550ef3bf
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
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>