Fix build with gcc 4.4, bug #272851 by hirakendu <hirakendu@gmail.com>

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 48 insertions, 7 deletions

diff --git a/media-video/dvgrab/ChangeLog b/media-video/dvgrab/ChangeLog
index cd3f85f87d9c..9044f3754ca8 100644
--- a/media-video/dvgrab/ChangeLog
+++ b/media-video/dvgrab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/dvgrab
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.35 2009/06/29 19:28:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/ChangeLog,v 1.36 2009/06/29 19:32:21 aballier Exp $
+
+  29 Jun 2009; Alexis Ballier <aballier@gentoo.org> dvgrab-3.4.ebuild,
+  +files/dvgrab-3.4-gcc44.patch:
+  Fix build with gcc 4.4, bug #272851 by hirakendu <hirakendu@gmail.com>
 
   29 Jun 2009; Alexis Ballier <aballier@gentoo.org>
   -files/dvgrab-2.1-automagic.patch, -dvgrab-3.0.ebuild:
diff --git a/media-video/dvgrab/Manifest b/media-video/dvgrab/Manifest
index c4a71c4796e2..c7826d0c2ea2 100644
--- a/media-video/dvgrab/Manifest
+++ b/media-video/dvgrab/Manifest
@@ -2,16 +2,17 @@
 Hash: SHA1
 
 AUX dvgrab-3.1-gcc43.patch 3021 RMD160 e61ed150e7a428b1a11bfcccde887e2c8e1cc94e SHA1 cc784df2ba12789bc0d3b129393439bb85438062 SHA256 5d908e953ba0646f051621de1f4799e7b35671f61bba378ef7caa21ca8a5b94a
+AUX dvgrab-3.4-gcc44.patch 746 RMD160 ce826cfcd633a79244cd519715db686a1a3a09e0 SHA1 33260bc4b851b6c2fc7ab120bd1c645ce8b266f2 SHA256 bf913896611cf923748f17ee6c704c4aba43876dab54a5b7479a0342d27a5e0e
 DIST dvgrab-3.1.tar.gz 188640 RMD160 0c2b159b03de017a2c0e5346cfdce2413a344ee7 SHA1 d91f946fe348b3599cc5631c17d4c4154c5dda08 SHA256 d520951c996c64830e67377205e0108aa327e55d6c1745e2f24932f5d67d88f0
 DIST dvgrab-3.4.tar.gz 201080 RMD160 62970759be7cf514df5ae7518916d2ced5bb0e62 SHA1 ffe0e713375ed4bdef1d9f2bc017a50c428c5f1b SHA256 eb076a6b91a051d25a010521cab6130704e6065ecbdabc16d7227820543ab3e6
 EBUILD dvgrab-3.1.ebuild 991 RMD160 ad099cdaf053b32e39f43bc347cc83b737ea5443 SHA1 da8eb5d970d63bff05ec5769329557ae5bb3ba2d SHA256 ea5bd864a63f20083f9957ce293d2c2f0e351e64b5c487b71b162048002bcf14
-EBUILD dvgrab-3.4.ebuild 907 RMD160 aca673919e9587ac4faa2913b87f53679ea387eb SHA1 7428de6a2f9e2635889efdf8ff4c87f4aec043d5 SHA256 17767d3002af4ff687927950fcaf6f8c54e25a1b4cf0dacd1c3173580b36b8da
-MISC ChangeLog 4891 RMD160 380d53459282101695c6975687e6b469a7c8b471 SHA1 33b154cee8be6693b499454f8bdb51136c46008d SHA256 aa20b1597bd532ea81170b9e7d26230b3b2023842bd60b05ada2edde7f5e2c6b
+EBUILD dvgrab-3.4.ebuild 1005 RMD160 21ace985490d4c8d014ed83d84d693b30ff512a9 SHA1 0149c76945a677944d79455dcbe0262b2541c717 SHA256 42ef16cf3538f6d4f1e7096960758c7d3cc304d9c74d6290e3dabfdf23c65d8c
+MISC ChangeLog 5069 RMD160 e27859525b850af166b7d6dfbbe73c2659c05e7a SHA1 068c7a8a48940505292dc97261d224c5a981f870 SHA256 075edb2d205d436c7c0efd56717860ae79913000dce45141acaec51d0e97f64a
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.12 (GNU/Linux)
 
-iEYEARECAAYFAkpJFgMACgkQvFcC4BYPU0rETACeLStLy5kJcoAU91pjBbPHk0Rg
-XnUAn2IPN2+lAohs34kwlCG9lKhTHzoX
-=0NfZ
+iEYEARECAAYFAkpJFs4ACgkQvFcC4BYPU0oJ6ACgwCHUEFIFZ7U00pSKnxGHsmfk
+LpYAoLNmVIhEqdwxDFQrVTwzoPGND7En
+=dwTj
 -----END PGP SIGNATURE-----
diff --git a/media-video/dvgrab/dvgrab-3.4.ebuild b/media-video/dvgrab/dvgrab-3.4.ebuild
index 845d5fcd240a..3277b98b7e83 100644
--- a/media-video/dvgrab/dvgrab-3.4.ebuild
+++ b/media-video/dvgrab/dvgrab-3.4.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-3.4.ebuild,v 1.1 2009/03/08 20:04:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/dvgrab/dvgrab-3.4.ebuild,v 1.2 2009/06/29 19:32:21 aballier Exp $
+
+inherit eutils
 
 DESCRIPTION="Digital Video (DV) grabber for GNU/Linux"
 HOMEPAGE="http://www.kinodv.org/"
@@ -20,6 +22,13 @@ RDEPEND=">=sys-libs/libraw1394-1.1
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-gcc44.patch"
+}
+
 src_compile() {
 	econf $(use_with quicktime libquicktime) $(use_with jpeg libjpeg)
 	emake || die "emake failed."
diff --git a/media-video/dvgrab/files/dvgrab-3.4-gcc44.patch b/media-video/dvgrab/files/dvgrab-3.4-gcc44.patch
new file mode 100644
index 000000000000..308399f3c796
--- /dev/null
+++ b/media-video/dvgrab/files/dvgrab-3.4-gcc44.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=272851
+Fix build with gcc 4.4
+Author: hirakendu <hirakendu@gmail.com>
+Upstream status: unknown
+
+diff -ruN dvgrab-3.4.orig/error.cc dvgrab-3.4.new/error.cc
+--- dvgrab-3.4.orig/error.cc	2007-07-06 12:04:24.000000000 -0700
++++ dvgrab-3.4.new/error.cc	2009-06-05 22:37:27.000000000 -0700
+@@ -23,6 +23,7 @@
+ 
+ // C includes
+ 
++#include <stdio.h>
+ #include <errno.h>
+ #include <string.h>
+ 
+diff -ruN dvgrab-3.4.orig/smiltime.cc dvgrab-3.4.new/smiltime.cc
+--- dvgrab-3.4.orig/smiltime.cc	2008-11-25 19:41:39.000000000 -0800
++++ dvgrab-3.4.new/smiltime.cc	2009-06-05 22:37:34.000000000 -0700
+@@ -28,6 +28,7 @@
+ #include <iomanip>
+ #include <sstream>
+ 
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <math.h>
+