svn commit: r302179 - in head/multimedia: . ffmpeg-011 ffmpeg-011/files
Martin Matuska
mm at FreeBSD.org
Mon Aug 6 12:52:47 UTC 2012
Author: mm
Date: Mon Aug 6 12:52:46 2012
New Revision: 302179
URL: http://svn.freebsd.org/changeset/ports/302179
Log:
FFmpeg is a complete, cross-platform solution to record, convert and stream
audio and video. It includes libavcodec - the leading audio/video codec
library.
This version is from the 0.11 release branch.
WWW: http://ffmpeg.mplayerhq.hu/
Added:
head/multimedia/ffmpeg-011/
- copied from r302166, head/multimedia/ffmpeg-devel/
head/multimedia/ffmpeg-011/files/ffserver-011.in
- copied, changed from r302166, head/multimedia/ffmpeg-devel/files/ffserver-head.in
Deleted:
head/multimedia/ffmpeg-011/files/ffserver-head.in
Modified:
head/multimedia/Makefile
head/multimedia/ffmpeg-011/Makefile
head/multimedia/ffmpeg-011/distinfo
head/multimedia/ffmpeg-011/pkg-descr
head/multimedia/ffmpeg-011/pkg-plist
Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile Mon Aug 6 12:48:34 2012 (r302178)
+++ head/multimedia/Makefile Mon Aug 6 12:52:46 2012 (r302179)
@@ -53,6 +53,7 @@
SUBDIR += emotion
SUBDIR += emovix
SUBDIR += ffmpeg
+ SUBDIR += ffmpeg-011
SUBDIR += ffmpeg-devel
SUBDIR += ffmpeg2theora
SUBDIR += ffmpegthumbnailer
Modified: head/multimedia/ffmpeg-011/Makefile
==============================================================================
--- head/multimedia/ffmpeg-devel/Makefile Mon Aug 6 11:43:42 2012 (r302166)
+++ head/multimedia/ffmpeg-011/Makefile Mon Aug 6 12:52:46 2012 (r302179)
@@ -1,16 +1,14 @@
-# New ports collection makefile for: ffmpeg-devel
-# Date created: 2009-08-12
-# Whom: Martin Matuska <mm at FreeBSD.org>
+# New ports collection makefile for: ffmpeg-011
+# Date created: 2012-08-06
+# Whom: Martin Matuska <mm at FreeBSD.org>
#
# $FreeBSD$
-#
PORTNAME= ffmpeg
-DISTVERSION= 2012-08-06
+PORTVERSION= 0.11.1
CATEGORIES= multimedia audio ipv6 net
-MASTER_SITES= http://git.videolan.org/
-PKGNAMESUFFIX= -devel
-DISTNAME= ffmpeg-${GIT_SUFFIX}
+MASTER_SITES= http://ffmpeg.org/releases/
+PKGNAMESUFFIX= -011
MAINTAINER= mm at FreeBSD.org
COMMENT= Realtime audio/video encoder/converter and streaming server
@@ -24,24 +22,18 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/ya
${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \
texi2html:${PORTSDIR}/textproc/texi2html
-CONFLICTS= ffmpeg-0.7*
-
-LATEST_LINK= ffmpeg-devel
-
-GIT_SNAPSHOT= 388243bb27f3d9b8f50d54268a784d55a7171f10
-GIT_SUFFIX= ${GIT_SNAPSHOT:C/^(.......).*$/\1/g}
-FETCH_ARGS= -pRr -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}
-FETCH_URL= "http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${GIT_SNAPSHOT};sf=tgz"
+LATEST_LINK= ffmpeg${PKGNAMESUFFIX}
HAS_CONFIGURE= yes
CONFIGURE_LOG= config.err
+USE_BZIP2= yes
USE_GMAKE= yes
MAKE_JOBS_SAFE= yes
WANT_SDL= yes
USE_PERL5_BUILD= yes
OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
- FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \
+ FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \
LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \
OPTIMIZED_CFLAGS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \
THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \
@@ -52,7 +44,6 @@ OPTIONS_DEFAULT= FFSERVER FONTCONFIG FRE
ASS_DESC= Subtitles rendering via libass
CDIO_DESC= Audio CD grabbing with libcdio
-FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK
FFSERVER_DESC= Build and install ffserver
LIBV4L_DESC= Video for Linux support
MODPLUG_DESC= Mod support via libmodplug
@@ -63,11 +54,11 @@ FFPROGS= ffmpeg ffprobe
FFLIBS= libavcodec libavdevice libavfilter libavformat \
libavutil libpostproc libswresample libswscale
INSTALL_TARGET= install-data install-libs install-headers
-FFMPEG_SUFFIX= -head
+FFMPEG_SUFFIX= -011
PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}"
MAN1= ffmpeg${FFMPEG_SUFFIX}.1 ffprobe${FFMPEG_SUFFIX}.1
-SHLIB_VER= 99
+SHLIB_VER= 11
PLIST_SUB+= SHLIB_VER=${SHLIB_VER}
USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
@@ -215,15 +206,6 @@ CONFIGURE_ARGS+= --enable-libfaac
CONFIGURE_ARGS+= --disable-libfaac
.endif
-# fdk_aac
-.if ${PORT_OPTIONS:MFDK_AAC}
-FFMPEG_NONFREE= yes
-LIB_DEPENDS+= fdk-aac:${PORTSDIR}/audio/fdk-aac
-CONFIGURE_ARGS+= --enable-libfdk-aac
-.else
-CONFIGURE_ARGS+= --disable-libfdk-aac
-.endif
-
# ffserver
.if ${PORT_OPTIONS:MFFSERVER}
PLIST_SUB+= FFSERVER=""
@@ -466,11 +448,6 @@ LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GP
LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3
.endif
-do-fetch:
- @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
- ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${FETCH_URL} ${FETCH_AFTER_ARGS}; \
- fi;
-
post-patch:
# {C,LD}FLAGS safeness
@${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
Modified: head/multimedia/ffmpeg-011/distinfo
==============================================================================
--- head/multimedia/ffmpeg-devel/distinfo Mon Aug 6 11:43:42 2012 (r302166)
+++ head/multimedia/ffmpeg-011/distinfo Mon Aug 6 12:52:46 2012 (r302179)
@@ -1,2 +1,2 @@
-SHA256 (ffmpeg-388243b.tar.gz) = ea65d0359ea0f629b25f529923f5fc344c0852390df694bfdb0af877bca92f73
-SIZE (ffmpeg-388243b.tar.gz) = 7475800
+SHA256 (ffmpeg-0.11.1.tar.bz2) = b01ddfb6352c84810879988f43172c5f7be555697edb929625845c7bb953fa96
+SIZE (ffmpeg-0.11.1.tar.bz2) = 6073253
Copied and modified: head/multimedia/ffmpeg-011/files/ffserver-011.in (from r302166, head/multimedia/ffmpeg-devel/files/ffserver-head.in)
==============================================================================
--- head/multimedia/ffmpeg-devel/files/ffserver-head.in Mon Aug 6 11:43:42 2012 (r302166, copy source)
+++ head/multimedia/ffmpeg-011/files/ffserver-011.in Mon Aug 6 12:52:46 2012 (r302179)
@@ -3,24 +3,24 @@
# $FreeBSD$
#
-# PROVIDE: ffserver-head
+# PROVIDE: ffserver-011
# REQUIRE: NETWORKING
# KEYWORD: shutdown
#
# Add the following lines to /etc/rc.conf to enable ffserver:
#
-#ffserver_head_enable="YES"
+#ffserver_011_enable="YES"
#
-ffserver_head_enable="${ffserver_head_enable-NO}"
+ffserver_011_enable="${ffserver_011_enable-NO}"
. /etc/rc.subr
-name=ffserver_head
-rcvar=ffserver_head_enable
+name=ffserver_011
+rcvar=ffserver_011_enable
command="%%PREFIX%%/bin/${name} &"
-required_files=%%PREFIX%%/etc/ffserver-head.conf
+required_files=%%PREFIX%%/etc/ffserver-011.conf
load_rc_config ${name}
run_rc_command "$1"
Modified: head/multimedia/ffmpeg-011/pkg-descr
==============================================================================
--- head/multimedia/ffmpeg-devel/pkg-descr Mon Aug 6 11:43:42 2012 (r302166)
+++ head/multimedia/ffmpeg-011/pkg-descr Mon Aug 6 12:52:46 2012 (r302179)
@@ -2,6 +2,6 @@ FFmpeg is a complete, cross-platform sol
audio and video. It includes libavcodec - the leading audio/video codec
library.
-This is the development version from SVN snapshos.
+This version is from the 0.11 release branch.
WWW: http://ffmpeg.mplayerhq.hu/
Modified: head/multimedia/ffmpeg-011/pkg-plist
==============================================================================
--- head/multimedia/ffmpeg-devel/pkg-plist Mon Aug 6 11:43:42 2012 (r302166)
+++ head/multimedia/ffmpeg-011/pkg-plist Mon Aug 6 12:52:46 2012 (r302179)
@@ -13,7 +13,6 @@ include/ffmpeg%%SUFF%%/libavcodec/vdpau.
include/ffmpeg%%SUFF%%/libavcodec/version.h
include/ffmpeg%%SUFF%%/libavcodec/xvmc.h
include/ffmpeg%%SUFF%%/libavdevice/avdevice.h
-include/ffmpeg%%SUFF%%/libavdevice/version.h
include/ffmpeg%%SUFF%%/libavfilter/asrc_abuffer.h
include/ffmpeg%%SUFF%%/libavfilter/avcodec.h
include/ffmpeg%%SUFF%%/libavfilter/avfilter.h
@@ -21,6 +20,7 @@ include/ffmpeg%%SUFF%%/libavfilter/avfil
include/ffmpeg%%SUFF%%/libavfilter/buffersink.h
include/ffmpeg%%SUFF%%/libavfilter/buffersrc.h
include/ffmpeg%%SUFF%%/libavfilter/version.h
+include/ffmpeg%%SUFF%%/libavfilter/vsrc_buffer.h
include/ffmpeg%%SUFF%%/libavformat/avformat.h
include/ffmpeg%%SUFF%%/libavformat/avio.h
include/ffmpeg%%SUFF%%/libavformat/version.h
@@ -34,7 +34,6 @@ include/ffmpeg%%SUFF%%/libavutil/avconfi
include/ffmpeg%%SUFF%%/libavutil/avstring.h
include/ffmpeg%%SUFF%%/libavutil/avutil.h
include/ffmpeg%%SUFF%%/libavutil/base64.h
-include/ffmpeg%%SUFF%%/libavutil/blowfish.h
include/ffmpeg%%SUFF%%/libavutil/bprint.h
include/ffmpeg%%SUFF%%/libavutil/bswap.h
include/ffmpeg%%SUFF%%/libavutil/common.h
@@ -63,35 +62,31 @@ include/ffmpeg%%SUFF%%/libavutil/random_
include/ffmpeg%%SUFF%%/libavutil/rational.h
include/ffmpeg%%SUFF%%/libavutil/samplefmt.h
include/ffmpeg%%SUFF%%/libavutil/sha.h
-include/ffmpeg%%SUFF%%/libavutil/time.h
include/ffmpeg%%SUFF%%/libavutil/timecode.h
include/ffmpeg%%SUFF%%/libavutil/timestamp.h
-include/ffmpeg%%SUFF%%/libavutil/version.h
-include/ffmpeg%%SUFF%%/libavutil/xtea.h
include/ffmpeg%%SUFF%%/libpostproc/postprocess.h
include/ffmpeg%%SUFF%%/libswresample/swresample.h
include/ffmpeg%%SUFF%%/libswscale/swscale.h
-include/ffmpeg%%SUFF%%/libswscale/version.h
lib/ffmpeg%%SUFF%%/libavcodec.a
lib/ffmpeg%%SUFF%%/libavcodec.so
lib/ffmpeg%%SUFF%%/libavcodec.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavcodec.so.54.49.100
+lib/ffmpeg%%SUFF%%/libavcodec.so.54.23.100
lib/ffmpeg%%SUFF%%/libavdevice.a
lib/ffmpeg%%SUFF%%/libavdevice.so
lib/ffmpeg%%SUFF%%/libavdevice.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavdevice.so.54.2.100
+lib/ffmpeg%%SUFF%%/libavdevice.so.54.0.100
lib/ffmpeg%%SUFF%%/libavfilter.a
lib/ffmpeg%%SUFF%%/libavfilter.so
lib/ffmpeg%%SUFF%%/libavfilter.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavfilter.so.3.5.102
+lib/ffmpeg%%SUFF%%/libavfilter.so.2.77.100
lib/ffmpeg%%SUFF%%/libavformat.a
lib/ffmpeg%%SUFF%%/libavformat.so
lib/ffmpeg%%SUFF%%/libavformat.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavformat.so.54.22.101
+lib/ffmpeg%%SUFF%%/libavformat.so.54.6.100
lib/ffmpeg%%SUFF%%/libavutil.a
lib/ffmpeg%%SUFF%%/libavutil.so
lib/ffmpeg%%SUFF%%/libavutil.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libavutil.so.51.66.101
+lib/ffmpeg%%SUFF%%/libavutil.so.51.54.100
lib/ffmpeg%%SUFF%%/libpostproc.a
lib/ffmpeg%%SUFF%%/libpostproc.so
lib/ffmpeg%%SUFF%%/libpostproc.so.%%SHLIB_VER%%
@@ -103,7 +98,7 @@ lib/ffmpeg%%SUFF%%/libswresample.so.0.15
lib/ffmpeg%%SUFF%%/libswscale.a
lib/ffmpeg%%SUFF%%/libswscale.so
lib/ffmpeg%%SUFF%%/libswscale.so.%%SHLIB_VER%%
-lib/ffmpeg%%SUFF%%/libswscale.so.2.1.101
+lib/ffmpeg%%SUFF%%/libswscale.so.2.1.100
libdata/pkgconfig/libavcodec%%SUFF%%.pc
libdata/pkgconfig/libavdevice%%SUFF%%.pc
libdata/pkgconfig/libavfilter%%SUFF%%.pc
More information about the svn-ports-all
mailing list