Fix build with gcc4 on NetBSD-3.99.21.

3 files changed, 97 insertions, 0 deletions

diff --git a/multimedia/ffmpeg/patches/patch-ah b/multimedia/ffmpeg/patches/patch-ah
new file mode 100644
index 00000000000..d97fe5fc190
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ah
@@ -0,0 +1,18 @@
+$NetBSD: patch-ah,v 1.1 2006/06/26 19:40:06 wiz Exp $
+
+--- libavcodec/avcodec.h.orig	2004-07-09 12:49:55.000000000 +0000
++++ libavcodec/avcodec.h
+@@ -1657,6 +1657,13 @@ typedef struct AVOption {
+ #define FF_OPT_MAX_DEPTH 10
+ } AVOption;
+ 
++#ifdef HAVE_MMX
++extern const struct AVOption avoptions_common[3 + 5];
++#else
++extern const struct AVOption avoptions_common[3];
++#endif
++extern const struct AVOption avoptions_workaround_bug[11];
++
+ /**
+  * Parse option(s) and sets fields in passed structure
+  * @param strct	structure where the parsed results will be written
diff --git a/multimedia/ffmpeg/patches/patch-ai b/multimedia/ffmpeg/patches/patch-ai
new file mode 100644
index 00000000000..421732c4ccd
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-ai
@@ -0,0 +1,19 @@
+$NetBSD: patch-ai,v 1.1 2006/06/26 19:40:06 wiz Exp $
+
+--- libavcodec/common.h.orig	2004-07-01 12:33:07.000000000 +0000
++++ libavcodec/common.h
+@@ -62,14 +62,6 @@
+ #define AVOPTION_SUB(ptr) { .name = NULL, .help = (const char*)ptr }
+ #define AVOPTION_END() AVOPTION_SUB(NULL)
+ 
+-struct AVOption;
+-#ifdef HAVE_MMX
+-extern const struct AVOption avoptions_common[3 + 5];
+-#else
+-extern const struct AVOption avoptions_common[3];
+-#endif
+-extern const struct AVOption avoptions_workaround_bug[11];
+-
+ #endif /* HAVE_AV_CONFIG_H */
+ 
+ /* Suppress restrict if it was not defined in config.h.  */
diff --git a/multimedia/ffmpeg/patches/patch-aj b/multimedia/ffmpeg/patches/patch-aj
new file mode 100644
index 00000000000..965519892e9
--- /dev/null
+++ b/multimedia/ffmpeg/patches/patch-aj
@@ -0,0 +1,60 @@
+$NetBSD: patch-aj,v 1.1 2006/06/26 19:40:06 wiz Exp $
+
+--- libavcodec/ac3tab.h.orig	2004-06-26 10:08:49.000000000 +0000
++++ libavcodec/ac3tab.h
+@@ -4,10 +4,10 @@
+  */
+ 
+ /* possible frequencies */
+-static const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
++const uint16_t ac3_freqs[3] = { 48000, 44100, 32000 };
+ 
+ /* possible bitrates */
+-static const uint16_t ac3_bitratetab[19] = {
++const uint16_t ac3_bitratetab[19] = {
+     32, 40, 48, 56, 64, 80, 96, 112, 128, 
+     160, 192, 224, 256, 320, 384, 448, 512, 576, 640 
+ };
+@@ -15,7 +15,7 @@ static const uint16_t ac3_bitratetab[19]
+ /* AC3 MDCT window */
+ 
+ /* MDCT window */
+-static const int16_t ac3_window[256] = {
++const int16_t ac3_window[256] = {
+     4,    7,   12,   16,   21,   28,   34,   42,
+    51,   61,   72,   84,   97,  111,  127,  145,
+   164,  184,  207,  231,  257,  285,  315,  347,
+@@ -144,27 +144,27 @@ static const uint8_t baptab[64]= {
+     15, 15, 15, 15,
+ };
+ 
+-static const uint8_t sdecaytab[4]={ 
++const uint8_t sdecaytab[4]={ 
+     0x0f, 0x11, 0x13, 0x15,
+ };
+ 
+-static const uint8_t fdecaytab[4]={ 
++const uint8_t fdecaytab[4]={ 
+     0x3f, 0x53, 0x67, 0x7b, 
+ };
+ 
+-static const uint16_t sgaintab[4]= { 
++const uint16_t sgaintab[4]= { 
+     0x540, 0x4d8, 0x478, 0x410,
+ };
+ 
+-static const uint16_t dbkneetab[4]= { 
++const uint16_t dbkneetab[4]= { 
+     0x000, 0x700, 0x900, 0xb00,
+ };
+ 
+-static const uint16_t floortab[8]= { 
++const uint16_t floortab[8]= { 
+     0x2f0, 0x2b0, 0x270, 0x230, 0x1f0, 0x170, 0x0f0, 0xf800,
+ };
+ 
+-static const uint16_t fgaintab[8]= {
++const uint16_t fgaintab[8]= {
+     0x080, 0x100, 0x180, 0x200, 0x280, 0x300, 0x380, 0x400,
+ };
+