add simple patches for gcc-4 support

approved by cube@

4 files changed, 68 insertions, 1 deletions

diff --git a/audio/faad2/distinfo b/audio/faad2/distinfo
index a8a23b57d9b..af4cb6e7cf5 100644
--- a/audio/faad2/distinfo
+++ b/audio/faad2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2005/02/23 20:39:44 agc Exp $
+$NetBSD: distinfo,v 1.7 2005/08/05 13:01:57 tonio Exp $
 
 SHA1 (faad2-2.0.tar.gz) = fc9f8d0812a9f46bbd851880045131e0e4ab08b8
 RMD160 (faad2-2.0.tar.gz) = e1e4d7c96cbc3db2b9e67385062ccf5decb61f90
@@ -9,3 +9,6 @@ SHA1 (patch-ac) = 9c610dbaa89df5a82587f685116aac5e760fe32c
 SHA1 (patch-ad) = 4d57360bfd5e9c7f75d06ae274723f7aa1e11186
 SHA1 (patch-ae) = 04b09d0ace9381152b1ebc12951c530c5c3c46fc
 SHA1 (patch-af) = c6da419d2ac6b120b2e70c72f240c6f6b83ca39a
+SHA1 (patch-ag) = a2527f6ddfcf65ba6077bc6145c87bb354c740db
+SHA1 (patch-ah) = d062e23144932994c4193189efc6dfc47520f139
+SHA1 (patch-ai) = 0f09c422d764467fdb5d4bce846bc80e653d4aac
diff --git a/audio/faad2/patches/patch-ag b/audio/faad2/patches/patch-ag
new file mode 100644
index 00000000000..73b47474b3b
--- /dev/null
+++ b/audio/faad2/patches/patch-ag
@@ -0,0 +1,36 @@
+$NetBSD: patch-ag,v 1.1 2005/08/05 13:01:57 tonio Exp $
+
+--- common/mp4v2/mp4property.h.orig	2005-08-05 12:14:37.000000000 +0200
++++ common/mp4v2/mp4property.h	2005-08-05 12:16:34.000000000 +0200
+@@ -58,7 +58,7 @@
+ 		return m_name;
+ 	}
+ 
+-	virtual MP4PropertyType GetType() = NULL; 
++	virtual MP4PropertyType GetType() = 0; 
+ 
+ 	bool IsReadOnly() {
+ 		return m_readOnly;
+@@ -74,17 +74,17 @@
+ 		m_implicit = value;
+ 	}
+ 
+-	virtual u_int32_t GetCount() = NULL;
+-	virtual void SetCount(u_int32_t count) = NULL;
++	virtual u_int32_t GetCount() = 0;
++	virtual void SetCount(u_int32_t count) = 0;
+ 
+ 	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) = 0;
+ 
+-	virtual void Write(MP4File* pFile, u_int32_t index = 0) = NULL;
++	virtual void Write(MP4File* pFile, u_int32_t index = 0) = 0;
+ 
+ 	virtual void Dump(FILE* pFile, u_int8_t indent,
+-		bool dumpImplicits, u_int32_t index = 0) = NULL;
++		bool dumpImplicits, u_int32_t index = 0) = 0;
+ 
+ 	virtual bool FindProperty(const char* name,
+ 		MP4Property** ppProperty, u_int32_t* pIndex = NULL);
diff --git a/audio/faad2/patches/patch-ah b/audio/faad2/patches/patch-ah
new file mode 100644
index 00000000000..9631874b7d5
--- /dev/null
+++ b/audio/faad2/patches/patch-ah
@@ -0,0 +1,15 @@
+$NetBSD: patch-ah,v 1.1 2005/08/05 13:01:57 tonio Exp $
+
+--- common/mp4v2/rtphint.h.orig	2005-08-05 12:17:32.000000000 +0200
++++ common/mp4v2/rtphint.h	2005-08-05 12:17:55.000000000 +0200
+@@ -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() = 0;
++	virtual void GetData(u_int8_t* pDest) = 0;
+ 
+ 	MP4Track* FindTrackFromRefIndex(u_int8_t refIndex);
+ 
diff --git a/audio/faad2/patches/patch-ai b/audio/faad2/patches/patch-ai
new file mode 100644
index 00000000000..dff0dd16f57
--- /dev/null
+++ b/audio/faad2/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2005/08/05 13:01:57 tonio Exp $
+
+--- common/mp4ff/mp4ffint.h.orig	2005-08-05 13:09:25.000000000 +0200
++++ common/mp4ff/mp4ffint.h	2005-08-05 13:09:52.000000000 +0200
+@@ -301,7 +301,7 @@
+ mp4ff_t *mp4ff_open_edit(mp4ff_callback_t *f);
+ #endif
+ void mp4ff_close(mp4ff_t *ff);
+-void mp4ff_track_add(mp4ff_t *f);
++static void mp4ff_track_add(mp4ff_t *f);
+ int32_t parse_sub_atoms(mp4ff_t *f, const uint64_t total_size);
+ int32_t parse_atoms(mp4ff_t *f);
+