aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--multimedia/mplayer/Makefile7
-rw-r--r--multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c12
-rw-r--r--multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c11
3 files changed, 27 insertions, 3 deletions
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index dede39358b62..b153f56da19e 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -260,7 +260,7 @@
PORTNAME= mplayer
PORTVERSION= 0.99.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= multimedia audio ipv6
MASTER_SITES= http://www1.mplayerhq.hu/MPlayer/releases/ \
http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -422,7 +422,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg
WITH_XANIM= yes
.endif
-.if exists(${LOCALBASE}/lib/RealPlayer8/realplay)
+.if exists(${LOCALBASE}/lib/RealPlayer/realplay.bin)
WITH_REALPLAYER= yes
.endif
@@ -524,6 +524,7 @@ DEFAULT_CDROM_DEVICE=/dev/acd0
#Kernel granularity
DEFAULT_KERN_HZ=1024
.else #MPLAYER_GENERIC_BUILD
+CFLAGS+= -fno-force-addr
.if defined(DEBUG)
CONFIGURE_ARGS+= --enable-debug
.endif
@@ -701,7 +702,7 @@ LIB_DEPENDS+= vorbis.3:${PORTSDIR}/audio/libvorbis
.if defined(WITH_REALPLAYER)
CONFIGURE_ARGS+= --enable-real \
- --with-reallibdir=${LOCALBASE}/lib/RealPlayer8/Codecs
+ --with-reallibdir=${LOCALBASE}/lib/RealPlayer/codecs
RUN_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
BUILD_DEPENDS+= realplay:${PORTSDIR}/multimedia/linux-realplayer
.endif
diff --git a/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c b/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c
new file mode 100644
index 000000000000..3fadae0b3807
--- /dev/null
+++ b/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c
@@ -0,0 +1,12 @@
+--- vidix/drivers/mga_vid.c.orig Thu Sep 2 13:34:25 2004
++++ vidix/drivers/mga_vid.c Tue Apr 12 17:51:55 2005
+@@ -1218,8 +1218,7 @@
+ {
+ if ((lst[i].command & PCI_COMMAND_IO) == 0)
+ {
+- printf("[mga] Device is disabled, ignoring\n");
+- continue;
++ printf("[mga] Device is disabled, trying anyways.\n");
+ }
+ switch(lst[i].device)
+ {
diff --git a/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c b/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c
new file mode 100644
index 000000000000..934d9e420dff
--- /dev/null
+++ b/multimedia/mplayer/files/patch-vidix-drivers-radeon_vid.c
@@ -0,0 +1,11 @@
+--- vidix/drivers/radeon_vid.c.orig Tue Dec 21 00:43:54 2004
++++ vidix/drivers/radeon_vid.c Tue Apr 12 17:49:46 2005
+@@ -852,6 +852,8 @@
+ DEVICE_ATI_RAGE_128_PRO2,
+ DEVICE_ATI_RAGE_128_PRO3,
+ /* these seem to be based on rage 128 instead of mach64 */
++ DEVICE_ATI_RAGE_MOBILITY_M4,
++ DEVICE_ATI_RAGE_MOBILITY_M42,
+ DEVICE_ATI_RAGE_MOBILITY_M3,
+ DEVICE_ATI_RAGE_MOBILITY_M32
+ #else