Attachment 138446 Details for Bug 184407 – m.diff.txt

m.diff.txt

m.diff.txt (text/plain; charset=US-ASCII), 48.02 KB, created by Thomas Zander on 2013-12-14 21:10:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2013-12-14 21:10:01 UTC

Size: 48.02 KB

patch

obsolete

>diff -r 4a1284260490 mencoder/Makefile
>--- a/mencoder/Makefile	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mencoder/Makefile	Sat Dec 14 22:07:30 2013 +0100
>@@ -3,16 +3,16 @@
> 
> PORTNAME=	mencoder
> PORTVERSION=	${MPLAYER_PORT_VERSION}
>-PORTREVISION=	1
>+PORTREVISION=	0
> 
> COMMENT=	Convenient video file and movie encoder
> 
>-NO_STAGE=	yes
> .include "${.CURDIR}/../mplayer/Makefile.shared"
> 
> OPTIONS_DEFINE= AMR_NB AMR_WB BLURAY CDIO CDPARANOIA DEBUG DIRAC \
>-		DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK LADSPA \
>-		LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS OPENAL OPENJPEG \
>+		DV FAAC FONTCONFIG FRIBIDI GIF GSM IPV6 JACK \
>+		LADSPA LIBMNG LIVEMEDIA LZO MAD NAS OCFLAGS \
>+		OPENAL OPENJPEG OPUS \
> 		OTCHAIN PULSEAUDIO REAL RTCPU RTMP SCHROEDINGER SMB \
> 		THEORA TWOLAME V4L VPX WIN32 X264 XVID
> 
>@@ -21,13 +21,12 @@
> BLURAY_DESC?=	BluRay support
> LZO_DESC?=	Enable external liblzo library
> OCFLAGS_DESC?=	Use optimized compiler flags
>+OPUS_DESC?=	Opus decoding with libopus
> OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
> REAL_DESC?=	Enable realplayer plugin
> RTCPU_DESC?=	Use runtime CPU detection
> WIN32_DESC?=	Install win32 binary codecs
> 
>-MAN1=		mencoder.1
>-
> RESTRICTED=	Port has restricted dependencies
> 
> PATCHDIR=	${.CURDIR}/../mplayer/files
>@@ -43,10 +42,10 @@
> 		subedit.pl subsearch.sh vobshift.py \
> 		w32codec_dl.pl wma2ogg.pl
> 
>+.include "${.CURDIR}/../mplayer/Makefile.optvars"
>+.include <bsd.port.options.mk>
> .include <bsd.port.pre.mk>
> 
>-LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame
>-
> CONFIGURE_ARGS+=	--disable-mplayer \
> 			--disable-libdca \
> 			--disable-x11 \
>@@ -65,46 +64,12 @@
> 			--disable-enca \
> 			--disable-musepack
> 
>+LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
>+
> ALL_TARGET=	mencoder
> 
> .include "${.CURDIR}/../mplayer/Makefile.options"
> 
>-.if ${PORT_OPTIONS:MFONTCONFIG}
>-LIB_DEPENDS+=		fontconfig:${PORTSDIR}/x11-fonts/fontconfig
>-.else
>-CONFIGURE_ARGS+=	--disable-fontconfig
>-.endif
>-
>-.if ${PORT_OPTIONS:MTWOLAME}
>-LIB_DEPENDS+=		twolame:${PORTSDIR}/audio/twolame
>-.else
>-CONFIGURE_ARGS+=	--disable-twolame
>-.endif
>-
>-.if ${PORT_OPTIONS:MFAAC}
>-LIB_DEPENDS+=		faac:${PORTSDIR}/audio/faac
>-.else
>-CONFIGURE_ARGS+=	--disable-faac
>-.endif
>-
>-.if ${PORT_OPTIONS:MX264}
>-LIB_DEPENDS+=		x264:${PORTSDIR}/multimedia/x264
>-.else
>-CONFIGURE_ARGS+=	--disable-x264
>-.endif
>-
>-.if ${PORT_OPTIONS:MXVID}
>-LIB_DEPENDS+=		xvidcore:${PORTSDIR}/multimedia/xvid
>-.else
>-CONFIGURE_ARGS+=	--disable-xvid
>-.endif
>-
>-.if ${PORT_OPTIONS:MDIRAC}
>-LIB_DEPENDS+=		dirac_encoder:${PORTSDIR}/multimedia/dirac
>-.else
>-CONFIGURE_ARGS+=	--disable-libdirac-lavc
>-.endif
>-
> pre-everything::
> 	@${ECHO_MSG} "N - O - T - E"
> 	@${ECHO_MSG} ""
>@@ -141,20 +106,16 @@
> 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
> 
> do-install:
>-	@${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${PREFIX}/bin
>+	@${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
> 
> post-install:
>-	@${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${MAN1PREFIX}/man/man1/mencoder.1
>-	@${MKDIR} ${DATADIR}
>-	@${CHMOD} 755 ${DATADIR}
>-	@${MKDIR} ${DATADIR}/tools
>-	@${CHMOD} 755 ${DATADIR}/tools
>+	@${INSTALL_MAN} ${WRKSRC}/DOCS/man/en/mplayer.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/mencoder.1
>+	@${MKDIR} ${STAGEDIR}${DATADIR}
>+	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/tools
>+	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/tools
> .for tool in ${TOOLFILES}
>-	@${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${DATADIR}/tools
>+	@${INSTALL_SCRIPT} ${WRKSRC}/TOOLS/${tool} ${STAGEDIR}${DATADIR}/tools
> .endfor
> 
>-.if ${ARCH} == "ia64" || ${ARCH} == "sparc64"
>-BROKEN=		Does not detect CPU correctly on ia64 or sparc64
>-.endif
>-
> .include <bsd.port.post.mk>
>diff -r 4a1284260490 mencoder/distinfo
>--- a/mencoder/distinfo	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mencoder/distinfo	Sat Dec 14 22:07:30 2013 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258
>-SIZE (mplayer-1.1.20130308.tar.xz) = 10326840
>+SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb
>+SIZE (mplayer-1.1.20131109.tar.xz) = 10738036
>diff -r 4a1284260490 mencoder/pkg-plist
>--- a/mencoder/pkg-plist	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mencoder/pkg-plist	Sat Dec 14 22:07:30 2013 +0100
>@@ -1,4 +1,5 @@
> bin/mencoder
>+man/man1/mencoder.1.gz
> %%DATADIR%%/tools/aconvert.sh
> %%DATADIR%%/tools/binary_codecs.sh
> %%DATADIR%%/tools/calcbpp.pl
>diff -r 4a1284260490 mplayer/Makefile
>--- a/mplayer/Makefile	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mplayer/Makefile	Sat Dec 14 22:07:30 2013 +0100
>@@ -1,19 +1,18 @@
> # Created by: Thomas E. Zander with help from Vladimir Kushnir
>-# $FreeBSD: head/multimedia/mplayer/Makefile 335446 2013-12-01 21:58:15Z thierry $
>+# $FreeBSD: head/multimedia/mplayer/Makefile 327747 2013-09-20 20:57:48Z bapt $
> 
> PORTNAME=	mplayer
> PORTVERSION=	${MPLAYER_PORT_VERSION}
>-PORTREVISION=	1
>+PORTREVISION=	0
> 
> COMMENT=	High performance media player supporting many formats
> 
>-NO_STAGE=	yes
> .include "${.CURDIR}/Makefile.shared"
> 
>-OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
>+OPTIONS_DEFINE= AALIB AMR_NB AMR_WB BLURAY CACA DEBUG DV \
> 		ENCA ESOUND FRIBIDI GIF GSM GUI IPV6 JACK \
>-		JOYSTICK LADSPA LIBMNG LIRC LIVEMEDIA LZO MAD \
>-		NAS OCFLAGS OPENAL OPENGL OPENJPEG OTCHAIN \
>+		LADSPA LIBMNG LIRC LZO NAS OCFLAGS \
>+		OPENAL OPENGL OPENJPEG OPUS OTCHAIN \
> 		PULSEAUDIO REAL RTC RTCPU RTMP SCHROEDINGER SDL \
> 		SKINS SMB SVGALIB V4L VDPAU WIN32 \
> 		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
>@@ -26,9 +25,9 @@
> 
> BLURAY_DESC?=	BluRay support
> ENCA_DESC?=	Charset conversion via enca
>-JOYSTICK_DESC?=	Joystick support
> LZO_DESC?=	External liblzo support
> OCFLAGS_DESC?=	Use optimized compiler flags
>+OPUS_DESC?=	Opus decoding with libopus
> OTCHAIN_DESC?=	Use gcc 4.6+ toolchain on legacy systems
> REAL_DESC?=	Enable realplayer plugin
> RTC_DESC?=	Add support for kernel real time clock
>@@ -38,24 +37,20 @@
> X11DGA_DESC?=	X11 DGA video driver support
> X11VM_DESC?=	X11 VidMode support
> 
>-MAN1=		mplayer.1
>-MANCOMPRESSED=	no
>+#MANCOMPRESSED=	no
> 
> SUB_FILES=	pkg-message
> 
> CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
>-USES=		pkgconfig
>+USES+=		pkgconfig
> 
>+.include "${.CURDIR}/Makefile.optvars"
>+.include <bsd.port.options.mk>
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "sparc64"
>-BROKEN=		Does not compile on sparc64
>-.endif
>-
> CONFIGURE_ARGS+=	--disable-arts \
> 			--disable-directfb \
> 			--disable-faac \
>-			--disable-faad \
> 			--disable-libdca \
> 			--disable-toolame \
> 			--disable-twolame \
>@@ -67,15 +62,9 @@
> 			--disable-musepack \
> 			--disable-theora
> 
>-# Fix a problem with unknown assembly opcodes in embedded ffmpeg
>-.if ${ARCH} == "ppc"
>-CONFIGURE_ARGS+=	--disable-asm
>-.endif
>-
> .include "${.CURDIR}/Makefile.options"
> 
> .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
>-MLINKS+=	mplayer.1 gmplayer.1
> PLIST_SUB+=	GMPLAYER=""
> DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
> .if ${PORT_OPTIONS:MSKINS}
>@@ -94,7 +83,7 @@
> .endif #GUI && X11
> 
> .if ${PORT_OPTIONS:MX11}
>-USE_XORG=	x11
>+USE_XORG=	x11 xscrnsaver
> .if ${PORT_OPTIONS:MXVIDEO}
> USE_XORG+=	xv
> .else
>@@ -130,75 +119,6 @@
> 		--disable-fontconfig
> .endif
> 
>-.if ${PORT_OPTIONS:MVDPAU}
>-LIB_DEPENDS+=	vdpau:${PORTSDIR}/multimedia/libvdpau
>-.else
>-CONFIGURE_ARGS+=	--disable-vdpau
>-.endif
>-
>-.if ${PORT_OPTIONS:MRTC}
>-BUILD_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
>-RUN_DEPENDS+=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
>-CONFIGURE_ARGS+=	--enable-rtc
>-.else
>-CONFIGURE_ARGS+=	--disable-rtc
>-.endif
>-
>-.if ${PORT_OPTIONS:MCACA}
>-LIB_DEPENDS+=		caca:${PORTSDIR}/graphics/libcaca
>-.else
>-CONFIGURE_ARGS+=	--disable-caca
>-.endif
>-
>-.if ${PORT_OPTIONS:MLIRC}
>-LIB_DEPENDS+=		lirc_client:${PORTSDIR}/comms/lirc
>-.else
>-CONFIGURE_ARGS+=	--disable-lirc
>-.endif
>-
>-.if ${PORT_OPTIONS:MSDL}
>-USE_SDL=	sdl
>-.else
>-CONFIGURE_ARGS+=	--disable-sdl
>-.endif
>-
>-.if ${PORT_OPTIONS:MSVGALIB}
>-LIB_DEPENDS+=		vga:${PORTSDIR}/graphics/svgalib
>-.else
>-CONFIGURE_ARGS+=	--disable-svga
>-.endif
>-
>-.if ${PORT_OPTIONS:MAALIB} || ${PORT_OPTIONS:MSDL}
>-LIB_DEPENDS+=		aa:${PORTSDIR}/graphics/aalib
>-.else
>-CONFIGURE_ARGS+=	--disable-aa
>-.endif
>-
>-.if ${PORT_OPTIONS:MESOUND}
>-USE_GNOME+=	esound
>-.else
>-CONFIGURE_ARGS+=	--disable-esd
>-.endif
>-
>-.if defined(WITH_KERN_HZ)
>-DEFAULT_KERN_HZ=${WITH_KERN_HZ}
>-.else
>-DEFAULT_KERN_HZ=1024
>-.endif
>-
>-.if ${PORT_OPTIONS:MJOYSTICK}
>-BUILD_DEPENDS+=	${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js
>-CONFIGURE_ARGS+=--enable-joystick
>-.else
>-CONFIGURE_ARGS+=--disable-joystick
>-.endif
>-
>-.if ${PORT_OPTIONS:MENCA}
>-LIB_DEPENDS+=		enca:${PORTSDIR}/converters/enca
>-.else
>-CONFIGURE_ARGS+=	--disable-enca
>-.endif
>-
> pre-everything::
> 	@${ECHO_MSG} "N - O - T - E"
> 	@${ECHO_MSG} ""
>@@ -248,16 +168,17 @@
> .endif
> 
> post-install:
>-	@${MKDIR} ${DATADIR}
>-	@${CHMOD} 755 ${DATADIR}
>-	@${MKDIR} ${DATADIR}/examples/etc
>-	@${CHMOD} 755 ${DATADIR}/examples/etc
>+	@${MKDIR} ${STAGEDIR}${DATADIR}
>+	@${CHMOD} 755 ${STAGEDIR}${DATADIR}
>+	@${MKDIR} ${STAGEDIR}${DATADIR}/examples/etc
>+	@${CHMOD} 755 ${STAGEDIR}${DATADIR}/examples/etc
> .for conf in ${CONFFILES}
>-	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${DATADIR}/examples/etc
>+	${INSTALL_DATA} ${WRKSRC}/etc/${conf} ${STAGEDIR}${DATADIR}/examples/etc
> .endfor
> .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
>-	@${LN} -sf ${PREFIX}/bin/mplayer ${PREFIX}/bin/gmplayer
>-	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${LOCALBASE}/share/pixmaps/mplayer.png
>+	@${LN} -sf ${PREFIX}/bin/mplayer ${STAGEDIR}${PREFIX}/bin/gmplayer
>+	@(cd ${STAGEDIR}${MAN1PREFIX}/man/man1 && ${LN} -sf mplayer.1.gz gmplayer.1.gz)
>+	${CP} -f ${WRKSRC}/etc/mplayer256x256.png ${STAGEDIR}${LOCALBASE}/share/pixmaps/mplayer.png
> .endif
> 	@${CAT} ${PKGMESSAGE}
> 
>diff -r 4a1284260490 mplayer/Makefile.options
>--- a/mplayer/Makefile.options	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mplayer/Makefile.options	Sat Dec 14 22:07:30 2013 +0100
>@@ -1,10 +1,11 @@
>-# Contains the options and dependencies that are shared
>-# among mplayer and mencoder
>+# Contains non-trivial handling of option variables
>+# and build environment. Must be included after
>+# bsd.port.pre.mk
> #
> # Some of the knobs are not tunable by the OPTIONS framework. These are
> # explained here in detail.
> #
>-# $FreeBSD: head/multimedia/mplayer/Makefile.options 335446 2013-12-01 21:58:15Z thierry $
>+# $FreeBSD: head/multimedia/mplayer/Makefile.options 330729 2013-10-18 07:45:48Z tijl $
> #
> # Feature options:
> # These options influence some general behaviour of mplayer. Almost all of the featues,
>@@ -27,14 +28,87 @@
> # Enables language support bg, cz, de, dk, en, es, fr, gr, hu, it, ko, nl, no, pl, pt_BR, ro, ru, sk, tr, uk, zh
> #
> 
>-.if ${OSVERSION} < 802502
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-base_system_log2f
>-.endif
>+# Non-OPTIONS knob handling
>+# =========================
> 
> .if defined(WITH_LANG)
> CONFIGURE_ARGS+=--language=${WITH_LANG}
> .endif
> 
>+.if defined(WITH_DVD_DEVICE)
>+DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
>+.else
>+DEFAULT_DVD_DEVICE=/dev/cd0
>+.endif
>+
>+.if defined(WITH_CDROM_DEVICE)
>+DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
>+.else
>+DEFAULT_CDROM_DEVICE=/dev/cd0
>+.endif
>+
>+.if defined(WITH_KERN_HZ)
>+DEFAULT_KERN_HZ=${WITH_KERN_HZ}
>+.else
>+DEFAULT_KERN_HZ=1024
>+.endif
>+
>+
>+# Non-simplified OPTIONS handling
>+# ===============================
>+
>+.if ${PORT_OPTIONS:MESOUND}
>+USE_GNOME+=	esound
>+.else
>+CONFIGURE_ARGS+=	--disable-esd
>+.endif
>+
>+.if ${PORT_OPTIONS:MIPV6}
>+CATEGORIES+=	ipv6
>+.else
>+CONFIGURE_ARGS+=	--disable-inet6
>+.endif
>+
>+.if ${PORT_OPTIONS:MOPENAL}
>+USE_OPENAL=	soft
>+.else
>+CONFIGURE_ARGS+=	--disable-openal
>+.endif
>+
>+.if ${PORT_OPTIONS:MRTMP}
>+LIB_DEPENDS+=		librtmp.so:${PORTSDIR}/multimedia/librtmp
>+CONFIGURE_ARGS+=	--enable-librtmp
>+EXTRA_LIBS+=		-lrtmp
>+.else
>+CONFIGURE_ARGS+=	--disable-librtmp
>+.endif
>+
>+.if ${PORT_OPTIONS:MSDL}
>+USE_SDL=	sdl
>+LIB_DEPENDS+=		libaa.so:${PORTSDIR}/graphics/aalib
>+.else
>+CONFIGURE_ARGS+=	--disable-sdl
>+.endif
>+
>+.if ${PORT_OPTIONS:MV4L}
>+BUILD_DEPENDS+=		${LOCALBASE}/include/linux/videodev2.h:${PORTSDIR}/multimedia/v4l_compat
>+LIB_DEPENDS+=		libv4l2.so:${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
>+
>+
>+# Build system handling (including OPTIONS)
>+# =========================================
>+
>+.if ${OSVERSION} < 802502
>+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-base_system_log2f
>+.endif
>+
> #On i386, gcc runs out of general purpose registers when
> #trying to compile a debug version with the default flags.
> .if ${PORT_OPTIONS:MDEBUG}
>@@ -49,11 +123,25 @@
> .endif #OCFLAGS
> .endif #DEBUG
> 
>-#Supported architectures for clang
>+# Supported architectures for clang
> .if ${ARCH} == "amd64" || ${ARCH} == "i386"
> MPLAYER_CLANG_SUPPORTED_ARCH=	yes
> .endif
> 
>+# Unsupported architectures for inline assembly
>+.if ${ARCH} == "ppc"
>+CONFIGURE_ARGS+=	--disable-asm
>+.endif
>+
>+# Unsupported architectures
>+.if ${ARCH} == "sparc64"
>+BROKEN=		Does not compile on sparc64
>+.endif
>+.if ${ARCH} == "ia64"
>+BROKEN=		Does not detect CPU correctly on ia64
>+.endif
>+
>+
> .if ${PORT_OPTIONS:MRTCPU}
> CONFIGURE_ARGS+=--enable-runtime-cpudetection
> .endif
>@@ -85,149 +173,6 @@
> .endif
> .endif
> 
>-.if ${PORT_OPTIONS:MIPV6}
>-CATEGORIES+=	ipv6
>-.else
>-CONFIGURE_ARGS+=	--disable-inet6
>-.endif
>-
>-.if ${PORT_OPTIONS:MGIF}
>-LIB_DEPENDS+=		gif:${PORTSDIR}/graphics/giflib
>-.else
>-CONFIGURE_ARGS+=	--disable-gif
>-.endif
>-
>-.if ${PORT_OPTIONS:MOPENJPEG}
>-LIB_DEPENDS+=		openjpeg:${PORTSDIR}/graphics/openjpeg
>-.else
>-CONFIGURE_ARGS+=	--disable-libopenjpeg
>-.endif
>-
>-.if ${PORT_OPTIONS:MMAD}
>-LIB_DEPENDS+=		mad:${PORTSDIR}/audio/libmad
>-.else
>-CONFIGURE_ARGS+=	--disable-mad
>-.endif
>-
>-.if ${PORT_OPTIONS:MDV}
>-LIB_DEPENDS+=		dv:${PORTSDIR}/multimedia/libdv
>-.else
>-CONFIGURE_ARGS+=	--disable-libdv
>-.endif
>-
>-.if ${PORT_OPTIONS:MTHEORA}
>-LIB_DEPENDS+=		theora:${PORTSDIR}/multimedia/libtheora
>-.else
>-CONFIGURE_ARGS+=	--disable-theora
>-.endif
>-
>-.if ${PORT_OPTIONS:MVPX}
>-LIB_DEPENDS+=		vpx:${PORTSDIR}/multimedia/libvpx
>-.else
>-CONFIGURE_ARGS+=	--disable-libvpx-lavc
>-.endif
>-
>-.if ${PORT_OPTIONS:MSCHROEDINGER}
>-LIB_DEPENDS+=		schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger
>-.else
>-CONFIGURE_ARGS+=	--disable-libschroedinger-lavc
>-.endif
>-
>-.if ${PORT_OPTIONS:MLIVEMEDIA}
>-CONFIGURE_ARGS+=	--enable-live
>-LIB_DEPENDS+=		libliveMedia.so:${PORTSDIR}/net/liveMedia
>-CFLAGS+=		-I${LOCALBASE}/include/liveMedia	\
>-			-I${LOCALBASE}/include/UsageEnvironment	\
>-			-I${LOCALBASE}/include/groupsock	\
>-			-I${LOCALBASE}/include/BasicUsageEnvironment
>-LDFLAGS+=		-L${LOCALBASE}/lib	\
>-			-lliveMedia \
>-			-lUsageEnvironment \
>-			-lBasicUsageEnvironment \
>-			-lgroupsock \
>-			-lstdc++
>-.else
>-CONFIGURE_ARGS+=	--disable-live
>-.endif
>-
>-.if ${PORT_OPTIONS:MJACK}
>-LIB_DEPENDS+=		jack:${PORTSDIR}/audio/jack
>-.else
>-CONFIGURE_ARGS+=	--disable-jack
>-.endif
>-
>-.if ${PORT_OPTIONS:MNAS}
>-LIB_DEPENDS+=		audio:${PORTSDIR}/audio/nas
>-.else
>-CONFIGURE_ARGS+=	--disable-nas
>-.endif
>-
>-.if ${PORT_OPTIONS:MOPENAL}
>-USE_OPENAL=	soft
>-.else
>-CONFIGURE_ARGS+=	--disable-openal
>-.endif
>-
>-.if ${PORT_OPTIONS:MPULSEAUDIO}
>-LIB_DEPENDS+=		pulse:${PORTSDIR}/audio/pulseaudio
>-.else
>-CONFIGURE_ARGS+=	--disable-pulse
>-.endif
>-
>-.if ${PORT_OPTIONS:MBLURAY}
>-LIB_DEPENDS+=		bluray:${PORTSDIR}/multimedia/libbluray
>-.else
>-CONFIGURE_ARGS+=	--disable-bluray
>-.endif
>-
>-.if ${PORT_OPTIONS:MSMB}
>-LIB_DEPENDS+=		smbclient:${PORTSDIR}/net/samba-libsmbclient
>-.else
>-CONFIGURE_ARGS+=	--disable-smb
>-.endif
>-
>-.if ${PORT_OPTIONS:MFRIBIDI}
>-LIB_DEPENDS+=		fribidi:${PORTSDIR}/converters/fribidi
>-.else
>-CONFIGURE_ARGS+=	--disable-fribidi
>-.endif
>-
>-.if ${PORT_OPTIONS:MCDPARANOIA}
>-LIB_DEPENDS+=		cdda_paranoia:${PORTSDIR}/audio/cdparanoia
>-.else
>-CONFIGURE_ARGS+=	--disable-cdparanoia
>-.endif
>-
>-.if ${PORT_OPTIONS:MCDIO}
>-LIB_DEPENDS+=		cdio:${PORTSDIR}/sysutils/libcdio
>-.else
>-CONFIGURE_ARGS+=	--disable-libcdio
>-.endif
>-
>-.if ${PORT_OPTIONS:MLADSPA}
>-RUN_DEPENDS+=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
>-.else
>-CONFIGURE_ARGS+=	--disable-ladspa
>-.endif
>-
>-.if ${PORT_OPTIONS:MLZO}
>-LIB_DEPENDS+=		lzo2:${PORTSDIR}/archivers/lzo2
>-.else
>-CONFIGURE_ARGS+=	--disable-liblzo
>-.endif
>-
>-.if defined(WITH_DVD_DEVICE)
>-DEFAULT_DVD_DEVICE=${WITH_DVD_DEVICE}
>-.else
>-DEFAULT_DVD_DEVICE=/dev/cd0
>-.endif
>-
>-.if defined(WITH_CDROM_DEVICE)
>-DEFAULT_CDROM_DEVICE=${WITH_CDROM_DEVICE}
>-.else
>-DEFAULT_CDROM_DEVICE=/dev/cd0
>-.endif
>-
> .if ${ARCH} == "i386" || ${ARCH} == "amd64"
> .if ${PORT_OPTIONS:MWIN32} && !defined(PACKAGE_BUILDING) && ${ARCH} == "i386"
> RUN_DEPENDS+=	${CODEC_DETECTION_FILE}:${CODEC_PORT}
>@@ -240,57 +185,7 @@
> .endif
> .endif # ARCH == i386/amd64
> 
>-.if ${PORT_OPTIONS:MREAL}
>-RUN_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
>-BUILD_DEPENDS+=		realplay:${PORTSDIR}/multimedia/linux-realplayer
>-.else
>-CONFIGURE_ARGS+=	--disable-real
>-.endif
>-
>-.if ${PORT_OPTIONS:MAMR_NB} || ${PORT_OPTIONS:MAMR_WB}
>-LIB_DEPENDS+=		opencore-amrnb:${PORTSDIR}/audio/opencore-amr
>-.endif
>-
>-.if !${PORT_OPTIONS:MAMR_NB}
>-CONFIGURE_ARGS+=	--disable-libopencore_amrnb
>-.endif
>-
>-.if !${PORT_OPTIONS:MAMR_WB}
>-CONFIGURE_ARGS+=	--disable-libopencore_amrwb
>-.endif
>-
>-.if ${PORT_OPTIONS:MGSM}
>-LIB_DEPENDS+=		gsm:${PORTSDIR}/audio/gsm
>-.else
>-CONFIGURE_ARGS+=	--disable-libgsm
>-.endif
>-
>-.if ${PORT_OPTIONS:MV4L}
>-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 ${PORT_OPTIONS:MRTMP}
>-LIB_DEPENDS+=		rtmp:${PORTSDIR}/multimedia/rtmpdump
>-CONFIGURE_ARGS+=	--enable-librtmp
>-EXTRA_LIBS+=		-lrtmp
>-.else
>-CONFIGURE_ARGS+=	--disable-librtmp
>-.endif
>-
>-.if ${PORT_OPTIONS:MLIBMNG}
>-LIB_DEPENDS+=		mng:${PORTSDIR}/graphics/libmng
>-.else
>-CONFIGURE_ARGS+=	--disable-mng
>-.endif
> 
> .if defined(EXTRA_LIBS)
> CONFIGURE_ARGS+=	--extra-libs="${EXTRA_LIBS}"
> .endif
>-
>diff -r 4a1284260490 mplayer/Makefile.optvars
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/mplayer/Makefile.optvars	Sat Dec 14 22:07:30 2013 +0100
>@@ -0,0 +1,110 @@
>+# Contains simple option variables that are used
>+# before including bsd.port.options.mk
>+# in Makefiles
>+
>+AALIB_LIB_DEPENDS=	libaa.so:${PORTSDIR}/graphics/aalib
>+AALIB_CONFIGURE_OFF=	--disable-aa
>+
>+AMR_NB_LIB_DEPENDS=	libopencore-amrnb.so:${PORTSDIR}/audio/opencore-amr
>+AMR_NB_CONFIGURE_OFF=	--disable-libopencore_amrnb
>+
>+AMR_WB_LIB_DEPENDS=	libopencore-amrwb.so:${PORTSDIR}/audio/opencore-amr
>+AMR_WB_CONFIGURE_OFF=	--disable-libopencore_amrwb
>+
>+BLURAY_LIB_DEPENDS=	libbluray.so:${PORTSDIR}/multimedia/libbluray
>+BLURAY_CONFIGURE_OFF=	--disable-bluray
>+
>+CACA_LIB_DEPENDS=	libcaca.so:${PORTSDIR}/graphics/libcaca
>+CACA_CONFIGURE_OFF=	--disable-caca
>+
>+CDIO_LIB_DEPENDS=	libcdio.so:${PORTSDIR}/sysutils/libcdio
>+CDIO_CONFIGURE_OFF=	--disable-libcdio
>+
>+CDPARANOIA_LIB_DEPENDS=	libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia
>+CDPARANOIA_CONFIGURE_OFF=	--disable-cdparanoia
>+
>+DIRAC_LIB_DEPENDS=	libdirac_encoder.so:${PORTSDIR}/multimedia/dirac
>+DIRAC_CONFIGURE_OFF=	--disable-libdirac-lavc
>+
>+DV_LIB_DEPENDS=		dv.so:${PORTSDIR}/multimedia/libdv
>+DV_CONFIGURE_OFF=	--disable-libdv
>+
>+ENCA_LIB_DEPENDS=	libenca.so:${PORTSDIR}/converters/enca
>+ENCA_CONFIGURE_OFF=		--disable-enca
>+
>+FAAC_LIB_DEPENDS=	libfaac.so:${PORTSDIR}/audio/faac
>+FAAC_CONFIGURE_OFF=	--disable-faac
>+
>+FONTCONFIG_LIB_DEPENDS=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig
>+FONTCONFIG_CONFIGURE_OFF=	--disable-fontconfig
>+
>+FRIBIDI_LIB_DEPENDS=	libfribidi.so:${PORTSDIR}/converters/fribidi
>+FRIBIDI_CONFIGURE_OFF=	--disable-fribidi
>+
>+GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
>+GIF_CONFIGURE_OFF=	--disable-gif
>+
>+GSM_LIB_DEPENDS=	libgsm.so:${PORTSDIR}/audio/gsm
>+GSM_CONFIGURE_OFF=	--disable-libgsm
>+
>+JACK_LIB_DEPENDS=	libjack.so:${PORTSDIR}/audio/jack
>+JACK_CONFIGURE_OFF=	--disable-jack
>+
>+LADSPA_RUN_DEPENDS=	${LOCALBASE}/lib/ladspa/amp.so:${PORTSDIR}/audio/ladspa
>+LADSPA_CONFIGURE_OFF=	--disable-ladspa
>+
>+LIBMNG_LIB_DEPENDS=	libmng.so:${PORTSDIR}/graphics/libmng
>+LIBMNG_CONFIGURE_OFF=	--disable-mng
>+
>+LIRC_LIB_DEPENDS=	liblirc_client.so:${PORTSDIR}/comms/lirc
>+LIRC_CONFIGURE_OFF=	--disable-lirc
>+
>+LZO_LIB_DEPENDS=	liblzo2.so:${PORTSDIR}/archivers/lzo2
>+LZO_CONFIGURE_OFF=	--disable-liblzo
>+
>+NAS_LIB_DEPENDS=	libaudio.so:${PORTSDIR}/audio/nas
>+NAS_CONFIGURE_OFF=	--disable-nas
>+
>+OPENJPEG_LIB_DEPENDS=	libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
>+OPENJPEG_CONFIGURE_OFF=	--disable-libopenjpeg
>+
>+OPUS_LIB_DEPENDS=	libopus.so:${PORTSDIR}/audio/opus
>+OPUS_CONFIGURE_OFF=	--disable-libopus
>+
>+PULSEAUDIO_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
>+PULSEAUDIO_CONFIGURE_OFF=	--disable-pulse
>+
>+REAL_RUN_DEPENDS=	realplay:${PORTSDIR}/multimedia/linux-realplayer
>+REAL_BUILD_DEPENDS=	realplay:${PORTSDIR}/multimedia/linux-realplayer
>+REAL_CONFIGURE_OFF=	--disable-real
>+
>+RTC_BUILD_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
>+RTC_RUN_DEPENDS=	${LOCALBASE}/modules/rtc.ko:${PORTSDIR}/emulators/rtc
>+RTC_CONFIGURE_ENABLE=	rtc
>+
>+SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:${PORTSDIR}/multimedia/schroedinger
>+SCHROEDINGER_CONFIGURE_OFF=	--disable-libschroedinger-lavc
>+
>+SMB_LIB_DEPENDS=	libsmbclient.so:${PORTSDIR}/net/samba-libsmbclient
>+SMB_CONFIGURE_OFF=	--disable-smb
>+
>+SVGALIB_LIB_DEPENDS=	libvga.so:${PORTSDIR}/graphics/svgalib
>+SVGALIB_CONFIGURE_OFF=	--disable-svga
>+
>+THEORA_LIB_DEPENDS=	libtheora.so:${PORTSDIR}/multimedia/libtheora
>+THEORA_CONFIGURE_OFF=	--disable-theora
>+
>+TWOLAME_LIB_DEPENDS=	libtwolame.so:${PORTSDIR}/audio/twolame
>+TWOLAME_CONFIGURE_OFF=	--disable-twolame
>+
>+VDPAU_LIB_DEPENDS=	libvdpau.so:${PORTSDIR}/multimedia/libvdpau
>+VDPAU_CONFIGURE_OFF=	--disable-vdpau
>+
>+VPX_LIB_DEPENDS=	libvpx.so:${PORTSDIR}/multimedia/libvpx
>+VPX_CONFIGURE_OFF=	--disable-libvpx-lavc
>+
>+X264_LIB_DEPENDS=	libx264.so:${PORTSDIR}/multimedia/x264
>+X264_CONFIGURE_OFF=	--disable-x264
>+
>+XVID_LIB_DEPENDS=	libxvidcore.so:${PORTSDIR}/multimedia/xvid
>+XVID_CONFIGURE_OFF=	--disable-xvid
>diff -r 4a1284260490 mplayer/Makefile.shared
>--- a/mplayer/Makefile.shared	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mplayer/Makefile.shared	Sat Dec 14 22:07:30 2013 +0100
>@@ -4,7 +4,7 @@
> #
> # $FreeBSD: head/multimedia/mplayer/Makefile.shared 327683 2013-09-20 10:54:22Z ak $
> 
>-MPLAYER_SNAPSHOT_DATE=	2013-03-08
>+MPLAYER_SNAPSHOT_DATE=	2013-11-09
> MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
> CATEGORIES?=	multimedia audio
> MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
>@@ -17,14 +17,13 @@
> 
> LICENSE=	GPLv2
> 
>-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
>-		freetype:${PORTSDIR}/print/freetype2
>+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
>+		libfreetype.so:${PORTSDIR}/print/freetype2
> 
> BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
> 
>-USES=		iconv ncurses
>+USES=		gmake iconv ncurses
> USE_XZ=		yes
>-USE_GMAKE=	yes
> GNU_CONFIGURE=	yes
> CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
> 		PTHREAD_LIBS="${PTHREAD_LIBS}" \
>@@ -34,16 +33,22 @@
> 		--as="${AS}" \
> 		--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
> 		--extra-libs="-L${PREFIX}/lib" \
>+		--disable-alsa \
> 		--disable-bitmap-font \
>+		--disable-crystalhd \
>+		--disable-faad \
> 		--disable-liba52 \
>-		--disable-alsa \
> 		--disable-libbs2b \
>+		--disable-libilbc \
>+		--disable-libnut \
>+		--disable-libvorbis \
>+		--disable-live \
>+		--disable-joystick \
>+		--disable-mad \
> 		--disable-mp3lib \
>-		--enable-ass-internal \
>-		--disable-libvorbis \
>+		--disable-nemesi \
> 		--disable-speex \
>-		--disable-libopus \
>-		--disable-libilbc
>+		--enable-ass-internal
> 
> WANT_GNOME=	yes
> WANT_SDL=	yes
>diff -r 4a1284260490 mplayer/distinfo
>--- a/mplayer/distinfo	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mplayer/distinfo	Sat Dec 14 22:07:30 2013 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (mplayer-1.1.20130308.tar.xz) = 920bd69143d5b867fd0041a99b6302a39ed48ecc1673fe3a051b3abccff17258
>-SIZE (mplayer-1.1.20130308.tar.xz) = 10326840
>+SHA256 (mplayer-1.1.20131109.tar.xz) = 5647919b61f01396af20273419d5fc74f8b3523177c40e7d1ca063ad45eb13eb
>+SIZE (mplayer-1.1.20131109.tar.xz) = 10738036
>diff -r 4a1284260490 mplayer/files/patch-configure
>--- a/mplayer/files/patch-configure	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mplayer/files/patch-configure	Sat Dec 14 22:07:30 2013 +0100
>@@ -1,6 +1,6 @@
>---- configure.orig	2013-11-16 23:28:21.000000000 +0100
>-+++ configure	2013-11-16 23:36:32.000000000 +0100
>-@@ -668,7 +668,7 @@
>+--- configure.orig	2013-11-08 17:59:55.000000000 +0100
>++++ configure	2013-11-09 14:34:53.996868923 +0100
>+@@ -640,7 +640,7 @@
>  _iwmmxt=auto
>  _mtrr=auto
>  _altivec=auto
>@@ -9,7 +9,7 @@
>  _ranlib=ranlib
>  _windres=windres
>  _cc=cc
>-@@ -1534,7 +1534,6 @@
>+@@ -1452,7 +1452,6 @@
>  
>    *)
>      echo "Unknown parameter: $ac_option"
>@@ -17,17 +17,8 @@
>      ;;
>  
>    esac
>-@@ -1592,7 +1591,7 @@
>-   esac
>-   echores "$cc_version"
>- else
>--  for _cc in "$_cc" gcc cc ; do
>-+  for _cc in "$_cc" clang cc ; do
>-     cc_name_tmp=$($_cc -v 2>&1 | tail -n 1 | cut -d ' ' -f 1)
>-     if test "$cc_name_tmp" = "gcc"; then
>-       cc_name=$cc_name_tmp
>-@@ -1669,7 +1668,7 @@
>-   case "$(uname -m 2>&1)" in
>+@@ -1689,7 +1688,7 @@
>+   case "$1" in
>        x86_64|amd64|i[3-9]86*|i86pc|x86|x86pc|k5|k6|k6_2|k6_3|k6-2|k6-3|pentium*|athlon*|i586_i686|i586-i686) host_arch=i386 ;;
>        ia64) host_arch=ia64 ;;
> -      macppc|ppc*|Power*) host_arch=ppc ;;
>@@ -35,155 +26,7 @@
>        alpha) host_arch=alpha ;;
>        sun4*|sparc*) host_arch=sparc ;;
>        parisc*|hppa*|9000*) host_arch=hppa ;;
>-@@ -1709,6 +1708,7 @@
>- fi
>- 
>- extra_cflags="-I. -Iffmpeg $extra_cflags"
>-+extra_ldflags="$extra_ldflags -L$_prefix/lib"
>- _timer=timer-linux.c
>- _getch=getch2.c
>- 
>-@@ -1945,7 +1945,7 @@
>-   if test "$_gcc3_ext" != ""; then
>-     # If we had to disable SSE/SSE2 because the active kernel does not
>-     # support this instruction set extension, we also have to tell
>--    # gcc3 to not generate SSE/SSE2 instructions for normal C code.
>-+    # clang to not generate SSE/SSE2 instructions for normal C code.
>-     cflag_check $_march $_gcc3_ext && _march="$_march $_gcc3_ext"
>-   fi
>- 
>-@@ -1996,15 +1996,15 @@
>-         # AMD CPUs just from their signature. Instead, we check directly
>-         # whether it supports SSE.
>-         if test "$_sse" = yes; then
>--            # gcc treats athlon-xp, athlon-4 and athlon-mp similarly.
>-+            # clang treats athlon-xp, athlon-4 and athlon-mp similarly.
>-             proc=athlon-xp
>-         else
>--            # Again, gcc treats athlon and athlon-tbird similarly.
>-+            # Again, clang treats athlon and athlon-tbird similarly.
>-             proc=athlon
>-         fi
>-         ;;
>-     15) iproc=686
>--        # k8 CPU type only supported in gcc >= 3.4.0, but that will be
>-+        # k8 CPU type only supported in clang >= 3.4.0, but that will be
>-         # caught and remedied in the optimization tests below.
>-         proc=k8
>-         ;;
>-@@ -2090,11 +2090,11 @@
>-   fi # test "$_runtime_cpudetection" = no
>- 
>- 
>--    # check that gcc supports our CPU, if not, fall back to earlier ones
>-+    # check that clang supports our CPU, if not, fall back to earlier ones
>-     # LGB: check -mcpu and -march swithing step by step with enabling
>-     # to fall back till 386.
>- 
>--    # gcc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
>-+    # clang >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
>- 
>-     if [ "$cc_vendor" = "gnu" ] && ([ "$_cc_major" -gt 3 ] || ( [ "$_cc_major" = 3 ] && [ "$_cc_minor" -ge 4 ])) ; then
>-         cpuopt=-mtune
>-@@ -2224,7 +2224,7 @@
>-     def_fast_64bit='#define HAVE_FAST_64BIT 1'
>-     iproc='x86_64'
>- 
>--    # gcc >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
>-+    # clang >= 3.4.0  doesn't support -mcpu, we have to use -mtune instead
>-     if test "$cc_vendor" = "gnu" && test "$_cc_major" -gt 3 -o "$_cc_major" -eq 3 -a "$_cc_minor" -ge 4 ; then
>-         cpuopt=-mtune
>-     else
>-@@ -2280,7 +2280,7 @@
>-       if test "$proc" = "k8"; then
>-         cflag_check -march=$proc $cpuopt=$proc || proc=athlon-xp
>-       fi
>--      # This will fail if gcc version < 3.3, which is OK because earlier
>-+      # This will fail if clang version < 3.3, which is OK because earlier
>-       # versions don't really support 64-bit on amd64.
>-       # Is this a valid assumption? -Corey
>-       if test "$proc" = "athlon-xp"; then
>-@@ -2400,7 +2400,7 @@
>-         fi
>-         ;;
>-       NetBSD)
>--        # only gcc 3.4 works reliably with AltiVec code under NetBSD
>-+        # only clang 3.4 works reliably with AltiVec code under NetBSD
>-         case $cc_version in
>-             2*|3.0*|3.1*|3.2*|3.3*)
>-                 ;;
>-@@ -2437,7 +2437,7 @@
>-             POWER3) _march='-mcpu=power3' _mcpu='-mtune=power3' ;;
>-             *) ;;
>-         esac
>--        # gcc 3.1(.1) and up supports 7400 and 7450
>-+        # clang 3.1(.1) and up supports 7400 and 7450
>-         if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "1" || test "$_cc_major" -ge "4"; then
>-             case "$proc" in
>-                 7400*|7410*) _march='-mcpu=7400' _mcpu='-mtune=7400' ;;
>-@@ -2445,7 +2445,7 @@
>-                 *) ;;
>-             esac
>-         fi
>--        # gcc 3.2 and up supports 970
>-+        # clang 3.2 and up supports 970
>-         if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" || test "$_cc_major" -ge "4"; then
>-             case "$proc" in
>-                 970*|PPC970*) _march='-mcpu=970' _mcpu='-mtune=970'
>-@@ -2453,14 +2453,14 @@
>-                 *) ;;
>-             esac
>-         fi
>--        # gcc 3.3 and up supports POWER4
>-+        # clang 3.3 and up supports POWER4
>-         if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "3" || test "$_cc_major" -ge "4"; then
>-             case "$proc" in
>-                 POWER4) _march='-mcpu=power4' _mcpu='-mtune=power4' ;;
>-                 *) ;;
>-             esac
>-         fi
>--        # gcc 3.4 and up supports 440*
>-+        # clang 3.4 and up supports 440*
>-         if test "$_cc_major" -ge "3" && test "$_cc_minor" -ge "4" || test "$_cc_major" -ge "4"; then
>-             case "$proc" in
>-                 440EP*) _march='-mcpu=440fp' _mcpu='-mtune=440fp' ;;
>-@@ -2468,7 +2468,7 @@
>-                 *) ;;
>-             esac
>-         fi
>--        # gcc 4.0 and up supports POWER5
>-+        # clang 4.0 and up supports POWER5
>-         if test "$_cc_major" -ge "4"; then
>-             case "$proc" in
>-                 POWER5*) _march='-mcpu=power5' _mcpu='-mtune=power5' ;;
>-@@ -2545,7 +2545,7 @@
>-             R5000) _march='-mips4' _mcpu='-mtune=r5000' ;;
>-             R8000|R10000|R12000|R14000|R16000) _march='-mips4' _mcpu='-mtune=r8000' ;;
>-         esac
>--        # gcc < 3.x does not support -mtune.
>-+        # clang < 3.x does not support -mtune.
>-         if test "$cc_vendor" = "gnu" && test "$_cc_major" -lt 3 ; then
>-             _mcpu=''
>-         fi
>-@@ -2669,7 +2669,7 @@
>- echocheck "GCC support of -mstackrealign"
>- # GCC 4.2 and some earlier Apple versions support this flag on x86. Since
>- # Mac OS X/Intel has an ABI different from Windows this is needed to avoid
>--# crashes when loading Win32 DLLs. Unfortunately some gcc versions create
>-+# crashes when loading Win32 DLLs. Unfortunately some clang versions create
>- # wrong code with this flag, but this can be worked around by adding
>- # -fno-unit-at-a-time as described in the blog post at
>- # http://www.dribin.org/dave/blog/archives/2006/12/05/missing_third_param/
>-@@ -2862,7 +2862,7 @@
>-         "xor %0, %0"
>-         :"=b"(x)
>-         // just adding ebx to clobber list seems unreliable with some
>--        // compilers, e.g. Haiku's gcc 2.95
>-+        // compilers, e.g. Haiku's clang 2.95
>-     );
>-     // and the above check does not work for OSX 64 bit...
>-     __asm__ volatile("":::"%ebx");
>-@@ -3765,7 +3765,7 @@
>+@@ -3822,7 +3821,7 @@
>  if linux ; then
>    THREAD_CFLAGS=-D_REENTRANT
>  elif freebsd || netbsd || openbsd || bsdos ; then
>@@ -192,7 +35,7 @@
>  fi
>  if test "$_pthreads" = auto ; then
>  cat > $TMPC << EOF
>-@@ -3775,7 +3775,7 @@
>+@@ -3832,7 +3831,7 @@
>  EOF
>  _pthreads=no
>  if ! hpux ; then
>@@ -201,50 +44,26 @@
>      # 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
>-@@ -4031,7 +4031,7 @@
>- echocheck "termcap"
>- if test "$_termcap" = auto ; then
>-   _termcap=no
>--  for ld_tmp in "-lncurses" "-ltinfo" "-ltermcap"; do
>-+  for ld_tmp in "/usr/lib/libncurses.so" "-ltinfo" "-ltermcap"; do
>-     statement_check term.h 'tgetent(0, 0)' $ld_tmp &&
>-       extra_ldflags="$extra_ldflags $ld_tmp" && _termcap=yes && break
>+@@ -3979,7 +3978,7 @@
>+   # NOTE: -L/usr/lib is a hack to avoid issues due to a
>+   # broken libiconv that e.g. macports installs into /opt/local/lib
>+   # which might get addded to the search path later by e.g. SDL
>+-  for ld_tmp in "" "-L/usr/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
>++  for ld_tmp in "" "-L$_prefix/lib -liconv" "-liconv" "-liconv $ld_dl" ; do
>+     cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
>+       ld_iconv="$ld_tmp" && _iconv=yes && break
>    done
>-@@ -4464,7 +4464,7 @@
>-     fi
>-   done
>-   if test $_cross_compile = no; then
>--    for I in /usr/X11/include /usr/X11R7/include /usr/local/include /usr/X11R6/include \
>-+    for I in /usr/X11/include /usr/X11R7/include /usr/local/include /usr/local/include \
>-              /usr/include/X11R6 /usr/openwin/include ; do
>-       if test -f "$I/X11/Xlib.h" ; then
>-         extra_cflags="$extra_cflags -I$I"
>-@@ -4479,8 +4479,8 @@
>- 
>- echocheck "X11"
>- if test "$_x11" = auto && test "$_x11_headers" = yes ; then
>--  for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/X11R6/lib -L/usr/lib/X11R6 \
>--           -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/X11R6/lib64 \
>-+  for I in "" -L/usr/X11R7/lib -L/usr/local/lib -L/usr/local/lib -L/usr/lib/X11R6 \
>-+           -L/usr/X11/lib -L/usr/lib32 -L/usr/openwin/lib -L/usr/local/lib64 -L/usr/local/lib64 \
>-            -L/usr/lib ; do
>-     if netbsd; then
>-       ld_tmp="$I -lXext -lX11 $ld_pthread -Wl,-R$(echo $I | sed s/^-L//)"
>-@@ -5904,7 +5904,7 @@
>+@@ -5903,7 +5902,7 @@
>  elif dragonfly ; then
>    default_cdrom_device="/dev/cd0"
>  elif freebsd ; then
> -  default_cdrom_device="/dev/acd0"
>-+  default_cdrom_device="/dev/cd0"
>++  default_cdrom_device="/dev/cdrom"
>  elif openbsd ; then
>    default_cdrom_device="/dev/rcd0c"
>  elif sunos ; then
>-@@ -5914,15 +5914,15 @@
>- elif amigaos ; then
>-   default_cdrom_device="a1ide.device:2"
>- else
>--  default_cdrom_device="/dev/cdrom"
>-+  default_cdrom_device="/dev/cd0"
>+@@ -5916,7 +5915,7 @@
>+   default_cdrom_device="/dev/cdrom"
>  fi
>  
> -if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
>@@ -252,26 +71,7 @@
>    default_dvd_device=$default_cdrom_device
>  elif darwin ; then
>    default_dvd_device="/dev/rdiskN"
>- else
>--  default_dvd_device="/dev/dvd"
>-+  default_dvd_device="/dev/cd0"
>- fi
>- 
>- 
>-@@ -6316,10 +6316,10 @@
>- echocheck "bzlib"
>- bzlib=no
>- def_bzlib='#define CONFIG_BZLIB 0'
>--statement_check bzlib.h 'BZ2_bzlibVersion()' -lbz2 && bzlib=yes
>-+statement_check bzlib.h 'BZ2_bzlibVersion()' /usr/lib/libbz2.so && bzlib=yes
>- if test "$bzlib" = yes ; then
>-   def_bzlib='#define CONFIG_BZLIB 1'
>--  extra_ldflags="$extra_ldflags -lbz2"
>-+  extra_ldflags="$extra_ldflags /usr/lib/libbz2.so"
>- fi
>- echores "$bzlib"
>- 
>-@@ -6470,7 +6470,7 @@
>+@@ -6514,7 +6513,7 @@
>  echocheck "libgsm"
>  if test "$_libgsm" = auto ; then
>    _libgsm=no
>@@ -280,21 +80,7 @@
>  fi
>  if test "$_libgsm" = yes ; then
>    def_libgsm='#define CONFIG_LIBGSM 1'
>-@@ -6888,11 +6888,12 @@
>-   cat > $TMPCPP << EOF
>- #define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
>- #include <liveMedia.hh>
>-+// Patch from Armin K. <krejzi at email dot com>
>- #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600)
>- #error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from <www.live555.com/liveMedia/>
>- #endif
>- #include "BasicUsageEnvironment.hh"
>--int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), 0, "", 0); return 0; }
>-+int main(void) { RTSPClient::createNew(*BasicUsageEnvironment::createNew(*BasicTaskScheduler::createNew()), "", 0, "", 0); return 0; }
>- EOF
>- 
>-   _live=no
>-@@ -6954,6 +6955,16 @@
>+@@ -6999,6 +6998,16 @@
>    nolibrtmp=no
>    def_librtmp='#define CONFIG_LIBRTMP 1'
>    inputmodules="librtmp $inputmodules"
>@@ -311,7 +97,7 @@
>  else
>    nolibrtmp=yes
>    _librtmp=no
>-@@ -7346,7 +7357,7 @@
>+@@ -7391,7 +7400,7 @@
>  echocheck "mencoder"
>  if test "$_mencoder" = no ; then
>    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
>@@ -320,7 +106,7 @@
>  fi
>  echores "$_mencoder"
>  
>-@@ -7684,8 +7695,11 @@
>+@@ -7729,8 +7738,11 @@
>  if test "$_gui" = yes ; then
>  
>    # Required libraries
>@@ -334,16 +120,7 @@
>      die "The GUI requires libavcodec with PNG support (needs zlib)."
>    fi
>    test "$_freetype" = no && test "$_bitmap_font" = no &&
>-@@ -7969,7 +7983,7 @@
>- 
>- #############################################################################
>- 
>--CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE"
>-+CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_FILE_OFFSET_BITS=64"
>- 
>- CXXFLAGS=" $CFLAGS -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS"
>- 
>-@@ -8271,7 +8285,7 @@
>+@@ -8318,7 +8330,7 @@
>  EXESUF      = $_exesuf
>  EXESUFS_ALL = .exe
>  
>@@ -352,12 +129,3 @@
>  $(mak_enable "$arch_all"    "$arch"    ARCH)
>  $(mak_enable "$subarch_all" "$subarch" ARCH)
>  $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
>-@@ -8473,7 +8487,7 @@
>- AS_C       = -c
>- CC_C       = -c
>- CXX_C      = -c
>--LD         = gcc
>-+LD         = clang
>- RANLIB     = $_ranlib
>- YASM       = $_yasm
>- DEPYASM    = $_yasm
>diff -r 4a1284260490 mplayer/files/patch-libavcodec-x86-ac3dsp_init.c
>--- a/mplayer/files/patch-libavcodec-x86-ac3dsp_init.c	Sat Dec 14 22:06:42 2013 +0100
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,11 +0,0 @@
>---- ffmpeg/libavcodec/x86/ac3dsp_init.c	2013-07-03 21:34:20.000000000 +0200
>-+++ ffmpeg/libavcodec/x86/ac3dsp_init.c	2013-07-03 21:34:45.000000000 +0200
>-@@ -51,7 +51,7 @@
>- extern void ff_ac3_extract_exponents_sse2 (uint8_t *exp, int32_t *coef, int nb_coefs);
>- extern void ff_ac3_extract_exponents_ssse3(uint8_t *exp, int32_t *coef, int nb_coefs);
>- 
>--#if ARCH_X86_32 && defined(__INTEL_COMPILER)
>-+#if ARCH_X86_32 && (defined(__INTEL_COMPILER) || defined(__clang__))
>- #       undef HAVE_7REGS
>- #       define HAVE_7REGS 0
>- #endif
>diff -r 4a1284260490 mplayer/files/patch-libavutil-x86-asm.h
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/mplayer/files/patch-libavutil-x86-asm.h	Sat Dec 14 22:07:30 2013 +0100
>@@ -0,0 +1,11 @@
>+--- ffmpeg/libavutil/x86/asm.h.orig	2013-05-25 19:20:04.000000000 +0200
>++++ ffmpeg/libavutil/x86/asm.h	2013-11-11 21:51:57.940269764 +0100
>+@@ -70,7 +70,7 @@
>+ typedef int x86_reg;
>+ #endif
>+ 
>+-#define HAVE_7REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE && HAVE_EBP_AVAILABLE))
>++#define HAVE_7REGS (ARCH_X86_64)
>+ #define HAVE_6REGS (ARCH_X86_64 || (HAVE_EBX_AVAILABLE || HAVE_EBP_AVAILABLE))
>+ 
>+ #if ARCH_X86_64 && defined(PIC)
>diff -r 4a1284260490 mplayer/files/patch-libmpdemux-demux_gif.c
>--- a/mplayer/files/patch-libmpdemux-demux_gif.c	Sat Dec 14 22:06:42 2013 +0100
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,99 +0,0 @@
>---- libmpdemux/demux_gif.c.orig	2010-12-12 11:37:15.000000000 +0100
>-+++ libmpdemux/demux_gif.c	2012-06-06 16:58:52.000000000 +0200
>-@@ -45,6 +45,16 @@
>- 
>- #define GIF_SIGNATURE (('G' << 16) | ('I' << 8) | 'F')
>- 
>-+static void localPrintGifError(void)
>-+{
>-+  char *Err = GifErrorString();
>-+
>-+  if (Err != NULL)
>-+    fprintf(stderr, "\nGIF-LIB error: %s.\n", Err);
>-+  else
>-+    fprintf(stderr, "\nGIF-LIB undefined error %d.\n", GifError());
>-+}
>-+
>- #ifndef CONFIG_GIF_TVT_HACK
>- // not supported by certain versions of the library
>- static int my_read_gif(GifFileType *gif, uint8_t *buf, int len)
>-@@ -94,14 +104,14 @@
>- 
>-   while (type != IMAGE_DESC_RECORD_TYPE) {
>-     if (DGifGetRecordType(gif, &type) == GIF_ERROR) {
>--      PrintGifError();
>-+      localPrintGifError();
>-       return 0; // oops
>-     }
>-     if (type == TERMINATE_RECORD_TYPE)
>-       return 0; // eof
>-     if (type == SCREEN_DESC_RECORD_TYPE) {
>-       if (DGifGetScreenDesc(gif) == GIF_ERROR) {
>--        PrintGifError();
>-+        localPrintGifError();
>-         return 0; // oops
>-       }
>-     }
>-@@ -109,7 +119,7 @@
>-       int code;
>-       unsigned char *p = NULL;
>-       if (DGifGetExtension(gif, &code, &p) == GIF_ERROR) {
>--        PrintGifError();
>-+        localPrintGifError();
>-         return 0; // oops
>-       }
>-       if (code == 0xF9) {
>-@@ -138,7 +148,7 @@
>- 	  comments[length] = 0;
>- 	  printf("%s", comments);
>-           if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
>--            PrintGifError();
>-+            localPrintGifError();
>-             return 0; // oops
>-           }
>- 	}
>-@@ -146,7 +156,7 @@
>-       }
>-       while (p != NULL) {
>-         if (DGifGetExtensionNext(gif, &p) == GIF_ERROR) {
>--          PrintGifError();
>-+          localPrintGifError();
>-           return 0; // oops
>-         }
>-       }
>-@@ -154,7 +164,7 @@
>-   }
>- 
>-   if (DGifGetImageDesc(gif) == GIF_ERROR) {
>--    PrintGifError();
>-+    localPrintGifError();
>-     return 0; // oops
>-   }
>- 
>-@@ -167,7 +177,7 @@
>-     memset(dp->buffer, gif->SBackGroundColor, priv->w * priv->h);
>- 
>-   if (DGifGetLine(gif, buf, len) == GIF_ERROR) {
>--    PrintGifError();
>-+    localPrintGifError();
>-     free(buf);
>-     return 0; // oops
>-   }
>-@@ -260,7 +270,7 @@
>-   gif = DGifOpen(demuxer->stream, my_read_gif);
>- #endif
>-   if (!gif) {
>--    PrintGifError();
>-+    localPrintGifError();
>-     free(priv);
>-     return NULL;
>-   }
>-@@ -302,7 +312,7 @@
>-   gif_priv_t *priv = demuxer->priv;
>-   if (!priv) return;
>-   if (priv->gif && DGifCloseFile(priv->gif) == GIF_ERROR)
>--    PrintGifError();
>-+    localPrintGifError();
>-   free(priv->refimg);
>-   free(priv);
>- }
>diff -r 4a1284260490 mplayer/files/patch-libmpdemux-demux_rtp.cpp
>--- a/mplayer/files/patch-libmpdemux-demux_rtp.cpp	Sat Dec 14 22:06:42 2013 +0100
>+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
>@@ -1,107 +0,0 @@
>---- libmpdemux/demux_rtp.cpp.orig	2012-03-05 19:14:38.000000000 +0100
>-+++ libmpdemux/demux_rtp.cpp	2013-11-16 23:39:54.000000000 +0100
>-@@ -19,7 +19,7 @@
>-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
>-  */
>- 
>--#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1
>-+// Patch from Armin K. <krejzi at email dot com>
>- 
>- extern "C" {
>- // on MinGW, we must include windows.h before the things it conflicts
>-@@ -94,15 +94,6 @@
>- 
>- extern "C" char* network_username;
>- extern "C" char* network_password;
>--static char* openURL_rtsp(RTSPClient* client, char const* url) {
>--  // If we were given a user name (and optional password), then use them:
>--  if (network_username != NULL) {
>--    char const* password = network_password == NULL ? "" : network_password;
>--    return client->describeWithPassword(url, network_username, password);
>--  } else {
>--    return client->describeURL(url);
>--  }
>--}
>- 
>- static char* openURL_sip(SIPClient* client, char const* url) {
>-   // If we were given a user name (and optional password), then use them:
>-@@ -126,6 +117,19 @@
>- extern AVCodecContext *avcctx;
>- #endif
>- 
>-+static char fWatchVariableForSyncInterface;
>-+static char* fResultString;
>-+static int fResultCode;
>-+
>-+static void responseHandlerForSyncInterface(RTSPClient* rtspClient, int responseCode, char* responseString) {
>-+  // Set result values:
>-+  fResultCode = responseCode;
>-+  fResultString = responseString;
>-+
>-+  // Signal a break from the event loop (thereby returning from the blocking command):
>-+  fWatchVariableForSyncInterface = ~0;
>-+}
>-+
>- extern "C" int audio_id, video_id, dvdsub_id;
>- extern "C" demuxer_t* demux_open_rtp(demuxer_t* demuxer) {
>-   Boolean success = False;
>-@@ -154,13 +158,19 @@
>- 	  rtsp_transport_http = demuxer->stream->streaming_ctrl->url->port;
>- 	  rtsp_transport_tcp = 1;
>- 	}
>--	rtspClient = RTSPClient::createNew(*env, verbose, "MPlayer", rtsp_transport_http);
>-+	rtspClient = RTSPClient::createNew(*env, url, verbose, "MPlayer", rtsp_transport_http);
>- 	if (rtspClient == NULL) {
>- 	  fprintf(stderr, "Failed to create RTSP client: %s\n",
>- 		  env->getResultMsg());
>- 	  break;
>- 	}
>--	sdpDescription = openURL_rtsp(rtspClient, url);
>-+	fWatchVariableForSyncInterface = 0;
>-+	rtspClient->sendDescribeCommand(responseHandlerForSyncInterface);
>-+	env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface);
>-+	if (fResultCode == 0)
>-+	    sdpDescription = fResultString;
>-+	else
>-+	    delete[] fResultString;
>-       } else { // SIP
>- 	unsigned char desiredAudioType = 0; // PCMU (use 3 for GSM)
>- 	sipClient = SIPClient::createNew(*env, desiredAudioType, NULL,
>-@@ -244,8 +254,12 @@
>- 
>- 	if (rtspClient != NULL) {
>- 	  // Issue a RTSP "SETUP" command on the chosen subsession:
>--	  if (!rtspClient->setupMediaSubsession(*subsession, False,
>--						rtsp_transport_tcp)) break;
>-+	  fWatchVariableForSyncInterface = 0;
>-+	  rtspClient->sendSetupCommand(*subsession, responseHandlerForSyncInterface, False, rtsp_transport_tcp);
>-+	  env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface);
>-+	  delete[] fResultString;
>-+	  if (fResultCode != 0) break;
>-+
>- 	  if (!strcmp(subsession->mediumName(), "audio"))
>- 	    audiofound = 1;
>- 	  if (!strcmp(subsession->mediumName(), "video"))
>-@@ -256,7 +270,11 @@
>- 
>-     if (rtspClient != NULL) {
>-       // Issue a RTSP aggregate "PLAY" command on the whole session:
>--      if (!rtspClient->playMediaSession(*mediaSession)) break;
>-+      fWatchVariableForSyncInterface = 0;
>-+      rtspClient->sendPlayCommand(*mediaSession, responseHandlerForSyncInterface);
>-+      env->taskScheduler().doEventLoop(&fWatchVariableForSyncInterface);
>-+      delete[] fResultString;
>-+      if (fResultCode != 0) break;
>-     } else if (sipClient != NULL) {
>-       sipClient->sendACK(); // to start the stream flowing
>-     }
>-@@ -645,7 +663,8 @@
>-   MediaSession* mediaSession = rtpState->mediaSession;
>-   if (mediaSession == NULL) return;
>-   if (rtpState->rtspClient != NULL) {
>--    rtpState->rtspClient->teardownMediaSession(*mediaSession);
>-+    fWatchVariableForSyncInterface = 0;
>-+    rtpState->rtspClient->sendTeardownCommand(*mediaSession, NULL);
>-   } else if (rtpState->sipClient != NULL) {
>-     rtpState->sipClient->sendBYE();
>-   }
>diff -r 4a1284260490 mplayer/files/patch-stream-tvi_bsdbt848.c
>--- a/mplayer/files/patch-stream-tvi_bsdbt848.c	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mplayer/files/patch-stream-tvi_bsdbt848.c	Sat Dec 14 22:07:30 2013 +0100
>@@ -1,6 +1,6 @@
>---- 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 @@
>+--- stream/tvi_bsdbt848.c.orig	2013-03-16 11:15:07.000000000 +0100
>++++ stream/tvi_bsdbt848.c	2013-11-09 13:47:43.804868208 +0100
>+@@ -366,11 +366,11 @@
>          int req_mode = *(int *)arg;
>  	u_short tmp_fps;
>  
>@@ -14,7 +14,7 @@
>              priv->maxheight = PAL_HEIGHT;
>              priv->maxwidth = PAL_WIDTH;
>              priv->maxfps = PAL_FPS;
>-@@ -377,7 +377,7 @@
>+@@ -391,7 +391,7 @@
>  
>          if(req_mode == TV_NORM_NTSC)
>              {
>@@ -23,7 +23,7 @@
>              priv->maxheight = NTSC_HEIGHT;
>              priv->maxwidth = NTSC_WIDTH;
>              priv->maxfps = NTSC_FPS;
>-@@ -401,9 +401,28 @@
>+@@ -415,9 +415,28 @@
>                  }
>              }
>  
>@@ -54,21 +54,21 @@
>              {
>              mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));
>              return TVI_CONTROL_FALSE;
>-@@ -532,8 +551,9 @@
>+@@ -546,8 +565,9 @@
>  /* Video Configuration */
>  
>- priv->videoready = TRUE;
>+ priv->videoready = 1;
> +priv->btdev = strdup("/dev/bktr0");
>- priv->immediatemode = FALSE;
>+ priv->immediatemode = 0;
> -priv->iformat = METEOR_FMT_PAL;
> +priv->iformat = BT848_IFORM_F_PALBDGHI;
>  priv->maxheight = PAL_HEIGHT;
>  priv->maxwidth = PAL_WIDTH;
>  priv->maxfps = PAL_FPS;
>-@@ -558,7 +578,7 @@
>+@@ -572,7 +592,7 @@
>      }
>  
>- if(priv->videoready == TRUE &&
>+ if(priv->videoready &&
> -   ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
> +   ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
>      {
>diff -r 4a1284260490 mplayer/pkg-plist
>--- a/mplayer/pkg-plist	Sat Dec 14 22:06:42 2013 +0100
>+++ b/mplayer/pkg-plist	Sat Dec 14 22:07:30 2013 +0100
>@@ -1,5 +1,7 @@
> bin/mplayer
>+man/man1/mplayer.1.gz
> %%GMPLAYER%%bin/gmplayer
>+%%GMPLAYER%%man/man1/gmplayer.1.gz
> %%GMPLAYER%%share/pixmaps/mplayer.png
> %%DATADIR%%/examples/etc/example.conf
> %%DATADIR%%/examples/etc/input.conf

Actions: View

Attachments on bug 184407: 138445 | 138446