ports/79828: [Maintainer-update] multimedia/mplayer

[Thomas E. Zander]

>Number:         79828
>Category:       ports
>Synopsis:       [Maintainer-update] multimedia/mplayer
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 12 16:50:35 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Thomas E. Zander
>Release:        FreeBSD 5.3-RELEASE-p6 i386
>Organization:
>Environment:
System: FreeBSD marvin.riggiland.au 5.3-RELEASE-p6 FreeBSD 5.3-RELEASE-p6 #2: Tue Mar 29 11:49:33 CEST 2005 root at marvin.riggiland.au:/usr/obj/usr/src/sys/MARVIN i386


	
>Description:
Cumulative patch addressing several issues:
- include pr 79809 by Conrad J. Sabatier <conrads at cox.net>
  (correct linux real player codecs detection)
- introduce new vidix patches (patch-vidix-drivers-mga_vid.c and
  patch-vidix-drivers-radeon_vid.c) to enable -vo xvidix for
  some accidently mistreated radeon and matrox cards,
  reported by Andre Albsmeier <andre at albsmeier.net>
- explicitly forbid -fforce-addr gcc optimization as it reliably
  breaks all ffmpeg descendants, by Mario Sergio Fujikawa Ferreira <lioux at FreeBSD.org>
>How-To-Repeat:
>Fix:

Patch to multimedia/mplayer:

diff -ruN mplayer-old/Makefile mplayer/Makefile
--- mplayer-old/Makefile	Tue Mar 15 08:20:53 2005
+++ mplayer/Makefile	Tue Apr 12 17:47:03 2005
@@ -422,7 +422,7 @@
 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 @@
 #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 @@
 
 .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 -ruN mplayer-old/files/patch-vidix-drivers-mga_vid.c mplayer/files/patch-vidix-drivers-mga_vid.c
--- mplayer-old/files/patch-vidix-drivers-mga_vid.c	Thu Jan  1 01:00:00 1970
+++ mplayer/files/patch-vidix-drivers-mga_vid.c	Tue Apr 12 17:52:39 2005
@@ -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 -ruN mplayer-old/files/patch-vidix-drivers-radeon_vid.c mplayer/files/patch-vidix-drivers-radeon_vid.c
--- mplayer-old/files/patch-vidix-drivers-radeon_vid.c	Thu Jan  1 01:00:00 1970
+++ mplayer/files/patch-vidix-drivers-radeon_vid.c	Tue Apr 12 17:53:30 2005
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted: