6 files changed, 58 insertions, 17 deletions

diff --git a/multimedia/xmms-avi/Makefile b/multimedia/xmms-avi/Makefile
index e39bc988a690..794eb4fae689 100644
--- a/multimedia/xmms-avi/Makefile
+++ b/multimedia/xmms-avi/Makefile
@@ -20,20 +20,14 @@ COMMENT=	An avifile based .avi and .asf file playback plugin for XMMS
 LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
 
 ONLY_FOR_ARCHS=	i386
-PLIST_FILES=	lib/xmms/Input/libavixmms.so
 
-USE_X_PREFIX=	yes
-USE_SDL=	sdl
 USE_GNOME=	gtk12
+USE_SDL=	sdl
 GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-win32-path=${LOCALBASE}/lib/win32
+USE_LDCONFIG=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
+PLIST_FILES=	lib/xmms/Input/libavixmms.so
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -49,4 +43,4 @@ post-patch:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/libavixmms.so ${PREFIX}/lib/xmms/Input
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/multimedia/xmms-avi/files/patch-include__videodecoder.h b/multimedia/xmms-avi/files/patch-include__videodecoder.h
new file mode 100644
index 000000000000..b222d76bf0fc
--- /dev/null
+++ b/multimedia/xmms-avi/files/patch-include__videodecoder.h
@@ -0,0 +1,11 @@
+--- include/videodecoder.h.orig	Fri Dec 15 09:12:07 2000
++++ include/videodecoder.h	Mon Jul  2 02:47:03 2007
+@@ -55,7 +55,7 @@
+      CAP_UYVY=8,
+      CAP_YVYU=16 };
+ 
+-    static IVideoDecoder* IVideoDecoder::Create(const BITMAPINFOHEADER& bh, int depth=24, int flip=0);
++    static IVideoDecoder* Create(const BITMAPINFOHEADER& bh, int depth=24, int flip=0);
+     
+     virtual ~IVideoDecoder(){}
+     virtual void Start()			=0;
diff --git a/multimedia/xmms-avi/files/patch-lib__audioencoder__lame3.70__lame.c b/multimedia/xmms-avi/files/patch-lib__audioencoder__lame3.70__lame.c
new file mode 100644
index 000000000000..1af97ee540cb
--- /dev/null
+++ b/multimedia/xmms-avi/files/patch-lib__audioencoder__lame3.70__lame.c
@@ -0,0 +1,20 @@
+--- lib/audioencoder/lame3.70/lame.c.orig	Tue Sep 12 18:12:24 2000
++++ lib/audioencoder/lame3.70/lame.c	Mon Jul  2 22:17:43 2007
+@@ -46,6 +46,9 @@
+ #include "asmstuff.h"
+ #endif
+ 
++#ifdef __FreeBSD__
++#include <floatingpoint.h>
++#endif
+ 
+ /* Global variable definitions for lame.c */
+ static Bit_stream_struc   bs;
+@@ -1197,7 +1200,6 @@
+    *  Disable floating point exepctions
+    */
+ #ifdef __FreeBSD__
+-# include <floatingpoint.h>
+   {
+   /* seet floating point mask to the Linux default */
+   fp_except_t mask;
diff --git a/multimedia/xmms-avi/files/patch-lib__videocodec__DirectShow__interfaces.h b/multimedia/xmms-avi/files/patch-lib__videocodec__DirectShow__interfaces.h
new file mode 100644
index 000000000000..30331126c95e
--- /dev/null
+++ b/multimedia/xmms-avi/files/patch-lib__videocodec__DirectShow__interfaces.h
@@ -0,0 +1,11 @@
+--- lib/videocodec/DirectShow/interfaces.h.orig	Thu Jan 11 00:01:43 2001
++++ lib/videocodec/DirectShow/interfaces.h	Mon Jul  2 02:45:54 2007
+@@ -30,8 +30,6 @@
+ struct IMemAllocator;
+ struct IMediaSample;
+ 
+-enum PIN_DIRECTION;
+-
+ class IClassFactory2
+ {
+ public:
diff --git a/multimedia/xmms-avi/files/patch-quantize-pvt.c b/multimedia/xmms-avi/files/patch-quantize-pvt.c
index 8e7ed8cc05ee..1a178cef20f1 100644
--- a/multimedia/xmms-avi/files/patch-quantize-pvt.c
+++ b/multimedia/xmms-avi/files/patch-quantize-pvt.c
@@ -1,10 +1,15 @@
---- lib/audioencoder/lame3.70/quantize-pvt.c.orig	Mon Dec 11 18:14:41 2006
-+++ lib/audioencoder/lame3.70/quantize-pvt.c	Mon Dec 11 18:14:59 2006
-@@ -1030,7 +1030,7 @@
+--- lib/audioencoder/lame3.70/quantize-pvt.c.orig	Tue Sep 12 18:12:33 2000
++++ lib/audioencoder/lame3.70/quantize-pvt.c	Wed Jul 11 14:46:01 2007
+@@ -1029,8 +1029,12 @@
+ 
          "jnz loop1\n\n"
          : /* no outputs */
++#if __GNUC__ >= 4
++        : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "g" (rx)
++#else
          : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
 -        : "%eax", "%ebx", "memory", "cc"
++#endif
 +        : "%eax", /* "%ebx", */ "memory", "cc"
        );
    }
diff --git a/multimedia/xmms-avi/files/patch-win32.h b/multimedia/xmms-avi/files/patch-win32.h
index 817fd50d1788..215df48175c4 100644
--- a/multimedia/xmms-avi/files/patch-win32.h
+++ b/multimedia/xmms-avi/files/patch-win32.h
@@ -1,5 +1,5 @@
---- lib/loader/win32.h.orig	Mon Dec 11 18:10:09 2006
-+++ lib/loader/win32.h	Mon Dec 11 18:10:21 2006
-@@ -1 +1,2 @@
- int ext_unknown();
+--- lib/loader/win32.h.orig	Tue Sep 12 18:12:21 2000
++++ lib/loader/win32.h	Mon Jul  2 02:44:09 2007
+@@ -1 +1 @@
+-int ext_unknown();
 +void* LookupExternalByName(const char* library, const char* name);