ports/101224: [Maintainer-update] to multimedia/mplayer

[Thomas E. Zander]

>Number:         101224
>Category:       ports
>Synopsis:       [Maintainer-update] to multimedia/mplayer
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Aug 01 20:50:23 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Thomas E. Zander
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD 6.1-STABLE


	
>Description:
Apply some user-requested changes to the mplayer port:
o Have mga xvidix driver autodetect memory, reported by Andre Albsmeier <andre at albsmeier.net>
o Remove PKGSUFFIX stuff, instead port name is always "mplayer"
o Use win32 real player codecs if the user prohibits linux-realplayer interaction
  This supersedes ports/100261

Furthermore I suggest a note in UPDATING to reflect the port name change and the
fact that users should perform a "make config" in mplayer's port dir when upgrading
from 0.99.7 due to the options framework.

>How-To-Repeat:
>Fix:

patch to multimedia/mplayer:

diff -ruN /usr/ports/multimedia/mplayer/Makefile mplayer/Makefile
--- /usr/ports/multimedia/mplayer/Makefile	Thu Jul 13 10:33:35 2006
+++ mplayer/Makefile	Tue Aug  1 22:20:43 2006
@@ -84,6 +84,7 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	0.99.8
+PORTREVISION=	1
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -246,12 +247,6 @@
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gui
 
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gtk2
-.else
-PKGNAMESUFFIX=	-gtk2
-.endif
-
 .if defined(WITH_LANG)
 WITH_LANG=	""
 .endif
@@ -377,11 +372,6 @@
 
 .if !defined(WITHOUT_ESOUND)
 USE_GNOME+=	esound
-.if defined(PKGNAMESUFFIX)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-esound
-.else
-PKGNAMESUFFIX=	-esound
-.endif
 .else
 CONFIGURE_ARGS+=	--disable-esd
 .endif
@@ -397,7 +387,12 @@
 RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 .else
+.if !defined(WITHOUT_WIN32)
+CONFIGURE_ARGS+=	--enable-real \
+			--with-reallibdir=${LOCALBASE}/lib/win32
+.else
 CONFIGURE_ARGS+=	--disable-real
+.endif
 .endif
 
 .if !defined(WITHOUT_LIVEMEDIA)
diff -ruN /usr/ports/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c mplayer/files/patch-vidix-drivers-mga_vid.c
--- /usr/ports/multimedia/mplayer/files/patch-vidix-drivers-mga_vid.c	Tue Apr 12 22:31:23 2005
+++ mplayer/files/patch-vidix-drivers-mga_vid.c	Mon Jul 31 22:49:55 2006
@@ -1,5 +1,14 @@
---- 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
+--- vidix/drivers/mga_vid.c.orig	Sun Jun 11 20:35:43 2006
++++ vidix/drivers/mga_vid.c	Mon Jul 31 22:48:55 2006
+@@ -43,7 +43,7 @@
+ 
+ #define MGA_VSYNC_POS 2
+ 
+-#undef MGA_PCICONFIG_MEMDETECT
++#define MGA_PCICONFIG_MEMDETECT
+ 
+ #define MGA_DEFAULT_FRAMES 4
+ 
 @@ -1218,8 +1218,7 @@
  	    {
  		if ((lst[i].command & PCI_COMMAND_IO) == 0)
>Release-Note:
>Audit-Trail:
>Unformatted: