Fix build with gcc4 on NetBSD-3.99.21.

4 files changed, 92 insertions, 7 deletions

diff --git a/multimedia/xine-lib/distinfo b/multimedia/xine-lib/distinfo
index ef4fa9ff1fe..8bc7c9a1e63 100644
--- a/multimedia/xine-lib/distinfo
+++ b/multimedia/xine-lib/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2006/06/21 18:31:14 drochner Exp $
+$NetBSD: distinfo,v 1.31 2006/06/26 17:13:36 wiz Exp $
 
 SHA1 (xine-lib-1.0.3a.tar.gz) = 2efe9bc3d85659731e8c679d2c60901a6101f17b
 RMD160 (xine-lib-1.0.3a.tar.gz) = 335abfaa46c4592a22246f75c3a455cd87b7cdc4
@@ -7,29 +7,32 @@ SHA1 (patch-aa) = 8218d6415878fb99ebf533eb9d60c9ffebbed274
 SHA1 (patch-ab) = c83f1826eabbc53e868ea4a532efda7f7ac8a4b7
 SHA1 (patch-ac) = 7959d6d3599c9debe79b1b4a5749b6af714588a0
 SHA1 (patch-ad) = 94aaac03f74c72a1ca753d1320aac07d1bb8a846
-SHA1 (patch-ae) = cf7486ed50a782fcfb17ad0985e76a7ae09a2938
+SHA1 (patch-ae) = 401dccaa31f391746f35a574d4abc71154d001ae
 SHA1 (patch-af) = f190e1595e1644b844bdc3d9e19975c03e73bb55
 SHA1 (patch-ag) = 5ad6e5e40d1fb8eeb3bf06e406ab4c67e69df3b1
-SHA1 (patch-ah) = 3f9b23c4a7994259056b73209a9e194db759f06d
+SHA1 (patch-ah) = a6e62210766a9f9f518413940eac5e857e1aabc4
 SHA1 (patch-ai) = f51423976056637f92366d9ccee6b97837ffc934
 SHA1 (patch-aj) = 4215c3bc37cf636e563a509f9a391081ed8e773b
 SHA1 (patch-ak) = 34b41bf29efeb1d0fa29b22d419d7665e33d2cb2
-SHA1 (patch-al) = f78b16bb84b3748c01c50d258c24fccfb19910b4
+SHA1 (patch-al) = 9e3ad86a7d7f32e58de157fa37141138af10838e
 SHA1 (patch-am) = 10f6433a8549bdce60ace5dcbd51df85eaa7ea16
 SHA1 (patch-an) = feb2cefb7bd9b7c82d9579ed223213f4a9a75c47
 SHA1 (patch-ao) = c5bbffceb34516951d2f19558bb6e082376ab195
 SHA1 (patch-ap) = aaf63024c1049c1f2175d9974367a6b84ac3028f
 SHA1 (patch-aq) = 6f486b79dcb14155f613df44b10ef8223b44167e
 SHA1 (patch-ar) = c0053ebca44544c42e39aab775e8441b6e9faa30
-SHA1 (patch-as) = ad09d98ba79cdaa0367589658d7fa05a78d075ba
+SHA1 (patch-as) = a0a93a256589e87a66eef31494441aa1b200f834
 SHA1 (patch-at) = 77bfc49591b50f3591b12c5f37a2a55d8ff8df66
-SHA1 (patch-av) = 56f462e6091a72e87544ece689557d60fbb749aa
+SHA1 (patch-au) = d125fe1852d57caf5e93ed66b5b65061ae03c9e5
+SHA1 (patch-av) = 635ec9b332cacc02882822d8f78871f1d9377d27
 SHA1 (patch-aw) = 78ab44197a6b9f85e4b272d522ce254de4d557dc
+SHA1 (patch-ax) = 18101c0a19f510455496fc75a10eebf3b28acde9
+SHA1 (patch-ay) = 9e2a551de0cf00b4801809b9893734e0d63878ce
 SHA1 (patch-ba) = c4a5fbe9d88d21a90fe01359ace7831f2a865c86
 SHA1 (patch-bb) = 40978e50dcb060a2b8314b310a68684e62e90bc2
 SHA1 (patch-bd) = 5352293022da25b08598d42655af2524ff99b28a
 SHA1 (patch-be) = 78dc9f32b5861fbe6195c26d56aefea6684610e9
-SHA1 (patch-bg) = c905cbac881a8f623bb0f465194673dcdaf373c0
+SHA1 (patch-bg) = aa1a8960d597113825993be59db45644a620e99d
 SHA1 (patch-bh) = ad36e3953ef1b91751ec6668af3135b449dade72
 SHA1 (patch-bi) = 7433089dc41b6f1633b23edb56881d27d68e6ff8
 SHA1 (patch-cb) = 654779bd2f41f3fae1ff074f260b3a5f5e8ecda2
diff --git a/multimedia/xine-lib/patches/patch-au b/multimedia/xine-lib/patches/patch-au
new file mode 100644
index 00000000000..5b2dbda54fa
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-au
@@ -0,0 +1,45 @@
+$NetBSD: patch-au,v 1.4 2006/06/26 17:13:36 wiz Exp $
+
+gcc4 fix from ffmpeg subversion repository revision 3945
+
+--- src/libffmpeg/libavcodec/i386/dsputil_mmx.c.orig	2006-06-26 11:55:29.000000000 +0000
++++ src/libffmpeg/libavcodec/i386/dsputil_mmx.c
+@@ -651,26 +651,22 @@ static void h263_h_loop_filter_mmx(uint8
+         "punpcklwd %%mm0, %%mm1		\n\t"
+         "punpckhwd %%mm4, %%mm3		\n\t"
+         "punpckhwd %%mm0, %%mm6		\n\t"
+-        "movd %%mm5, %0			\n\t"
++        "movd %%mm5, (%0)		\n\t"
+         "punpckhdq %%mm5, %%mm5		\n\t"
+-        "movd %%mm5, %1			\n\t"
+-        "movd %%mm3, %2			\n\t"
++        "movd %%mm5, (%0,%2)		\n\t"
++        "movd %%mm3, (%0,%2,2)		\n\t"
+         "punpckhdq %%mm3, %%mm3		\n\t"
+-        "movd %%mm3, %3			\n\t"
+-        "movd %%mm1, %4			\n\t"
++        "movd %%mm3, (%0,%3)		\n\t"
++        "movd %%mm1, (%1)		\n\t"
+         "punpckhdq %%mm1, %%mm1		\n\t"
+-        "movd %%mm1, %5			\n\t"
+-        "movd %%mm6, %6			\n\t"
++        "movd %%mm1, (%1,%2)		\n\t"
++        "movd %%mm6, (%1,%2,2)		\n\t"
+         "punpckhdq %%mm6, %%mm6		\n\t"
+-        "movd %%mm6, %7			\n\t"
+-        : "=m" (*(uint32_t*)(src + 0*stride)),
+-          "=m" (*(uint32_t*)(src + 1*stride)),
+-          "=m" (*(uint32_t*)(src + 2*stride)),
+-          "=m" (*(uint32_t*)(src + 3*stride)),
+-          "=m" (*(uint32_t*)(src + 4*stride)),
+-          "=m" (*(uint32_t*)(src + 5*stride)),
+-          "=m" (*(uint32_t*)(src + 6*stride)),
+-          "=m" (*(uint32_t*)(src + 7*stride))
++        "movd %%mm6, (%1,%3)		\n\t"
++        :: "r" (src),
++           "r" (src + 4*stride),
++           "r" ((long)   stride ),
++           "r" ((long)(3*stride))
+     );
+ }
+ 
diff --git a/multimedia/xine-lib/patches/patch-ax b/multimedia/xine-lib/patches/patch-ax
new file mode 100644
index 00000000000..7a3286ae8ef
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ax
@@ -0,0 +1,18 @@
+$NetBSD: patch-ax,v 1.1 2006/06/26 17:13:36 wiz Exp $
+
+--- src/libffmpeg/libavcodec/avcodec.h.orig	2004-05-30 19:24:19.000000000 +0000
++++ src/libffmpeg/libavcodec/avcodec.h
+@@ -1639,6 +1639,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/xine-lib/patches/patch-ay b/multimedia/xine-lib/patches/patch-ay
new file mode 100644
index 00000000000..ca083224d8a
--- /dev/null
+++ b/multimedia/xine-lib/patches/patch-ay
@@ -0,0 +1,19 @@
+$NetBSD: patch-ay,v 1.1 2006/06/26 17:13:36 wiz Exp $
+
+--- src/libffmpeg/libavcodec/common.h.orig	2005-10-09 14:51:00.000000000 +0000
++++ src/libffmpeg/libavcodec/common.h
+@@ -66,14 +66,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.  */