Update to upstream version 1.3.0 from 2016-02-16

- Use released version instead of svn snapshot for this distfile
- Update MASTER_SITES to fetch from mplayer.hq instead of LOCAL for
  this distfile
- Use bundled ffmpeg-3.0

7 files changed, 14 insertions, 41 deletions

diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index f9a7d11fb3d5..60a11ac80c00 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	mencoder
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
@@ -89,9 +88,6 @@ pre-everything::
 	@${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:
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 2c0365d11183..a9d8c005c16b 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -1,4 +1,2 @@
-SHA256 (ffmpeg-2.8.6.tar.bz2) = 40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62
-SIZE (ffmpeg-2.8.6.tar.bz2) = 8582420
-SHA256 (mplayer-1.2.20151219.tar.xz) = f11d1100a1c37ec9e3e19c7698baf77871ae305ae431ec4a3dc187ca9316e4a2
-SIZE (mplayer-1.2.20151219.tar.xz) = 5167716
+SHA256 (MPlayer-1.3.0.tar.xz) = 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843
+SIZE (MPlayer-1.3.0.tar.xz) = 13278984
diff --git a/multimedia/mplayer/Makefile b/multimedia/mplayer/Makefile
index e0a2b383de81..5337eadfc21c 100644
--- a/multimedia/mplayer/Makefile
+++ b/multimedia/mplayer/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	mplayer
 PORTVERSION=	${MPLAYER_PORT_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia audio
 
 MAINTAINER=	riggs@FreeBSD.org
@@ -132,9 +131,6 @@ pre-everything::
 	@${ECHO_MSG} "http://www.mplayerhq.hu/"
 .endif
 
-pre-patch:
-	${MV} ${WRKDIR}/ffmpeg-${FFMPEG_VERSION} ${WRKSRC}/ffmpeg
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|; \
diff --git a/multimedia/mplayer/Makefile.common b/multimedia/mplayer/Makefile.common
index 0c155d88841e..43d77945076a 100644
--- a/multimedia/mplayer/Makefile.common
+++ b/multimedia/mplayer/Makefile.common
@@ -4,15 +4,10 @@
 #
 # $FreeBSD$
 
-MPLAYER_SNAPSHOT_DATE=	2015-12-19
-MPLAYER_PORT_VERSION=	1.2.r${MPLAYER_SNAPSHOT_DATE:S/-//g}
-FFMPEG_VERSION=	2.8.6
-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}
+MPLAYER_PORT_VERSION=	1.3.0
+MASTER_SITES=	http://www.mplayerhq.hu/MPlayer/releases/ \
+		ftp://ftp.mplayerhq.hu/MPlayer/releases/
+DISTNAME=	MPlayer-${MPLAYER_PORT_VERSION}
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
@@ -21,7 +16,7 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
 		libdvdnav.so:${PORTSDIR}/multimedia/libdvdnav
 
-USES=		compiler:c11 gmake iconv ncurses tar:bzip2 tar:xz
+USES=		compiler:c11 gmake iconv ncurses tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	TMPDIR="${WRKSRC}"
 CONFIGURE_ARGS=	--cc="${CC}" \
diff --git a/multimedia/mplayer/distinfo b/multimedia/mplayer/distinfo
index 2c0365d11183..a9d8c005c16b 100644
--- a/multimedia/mplayer/distinfo
+++ b/multimedia/mplayer/distinfo
@@ -1,4 +1,2 @@
-SHA256 (ffmpeg-2.8.6.tar.bz2) = 40611e329bc354592c6f8f1deb033c31b91f80e91f5707ca4f9afceca78d8e62
-SIZE (ffmpeg-2.8.6.tar.bz2) = 8582420
-SHA256 (mplayer-1.2.20151219.tar.xz) = f11d1100a1c37ec9e3e19c7698baf77871ae305ae431ec4a3dc187ca9316e4a2
-SIZE (mplayer-1.2.20151219.tar.xz) = 5167716
+SHA256 (MPlayer-1.3.0.tar.xz) = 3ad0846c92d89ab2e4e6fb83bf991ea677e7aa2ea775845814cbceb608b09843
+SIZE (MPlayer-1.3.0.tar.xz) = 13278984
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
index 9103a5db9e33..838d380df25b 100644
--- a/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
+++ b/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
@@ -1,9 +1,9 @@
---- ffmpeg/libavcodec/Makefile.orig	2015-06-19 20:44:36 UTC
+--- ffmpeg/libavcodec/Makefile.orig	2016-02-16 20:31:33 UTC
 +++ ffmpeg/libavcodec/Makefile
-@@ -877,7 +877,7 @@ SKIPHEADERS                            +
-                                           old_codec_ids.h               \
-                                           tableprint.h                  \
-                                           tableprint_vlc.h              \
+@@ -935,7 +935,7 @@ SKIPHEADERS                            +
+                                           aaccoder_trellis.h            \
+                                           aacenc_quantization.h         \
+                                           aacenc_quantization_misc.h    \
 -                                          $(ARCH)/vp56_arith.h          \
 +                                          $(MPLAYER_ARCH)/vp56_arith.h          \
  
diff --git a/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile b/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile
deleted file mode 100644
index 304850bd3cce..000000000000
--- a/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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
-