svn commit: r409677 - in head/multimedia: mencoder mplayer mplayer/files
Thomas Zander
riggs at FreeBSD.org
Sat Feb 27 17:48:13 UTC 2016
Author: riggs
Date: Sat Feb 27 17:48:11 2016
New Revision: 409677
URL: https://svnweb.freebsd.org/changeset/ports/409677
Log:
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
Deleted:
head/multimedia/mplayer/files/patch-ffmpeg_libavfilter_Makefile
Modified:
head/multimedia/mencoder/Makefile
head/multimedia/mencoder/distinfo
head/multimedia/mplayer/Makefile
head/multimedia/mplayer/Makefile.common
head/multimedia/mplayer/distinfo
head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
Modified: head/multimedia/mencoder/Makefile
==============================================================================
--- head/multimedia/mencoder/Makefile Sat Feb 27 17:41:32 2016 (r409676)
+++ head/multimedia/mencoder/Makefile Sat Feb 27 17:48:11 2016 (r409677)
@@ -3,7 +3,6 @@
PORTNAME= mencoder
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 3
CATEGORIES= multimedia audio
MAINTAINER= riggs at 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}|; \
Modified: head/multimedia/mencoder/distinfo
==============================================================================
--- head/multimedia/mencoder/distinfo Sat Feb 27 17:41:32 2016 (r409676)
+++ head/multimedia/mencoder/distinfo Sat Feb 27 17:48:11 2016 (r409677)
@@ -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
Modified: head/multimedia/mplayer/Makefile
==============================================================================
--- head/multimedia/mplayer/Makefile Sat Feb 27 17:41:32 2016 (r409676)
+++ head/multimedia/mplayer/Makefile Sat Feb 27 17:48:11 2016 (r409677)
@@ -3,7 +3,6 @@
PORTNAME= mplayer
PORTVERSION= ${MPLAYER_PORT_VERSION}
-PORTREVISION= 3
CATEGORIES= multimedia audio
MAINTAINER= riggs at 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}|; \
Modified: head/multimedia/mplayer/Makefile.common
==============================================================================
--- head/multimedia/mplayer/Makefile.common Sat Feb 27 17:41:32 2016 (r409676)
+++ head/multimedia/mplayer/Makefile.common Sat Feb 27 17:48:11 2016 (r409677)
@@ -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}/graph
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}" \
Modified: head/multimedia/mplayer/distinfo
==============================================================================
--- head/multimedia/mplayer/distinfo Sat Feb 27 17:41:32 2016 (r409676)
+++ head/multimedia/mplayer/distinfo Sat Feb 27 17:48:11 2016 (r409677)
@@ -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
Modified: head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile
==============================================================================
--- head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile Sat Feb 27 17:41:32 2016 (r409676)
+++ head/multimedia/mplayer/files/patch-ffmpeg_libavcodec_Makefile Sat Feb 27 17:48:11 2016 (r409677)
@@ -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 \
More information about the svn-ports-all
mailing list