Added gcc-3.4 patch

4 files changed, 39 insertions, 9 deletions

diff --git a/media-video/piave/ChangeLog b/media-video/piave/ChangeLog
index 12f4358fbc8c..e01345953a85 100644
--- a/media-video/piave/ChangeLog
+++ b/media-video/piave/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-video/piave
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/piave/ChangeLog,v 1.7 2004/06/25 00:48:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/piave/ChangeLog,v 1.8 2004/10/18 15:11:29 zypher Exp $
+
+  18 Oct 2004; Marc Hildebrand <zypher@gentoo.org> piave-0.2.4-r1.ebuild:
+  Added gcc-3.4 patch. Thanks to Mathijs Mohlmann for the patch.
 
   27 Apr 2004; Aron Griffis <agriffis@gentoo.org> piave-0.2.4-r1.ebuild:
   Add inherit eutils
diff --git a/media-video/piave/Manifest b/media-video/piave/Manifest
index 581c7a5dc77d..da4032e0ad3c 100644
--- a/media-video/piave/Manifest
+++ b/media-video/piave/Manifest
@@ -1,7 +1,8 @@
-MD5 8c4d7b9d8480671367944430b153ab32 piave-0.2.4.ebuild 1092
-MD5 cd31720b006f217fc17803562a455d45 ChangeLog 775
+MD5 65c49d2bcf26d0d1b9d0b670e923a381 ChangeLog 915
 MD5 b930e21bf22fd73f984ae65f871fdc2d metadata.xml 253
-MD5 25e4a8caa341a6623aae01f0d304b86b piave-0.2.4-r1.ebuild 1085
+MD5 8c4d7b9d8480671367944430b153ab32 piave-0.2.4.ebuild 1092
+MD5 e8842eadfbcb611d22a39305a59f873d piave-0.2.4-r1.ebuild 1178
 MD5 b3f256c82b671e109307527c6d78a51a files/piave-0.2.4-include-arts.diff 1216
-MD5 e82020c9dafa6d2c570921b0fafbd5ff files/digest-piave-0.2.4 63
 MD5 e82020c9dafa6d2c570921b0fafbd5ff files/digest-piave-0.2.4-r1 63
+MD5 b39211483360995059bfb6eb8e23fd30 files/piave-0.2.4-gcc34.patch 671
+MD5 e82020c9dafa6d2c570921b0fafbd5ff files/digest-piave-0.2.4 63
diff --git a/media-video/piave/files/piave-0.2.4-gcc34.patch b/media-video/piave/files/piave-0.2.4-gcc34.patch
new file mode 100644
index 000000000000..f4f0e542a204
--- /dev/null
+++ b/media-video/piave/files/piave-0.2.4-gcc34.patch
@@ -0,0 +1,23 @@
+--- piave-0.2.4/plugins/iostream/vorbisfile/vorbisfile.cc      2003-09-15 12:52:25.000000000 +0200
++++ piave-0.2.4.sav/plugins/iostream/vorbisfile/vorbisfile.cc       2004-10-13 13:52:03.402240909 +0200
+@@ -44,6 +44,7 @@
+ using std::endl;
+ #include <string>
+ using std::string;
++#include <math.h>
+
+ // this header
+ #include "vorbisfile.hh"
+--- piave-0.2.4/plugins/iostream/sndfile/sndfile.cc      2003-09-15 12:52:25.000000000 +0200
++++ piave-0.2.4.sav/plugins/iostream/sndfile/sndfile.cc       2004-10-13 13:52:03.402240909 +0200
+@@ -44,6 +44,7 @@
+ using std::endl;
+ #include <string>
+ using std::string;
++#include <math.h>
+
+ // this header
+ #include "vorbisfile.hh"
+
+
+
diff --git a/media-video/piave/piave-0.2.4-r1.ebuild b/media-video/piave/piave-0.2.4-r1.ebuild
index 78add39282a5..cd43aa335d7a 100644
--- a/media-video/piave/piave-0.2.4-r1.ebuild
+++ b/media-video/piave/piave-0.2.4-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/piave/piave-0.2.4-r1.ebuild,v 1.3 2004/06/25 00:48:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/piave/piave-0.2.4-r1.ebuild,v 1.4 2004/10/18 15:11:29 zypher Exp $
 
-inherit eutils
+inherit eutils gcc
 
 DESCRIPTION="PIAVE - Piave Is A Video Editor"
 HOMEPAGE="http://modesto.sourceforge.net/piave/index.html"
@@ -30,8 +30,11 @@ DEPEND="virtual/x11
 src_compile() {
 	cd ${S}
 	epatch ${FILESDIR}/piave-0.2.4-include-arts.diff
-	`use_enable nls` \
-	myconf=${myconf}" --with-gnu-ld"
+	if [ "`gcc-minor-version`" -eq "4" ]
+	then
+	epatch ${FILESDIR}/piave-0.2.4-gcc34.patch
+	fi
+	myconf=${myconf}" --with-gnu-ld	`use_enable nls`"
 	econf ${myconf} || die "configure failed"
 	emake || die
 }