17 files changed, 223 insertions, 404 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 58158c16095d..d9a2a381ce78 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -32,21 +32,26 @@
 # the default is to build mplayer with mencoder. If you're sure that you
 # don't want to encode or recode any media file, then define this.
 #
-# WITH_GUI
-# default: defined if gtk12 libs are installed on the system
-# defining this knob will force the ports system to install gtk12 first
-# (if not available) and then link mplayer against it. Then you'll
-# be able to use gmplayer, the graphical version of mplayer
-# Note: Defining both WITH_GUI and WITHOUT_GUI will build mplayer without
-#       grapical inteface.
-
+# WITH_GTK1|WITH_GTK2
+# default: autodetect GTK1
+# if you want mplayer to have gui abilities, you can use this knob to define
+# which graphical toolkit set mplayer is built with.
+# It defaults to detect and use GTK1 if it finds a working installation on the
+# system. This can be overridden by choosing WITH_GTK2 or disable graphical
+# user interface by defining WITHOUT_GUI
+# Note: If you define WITH_GTK* *and* WITHOUT_GUI, mplayer will be built without
+#       gui capabilities.
+#       The GTK2 patches are not official ones, so they should be considered as
+#       experimental.
+# Note: GTK2 patches are not included at the moment. So defining this knob has
+#       no effect until new working patches are available
+#
 # WITHOUT_GUI
 # default: undefined
 # normally mplayer comes with gmplayer if gtk is installed on the system.
 # If you want to force mplayer to disable the graphical user interface and
 # build without gui ability, define this.
 #
-#
 # WITHOUT_FREETYPE
 # default: undefined
 # since freetype is installed on almost any system people might want
@@ -104,29 +109,22 @@
 # the libary on your system, it is used, otherwise not.
 # If you define it, it will be built and installed as dependency.)
 #
-# WITH_DVD
-# default: autodetect
-#
-# WITH_DVD_DEVICE
+# WITH_DVD_DEVICE=/path/to/desired/device
 # default 5.x: /dev/acd0
 # default 4.x: /dev/acd0c
-# change the default dvd device
+# This option changes the default device where mplayer looks for
+# a DVD medium
 #
-# WITH_CDROM_DEVICE
+# WITH_CDROM_DEVICE=/path/to/desired/device
 # default 5.x: /dev/acd0
 # default 4.x: /dev/acd0c
-# change the default cdrom device
-# useful for VCD's
-#
-# WITH_LIBDVDREAD
-# default: disabled
-# define this if you prefer the use of libdvdread instead of the
-# mplayer-internal dvd reading routine (which is derived from
-# libdvdread). This only affect mplayer if WITH_DVD is used.
+# This option changes the default cdrom device, maybe useful for VCDs
 #
 # WITH_LIBDVDNAV
-# Completely disabled at the moment because of incompatibility issues
-# with the new libdvdnav. This will probably be fixed in mplayer-1.0.
+# default: autodetect
+# NOTE: This is disabled in the development tree at the moment
+#       because it simply doesn't work, so defining it has no
+#       effect until it works again.
 #
 # WITH_LIBUNGIF
 # default: autodetect
@@ -135,7 +133,7 @@
 # default: autodetect
 # Note: arts audio output cannot work together with mplayer's gtk1-gui
 # 	because of conflicting glib versions, so it it is disabled if
-# 	mplayer is built with graphical user interface
+# 	mplayer is built with gtk1 graphical user interface
 #
 # WITH_CDPARANOIA
 # default: autodetect
@@ -171,10 +169,10 @@
 # WITH_LIVEMEDIA
 # default: autotedect
 #
-# WITH_XVID
-# default: autodetect
+# WITH_MATROSKA
+# default: autotedect
 #
-# WITH_FAAD
+# WITH_XVID
 # default: autodetect
 #
 # WITH_LZO
@@ -205,8 +203,7 @@
 # to be installed.
 
 PORTNAME=	mplayer
-PORTVERSION=	0.92.1
-PORTREVISION=	2
+PORTVERSION=	0.99.4
 CATEGORIES=	multimedia audio ipv6
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -218,11 +215,7 @@ MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		ftp://ftp.lug.udel.edu/MPlayer/releases/ \
 		ftp://mirrors.xmission.com/MPlayer/releases/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-0.92.1
-
-PATCH_SITES=	${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/kame/misc/&,}
-PATCHFILES=	mplayer-0.9.2-v6-20030930.diff.gz
-PATCH_DIST_STRIP=	-p1
+DISTNAME=	MPlayer-1.0pre4
 
 MAINTAINER=	riggs@rrr.de
 COMMENT=	High performance media player/encoder supporting many formats
@@ -243,8 +236,8 @@ CONFIGURE_ARGS=	--with-extralibdir=${LOCALBASE}/lib \
 		--with-x11incdir=${X11BASE}/include \
 		--enable-png \
 		--disable-libfame \
-		--disable-tv-v4l \
-		--disable-dvdnav
+		--disable-external-faad \
+		--disable-tv-v4l
 
 .if defined(WITH_LANG)
 CONFIGURE_ARGS+=--language=${WITH_LANG}
@@ -257,11 +250,6 @@ MAN1=		mplayer.1
 MANCOMPRESSED=	no
 
 CONFFILES=	codecs.conf example.conf input.conf menu.conf
-DOCFILES=	bugreports.html cd-dvd.html codecs-in.html \
-		codecs.html documentation.html faq.html skin.html \
-		encoding.html formats.html sound.html \
-		users_against_developers.html \
-		video.html
 TOOLFILES=	calcbpp.pl countquant.pl \
 		dvd2divxscript.pl menc2pass \
 		mencvcd mp.pl sws-test w32codec_dl.pl \
@@ -292,18 +280,10 @@ WITH_ARTS=	yes
 WITH_CDPARANOIA=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libdv.a)
+.if exists(${LOCALBASE}/lib/libdv.so.4)
 WITH_LIBDV=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libdvdcss.so.2)
-WITH_DVD=	yes
-.endif
-
-#.if exists(${LOCALBASE}/lib/libdvdnav.so.3)
-#WITH_LIBDVDNAV=	yes
-#.endif
-
 .if exists(${LOCALBASE}/lib/libungif.so.5)
 WITH_LIBUNGIF=	yes
 .endif
@@ -353,10 +333,6 @@ WITH_LIVEMEDIA=	yes
 WITH_XVID=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/libfaad.so)
-WITH_FAAD=	yes
-.endif
-
 .if exists(${X11BASE}/lib/libxmms.so)
 WITH_XMMS=	yes
 .endif
@@ -369,6 +345,10 @@ WITH_LZO=	yes
 WITH_FREETYPE=	yes
 .endif
 
+.if exists(${LOCALBASE}/lib/libmatroska.a)
+WITH_MATROSKA=	yes
+.endif
+
 .if defined (DEBUG)
 CONFIGURE_ARGS+=	--enable-debug
 .endif
@@ -377,26 +357,28 @@ CONFIGURE_ARGS+=	--enable-debug
 CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
 .endif
 
-.if ${HAVE_GNOME:Mgtk12}!=""
-WITH_GUI=	yes
+.if ${HAVE_GNOME:Mgtk12}!="" && !defined(WITHOUT_GUI) && !defined(WITH_GTK2)
+WITH_GTK1=	yes
 .endif
 
-.if defined(WITH_GUI) && !defined(WITHOUT_GUI)
+.if !defined(WITHOUT_GUI)
 PLIST_SUB+=	GMPLAYER=""
 .else
 PLIST_SUB+=	GMPLAYER="@comment "
 .endif
 
-.if defined(WITH_RTC)
-BUILD_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
-RUN_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
-CONFIGURE_ARGS+=	--enable-rtc
-CONFIGURE_ENV+=		CFLAGS+="-I/${LOCALBASE}/include"
-.else
-CONFIGURE_ARGS+=	--disable-rtc
-.endif
+#.if defined(WITH_GTK2) && !defined(WITHOUT_GUI)
+#USE_GNOME+=	gtk20
+#RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins
+#.if defined(PKGNAMESUFFIX)
+#PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gtk2
+#.else
+#PKGNAMESUFFIX=	-gtk2
+#.endif
+#CONFIGURE_ARGS+=	--enable-gui
+#.endif
 
-.if defined(WITH_GUI) && !defined(WITHOUT_GUI)
+.if defined(WITH_GTK1) && !defined(WITHOUT_GUI)
 USE_GNOME+=	gtk12
 RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/Skin:${PORTSDIR}/multimedia/mplayer-skins
 .if defined(PKGNAMESUFFIX)
@@ -405,10 +387,21 @@ PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gtk
 PKGNAMESUFFIX=	-gtk
 .endif
 CONFIGURE_ARGS+=	--enable-gui
-.else
+.endif
+
+.if defined(WITHOUT_GUI)
 CONFIGURE_ARGS+=	--disable-gui
 .endif
 
+.if defined(WITH_RTC)
+BUILD_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
+RUN_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
+CONFIGURE_ARGS+=	--enable-rtc
+CONFIGURE_ENV+=		CFLAGS+="-I/${LOCALBASE}/include"
+.else
+CONFIGURE_ARGS+=	--disable-rtc
+.endif
+
 .if !defined(WITHOUT_MENCODER)
 LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 MLINKS+=	mplayer.1 mencoder.1
@@ -418,7 +411,7 @@ CONFIGURE_ARGS+=	--disable-mencoder
 PLIST_SUB+=	MENCODER="@comment "
 .endif
 
-.if defined(WITH_ARTS) && (!defined(WITH_GUI) || defined(WITHOUT_GUI))
+.if defined(WITH_ARTS) && (!defined(WITH_GTK1) || defined(WITHOUT_GUI))
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
 
 CONFIGURE_ARGS+=	--enable-arts
@@ -432,26 +425,6 @@ LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 CONFIGURE_ARGS+=	--disable-cdparanoia
 .endif
 
-.if defined(WITH_DVD)
-.if !defined(WITH_LIBDVDREAD)
-LIB_DEPENDS+=	dvdcss.2:${PORTSDIR}/multimedia/libdvdcss
-.else
-LIB_DEPENDS+=	dvdread.3:${PORTSDIR}/multimedia/libdvdread
-.endif
-#.if defined(WITH_LIBDVDNAV)
-#LIB_DEPENDS+=	dvdnav.3:${PORTSDIR}/multimedia/libdvdnav
-
-#CONFIGURE_ARGS+=	--enable-dvdnav
-#.else
-#CONFIGURE_ARGS+=	--disable-dvdnav
-#.endif
-
-CONFIGURE_ARGS+=	--enable-css \
-			--with-csslibdir=${LOCALBASE}/lib
-.else
-CONFIGURE_ARGS+=	--disable-css
-.endif
-
 .if defined(WITH_LIBUNGIF)
 LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
 #CONFIGURE_ARGS+=	--enable-gif
@@ -476,6 +449,14 @@ CONFIGURE_ARGS+=	--enable-mad \
 CONFIGURE_ARGS+=	--disable-mad
 .endif
 
+.if defined(WITH_MATROSKA)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libmatroska.a:${PORTSDIR}/multimedia/libmatroska
+
+CONFIGURE_ARGS+=	--enable-matroska
+.else
+CONFIGURE_ARGS+=	--disable-matroska
+.endif
+
 .if defined(WITH_SVGALIB)
 LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 .endif
@@ -516,8 +497,7 @@ BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/live
 .endif
 
 .if defined(WITH_XVID)
-CONFIGURE_ARGS+=	--enable-xvid \
-			--with-xvidcore=${LOCALBASE}/lib/libxvidcore.so
+CONFIGURE_ARGS+=	--enable-xvid
 LIB_DEPENDS+=		xvidcore.2:${PORTSDIR}/multimedia/xvid
 .endif
 
@@ -532,11 +512,6 @@ CONFIGURE_ARGS+=	--enable-xmms
 LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 .endif
 
-.if defined(WITH_FAAD)
-CONFIGURE_ARGS+=	--enable-faad
-LIB_DEPENDS+=	faad.0:${PORTSDIR}/audio/faad
-.endif
-
 .if defined(WITH_FREETYPE)
 CONFIGURE_ARGS+=	--with-extraincdir=${LOCALBASE}/include/freetype2 \
 			--enable-freetype
@@ -629,10 +604,10 @@ pre-everything::
 	@${ECHO_MSG} "Take a careful look into the Makefile in order"
 	@${ECHO_MSG} "to learn how to tune mplayer towards you personal preferences!"
 	@${ECHO_MSG} "For example,"
-	@${ECHO_MSG} "make WITH_GUI=yes"
-	@${ECHO_MSG} "builds MPlayer with GUI support."
+	@${ECHO_MSG} "make WITH_GTK1
+	@${ECHO_MSG} "builds MPlayer with GTK1-GUI support."
 
-.if defined(WITH_GUI) && !defined(WITHOUT_GUI)
+.if !defined(WITHOUT_GUI)
 	@${ECHO_MSG} "If you want to use the GUI, you can either install"
 	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
 	@${ECHO_MSG} "or download official skin collections from"
@@ -640,6 +615,9 @@ pre-everything::
 .endif
 
 post-patch:
+#.if defined(WITH_GTK2) && !defined(WITHOUT_GUI)
+#	@cd ${WRKSRC} && ${PATCH} < ${PATCHDIR}/extra-patch-gtk2
+#.endif
 	@${REINPLACE_CMD} -e \
 		's|libxmms.so.1|libxmms.so|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
@@ -666,11 +644,6 @@ post-patch:
 		${WRKSRC}/mplayer.c
 .endif
 
-pre-configure:
-.if defined(WITH_LIBDVDREAD)
-	@${RM} -Rf ${WRKSRC}/libmpdvdkit2/
-.endif
-
 post-configure:
 	@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
 		${WRKSRC}/config.mak
@@ -689,11 +662,9 @@ post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${CHMOD} 755 ${DOCSDIR}
-.for doc in ${DOCFILES}
-	@${INSTALL_DATA} ${WRKSRC}/DOCS/${doc} ${DOCSDIR}
-.endfor
+	@${INSTALL_DATA} ${WRKSRC}/DOCS/HTML/en/* ${DOCSDIR}
 .endif
-.if defined(WITH_GUI) && !defined(WITHOUT_GUI)
+.if !defined(WITHOUT_GUI)
 	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
 .endif
 	@${CAT} ${.CURDIR}/pkg-message
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 99c67a228df8..46918a039e3d 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,4 +1,2 @@
-MD5 (MPlayer-0.92.1.tar.bz2) = 678920b5667862cef1cd8cdb042a5773
-SIZE (MPlayer-0.92.1.tar.bz2) = 3463518
-MD5 (mplayer-0.9.2-v6-20030930.diff.gz) = 1984f929672e38efb589c0f5fc61b37e
-SIZE (mplayer-0.9.2-v6-20030930.diff.gz) = 2139
+MD5 (MPlayer-1.0pre4.tar.bz2) = 83ebac0f05b192516a41fca2350ca01a
+SIZE (MPlayer-1.0pre4.tar.bz2) = 4913390
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index b9b213de18e9..f7e930c1dab2 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,54 +1,49 @@
---- configure.orig	Sat Aug  9 16:12:30 2003
-+++ configure	Mon Mar 15 20:51:21 2004
-@@ -300,7 +300,7 @@
+--- configure.orig	Mon Apr 26 11:44:06 2004
++++ configure	Wed Apr 28 16:09:47 2004
+@@ -339,7 +339,7 @@
  
  
  # 1st pass checking for vital options
 -_install=install
 +_install=@${BSD_INSTALL_PROGRAM}
  _ranlib=ranlib
- _cc=gcc
+ _cc=cc
  test "$CC" && _cc="$CC"
-@@ -392,6 +392,7 @@
-       i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
-       ia64) host_arch=ia64 ;;
-       x86_64) host_arch=x86_64 ;;
-+      amd64) host_arch=x86_64 ;;
-       ppc) host_arch=ppc ;;
-       alpha) host_arch=alpha ;;
-       sparc*) host_arch=sparc ;;
-@@ -539,19 +540,10 @@
- 
- # Try to find the available options for the current CPU
- if x86 || ppc; then
--  if test -r /proc/cpuinfo ; then
--    # Linux with /proc mounted, extract CPU information from it
--    _cpuinfo="cat /proc/cpuinfo"
--  elif test -r /compat/linux/proc/cpuinfo ; then
--    # FreeBSD with Linux emulation /proc mounted,
--    # extract CPU information from it
--    _cpuinfo="cat /compat/linux/proc/cpuinfo"
--  elif x86; then
-     # all other OSes try to extract CPU information from a small helper
-     # program TOOLS/cpuinfo instead
-     $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
-     _cpuinfo="TOOLS/cpuinfo"
--  fi
+@@ -594,22 +594,10 @@
+ _cpuinfo="echo"
+ # Cygwin has /proc/cpuinfo, but only supports Intel CPUs
+ # FIXME: Remove the cygwin check once AMD CPUs are supported
+-if test -r /proc/cpuinfo && not cygwin; then
+-  # Linux with /proc mounted, extract CPU information from it
+-  _cpuinfo="cat /proc/cpuinfo"
+-elif test -r /compat/linux/proc/cpuinfo && not x86 ; then
+-  # FreeBSD with Linux emulation /proc mounted,
+-  # extract CPU information from it
+-  _cpuinfo="cat /compat/linux/proc/cpuinfo"
+-elif darwin ; then
+-  # use hostinfo on Darwin
+-  _cpuinfo="hostinfo"
+-elif x86; then
+   # all other OSes try to extract CPU information from a small helper
+   # program TOOLS/cpuinfo instead
+   $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
+   _cpuinfo="TOOLS/cpuinfo"
+-fi
  
-   pname=`$_cpuinfo | grep 'model name' | cut -d ':' -f 2 | head -1`
-   pvendor=`$_cpuinfo | grep 'vendor_id' | cut -d ':' -f 2  | cut -d ' ' -f 2 | head -1`
-@@ -1423,8 +1415,8 @@
+ case "$host_arch" in
+   i[3-9]86|x86|x86pc|k5|k6|k6-2|k6-3|pentium*|athlon*|i586-i686)
+@@ -1656,8 +1644,8 @@
      ;;
  
    *)
 -    echo "Unknown parameter: $ac_option"
 -    exit 1
 +    echo -n "Unknown parameter: $ac_option"
-+    echo " (ignoring)"
++    echo " (ignoring)."
      ;;
  
    esac
-@@ -1434,7 +1426,7 @@
+@@ -1667,7 +1655,7 @@
  test -z "$_bindir" && _bindir="$_prefix/bin"
  test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
  test -z "$_mandir" && _mandir="$_prefix/man"
@@ -57,7 +52,7 @@
  test -z "$_libdir" && _libdir="$_prefix/lib"
  test -z "$_mlibdir" && _mlibdir="$MLIBHOME"
  
-@@ -1866,13 +1858,7 @@
+@@ -2258,13 +2246,7 @@
  
  
  echocheck "memalign()"
@@ -71,7 +66,7 @@
  if test "$_memalign" = yes ; then
   _def_memalign='#define HAVE_MEMALIGN 1'
  else
-@@ -1961,31 +1947,7 @@
+@@ -2352,40 +2334,8 @@
  
  
  echocheck "pthread"
@@ -80,7 +75,9 @@
 -void* func(void *arg) { return arg; }
 -int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
 -EOF
--if ( cc_check && $TMPO ) ; then              # QNX
+-if mingw32 ; then
+-  _ld_pthread=''
+-elif ( cc_check && $TMPO ) ; then              # QNX
 -  _ld_pthread=''
 -elif ( cc_check -lpthread && $TMPO ) ; then
 -  _ld_pthread='-lpthread'
@@ -94,17 +91,25 @@
 -    elif ( cc_check -pthread ) ; then
 -     _ld_pthread='-pthread'
 -    else
--      die "Static lib pthread not found (needed by Windows and networking stufff)."
+-      echores "no static pthread found (v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, Win32 loader disabled)"
+-      _ld_pthread='' ; _nas=no ; _tv_v4l=no ; _macosx=no ; _win32=no
 -    fi
 -  else
--    die "Lib pthread not found (needed by Windows and networking stuff)."
+-    echores "no (v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled)"
+-    _ld_pthread='' ; _nas=no ; _tv_v4l=no ; _macosx=no ; _win32=no
 -  fi
 -fi
+-if test "$_ld_pthread" != '' ; then
+-  echores "yes (using $_ld_pthread)"
+-else
+-  echores "no"
+-fi
 +_ld_pthread="${PTHREAD_LIBS}"
- echores "yes (using $_ld_pthread)"
++echores "yes (using $_ld_pthread)"
  
  
-@@ -3819,11 +3781,11 @@
+ echocheck "sys/soundcard.h"
+@@ -4458,11 +4408,11 @@
  
  
  echocheck "RTC"
@@ -118,7 +123,7 @@
  int main(void) { return RTC_IRQP_READ; }
  EOF
      _rtc=no
-@@ -4848,7 +4810,7 @@
+@@ -5772,7 +5722,7 @@
    CFLAGS="$CFLAGS -D_REENTRANT"
  elif bsd ; then
    # FIXME bsd needs this so maybe other OS'es
diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae
index f5ac9daf4e55..d512ecb969da 100644
--- a/multimedia/mplayer/files/patch-ae
+++ b/multimedia/mplayer/files/patch-ae
@@ -1,8 +1,8 @@
---- Makefile.orig	Sat Sep 27 15:26:46 2003
-+++ Makefile	Sat Sep 27 15:29:55 2003
-@@ -254,47 +254,11 @@
- ifeq ($(SHARED_PP),yes)
- 	$(MAKE) install -C postproc 
+--- Makefile.orig	Sat Jan 24 20:33:40 2004
++++ Makefile	Sat Jan 24 20:49:23 2004
+@@ -252,53 +252,10 @@
+ ifeq ($(VIDIX),yes)
+ 	$(DO_MAKE)
  endif
 -	if test ! -d $(BINDIR) ; then mkdir -p $(BINDIR) ; fi
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG) $(BINDIR)/$(PRG)
@@ -10,13 +10,25 @@
 -	-ln -sf $(PRG) $(BINDIR)/gmplayer
 -endif
 -	if test ! -d $(MANDIR)/man1 ; then mkdir -p $(MANDIR)/man1; fi
--	$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
+-	for i in $(LANGUAGES); do \
+-		if test "$$i" = en ; then \
+-			$(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1 ; \
+-		else \
+-			mkdir -p $(MANDIR)/$$i/man1 ; \
+-			$(INSTALL) -c -m 644 DOCS/man/$$i/mplayer.1 $(MANDIR)/$$i/man1/mplayer.1 ; \
+-		fi ; \
+-	done
 +	@${BSD_INSTALL_PROGRAM} $(PRG) $(BINDIR)/$(PRG)
-+	@${BSD_INSTALL_MAN} DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
++	@${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
  ifeq ($(MENCODER),yes)
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
-+	@${BSD_INSTALL_PROGRAM} $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
- 	-ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1
+-	for i in $(LANGUAGES); do \
+-		if test "$$i" = en ; then \
+-			ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1 ; \
+-		else \
+-			ln -sf mplayer.1 $(MANDIR)/$$i/man1/mencoder.1 ; \
+-		fi ; \
+-	done
 -endif
 -	@if test ! -d $(DATADIR) ; then mkdir -p $(DATADIR) ; fi
 -	@if test ! -d $(DATADIR)/font ; then mkdir -p $(DATADIR)/font ; fi
@@ -41,13 +53,7 @@
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) libmpdvdkit/libmpdvdkit.so $(LIBDIR)/libmpdvdkit.so
 -endif
 -endif
--endif
--ifeq ($(CSS_USE),yes)
--	@echo "The following task requires root privileges. If it fails don't panic,"
--	@echo "however it means you can't use fibmap_mplayer."
--	@echo "Without this (or without running mplayer as root) you won't be"
--	@echo "able to play encrypted DVDs."
--	-$(INSTALL) -o 0 -g 0 -m 4755 $(INSTALLSTRIP) $(PRG_FIBMAP) $(BINDIR)/$(PRG_FIBMAP)
++	@${BSD_INSTALL_PROGRAM} $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
  endif
  
  uninstall:
diff --git a/multimedia/mplayer/files/patch-cfg-common.h b/multimedia/mplayer/files/patch-cfg-common.h
deleted file mode 100644
index 8de2c7301a3d..000000000000
--- a/multimedia/mplayer/files/patch-cfg-common.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- cfg-common.h.orig	Sat Feb  8 21:52:25 2003
-+++ cfg-common.h	Fri Aug 29 11:08:51 2003
-@@ -279,8 +279,8 @@
- 	{"alsa", &tv_param_alsa, CONF_TYPE_FLAG, 0, 0, 1, NULL},
- #endif
- 	{"adevice", &tv_param_adevice, CONF_TYPE_STRING, 0, 0, 0, NULL},
-+#endif	
- 	{"audioid", &tv_param_audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 9, NULL},
--#endif
- 	{NULL, NULL, 0, 0, 0, 0, NULL}
- };
- #endif
diff --git a/multimedia/mplayer/files/patch-demux-tv.c b/multimedia/mplayer/files/patch-demux-tv.c
deleted file mode 100644
index 4a43b3588e18..000000000000
--- a/multimedia/mplayer/files/patch-demux-tv.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- libmpdemux/tv.c.orig	Mon Mar 10 17:00:39 2003
-+++ libmpdemux/tv.c	Fri Aug 29 11:08:51 2003
-@@ -53,9 +53,9 @@
- char *tv_param_outfmt = "yv12";
- float tv_param_fps = -1.0;
- char **tv_param_channels = NULL;
-+int tv_param_audio_id = 0;
- #ifdef HAVE_TV_V4L
- int tv_param_amode = -1;
--int tv_param_audio_id = 0;
- int tv_param_volume = 60000;
- int tv_param_bass = -1;
- int tv_param_treble = -1;
diff --git a/multimedia/mplayer/files/patch-demux-tv.h b/multimedia/mplayer/files/patch-demux-tv.h
deleted file mode 100644
index 97c2ed388e6d..000000000000
--- a/multimedia/mplayer/files/patch-demux-tv.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- libmpdemux/tv.h.orig	Sat Dec 28 23:57:39 2002
-+++ libmpdemux/tv.h	Fri Aug 29 11:08:51 2003
-@@ -24,9 +24,9 @@
- extern int tv_param_noaudio;
- extern int tv_param_immediate;
- extern int tv_param_audiorate;
-+extern int tv_param_audio_id;
- #ifdef HAVE_TV_V4L
- extern int tv_param_amode;
--extern int tv_param_audio_id;
- extern int tv_param_volume;
- extern int tv_param_bass;
- extern int tv_param_treble;
diff --git a/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c b/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
deleted file mode 100644
index 39128a408536..000000000000
--- a/multimedia/mplayer/files/patch-demux-tvi_bsdbt848.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- libmpdemux/tvi_bsdbt848.c.orig	Mon Jun  2 00:30:37 2003
-+++ libmpdemux/tvi_bsdbt848.c	Sun Jan 18 21:26:15 2004
-@@ -39,8 +39,12 @@
- #include <signal.h>
- #include <string.h>
- 
-+#include <sys/param.h>
- #ifdef __NetBSD__
- #include <dev/ic/bt8xx.h>
-+#elif __FreeBSD_version >= 502100
-+#include <dev/bktr/ioctl_meteor.h>
-+#include <dev/bktr/ioctl_bt848.h>
- #else
- #include <machine/ioctl_meteor.h>
- #include <machine/ioctl_bt848.h>
-@@ -287,6 +291,7 @@
- 
-     case TVI_CONTROL_TUN_SET_NORM:
-         {
-+	u_short tmp_fps;
-         int req_mode = (int)*(void **)arg;
- 
-         priv->iformat = METEOR_FMT_AUTOMODE;
-@@ -352,11 +357,18 @@
-             return(0);
-             }
- 
--        if(ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0) 
-+	tmp_fps=priv->fps;
-+	if(ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0)
-             {
-             perror("fps:ioctl");
-             return(0);
-             }
-+	//set audioid after norm has been set    
-+	if(priv->tunerready == TRUE &&
-+	    ioctl(priv->tunerfd,BT848_SAUDIO, &tv_param_audio_id)<0)
-+	    {
-+		perror("Unable to set audioid");
-+	    }
- 
-         return(TVI_CONTROL_TRUE);
-         }
-@@ -453,6 +465,7 @@
- {
- int marg;
- int count;
-+u_short tmp_fps;
- 
- G_private = priv; /* Oooh, sick */
- 
-@@ -497,8 +510,9 @@
-     perror("SINPUT:ioctl");
-     }
- 
-+tmp_fps=priv->fps;
- if(priv->videoready == TRUE &&
--   ioctl(priv->btfd, METEORSFPS, &priv->fps) < 0) 
-+   ioctl(priv->btfd, METEORSFPS, &tmp_fps) < 0) 
-     {
-     perror("SFPS:ioctl");
-     }
diff --git a/multimedia/mplayer/files/patch-demux_rawdv.c b/multimedia/mplayer/files/patch-demux_rawdv.c
deleted file mode 100644
index 20911c92fa45..000000000000
--- a/multimedia/mplayer/files/patch-demux_rawdv.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmpdemux/demux_rawdv.c.orig	Sat Mar 22 17:31:29 2003
-+++ libmpdemux/demux_rawdv.c	Wed Aug  6 21:10:01 2003
-@@ -40,7 +40,7 @@
- {
-    rawdv_frames_t *frames = (rawdv_frames_t *)demuxer->priv;
-    sh_video_t *sh_video = demuxer->video->sh;
--   int newpos=(flags&1)?0:frames->current_frame;
-+   off_t newpos=(flags&1)?0:frames->current_frame;
-    if(flags&2)
-    {
-       // float 0..1
diff --git a/multimedia/mplayer/files/patch-libao2-ao_oss.c b/multimedia/mplayer/files/patch-libao2-ao_oss.c
deleted file mode 100644
index c384d1da90a4..000000000000
--- a/multimedia/mplayer/files/patch-libao2-ao_oss.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libao2/ao_oss.c.orig	Sun Jul 27 13:41:36 2003
-+++ libao2/ao_oss.c	Sun Jul 27 13:49:37 2003
-@@ -247,7 +247,11 @@
- 	mp_msg(MSGT_AO,MSGL_ERR,"\nFatal error: *** CANNOT RE-OPEN / RESET AUDIO DEVICE *** %s\n", strerror(errno));
- 	return;
-     }
--
-+    
-+#if defined(FD_CLOEXEC) && defined(F_SETFD)
-+  fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
-+#endif
-+  
-   ioctl (audio_fd, SNDCTL_DSP_SETFMT, &ao_data.format);
-   if(ao_data.format != AFMT_AC3) {
-     if (ao_data.channels > 2)
diff --git a/multimedia/mplayer/files/patch-libdha::Makefile b/multimedia/mplayer/files/patch-libdha-Makefile
index da2dbc9bad98..5e2e22cfacf2 100644
--- a/multimedia/mplayer/files/patch-libdha::Makefile
+++ b/multimedia/mplayer/files/patch-libdha-Makefile
@@ -1,5 +1,5 @@
---- libdha/Makefile.orig	Sun Dec 22 01:49:52 2002
-+++ libdha/Makefile	Sat Feb  1 12:10:47 2003
+--- libdha/Makefile.orig	Sat Jan 24 20:54:51 2004
++++ libdha/Makefile	Sat Jan 24 20:55:44 2004
 @@ -4,8 +4,6 @@
  
  MAJOR_VERSION = 0
@@ -9,12 +9,12 @@
  
  ifeq ($(TARGET_OS),CYGWIN)
  SHORTNAME = libdha.dll
-@@ -15,7 +13,7 @@
- #SHORTNAME = libdha.so
- VSHORTNAME = libdha.so
- endif
+@@ -19,7 +17,7 @@
+ LIBNAME = libdha.a
+ SHORTNAME = libdha.a
+ else
 -LIBNAME = libdha.so.$(VERSION)
 +LIBNAME = libdha-$(MAJOR_VERSION).so.$(MINOR_VERSION)
+ endif
  
  SRCS=libdha.c mtrr.c pci.c pci_names.c
- OBJS=$(SRCS:.c=.o)
diff --git a/multimedia/mplayer/files/patch-libvo_font_load.h b/multimedia/mplayer/files/patch-libvo_font_load.h
deleted file mode 100644
index bf6ad7f1f026..000000000000
--- a/multimedia/mplayer/files/patch-libvo_font_load.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- libvo/font_load.h.orig	Tue Mar 16 21:29:40 2004
-+++ libvo/font_load.h	Tue Mar 16 21:29:58 2004
-@@ -2,7 +2,8 @@
- #define __MPLAYER_FONT_LOAD_H
- 
- #ifdef HAVE_FREETYPE
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #endif
- 
- typedef struct {
diff --git a/multimedia/mplayer/files/patch-libvo_font_load_ft.c b/multimedia/mplayer/files/patch-libvo_font_load_ft.c
deleted file mode 100644
index 4197e5c61511..000000000000
--- a/multimedia/mplayer/files/patch-libvo_font_load_ft.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libvo/font_load_ft.c.orig	Tue Mar 16 21:33:42 2004
-+++ libvo/font_load_ft.c	Tue Mar 16 21:34:02 2004
-@@ -20,7 +20,8 @@
- 
- #include <iconv.h>
- 
--#include <freetype/freetype.h>
-+#include <ft2build.h>
-+#include FT_FREETYPE_H
- #include <freetype/ftglyph.h>
- 
- #include "../bswap.h"
diff --git a/multimedia/mplayer/files/patch-loader-ldt_keeper.c b/multimedia/mplayer/files/patch-loader-ldt_keeper.c
deleted file mode 100644
index 16c205ff7830..000000000000
--- a/multimedia/mplayer/files/patch-loader-ldt_keeper.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- loader/ldt_keeper.c.orig	Sun Nov 17 12:41:19 2002
-+++ loader/ldt_keeper.c	Tue Sep  2 17:55:21 2003
-@@ -88,11 +88,16 @@
- #define       LDT_SEL(idx) ((idx) << 3 | 1 << 2 | 3)
- 
- /* i got this value from wine sources, it's the first free LDT entry */
-+#if defined(__FreeBSD__) && defined(LDT_AUTO_ALLOC)
-+#define       TEB_SEL_IDX     LDT_AUTO_ALLOC
-+#endif
-+
- #ifndef       TEB_SEL_IDX
- #define       TEB_SEL_IDX     17
- #endif
- 
--#define       TEB_SEL LDT_SEL(TEB_SEL_IDX)
-+static unsigned int fs_ldt = TEB_SEL_IDX;
-+
- 
- /**
-  * here is a small logical problem with Restore for multithreaded programs -
-@@ -104,8 +109,10 @@
- #endif
- void Setup_FS_Segment(void)
- {
-+    unsigned int ldt_desc = LDT_SEL(fs_ldt);
-+
-     __asm__ __volatile__(
--	"movl %0,%%eax; movw %%ax, %%fs" : : "i" (TEB_SEL)
-+	"movl %0,%%eax; movw %%ax, %%fs" : : "r" (ldt_desc)
-     );
- }
- 
-@@ -211,7 +218,13 @@
-         unsigned long d[2];
- 
-         LDT_EntryToBytes( d, &array );
-+#if defined(__FreeBSD__) && defined(LDT_AUTO_ALLOC)
-+        ret = i386_set_ldt(LDT_AUTO_ALLOC, (union descriptor *)d, 1);
-+        array.entry_number = ret;
-+        fs_ldt = ret;
-+#else
-         ret = i386_set_ldt(array.entry_number, (union descriptor *)d, 1);
-+#endif
-         if (ret < 0)
-         {
-             perror("install_fs");
-@@ -224,7 +237,7 @@
- #if defined(__svr4__)
-     {
- 	struct ssd ssd;
--	ssd.sel = TEB_SEL;
-+	ssd.sel = LDT_SEL(TEB_SEL_IDX);
- 	ssd.bo = array.base_addr;
- 	ssd.ls = array.limit - array.base_addr;
- 	ssd.acc1 = ((array.read_exec_only == 0) << 1) |
diff --git a/multimedia/mplayer/files/patch-loader-win32.c b/multimedia/mplayer/files/patch-loader-win32.c
deleted file mode 100644
index a56f36d3fab8..000000000000
--- a/multimedia/mplayer/files/patch-loader-win32.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- loader/win32.c.orig	Sun Apr  6 01:29:17 2003
-+++ loader/win32.c	Sun Apr  6 01:29:30 2003
-@@ -931,6 +931,8 @@
- 
- 	    switch(gCpuCaps.cpuType)
- 	    {
-+		case CPUTYPE_I686_8:
-+		case CPUTYPE_I686_7:
- 		case CPUTYPE_I686:
- 		case CPUTYPE_I586:
- 		    cachedsi.dwProcessorType = PROCESSOR_INTEL_PENTIUM;
diff --git a/multimedia/mplayer/pkg-message b/multimedia/mplayer/pkg-message
index 15aba7b53e55..29ccbd1264ef 100644
--- a/multimedia/mplayer/pkg-message
+++ b/multimedia/mplayer/pkg-message
@@ -13,7 +13,3 @@ Please take a look at docs in
 If you encounter strange problems, please have a look at
 http://www.rrr.de/~riggs/mplayer/faq_en.html
 before throwing stones at me :-)
-
-CAUTION: Please please please don't use
--funroll-loops in your CFLAGS when compiling this port.
-It WILL NOT WORK for many CPUs.
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index bb64540ab50a..0a653aa52fb6 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -1,27 +1,86 @@
 bin/mplayer
 %%MENCODER%%bin/mencoder
 %%GMPLAYER%%bin/gmplayer
+%%PORTDOCS%%share/doc/mplayer/amiga.html
+%%PORTDOCS%%share/doc/mplayer/aspect.html
+%%PORTDOCS%%share/doc/mplayer/bsd.html
 %%PORTDOCS%%share/doc/mplayer/bugreports.html
+%%PORTDOCS%%share/doc/mplayer/bugreports_advusers.html
+%%PORTDOCS%%share/doc/mplayer/bugreports_fix.html
+%%PORTDOCS%%share/doc/mplayer/bugreports_report.html
+%%PORTDOCS%%share/doc/mplayer/bugreports_what.html
+%%PORTDOCS%%share/doc/mplayer/bugreports_where.html
+%%PORTDOCS%%share/doc/mplayer/bugs-audio.html
+%%PORTDOCS%%share/doc/mplayer/bugs-special.html
+%%PORTDOCS%%share/doc/mplayer/bugs.html
 %%PORTDOCS%%share/doc/mplayer/cd-dvd.html
-%%PORTDOCS%%share/doc/mplayer/codecs-in.html
 %%PORTDOCS%%share/doc/mplayer/codecs.html
-%%PORTDOCS%%share/doc/mplayer/documentation.html
-%%PORTDOCS%%share/doc/mplayer/encoding.html
+%%PORTDOCS%%share/doc/mplayer/commandline.html
+%%PORTDOCS%%share/doc/mplayer/control.html
+%%PORTDOCS%%share/doc/mplayer/custommatrices.html
+%%PORTDOCS%%share/doc/mplayer/default.css
+%%PORTDOCS%%share/doc/mplayer/devices.html
+%%PORTDOCS%%share/doc/mplayer/drives.html
+%%PORTDOCS%%share/doc/mplayer/dvd.html
+%%PORTDOCS%%share/doc/mplayer/edl.html
 %%PORTDOCS%%share/doc/mplayer/faq.html
+%%PORTDOCS%%share/doc/mplayer/features.html
 %%PORTDOCS%%share/doc/mplayer/formats.html
+%%PORTDOCS%%share/doc/mplayer/gcc-296.html
+%%PORTDOCS%%share/doc/mplayer/gui.html
+%%PORTDOCS%%share/doc/mplayer/history.html
+%%PORTDOCS%%share/doc/mplayer/howtoread.html
+%%PORTDOCS%%share/doc/mplayer/hpux.html
+%%PORTDOCS%%share/doc/mplayer/index.html
+%%PORTDOCS%%share/doc/mplayer/install.html
+%%PORTDOCS%%share/doc/mplayer/intro.html
+%%PORTDOCS%%share/doc/mplayer/irix.html
+%%PORTDOCS%%share/doc/mplayer/joe-barr.html
+%%PORTDOCS%%share/doc/mplayer/linux.html
+%%PORTDOCS%%share/doc/mplayer/macos.html
+%%PORTDOCS%%share/doc/mplayer/mailinglists.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-divx4.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-dvd-mpeg4.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-enc-images.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-enc-libavcodec.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-telecine.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-mpeg.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-extractsub.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-fix-avi.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-rescale.html
+%%PORTDOCS%%share/doc/mplayer/menc-feat-streamcopy.html
+%%PORTDOCS%%share/doc/mplayer/mencoder.html
+%%PORTDOCS%%share/doc/mplayer/mplayer-binary.html
+%%PORTDOCS%%share/doc/mplayer/mpst.html
+%%PORTDOCS%%share/doc/mplayer/nvidia-opinions.html
+%%PORTDOCS%%share/doc/mplayer/patches.html
+%%PORTDOCS%%share/doc/mplayer/ports.html
+%%PORTDOCS%%share/doc/mplayer/qnx.html
+%%PORTDOCS%%share/doc/mplayer/rtc.html
 %%PORTDOCS%%share/doc/mplayer/skin.html
-%%PORTDOCS%%share/doc/mplayer/sound.html
-%%PORTDOCS%%share/doc/mplayer/video.html
-%%PORTDOCS%%share/doc/mplayer/users_against_developers.html
+%%PORTDOCS%%share/doc/mplayer/skin-file.html
+%%PORTDOCS%%share/doc/mplayer/skin-fonts.html
+%%PORTDOCS%%share/doc/mplayer/skin-gui.html
+%%PORTDOCS%%share/doc/mplayer/skin-overview.html
+%%PORTDOCS%%share/doc/mplayer/solaris.html
+%%PORTDOCS%%share/doc/mplayer/streaming.html
+%%PORTDOCS%%share/doc/mplayer/subosd.html
+%%PORTDOCS%%share/doc/mplayer/tv-input.html
+%%PORTDOCS%%share/doc/mplayer/usage.html
+%%PORTDOCS%%share/doc/mplayer/users-vs-dev.html
+%%PORTDOCS%%share/doc/mplayer/vcd.html
+%%PORTDOCS%%share/doc/mplayer/windows.html
 %%VIDIX%%lib/libdha.so.0
 %%VIDIX%%lib/libdha-0.so.1
 %%VIDIX%%lib/mplayer/vidix/cyberblade_vid.so
 %%VIDIX%%lib/mplayer/vidix/mach64_vid.so
 %%VIDIX%%lib/mplayer/vidix/mga_crtc2_vid.so
 %%VIDIX%%lib/mplayer/vidix/mga_vid.so
+%%VIDIX%%lib/mplayer/vidix/nvidia_vid.so
 %%VIDIX%%lib/mplayer/vidix/pm3_vid.so
 %%VIDIX%%lib/mplayer/vidix/radeon_vid.so
 %%VIDIX%%lib/mplayer/vidix/rage128_vid.so
+%%VIDIX%%lib/mplayer/vidix/sis_vid.so
 share/mplayer/tools/calcbpp.pl
 share/mplayer/tools/countquant.pl
 share/mplayer/tools/dvd2divxscript.pl