- Update to 1.0rc1, which brings goodies like native WMV9/VC-1 playback, faster

  h.264 decoding, ability to switch audio stream during DVD playback and much
  more

Submitted by:	Thomas E. Zander <riggs@rrr.de> (maintainer)
Thanks to:	itetcu

9 files changed, 120 insertions, 181 deletions

diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index 62fe3c918ef..5e0b0bb59f1 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -83,8 +83,7 @@
 #
 
 PORTNAME=	mplayer
-PORTVERSION=	0.99.8
-PORTREVISION=	5
+PORTVERSION=	0.99.10
 CATEGORIES=	multimedia audio
 MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
 		http://www2.mplayerhq.hu/MPlayer/releases/ \
@@ -96,7 +95,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-1.0pre8
+DISTNAME=	MPlayer-1.0rc1
 
 MAINTAINER=	riggs@rrr.de
 COMMENT=	High performance media player/encoder supporting many formats
@@ -119,9 +118,7 @@ CONFIGURE_ARGS=	--with-extralibdir=${LOCALBASE}/lib \
 		--disable-libfame \
 		--disable-external-faad \
 		--disable-external-vidix \
-		--disable-tv-v4l \
-		--disable-liblzo \
-		--disable-libcdio
+		--disable-tv-v4l
 
 OPTIONS=	DEBUG "Include debug symbols in mplayer's binary files" off
 
@@ -141,14 +138,20 @@ OPTIONS+=	FREETYPE "Use freetype for OSD fonts (TrueType!)" on
 OPTIONS+=	RTC "Add support for kernel real time clock timing" off
 OPTIONS+=	ARTS "Enable KDE sound system support" off
 OPTIONS+=	ESOUND "Enable GNOME esound support" off
+OPTIONS+=	JACK "Enable JackIt audio server support" off
 OPTIONS+=	POLYP "Enable polyp sound server support" off
+OPTIONS+=	OPENAL "Enable OpenAL sound support" off
 OPTIONS+=	LIBUNGIF "Enable gif support" on
 OPTIONS+=	AALIB "Enable aalib support" off
 OPTIONS+=	LIBCACA "Enable libcaca support" off
 OPTIONS+=	SVGALIB "Enable svgalib support" off
 OPTIONS+=	LIBDV "Enable libdv support" off
 OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
+OPTIONS+=	TWOLAME "Enable twolame MPEG audio codec support" off
 OPTIONS+=	DTS "Enable DTS audio codec support" on
+OPTIONS+=	LIBMPCDEC "Enable libmpcdec support" off
+OPTIONS+=	FAAC "Enable FAAC audio codec support" off
+OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
 OPTIONS+=	SPEEX "Enable speex audio codec support" off
 OPTIONS+=	TREMOR "Use built-in tremor instead of libvorbis" off
 OPTIONS+=	XMMS "Enable XMMS plugin support" off
@@ -161,7 +164,9 @@ OPTIONS+=	REALPLAYER "Enable real player plugin" off
 OPTIONS+=	LIVEMEDIA "Enable LIVE555 streaming support" off
 OPTIONS+=	FRIBIDI "Enable FriBiDi support" off
 OPTIONS+=	LIRC "Enable lirc support" off
+OPTIONS+=	LIBCDIO "Enable libcdio support" off
 OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
+OPTIONS+=	LIBLZO "Enable external liblzo library" off
 .endif
 
 WANT_GNOME=	yes
@@ -179,6 +184,7 @@ TOOLFILES=	calcbpp.pl countquant.pl dvd2divxscript.pl \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 500000
+USE_GCC=	3.4+
 CFLAGS+=	-Duint_fast64_t=uint64_t
 CFLAGS+=	-Droundf=rintf
 .if ${ARCH} == "i386"
@@ -216,7 +222,7 @@ PLIST_SUB+=	VIDIX="@comment "
 #Compiler flags
 CFLAGS=		#let mplayer decide the flags
 
-.for module in ARTS FRIBIDI CDPARANOIA LIBCACA LIBUNGIF LIBDV MAD THEORA X264 FRIBIDI LIVEMEDIA ESOUND OCFLAGS RTC MENCODER NVIDIA LIRC XMMS
+.for module in ARTS CDPARANOIA LIBCACA LIBUNGIF LIBDV MAD THEORA X264 FRIBIDI LIVEMEDIA ESOUND OCFLAGS RTC MENCODER NVIDIA LIRC XMMS
 WITHOUT_${module}=yes
 .undef(WITH_${module})
 .endfor
@@ -237,7 +243,7 @@ CFLAGS+=	-fno-force-addr
 
 .if !defined(WITHOUT_X11)
 USE_XLIB=	yes
-CFLAGS+=	-I${X11BASE}/include
+#CFLAGS+=	-I${X11BASE}/include
 CONFIGURE_ARGS+=--with-x11libdir=${X11BASE}/lib \
 		--with-x11incdir=${X11BASE}/include
 .else
@@ -266,10 +272,6 @@ PLIST_SUB+=	GMPLAYER=""
 RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
 .endif
 
-.if ( ${OSVERSION} < 500000 )
-USE_GCC=	3.4
-.endif
-
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gui
 
@@ -319,6 +321,12 @@ CONFIGURE_ARGS+=	--enable-fribidi
 CONFIGURE_ARGS+=	--disable-fribidi
 .endif
 
+.if defined(WITH_LIBCDIO) && !defined(WITH_CDPARANOIA)
+BUILD_DEPENDS+=	${LOCALBASE}/include/cdio/cdio.h:${PORTSDIR}/sysutils/libcdio
+.else
+CONFIGURE_ARGS+=	--disable-libcdio
+.endif
+
 .if defined(WITH_CDPARANOIA)
 LIB_DEPENDS+=	cdda_paranoia.0:${PORTSDIR}/audio/cdparanoia
 .else
@@ -340,7 +348,6 @@ CONFIGURE_ARGS+=	--disable-gif
 
 .if defined(WITH_LIBDV)
 LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
-
 CONFIGURE_ARGS+=	--enable-libdv
 .else
 CONFIGURE_ARGS+=	--disable-libdv
@@ -353,6 +360,12 @@ CONFIGURE_ARGS+=	--enable-lirc
 CONFIGURE_ARGS+=	--disable-lirc
 .endif
 
+.if defined(WITH_TWOLAME)
+LIB_DEPENDS+=	twolame.0:${PORTSDIR}/audio/twolame
+.else
+CONFIGURE_ARGS+=	--disable-twolame
+.endif
+
 .if defined(WITH_MAD)
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
 
@@ -402,6 +415,12 @@ USE_GNOME+=	esound
 CONFIGURE_ARGS+=	--disable-esd
 .endif
 
+.if defined(WITH_JACK)
+LIB_DEPENDS+=	jack.0:${PORTSDIR}/audio/jack
+.else
+CONFIGURE_ARGS+=	--disable-jack
+.endif
+
 .if defined(WITH_POLYP)
 CONFIGURE_ARGS+=	--enable-polyp
 LIB_DEPENDS+=		polyp-0.7.0:${PORTSDIR}/audio/polypaudio
@@ -409,6 +428,12 @@ LIB_DEPENDS+=		polyp-0.7.0:${PORTSDIR}/audio/polypaudio
 CONFIGURE_ARGS+=	--disable-polyp
 .endif
 
+.if defined(WITH_OPENAL)
+LIB_DEPENDS+=	openal.0:${PORTSDIR}/audio/openal
+.else
+CONFIGURE_ARGS+=	--disable-openal
+.endif
+
 .if !defined(WITH_TREMOR)
 CONFIGURE_ARGS+=	--disable-internal-tremor
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
@@ -459,6 +484,24 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libdts.a:${PORTSDIR}/multimedia/libdts
 CONFIGURE_ARGS+=	--disable-libdts
 .endif
 
+.if defined(WITH_LIBMPCDEC)
+LIB_DEPENDS+=	mpcdec.4:${PORTSDIR}/audio/libmpcdec
+.else
+CONFIGURE_ARGS+=	--disable-musepack
+.endif
+
+.if defined(WITH_FAAC)
+LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
+.else
+CONFIGURE_ARGS+=	--disable-faac
+.endif
+
+.if defined(WITH_LADSPA)
+RUN_DEPENDS+=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
+.else
+CONFIGURE_ARGS+=	--disable-ladspa
+.endif
+
 .if !defined(WITHOUT_SPEEX)
 CONFIGURE_ARGS+=	--enable-speex
 LIB_DEPENDS+=	speex.3:${PORTSDIR}/audio/speex
@@ -471,7 +514,9 @@ CONFIGURE_ARGS+=	--with-extraincdir=${LOCALBASE}/include/freetype2 \
 			--enable-freetype
 LIB_DEPENDS+=		freetype.9:${PORTSDIR}/print/freetype2
 .else
+.if !defined(WITHOUT_X11)
 RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts
+.endif
 CONFIGURE_ARGS+=	--disable-freetype
 .endif
 
@@ -482,6 +527,12 @@ CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${X11BASE}/lib/X11/xanim
 CONFIGURE_ARGS+=--disable-xanim
 .endif
 
+.if defined(WITH_LIBLZO)
+LIB_DEPENDS+=		lzo.1:${PORTSDIR}/archivers/lzo
+.else
+CONFIGURE_ARGS+=	--disable-liblzo
+.endif
+
 .if defined(WITH_DVD_DEVICE)
 DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
 .else
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 26f65ae9056..bd09730976f 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-MD5 (MPlayer-1.0pre8.tar.bz2) = f82bb2bc51b6cd5e5dd96f88f6f98582
-SHA256 (MPlayer-1.0pre8.tar.bz2) = 4e611138efb3709e650e3770bb3f33609f3fd04047932c830e52a02e0e97efcc
-SIZE (MPlayer-1.0pre8.tar.bz2) = 8166628
+MD5 (MPlayer-1.0rc1.tar.bz2) = 18c05d88e22c3b815a43ca8d7152ccdc
+SHA256 (MPlayer-1.0rc1.tar.bz2) = 8dd9dd61a0fe56904f5b76ddedb99bd359abaaf486e0b83b45e3357fecc81063
+SIZE (MPlayer-1.0rc1.tar.bz2) = 8414213
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
index d5a5ff8338d..a9d297a6374 100644
--- a/multimedia/mplayer/files/patch-ad
+++ b/multimedia/mplayer/files/patch-ad
@@ -1,6 +1,6 @@
---- configure.orig	Sun Jun 11 20:35:47 2006
-+++ configure	Tue Jul 11 23:56:05 2006
-@@ -61,9 +61,9 @@
+--- configure.orig	Mon Oct 23 00:32:31 2006
++++ configure	Tue Oct 24 22:19:10 2006
+@@ -59,9 +59,9 @@
    echo >> "$TMPLOG"
    cat "$1" >> "$TMPLOG"
    echo >> "$TMPLOG"
@@ -12,16 +12,16 @@
    TMP="$?"
    echo >> "$TMPLOG"
    echo "ldd $TMPO" >> "$TMPLOG"
-@@ -453,7 +453,7 @@
- _sse=auto
- _sse2=auto
+@@ -474,7 +474,7 @@
+ _armv5te=auto
+ _iwmmxt=auto
  _mtrr=auto
 -_install=install
 +_install=@${BSD_INSTALL_PROGRAM}
  _ranlib=ranlib
  _cc=cc
  test "$CC" && _cc="$CC"
-@@ -574,14 +574,7 @@
+@@ -599,14 +599,7 @@
        case "`uname -m 2>&1`" in
        i[3-9]86*|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686|BePC) host_arch=i386 ;;
        ia64) host_arch=ia64 ;;
@@ -37,7 +37,7 @@
        macppc|ppc|ppc64) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
        sparc) host_arch=sparc ;;
-@@ -806,25 +799,10 @@
+@@ -831,25 +824,10 @@
  _cpuinfo="echo"
  # Cygwin has /proc/cpuinfo, but only supports Intel CPUs
  # FIXME: Remove the cygwin check once AMD CPUs are supported
@@ -54,7 +54,7 @@
 -elif aix; then
 -  # use 'lsattr' on AIX
 -  _cpuinfo="lsattr -E -l proc0 -a type"
--elif x86; then
+-elif x86 || x86_64; then
    # all other OSes try to extract CPU information from a small helper
    # program TOOLS/cpuinfo instead
    $_cc -o TOOLS/cpuinfo TOOLS/cpuinfo.c
@@ -63,7 +63,7 @@
  
  if x86 || x86_64 ; then
    # gather more CPU information
-@@ -1526,7 +1504,7 @@
+@@ -1539,7 +1517,7 @@
    fi
    _stripbinaries=no
  elif test -z "$CFLAGS" ; then
@@ -72,7 +72,7 @@
  else
    _warn_CFLAGS=yes
  fi
-@@ -2177,8 +2155,7 @@
+@@ -2204,8 +2182,7 @@
      ;;
  
    *)
@@ -82,7 +82,7 @@
      ;;
  
    esac
-@@ -2826,13 +2803,7 @@
+@@ -2898,13 +2875,7 @@
  
  
  echocheck "memalign()"
@@ -96,11 +96,11 @@
  if test "$_memalign" = yes ; then
   _def_memalign='#define HAVE_MEMALIGN 1'
  else
-@@ -2931,20 +2902,8 @@
+@@ -3005,20 +2976,8 @@
  _def_threads='#undef HAVE_THREADS'
  
  echocheck "pthread"
--if test "$_pthreads" != no ; then
+-if test "$_pthreads" = auto ; then
 -cat > $TMPC << EOF
 -#include <pthread.h>
 -void* func(void *arg) { return arg; }
@@ -119,17 +119,17 @@
  if test "$_pthreads" = yes ; then
    _res_comment="using $_ld_pthread"
    _def_pthreads='#define HAVE_PTHREADS 1'
-@@ -6529,7 +6488,8 @@
+@@ -6555,7 +6514,8 @@
  #endif
  int main(void) { x264_encoder_open((void*)0); return 0; }
  EOF
--_ld_x264="$_ld_x264 -lx264 $_ld_pthread"
-+_ld_x264pc=`pkg-config x264 --libs 2>/dev/null`
-+_ld_x264="$_ld_x264 $_ld_x264pc $_ld_pthread"
- if test "$_x264" != no ; then 
+-  _ld_x264="$_ld_x264 -lx264 $_ld_pthread"
++  _ld_x264pc=`pkg-config x264 --libs 2>/dev/null`
++  _ld_x264="$_ld_x264 $_ld_x264pc $_ld_pthread"
    _x264=no
-   if cc_check $_inc_x264 $_ld_x264 $_ld_lm ; then 
-@@ -6723,8 +6683,11 @@
+   if cc_check $_ld_x264 $_ld_lm ; then 
+     _x264=yes
+@@ -6685,8 +6645,11 @@
   if test "$_tv" = yes ; then
      cat > $TMPC <<EOF
  #include <sys/types.h>
@@ -141,7 +141,7 @@
  #else
  #include <machine/ioctl_bt848.h>
  #endif
-@@ -7166,7 +7129,7 @@
+@@ -7218,7 +7181,7 @@
    CFLAGS="$CFLAGS -D_REENTRANT"
  elif bsd ; then
    # FIXME bsd needs this so maybe other OS'es
@@ -150,19 +150,3 @@
  fi
  # 64 bit file offsets?
  if test "$_largefiles" = yes || freebsd ; then
-@@ -7318,13 +7281,11 @@
- echocheck "lirc"
- if test "$_lirc" = auto ; then
-   _lirc=no
--  if test -c /dev/lirc -o -c /dev/lirc/0 ; then
--      cat > $TMPC <<EOF
-+  cat > $TMPC <<EOF
- #include <lirc/lirc_client.h>
- int main(void) { return 0; }
- EOF
--      cc_check -llirc_client && _lirc=yes
--  fi
-+  cc_check -llirc_client && _lirc=yes
- fi
- if test "$_lirc" = yes ; then
-   _def_lirc='#define HAVE_LIRC 1'
diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae
index 6cf53e676b0..7f20ee2f144 100644
--- a/multimedia/mplayer/files/patch-ae
+++ b/multimedia/mplayer/files/patch-ae
@@ -1,6 +1,6 @@
---- Makefile.orig	Thu Jun 15 10:20:29 2006
-+++ Makefile	Thu Jun 15 10:27:06 2006
-@@ -446,47 +446,11 @@
+--- Makefile.orig	Mon Oct 23 00:32:31 2006
++++ Makefile	Tue Oct 24 21:35:42 2006
+@@ -414,43 +414,11 @@
  	$(MAKE) -C libdha install
  	$(MAKE) -C vidix install
  endif
@@ -24,18 +24,14 @@
 -	$(INSTALL) -m 755 $(INSTALLSTRIP) $(PRG_MENCODER) $(BINDIR)/$(PRG_MENCODER)
 -	for i in $(MAN_LANG); do \
 -		if test "$$i" = en ; then \
--			ln -sf mplayer.1 $(MANDIR)/man1/mencoder.1 ; \
+-			cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
 -		else \
--			ln -sf mplayer.1 $(MANDIR)/$$i/man1/mencoder.1 ; \
+-			cd $(MANDIR)/$$i/man1 && ln -sf mplayer.1 mencoder.1 ; \
 -		fi ; \
 -	done
 -endif
 -	@$(INSTALL) -d $(DATADIR)
 -	@$(INSTALL) -d $(DATADIR)/font
--	@if test ! -f $(DATADIR)/font/font.desc ; then \
--	echo "*** Download font at http://www.mplayerhq.hu/dload.html" ; \
--	echo "*** for OSD/Subtitles support and extract to $(DATADIR)/font/" ; \
--	fi
 -ifeq ($(GUI),yes)
 -	@$(INSTALL) -d $(DATADIR)/skins
 -	@echo "*** Download skin(s) at http://www.mplayerhq.hu/dload.html"
diff --git a/multimedia/mplayer/files/patch-libmpcodecs_ve_x264.c b/multimedia/mplayer/files/patch-libmpcodecs_ve_x264.c
deleted file mode 100644
index 17ebf5cd9a4..00000000000
--- a/multimedia/mplayer/files/patch-libmpcodecs_ve_x264.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- libmpcodecs/ve_x264.c.orig	Sun Jun 11 18:35:41 2006
-+++ libmpcodecs/ve_x264.c	Fri Nov  3 17:05:22 2006
-@@ -208,7 +208,7 @@
- };
- 
- static int parse_cqm(const char *str, uint8_t *cqm, int length,
--                     h264_module_t *mod, char *matrix_name) {
-+                     h264_module_t *mod, const char *matrix_name) {
-     int i;
-     if (!str) return 0;
-     for (i = 0; i < length; i++) {
-@@ -247,8 +247,11 @@
-     mod->param.i_deblocking_filter_beta = deblockbeta;
-     mod->param.b_cabac = cabac;
- 
-+    mod->param.rc.i_rc_method = X264_RC_CQP;
-     mod->param.rc.i_qp_constant = qp_constant;
--    mod->param.rc.i_rf_constant = rf_constant;
-+    if(rf_constant > 0)
-+        mod->param.rc.i_rc_method = X264_RC_CRF;
-+    mod->param.rc.f_rf_constant = rf_constant;
-     if(qp_min > qp_constant)
-         qp_min = qp_constant;
-     if(qp_max < qp_constant)
-@@ -275,7 +278,7 @@
-                    "VBV requires both vbv_maxrate and vbv_bufsize.\n");
-             return 0;
-         }
--        mod->param.rc.b_cbr = 1;
-+        mod->param.rc.i_rc_method = X264_RC_ABR;
-         mod->param.rc.i_bitrate = bitrate;
-         mod->param.rc.f_rate_tolerance = ratetol;
-         mod->param.rc.i_vbv_max_bitrate = vbv_maxrate;
diff --git a/multimedia/mplayer/files/patch-libmpdemux_cookies.c b/multimedia/mplayer/files/patch-stream-cookies.c
index d5d7e4fba37..1f9bda62102 100644
--- a/multimedia/mplayer/files/patch-libmpdemux_cookies.c
+++ b/multimedia/mplayer/files/patch-stream-cookies.c
@@ -1,6 +1,6 @@
---- libmpdemux/cookies.c.orig	Mon Jun 12 03:35:46 2006
-+++ libmpdemux/cookies.c	Tue Aug 15 03:01:58 2006
-@@ -20,6 +20,10 @@
+--- stream/cookies.c.orig	Mon Oct 23 00:32:25 2006
++++ stream/cookies.c	Tue Oct 24 21:52:00 2006
+@@ -21,6 +21,10 @@
  
  #define MAX_COOKIES 20
  
diff --git a/multimedia/mplayer/files/patch-libmpdemux_tvi_bsdbt848.c b/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
index cf4cd1e08bd..379b6705087 100644
--- a/multimedia/mplayer/files/patch-libmpdemux_tvi_bsdbt848.c
+++ b/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
@@ -1,7 +1,7 @@
---- libmpdemux/tvi_bsdbt848.c.orig	Tue Dec 28 04:30:14 2004
-+++ libmpdemux/tvi_bsdbt848.c	Fri Dec 16 20:42:14 2005
-@@ -296,11 +296,11 @@
-         int req_mode = (int)*(void **)arg;
+--- stream/tvi_bsdbt848.c.orig	Mon Oct 23 00:32:25 2006
++++ stream/tvi_bsdbt848.c	Tue Oct 24 21:54:45 2006
+@@ -297,11 +297,11 @@
+         int req_mode = *(int *)arg;
  	u_short tmp_fps;
  
 -        priv->iformat = METEOR_FMT_AUTOMODE;
@@ -14,7 +14,7 @@
              priv->maxheight = PAL_HEIGHT;
              priv->maxwidth = PAL_WIDTH;
              priv->maxfps = PAL_FPS;
-@@ -321,7 +321,7 @@
+@@ -322,7 +322,7 @@
  
          if(req_mode == TV_NORM_NTSC) 
              {
@@ -23,7 +23,7 @@
              priv->maxheight = NTSC_HEIGHT;
              priv->maxwidth = NTSC_WIDTH;
              priv->maxfps = NTSC_FPS;
-@@ -345,9 +345,28 @@
+@@ -346,9 +346,28 @@
                  }
              }
  
@@ -54,7 +54,7 @@
              {
              perror("format:ioctl");
              return(TVI_CONTROL_FALSE);
-@@ -478,7 +497,7 @@
+@@ -479,7 +498,7 @@
  priv->videoready = TRUE;
  priv->btdev = strdup("/dev/bktr0");
  priv->immediatemode = FALSE;
@@ -63,7 +63,7 @@
  priv->maxheight = PAL_HEIGHT;
  priv->maxwidth = PAL_WIDTH;
  priv->maxfps = PAL_FPS;
-@@ -503,7 +522,7 @@
+@@ -504,7 +523,7 @@
      }
  
  if(priv->videoready == TRUE && 
diff --git a/multimedia/mplayer/files/patch-vidix-drivers-Makefile b/multimedia/mplayer/files/patch-vidix-drivers-Makefile
index d39d65e13b2..d8e995550ae 100644
--- a/multimedia/mplayer/files/patch-vidix-drivers-Makefile
+++ b/multimedia/mplayer/files/patch-vidix-drivers-Makefile
@@ -1,67 +1,11 @@
---- vidix/drivers/Makefile.orig	Mon May 31 16:15:35 2004
-+++ vidix/drivers/Makefile	Thu Jul 22 22:30:40 2004
-@@ -8,55 +8,55 @@
- CYBERBLADE_SRCS=cyberblade_vid.c
- CYBERBLADE_OBJS=cyberblade_vid.o
- CYBERBLADE_LIBS=-L../../libdha -ldha -lm
--CYBERBLADE_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+CYBERBLADE_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- RADEON_VID=radeon_vid.so
- RADEON_SRCS=radeon_vid.c
- RADEON_OBJS=radeon_vid.o
- RADEON_LIBS=-L../../libdha -ldha -lm $(X_LIB)
--RADEON_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+RADEON_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- RAGE128_VID=rage128_vid.so
- RAGE128_SRCS=radeon_vid.c
- RAGE128_OBJS=rage128_vid.o
- RAGE128_LIBS=-L../../libdha -ldha -lm $(X_LIB)
--RAGE128_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128
-+RAGE128_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DRAGE128
- 
- PM3_VID=pm3_vid.so
- PM3_SRCS=pm3_vid.c
- PM3_OBJS=pm3_vid.o
- PM3_LIBS=-L../../libdha -ldha
--PM3_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+PM3_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- MACH64_VID=mach64_vid.so
- MACH64_SRCS=mach64_vid.c
- MACH64_OBJS=mach64_vid.o
- MACH64_LIBS=-L../../libdha -ldha
--MACH64_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DRAGE128
-+MACH64_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DRAGE128
- 
- MGA_VID=mga_vid.so
- MGA_SRCS=mga_vid.c
- MGA_OBJS=mga_vid.o
- MGA_LIBS=-L../../libdha -ldha -lm
--MGA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+MGA_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- MGA_CRTC2_VID=mga_crtc2_vid.so
- MGA_CRTC2_SRCS=mga_vid.c
- MGA_CRTC2_OBJS=mga_crtc2_vid.o
- MGA_CRTC2_LIBS=-L../../libdha -ldha -lm
--MGA_CRTC2_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. -DCRTC2
-+MGA_CRTC2_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I.. -DCRTC2
- 
- NVIDIA_VID=nvidia_vid.so
- NVIDIA_SRCS=nvidia_vid.c
- NVIDIA_OBJS=nvidia_vid.o
- NVIDIA_LIBS=-L../../libdha -ldha -lm
--NVIDIA_CFLAGS=$(OPTFLAGS) -fPIC -I. -I.. 
-+NVIDIA_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- SIS_VID=sis_vid.so
- SIS_SRCS=sis_vid.c sis_bridge.c
- SIS_OBJS=sis_vid.o sis_bridge.o
- SIS_LIBS=-L../../libdha -ldha
--SIS_CFLAGS=$(OPTFLAGS) -fPIC -I. -I..
-+SIS_CFLAGS=$(OPTFLAGS) $(X11_INC) -fPIC -I. -I..
- 
- all:    $(CYBERBLADE_VID) $(RADEON_VID) $(RAGE128_VID) $(MACH64_VID) $(NVIDIA_VID) $(GENFB_VID) $(MGA_VID) $(MGA_CRTC2_VID) $(PM3_VID) $(SIS_VID)
- 
+--- vidix/drivers/Makefile.orig	Mon Oct 23 00:32:26 2006
++++ vidix/drivers/Makefile	Tue Oct 24 22:04:38 2006
+@@ -6,7 +6,7 @@
+ VIDIX_LIBS = -L../../libdha -ldha
+ VIDIX_LIBS_M = $(VIDIX_LIBS) -lm
+ VIDIX_LIBS_X = $(VIDIX_LIBS_M) $(X_LIB)
+-VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) -fPIC
++VIDIX_CFLAGS= -I. -I.. $(OPTFLAGS) $(X11_INC) -fPIC
+ 
+ RAGE128_CFLAGS=$(VIDIX_CFLAGS) -DRAGE128
+ MGA_CRTC2_CFLAGS=$(VIDIX_CFLAGS) -DCRTC2
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index 6f2e9d95434..269df77d447 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -32,22 +32,20 @@ bin/mplayer
 %%PORTDOCS%%%%DOCSDIR%%/exotic_platforms.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/features.html
-%%PORTDOCS%%%%DOCSDIR%%/gcc-296.html
+%%PORTDOCS%%%%DOCSDIR%%/fonts-osd.html
 %%PORTDOCS%%%%DOCSDIR%%/gui.html
 %%PORTDOCS%%%%DOCSDIR%%/history.html
 %%PORTDOCS%%%%DOCSDIR%%/howtoread.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/install.html
-%%PORTDOCS%%%%DOCSDIR%%/installation_codecs.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/joe-barr.html
 %%PORTDOCS%%%%DOCSDIR%%/linux.html
 %%PORTDOCS%%%%DOCSDIR%%/macos.html
-%%PORTDOCS%%%%DOCSDIR%%/mailinglists.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-dvd-mpeg4.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-enc-images.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-enc-libavcodec.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-extractsub.html
+%%PORTDOCS%%%%DOCSDIR%%/menc-feat-handheld-psp.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-mpeg.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-mpeg4.html
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-rescale.html
@@ -61,13 +59,13 @@ bin/mplayer
 %%PORTDOCS%%%%DOCSDIR%%/menc-feat-xvid.html
 %%PORTDOCS%%%%DOCSDIR%%/mencoder.html
 %%PORTDOCS%%%%DOCSDIR%%/mpeg_decoders.html
-%%PORTDOCS%%%%DOCSDIR%%/mplayer-binary.html
 %%PORTDOCS%%%%DOCSDIR%%/mpst.html
 %%PORTDOCS%%%%DOCSDIR%%/mtrr.html
-%%PORTDOCS%%%%DOCSDIR%%/nvidia-opinions.html
 %%PORTDOCS%%%%DOCSDIR%%/other.html
 %%PORTDOCS%%%%DOCSDIR%%/output-trad.html
 %%PORTDOCS%%%%DOCSDIR%%/ports.html
+%%PORTDOCS%%%%DOCSDIR%%/radio-input.html
+%%PORTDOCS%%%%DOCSDIR%%/radio.html
 %%PORTDOCS%%%%DOCSDIR%%/rtc.html
 %%PORTDOCS%%%%DOCSDIR%%/skin-file.html
 %%PORTDOCS%%%%DOCSDIR%%/skin-fonts.html
@@ -86,7 +84,6 @@ bin/mplayer
 %%PORTDOCS%%%%DOCSDIR%%/tvout.html
 %%PORTDOCS%%%%DOCSDIR%%/unix.html
 %%PORTDOCS%%%%DOCSDIR%%/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/users-vs-dev.html
 %%PORTDOCS%%%%DOCSDIR%%/vcd.html
 %%PORTDOCS%%%%DOCSDIR%%/video-cards.html
 %%PORTDOCS%%%%DOCSDIR%%/video-codecs.html