gcc 3.4 fix

4 files changed, 59 insertions, 4 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 72707b7f9f3e..214bf0491031 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/faad2
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.25 2004/04/26 02:41:35 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.26 2004/04/28 04:43:52 lv Exp $
+
+  28 Apr 2004; Travis Tilley <lv@gentoo.org> +files/faad2-2.0-gcc34.patch,
+  faad2-2.0-r1.ebuild:
+  added fix for compiling with gcc 3.4
 
   25 Apr 2004; Aron Griffis <agriffis@gentoo.org> faad2-1.1.ebuild:
   Add die following econf for bug 48950
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index fafe9098972c..c1f462587785 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,14 +1,15 @@
 MD5 9dacb8ea7625e127d600b96f11f5b175 faad2-2.0_rc3-r1.ebuild 1627
-MD5 94a6a6395995b3eb8410c9f0c0c8ed83 faad2-2.0-r1.ebuild 1677
+MD5 2bdc92630d67bb09d1474f4b071c403b faad2-2.0-r1.ebuild 1707
 MD5 2867c111d760654d69b55a1aa432a8aa faad2-2.0.ebuild 1611
 MD5 08b4c5ec4b5bd331adf26f265dd15f8f faad2-2.0_rc3.ebuild 1258
 MD5 822f9b30b28f4f41af8be454f6f23922 faad2-1.1.ebuild 1042
-MD5 26743538caec91c229bf21a34acfeefb ChangeLog 3728
+MD5 0c41637e5989dacd20173be85192b0fa ChangeLog 3860
 MD5 8b5320d3c7b57d34bbd12f34eaaabc08 metadata.xml 304
 MD5 6264dccf9a4c49712b65b406825c5113 files/mp4atom-sliver.patch 659
 MD5 9d78b52a4f4b2514b35b4f5319f376cb files/digest-faad2-2.0_rc3 65
 MD5 10465da781f67413a312a590160497b8 files/digest-faad2-1.1 62
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0 61
+MD5 0804aafcd0f802e6040f71c3ac45c05b files/faad2-2.0-gcc34.patch 1677
 MD5 042669e1c5f4755340520e417eafad15 files/faad2-2.0-configure-mpeg4ip.patch 416
 MD5 1ceab8b26925d147b1e0a359ce23d56e files/faad2-2.0-noext.patch 856
 MD5 362594a8b2abbbae6e05c2ea1ab32c3f files/digest-faad2-2.0-r1 61
diff --git a/media-libs/faad2/faad2-2.0-r1.ebuild b/media-libs/faad2/faad2-2.0-r1.ebuild
index 9c913290faa9..0f00c682b59e 100644
--- a/media-libs/faad2/faad2-2.0-r1.ebuild
+++ b/media-libs/faad2/faad2-2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r1.ebuild,v 1.1 2004/03/26 05:19:18 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/faad2-2.0-r1.ebuild,v 1.2 2004/04/28 04:43:52 lv Exp $
 
 inherit eutils libtool flag-o-matic
 
@@ -32,6 +32,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${P}-makefile-space.patch
 	epatch ${FILESDIR}/${P}-configure-mpeg4ip.patch
 
+	epatch ${FILESDIR}/${P}-gcc34.patch
+
 	cd ${S}/common/mp4v2
 	epatch ${FILESDIR}/mp4atom-sliver.patch
 
diff --git a/media-libs/faad2/files/faad2-2.0-gcc34.patch b/media-libs/faad2/files/faad2-2.0-gcc34.patch
new file mode 100644
index 000000000000..c56f4dca49f9
--- /dev/null
+++ b/media-libs/faad2/files/faad2-2.0-gcc34.patch
@@ -0,0 +1,48 @@
+--- common/mp4v2/mp4property.h.old	2003-06-29 22:41:00.000000000 +0100
++++ common/mp4v2/mp4property.h	2004-04-23 18:33:37.751587448 +0100
+@@ -58,7 +58,7 @@
+ 		return m_name;
+ 	}
+ 
+-	virtual MP4PropertyType GetType() = NULL; 
++	virtual MP4PropertyType GetType(const char *name = NULL);
+ 
+ 	bool IsReadOnly() {
+ 		return m_readOnly;
+@@ -74,17 +74,18 @@
+ 		m_implicit = value;
+ 	}
+ 
+-	virtual u_int32_t GetCount() = NULL;
+-	virtual void SetCount(u_int32_t count) = NULL;
++	virtual u_int32_t GetCount(const char *name = NULL);
++
++	virtual void SetCount(u_int32_t count, const char *name = NULL);
+ 
+ 	virtual void Generate() { /* default is a no-op */ };
+ 
+-	virtual void Read(MP4File* pFile, u_int32_t index = 0) = NULL;
++	virtual void Read(MP4File* pFile, u_int32_t index = 0, const char *name = NULL);
+ 
+-	virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL;
++	virtual void Write(MP4File* pFile, u_int32_t index = 0, const char *name = NULL);
+ 
+ 	virtual void Dump(FILE* pFile, u_int8_t indent,
+-		bool dumpImplicits, u_int32_t index = 0) = NULL;
++		bool dumpImplicits, u_int32_t index = 0, const char *name = NULL);
+ 
+ 	virtual bool FindProperty(const char* name,
+ 		MP4Property** ppProperty, u_int32_t* pIndex = NULL);
+--- common/mp4v2/rtphint.h.old	2003-06-29 22:41:00.000000000 +0100
++++ common/mp4v2/rtphint.h	2004-04-23 18:33:37.751587448 +0100
+@@ -35,8 +35,8 @@
+ 		return m_pPacket;
+ 	}
+ 
+-	virtual u_int16_t GetDataSize() = NULL;
+-	virtual void GetData(u_int8_t* pDest) = NULL;
++	virtual u_int16_t GetDataSize(const char *name = NULL);
++	virtual void GetData(u_int8_t* pDest, const char *name = NULL);
+ 
+ 	MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
+