summaryrefslogtreecommitdiff
path: root/multimedia/mencoder
diff options
context:
space:
mode:
authorThomas Zander <riggs@FreeBSD.org>2015-08-23 16:41:23 +0000
committerThomas Zander <riggs@FreeBSD.org>2015-08-23 16:41:23 +0000
commit6ea8dbba59229635685e93b330f13aed484bc167 (patch)
tree713fe93e0e00e7f5e1289be6f106e97fe425c594 /multimedia/mencoder
parent- Update to 4.1.0 (diff)
- Update to recent mplayer snapshot (2015-08-22)
- Unbundle ffmpeg and use the distfile from multimedia/ffmpeg (currently on version 2.7.2) - Fix edge case assertion in av_free on 9.x/i386 upon stream close with mencoder (no change in behaviour) - Include LICENSE_FILE - Pet portlint
Notes
Notes: svn path=/head/; revision=395119
Diffstat (limited to 'multimedia/mencoder')
-rw-r--r--multimedia/mencoder/Makefile8
-rw-r--r--multimedia/mencoder/distinfo6
2 files changed, 10 insertions, 4 deletions
diff --git a/multimedia/mencoder/Makefile b/multimedia/mencoder/Makefile
index 49f953675e98..08715f2a84e1 100644
--- a/multimedia/mencoder/Makefile
+++ b/multimedia/mencoder/Makefile
@@ -3,11 +3,12 @@
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 \
@@ -79,6 +80,9 @@ 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:
.if ${OSVERSION} >= 900010
@${REINPLACE_CMD} -e \
diff --git a/multimedia/mencoder/distinfo b/multimedia/mencoder/distinfo
index 9ae471439ae1..9218cb72ebce 100644
--- a/multimedia/mencoder/distinfo
+++ b/multimedia/mencoder/distinfo
@@ -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