ports/114414: Update port: multimedia/xmms-avi
KATO Tsuguru
tkato432 at yahoo.com
Sun Jul 8 18:10:14 UTC 2007
>Number: 114414
>Category: ports
>Synopsis: Update port: multimedia/xmms-avi
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Jul 08 18:10:13 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 6.2-RELEASE-p5 i386
>Organization:
>Environment:
>Description:
- Fix build with gcc4
New file:
files/patch-include__videodecoder.h
files/patch-lib__audioencoder__lame3.70__lame.c
files/patch-lib__videodcodec__DirectShow__interfaces.h
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/multimedia/xmms-avi/Makefile multimedia/xmms-avi/Makefile
--- /usr/ports/multimedia/xmms-avi/Makefile Tue Jul 3 22:37:35 2007
+++ multimedia/xmms-avi/Makefile Tue Jul 3 22:46:02 2007
@@ -20,20 +20,14 @@
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 @@
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/.libs/libavixmms.so ${PREFIX}/lib/xmms/Input
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff -urN /usr/ports/multimedia/xmms-avi/files/patch-include__videodecoder.h multimedia/xmms-avi/files/patch-include__videodecoder.h
--- /usr/ports/multimedia/xmms-avi/files/patch-include__videodecoder.h Thu Jan 1 09:00:00 1970
+++ multimedia/xmms-avi/files/patch-include__videodecoder.h Mon Jul 2 02:47:13 2007
@@ -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 -urN /usr/ports/multimedia/xmms-avi/files/patch-lib__audioencoder__lame3.70__lame.c multimedia/xmms-avi/files/patch-lib__audioencoder__lame3.70__lame.c
--- /usr/ports/multimedia/xmms-avi/files/patch-lib__audioencoder__lame3.70__lame.c Thu Jan 1 09:00:00 1970
+++ multimedia/xmms-avi/files/patch-lib__audioencoder__lame3.70__lame.c Mon Jul 2 22:17:59 2007
@@ -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 -urN /usr/ports/multimedia/xmms-avi/files/patch-lib__videocodec__DirectShow__interfaces.h multimedia/xmms-avi/files/patch-lib__videocodec__DirectShow__interfaces.h
--- /usr/ports/multimedia/xmms-avi/files/patch-lib__videocodec__DirectShow__interfaces.h Thu Jan 1 09:00:00 1970
+++ multimedia/xmms-avi/files/patch-lib__videocodec__DirectShow__interfaces.h Mon Jul 2 02:46:14 2007
@@ -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 -urN /usr/ports/multimedia/xmms-avi/files/patch-quantize-pvt.c multimedia/xmms-avi/files/patch-quantize-pvt.c
--- /usr/ports/multimedia/xmms-avi/files/patch-quantize-pvt.c Wed Dec 13 04:36:14 2006
+++ multimedia/xmms-avi/files/patch-quantize-pvt.c Mon Jul 2 22:57:13 2007
@@ -1,10 +1,12 @@
---- 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 Mon Jul 2 22:55:13 2007
+@@ -1029,8 +1029,8 @@
+
"jnz loop1\n\n"
: /* no outputs */
- : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
+- : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "m" (rx)
- : "%eax", "%ebx", "memory", "cc"
++ : "t" (istep), "r" (xr), "r" (adj43asm), "r" (ix), "r" (576 / 4), "g" (rx)
+ : "%eax", /* "%ebx", */ "memory", "cc"
);
}
diff -urN /usr/ports/multimedia/xmms-avi/files/patch-win32.h multimedia/xmms-avi/files/patch-win32.h
--- /usr/ports/multimedia/xmms-avi/files/patch-win32.h Wed Dec 13 04:36:14 2006
+++ multimedia/xmms-avi/files/patch-win32.h Mon Jul 2 02:44:32 2007
@@ -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);
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list