Index: head/multimedia/mencoder/Makefile
===================================================================
--- head/multimedia/mencoder/Makefile	(revision 395118)
+++ head/multimedia/mencoder/Makefile	(revision 395119)
@@ -1,123 +1,127 @@
 # Created by: Thomas E. Zander
 # $FreeBSD$
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	2
+CATEGORIES=	multimedia audio
 
+MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	Convenient video file and movie encoder
 
-.include "${.CURDIR}/../mplayer/Makefile.shared"
+.include "${.CURDIR}/../mplayer/Makefile.common"
 
 OPTIONS_DEFINE=	AMR_NB AMR_WB BLURAY CDIO DEBUG DV FAAC FONTCONFIG \
 		FRIBIDI GIF GNUTLS GSM IPV6 JACK LADSPA LIBMNG LZO \
 		MAD NAS OCFLAGS OPENAL OPENJPEG OPUS PULSEAUDIO REAL \
 		RTCPU RTMP SCHROEDINGER SMB THEORA TWOLAME V4L VPX \
 		X264 XVID
 
 OPTIONS_DEFAULT=GIF GNUTLS IPV6 OCFLAGS RTCPU X264 XVID
 
 BLURAY_DESC?=	BluRay support
 LZO_DESC?=	Enable external liblzo library
 OCFLAGS_DESC?=	Use optimized compiler flags
 REAL_DESC?=	Enable realplayer plugin
 RTCPU_DESC?=	Use runtime CPU detection on supported archs
 
 RESTRICTED=	Port has restricted dependencies
 
 PATCHDIR=	${.CURDIR}/../mplayer/files
 FILESDIR=	${PATCHDIR}
 DATADIR=	${PREFIX}/share/mplayer
 
 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 mphelp_check.py mplmult.sh \
 		plotpsnr.pl psnr-video.sh qepdvcd.sh \
 		subedit.pl subsearch.sh vobshift.py \
 		w32codec_dl.pl wma2ogg.pl
 
 USES+=		alias iconv pkgconfig shebangfix
 SHEBANG_FILES=	TOOLS/calcbpp.pl TOOLS/checktree.sh TOOLS/countquant.pl	\
 		TOOLS/divx2svcd.sh TOOLS/dvd2divxscript.pl TOOLS/mencvcd.sh \
 		TOOLS/mphelp_check.py TOOLS/plotpsnr.pl TOOLS/psnr-video.sh \
 		TOOLS/qepdvcd.sh TOOLS/subedit.pl TOOLS/w32codec_dl.pl \
 		TOOLS/wma2ogg.pl
 
 .include "${.CURDIR}/../mplayer/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-mplayer \
 			--disable-libdca \
 			--disable-x11 \
 			--disable-vdpau \
 			--disable-rtc \
 			--disable-arts \
 			--disable-caca \
 			--disable-lirc \
 			--disable-sdl \
 			--disable-svga \
 			--disable-aa \
 			--disable-joystick \
 			--disable-directfb \
 			--disable-mpg123 \
 			--disable-enca \
 			--disable-musepack
 
 LIB_DEPENDS+=	libmp3lame.so:${PORTSDIR}/audio/lame
 
 ALL_TARGET=	mencoder
 
 .include "${.CURDIR}/../mplayer/Makefile.options"
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
+
+pre-patch:
+	${MV} ${WRKDIR}/ffmpeg-${FFMPEG_VERSION} ${WRKSRC}/ffmpeg
 
 post-patch:
 .if ${OSVERSION} >= 900010
 	@${REINPLACE_CMD} -e \
 		'/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}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
 		${REINPLACE_CMD} -E \
 			-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 			-e 's|[[:space:]]gcc| ${CC}|' \
 			-e 's|\$$\(CC\)|${CC}|' \
 			-e 's|/usr/X11R6|${LOCALBASE}|'
 	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
 
 post-install:
 	${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} ${STAGEDIR}${DATADIR}/tools
 .endfor
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mencoder/distinfo
===================================================================
--- head/multimedia/mencoder/distinfo	(revision 395118)
+++ head/multimedia/mencoder/distinfo	(revision 395119)
@@ -1,2 +1,4 @@
-SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3
-SIZE (mplayer-1.1.20150403.tar.xz) = 11552096
+SHA256 (ffmpeg-2.7.2.tar.bz2) = 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2
+SIZE (ffmpeg-2.7.2.tar.bz2) = 8157217
+SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7
+SIZE (mplayer-1.1.20150822.tar.xz) = 5162400
Index: head/multimedia/mplayer/Makefile.shared
===================================================================
--- head/multimedia/mplayer/Makefile.shared	(revision 395118)
+++ head/multimedia/mplayer/Makefile.shared	(nonexistent)
@@ -1,54 +0,0 @@
-# Contains the build infrastructural definitions for both
-# mplayer and mencoder....the variables that we need to set
-# before we include bsd.port.pre.mk
-#
-# $FreeBSD$
-
-MPLAYER_SNAPSHOT_DATE=	2015-04-03
-MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
-CATEGORIES?=	multimedia audio
-MASTER_SITES=	LOCAL/riggs/mplayer
-DISTNAME=	mplayer-${MPLAYER_PORT_VERSION:S/.r/./g}
-WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
-
-MAINTAINER?=	riggs@FreeBSD.org
-
-LICENSE=	GPLv2
-
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
-
-BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
-
-USES=		compiler:c11 gmake iconv ncurses tar:xz
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
-CONFIGURE_ARGS=	--cc="${CC}" \
-		--host-cc="${CC}" \
-		--as="${AS}" \
-		--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
-		--extra-libs="-L${PREFIX}/lib" \
-		--disable-alsa \
-		--disable-bitmap-font \
-		--disable-crystalhd \
-		--disable-esd \
-		--disable-faad \
-		--disable-ggi \
-		--disable-ggiwmh \
-		--disable-liba52 \
-		--disable-libbs2b \
-		--disable-libdirac-lavc \
-		--disable-libilbc \
-		--disable-libnut \
-		--disable-libvorbis \
-		--disable-live \
-		--disable-joystick \
-		--disable-mad \
-		--disable-libmpeg2 \
-		--disable-nemesi \
-		--disable-speex \
-		--enable-ass-internal
-
-WANT_GNOME=	yes
-WANT_SDL=	yes

Property changes on: head/multimedia/mplayer/Makefile.shared
___________________________________________________________________
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:keywords
## -1 +0,0 ##
-FreeBSD=%H
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/Makefile
===================================================================
--- head/multimedia/mplayer/Makefile	(revision 395118)
+++ head/multimedia/mplayer/Makefile	(revision 395119)
@@ -1,171 +1,175 @@
 # Created by: Thomas E. Zander with help from Vladimir Kushnir
 # $FreeBSD$
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	4
+CATEGORIES=	multimedia audio
 
+MAINTAINER=	riggs@FreeBSD.org
 COMMENT=	High performance media player supporting many formats
 
-.include "${.CURDIR}/Makefile.shared"
+.include "${.CURDIR}/Makefile.common"
 
 OPTIONS_DEFINE=	AALIB AMR_NB AMR_WB BLURAY CACA CDIO DEBUG DV \
 		ENCA FONTCONFIG FRIBIDI GIF GNUTLS GSM GUI IPV6 JACK \
-		LADSPA LIBMNG LIRC LZO NAS OCFLAGS  OPENAL OPENGL \
+		LADSPA LIBMNG LIRC LZO NAS OCFLAGS OPENAL OPENGL \
 		OPENJPEG OPUS PULSEAUDIO REAL RTC RTCPU RTMP \
 		SCHROEDINGER SDL SKINS SMB SVGALIB V4L VDPAU VPX \
 		X11 X11DGA X11VM XINERAMA XVIDEO XVMC
 
 OPTIONS_DEFAULT=FONTCONFIG FRIBIDI GNUTLS IPV6 OCFLAGS OPENGL RTCPU \
 		SKINS X11 X11DGA X11VM XINERAMA XVIDEO
 
 BLURAY_DESC?=	BluRay support
 ENCA_DESC?=	Charset conversion via enca
 LZO_DESC?=	External liblzo support
 OCFLAGS_DESC?=	Use optimized compiler flags
 REAL_DESC?=	Enable realplayer plugin
 RTC_DESC?=	Add support for kernel real time clock
 RTCPU_DESC?=	Use runtime CPU detection on supported archs
 SKINS_DESC?=	Install skins for GUI
 X11DGA_DESC?=	X11 DGA video driver support
 X11VM_DESC?=	X11 VidMode support
 
 SUB_FILES=	pkg-message
 
 CONFLICTS=	mplayer2-2.*
 
 CONFFILES=	example.conf input.conf menu.conf dvb-menu.conf
 USES+=		iconv pkgconfig
 
 .include "${.CURDIR}/Makefile.optvars"
 .include <bsd.port.pre.mk>
 
 CONFIGURE_ARGS+=	--disable-arts \
 			--disable-directfb \
 			--disable-faac \
 			--disable-libdca \
 			--disable-toolame \
 			--disable-twolame \
 			--disable-x264 \
 			--disable-xvid \
 			--disable-libdirac-lavc \
 			--disable-mencoder \
 			--disable-mpg123 \
 			--disable-musepack \
 			--disable-theora
 
 .include "${.CURDIR}/Makefile.options"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 PLIST_SUB+=	GMPLAYER=""
 DESKTOP_ENTRIES=	"MPlayer" "High performance media player" "mplayer" "gmplayer" "" false
 .if ${PORT_OPTIONS:MSKINS}
 RUN_DEPENDS+=	mplayer-skins>=0:${PORTSDIR}/multimedia/mplayer-skins
 .endif
 
 USE_GNOME+=	gtk20
 CONFIGURE_ARGS+=	--enable-gui
 
 .else
 PLIST_SUB+=	GMPLAYER="@comment "
 .endif #GUI && X11
 
 .if ${PORT_OPTIONS:MX11}
 USE_XORG=	x11 xproto xscrnsaver
 .if ${PORT_OPTIONS:MXVIDEO}
 USE_XORG+=	xv
 .else
 CONFIGURE_ARGS+=--disable-xv
 .endif
 .if ${PORT_OPTIONS:MX11DGA}
 USE_XORG+=	xxf86dga
 .else
 CONFIGURE_ARGS+=--disable-dga1 --disable-dga2
 .endif
 .if ${PORT_OPTIONS:MOPENGL}
 USE_GL+=	gl
 .else
 CONFIGURE_ARGS+=--disable-gl
 .endif
 .if ${PORT_OPTIONS:MXINERAMA}
 USE_XORG+=	xinerama xineramaproto
 .else
 CONFIGURE_ARGS+=--disable-xinerama
 .endif
 .if ${PORT_OPTIONS:MX11VM}
 USE_XORG+=	xxf86vm
 .else
 CONFIGURE_ARGS+=--disable-vm
 .endif
 .if ${PORT_OPTIONS:MXVMC}
 USE_XORG+=	xvmc
 CONFIGURE_ARGS+=--enable-xvmc --with-xvmclib=XvMCW
 .endif
 .else	#X11
 CONFIGURE_ARGS+=--disable-x11
 .endif
 
 pre-everything::
 	@${ECHO_MSG} "N - O - T - E"
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "There are some knobs which *can* *not* be selected via the"
 	@${ECHO_MSG} "OPTIONS framework. At the moment, these settings are:"
 	@${ECHO_MSG} "WITH_KERN_HZ=${DEFAULT_KERN_HZ}"
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${ECHO_MSG} "If you want to use the GUI, you can use the skins from"
 	@${ECHO_MSG} "${PORTSDIR}/multimedia/mplayer-skins"
 	@${ECHO_MSG} "or download them from"
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
+
+pre-patch:
+	${MV} ${WRKDIR}/ffmpeg-${FFMPEG_VERSION} ${WRKSRC}/ffmpeg
 
 post-patch:
 .if ${OSVERSION} >= 900010
 	@${REINPLACE_CMD} -e \
 		'/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}|' \
 		-e 's|/usr/local|${LOCALBASE}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|' \
 		-e 's|-lbz2|/usr/lib/libbz2.so|' \
 		-e 's|-lncurses|/usr/lib/libncurses.so|' \
 		-e 's|-liconv|${ICONV_LIB}|' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
 	@${FIND} -E ${WRKSRC} -type f \
 		-iregex ".*(configure|.sh|Makefile)" -print0 | \
 		${XARGS} -x -0 -n 10 \
 		${REINPLACE_CMD} -E \
 			-e 's|[[:space:]]gcc[-[:digit:]\.]+| ${CC}|' \
 			-e 's|[[:space:]]gcc| ${CC}|' \
 			-e 's|\$$\(CC\)|${CC}|' \
 			-e 's|/usr/X11R6|${LOCALBASE}|'
 	@${FIND} ${WRKSRC}/DOCS/man -name "mplayer.1" | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's|/usr/\\:local/\\:etc/\\:mplayer|${DATADIR:S/\//\/\\\:/g}|g ; \
 		 s|/dev/\\:(dvd[[:alnum:]]*[[:>:]])|${DEFAULT_DVD_DEVICE:S/dev\//dev\/\\\:/}|g ; \
 		 s|/dev/\\:(cdrom[[:alnum:]]*[[:>:]])|${DEFAULT_CDROM_DEVICE:S/dev\//dev\/\\\:/}|g'
 .if ${PORT_OPTIONS:MRTC}
 	@${REINPLACE_CMD} -e \
 		's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' \
 		${WRKSRC}/mplayer.c
 .endif
 
 post-install:
 	@${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} ${STAGEDIR}${DATADIR}/examples/etc
 .endfor
 .if ${PORT_OPTIONS:MGUI} && ${PORT_OPTIONS:MX11}
 	@${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}${PREFIX}/share/pixmaps/mplayer.png
 .endif
 
 .include <bsd.port.post.mk>
Index: head/multimedia/mplayer/Makefile.common
===================================================================
--- head/multimedia/mplayer/Makefile.common	(nonexistent)
+++ head/multimedia/mplayer/Makefile.common	(revision 395119)
@@ -0,0 +1,56 @@
+# Contains the build infrastructural definitions for both
+# mplayer and mencoder....the variables that we need to set
+# before we include bsd.port.pre.mk
+#
+# $FreeBSD$
+
+MPLAYER_SNAPSHOT_DATE=	2015-08-22
+MPLAYER_PORT_VERSION=	1.1.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
+FFMPEG_VERSION=	2.7.2
+MASTER_SITES=	LOCAL/riggs/mplayer:local \
+		http://ffmpeg.org/releases/:ffmpeg
+DISTFILES+=	ffmpeg-${FFMPEG_VERSION}.tar.bz2:ffmpeg \
+		${DISTNAME}.tar.xz:local
+DISTNAME=	mplayer-${MPLAYER_PORT_VERSION:S/.r/./g}
+WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
+		libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
+
+BUILD_DEPENDS=	${LOCALBASE}/bin/yasm:${PORTSDIR}/devel/yasm
+
+USES=		compiler:c11 gmake iconv ncurses tar:bzip2 tar:xz
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
+CONFIGURE_ARGS=	--cc="${CC}" \
+		--host-cc="${CC}" \
+		--as="${AS}" \
+		--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
+		--extra-libs="-L${PREFIX}/lib" \
+		--disable-alsa \
+		--disable-bitmap-font \
+		--disable-crystalhd \
+		--disable-esd \
+		--disable-faad \
+		--disable-ggi \
+		--disable-ggiwmh \
+		--disable-liba52 \
+		--disable-libbs2b \
+		--disable-libdirac-lavc \
+		--disable-libilbc \
+		--disable-libnut \
+		--disable-libvorbis \
+		--disable-live \
+		--disable-joystick \
+		--disable-mad \
+		--disable-libmpeg2 \
+		--disable-nemesi \
+		--disable-speex \
+		--enable-ass-internal
+
+WANT_GNOME=	yes
+WANT_SDL=	yes

Property changes on: head/multimedia/mplayer/Makefile.common
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/distinfo
===================================================================
--- head/multimedia/mplayer/distinfo	(revision 395118)
+++ head/multimedia/mplayer/distinfo	(revision 395119)
@@ -1,2 +1,4 @@
-SHA256 (mplayer-1.1.20150403.tar.xz) = 910c2c6fda92f5883e09f34c39ca314aa5a815fa1c224e5c072bde82339f6db3
-SIZE (mplayer-1.1.20150403.tar.xz) = 11552096
+SHA256 (ffmpeg-2.7.2.tar.bz2) = 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2
+SIZE (ffmpeg-2.7.2.tar.bz2) = 8157217
+SHA256 (mplayer-1.1.20150822.tar.xz) = a01e31b8a54f61d37bdeddd5c3514956c1c6366b65e3e67c25c828c47c98d9f7
+SIZE (mplayer-1.1.20150822.tar.xz) = 5162400
Index: head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c
===================================================================
--- head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c	(nonexistent)
@@ -1,14 +0,0 @@
---- ffmpeg/libavcodec/libgsmdec.c.orig	2014-07-21 19:20:03.000000000 +0200
-+++ ffmpeg/libavcodec/libgsmdec.c	2014-08-15 11:02:55.987422815 +0200
-@@ -28,11 +28,7 @@
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
- 
- #include "config.h"
--#if HAVE_GSM_H
- #include <gsm.h>
--#else
--#include <gsm/gsm.h>
--#endif
- 
- #include "libavutil/channel_layout.h"
- #include "libavutil/common.h"

Property changes on: head/multimedia/mplayer/files/patch-libavcodec-libgsmdec.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libavutil-x86-asm.h
===================================================================
--- head/multimedia/mplayer/files/patch-libavutil-x86-asm.h	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libavutil-x86-asm.h	(nonexistent)
@@ -1,11 +0,0 @@
---- 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)

Property changes on: head/multimedia/mplayer/files/patch-libavutil-x86-asm.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c
===================================================================
--- head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c	(nonexistent)
@@ -1,10 +0,0 @@
---- ffmpeg/libavcodec/mpegaudio_parser.c.orig	2014-02-12 19:20:06.000000000 +0100
-+++ ffmpeg/libavcodec/mpegaudio_parser.c	2014-04-19 14:39:15.514132783 +0200
-@@ -83,6 +83,7 @@
-                         avctx->sample_rate= sr;
-                         avctx->channels   = channels;
-                         s1->duration      = frame_size;
-+                        avctx->frame_size = frame_size;
-                         avctx->codec_id   = codec_id;
-                         if (s->no_bitrate || !avctx->bit_rate) {
-                             s->no_bitrate = 1;

Property changes on: head/multimedia/mplayer/files/patch-libavcodec-mpegaudio_parser.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libavcodec-Makefile
===================================================================
--- head/multimedia/mplayer/files/patch-libavcodec-Makefile	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libavcodec-Makefile	(nonexistent)
@@ -1,11 +0,0 @@
---- ffmpeg/libavcodec/Makefile.orig	2015-04-02 19:20:07.000000000 +0200
-+++ ffmpeg/libavcodec/Makefile	2015-04-03 13:25:18.741269686 +0200
-@@ -865,7 +865,7 @@
-                                           old_codec_ids.h               \
-                                           tableprint.h                  \
-                                           tableprint_vlc.h              \
--                                          $(ARCH)/vp56_arith.h          \
-+                                          $(MPLAYER_ARCH)/vp56_arith.h          \
- 
- SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h
- SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER)  += libschroedinger.h

Property changes on: head/multimedia/mplayer/files/patch-libavcodec-Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-gui_ws_ws.c
===================================================================
--- head/multimedia/mplayer/files/patch-gui_ws_ws.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-gui_ws_ws.c	(nonexistent)
@@ -1,10 +0,0 @@
---- gui/wm/ws.c.orig	2013-08-03 00:42:05.000000000 +0200
-+++ gui/wm/ws.c	2013-12-16 10:13:26.000000000 +0100
-@@ -1322,6 +1322,7 @@
-         win->xImage->data     = win->Shminfo.shmaddr;
-         win->Shminfo.readOnly = False;
-         XShmAttach(wsDisplay, &win->Shminfo);
-+	XSync(wsDisplay, False);
-         shmctl(win->Shminfo.shmid, IPC_RMID, 0);
-     } else
- #endif

Property changes on: head/multimedia/mplayer/files/patch-gui_ws_ws.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c
===================================================================
--- head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c	(nonexistent)
@@ -1,14 +0,0 @@
---- ffmpeg/libavcodec/libgsmenc.c.orig	2014-08-15 11:02:02.619426519 +0200
-+++ ffmpeg/libavcodec/libgsmenc.c	2014-08-15 11:02:28.587424476 +0200
-@@ -28,11 +28,7 @@
- // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
- 
- #include "config.h"
--#if HAVE_GSM_H
- #include <gsm.h>
--#else
--#include <gsm/gsm.h>
--#endif
- 
- #include "libavutil/common.h"
- 

Property changes on: head/multimedia/mplayer/files/patch-libavcodec-libgsmenc.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libavfilter-Makefile
===================================================================
--- head/multimedia/mplayer/files/patch-libavfilter-Makefile	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libavfilter-Makefile	(nonexistent)
@@ -1,10 +0,0 @@
---- ffmpeg/libavfilter/Makefile.orig	2012-03-21 19:20:05.000000000 +0100
-+++ ffmpeg/libavfilter/Makefile	2012-03-22 16:09:31.826872990 +0100
-@@ -167,6 +167,7 @@
- OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_yvu9.o
- OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
- 
-+-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile
- 
- DIRS = x86 libmpcodecs
- 

Property changes on: head/multimedia/mplayer/files/patch-libavfilter-Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libao2-ao_oss.c
===================================================================
--- head/multimedia/mplayer/files/patch-libao2-ao_oss.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libao2-ao_oss.c	(nonexistent)
@@ -1,89 +0,0 @@
---- libao2/ao_oss.c.orig	2010-01-11 21:27:52.000000000 +0100
-+++ libao2/ao_oss.c	2011-12-29 01:06:49.227522915 +0100
-@@ -56,6 +56,8 @@
- 	""
- };
- 
-+static int volume = -1;
-+
- /* Support for >2 output channels added 2001-11-25 - Steve Davies <steve@daviesfam.org> */
- 
- LIBAO_EXTERN(oss)
-@@ -72,6 +74,11 @@
-     case AF_FORMAT_S16_BE: return AFMT_S16_BE;
- #ifdef AFMT_S24_PACKED
-     case AF_FORMAT_S24_LE: return AFMT_S24_PACKED;
-+#elif defined(__FreeBSD__) && defined(AFMT_S24_LE)
-+    case AF_FORMAT_U24_LE: return AFMT_U24_LE;
-+    case AF_FORMAT_U24_BE: return AFMT_U24_BE;
-+    case AF_FORMAT_S24_LE: return AFMT_S24_LE;
-+    case AF_FORMAT_S24_BE: return AFMT_S24_BE;
- #endif
- #ifdef AFMT_U32_LE
-     case AF_FORMAT_U32_LE: return AFMT_U32_LE;
-@@ -115,6 +122,11 @@
-     case AFMT_S16_BE: return AF_FORMAT_S16_BE;
- #ifdef AFMT_S24_PACKED
-     case AFMT_S24_PACKED: return AF_FORMAT_S24_LE;
-+#elif defined(__FreeBSD__) && defined(AFMT_S24_LE)
-+    case AFMT_U24_LE: return AF_FORMAT_U24_LE;
-+    case AFMT_U24_BE: return AF_FORMAT_U24_BE;
-+    case AFMT_S24_LE: return AF_FORMAT_S24_LE;
-+    case AFMT_S24_BE: return AF_FORMAT_S24_BE;
- #endif
- #ifdef AFMT_U32_LE
-     case AFMT_U32_LE: return AF_FORMAT_U32_LE;
-@@ -434,9 +446,29 @@
-     audio_fd = -1;
- }
- 
-+static void savevol(void){
-+	int fd;
-+	if (volume < 0) {
-+		if ((fd = open(oss_mixer_device, O_RDONLY)) >= 0) { 
-+			ioctl(fd, MIXER_READ(oss_mixer_channel), &volume);
-+			close(fd);
-+		}
-+	}     
-+}
-+
-+static void restorevol(void){
-+	int fd;
-+	if ((fd = open(oss_mixer_device, O_RDONLY)) >= 0) {
-+		ioctl(fd, MIXER_WRITE(oss_mixer_channel), &volume);
-+		close(fd);
-+	}
-+	volume = -1;     
-+}
-+
- // stop playing and empty buffers (for seeking/pause)
- static void reset(void){
-   int oss_format;
-+    savevol();
-     uninit(1);
-     audio_fd=open(dsp, O_WRONLY);
-     if(audio_fd < 0){
-@@ -448,6 +480,7 @@
-   fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
- #endif
- 
-+  ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
-   oss_format = format2oss(ao_data.format);
-   if(AF_FORMAT_IS_AC3(ao_data.format))
-     ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
-@@ -459,13 +492,14 @@
-       int c = ao_data.channels-1;
-       ioctl (audio_fd, SNDCTL_DSP_STEREO, &c);
-     }
--    ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
-   }
-+  restorevol();
- }
- 
- // stop playing, keep buffers (for pause)
- static void audio_pause(void)
- {
-+	savevol();
-     prepause_space = get_space();
-     uninit(1);
- }

Property changes on: head/multimedia/mplayer/files/patch-libao2-ao_oss.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libvo-x11_common.c
===================================================================
--- head/multimedia/mplayer/files/patch-libvo-x11_common.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libvo-x11_common.c	(nonexistent)
@@ -1,11 +0,0 @@
---- libvo/x11_common.c.orig	2014-02-08 21:39:02.000000000 +0100
-+++ libvo/x11_common.c	2014-04-19 14:43:53.715749607 +0200
-@@ -430,7 +430,7 @@
-     }
- 
-     // Required so that XLookupString returns UTF-8
--    if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8"))
-+    if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
-         mp_msg(MSGT_VO, MSGL_WARN, MSGTR_CouldntFindUTF8Locale);
-     XSetErrorHandler(x11_errorhandler);
- 

Property changes on: head/multimedia/mplayer/files/patch-libvo-x11_common.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libao2-ao_arts.c
===================================================================
--- head/multimedia/mplayer/files/patch-libao2-ao_arts.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libao2-ao_arts.c	(nonexistent)
@@ -1,15 +0,0 @@
---- 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(int immed)
- {
--	arts_close_stream(stream);
--	arts_free();
-+	if (stream != NULL) {
-+	    arts_close_stream(stream);
-+	    stream = NULL;
-+	}
- }
- 
- static int play(void* data,int len,int flags)

Property changes on: head/multimedia/mplayer/files/patch-libao2-ao_arts.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-stream-tvi_v4l2.c
===================================================================
--- head/multimedia/mplayer/files/patch-stream-tvi_v4l2.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-stream-tvi_v4l2.c	(nonexistent)
@@ -1,25 +0,0 @@
---- stream/tvi_v4l2.c.orig	2011-06-26 16:42:35.000000000 +0200
-+++ stream/tvi_v4l2.c	2011-11-26 20:09:03.369654854 +0100
-@@ -52,7 +52,6 @@
- #ifdef HAVE_SYS_VIDEOIO_H
- #include <sys/videoio.h>
- #else
--#include <linux/types.h>
- #include <linux/videodev2.h>
- #endif
- #include "mp_msg.h"
-@@ -62,6 +61,14 @@
- #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 */

Property changes on: head/multimedia/mplayer/files/patch-stream-tvi_v4l2.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
===================================================================
--- head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c	(nonexistent)
@@ -1,76 +0,0 @@
---- 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;
- 
--        priv->iformat = METEOR_FMT_AUTOMODE;
-+        priv->iformat = BT848_IFORM_F_AUTO;
- 
-         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;
-@@ -391,7 +391,7 @@
- 
-         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;
-@@ -415,9 +415,28 @@
-                 }
-             }
- 
--        if(req_mode == TV_NORM_SECAM) priv->iformat = METEOR_FMT_SECAM;
-+        if(req_mode == TV_NORM_SECAM)
-+            {
-+            priv->iformat = BT848_IFORM_F_SECAM;
-+            priv->maxheight = PAL_HEIGHT;
-+            priv->maxwidth = PAL_WIDTH;
-+            priv->maxfps = PAL_FPS;
-+            priv->fps = PAL_FPS;
-+
-+            if(priv->fps > priv->maxfps) priv->fps = priv->maxfps;
-+
-+            if(priv->geom.rows > priv->maxheight)
-+                {
-+                priv->geom.rows = priv->maxheight;
-+                }
-+
-+            if(priv->geom.columns > priv->maxwidth)
-+                {
-+                priv->geom.columns = priv->maxwidth;
-+                }
-+            }
- 
--        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;
-@@ -546,8 +565,9 @@
- /* Video Configuration */
- 
- priv->videoready = 1;
-+priv->btdev = strdup("/dev/bktr0");
- 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;
-@@ -572,7 +592,7 @@
-     }
- 
- if(priv->videoready &&
--   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));
-     }

Property changes on: head/multimedia/mplayer/files/patch-stream-tvi_bsdbt848.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-stream-stream_cdda.c
===================================================================
--- head/multimedia/mplayer/files/patch-stream-stream_cdda.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-stream-stream_cdda.c	(nonexistent)
@@ -1,13 +0,0 @@
---- stream/stream_cdda.c.orig	2013-12-02 15:30:21.000000000 +0100
-+++ stream/stream_cdda.c	2015-01-24 15:44:33.095742583 +0100
-@@ -21,8 +21,8 @@
- #include <cdda_interface.h>
- #include <cdda_paranoia.h>
- #else
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- #endif
- #include <stdio.h>
- #include <stdlib.h>

Property changes on: head/multimedia/mplayer/files/patch-stream-stream_cdda.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-vidix-mga_vid.c
===================================================================
--- head/multimedia/mplayer/files/patch-vidix-mga_vid.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-vidix-mga_vid.c	(nonexistent)
@@ -1,17 +0,0 @@
---- vidix/mga_vid.c.orig	2014-05-17 03:38:00.000000000 +0200
-+++ vidix/mga_vid.c	2014-08-11 20:58:07.109876980 +0200
-@@ -1110,13 +1110,10 @@
- 		    i, lst[i].vendor, lst[i].device);
- 	    if (lst[i].vendor == VENDOR_MATROX)
- 	    {
--#if 0
- 		if ((lst[i].command & PCI_COMMAND_IO) == 0)
- 		{
--			mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device is disabled, ignoring\n");
--			continue;
-+			mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device seems disabled, trying anyway\n");
- 		}
--#endif
- 		switch(lst[i].device)
- 		{
- 		    case DEVICE_MATROX_MGA_G550_AGP:

Property changes on: head/multimedia/mplayer/files/patch-vidix-mga_vid.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libavformat-udp.c
===================================================================
--- head/multimedia/mplayer/files/patch-libavformat-udp.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libavformat-udp.c	(nonexistent)
@@ -1,11 +0,0 @@
---- ffmpeg/libavformat/udp.c.orig	2015-03-30 19:20:06.000000000 +0200
-+++ ffmpeg/libavformat/udp.c	2015-04-03 13:29:34.228251670 +0200
-@@ -71,6 +71,8 @@
- #define UDP_MAX_PKT_SIZE 65536
- #define UDP_HEADER_SIZE 8
- 
-+#define IPPROTO_IPV6 41
-+
- typedef struct UDPContext {
-     const AVClass *class;
-     int udp_fd;

Property changes on: head/multimedia/mplayer/files/patch-libavformat-udp.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S
===================================================================
--- head/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S	(revision 395118)
+++ head/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S	(nonexistent)
@@ -1,11 +0,0 @@
---- ffmpeg/libavcodec/arm/fft_vfp.S.orig	2014-12-09 19:20:07.000000000 +0100
-+++ ffmpeg/libavcodec/arm/fft_vfp.S	2014-12-24 15:48:09.494735677 +0100
-@@ -33,7 +33,7 @@
-         movrel  a2, (fft_tab_vfp - 8)
-         ldr     pc, [a2, ip, lsl #2]
- endfunc
--const   fft_tab_vfp, relocate=1
-+const   fft_tab_vfp
-         .word   fft4_vfp
-         .word   fft8_vfp
-         .word   X(ff_fft16_vfp)     @ this one alone is exported

Property changes on: head/multimedia/mplayer/files/patch-libavcodec-arm-fft_vfp.S
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg-Makefile
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg-Makefile	(revision 395118)
+++ head/multimedia/mplayer/files/patch-ffmpeg-Makefile	(nonexistent)
@@ -1,11 +0,0 @@
---- ffmpeg/Makefile.orig	2014-07-22 19:20:06.000000000 +0200
-+++ ffmpeg/Makefile	2014-08-11 20:49:48.038911362 +0200
-@@ -91,7 +91,7 @@
- $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
- SUBDIR := $(1)/
- include $(SRC_PATH)/$(1)/Makefile
---include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
-+-include $(SRC_PATH)/$(1)/$(MPLAYER_ARCH)/Makefile
- -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
- include $(SRC_PATH)/library.mak
- endef

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg-Makefile
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-stream-tvi_v4l.c
===================================================================
--- head/multimedia/mplayer/files/patch-stream-tvi_v4l.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-stream-tvi_v4l.c	(nonexistent)
@@ -1,17 +0,0 @@
---- 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 = {

Property changes on: head/multimedia/mplayer/files/patch-stream-tvi_v4l.c
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-Makefile
===================================================================
--- head/multimedia/mplayer/files/patch-Makefile	(revision 395118)
+++ head/multimedia/mplayer/files/patch-Makefile	(revision 395119)
@@ -1,28 +1,28 @@
---- Makefile.orig	2012-03-03 17:45:15.000000000 +0100
-+++ Makefile	2012-03-22 15:26:08.719328325 +0100
-@@ -904,20 +904,17 @@
+--- Makefile.orig	2015-06-03 11:58:05 UTC
++++ Makefile
+@@ -855,20 +855,17 @@ $(VIDIX_OBJS): $(VIDIX_PCI_FILES)
  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 install-gui-icons
 -	-ln -sf mplayer$(EXESUF) $(BINDIR)/gmplayer$(EXESUF)
 -	$(INSTALL) -d $(DATADIR)/skins $(prefix)/share/applications
 -	$(INSTALL) -m 644 etc/mplayer.desktop $(prefix)/share/applications/
 +install-gui: install-mplayer
  
  install-gui-icons:    $(foreach size,$(GUI_ICONSIZES),install-gui-icon-$(size))
  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
Index: head/multimedia/mplayer/files/patch-configure
===================================================================
--- head/multimedia/mplayer/files/patch-configure	(revision 395118)
+++ head/multimedia/mplayer/files/patch-configure	(revision 395119)
@@ -1,180 +1,169 @@
---- configure.orig	2014-12-17 22:02:44.000000000 +0100
-+++ configure	2015-03-28 13:56:41.340987552 +0100
-@@ -646,7 +646,7 @@
+--- configure.orig	2015-08-02 17:29:05 UTC
++++ configure
+@@ -646,7 +646,7 @@ armthumb=auto
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
 -_install=install
 +_install=@${BSD_INSTALL_PROGRAM}
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -988,7 +988,7 @@
+@@ -988,7 +988,7 @@ for ac_option do
      ld_static=''
      ;;
    --enable-profile)
 -    _profile='-p'
 +    _profile='-pg'
      ;;
    --disable-profile)
      _profile=
-@@ -1459,7 +1459,6 @@
+@@ -1459,7 +1459,6 @@ for ac_option do
  
    *)
      echo "Unknown parameter: $ac_option"
 -    exit 1
      ;;
  
    esac
-@@ -1712,7 +1711,7 @@
+@@ -1712,7 +1711,7 @@ if test -z "$_target" ; then
    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 ;;
 +      macppc|powerpc|ppc*|Power*) host_arch=ppc ;;
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1834,7 +1833,11 @@
+@@ -1835,7 +1834,11 @@ echocheck "working compiler"
  cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
  echo "yes"
  
 -cflag_check "-lm" && libm="-lm"
 +if test -z "$_profile" ; then
 +  cflag_check "-lm" && libm="-lm"
 +else
 +  cflag_check "-lm_p" && libm="-lm_p"
 +fi
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
-@@ -3164,6 +3167,13 @@
+@@ -3170,6 +3173,13 @@ if arm ; then
    fi
    echores "$setend"
  
 +  echocheck "ARM setend"
 +  if test $setend = "auto" ; then
 +    setend=no
 +    inline_asm_check '"setend be"' && setend=yes
 +  fi
 +  echores "$setend"
 +
    echocheck "softfloat ABI"
    softfloat=yes
    cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
-@@ -3914,7 +3924,7 @@
+@@ -3920,7 +3930,7 @@ echocheck "pthread"
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
 -  THREAD_CFLAGS=-D_THREAD_SAFE
 +  THREAD_CFLAGS=
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -3924,7 +3934,7 @@
+@@ -3930,7 +3940,7 @@ int main(void) { pthread_t tid; return p
  EOF
  _pthreads=no
  if ! hpux ; then
 -  for ld_tmp in "-lpthreadGC2" "" "-lpthread" "-pthread" ; do
 +  for ld_tmp in "-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
-@@ -4076,7 +4086,7 @@
+@@ -4082,7 +4092,7 @@ EOF
    # 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" "-L%%LOCALBASE%%/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
-@@ -5474,15 +5484,6 @@
+@@ -5484,15 +5494,6 @@ EOF
        break
      fi
    done
 -  if test "$_x11" = yes && cc_check -DGL_EGL_X11 -lEGL ; then
 -    _gl=yes
 -    _gl_egl_x11=yes
 -    libs_mplayer="$libs_mplayer -lEGL $ld_dl"
 -  elif cc_check -DGL_EGL_ANDROID -lEGL ; then
 -    _gl=yes
 -    _gl_egl_android=yes
 -    libs_mplayer="$libs_mplayer -lEGL $ld_dl"
 -  fi
    if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
      _gl=yes
      _gl_win32=yes
-@@ -6046,7 +6047,7 @@
+@@ -6056,7 +6057,7 @@ elif darwin ; then
  elif dragonfly ; then
    default_cdrom_device="/dev/cd0"
  elif freebsd ; then
 -  default_cdrom_device="/dev/acd0"
 +  default_cdrom_device="/dev/cdrom"
  elif openbsd ; then
    default_cdrom_device="/dev/rcd0c"
  elif sunos ; then
-@@ -6059,7 +6060,7 @@
+@@ -6069,7 +6070,7 @@ else
    default_cdrom_device="/dev/cdrom"
  fi
  
 -if win32 || os2 || dragonfly || freebsd || openbsd || sunos || amigaos ; then
 +if win32 || os2 || dragonfly || openbsd || sunos || amigaos ; then
    default_dvd_device=$default_cdrom_device
  elif darwin ; then
    default_dvd_device="/dev/rdiskN"
-@@ -6133,8 +6134,8 @@
-         cat > $TMPC << EOF
- #include <stdio.h>
- #include <cdio/version.h>
--#include <cdio/cdda.h>
--#include <cdio/paranoia.h>
-+#include <cdio/paranoia/cdda.h>
-+#include <cdio/paranoia/paranoia.h>
- int main(void) {
-     void *test = cdda_verbose_set;
-     printf("%s\n", CDIO_VERSION);
-@@ -6566,7 +6567,7 @@
+@@ -6586,7 +6587,7 @@ echores "$_speex"
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
 -  statement_check gsm/gsm.h 'gsm_create()' -lgsm && _libgsm=yes
 +  statement_check gsm.h 'gsm_create()' -lgsm && _libgsm=yes
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7051,6 +7052,16 @@
+@@ -7071,6 +7072,16 @@ if test "$_librtmp" = yes && test "$netw
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
 +
 +  if $_pkg_config --exists librtmp; then
 +	_inc_tmp=$($_pkg_config --cflags librtmp)
 +	_ld_tmp=$($_pkg_config --libs librtmp)
 +  else
 +	_inc_tmp="-I${LOCALBASE}/include"
 +	_ld_tmp="-L${LOCALBASE}/lib -lrtmp -lz -lssl -lcrypto"
 +  fi
 +  extra_ldflags="$extra_ldflags $_ld_tmp"
 +  extra_cflags="$extra_cflags $_inc_tmp"
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7450,7 +7461,7 @@
+@@ -7471,7 +7482,7 @@ echores "$_mp3lame"
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
 -  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER SNOW_ENCODER"
 +  libavencoders="$mplayer_encoders MPEG1VIDEO_ENCODER H263_ENCODER SNOW_ENCODER"
  fi
  echores "$_mencoder"
  
-@@ -8329,7 +8340,7 @@
+@@ -8353,7 +8364,7 @@ TIMER = $_timer
  EXESUF      = $_exesuf
  EXESUFS_ALL = .exe
  
 -ARCH = $arch
 +MPLAYER_ARCH = $arch
  $(mak_enable "$arch_all"    "$arch"    ARCH)
  $(mak_enable "$subarch_all" "$subarch" ARCH)
  $(mak_enable "$cpuexts_all" "$cpuexts" HAVE)
Index: head/multimedia/mplayer/files/patch-ffmpeg_Makefile
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_Makefile	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_Makefile	(revision 395119)
@@ -0,0 +1,11 @@
+--- ffmpeg/Makefile.orig	2015-06-19 20:44:35 UTC
++++ ffmpeg/Makefile
+@@ -92,7 +92,7 @@ define DOSUBDIR
+ $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V))))
+ SUBDIR := $(1)/
+ include $(SRC_PATH)/$(1)/Makefile
+--include $(SRC_PATH)/$(1)/$(ARCH)/Makefile
++-include $(SRC_PATH)/$(1)/$(MPLAYER_ARCH)/Makefile
+ -include $(SRC_PATH)/$(1)/$(INTRINSICS)/Makefile
+ include $(SRC_PATH)/library.mak
+ endef

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile	(revision 395119)
@@ -0,0 +1,11 @@
+--- ffmpeg/libavcodec/Makefile.orig	2015-06-19 20:44:36 UTC
++++ ffmpeg/libavcodec/Makefile
+@@ -877,7 +877,7 @@ SKIPHEADERS                            +
+                                           old_codec_ids.h               \
+                                           tableprint.h                  \
+                                           tableprint_vlc.h              \
+-                                          $(ARCH)/vp56_arith.h          \
++                                          $(MPLAYER_ARCH)/vp56_arith.h          \
+ 
+ SKIPHEADERS-$(CONFIG_D3D11VA)          += d3d11va.h dxva2_internal.h
+ SKIPHEADERS-$(CONFIG_DXVA2)            += dxva2.h dxva2_internal.h

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S	(revision 395119)
@@ -0,0 +1,11 @@
+--- ffmpeg/libavcodec/arm/fft_vfp.S.orig	2015-06-19 20:44:37 UTC
++++ ffmpeg/libavcodec/arm/fft_vfp.S
+@@ -33,7 +33,7 @@ function ff_fft_calc_vfp, export=1
+         movrel  a2, (fft_tab_vfp - 8)
+         ldr     pc, [a2, ip, lsl #2]
+ endfunc
+-const   fft_tab_vfp, relocate=1
++const   fft_tab_vfp
+         .word   fft4_vfp
+         .word   fft8_vfp
+         .word   X(ff_fft16_vfp)     @ this one alone is exported

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c	(revision 395119)
@@ -0,0 +1,14 @@
+--- ffmpeg/libavcodec/libgsmdec.c.orig	2015-06-19 20:44:39 UTC
++++ ffmpeg/libavcodec/libgsmdec.c
+@@ -28,11 +28,7 @@
+ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
+ 
+ #include "config.h"
+-#if HAVE_GSM_H
+ #include <gsm.h>
+-#else
+-#include <gsm/gsm.h>
+-#endif
+ 
+ #include "libavutil/channel_layout.h"
+ #include "libavutil/common.h"

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c	(revision 395119)
@@ -0,0 +1,14 @@
+--- ffmpeg/libavcodec/libgsmenc.c.orig	2015-06-19 20:44:39 UTC
++++ ffmpeg/libavcodec/libgsmenc.c
+@@ -28,11 +28,7 @@
+ // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html
+ 
+ #include "config.h"
+-#if HAVE_GSM_H
+ #include <gsm.h>
+-#else
+-#include <gsm/gsm.h>
+-#endif
+ 
+ #include "libavutil/common.h"
+ 

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c	(revision 395119)
@@ -0,0 +1,10 @@
+--- ffmpeg/libavcodec/mpegaudio_parser.c.orig	2015-06-19 20:44:40 UTC
++++ ffmpeg/libavcodec/mpegaudio_parser.c
+@@ -84,6 +84,7 @@ static int mpegaudio_parse(AVCodecParser
+                         avctx->sample_rate= sr;
+                         avctx->channels   = channels;
+                         s1->duration      = frame_size;
++                        avctx->frame_size = frame_size;
+                         avctx->codec_id   = codec_id;
+                         if (s->no_bitrate || !avctx->bit_rate) {
+                             s->no_bitrate = 1;

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile	(revision 395119)
@@ -0,0 +1,10 @@
+--- ffmpeg/libavfilter/Makefile.orig	2015-06-19 20:44:50 UTC
++++ ffmpeg/libavfilter/Makefile
+@@ -26,6 +26,7 @@ OBJS = allfilters.o                     
+        transform.o                                                      \
+        video.o                                                          \
+ 
++-include $(SRC_PATH)/$(SUBDIR)$(MPLAYER_ARCH)/Makefile
+ 
+ OBJS-$(CONFIG_AVCODEC)                       += avcodec.o
+ 

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c	(revision 395119)
@@ -0,0 +1,11 @@
+--- ffmpeg/libavformat/udp.c.orig	2015-06-19 20:44:53 UTC
++++ ffmpeg/libavformat/udp.c
+@@ -71,6 +71,8 @@
+ #define UDP_MAX_PKT_SIZE 65536
+ #define UDP_HEADER_SIZE 8
+ 
++#define IPPROTO_IPV6 41
++
+ typedef struct UDPContext {
+     const AVClass *class;
+     int udp_fd;

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c	(revision 395119)
@@ -0,0 +1,11 @@
+--- ffmpeg/libavutil/mem.c.orig	2015-08-23 16:08:16 UTC
++++ ffmpeg/libavutil/mem.c
+@@ -228,7 +228,7 @@ void av_free(void *ptr)
+ #if CONFIG_MEMALIGN_HACK
+     if (ptr) {
+         int v= ((char *)ptr)[-1];
+-        av_assert0(v>0 && v<=ALIGN);
++        av_assert0(v>=0 && v<=ALIGN);
+         free((char *)ptr - v);
+     }
+ #elif HAVE_ALIGNED_MALLOC

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h
===================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h	(nonexistent)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h	(revision 395119)
@@ -0,0 +1,11 @@
+--- ffmpeg/libavutil/x86/asm.h.orig	2015-06-19 20:44:54 UTC
++++ ffmpeg/libavutil/x86/asm.h
+@@ -71,7 +71,7 @@ typedef int32_t x86_reg;
+ 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)

Property changes on: head/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-gui_wm_ws.c
===================================================================
--- head/multimedia/mplayer/files/patch-gui_wm_ws.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-gui_wm_ws.c	(revision 395119)
@@ -0,0 +1,10 @@
+--- gui/wm/ws.c.orig	2015-08-01 07:44:07 UTC
++++ gui/wm/ws.c
+@@ -1322,6 +1322,7 @@ void wsImageCreate(wsWindow *win, int w,
+         win->xImage->data     = win->Shminfo.shmaddr;
+         win->Shminfo.readOnly = False;
+         XShmAttach(wsDisplay, &win->Shminfo);
++	XSync(wsDisplay, False);
+         shmctl(win->Shminfo.shmid, IPC_RMID, 0);
+     } else
+ #endif

Property changes on: head/multimedia/mplayer/files/patch-gui_wm_ws.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libao2_ao__arts.c
===================================================================
--- head/multimedia/mplayer/files/patch-libao2_ao__arts.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-libao2_ao__arts.c	(revision 395119)
@@ -0,0 +1,15 @@
+--- libao2/ao_arts.c.orig	2010-02-20 21:02:49 UTC
++++ libao2/ao_arts.c
+@@ -116,8 +116,10 @@ static int init(int rate_hz, int channel
+ 
+ static void uninit(int immed)
+ {
+-	arts_close_stream(stream);
+-	arts_free();
++	if (stream != NULL) {
++	    arts_close_stream(stream);
++	    stream = NULL;
++	}
+ }
+ 
+ static int play(void* data,int len,int flags)

Property changes on: head/multimedia/mplayer/files/patch-libao2_ao__arts.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libao2_ao__oss.c
===================================================================
--- head/multimedia/mplayer/files/patch-libao2_ao__oss.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-libao2_ao__oss.c	(revision 395119)
@@ -0,0 +1,89 @@
+--- libao2/ao_oss.c.orig	2013-03-17 22:47:17 UTC
++++ libao2/ao_oss.c
+@@ -57,6 +57,8 @@ static const ao_info_t info =
+ 	""
+ };
+ 
++static int volume = -1;
++
+ /* Support for >2 output channels added 2001-11-25 - Steve Davies <steve@daviesfam.org> */
+ 
+ LIBAO_EXTERN(oss)
+@@ -73,6 +75,11 @@ static int format2oss(int format)
+     case AF_FORMAT_S16_BE: return AFMT_S16_BE;
+ #ifdef AFMT_S24_PACKED
+     case AF_FORMAT_S24_LE: return AFMT_S24_PACKED;
++#elif defined(__FreeBSD__) && defined(AFMT_S24_LE)
++    case AF_FORMAT_U24_LE: return AFMT_U24_LE;
++    case AF_FORMAT_U24_BE: return AFMT_U24_BE;
++    case AF_FORMAT_S24_LE: return AFMT_S24_LE;
++    case AF_FORMAT_S24_BE: return AFMT_S24_BE;
+ #endif
+ #ifdef AFMT_U32_LE
+     case AF_FORMAT_U32_LE: return AFMT_U32_LE;
+@@ -116,6 +123,11 @@ static int oss2format(int format)
+     case AFMT_S16_BE: return AF_FORMAT_S16_BE;
+ #ifdef AFMT_S24_PACKED
+     case AFMT_S24_PACKED: return AF_FORMAT_S24_LE;
++#elif defined(__FreeBSD__) && defined(AFMT_S24_LE)
++    case AFMT_U24_LE: return AF_FORMAT_U24_LE;
++    case AFMT_U24_BE: return AF_FORMAT_U24_BE;
++    case AFMT_S24_LE: return AF_FORMAT_S24_LE;
++    case AFMT_S24_BE: return AF_FORMAT_S24_BE;
+ #endif
+ #ifdef AFMT_U32_LE
+     case AFMT_U32_LE: return AF_FORMAT_U32_LE;
+@@ -435,9 +447,29 @@ static void uninit(int immed){
+     audio_fd = -1;
+ }
+ 
++static void savevol(void){
++	int fd;
++	if (volume < 0) {
++		if ((fd = open(oss_mixer_device, O_RDONLY)) >= 0) { 
++			ioctl(fd, MIXER_READ(oss_mixer_channel), &volume);
++			close(fd);
++		}
++	}     
++}
++
++static void restorevol(void){
++	int fd;
++	if ((fd = open(oss_mixer_device, O_RDONLY)) >= 0) {
++		ioctl(fd, MIXER_WRITE(oss_mixer_channel), &volume);
++		close(fd);
++	}
++	volume = -1;     
++}
++
+ // stop playing and empty buffers (for seeking/pause)
+ static void reset(void){
+   int oss_format;
++    savevol();
+     uninit(1);
+     audio_fd=open(dsp, O_WRONLY);
+     if(audio_fd < 0){
+@@ -449,6 +481,7 @@ static void reset(void){
+   fcntl(audio_fd, F_SETFD, FD_CLOEXEC);
+ #endif
+ 
++  ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
+   oss_format = format2oss(ao_data.format);
+   if(AF_FORMAT_IS_AC3(ao_data.format))
+     ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
+@@ -460,13 +493,14 @@ static void reset(void){
+       int c = ao_data.channels-1;
+       ioctl (audio_fd, SNDCTL_DSP_STEREO, &c);
+     }
+-    ioctl (audio_fd, SNDCTL_DSP_SPEED, &ao_data.samplerate);
+   }
++  restorevol();
+ }
+ 
+ // stop playing, keep buffers (for pause)
+ static void audio_pause(void)
+ {
++	savevol();
+     prepause_space = get_space();
+     uninit(1);
+ }

Property changes on: head/multimedia/mplayer/files/patch-libao2_ao__oss.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-libvo_x11__common.c
===================================================================
--- head/multimedia/mplayer/files/patch-libvo_x11__common.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-libvo_x11__common.c	(revision 395119)
@@ -0,0 +1,11 @@
+--- libvo/x11_common.c.orig	2015-05-11 20:10:01 UTC
++++ libvo/x11_common.c
+@@ -430,7 +430,7 @@ int vo_init(void)
+     }
+ 
+     // Required so that XLookupString returns UTF-8
+-    if (!setlocale(LC_CTYPE, "C.UTF-8") && !setlocale(LC_CTYPE, "en_US.utf8"))
++    if (!setlocale(LC_CTYPE, "en_US.UTF-8"))
+         mp_msg(MSGT_VO, MSGL_WARN, MSGTR_CouldntFindUTF8Locale);
+     XSetErrorHandler(x11_errorhandler);
+ 

Property changes on: head/multimedia/mplayer/files/patch-libvo_x11__common.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-mplayer.c
===================================================================
--- head/multimedia/mplayer/files/patch-mplayer.c	(revision 395118)
+++ head/multimedia/mplayer/files/patch-mplayer.c	(revision 395119)
@@ -1,12 +1,12 @@
---- mplayer.c.orig	2014-04-06 20:46:45.000000000 +0200
-+++ mplayer.c	2014-06-07 14:40:43.756655422 +0200
-@@ -3707,7 +3707,8 @@
+--- mplayer.c.orig	2015-06-10 21:17:35 UTC
++++ mplayer.c
+@@ -3711,7 +3711,8 @@ goto_enable_cache:
          if (use_gui) {
              if (!gui(GUI_SET_VIDEO, mpctx->sh_video))
                  goto goto_next_file;
 -            gui(GUI_SET_AUDIO, mpctx->sh_audio);
 +            if (mpctx->sh_audio)
 +                gui(GUI_SET_AUDIO, mpctx->sh_audio);
          }
  #endif
  
Index: head/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c
===================================================================
--- head/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c	(revision 395119)
@@ -0,0 +1,76 @@
+--- stream/tvi_bsdbt848.c.orig	2013-03-16 10:15:07 UTC
++++ stream/tvi_bsdbt848.c
+@@ -366,11 +366,11 @@ static int control(priv_t *priv, int cmd
+         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)
+             {
+-            priv->iformat = METEOR_FMT_PAL;
++            priv->iformat = BT848_IFORM_F_PALBDGHI;
+             priv->maxheight = PAL_HEIGHT;
+             priv->maxwidth = PAL_WIDTH;
+             priv->maxfps = PAL_FPS;
+@@ -391,7 +391,7 @@ static int control(priv_t *priv, int cmd
+ 
+         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;
+@@ -415,9 +415,28 @@ static int control(priv_t *priv, int cmd
+                 }
+             }
+ 
+-        if(req_mode == TV_NORM_SECAM) priv->iformat = METEOR_FMT_SECAM;
++        if(req_mode == TV_NORM_SECAM)
++            {
++            priv->iformat = BT848_IFORM_F_SECAM;
++            priv->maxheight = PAL_HEIGHT;
++            priv->maxwidth = PAL_WIDTH;
++            priv->maxfps = PAL_FPS;
++            priv->fps = PAL_FPS;
+ 
+-        if(ioctl(priv->btfd, METEORSFMT, &priv->iformat) < 0)
++            if(priv->fps > priv->maxfps) priv->fps = priv->maxfps;
++
++            if(priv->geom.rows > priv->maxheight)
++                {
++                priv->geom.rows = priv->maxheight;
++                }
++
++            if(priv->geom.columns > priv->maxwidth)
++                {
++                priv->geom.columns = priv->maxwidth;
++                }
++            }
++
++        if(ioctl(priv->btfd, BT848SFMT, &priv->iformat) < 0)
+             {
+             mp_msg(MSGT_TV, MSGL_ERR, MSGTR_TV_Bt848IoctlFailed, "METEORSFMT", strerror(errno));
+             return TVI_CONTROL_FALSE;
+@@ -546,8 +565,9 @@ G_private = priv; /* Oooh, sick */
+ /* Video Configuration */
+ 
+ priv->videoready = 1;
++priv->btdev = strdup("/dev/bktr0");
+ 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;
+@@ -572,7 +592,7 @@ if(priv->btfd < 0)
+     }
+ 
+ if(priv->videoready &&
+-   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));
+     }

Property changes on: head/multimedia/mplayer/files/patch-stream_tvi__bsdbt848.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-stream_tvi__v4l.c
===================================================================
--- head/multimedia/mplayer/files/patch-stream_tvi__v4l.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-stream_tvi__v4l.c	(revision 395119)
@@ -0,0 +1,17 @@
+--- stream/tvi_v4l.c.orig	2013-03-17 22:47:17 UTC
++++ stream/tvi_v4l.c
+@@ -65,6 +65,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);
+ 
+ const tvi_info_t tvi_info_v4l = {

Property changes on: head/multimedia/mplayer/files/patch-stream_tvi__v4l.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-stream_tvi__v4l2.c
===================================================================
--- head/multimedia/mplayer/files/patch-stream_tvi__v4l2.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-stream_tvi__v4l2.c	(revision 395119)
@@ -0,0 +1,25 @@
+--- stream/tvi_v4l2.c.orig	2014-06-10 16:39:04 UTC
++++ stream/tvi_v4l2.c
+@@ -53,7 +53,6 @@ known issues:
+ #ifdef HAVE_SYS_VIDEOIO_H
+ #include <sys/videoio.h>
+ #else
+-#include <linux/types.h>
+ #include <linux/videodev2.h>
+ #endif
+ #include "mp_msg.h"
+@@ -68,6 +67,14 @@ known issues:
+ #define V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC 0x2000
+ #endif
+ 
++#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 */

Property changes on: head/multimedia/mplayer/files/patch-stream_tvi__v4l2.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/multimedia/mplayer/files/patch-vidix_mga__vid.c
===================================================================
--- head/multimedia/mplayer/files/patch-vidix_mga__vid.c	(nonexistent)
+++ head/multimedia/mplayer/files/patch-vidix_mga__vid.c	(revision 395119)
@@ -0,0 +1,17 @@
+--- vidix/mga_vid.c.orig	2014-05-17 01:38:00 UTC
++++ vidix/mga_vid.c
+@@ -1110,13 +1110,10 @@ static int mga_probe(int verbose,int for
+ 		    i, lst[i].vendor, lst[i].device);
+ 	    if (lst[i].vendor == VENDOR_MATROX)
+ 	    {
+-#if 0
+ 		if ((lst[i].command & PCI_COMMAND_IO) == 0)
+ 		{
+-			mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device is disabled, ignoring\n");
+-			continue;
++			mp_msg(MSGT_VO, MSGL_STATUS, "[mga] Device seems disabled, trying anyway\n");
+ 		}
+-#endif
+ 		switch(lst[i].device)
+ 		{
+ 		    case DEVICE_MATROX_MGA_G550_AGP:

Property changes on: head/multimedia/mplayer/files/patch-vidix_mga__vid.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property