author: Martin Matuska <mm@FreeBSD.org> 2010-04-21 13:07:23 +0000
committer: Martin Matuska <mm@FreeBSD.org> 2010-04-21 13:07:23 +0000
commit: c2902ebdd2f0afbf27998afd98dc20876a812226 (patch)
tree: 61d590d42ee6a8e07b926a95cd4125c6af006965 /multimedia
parent: 15818eeb8efc009d25959bb294f5cf9d75ebe316 (diff)
39 files changed, 368 insertions, 1088 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index b3eca2289e9f..6e8a950b5ae7 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -6,40 +6,36 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	6
 COMMENT=	Convenient video file and movie encoder
 NO_PACKAGE=	Port has restricted dependencies
 
 .include "${.CURDIR}/../mplayer/Makefile.shared"
 
-OPTIONS=	DEBUG "Include debug symbols in mencoder's binary files" off
-OPTIONS+=	RTCPU "Let mplayer dynamically check for CPU features" on
+OPTIONS=	DEBUG "Include debug symbols in mencoder's binary" off
+OPTIONS+=	RTCPU "Allow runtime CPU detection" on
 OPTIONS+=	OCFLAGS "Use optimized compiler flags" on
-OPTIONS+=	SIMD "Allow mplayer to use vector engines (MMX...)" on
 OPTIONS+=	IPV6 "Include inet6 network support" on
 OPTIONS+=	JACK "Enable JackIt audio server support" off
-#OPTIONS+=	POLYP "Enable polyp sound server support" off
 OPTIONS+=	NAS "Enable NAS sound server support" off
 OPTIONS+=	OPENAL "Enable OpenAL sound support" off
+OPTIONS+=	PULSE "Enable PulseAudio" off
 OPTIONS+=	LIBUNGIF "Enable gif support" on
+OPTIONS+=	OPENJPEG "Enable JPEG2000 support" off
 OPTIONS+=	LIBDV "Enable libdv support" off
 OPTIONS+=	MAD "Enable mad MPEG audio engine support" off
+OPTIONS+=	AMR "Enable opencore AMR audio codec 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
 OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
 OPTIONS+=	THEORA "Enable ogg theora video support" off
-.if !defined(PACKAGE_BUILDING)
-OPTIONS+=	AMR "Enable AMR audio codec support" off
-.endif
-OPTIONS+=	X264 "Enable x264 (H.264) video codec support" off
-OPTIONS+=	XANIM "Enable xanim DLL support" off
 OPTIONS+=	XVID "Enable XVID video codec support" on
+OPTIONS+=	X264 "Enable x264 (H.264) video codec support" on
+OPTIONS+=	DIRAC "Enable dirac video codec support" off
+OPTIONS+=	SCHROEDINGER "Dirac codec via libschroedinger" off
 OPTIONS+=	REALPLAYER "Enable real player plugin" off
 OPTIONS+=	LIVEMEDIA "Enable LIVE555 streaming support" off
 OPTIONS+=	SMB "Enable Samba input support" off
@@ -47,17 +43,20 @@ OPTIONS+=	FRIBIDI "Enable FriBiDi support" off
 OPTIONS+=	LIBCDIO "Enable libcdio support" off
 OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
 OPTIONS+=	LIBLZO "Enable external liblzo library" off
+OPTIONS+=	V4L "Enable Video4Linux TV support" off
 
 MLINKS=		mplayer.1 mencoder.1
 
 PATCHDIR=	${.CURDIR}/../mplayer/files
 DATADIR=	${PREFIX}/share/mplayer
 
-TOOLFILES=	calcbpp.pl checktree.sh countquant.pl \
-		dvd2divxscript.pl mencvcd \
-		mplmult.sh plotpsnr.pl psnr-video.sh \
-		qepdvcd.sh subedit.pl subsearch.sh \
-		w32codec_dl.pl wma2ogg.pl
+TOOLFILES=	aconvert.sh binary_codecs.sh calcbpp.pl \
+		checktree.sh countquant.pl divx2svcd.sh \
+		dvd2divxscript.pl edgedetect.fp edgeenh.fp \
+		emboss.fp mencvcd.sh midentify.sh \
+		mpconsole.sh mplmult.sh plotpsnr.pl \
+		psnr-video.sh qepdvcd.sh subedit.pl \
+		subsearch.sh w32codec_dl.pl wma2ogg.pl \
 
 .include <bsd.port.pre.mk>
 
@@ -65,9 +64,9 @@ LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
 BUILD_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 RUN_DEPENDS+=	mplayer:${PORTSDIR}/multimedia/mplayer
 
-CONFIGURE_ARGS+=	--disable-vidix-internal \
-			--disable-freetype \
+CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-x11 \
+			--disable-vdpau \
 			--disable-fontconfig \
 			--disable-rtc \
 			--disable-arts \
@@ -81,6 +80,8 @@ CONFIGURE_ARGS+=	--disable-vidix-internal \
 			--disable-directfb \
 			--disable-ssse3
 
+ALL_TARGET=	mencoder
+
 .include "${.CURDIR}/../mplayer/Makefile.options"
 
 .if defined(WITH_TWOLAME)
@@ -95,6 +96,25 @@ LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
 CONFIGURE_ARGS+=	--disable-faac
 .endif
 
+.if !defined(WITHOUT_X264)
+LIB_DEPENDS+=	x264.85:${PORTSDIR}/multimedia/x264
+.else
+CONFIGURE_ARGS+=	--disable-x264
+.endif
+
+.if !defined(WITHOUT_XVID)
+LIB_DEPENDS+=		xvidcore.4:${PORTSDIR}/multimedia/xvid
+.else
+CONFIGURE_ARGS+=	--disable-xvid
+.endif
+
+.ifdef(WITH_DIRAC)
+LIB_DEPENDS+=		dirac_encoder.1:${PORTSDIR}/multimedia/dirac
+.else
+CONFIGURE_ARGS+=	--disable-libdirac
+.endif
+
+
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
@@ -104,14 +124,16 @@ pre-everything::
 	@${ECHO_MSG} "order to learn more about them."
 
 post-patch:
+.if ${OSVERSION} >= 900010
 	@${REINPLACE_CMD} -e \
-		's|libxmms.so.1|libxmms.so|' \
+		'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.endif
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's!/usr/local!${PREFIX}!' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index a93ea236b326..5adf03a1abf8 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-MD5 (MPlayer-1.0rc2.tar.bz2) = 7e27e535c2d267637df34898f1b91707
-SHA256 (MPlayer-1.0rc2.tar.bz2) = 3875b7cc85e8e7df81c02a638db6b4a970d1e66a86dad6ebf29a1d19f38f5953
-SIZE (MPlayer-1.0rc2.tar.bz2) = 9338201
+MD5 (mplayer-1.0rc20100117.tar.bz2) = ba9eecc0613c1e592b970383616a679b
+SHA256 (mplayer-1.0rc20100117.tar.bz2) = b9c181671112acb6807d6cdd143941b262854b85616716fe9d1b736fff9c158d
+SIZE (mplayer-1.0rc20100117.tar.bz2) = 8663385
diff --git a/multimedia/mencoder/pkg-plist b/multimedia/mencoder/pkg-plist
index edf35073d54b..e178b748f7d6 100644
--- a/multimedia/mencoder/pkg-plist
+++ b/multimedia/mencoder/pkg-plist
@@ -1,9 +1,17 @@
 bin/mencoder
+%%DATADIR%%/tools/aconvert.sh
+%%DATADIR%%/tools/binary_codecs.sh
 %%DATADIR%%/tools/calcbpp.pl
 %%DATADIR%%/tools/checktree.sh
 %%DATADIR%%/tools/countquant.pl
+%%DATADIR%%/tools/divx2svcd.sh
 %%DATADIR%%/tools/dvd2divxscript.pl
-%%DATADIR%%/tools/mencvcd
+%%DATADIR%%/tools/edgedetect.fp
+%%DATADIR%%/tools/edgeenh.fp
+%%DATADIR%%/tools/emboss.fp
+%%DATADIR%%/tools/mencvcd.sh
+%%DATADIR%%/tools/midentify.sh
+%%DATADIR%%/tools/mpconsole.sh
 %%DATADIR%%/tools/mplmult.sh
 %%DATADIR%%/tools/plotpsnr.pl
 %%DATADIR%%/tools/psnr-video.sh
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index e6e777689402..6424943baed1 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -7,16 +7,14 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	17
 
 COMMENT=	High performance media player supporting many formats
 
 .include "${.CURDIR}/Makefile.shared"
 
-OPTIONS=	DEBUG "Include debug symbols in mplayer's binary files" off
-OPTIONS+=	RTCPU "Let mplayer dynamically check for CPU features" on
+OPTIONS=	DEBUG "Include debug symbols in mplayer's binaries" off
+OPTIONS+=	RTCPU "Allow runtime CPU detection" on
 OPTIONS+=	OCFLAGS "Use optimized compiler flags" on
-OPTIONS+=	SIMD "Allow mplayer to use vector engines (MMX...)" on
 OPTIONS+=	IPV6 "Include inet6 network support" on
 OPTIONS+=	X11 "Enable X11 support for mplayer's video output" on
 OPTIONS+=	X11XV "X11 video drivers: XV" on
@@ -25,38 +23,34 @@ OPTIONS+=	X11GL "X11 video drivers: OpenGL" on
 OPTIONS+=	X11XIN "X11 video drivers: Xinerama" on
 OPTIONS+=	X11VM "X11 VidMode support" on
 OPTIONS+=	X11XVMC "Enable XvMC acceleration" off
+OPTIONS+=	VDPAU "Enable Nvidia VDPAU acceleration" off
 OPTIONS+=	GUI "Enable GTK2 graphical user interface with X11" on
 OPTIONS+=	SDL "Enable SDL video output" off
-OPTIONS+=	VIDIX "Enable VIDIX video output on supported archs" on
 OPTIONS+=	SKINS "Force dependency on mplayer-skins" on
-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+=	NAS "Enable NAS sound server support" off
 OPTIONS+=	OPENAL "Enable OpenAL sound support" off
+OPTIONS+=	PULSE "Enable PulseAudio" off
 OPTIONS+=	LIBUNGIF "Enable gif support" on
+OPTIONS+=	OPENJPEG "Enable JPEG2000 support" off
 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+=	AMR "Enable opencore AMR audio codec support" off
 OPTIONS+=	DTS "Enable DTS audio codec support" on
 OPTIONS+=	LIBMPCDEC "Enable libmpcdec support" off
 OPTIONS+=	LADSPA "Enable LADSPA plugin support" off
 OPTIONS+=	SPEEX "Enable speex audio codec support" on
-OPTIONS+=	TREMOR "Use built-in tremor instead of libvorbis" off
-OPTIONS+=	XMMS "Enable XMMS plugin support" off
 OPTIONS+=	THEORA "Enable ogg theora video support" off
+OPTIONS+=	SCHROEDINGER "Dirac codec via libschroedinger" off
 .if !defined(PACKAGE_BUILDING)
 OPTIONS+=	WIN32 "Enable win32 codec set on the IA32 arch" on
-OPTIONS+=	AMR "Enable AMR audio codec support" off
 .endif
-OPTIONS+=	X264 "Enable x264 (H.264) video codec support" off
-OPTIONS+=	XANIM "Enable xanim DLL support" off
-OPTIONS+=	XVID "Enable XVID video codec support" on
 OPTIONS+=	REALPLAYER "Enable real player plugin" off
 OPTIONS+=	LIVEMEDIA "Enable LIVE555 streaming support" off
 OPTIONS+=	SMB "Enable Samba input support" off
@@ -66,6 +60,7 @@ OPTIONS+=	LIBCDIO "Enable libcdio support" off
 OPTIONS+=	CDPARANOIA "Enable cdparanoia support" off
 OPTIONS+=	LIBLZO "Enable external liblzo library" off
 OPTIONS+=	JOYSTICK "Enable joystick support" off
+OPTIONS+=	V4L "Enable Video4Linux TV support" off
 
 MAN1=		mplayer.1
 MANCOMPRESSED=	no
@@ -80,23 +75,16 @@ CONFIGURE_ARGS+=	--disable-ssse3 \
 			--disable-directfb \
 			--disable-faac \
 			--disable-twolame \
+			--disable-x264 \
+			--disable-xvid \
 			--disable-mencoder
 
 .include "${.CURDIR}/Makefile.options"
 
-#Building of vidix dependent shared libs is only possible
-#on i386 and amd64 at the moment.
-.if !defined(WITHOUT_VIDIX)
-.if !(${ARCH} == "i386" || ${ARCH} == "amd64")
-CONFIGURE_ARGS+=--disable-vidix-internal
-.endif
-.else
-CONFIGURE_ARGS+=--disable-vidix-internal
-.endif
-
 .if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
+MLINKS+=	mplayer.1 gmplayer.1
 PLIST_SUB+=	GMPLAYER=""
-DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "${DATADIR}/skins/Blue/icons/icon32x32.png" "gmplayer" "" false
+DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
 .if !defined(WITHOUT_SKINS)
 RUN_DEPENDS+=	${LOCALBASE}/share/mplayer/skins:${PORTSDIR}/multimedia/mplayer-skins
 .endif
@@ -112,17 +100,6 @@ WITH_LANG=	""
 PLIST_SUB+=	GMPLAYER="@comment "
 .endif #WITHOUT_GUI
 
-.if !defined(WITHOUT_FREETYPE)
-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
-
 .if !defined(WITHOUT_X11)
 USE_XORG=	x11
 .if !defined(WITHOUT_X11XV)
@@ -160,6 +137,12 @@ CONFIGURE_ARGS+=--disable-x11 \
 		--disable-fontconfig
 .endif
 
+.if defined(WITH_VDPAU)
+LIB_DEPENDS+=	vdpau.1:${PORTSDIR}/x11/nvidia-driver
+.else
+CONFIGURE_ARGS+=	--disable-vdpau
+.endif
+
 .if defined(WITH_RTC)
 BUILD_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
 RUN_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
@@ -171,7 +154,6 @@ CONFIGURE_ARGS+=	--disable-rtc
 
 .if defined(WITH_ARTS)
 LIB_DEPENDS+=	artsc.0:${PORTSDIR}/audio/arts
-CONFIGURE_ARGS+=	--enable-arts
 .else
 CONFIGURE_ARGS+=	--disable-arts
 .endif
@@ -184,7 +166,6 @@ CONFIGURE_ARGS+=	--disable-caca
 
 .if defined(WITH_LIRC)
 LIB_DEPENDS+=	lirc_client.1:${PORTSDIR}/comms/lirc
-CONFIGURE_ARGS+=	--enable-lirc
 .else
 CONFIGURE_ARGS+=	--disable-lirc
 .endif
@@ -243,14 +224,16 @@ pre-everything::
 .endif
 
 post-patch:
+.if ${OSVERSION} >= 900010
 	@${REINPLACE_CMD} -e \
-		's|libxmms.so.1|libxmms.so|' \
+		'/CFLAGS.*-D_LARGEFILE64_SOURCE/ s/-D_LARGEFILE64_SOURCE/-D_FILE_OFFSET_BITS=64/' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
+.endif
 	@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
 		s|/dev/cdrom|${DEFAULT_CDROM_DEVICE}|' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${REINPLACE_CMD} -e 's!/usr/local!${PREFIX}!' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
@@ -268,6 +251,14 @@ post-patch:
 		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
 		${WRKSRC}/mplayer.c
 .endif
+#.if defined(WITH_VDPAU)
+#	@if [ ! -e ${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/vdpau.h ]; then \
+#		${ECHO_CMD} "For VDPAU support you need a recent version of x11/nvidia-driver installed"; \
+#		${FALSE}; \
+#	fi
+#	@${MKDIR} ${WRKSRC}/vdpau
+#	@${CP} ${LOCALBASE}/share/doc/NVIDIA_GLX-1.0/vdpau*.h ${WRKSRC}/vdpau
+#.endif
 
 post-configure:
 	@${REINPLACE_CMD} -e 's#-pthread#${PTHREAD_LIBS}#g' \
@@ -281,17 +272,10 @@ post-install:
 .for conf in ${CONFFILES}
 	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc
 .endfor
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	@${CHMOD} 755 ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/DOCS/HTML/en/* ${DOCSDIR}
-.endif
 .if !defined(WITHOUT_GUI) && !defined(WITHOUT_X11)
 	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
+	${INSTALL_DATA} ${WRKSRC}/etc/mplayer.xpm ${LOCALBASE}/share/pixmaps
 .endif
 	@${CAT} ${PKGMESSAGE}
 
-install-user:
-	@${PERL} ${FILESDIR}/install-user
-
 .include <bsd.port.post.mk>
diff --git a/multimedia/mplayer/Makefile.options b/multimedia/mplayer/Makefile.options
index 5d66e9ccc89c..160c87bc0421 100644
--- a/multimedia/mplayer/Makefile.options
+++ b/multimedia/mplayer/Makefile.options
@@ -4,34 +4,6 @@
 # Some of the knobs are not tunable by the OPTIONS framework. These are
 # explained here in detail.
 #
-# CPU features:
-#
-# The following is only of interest if you haven't enabled
-# RTCPU in your OPTIONS selection.
-# The correct instruction set of your processor is normally
-# auto-detected, so there is probably no necessity to change them.
-# Note that disabling SIMD via the OPTIONS framework completely
-# disables utilization of vector engines, i.e. it implies
-# WITHOUT_MMX, WITHOUT_3DNOW and WITHOUT_SSE
-#
-# WITHOUT_MMX
-# default: autodetected
-# disables using of mmx code
-#
-# WITHOUT_3DNOW
-# default: autodetected
-# disables using of 3dNow! instructions on AMD CPUs
-#
-# WITHOUT_SSE
-# default: autodetected
-# disables all mmx2 and sse/sse2 code
-# CAUTION: There are some Athlon CPUs which claim to be sse-able but
-# aren't. If you encounter strange problems on such a CPU, try
-# to build mplayer with this knob and report the problem
-# NOTE: SSE is available only if "options CPU_ENABLE_SSE" in your
-# kernel config. This is standard for 5.x and newer systems on I686_CPU
-# and later. 4.x users will have to define this explicitly.
-#
 # Feature options:
 # These options influence some general behaviour of mplayer. Most of the featues,
 # for example all the codecs, are selected via the OPTIONS framework.
@@ -64,12 +36,18 @@ DEBUG_FLAGS=	-g -O -fomit-frame-pointer
 .endif
 .else
 .if !defined(WITHOUT_OCFLAGS)
-CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
+#CFLAGS+=	-O3 -ffast-math -fomit-frame-pointer
+#Let mplayer determine its own cflags
+CFLAGS=
 .else
 CFLAGS+=	-O -fomit-frame-pointer
 .endif
 .endif
 
+.if !defined(WITHOUT_RTCPU)
+CONFIGURE_ARGS+=--enable-runtime-cpudetection
+.endif
+
 .if defined(WITHOUT_IPV6)
 CONFIGURE_ARGS+=	--disable-inet6
 .else
@@ -78,52 +56,40 @@ CATEGORIES+=	ipv6
 
 .if !defined(WITHOUT_LIBUNGIF)
 LIB_DEPENDS+=	ungif.5:${PORTSDIR}/graphics/libungif
-#CONFIGURE_ARGS+=	--enable-gif
 .else
 CONFIGURE_ARGS+=	--disable-gif
 .endif
 
+.ifdef(WITH_OPENJPEG)
+LIB_DEPENDS+=		openjpeg.2:${PORTSDIR}/graphics/openjpeg
+.else
+CONFIGURE_ARGS+=	--disable-libopenjpeg
+.endif
+
 .if defined(WITH_MAD)
 LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad
-
-CONFIGURE_ARGS+=	--enable-mad \
-			--with-madlibdir=${LOCALBASE}/lib
 .else
 CONFIGURE_ARGS+=	--disable-mad
 .endif
 
 .if defined(WITH_LIBDV)
 LIB_DEPENDS+=	dv.4:${PORTSDIR}/multimedia/libdv
-CONFIGURE_ARGS+=	--enable-libdv
 .else
 CONFIGURE_ARGS+=	--disable-libdv
 .endif
 
-.if defined(WITH_X264)
-LIB_DEPENDS+=	x264.65:${PORTSDIR}/multimedia/x264
-.else
-CONFIGURE_ARGS+=	--disable-x264
-.endif
-
-.if !defined(WITH_TREMOR)
-CONFIGURE_ARGS+=	--disable-tremor-internal --disable-tremor-external
-LIB_DEPENDS+=	vorbis.4:${PORTSDIR}/audio/libvorbis
-.endif
-
-.if !defined(WITHOUT_XVID)
-#Adding --enable-xvid to CONFIG args breaks LDFLAGS in this release
-#CONFIGURE_ARGS+=	--enable-xvid
-LIB_DEPENDS+=		xvidcore.4:${PORTSDIR}/multimedia/xvid
-.else
-CONFIGURE_ARGS+=	--disable-xvid
-.endif
-
 .if defined(WITH_THEORA)
 LIB_DEPENDS+=	theora.0:${PORTSDIR}/multimedia/libtheora
 .else
 CONFIGURE_ARGS+=	--disable-theora
 .endif
 
+.if defined(WITH_SCHROEDINGER)
+LIB_DEPENDS+=		schroedinger-1.0.3:${PORTSDIR}/multimedia/schroedinger
+.else
+CONFIGURE_ARGS+=	--disable-libschroedinger
+.endif
+
 .if defined(WITH_LIBMPCDEC)
 LIB_DEPENDS+=	mpcdec.5:${PORTSDIR}/audio/libmpcdec
 .else
@@ -131,71 +97,51 @@ CONFIGURE_ARGS+=	--disable-musepack
 .endif
 
 .if !defined(WITHOUT_DTS)
-#CFLAGS+=		-I${LOCALBASE}/include
-CONFIGURE_ARGS+=	--enable-libdca
-BUILD_DEPENDS+=		${LOCALBASE}/lib/libdca.a:${PORTSDIR}/multimedia/libdca
+LIB_DEPENDS+=		dca.0:${PORTSDIR}/multimedia/libdca
 .else
 CONFIGURE_ARGS+=	--disable-libdca
 .endif
 
 .if !defined(WITHOUT_SPEEX)
-CONFIGURE_ARGS+=	--enable-speex
 LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
 .else
 CONFIGURE_ARGS+=	--disable-speex
 .endif
 
-.if defined(WITH_XANIM)
-BUILD_DEPENDS+=	xanim:${PORTSDIR}/multimedia/xanim
-CONFIGURE_ARGS+=--enable-xanim --with-xanimlibdir=${LOCALBASE}/lib/X11/xanim
-.else
-CONFIGURE_ARGS+=--disable-xanim
-.endif
-
 .if defined(WITH_LIVEMEDIA)
-#CONFIGURE_ARGS+=	--enable-live \
-#			--with-livelibdir=${LOCALBASE}/live
 RUN_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 BUILD_DEPENDS+=		${LOCALBASE}/live/liveMedia/libliveMedia.a:${PORTSDIR}/net/liveMedia
 .else
 CONFIGURE_ARGS+=	--disable-live
 .endif
 
-.if defined(WITH_XMMS)
-CONFIGURE_ARGS+=	--enable-xmms
-LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
-.else
-CONFIGURE_ARGS+=	--disable-xmms
-.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
-#.else
-#CONFIGURE_ARGS+=	--disable-polyp
-#.endif
-
 .if defined(WITH_NAS)
-CONFIGURE_ARGS+=	--enable-nas
 LIB_DEPENDS+=		audio.2:${PORTSDIR}/audio/nas
 .else
 CONFIGURE_ARGS+=	--disable-nas
 .endif
 
 .if defined(WITH_OPENAL)
-LIB_DEPENDS+=	openal.1:${PORTSDIR}/audio/openal-soft
+#TODO: test this
+#LIB_DEPENDS+=	openal.1:${PORTSDIR}/audio/openal-soft
+USE_OPENAL=	soft
 .else
 CONFIGURE_ARGS+=	--disable-openal
 .endif
 
+.if defined(WITH_PULSE)
+LIB_DEPENDS+=		pulse.0:${PORTSDIR}/audio/pulseaudio
+.else
+CONFIGURE_ARGS+=	--disable-pulse
+.endif
+
 .if defined(WITH_SMB)
-CONFIGURE_ARGS+=	--enable-smb
 LIB_DEPENDS+=		smbclient.0:${PORTSDIR}/net/samba-libsmbclient
 .else
 CONFIGURE_ARGS+=	--disable-smb
@@ -203,7 +149,6 @@ CONFIGURE_ARGS+=	--disable-smb
 
 .if defined(WITH_FRIBIDI)
 LIB_DEPENDS+=	fribidi.3:${PORTSDIR}/converters/fribidi
-CONFIGURE_ARGS+=	--enable-fribidi
 .else
 CONFIGURE_ARGS+=	--disable-fribidi
 .endif
@@ -244,21 +189,7 @@ DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
 DEFAULT_CDROM_DEVICE=/dev/acd0
 .endif
 
-# "enable" build for other archs
 .if ${ARCH} == "i386" || ${ARCH} == "amd64"
-.if !defined(WITHOUT_RTCPU)
-CONFIGURE_ARGS+=--enable-runtime-cpudetection
-.else #WITH_RTCPU
-.if defined(WITHOUT_MMX) || defined(WITHOUT_SIMD)
-CONFIGURE_ARGS+=--disable-mmx
-.endif
-.if defined(WITHOUT_3DNOW) || defined(WITHOUT_SIMD)
-CONFIGURE_ARGS+=--disable-3dnow --disable-3dnowext
-.endif
-.if defined(WITHOUT_SSE) || defined(WITHOUT_SIMD)
-CONFIGURE_ARGS+=--disable-mmxext --disable-sse --disable-sse2
-.endif
-.endif #WITH_RTCPU
 .if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
 RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
 CONFIGURE_ARGS+=	--win32codecsdir=${LOCALBASE}/lib/win32
@@ -271,20 +202,36 @@ CONFIGURE_ARGS+=	--disable-win32dll \
 .endif # ARCH == i386/amd64
 
 .if defined(WITH_REALPLAYER)
-CONFIGURE_ARGS+=	--enable-real \
-			--realcodecsdir=${LOCALBASE}/lib/RealPlayer/codecs
+CONFIGURE_ARGS+=	--realcodecsdir=${LOCALBASE}/lib/RealPlayer/codecs
 RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
 .else
 .if !defined(WITHOUT_WIN32) && !defined(PACKAGE_BUILDING)
-CONFIGURE_ARGS+=	--enable-real \
-			--realcodecsdir=${LOCALBASE}/lib/win32
+CONFIGURE_ARGS+=	--realcodecsdir=${LOCALBASE}/lib/win32
 .else
 CONFIGURE_ARGS+=	--disable-real
 .endif
 .endif
 
 .if defined(WITH_AMR)
-LIB_DEPENDS+=		amrnb:${PORTSDIR}/audio/libamrnb \
-			amrwb:${PORTSDIR}/audio/libamrwb
+LIB_DEPENDS+=		opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
+.else
+CONFIGURE_ARGS+=	--disable-libopencore_amrnb \
+			--disable-libopencore_amrwb
 .endif
+
+.if defined(WITH_V4L)
+BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
+LIB_DEPENDS+=		v4l2.0:${PORTSDIR}/multimedia/libv4l
+CONFIGURE_ARGS+=	--enable-tv-v4l1 \
+			--enable-tv-v4l2
+EXTRA_LIBS+=		-lv4l1 -lv4l2
+.else
+CONFIGURE_ARGS+=	--disable-tv-v4l1 \
+			--disable-tv-v4l2
+.endif
+
+.if defined(EXTRA_LIBS)
+CONFIGURE_ARGS+=	--extra-libs="${EXTRA_LIBS}"
+.endif
+
diff --git a/multimedia/mplayer/Makefile.shared b/multimedia/mplayer/Makefile.shared
index 760651ec8a6e..933b3aa72b83 100644
--- a/multimedia/mplayer/Makefile.shared
+++ b/multimedia/mplayer/Makefile.shared
@@ -2,42 +2,31 @@
 # mplayer and mencoder....the variables that we need to set
 # before we include bsd.port.pre.mk
 
-MPLAYER_PORT_VERSION=	0.99.11
+MPLAYER_SNAPSHOT_DATE=	2010-01-17
+MPLAYER_PORT_VERSION=	1.0.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
 CATEGORIES?=	multimedia audio
-MASTER_SITES=	http://www1.mplayerhq.hu/MPlayer/releases/ \
-		http://www2.mplayerhq.hu/MPlayer/releases/ \
-		http://ftp.lug.udel.edu/MPlayer/releases/ \
-		http://www4.mplayerhq.hu/MPlayer/releases/ \
-		http://mirrors.xmission.com/MPlayer/releases/ \
-		ftp://ftp1.mplayerhq.hu/MPlayer/releases/ \
-		ftp://ftp2.mplayerhq.hu/MPlayer/releases/ \
-		ftp://ftp.lug.udel.edu/MPlayer/releases/ \
-		ftp://mirrors.xmission.com/MPlayer/releases/ \
+MASTER_SITES=	http://freebsd.unixfreunde.de/sources/ \
 		http://www.rrr.de/~riggs/mplayer/
-DISTNAME=	MPlayer-1.0rc2
+DISTNAME=	mplayer-${MPLAYER_PORT_VERSION:S/.r/rc/g}
+WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
 
 MAINTAINER?=	riggs@rrr.de
 
-PATCH_SITES=	http://www.mplayerhq.hu/MPlayer/patches/
-
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png \
+		freetype.9:${PORTSDIR}/print/freetype2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
-		PTHREAD_LIBS=${PTHREAD_LIBS} \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
 		TMPDIR="${WRKSRC}"
-CONFIGURE_ARGS= --enable-png \
-		--enable-menu \
-		--disable-faad-external \
-		--disable-vidix-external \
-		--disable-tv-v4l1 \
-		--disable-tv-v4l2 \
-		--disable-dvdnav
+CONFIGURE_ARGS= --disable-bitmap-font
+
+CONFIGURE_LOG=	configure.log
 
 WANT_GNOME=	yes
 WANT_SDL=	yes
 
-MAKE_JOBS_UNSAFE=	yes
+MAKE_JOBS_SAFE=	yes
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index a93ea236b326..5adf03a1abf8 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-MD5 (MPlayer-1.0rc2.tar.bz2) = 7e27e535c2d267637df34898f1b91707
-SHA256 (MPlayer-1.0rc2.tar.bz2) = 3875b7cc85e8e7df81c02a638db6b4a970d1e66a86dad6ebf29a1d19f38f5953
-SIZE (MPlayer-1.0rc2.tar.bz2) = 9338201
+MD5 (mplayer-1.0rc20100117.tar.bz2) = ba9eecc0613c1e592b970383616a679b
+SHA256 (mplayer-1.0rc20100117.tar.bz2) = b9c181671112acb6807d6cdd143941b262854b85616716fe9d1b736fff9c158d
+SIZE (mplayer-1.0rc20100117.tar.bz2) = 8663385
diff --git a/multimedia/mplayer/files/install-user b/multimedia/mplayer/files/install-user
deleted file mode 100644
index 75e8002181c4..000000000000
--- a/multimedia/mplayer/files/install-user
+++ /dev/null
@@ -1,57 +0,0 @@
-#This perl script links the codec config file
-#and the fonts dir to the user's home dir.
-#Last touched: 2002-12-16 riggs
-
-if (-e "$ENV{HOME}/.mplayer/font")
-{
-	print "Sorry, font link is already existing.\n";
-	exit 1;
-}
-
-#Determining location of fonts:
-
-@pkg=`pkg_info -Lx mplayer-fonts`;
-print "$prefix[3]";
-$prefix=$pkg[3];
-$prefix=~ s/(.+mplayer).*/$1/;
-chop $prefix;
-
-if ($1 eq "")
-{
-	print "You have no mplayer-fonts installed.\n";
-	exit 1;
-}
-
-print "You may choose any of the available language sets:\n\n";
-print "ISO-8859-1 Font : 1\n";
-print "ISO-8859-2 Font : 2\n";
-print "(old) Cyrillic fonts : c\n";
-print "Russian fonts : r\n";
-
-print "Your decision? ";
-chomp ($lang=<STDIN>);
-print "\n";
-
-if ($lang eq "1" || $lang eq "2")
-{
-	print "The available sizes for this font are 14,18,24,28.\n";
-	print "Please enter the wanted size: \n";
-	chomp ($size=<STDIN>);
-	if ($size ne "14" && $size ne "18" && $size ne "24" && $size ne "28") {$size=14;}
-}
-
-unless (-e "$ENV{HOME}/.mplayer") {system "mkdir $ENV{HOME}/.mplayer";}
-
-if ($lang eq "c")
-{
-	system "ln -sv $prefix/fonts/cyrillic/ $ENV{HOME}/.mplayer/font";
-}
-elsif ($lang eq "r")
-{
-	system "ln -sv $prefix/fonts/koi8r-font/ $ENV{HOME}/.mplayer/font";
-}
-elsif ($lang eq "2")
-{
-	system "ln -sv $prefix/fonts/iso-8859-2/arial-$size/ $ENV{HOME}/.mplayer/font";
-}
-else {system "ln -sv $prefix/fonts/iso-8859-1/arial-$size/ $ENV{HOME}/.mplayer/font"};
diff --git a/multimedia/mplayer/files/patch-CVE-2008-3162 b/multimedia/mplayer/files/patch-CVE-2008-3162
deleted file mode 100644
index 73a80cd65e9b..000000000000
--- a/multimedia/mplayer/files/patch-CVE-2008-3162
+++ /dev/null
@@ -1,52 +0,0 @@
---- libavformat/psxstr.c	2008/06/26 20:50:15	13992
-+++ libavformat/psxstr.c	2008/06/26 22:22:10	13993
-@@ -274,12 +274,23 @@
-                 int current_sector = AV_RL16(&sector[0x1C]);
-                 int sector_count   = AV_RL16(&sector[0x1E]);
-                 int frame_size = AV_RL32(&sector[0x24]);
--                int bytes_to_copy;
-+
-+                if(!(   frame_size>=0
-+                     && current_sector < sector_count
-+                     && sector_count*VIDEO_DATA_CHUNK_SIZE >=frame_size)){
-+                    av_log(s, AV_LOG_ERROR, "Invalid parameters %d %d %d\n", current_sector, sector_count, frame_size);
-+                    return AVERROR_INVALIDDATA;
-+                }
-+
- //        printf("%d %d %d\n",current_sector,sector_count,frame_size);
-                 /* if this is the first sector of the frame, allocate a pkt */
-                 pkt = &str->tmp_pkt;
--                if (current_sector == 0) {
--                    if (av_new_packet(pkt, frame_size))
-+
-+                if(pkt->size != sector_count*VIDEO_DATA_CHUNK_SIZE){
-+                    if(pkt->data)
-+                        av_log(s, AV_LOG_ERROR, "missmatching sector_count\n");
-+                    av_free_packet(pkt);
-+                    if (av_new_packet(pkt, sector_count*VIDEO_DATA_CHUNK_SIZE))
-                         return AVERROR(EIO);
- 
-                     pkt->pos= url_ftell(pb) - RAW_CD_SECTOR_SIZE;
-@@ -293,15 +304,15 @@
-                        str->pts += (90000 / 15);
-                 }
- 
--                /* load all the constituent chunks in the video packet */
--                bytes_to_copy = frame_size - current_sector*VIDEO_DATA_CHUNK_SIZE;
--                if (bytes_to_copy>0) {
--                    if (bytes_to_copy>VIDEO_DATA_CHUNK_SIZE) bytes_to_copy=VIDEO_DATA_CHUNK_SIZE;
--                    memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
--                        sector + VIDEO_DATA_HEADER_SIZE, bytes_to_copy);
--                }
-+                memcpy(pkt->data + current_sector*VIDEO_DATA_CHUNK_SIZE,
-+                       sector + VIDEO_DATA_HEADER_SIZE,
-+                       VIDEO_DATA_CHUNK_SIZE);
-+
-                 if (current_sector == sector_count-1) {
-+                    pkt->size= frame_size;
-                     *ret_pkt = *pkt;
-+                    pkt->data= NULL;
-+                    pkt->size= -1;
-                     return 0;
-                 }
- 
diff --git a/multimedia/mplayer/files/patch-CVE-2008-3827 b/multimedia/mplayer/files/patch-CVE-2008-3827
deleted file mode 100644
index 88566fe0b010..000000000000
--- a/multimedia/mplayer/files/patch-CVE-2008-3827
+++ /dev/null
@@ -1,28 +0,0 @@
-Index: libmpdemux/demux_real.c
-===================================================================
---- libmpdemux/demux_real.c	(revision 27605)
-+++ libmpdemux/demux_real.c	(working copy)
-@@ -947,6 +947,7 @@
- 			    // last fragment!
- 			    if(dp_hdr->len!=vpkg_length-vpkg_offset)
- 				mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d  frag.len=%d  total.len=%d  \n",dp->len,vpkg_offset,vpkg_length-vpkg_offset);
-+			    if (vpkg_offset > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) vpkg_offset = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
-             		    stream_read(demuxer->stream, dp_data+dp_hdr->len, vpkg_offset);
- 			    if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
- 			    dp_hdr->len+=vpkg_offset;
-@@ -970,6 +971,7 @@
- 			// non-last fragment:
- 			if(dp_hdr->len!=vpkg_offset)
- 			    mp_msg(MSGT_DEMUX,MSGL_V,"warning! assembled.len=%d  offset=%d  frag.len=%d  total.len=%d  \n",dp->len,vpkg_offset,len,vpkg_length);
-+			if (len > dp->len - sizeof(dp_hdr_t) - dp_hdr->len) len = dp->len - sizeof(dp_hdr_t) - dp_hdr->len;
-             		stream_read(demuxer->stream, dp_data+dp_hdr->len, len);
- 			if((dp_data[dp_hdr->len]&0x20) && (sh_video->format==0x30335652)) --dp_hdr->chunks; else
- 			dp_hdr->len+=len;
-@@ -992,6 +994,7 @@
- 		extra[0]=1; extra[1]=0; // offset of the first chunk
- 		if(0x00==(vpkg_header&0xc0)){
- 		    // first fragment:
-+		    if (len > dp->len - sizeof(dp_hdr_t)) len = dp->len - sizeof(dp_hdr_t);
- 		    dp_hdr->len=len;
- 		    stream_read(demuxer->stream, dp_data, len);
- 		    ds->asf_packet=dp;
diff --git a/multimedia/mplayer/files/patch-CVE-2008-5616 b/multimedia/mplayer/files/patch-CVE-2008-5616
deleted file mode 100644
index 30626d496862..000000000000
--- a/multimedia/mplayer/files/patch-CVE-2008-5616
+++ /dev/null
@@ -1,55 +0,0 @@
---- libmpdemux/demux_vqf.c.orig	2007-10-07 20:49:33.000000000 +0100
-+++ libmpdemux/demux_vqf.c	2008-12-15 14:29:58.000000000 +0000
-@@ -50,11 +50,14 @@
-     unsigned chunk_size;
-     hi->size=chunk_size=stream_read_dword(s); /* include itself */
-     stream_read(s,chunk_id,4);
-+    if (chunk_size < 8) return NULL;
-+    chunk_size -= 8;
-     if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('C','O','M','M'))
-     {
--    char buf[chunk_size-8];
-+    char buf[BUFSIZ];
-     unsigned i,subchunk_size;
--    if(stream_read(s,buf,chunk_size-8)!=chunk_size-8) return NULL;
-+    if (chunk_size > sizeof(buf) || chunk_size < 20) return NULL;
-+    if(stream_read(s,buf,chunk_size)!=chunk_size) return NULL;
-     i=0;
-     subchunk_size=be2me_32(*((uint32_t *)&buf[0]));
-     hi->channelMode=be2me_32(*((uint32_t *)&buf[4]));
-@@ -83,13 +86,15 @@
-     sh_audio->samplesize = 4;
-     w->wBitsPerSample = 8*sh_audio->samplesize;
-     w->cbSize = 0;
-+    if (subchunk_size > chunk_size - 4) continue;
-     i+=subchunk_size+4;
--    while(i<chunk_size-8)
-+    while(i + 8 < chunk_size)
-     {
-         unsigned slen,sid;
--        char sdata[chunk_size];
-+        char sdata[BUFSIZ];
-         sid=*((uint32_t *)&buf[i]); i+=4;
-         slen=be2me_32(*((uint32_t *)&buf[i])); i+=4;
-+        if (slen > sizeof(sdata) - 1 || slen > chunk_size - i) break;
-         if(sid==mmioFOURCC('D','S','I','Z'))
-         {
-         hi->Dsiz=be2me_32(*((uint32_t *)&buf[i]));
-@@ -141,7 +146,7 @@
-     if(*((uint32_t *)&chunk_id[0])==mmioFOURCC('D','A','T','A'))
-     {
-     demuxer->movi_start=stream_tell(s);
--    demuxer->movi_end=demuxer->movi_start+chunk_size-8;
-+    demuxer->movi_end=demuxer->movi_start+chunk_size;
-     mp_msg(MSGT_DEMUX, MSGL_V, "Found data at %"PRIX64" size %"PRIu64"\n",demuxer->movi_start,demuxer->movi_end);
-     /* Done! play it */
-     break;
-@@ -149,7 +154,7 @@
-     else
-     {
-     mp_msg(MSGT_DEMUX, MSGL_V, "Unhandled chunk '%c%c%c%c' %u bytes\n",((char *)&chunk_id)[0],((char *)&chunk_id)[1],((char *)&chunk_id)[2],((char *)&chunk_id)[3],chunk_size);
--    stream_skip(s,chunk_size-8); /*unknown chunk type */
-+    stream_skip(s,chunk_size); /*unknown chunk type */
-     }
-   }
- 
diff --git a/multimedia/mplayer/files/patch-Makefile b/multimedia/mplayer/files/patch-Makefile
new file mode 100644
index 000000000000..47bf54ebeffc
--- /dev/null
+++ b/multimedia/mplayer/files/patch-Makefile
@@ -0,0 +1,27 @@
+--- Makefile.orig	2010-01-03 17:39:16.000000000 +0100
++++ Makefile	2010-01-06 21:15:58.372494408 +0100
+@@ -914,20 +914,16 @@
+ install: $(INSTALL_TARGETS-yes)
+ 
+ install-dirs:
+-	$(INSTALL) -d $(BINDIR) $(CONFDIR) $(LIBDIR)
+ 
+-install-%: %$(EXESUF) install-dirs
+-	$(INSTALL) -m 755 $(INSTALLSTRIP) $< $(BINDIR)
++install-mplayer: mplayer$(EXESUF) install-dirs
++	@${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR)
+ 
+ install-gui: install-mplayer
+-	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
+-	$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/pixmaps $(prefix)/share/applications
+-	$(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/
+-	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
+ 
+ install-gui-man:      $(foreach lang,$(MAN_LANGS),install-gui-man-$(lang))
+ install-mencoder-man: $(foreach lang,$(MAN_LANGS),install-mencoder-man-$(lang))
+-install-mplayer-man:  $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang))
++install-mplayer-man:
++	@${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
+ 
+ install-gui-man-en: install-mplayer-man-en
+ 	cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1
diff --git a/multimedia/mplayer/files/patch-ad b/multimedia/mplayer/files/patch-ad
deleted file mode 100644
index 642c80b8457e..000000000000
--- a/multimedia/mplayer/files/patch-ad
+++ /dev/null
@@ -1,169 +0,0 @@
---- configure.orig	2007-10-08 03:49:33.000000000 +0800
-+++ configure	2008-08-18 20:37:59.000000000 +0800
-@@ -62,9 +62,9 @@
-   echo >> "$TMPLOG"
-   cat "$1" >> "$TMPLOG"
-   echo >> "$TMPLOG"
--  echo "$_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra $_libs_mplayer $_libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
-+  echo "$_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra $_libs_mplayer $_libs_mencoder -o $TMPEXE $@" >> "$TMPLOG"
-   rm -f "$TMPEXE"
--  $_cc $CFLAGS $_inc_extra $_ld_static $_ld_extra $_libs_mplayer $_libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
-+  $_cc $CFLAGS -fno-fast-math $_inc_extra $_ld_static $_ld_extra $_libs_mplayer $_libs_mencoder -o "$TMPEXE" "$@" >> "$TMPLOG" 2>&1
-   TMP="$?"
-   echo >> "$TMPLOG"
-   echo >> "$TMPLOG"
-@@ -484,7 +484,7 @@
- _iwmmxt=auto
- _mtrr=auto
- _altivec=auto
--_install=install
-+_install=@${BSD_INSTALL_PROGRAM}
- _ranlib=ranlib
- _ldconfig=ldconfig
- _cc=cc
-@@ -1188,8 +1188,7 @@
-         _3dnow=no _3dnowext=no _mmx=no _mmxext=no ;;
- 
-   *)
--    echo "Unknown parameter: $ac_option"
--    exit 1
-+    echo "Unknown parameter: $ac_option (ignoring)"
-     ;;
- 
-   esac
-@@ -1248,14 +1247,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 ;;
--      x86_64|amd64)
--        if [ -n "`$_cc -dumpmachine | sed -n '/^x86_64-/p;/^amd64-/p'`" -a \
--             -z "`echo $CFLAGS | grep -- -m32`"  ]; then
--          host_arch=x86_64
--        else
--          host_arch=i386
--        fi
--      ;;
-+      x86_64|amd64) host_arch=x86_64 ;;
-       macppc|ppc|ppc64) host_arch=ppc ;;
-       alpha) host_arch=alpha ;;
-       sparc) host_arch=sparc ;;
-@@ -1307,7 +1299,7 @@
- 
- if freebsd ; then
-   _ld_extra="$_ld_extra -L/usr/local/lib"
--  _inc_extra="$_inc_extra -I/usr/local/include"
-+  _inc_extra="$_inc_extra -I... -I.../libavutil -I$_prefix/include"
- fi
- 
- if darwin; then
-@@ -1524,25 +1516,10 @@
- 
- # 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_32 ; then
--  # FreeBSD with Linux emulation /proc mounted,
--  # extract CPU information from it
--  _cpuinfo="cat /compat/linux/proc/cpuinfo"
--elif darwin && not x86_32 ; then
--  # use hostinfo on Darwin
--  _cpuinfo="hostinfo"
--elif aix; then
--  # use 'lsattr' on AIX
--  _cpuinfo="lsattr -E -l proc0 -a type"
--elif x86; then
-   # all other OSes try to extract CPU information from a small helper
-   # program cpuinfo instead
-   $_cc -o cpuinfo$_exesuf cpuinfo.c
-   _cpuinfo="./cpuinfo$_exesuf"
--fi
- 
- if x86 ; then
-   # gather more CPU information
-@@ -2331,7 +2308,7 @@
-   elif test "$cc_vendor" != "gnu" ; then
-     CFLAGS="-O2 $_march $_mcpu $_pipe"
-   else
--    CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
-+    CFLAGS="-Wall -Wno-switch -Wpointer-arith -Wredundant-decls -O $_pipe"
-   fi
- else
-   _warn_CFLAGS=yes
-@@ -2965,13 +2942,7 @@
- 
- 
- echocheck "memalign()"
--# XXX restrict to x86 ? extend to other CPUs/cacheline sizes ?
--cat > $TMPC << EOF
--#include <malloc.h>
--int main (void) { (void) memalign(64, sizeof(char)); return 0; }
--EOF
- _memalign=no
--cc_check && _memalign=yes
- if test "$_memalign" = yes ; then
-  _def_memalign='#define HAVE_MEMALIGN 1'
- else
-@@ -3057,20 +3028,8 @@
- _def_threads='#undef HAVE_THREADS'
- 
- echocheck "pthread"
--if test "$_pthreads" = auto ; then
--cat > $TMPC << EOF
--#include <pthread.h>
--void* func(void *arg) { return arg; }
--int main(void) { pthread_t tid; return pthread_create (&tid, 0, func, 0) == 0 ? 0 : 1; }
--EOF
--_pthreads=no
--if not hpux ; then
--  for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
--    # for crosscompilation, we cannot execute the program, be happy if we can link statically
--    cc_check $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
--  done
--fi
--fi
-+_pthreads=yes
-+_ld_pthread="${PTHREAD_LIBS}"
- if test "$_pthreads" = yes ; then
-   _res_comment="using $_ld_pthread"
-   _def_pthreads='#define HAVE_PTHREADS 1'
-@@ -6722,12 +6681,12 @@
- if bsd; then
-   echocheck "*BSD BT848 bt8xx header"
-   _ioctl_bt848_h=no
--  for file in "machine/ioctl_bt848.h" \
--            "dev/bktr/ioctl_bt848.h" \
--            "dev/video/bktr/ioctl_bt848.h" \
--            "dev/ic/bt8xx.h" ; do
-+  for file in "dev/bktr/ioctl_bt848.h" \
-+              "machine/ioctl_bt848.h" ; do
-     cat > $TMPC <<EOF
- #include <sys/types.h>
-+#include <sys/param.h>
-+#include <sys/ioctl.h>
- #include <$file>
- int main(void) {
-  ioctl(0, TVTUNER_GETFREQ, 0);
-@@ -7343,12 +7302,8 @@
- echocheck "joystick"
- _def_joystick='#undef HAVE_JOYSTICK'
- if test "$_joystick" = yes ; then
--  if linux ; then
-     # TODO add some check
-     _def_joystick='#define HAVE_JOYSTICK 1'
--  else
--    _joystick="no (unsupported under $system_name)"
--  fi
- fi
- echores "$_joystick"
- 
-@@ -7448,7 +7403,7 @@
-   CFLAGS="$CFLAGS -D_REENTRANT"
- elif bsd ; then
-   # FIXME bsd needs this so maybe other OS'es
--  CFLAGS="$CFLAGS -D_THREAD_SAFE"
-+  CFLAGS="$CFLAGS ${PTHREAD_CFLAGS}"
- fi
- if cygwin ; then
-   CFLAGS="$CFLAGS -D__CYGWIN__"
diff --git a/multimedia/mplayer/files/patch-ae b/multimedia/mplayer/files/patch-ae
deleted file mode 100644
index f21b28af1b36..000000000000
--- a/multimedia/mplayer/files/patch-ae
+++ /dev/null
@@ -1,50 +0,0 @@
---- Makefile.orig	2007-10-08 03:49:33.000000000 +0800
-+++ Makefile	2007-10-20 15:44:28.000000000 +0800
-@@ -246,44 +246,17 @@
- install: install-dirs $(INSTALL_TARGETS)
- 
- install-dirs:
--	$(INSTALL) -d $(BINDIR)
--	$(INSTALL) -d $(DATADIR)
--	$(INSTALL) -d $(MANDIR)/man1
--	$(INSTALL) -d $(CONFDIR)
--	if test -f $(CONFDIR)/codecs.conf ; then mv -f $(CONFDIR)/codecs.conf $(CONFDIR)/codecs.conf.old ; fi
- 
- install-mplayer: mplayer$(EXESUF)
--	$(INSTALL) -m 755 $(INSTALLSTRIP) mplayer$(EXESUF) $(BINDIR)
-+	@${BSD_INSTALL_PROGRAM} mplayer$(EXESUF) $(BINDIR)
- 
- install-mplayer-man:
--	for i in $(MAN_LANG); do \
--		if test "$$i" = en ; then \
--			$(INSTALL) -c -m 644 DOCS/man/en/mplayer.1 $(MANDIR)/man1/ ; \
--		else \
--			$(INSTALL) -d $(MANDIR)/$$i/man1 ; \
--			$(INSTALL) -c -m 644 DOCS/man/$$i/mplayer.1 $(MANDIR)/$$i/man1/ ; \
--		fi ; \
--	done
-+	@${BSD_INSTALL_MAN} DOCS/man/en/mplayer.1 $(MANDIR)/man1/mplayer.1
- 
- install-mencoder: mencoder$(EXESUF)
--	$(INSTALL) -m 755 $(INSTALLSTRIP) mencoder$(EXESUF) $(BINDIR)
--	for i in $(MAN_LANG); do \
--		if test "$$i" = en ; then \
--			cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 ; \
--		else \
--			cd $(MANDIR)/$$i/man1 && ln -sf mplayer.1 mencoder.1 ; \
--		fi ; \
--	done
-+	@${BSD_INSTALL_PROGRAM} mencoder$(EXESUF) $(BINDIR)
- 
- install-gui:
--	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
--	$(INSTALL) -d $(DATADIR)/skins
--	@echo "*** Download skin(s) at http://www.mplayerhq.hu/design7/dload.html"
--	@echo "*** for GUI, and extract to $(DATADIR)/skins/"
--	$(INSTALL) -d $(prefix)/share/pixmaps
--	$(INSTALL) -m 644 etc/mplayer.xpm $(prefix)/share/pixmaps/
--	$(INSTALL) -d $(prefix)/share/applications
--	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
- 
- uninstall:
- 	-rm -f $(BINDIR)/mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
new file mode 100644
index 000000000000..cd638f30fb6c
--- /dev/null
+++ b/multimedia/mplayer/files/patch-configure
@@ -0,0 +1,90 @@
+--- configure.orig	2010-01-17 00:22:43.000000000 +0100
++++ configure	2010-01-17 14:29:54.248533341 +0100
+@@ -527,7 +527,7 @@
+ _iwmmxt=auto
+ _mtrr=auto
+ _altivec=auto
+-_install=install
++_install=@${BSD_INSTALL_PROGRAM}
+ _ranlib=ranlib
+ _windres=windres
+ _cc=cc
+@@ -1353,7 +1353,6 @@
+ 
+   *)
+     echo "Unknown parameter: $ac_option"
+-    exit 1
+     ;;
+ 
+   esac
+@@ -1462,8 +1461,8 @@
+ _timer=timer-linux.c
+ _getch=getch2.c
+ if freebsd ; then
+-  extra_ldflags="$extra_ldflags -L/usr/local/lib"
+-  extra_cflags="$extra_cflags -I/usr/local/include"
++  extra_ldflags="$extra_ldflags -L$_prefix/lib"
++  extra_cflags="$extra_cflags -I$_prefix/include"
+ fi
+ 
+ if netbsd || dragonfly ; then
+@@ -3516,22 +3515,10 @@
+ if linux ; then
+   THREAD_CFLAGS=-D_REENTRANT
+ elif freebsd || netbsd || openbsd || bsdos ; then
+-  THREAD_CFLAGS=-D_THREAD_SAFE
+-fi
+-if test "$_pthreads" = auto ; then
+-cat > $TMPC << EOF
+-#include <pthread.h>
+-void* func(void *arg) { return arg; }
+-int main(void) { pthread_t tid; return pthread_create(&tid, 0, func, 0) == 0 ? 0 : 1; }
+-EOF
+-_pthreads=no
+-if ! hpux ; then
+-  for _ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
+-    # for crosscompilation, we cannot execute the program, be happy if we can link statically
+-    cc_check $THREAD_CFLAGS $_ld_tmp && (tmp_run || test "$_ld_static") && _ld_pthread="$_ld_tmp" && _pthreads=yes && break
+-  done
+-fi
++  THREAD_CFLAGS=${PTHREAD_CFLAGS}
+ fi
++_pthreads=yes
++_ld_pthread="${PTHREAD_LIBS}"
+ if test "$_pthreads" = yes ; then
+   test $_ld_pthread && _res_comment="using $_ld_pthread"
+   def_pthreads='#define HAVE_PTHREADS 1'
+@@ -7637,8 +7624,8 @@
+ if test "$_mencoder" = yes ; then
+   def_muxers='#define CONFIG_MUXERS 1'
+ else
+-  # mpeg1video for vf_lavc, snow for vf_uspp and vf_mcdeint, png for vf_screenshot
+-  _libavencoders="MPEG1VIDEO_ENCODER SNOW_ENCODER"
++  # mpeg1video for vf_lavc, snow/h263 for vf_uspp and vf_mcdeint, png for vf_screenshot
++  _libavencoders="MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
+   test "$_zlib" = yes && _libavencoders="$_libavencoders PNG_ENCODER"
+   _libavmuxers=""
+   def_muxers='#define CONFIG_MUXERS 0'
+@@ -8023,8 +8010,11 @@
+ if test "$_gui" = yes ; then
+ 
+   # Required libraries
+-  if test "$_libavcodec" != yes ||
+-      ! echo $_libavdecoders | grep -q PNG_DECODER ; then
++  # Work around a sh bug in FreeBSD < 8
++  if test "$_libavcodec" != yes ; then
++    die "The GUI requires libavcodec with PNG support (needs zlib)."
++  fi
++  if ! echo $_libavdecoders | grep -q PNG_DECODER ; then
+     die "The GUI requires libavcodec with PNG support (needs zlib)."
+   fi
+   test "$_freetype" = no && test "$_bitmap_font" = no && \
+@@ -8217,7 +8207,7 @@
+ echocheck "joystick"
+ def_joystick='#undef CONFIG_JOYSTICK'
+ if test "$_joystick" = yes ; then
+-  if linux ; then
++  if linux || freebsd ; then
+     # TODO add some check
+     def_joystick='#define CONFIG_JOYSTICK 1'
+   else
diff --git a/multimedia/mplayer/files/patch-cpudetect.h b/multimedia/mplayer/files/patch-cpudetect.h
deleted file mode 100644
index 9b77619c8aac..000000000000
--- a/multimedia/mplayer/files/patch-cpudetect.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpudetect.h.orig	Sun Apr  6 01:28:52 2003
-+++ cpudetect.h	Sun Apr  6 01:29:06 2003
-@@ -5,6 +5,8 @@
- #define CPUTYPE_I486	4
- #define CPUTYPE_I586	5
- #define CPUTYPE_I686    6
-+#define CPUTYPE_I686_7	7
-+#define CPUTYPE_I686_8	8
- 
- typedef struct cpucaps_s {
- 	int cpuType;
diff --git a/multimedia/mplayer/files/patch-gui-wm_wc.c b/multimedia/mplayer/files/patch-gui-wm_wc.c
deleted file mode 100644
index 1e18b799f03e..000000000000
--- a/multimedia/mplayer/files/patch-gui-wm_wc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- gui/wm/ws.c.orgi	2009-03-01 14:37:10.000000000 +0100
-+++ gui/wm/ws.c	2009-03-01 14:37:30.000000000 +0100
-@@ -1157,6 +1157,7 @@
-    win->xImage->data=win->Shminfo.shmaddr;
-    win->Shminfo.readOnly=0;
-    XShmAttach( wsDisplay,&win->Shminfo );
-+   XSync(wsDisplay, False);
-    shmctl( win->Shminfo.shmid,IPC_RMID,0 );
-   }
-   else
diff --git a/multimedia/mplayer/files/patch-input-joystick.c b/multimedia/mplayer/files/patch-input-joystick.c
deleted file mode 100644
index ad424472e5b1..000000000000
--- a/multimedia/mplayer/files/patch-input-joystick.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- input/joystick.c.orig	2007-10-08 03:49:26.000000000 +0800
-+++ input/joystick.c	2007-10-20 16:00:20.000000000 +0800
-@@ -24,8 +24,6 @@
- #define JS_DEV "/dev/input/js0"
- #endif
- 
--#ifdef TARGET_LINUX
--
- #include <linux/joystick.h>
- 
- int axis[256];
-@@ -145,18 +143,3 @@
- 
-   return MP_INPUT_NOTHING;
- }
--
--#else /* TARGET_LINUX */
--
--// dummy function
--
--int mp_input_joystick_init(char* dev) {
--  return -1;
--}
--
--int mp_input_joystick_read(int fd) {
--  
--  return MP_INPUT_NOTHING;
--}
--
--#endif /* TARGET_LINUX */
diff --git a/multimedia/mplayer/files/patch-libao2-ao_arts.c b/multimedia/mplayer/files/patch-libao2-ao_arts.c
index f66c40661213..23c4ee37fe6f 100644
--- a/multimedia/mplayer/files/patch-libao2-ao_arts.c
+++ b/multimedia/mplayer/files/patch-libao2-ao_arts.c
@@ -1,18 +1,15 @@
---- libao2/ao_arts.c.orig	Fri Dec 27 14:35:07 2002
-+++ libao2/ao_arts.c	Mon Mar  3 17:10:38 2003
-@@ -102,8 +102,14 @@
+--- libao2/ao_arts.c.orig	2009-03-06 13:43:12.000000000 -0600
++++ libao2/ao_arts.c	2009-07-23 19:57:44.090958744 -0500
+@@ -116,8 +116,10 @@
  
- static void uninit()
+ static void uninit(int immed)
  {
 -	arts_close_stream(stream);
+-	arts_free();
 +	if (stream != NULL) {
-+		arts_close_stream(stream);
-+		stream = NULL;
-+        }
-+/* XXX - we get "MPlayer interrupted by signal 11 in module:
-+   exit_player" unless commented :(
- 	arts_free();
-+*/ 
++	    arts_close_stream(stream);
++	    stream = NULL;
++	}
  }
  
  static int play(void* data,int len,int flags)
diff --git a/multimedia/mplayer/files/patch-libao2-ao_oss.c b/multimedia/mplayer/files/patch-libao2-ao_oss.c
index ba7ccfb401eb..265323db1d13 100644
--- a/multimedia/mplayer/files/patch-libao2-ao_oss.c
+++ b/multimedia/mplayer/files/patch-libao2-ao_oss.c
@@ -1,14 +1,14 @@
---- libao2/ao_oss.c.orig
-+++ libao2/ao_oss.c
-@@ -433,6 +433,7 @@
+--- libao2/ao_oss.c.orig	2009-05-12 21:58:57.000000000 -0500
++++ libao2/ao_oss.c	2009-07-23 19:58:44.870097203 -0500
+@@ -453,6 +453,7 @@
    fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
  #endif
  
 +  ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
    oss_format = format2oss(ao_data.format);
-   ioctl (audio_fd, SNDCTL_DSP_SETFMT, &oss_format);
-   if(ao_data.format != AF_FORMAT_AC3) {
-@@ -442,7 +443,6 @@
+   if(ao_data.format == AF_FORMAT_AC3)
+     ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
+@@ -464,7 +465,6 @@
        int c = ao_data.channels-1;
        ioctl (audio_fd, SNDCTL_DSP_STEREO, &c);
      }
diff --git a/multimedia/mplayer/files/patch-libavcodec-Makefile b/multimedia/mplayer/files/patch-libavcodec-Makefile
deleted file mode 100644
index ea1db4f04e25..000000000000
--- a/multimedia/mplayer/files/patch-libavcodec-Makefile
+++ /dev/null
@@ -1,13 +0,0 @@
---- libavcodec/Makefile.orig	2007-10-07 15:49:37.000000000 -0400
-+++ libavcodec/Makefile	2007-11-14 02:49:09.000000000 -0500
-@@ -6,6 +6,10 @@
- 
- CFLAGS += -I$(SRC_PATH)/libswscale -I$(SRC_PATH)/libavcodec
- 
-+ifeq ($(ARCH_X86_64),yes)
-+CFLAGS += -DBROKEN_RELOCATIONS
-+endif
-+
- OBJS = allcodecs.o \
-        audioconvert.o \
-        bitstream.o \
diff --git a/multimedia/mplayer/files/patch-libavcodec-h264.c b/multimedia/mplayer/files/patch-libavcodec-h264.c
deleted file mode 100644
index a6be14980de5..000000000000
--- a/multimedia/mplayer/files/patch-libavcodec-h264.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libavcodec/h264.c.orig	2007-10-08 03:49:36.000000000 +0800
-+++ libavcodec/h264.c	2007-10-20 16:03:23.000000000 +0800
-@@ -5241,7 +5241,7 @@
-     return ctx + 4 * cat;
- }
- 
--static const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
-+const attribute_used uint8_t last_coeff_flag_offset_8x8[63] = {
-     0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
-     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-     3, 3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4,
diff --git a/multimedia/mplayer/files/patch-libavcodec-libx264.c b/multimedia/mplayer/files/patch-libavcodec-libx264.c
deleted file mode 100644
index a6a801261e16..000000000000
--- a/multimedia/mplayer/files/patch-libavcodec-libx264.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- ./libavcodec/libx264.c.orig	2007-10-07 21:49:37.000000000 +0200
-+++ ./libavcodec/libx264.c	2009-04-01 00:07:32.000000000 +0200
-@@ -70,6 +70,7 @@
- X264_frame(AVCodecContext *ctx, uint8_t *buf, int bufsize, void *data)
- {
-     X264Context *x4 = ctx->priv_data;
-+    av_freep(&ctx->extradata);
-     AVFrame *frame = data;
-     x264_nal_t *nal;
-     int nnal, i;
-@@ -162,7 +163,7 @@
- 
-     x4->params.i_bframe = avctx->max_b_frames;
-     x4->params.b_cabac = avctx->coder_type == FF_CODER_TYPE_AC;
--    x4->params.b_bframe_adaptive = avctx->b_frame_strategy;
-+    x4->params.i_bframe_adaptive = avctx->b_frame_strategy;
-     x4->params.i_bframe_bias = avctx->bframebias;
-     x4->params.b_bframe_pyramid = (avctx->flags2 & CODEC_FLAG2_BPYRAMID);
-     avctx->has_b_frames= (avctx->flags2 & CODEC_FLAG2_BPYRAMID) ? 2 : !!avctx->max_b_frames;
-@@ -225,8 +226,6 @@
-     x4->params.analyse.i_me_range = avctx->me_range;
-     x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality;
- 
--    x4->params.analyse.b_bidir_me = (avctx->bidir_refine > 0);
--    x4->params.analyse.b_bframe_rdo = (avctx->flags2 & CODEC_FLAG2_BRDO);
-     x4->params.analyse.b_mixed_references =
-         (avctx->flags2 & CODEC_FLAG2_MIXED_REFS);
-     x4->params.analyse.b_chroma_me = (avctx->me_cmp & FF_CMP_CHROMA);
-@@ -251,7 +250,6 @@
-     x4->params.rc.f_ip_factor = 1/fabs(avctx->i_quant_factor);
-     x4->params.rc.f_pb_factor = avctx->b_quant_factor;
-     x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset;
--    x4->params.rc.psz_rc_eq = avctx->rc_eq;
- 
-     x4->params.analyse.b_psnr = (avctx->flags & CODEC_FLAG_PSNR);
-     x4->params.i_log_level = X264_LOG_DEBUG;
diff --git a/multimedia/mplayer/files/patch-libavutil-bswap.h b/multimedia/mplayer/files/patch-libavutil-bswap.h
deleted file mode 100644
index fc196d2b6e52..000000000000
--- a/multimedia/mplayer/files/patch-libavutil-bswap.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- libavutil/bswap.h.orig	2007-10-08 03:49:34.000000000 +0800
-+++ libavutil/bswap.h	2007-10-20 15:54:54.000000000 +0800
-@@ -29,8 +29,17 @@
- #include <stdint.h>
- #include "common.h"
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
- #ifdef HAVE_BYTESWAP_H
- #include <byteswap.h>
-+#elif (defined(__FreeBSD__) && __FreeBSD_version >= 500000)
-+#include <sys/endian.h>
-+#define bswap_16(x) bswap16(x)
-+#define bswap_32(x) bswap32(x)
-+#define bswap_64(x) bswap64(x)
- #else
- 
- #ifdef ARCH_X86_64
diff --git a/multimedia/mplayer/files/patch-libavutil-x86_cpu.h b/multimedia/mplayer/files/patch-libavutil-x86_cpu.h
new file mode 100644
index 000000000000..ae3877c1ca02
--- /dev/null
+++ b/multimedia/mplayer/files/patch-libavutil-x86_cpu.h
@@ -0,0 +1,11 @@
+--- libavutil/x86_cpu.h~	2009-03-19 09:49:47.000000000 -0500
++++ libavutil/x86_cpu.h	2009-07-24 14:20:58.308327513 -0500
+@@ -69,7 +69,7 @@
+ #define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
+ #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
+ 
+-#if ARCH_X86_64 && defined(PIC)
++#if ARCH_X86_64
+ #    define BROKEN_RELOCATIONS 1
+ #endif
+ 
diff --git a/multimedia/mplayer/files/patch-libfaad2-common.h b/multimedia/mplayer/files/patch-libfaad2-common.h
deleted file mode 100644
index 291b429405b8..000000000000
--- a/multimedia/mplayer/files/patch-libfaad2-common.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- libfaad2/common.h.orig	Thu Jun 15 10:39:27 2006
-+++ libfaad2/common.h	Thu Jun 15 10:40:18 2006
-@@ -318,8 +318,9 @@
-       *y2 = MUL_F(x2, c1) - MUL_F(x1, c2);
-   }
- 
--
--  #if defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
-+  #if defined(HAVE_LRINTF)
-+    #define HAS_LRINTF
-+  #elif defined(_WIN32) && !defined(__MINGW32__) && !defined(HAVE_LRINTF)
-     #define HAS_LRINTF
-     static INLINE int lrintf(float f)
-     {
diff --git a/multimedia/mplayer/files/patch-libmpcodecs__vd_ffmpeg.c b/multimedia/mplayer/files/patch-libmpcodecs__vd_ffmpeg.c
deleted file mode 100644
index ef5d3f1129f7..000000000000
--- a/multimedia/mplayer/files/patch-libmpcodecs__vd_ffmpeg.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./libmpcodecs/vd_ffmpeg.c.orig	2007-10-07 15:49:25.000000000 -0400
-+++ ./libmpcodecs/vd_ffmpeg.c	2009-07-17 14:28:08.733520971 -0400
-@@ -387,7 +387,7 @@
-     }
-     /* Pass palette to codec */
-     if (sh->bih && (sh->bih->biBitCount <= 8)) {
--        avctx->palctrl = calloc(1,sizeof(AVPaletteControl));
-+        avctx->palctrl = av_malloc(sizeof(AVPaletteControl));
-         avctx->palctrl->palette_changed = 1;
-         if (sh->bih->biSize-sizeof(BITMAPINFOHEADER))
-             /* Palette size in biSize */
diff --git a/multimedia/mplayer/files/patch-overflows-20080202 b/multimedia/mplayer/files/patch-overflows-20080202
deleted file mode 100644
index b7cc3fcef72c..000000000000
--- a/multimedia/mplayer/files/patch-overflows-20080202
+++ /dev/null
@@ -1,98 +0,0 @@
---- libmpdemux/demux_audio.c.orig	2007-10-08 03:49:33.000000000 +0800
-+++ libmpdemux/demux_audio.c	2008-02-02 21:01:44.000000000 +0800
-@@ -229,6 +229,8 @@
-           ptr += 4;
- 
-           comment = ptr;
-+          if (&comment[length] < comments || &comment[length] >= &comments[blk_len])
-+            return;
-           c = comment[length];
-           comment[length] = 0;
- 
---- libmpdemux/demux_mov.c.orig	2007-10-08 03:49:33.000000000 +0800
-+++ libmpdemux/demux_mov.c	2008-02-02 21:01:48.000000000 +0800
-@@ -173,11 +173,12 @@
-     i=trak->chunkmap_size;
-     while(i>0){
- 	--i;
--	for(j=trak->chunkmap[i].first;j<last;j++){
-+	j=FFMAX(trak->chunkmap[i].first, 0);
-+	for(;j<last;j++){
- 	    trak->chunks[j].desc=trak->chunkmap[i].sdid;
- 	    trak->chunks[j].size=trak->chunkmap[i].spc;
- 	}
--	last=trak->chunkmap[i].first;
-+	last=FFMIN(trak->chunkmap[i].first, trak->chunks_size);
-     }
- 
- #if 0
-@@ -235,6 +236,8 @@
-     s=0;
-     for(j=0;j<trak->durmap_size;j++){
- 	for(i=0;i<trak->durmap[j].num;i++){
-+	    if (s >= trak->samples_size)
-+		break;
- 	    trak->samples[s].pts=pts;
- 	    ++s;
- 	    pts+=trak->durmap[j].dur;
-@@ -246,6 +249,8 @@
-     for(j=0;j<trak->chunks_size;j++){
- 	off_t pos=trak->chunks[j].pos;
- 	for(i=0;i<trak->chunks[j].size;i++){
-+	    if (s >= trak->samples_size)
-+		break;
- 	    trak->samples[s].pos=pos;
- 	    mp_msg(MSGT_DEMUX, MSGL_DBG3, "Sample %5d: pts=%8d  off=0x%08X  size=%d\n",s,
- 		trak->samples[s].pts,
-@@ -1568,8 +1573,7 @@
- 			if( udta_len>udta_size)
- 				udta_len=udta_size;
- 			{
--			char dump[udta_len-4];
--			stream_read(demuxer->stream, (char *)&dump, udta_len-4-4);
-+			stream_skip(demuxer->stream, udta_len-4-4);
- 			udta_size -= udta_len;
- 			}
- 		    }
---- stream/url.c.orig	2007-10-08 03:49:26.000000000 +0800
-+++ stream/url.c	2008-02-02 21:00:22.000000000 +0800
-@@ -328,6 +328,7 @@
- 		}
- 	}
- 	
-+	tmp = NULL;
- 	while(i < len) {
- 		// look for the next char that must be kept
- 		for  (j=i;j<len;j++) {
---- stream/stream_cddb.c.orig	2007-10-08 03:49:26.000000000 +0800
-+++ stream/stream_cddb.c	2008-02-02 21:02:51.000000000 +0800
-@@ -53,6 +53,7 @@
- #include "version.h"
- #include "stream.h"
- #include "network.h"
-+#include "libavutil/intreadwrite.h"
- 
- #define DEFAULT_FREEDB_SERVER	"freedb.freedb.org"
- #define DEFAULT_CACHE_DIR	"/.cddb/"
-@@ -453,8 +454,9 @@
- 		} else {
- 			len = ptr2-ptr+1;
- 		}
-+		len = FFMIN(sizeof(album_title) - 1, len);
- 		strncpy(album_title, ptr, len);
--		album_title[len-2]='\0';
-+		album_title[len]='\0';
- 	}
- 	mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
- 	return 0;
-@@ -490,8 +492,9 @@
- 				} else {
- 					len = ptr2-ptr+1;
- 				}
-+				len = FFMIN(sizeof(album_title) - 1, len);
- 				strncpy(album_title, ptr, len);
--				album_title[len-2]='\0';
-+				album_title[len]='\0';
- 			}
- 			mp_msg(MSGT_DEMUX, MSGL_STATUS, MSGTR_MPDEMUX_CDDB_ParseOKFoundAlbumTitle, album_title);
- 			return cddb_request_titles(cddb_data);
diff --git a/multimedia/mplayer/files/patch-stream-cookies.c b/multimedia/mplayer/files/patch-stream-cookies.c
deleted file mode 100644
index 1f9bda621029..000000000000
--- a/multimedia/mplayer/files/patch-stream-cookies.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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
- 
-+#ifndef SIZE_MAX
-+#define SIZE_MAX ((size_t)-1)
-+#endif
-+
- char *cookies_file = NULL;
- 
- typedef struct cookie_list_type {
diff --git a/multimedia/mplayer/files/patch-stream-stream_dvd.h b/multimedia/mplayer/files/patch-stream-stream_dvd.h
deleted file mode 100644
index c1a709c8387b..000000000000
--- a/multimedia/mplayer/files/patch-stream-stream_dvd.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- stream/stream_dvd.h.orig	2007-10-08 03:49:26.000000000 +0800
-+++ stream/stream_dvd.h	2007-10-26 20:38:27.000000000 +0800
-@@ -1,19 +1,7 @@
--#ifdef USE_DVDREAD_INTERNAL
--#include "dvdread/dvd_reader.h"
--#include "dvdread/ifo_types.h"
--#include "dvdread/ifo_read.h"
--#include "dvdread/nav_read.h"
--#elif defined(USE_DVDNAV)
--#include <dvd_reader.h>
--#include <ifo_types.h>
--#include <ifo_read.h>
--#include <nav_read.h>
--#else
--#include <dvdread/dvd_reader.h>
--#include <dvdread/ifo_types.h>
--#include <dvdread/ifo_read.h>
--#include <dvdread/nav_read.h>
--#endif
-+#include "../dvdread/dvd_reader.h"
-+#include "../dvdread/ifo_types.h"
-+#include "../dvdread/ifo_read.h"
-+#include "../dvdread/nav_read.h"
- 
- typedef struct {
-   dvd_reader_t *dvd;
diff --git a/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c b/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
index 837abc1381c2..7b5f55815a04 100644
--- a/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
+++ b/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
@@ -1,37 +1,29 @@
---- stream/tvi_bsdbt848.c.orig	2007-10-07 21:49:26.000000000 +0200
-+++ stream/tvi_bsdbt848.c	2007-12-26 12:28:21.000000000 +0100
-@@ -26,6 +26,7 @@
- #define NTSC_HEIGHT 480
- #define NTSC_FPS    29.97
- 
-+#include <errno.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-@@ -351,11 +352,11 @@
+--- stream/tvi_bsdbt848.c.orig	2009-05-12 21:58:57.000000000 -0500
++++ stream/tvi_bsdbt848.c	2009-07-23 20:39:13.536681248 -0500
+@@ -352,11 +352,11 @@
          int req_mode = *(int *)arg;
  	u_short tmp_fps;
  
 -        priv->iformat = METEOR_FMT_AUTOMODE;
 +        priv->iformat = BT848_IFORM_F_AUTO;
  
-         if(req_mode == TV_NORM_PAL) 
+         if(req_mode == TV_NORM_PAL)
              {
 -            priv->iformat = METEOR_FMT_PAL;
 +            priv->iformat = BT848_IFORM_F_PALBDGHI;
              priv->maxheight = PAL_HEIGHT;
              priv->maxwidth = PAL_WIDTH;
              priv->maxfps = PAL_FPS;
-@@ -376,7 +377,7 @@
+@@ -377,7 +377,7 @@
  
-         if(req_mode == TV_NORM_NTSC) 
+         if(req_mode == TV_NORM_NTSC)
              {
 -            priv->iformat = METEOR_FMT_NTSC;
 +            priv->iformat = BT848_IFORM_F_NTSCM;
              priv->maxheight = NTSC_HEIGHT;
              priv->maxwidth = NTSC_WIDTH;
              priv->maxfps = NTSC_FPS;
-@@ -400,9 +401,28 @@
+@@ -401,9 +401,28 @@
                  }
              }
  
@@ -57,12 +49,12 @@
 +                }
 +            }
  
--        if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) 
-+        if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) 
+-        if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
++        if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
              {
              mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));
-             return(TVI_CONTROL_FALSE);
-@@ -531,8 +551,9 @@
+             return TVI_CONTROL_FALSE;
+@@ -532,8 +551,9 @@
  /* Video Configuration */
  
  priv->videoready = TRUE;
@@ -73,12 +65,12 @@
  priv->maxheight = PAL_HEIGHT;
  priv->maxwidth = PAL_WIDTH;
  priv->maxfps = PAL_FPS;
-@@ -557,7 +578,7 @@
+@@ -558,7 +578,7 @@
      }
  
- if(priv->videoready == TRUE && 
--   ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0) 
-+   ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0) 
+ if(priv->videoready == TRUE &&
+-   ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
++   ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
      {
      mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "SETEORSFMT", strerror(errno));
      }
diff --git a/multimedia/mplayer/files/patch-stream-tvi_v4l.c b/multimedia/mplayer/files/patch-stream-tvi_v4l.c
new file mode 100644
index 000000000000..f2ed47905057
--- /dev/null
+++ b/multimedia/mplayer/files/patch-stream-tvi_v4l.c
@@ -0,0 +1,17 @@
+--- stream/tvi_v4l.c	2007-10-07 23:49:26.000000000 +0400
++++ stream/tvi_v4l.c	2010-01-27 13:42:17.781746063 +0300
+@@ -48,6 +48,14 @@
+ 
+ #include "audio_in.h"
+ 
++#include <libv4l1.h>
++#define open	v4l1_open
++#define close	v4l1_close
++#define dup	v4l1_dup
++#define ioctl	v4l1_ioctl
++#define mmap	v4l1_mmap
++#define munmap	v4l1_munmap
++
+ static tvi_handle_t *tvi_init_v4l(tv_param_t* tv_param);
+ 
+ tvi_info_t tvi_info_v4l = {
diff --git a/multimedia/mplayer/files/patch-stream-tvi_v4l2.c b/multimedia/mplayer/files/patch-stream-tvi_v4l2.c
new file mode 100644
index 000000000000..a7c9459046c8
--- /dev/null
+++ b/multimedia/mplayer/files/patch-stream-tvi_v4l2.c
@@ -0,0 +1,25 @@
+--- stream/tvi_v4l2.c	2007-10-07 23:49:26.000000000 +0400
++++ stream/tvi_v4l2.c	2010-01-27 13:25:47.000000000 +0300
+@@ -38,7 +38,6 @@ known issues:
+ #ifdef HAVE_SYS_SYSINFO_H
+ #include <sys/sysinfo.h>
+ #endif
+-#include <linux/types.h>
+ #include <linux/videodev2.h>
+ #include "mp_msg.h"
+ #include "libmpcodecs/img_format.h"
+@@ -46,6 +46,14 @@ known issues:
+ #include "tv.h"
+ #include "audio_in.h"
+ 
++#include <libv4l2.h>
++#define open	v4l2_open
++#define close	v4l2_close
++#define dup	v4l2_dup
++#define ioctl	v4l2_ioctl
++#define mmap	v4l2_mmap
++#define munmap	v4l2_munmap
++
+ #define info tvi_info_v4l2
+ static tvi_handle_t *tvi_init_v4l2(tv_param_t* tv_param);
+ /* information about this file */
diff --git a/multimedia/mplayer/files/patch-tremor-codec_internal.h b/multimedia/mplayer/files/patch-tremor-codec_internal.h
deleted file mode 100644
index 0bba35e05417..000000000000
--- a/multimedia/mplayer/files/patch-tremor-codec_internal.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- tremor/codec_internal.h.orig	Sun Aug 20 11:04:15 2006
-+++ tremor/codec_internal.h	Sun Aug 20 11:06:05 2006
-@@ -17,6 +17,8 @@
- 
- #include "codebook.h"
- 
-+void *_vorbis_block_alloc(vorbis_block *vb, long bytes);
-+
- typedef void vorbis_look_mapping;
- typedef void vorbis_look_floor;
- typedef void vorbis_look_residue;
diff --git a/multimedia/mplayer/files/patch-vidix-mga_vid.c b/multimedia/mplayer/files/patch-vidix-mga_vid.c
index 9be0d06d7c5b..d94ced8935e8 100644
--- a/multimedia/mplayer/files/patch-vidix-mga_vid.c
+++ b/multimedia/mplayer/files/patch-vidix-mga_vid.c
@@ -1,5 +1,5 @@
---- vidix/mga_vid.c.orig	2007-10-08 03:49:27.000000000 +0800
-+++ vidix/mga_vid.c	2007-10-20 16:24:47.000000000 +0800
+--- vidix/mga_vid.c.orig	2009-05-12 21:58:57.000000000 -0500
++++ vidix/mga_vid.c	2009-07-23 20:41:50.683011307 -0500
 @@ -1110,13 +1110,10 @@
  		    i, lst[i].vendor, lst[i].device);
  	    if (lst[i].vendor == VENDOR_MATROX)
@@ -9,7 +9,7 @@
  		{
 -			printf("[mga] Device is disabled, ignoring\n");
 -			continue;
-+			printf("[mga] Device is disabled, trying anyways.\n");
++                        printf("[mga] Device is disabled, trying anyways.\n");
  		}
 -#endif
  		switch(lst[i].device)
diff --git a/multimedia/mplayer/files/patch-vidix-pci.c b/multimedia/mplayer/files/patch-vidix-pci.c
index e349a3b8ef1e..d9d310801ca7 100644
--- a/multimedia/mplayer/files/patch-vidix-pci.c
+++ b/multimedia/mplayer/files/patch-vidix-pci.c
@@ -1,10 +1,10 @@
---- vidix/pci.c.orig	2007-10-07 15:49:27.000000000 -0400
-+++ vidix/pci.c	2007-11-14 03:12:26.000000000 -0500
-@@ -484,8 +484,6 @@
+--- vidix/pci.c.orig	2009-05-12 21:58:57.000000000 -0500
++++ vidix/pci.c	2009-07-23 20:42:47.861327948 -0500
+@@ -481,8 +481,6 @@
  #include "sysdep/pci_arm32.c"
  #elif defined(__powerpc__)
  #include "sysdep/pci_powerpc.c"
--#elif defined(__x86_64__)
+-#elif defined(__x86_64__) || defined(__sh__)
 -/* Nothing here right now */
  #else
  #include "sysdep/pci_x86.c"
diff --git a/multimedia/mplayer/files/patch-vidix-radeon_vid.c b/multimedia/mplayer/files/patch-vidix-radeon_vid.c
index 60f0ed1b217b..a0362fecf410 100644
--- a/multimedia/mplayer/files/patch-vidix-radeon_vid.c
+++ b/multimedia/mplayer/files/patch-vidix-radeon_vid.c
@@ -1,6 +1,6 @@
---- vidix/radeon_vid.c.orig	2007-10-08 03:49:27.000000000 +0800
-+++ vidix/radeon_vid.c	2007-10-20 16:26:57.000000000 +0800
-@@ -353,6 +353,8 @@
+--- vidix/radeon_vid.c.orig	2009-05-12 21:58:57.000000000 -0500
++++ vidix/radeon_vid.c	2009-07-23 20:43:25.733650341 -0500
+@@ -345,6 +345,8 @@
   { DEVICE_ATI_RAGE_128_PRO2, 0 },
   { DEVICE_ATI_RAGE_128_PRO3, 0 },
  /* these seem to be based on rage 128 instead of mach64 */
diff --git a/multimedia/mplayer/files/pkg-message.in b/multimedia/mplayer/files/pkg-message.in
index 83103c0e2bca..d0947c0a280a 100644
--- a/multimedia/mplayer/files/pkg-message.in
+++ b/multimedia/mplayer/files/pkg-message.in
@@ -1,12 +1,12 @@
 
 ===================================================================
-MPlayer comes with useful documentation covering many topics like
+MPlayer's comprehensive documentation covers many topics like
 output devices, video encoding, repairing broken files etc.
-They are installed in
+It is auto-generated daily and can be found on the project
+homepage in the documentation section:
 
-%%DOCSDIR%%
+http://www.mplayerhq.hu/design7/info.html#docs
 
-for references.
 ===================================================================
 MPlayer's system-wide configuration dir is
 
@@ -18,15 +18,4 @@ your system, you find some examples in
 
 %%DATADIR%%/examples/etc
 ===================================================================
-This port provides a simple and easy to use
-tool to provide bitmap fonts in OSD.
-Just cd to the ports directory and type
-
-make install-user
-
-Note: This is only for the bitmap fonts! If you've compiled
-mplayer with truetype support, i.e. it is linked to freetype,
-which is the preferred and supported default setting, this won't
-work as expected.
-===================================================================
 
diff --git a/multimedia/mplayer/pkg-plist b/multimedia/mplayer/pkg-plist
index 1fecd8521689..199230b279b2 100644
--- a/multimedia/mplayer/pkg-plist
+++ b/multimedia/mplayer/pkg-plist
@@ -1,108 +1,6 @@
 bin/mplayer
 %%GMPLAYER%%bin/gmplayer
-%%PORTDOCS%%%%DOCSDIR%%/aalib.html
-%%PORTDOCS%%%%DOCSDIR%%/advaudio.html
-%%PORTDOCS%%%%DOCSDIR%%/aspect.html
-%%PORTDOCS%%%%DOCSDIR%%/audio-codecs.html
-%%PORTDOCS%%%%DOCSDIR%%/audio-formats.html
-%%PORTDOCS%%%%DOCSDIR%%/audio.html
-%%PORTDOCS%%%%DOCSDIR%%/bsd.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_advusers.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_fix.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_regression_test.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_report.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_security.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_what.html
-%%PORTDOCS%%%%DOCSDIR%%/bugreports_where.html
-%%PORTDOCS%%%%DOCSDIR%%/bugs-audio.html
-%%PORTDOCS%%%%DOCSDIR%%/bugs-special.html
-%%PORTDOCS%%%%DOCSDIR%%/bugs.html
-%%PORTDOCS%%%%DOCSDIR%%/caca.html
-%%PORTDOCS%%%%DOCSDIR%%/cd-dvd.html
-%%PORTDOCS%%%%DOCSDIR%%/codec-importing.html
-%%PORTDOCS%%%%DOCSDIR%%/codecs.html
-%%PORTDOCS%%%%DOCSDIR%%/commandline.html
-%%PORTDOCS%%%%DOCSDIR%%/containers.html
-%%PORTDOCS%%%%DOCSDIR%%/control.html
-%%PORTDOCS%%%%DOCSDIR%%/default.css
-%%PORTDOCS%%%%DOCSDIR%%/directfb.html
-%%PORTDOCS%%%%DOCSDIR%%/dfbmga.html
-%%PORTDOCS%%%%DOCSDIR%%/dga.html
-%%PORTDOCS%%%%DOCSDIR%%/drives.html
-%%PORTDOCS%%%%DOCSDIR%%/dvd.html
-%%PORTDOCS%%%%DOCSDIR%%/edl.html
-%%PORTDOCS%%%%DOCSDIR%%/encoding-guide.html
-%%PORTDOCS%%%%DOCSDIR%%/exotic_platforms.html
-%%PORTDOCS%%%%DOCSDIR%%/faq.html
-%%PORTDOCS%%%%DOCSDIR%%/fbdev.html
-%%PORTDOCS%%%%DOCSDIR%%/features.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%%/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/linux.html
-%%PORTDOCS%%%%DOCSDIR%%/macos.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-quicktime-7.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-rescale.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-selecting-codec.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-selecting-input.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-streamcopy.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-telecine.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-vcd-dvd.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-video-for-windows.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-x264.html
-%%PORTDOCS%%%%DOCSDIR%%/menc-feat-xvid.html
-%%PORTDOCS%%%%DOCSDIR%%/mencoder.html
-%%PORTDOCS%%%%DOCSDIR%%/mga_vid.html
-%%PORTDOCS%%%%DOCSDIR%%/mpeg_decoders.html
-%%PORTDOCS%%%%DOCSDIR%%/mtrr.html
-%%PORTDOCS%%%%DOCSDIR%%/opengl.html
-%%PORTDOCS%%%%DOCSDIR%%/other.html
-%%PORTDOCS%%%%DOCSDIR%%/ports.html
-%%PORTDOCS%%%%DOCSDIR%%/radio-input.html
-%%PORTDOCS%%%%DOCSDIR%%/radio.html
-%%PORTDOCS%%%%DOCSDIR%%/rtc.html
-%%PORTDOCS%%%%DOCSDIR%%/sdl.html
-%%PORTDOCS%%%%DOCSDIR%%/svgalib.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-file.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-fonts.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-gui.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-overview.html
-%%PORTDOCS%%%%DOCSDIR%%/skin-quality.html
-%%PORTDOCS%%%%DOCSDIR%%/skin.html
-%%PORTDOCS%%%%DOCSDIR%%/softreq.html
-%%PORTDOCS%%%%DOCSDIR%%/streaming.html
-%%PORTDOCS%%%%DOCSDIR%%/subosd.html
-%%PORTDOCS%%%%DOCSDIR%%/sync.html
-%%PORTDOCS%%%%DOCSDIR%%/tdfx_vid.html
-%%PORTDOCS%%%%DOCSDIR%%/tdfxfb.html
-%%PORTDOCS%%%%DOCSDIR%%/troubleshooting.html
-%%PORTDOCS%%%%DOCSDIR%%/tv.html
-%%PORTDOCS%%%%DOCSDIR%%/tv-input.html
-%%PORTDOCS%%%%DOCSDIR%%/tv-teletext.html
-%%PORTDOCS%%%%DOCSDIR%%/tvout.html
-%%PORTDOCS%%%%DOCSDIR%%/unix.html
-%%PORTDOCS%%%%DOCSDIR%%/usage.html
-%%PORTDOCS%%%%DOCSDIR%%/vcd.html
-%%PORTDOCS%%%%DOCSDIR%%/vesa.html
-%%PORTDOCS%%%%DOCSDIR%%/video-codecs.html
-%%PORTDOCS%%%%DOCSDIR%%/video-formats.html
-%%PORTDOCS%%%%DOCSDIR%%/video.html
-%%PORTDOCS%%%%DOCSDIR%%/vidix.html
-%%PORTDOCS%%%%DOCSDIR%%/windows.html
-%%PORTDOCS%%%%DOCSDIR%%/x11.html
-%%PORTDOCS%%%%DOCSDIR%%/xv.html
+%%GMPLAYER%%share/pixmaps/mplayer.xpm
 %%DATADIR%%/examples/etc/example.conf
 %%DATADIR%%/examples/etc/input.conf
 %%DATADIR%%/examples/etc/menu.conf
@@ -110,4 +8,3 @@ bin/mplayer
 @dirrm %%DATADIR%%/examples/etc
 @dirrm %%DATADIR%%/examples
 @dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
author	Martin Matuska <mm@FreeBSD.org>	2010-04-21 13:07:23 +0000
committer	Martin Matuska <mm@FreeBSD.org>	2010-04-21 13:07:23 +0000
commit	c2902ebdd2f0afbf27998afd98dc20876a812226 (patch)
tree	61d590d42ee6a8e07b926a95cd4125c6af006965 /multimedia
parent	15818eeb8efc009d25959bb294f5cf9d75ebe316 (diff)