new gcc 3.4 patch that should fix bug #50024

3 files changed, 19 insertions, 54 deletions

diff --git a/media-libs/faad2/ChangeLog b/media-libs/faad2/ChangeLog
index 59752c5eb834..e39ea5dea916 100644
--- a/media-libs/faad2/ChangeLog
+++ b/media-libs/faad2/ChangeLog
@@ -1,6 +1,9 @@
 # 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.28 2004/06/01 22:07:07 lv Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/faad2/ChangeLog,v 1.29 2004/06/13 03:32:43 lv Exp $
+
+  12 Jun 2004; Travis Tilley <lv@gentoo.org> files/faad2-2.0-gcc34.patch:
+  new gcc 3.4 patch that should fix bug #50024
 
   01 Jun 2004; Travis Tilley <lv@gentoo.org> faad2-2.0-r1.ebuild:
   stable on amd64
diff --git a/media-libs/faad2/Manifest b/media-libs/faad2/Manifest
index b80e037eef8b..d9fa9da1b4c7 100644
--- a/media-libs/faad2/Manifest
+++ b/media-libs/faad2/Manifest
@@ -1,15 +1,15 @@
-MD5 9dacb8ea7625e127d600b96f11f5b175 faad2-2.0_rc3-r1.ebuild 1627
-MD5 f234644b5b252d9822c3377607d8193b faad2-2.0-r1.ebuild 1706
-MD5 2867c111d760654d69b55a1aa432a8aa faad2-2.0.ebuild 1611
-MD5 2d98c0846396d7f892fb7def447c83a1 faad2-2.0_rc3.ebuild 1257
-MD5 822f9b30b28f4f41af8be454f6f23922 faad2-1.1.ebuild 1042
-MD5 818352a0c85a084db6670003baf298be ChangeLog 4034
+MD5 fafd6f76401f3b1a58ddc4b89a84daba faad2-2.0_rc3-r1.ebuild 1626
+MD5 bd2fcb180f833970c63de334b06a112c faad2-2.0-r1.ebuild 1705
+MD5 674b7b996c92b052446a47af6854e639 faad2-2.0.ebuild 1610
+MD5 bcf5996ab3877b4784bc0225c880d924 faad2-2.0_rc3.ebuild 1256
+MD5 4fadc59b550271cb2f97819c835f3857 faad2-1.1.ebuild 1041
+MD5 32440a03c9820ad26897343471641592 ChangeLog 4155
 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 c7b0b0563f7c682ecd92ef4c32ceef60 files/faad2-2.0-gcc34.patch 296
 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/files/faad2-2.0-gcc34.patch b/media-libs/faad2/files/faad2-2.0-gcc34.patch
index c56f4dca49f9..fe11002a1116 100644
--- a/media-libs/faad2/files/faad2-2.0-gcc34.patch
+++ b/media-libs/faad2/files/faad2-2.0-gcc34.patch
@@ -1,48 +1,10 @@
---- 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;
- 	}
+--- faad2/common/mp4v2/mp4property.h	2004-04-14 20:53:58.582017392 -0400
++++ faad2/common/mp4v2/mp4property_.h	2004-04-14 20:51:21.955828192 -0400
+@@ -21,6 +21,7 @@
  
--	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);
+ #ifndef __MP4_PROPERTY_INCLUDED__
+ #define __MP4_PROPERTY_INCLUDED__
++#define NULL 0
  
+ // forward declarations
+ class MP4Atom;