14 files changed, 96 insertions, 200 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 8b30cbaf12dd..b3061b160f78 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
-PORTREVISION=	2
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
@@ -91,29 +90,7 @@ pre-everything::
 	@${ECHO_MSG} "DEFAULT_DVD_DEVICE=${DEFAULT_DVD_DEVICE}"
 	@${ECHO_MSG} "DEFAULT_CDROM_DEVICE=${DEFAULT_CDROM_DEVICE}"
 
-post-patch:
-	@${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}|' \
-			-e 's|%%LOCALBASE%%|${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'
+post-patch: common-post-patch
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mencoder ${STAGEDIR}${PREFIX}/bin
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 8e6758dfe550..ab6115033ee0 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473848106
-SHA256 (mplayer-1.3.0.20160912.tar.xz) = 8be40d3205c95dbea494ee6250e63a119ee04a785664301b0079e9e97e3c7ec8
-SIZE (mplayer-1.3.0.20160912.tar.xz) = 12736924
+TIMESTAMP = 1482913109
+SHA256 (mplayer-1.3.0.20161228.tar.xz) = 51e7c624ad2db67cd67a6f5ca973fc2509bbcc9310f2e67597011d187f0edbe6
+SIZE (mplayer-1.3.0.20161228.tar.xz) = 5166288
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index e55cd00cf529..fbee8d88eee3 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -134,29 +134,7 @@ pre-everything::
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
-post-patch:
-	@${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}|' \
-			-e 's|%%LOCALBASE%%|${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'
+post-patch: common-post-patch
 
 post-patch-RTC-on:
 	@${REINPLACE_CMD} -e 's|irqp = 1024|irqp = ${DEFAULT_KERN_HZ}|' ${WRKSRC}/mplayer.c
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index c68d49ab10dd..7c391fbd0dac 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -5,8 +5,8 @@
 # $FreeBSD$
 
 MPLAYER_PORT_VERSION=	1.3.0
-MPLAYER_SNAPSHOT_DATE=	2016-09-12
-PORTREVISION?=	3
+MPLAYER_SNAPSHOT_DATE=	2016-12-28
+PORTREVISION?=	0
 MASTER_SITES=	LOCAL/riggs/mplayer
 DISTNAME=	mplayer-${MPLAYER_PORT_VERSION}.${MPLAYER_SNAPSHOT_DATE:S/-//g}
 WRKSRC=		${WRKDIR}/mplayer-export-${MPLAYER_SNAPSHOT_DATE}
@@ -15,15 +15,17 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libpng.so:graphics/png \
+		libavcodec.so:multimedia/ffmpeg \
 		libfreetype.so:print/freetype2
 
 USES=		compiler:c11 gmake iconv ncurses tar:xz
 NOPRECIOUSMAKEVARS=	yes # ARCH
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc="${CC}" \
 		--host-cc="${CC}" \
 		--as="${AS}" \
+		--mandir="${PREFIX}/man" \
 		--extra-cflags="-I${PREFIX}/include -I${LOCALBASE}/include" \
 		--extra-libs="-L${PREFIX}/lib" \
 		--disable-alsa \
@@ -31,6 +33,7 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--disable-crystalhd \
 		--disable-esd \
 		--disable-faad \
+		--disable-ffmpeg_a \
 		--disable-ggi \
 		--disable-ggiwmh \
 		--disable-liba52 \
@@ -48,3 +51,27 @@ CONFIGURE_ARGS=	--cc="${CC}" \
 		--enable-ass-internal
 
 WANT_GNOME=	yes
+
+common-post-patch:
+	@${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}|' \
+			-e 's|%%LOCALBASE%%|${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'
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index b9cc8641e4ec..5b0a76d08af2 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473836368
-SHA256 (mplayer-1.3.0.20160912.tar.xz) = 8be40d3205c95dbea494ee6250e63a119ee04a785664301b0079e9e97e3c7ec8
-SIZE (mplayer-1.3.0.20160912.tar.xz) = 12736924
+TIMESTAMP = 1482906715
+SHA256 (mplayer-1.3.0.20161228.tar.xz) = 51e7c624ad2db67cd67a6f5ca973fc2509bbcc9310f2e67597011d187f0edbe6
+SIZE (mplayer-1.3.0.20161228.tar.xz) = 5166288
diff --git a/multimedia/mplayer/files/patch-configure b/multimedia/mplayer/files/patch-configure
index ce11fa00a670..75dae6d61803 100644
--- a/multimedia/mplayer/files/patch-configure
+++ b/multimedia/mplayer/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2015-12-18 14:53:21 UTC
+--- configure.orig	2016-11-14 23:29:59 UTC
 +++ configure
-@@ -646,7 +646,7 @@ armthumb=auto
+@@ -649,7 +649,7 @@ armthumb=auto
  _iwmmxt=auto
  _mtrr=auto
  _altivec=auto
@@ -9,7 +9,7 @@
  _ranlib=ranlib
  _windres=windres
  _cc=cc
-@@ -988,7 +988,7 @@ for ac_option do
+@@ -992,7 +992,7 @@ for ac_option do
      ld_static=''
      ;;
    --enable-profile)
@@ -18,7 +18,7 @@
      ;;
    --disable-profile)
      _profile=
-@@ -1459,7 +1459,6 @@ for ac_option do
+@@ -1464,7 +1464,6 @@ for ac_option do
  
    *)
      echo "Unknown parameter: $ac_option"
@@ -26,7 +26,48 @@
      ;;
  
    esac
-@@ -1712,7 +1711,7 @@ if test -z "$_target" ; then
+@@ -1502,40 +1501,6 @@ rm -f "$TMPLOG"
+ echo configuration: $configuration > "$TMPLOG"
+ echo >> "$TMPLOG"
+ 
+-
+-# local FFmpeg checkout handling
+-if test -e ffmpeg/.svn ; then
+-    echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
+-    exit 1
+-fi
+-
+-FFBRANCH=master
+-test -e FFBRANCH && FFBRANCH=$(cat FFMPEG_BRANCH)
+-
+-if test -e ffmpeg/mp_auto_pull ; then
+-    echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
+-    (cd ffmpeg && git checkout $FFBRANCH)
+-    if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
+-        echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
+-        exit 1
+-    fi
+-fi
+-
+-if test "$ffmpeg_a" != "no" && ! test -e ffmpeg ; then
+-    echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
+-    read tmp
+-    if ! git clone -b $FFBRANCH --depth 1 git://source.ffmpeg.org/ffmpeg.git ffmpeg ; then
+-        rm -rf ffmpeg
+-        echo "Failed to get a FFmpeg checkout"
+-        echo "Please try again or put FFmpeg source code copy into ffmpeg/ manually."
+-        echo "Nightly snapshot: http://ffmpeg.org/releases/ffmpeg-snapshot.tar.bz2"
+-        echo "To use a github mirror via http (e.g. because a firewall blocks git):"
+-        echo "git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg; touch ffmpeg/mp_auto_pull"
+-        exit 1
+-    fi
+-    touch ffmpeg/mp_auto_pull
+-fi
+-
+ list_subparts() {
+   test ! -e ffmpeg/libav${3} && return 1
+   pattern="s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p"
+@@ -1732,7 +1697,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 ;;
@@ -35,7 +76,7 @@
        alpha) host_arch=alpha ;;
        sun4*|sparc*) host_arch=sparc ;;
        parisc*|hppa*|9000*) host_arch=hppa ;;
-@@ -1835,7 +1834,11 @@ echocheck "working compiler"
+@@ -1855,7 +1820,11 @@ echocheck "working compiler"
  cflag_check "" || die "Compiler is not functioning correctly. Check your installation and custom CFLAGS $CFLAGS ."
  echo "yes"
  
@@ -48,7 +89,7 @@
  
  if test -z "$_target" ; then
    cat > $TMPC << EOF
-@@ -3194,6 +3197,13 @@ if arm ; then
+@@ -3224,6 +3193,13 @@ if arm ; then
    fi
    echores "$setend"
  
@@ -62,7 +103,7 @@
    echocheck "softfloat ABI"
    softfloat=yes
    cpp_condition_check '' 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no
-@@ -3944,7 +3954,7 @@ echocheck "pthread"
+@@ -3993,7 +3969,7 @@ echocheck "pthread"
  if linux ; then
    THREAD_CFLAGS=-D_REENTRANT
  elif freebsd || netbsd || openbsd || bsdos ; then
@@ -71,7 +112,7 @@
  fi
  if test "$_pthreads" = auto ; then
  cat > $TMPC << EOF
-@@ -3954,7 +3964,7 @@ int main(void) { pthread_t tid; return p
+@@ -4003,7 +3979,7 @@ int main(void) { pthread_t tid; return p
  EOF
  _pthreads=no
  if ! hpux ; then
@@ -80,7 +121,7 @@
      # 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
-@@ -4103,7 +4113,7 @@ int main(void) {
+@@ -4152,7 +4128,7 @@ int main(void) {
  }
  EOF
    _iconv=no
@@ -89,7 +130,7 @@
      cc_check $ld_tmp && extra_ldflags="$extra_ldflags $ld_tmp" &&
        ld_iconv="$ld_tmp" && _iconv=yes && break
    done
-@@ -5505,15 +5515,6 @@ EOF
+@@ -5565,15 +5541,6 @@ EOF
        break
      fi
    done
@@ -105,7 +146,7 @@
    if win32 && cc_check -DGL_WIN32 -lopengl32 ; then
      _gl=yes
      _gl_win32=yes
-@@ -6077,7 +6078,7 @@ elif darwin ; then
+@@ -6137,7 +6104,7 @@ elif darwin ; then
  elif dragonfly ; then
    default_cdrom_device="/dev/cd0"
  elif freebsd ; then
@@ -114,7 +155,7 @@
  elif openbsd ; then
    default_cdrom_device="/dev/rcd0c"
  elif sunos ; then
-@@ -6090,7 +6091,7 @@ else
+@@ -6150,7 +6117,7 @@ else
    default_cdrom_device="/dev/cdrom"
  fi
  
@@ -123,7 +164,7 @@
    default_dvd_device=$default_cdrom_device
  elif darwin ; then
    default_dvd_device="/dev/rdiskN"
-@@ -6607,7 +6608,7 @@ echores "$_speex"
+@@ -6667,7 +6634,7 @@ echores "$_speex"
  echocheck "libgsm"
  if test "$_libgsm" = auto ; then
    _libgsm=no
@@ -132,7 +173,7 @@
  fi
  if test "$_libgsm" = yes ; then
    def_libgsm='#define CONFIG_LIBGSM 1'
-@@ -7092,6 +7093,16 @@ if test "$_librtmp" = yes && test "$netw
+@@ -7152,6 +7119,16 @@ if test "$_librtmp" = yes && test "$netw
    nolibrtmp=no
    def_librtmp='#define CONFIG_LIBRTMP 1'
    inputmodules="librtmp $inputmodules"
@@ -149,7 +190,7 @@
  else
    nolibrtmp=yes
    _librtmp=no
-@@ -7493,7 +7504,7 @@ echores "$_mp3lame"
+@@ -7553,7 +7530,7 @@ echores "$_mp3lame"
  echocheck "mencoder"
  if test "$_mencoder" = no ; then
    # mpeg1video for vf_lavc, snow for vf_uspp / vf_mcdeint,
@@ -158,7 +199,7 @@
  fi
  echores "$_mencoder"
  
-@@ -8094,7 +8105,7 @@ libs_mplayer=$ld_tmp
+@@ -8159,7 +8136,7 @@ libs_mplayer=$ld_tmp
  
  #############################################################################
  
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S
deleted file mode 100644
index c9ed1e50ad7b..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_arm_fft__vfp.S
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c
deleted file mode 100644
index 4416aa71dfe5..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmdec.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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"
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c
deleted file mode 100644
index c99f4c6c2263..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_libgsmenc.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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"
- 
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c
deleted file mode 100644
index 8fb12617e5e2..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_mpegaudio__parser.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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;
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c b/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c
deleted file mode 100644
index d1fc74ace2ee..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavformat_rtsp.c
+++ /dev/null
@@ -1,45 +0,0 @@
---- ffmpeg/libavformat/rtsp.c.orig	2016-08-05 16:20:04 UTC
-+++ ffmpeg/libavformat/rtsp.c
-@@ -1613,7 +1613,12 @@ int ff_rtsp_make_setup_request(AVFormatC
-             }
-             if (ttl > 0)
-                 snprintf(optbuf, sizeof(optbuf), "?ttl=%d", ttl);
--            getnameinfo((struct sockaddr*) &addr, sizeof(addr),
-+            getnameinfo((struct sockaddr*) &addr,
-+#if HAVE_STRUCT_SOCKADDR_SA_LEN
-+                        ((struct sockaddr*) &addr)->sa_len,
-+#else
-+                        sizeof(addr),
-+#endif
-                         namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
-             ff_url_join(url, sizeof(url), "rtp", NULL, namebuf,
-                         port, "%s", optbuf);
-@@ -1829,8 +1834,13 @@ redirect:
-         goto fail;
-     }
-     if (!getpeername(tcp_fd, (struct sockaddr*) &peer, &peer_len)) {
--        getnameinfo((struct sockaddr*) &peer, peer_len, host, sizeof(host),
--                    NULL, 0, NI_NUMERICHOST);
-+        getnameinfo((struct sockaddr*) &peer, 
-+#if HAVE_STRUCT_SOCKADDR_SA_LEN
-+                    ((struct sockaddr*) &peer)->sa_len,
-+#else
-+                    peer_len,            
-+#endif
-+		    host, sizeof(host), NULL, 0, NI_NUMERICHOST);
-     }
- 
-     /* request options supported by the server; this also detects server
-@@ -2309,7 +2319,11 @@ static int sdp_read_header(AVFormatConte
-             AVDictionary *opts = map_to_opts(rt);
- 
-             err = getnameinfo((struct sockaddr*) &rtsp_st->sdp_ip,
--                              sizeof(rtsp_st->sdp_ip),
-+#if HAVE_STRUCT_SOCKADDR_SA_LEN
-+                        ((struct sockaddr*) &rtsp_st->sdp_ip)->sa_len,
-+#else
-+                        sizeof(rtsp_st->sdp_ip),
-+#endif
-                               namebuf, sizeof(namebuf), NULL, 0, NI_NUMERICHOST);
-             if (err) {
-                 av_log(s, AV_LOG_ERROR, "getnameinfo: %s\n", gai_strerror(err));
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c b/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c
deleted file mode 100644
index e2378b8906fb..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavformat_udp.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c b/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c
deleted file mode 100644
index 58dd9ae4d0d3..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavutil_mem.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h b/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h
deleted file mode 100644
index 235c39e9acc0..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavutil_x86_asm.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)