diff options
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 27 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-configure | 23 | ||||
| -rw-r--r-- | multimedia/ffmpeg/pkg-plist | 29 |
4 files changed, 45 insertions, 38 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 2e12fca6ef5c..b7ff992ba779 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= ffmpeg -PORTVERSION= 2.2.4 -PORTREVISION= 6 +PORTVERSION= 2.3.3 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -11,8 +10,8 @@ MASTER_SITES= http://ffmpeg.org/releases/ MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server -LICENSE= GPLv2 LGPL21 -LICENSE_COMB= multi +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \ @@ -21,6 +20,7 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ HAS_CONFIGURE= yes CONFIGURE_LOG= config.err USES= gmake pkgconfig perl5 tar:bzip2 +USE_LDCONFIG= yes USE_PERL5= build WANT_SDL= yes @@ -41,6 +41,8 @@ FFSERVER_DESC= Build and install ffserver LIBV4L_DESC= Video for Linux support X11GRAB_DESC= Enable x11 grabbing +OPTIONS_SUB= yes + # aacplus AACPLUS_LIB_DEPENDS= libaacplus.so:${PORTSDIR}/audio/libaacplus AACPLUS_CONFIGURE_ENABLE= libaacplus @@ -200,10 +202,7 @@ XVID_CONFIGURE_ENABLE= libxvid FFPROGS= ffmpeg ffprobe INSTALL_TARGET= install-progs install-data install-libs install-headers -#FFMPEG_SUFFIX= 2 -#PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}" -#USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} .include <bsd.port.options.mk> @@ -254,9 +253,10 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ --extra-libs="${PTHREAD_LIBS}" -DOC_FILES= Changelog CREDITS INSTALL LICENSE MAINTAINERS README +DOC_FILES= Changelog CREDITS INSTALL.md LICENSE.md MAINTAINERS \ + README.md RELEASE_NOTES # under doc subdirectory -DOC_DOCFILES= APIchanges RELEASE_NOTES *.txt *.html +DOC_DOCFILES= APIchanges *.txt *.html PORTDOCS= * .if ${PORT_OPTIONS:MDEBUG} @@ -294,20 +294,15 @@ CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer # ffserver .if ${PORT_OPTIONS:MFFSERVER} -PLIST_SUB+= FFSERVER="" -PLIST_FILES+= man/man1/ffserver.1.gz FFPROGS+= ffserver -. if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffserver.html -. endif -.else -PLIST_SUB+= FFSERVER="@comment " +.endif .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl -PLIST_FILES+= bin/ffplay man/man1/ffplay.1.gz FFPROGS+= ffplay .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffplay.html diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index 453fdeff5d70..b2361d38d793 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-2.2.4.tar.bz2) = ff18e584d5daca2291f598389c990a0f4ec31c74647d923e73839c336b80b73f -SIZE (ffmpeg-2.2.4.tar.bz2) = 7023865 +SHA256 (ffmpeg-2.3.3.tar.bz2) = bb4c0d10a24e08fe67292690a1b4d4ded04f5c4c388f0656c98940ab0c606446 +SIZE (ffmpeg-2.3.3.tar.bz2) = 7448421 diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure index ba1a11f38410..81c455bece4f 100644 --- a/multimedia/ffmpeg/files/patch-configure +++ b/multimedia/ffmpeg/files/patch-configure @@ -1,15 +1,20 @@ ---- configure.orig -+++ configure -@@ -2147,7 +2147,7 @@ yasmexe_default="yasm" - nogas=":" +--- configure.orig 2014-08-17 15:33:04.000000000 +0200 ++++ configure 2014-09-12 15:07:50.647439045 +0200 +@@ -2649,12 +2649,7 @@ + host_os=$target_os_default # machine --arch_default=$(uname -m) +-if test "$target_os_default" = aix; then +- arch_default=$(uname -p) +- strip_default="strip -X32_64" +-else +- arch_default=$(uname -m) +-fi +arch_default=$(uname -p) cpu="generic" - # OS -@@ -4373,7 +4373,7 @@ ifndef MAIN_MAKEFILE + # configurable options +@@ -5381,7 +5376,7 @@ SRC_PATH:=\$(SRC_PATH:.%=..%) endif CC_IDENT=$cc_ident @@ -18,7 +23,7 @@ CC=$cc CXX=$cxx AS=$as -@@ -4555,7 +4555,7 @@ exec_prefix=\${prefix} +@@ -5590,7 +5585,7 @@ libdir=$libdir includedir=$incdir @@ -27,7 +32,7 @@ Description: $comment Version: $version Requires: $(enabled shared || echo $requires) -@@ -4569,10 +4569,10 @@ EOF +@@ -5604,10 +5599,10 @@ mkdir -p doc/examples/pc-uninstalled includedir=${source_path} [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.." diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist index 05c87d11b0d1..975b198f1ba4 100644 --- a/multimedia/ffmpeg/pkg-plist +++ b/multimedia/ffmpeg/pkg-plist @@ -1,9 +1,11 @@ bin/ffmpeg +%%SDL%%bin/ffplay bin/ffprobe %%FFSERVER%%bin/ffserver %%FFSERVER%%@sample etc/ffserver.conf.sample include/libavcodec/avcodec.h include/libavcodec/avfft.h +include/libavcodec/dv_profile.h include/libavcodec/dxva2.h include/libavcodec/old_codec_ids.h include/libavcodec/vaapi.h @@ -44,6 +46,7 @@ include/libavutil/common.h include/libavutil/cpu.h include/libavutil/crc.h include/libavutil/dict.h +include/libavutil/display.h include/libavutil/downmix_info.h include/libavutil/error.h include/libavutil/eval.h @@ -51,6 +54,7 @@ include/libavutil/ffversion.h include/libavutil/fifo.h include/libavutil/file.h include/libavutil/frame.h +include/libavutil/hash.h include/libavutil/hmac.h include/libavutil/imgutils.h include/libavutil/intfloat.h @@ -71,6 +75,7 @@ include/libavutil/pixdesc.h include/libavutil/pixfmt.h include/libavutil/random_seed.h include/libavutil/rational.h +include/libavutil/replaygain.h include/libavutil/ripemd.h include/libavutil/samplefmt.h include/libavutil/sha.h @@ -79,6 +84,7 @@ include/libavutil/stereo3d.h include/libavutil/time.h include/libavutil/timecode.h include/libavutil/timestamp.h +include/libavutil/threadmessage.h include/libavutil/version.h include/libavutil/xtea.h include/libpostproc/postprocess.h @@ -90,27 +96,27 @@ include/libswscale/version.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.55 -lib/libavcodec.so.55.52.102 +lib/libavcodec.so.55.69.100 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.55 -lib/libavdevice.so.55.10.100 +lib/libavdevice.so.55.13.102 lib/libavfilter.a lib/libavfilter.so lib/libavfilter.so.4 -lib/libavfilter.so.4.2.100 +lib/libavfilter.so.4.11.100 lib/libavformat.a lib/libavformat.so lib/libavformat.so.55 -lib/libavformat.so.55.33.100 +lib/libavformat.so.55.48.100 lib/libavresample.a lib/libavresample.so lib/libavresample.so.1 -lib/libavresample.so.1.2.0 +lib/libavresample.so.1.3.0 lib/libavutil.a lib/libavutil.so lib/libavutil.so.52 -lib/libavutil.so.52.66.100 +lib/libavutil.so.52.92.100 lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.52 @@ -118,11 +124,11 @@ lib/libpostproc.so.52.3.100 lib/libswresample.a lib/libswresample.so lib/libswresample.so.0 -lib/libswresample.so.0.18.100 +lib/libswresample.so.0.19.100 lib/libswscale.a lib/libswscale.so lib/libswscale.so.2 -lib/libswscale.so.2.5.102 +lib/libswscale.so.2.6.100 libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavdevice.pc libdata/pkgconfig/libavfilter.pc @@ -133,11 +139,13 @@ libdata/pkgconfig/libpostproc.pc libdata/pkgconfig/libswresample.pc libdata/pkgconfig/libswscale.pc man/man1/ffmpeg.1.gz +%%SDL%%man/man1/ffplay.1.gz man/man1/ffprobe.1.gz +%%FFSERVER%%man/man1/ffserver.1.gz %%DATADIR%%/examples/Makefile %%DATADIR%%/examples/README -%%DATADIR%%/examples/avcodec.c %%DATADIR%%/examples/avio_reading.c +%%DATADIR%%/examples/decoding_encoding.c %%DATADIR%%/examples/demuxing_decoding.c %%DATADIR%%/examples/filter_audio.c %%DATADIR%%/examples/filtering_audio.c @@ -148,14 +156,13 @@ man/man1/ffprobe.1.gz %%DATADIR%%/examples/resampling_audio.c %%DATADIR%%/examples/scaling_video.c %%DATADIR%%/examples/transcode_aac.c +%%DATADIR%%/examples/transcoding.c %%DATADIR%%/ffprobe.xsd %%DATADIR%%/libvpx-1080p.ffpreset %%DATADIR%%/libvpx-1080p50_60.ffpreset %%DATADIR%%/libvpx-360p.ffpreset %%DATADIR%%/libvpx-720p.ffpreset %%DATADIR%%/libvpx-720p50_60.ffpreset -%%DATADIR%%/libx264-ipod320.ffpreset -%%DATADIR%%/libx264-ipod640.ffpreset @dirrm %%DATADIR%%/examples @dirrm %%DATADIR%% @dirrm include/libswscale |