diff options
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 46 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavcodec-Makefile | 20 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-libavfilter-Makefile | 14 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/pkg-plist | 31 |
5 files changed, 69 insertions, 46 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 4ed0ac28701a..23fc2c0bf4fe 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -6,12 +6,11 @@ # PORTNAME= ffmpeg -DISTVERSION= 2011-06-25 -PORTREVISION= 1 +DISTVERSION= 2011-10-09 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} -MASTER_SITE_SUBDIR= mm -DISTNAME= ffmpeg-${GIT_SUFFIX} +MASTER_SITE_SUBDIR= mm/ffmpeg +DISTNAME= ffmpeg-HEAD-${GIT_SUFFIX} MAINTAINER= mm@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server @@ -23,7 +22,7 @@ CONFLICTS= ffmpeg-0.* LATEST_LINK= ffmpeg-devel -GIT_SNAPSHOT= dca3542d35c8b1769f9fd32641567ffa2346327e +GIT_SNAPSHOT= 9719f25e7b5a7222ca4a1e0966bb35f363752814 GIT_SUFFIX= ${GIT_SNAPSHOT:C/^(.......).*$/\1/g} USE_XZ= yes @@ -33,7 +32,8 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_SDL= yes -OPTIONS= ALSA "Enable alsa input/output device" off \ +OPTIONS= AACPLUS "Enable aac via libaacplus" off \ + ALSA "Enable alsa input/output device" off \ AMR_NB "AMR Narrow Band audio encoder (opencore)" off \ AMR_WB "AMR Wide Band audio decoder (opencore)" off \ CELT "Enable CELT/Opus decoding via libcelt" off \ @@ -117,10 +117,7 @@ USE_LDCONFIG= yes DOC_FILES= Changelog CREDITS INSTALL LICENSE MAINTAINERS README # under doc subdirectory -DOC_DOCFILES= APIchanges TODO avutil.txt developer.html faq.html \ - ffmpeg.html ffprobe.html general.html issue_tracker.txt \ - libavfilter.html optimization.txt rate_distortion.txt \ - snow.txt soc.txt swscale.txt tablegen.txt viterbi.txt +DOC_DOCFILES= APIchanges RELEASE_NOTES *.txt *.html PORTDOCS= * .if !defined(WITH_DEBUG) @@ -154,7 +151,7 @@ FFMPEG_CFLAGS+= -msse # PORTDOCS .if !defined(NOPORTDOCS) BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html -MAN1+= ffmpeg.1 ffprobe.1 +MAN1+= avconv.1 ffmpeg.1 ffprobe.1 .endif # optimizations @@ -162,6 +159,15 @@ MAN1+= ffmpeg.1 ffprobe.1 CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif +#aacplus +.if defined(WITH_AACPLUS) +FFMPEG_NONFREE= yes +LIB_DEPENDS+= aacplus.2:${PORTSDIR}/audio/libaacplus +CONFIGURE_ARGS+= --enable-libaacplus +.else +CONFIGURE_ARGS+= --disable-libaacplus +.endif + #alsa .if defined(WITH_ALSA) LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib @@ -206,9 +212,9 @@ CONFIGURE_ARGS+= --disable-libdirac # faac .if defined(WITH_FAAC) -RESTRICTED= linking to libfaac restricts redistribution +FFMPEG_NONFREE= yes LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac -CONFIGURE_ARGS+= --enable-libfaac --enable-nonfree +CONFIGURE_ARGS+= --enable-libfaac .else CONFIGURE_ARGS+= --disable-libfaac .endif @@ -370,7 +376,7 @@ CONFIGURE_ARGS+= --disable-libvpx # x264 .if !defined(WITHOUT_X264) -LIB_DEPENDS+= x264.115:${PORTSDIR}/multimedia/x264 +LIB_DEPENDS+= x264.116:${PORTSDIR}/multimedia/x264 CONFIGURE_ARGS+= --enable-libx264 .else CONFIGURE_ARGS+= --disable-libx264 @@ -385,16 +391,24 @@ CONFIGURE_ARGS+= --disable-libxvid .endif # License knobs +.if defined(FFMPEG_NONFREE) +RESTRICTED= linking to libfaac or libaacplus restricts redistribution +CONFIGURE_ARGS+= --enable-nonfree +. if defined(FFMPEG_LICENSE_GPL3) +CONFIGURE_ARGS+= --enable-version3 +. endif +.else LICENSE_COMB= multi -.if defined(FFMPEG_LICENSE_GPL3) +. if defined(FFMPEG_LICENSE_GPL3) LICENSE= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 CONFIGURE_ARGS+= --enable-version3 -.else +. else LICENSE= GPLv2 LGPL21 LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 +. endif .endif pre-configure: diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo index 44f9b0aec3bb..88b4bdb1f9e1 100644 --- a/multimedia/ffmpeg-devel/distinfo +++ b/multimedia/ffmpeg-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-dca3542.tar.xz) = 9838629c66c27b66042c333eb6ed48292c10da0207e1ee71cec7a47ce806e520 -SIZE (ffmpeg-dca3542.tar.xz) = 3838284 +SHA256 (ffmpeg-HEAD-9719f25.tar.xz) = e7fd708af2fe8c9290b76256961c6e7791ea07fa46a294d24ab53c735cf96c8a +SIZE (ffmpeg-HEAD-9719f25.tar.xz) = 4034508 diff --git a/multimedia/ffmpeg-devel/files/patch-libavcodec-Makefile b/multimedia/ffmpeg-devel/files/patch-libavcodec-Makefile index 8a43557f17f7..2b2eed87f11b 100644 --- a/multimedia/ffmpeg-devel/files/patch-libavcodec-Makefile +++ b/multimedia/ffmpeg-devel/files/patch-libavcodec-Makefile @@ -1,11 +1,19 @@ ---- libavcodec/Makefile.orig 2010-07-21 14:37:37.000000000 +0200 -+++ libavcodec/Makefile 2010-08-01 21:19:55.324513241 +0200 -@@ -615,7 +615,7 @@ +--- libavcodec/Makefile.orig 2011-10-10 09:57:41.000000000 +0200 ++++ libavcodec/Makefile 2011-10-10 10:19:10.382958515 +0200 +@@ -686,14 +686,14 @@ # well. OBJS-$(!CONFIG_SMALL) += inverse.o ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile +--include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile ++-include $(SRC_PATH)/$(SUBDIR)$(FFMPEG_ARCH)/Makefile - SKIPHEADERS = %_tablegen.h + SKIPHEADERS += %_tablegen.h \ + %_tables.h \ + aac_tablegen_decl.h \ + fft-internal.h \ + tableprint.h \ +- $(ARCH)/vp56_arith.h ++ $(FFMPEG_ARCH)/vp56_arith.h SKIPHEADERS-$(CONFIG_DXVA2) += dxva2.h dxva2_internal.h + SKIPHEADERS-$(CONFIG_LIBDIRAC) += libdirac.h + SKIPHEADERS-$(CONFIG_LIBSCHROEDINGER) += libschroedinger.h diff --git a/multimedia/ffmpeg-devel/files/patch-libavfilter-Makefile b/multimedia/ffmpeg-devel/files/patch-libavfilter-Makefile index eee45b494489..27e0d99680dc 100644 --- a/multimedia/ffmpeg-devel/files/patch-libavfilter-Makefile +++ b/multimedia/ffmpeg-devel/files/patch-libavfilter-Makefile @@ -1,11 +1,11 @@ ---- libavfilter/Makefile.orig 2010-11-30 14:35:44.372975001 +0100 -+++ libavfilter/Makefile 2010-11-30 14:35:50.292359891 +0100 -@@ -50,7 +50,7 @@ +--- libavfilter/Makefile.orig 2011-10-10 09:57:41.000000000 +0200 ++++ libavfilter/Makefile 2011-10-10 10:20:17.318954919 +0200 +@@ -148,7 +148,7 @@ + OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o - OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o ---include $(SUBDIR)$(ARCH)/Makefile -+-include $(SUBDIR)$(FFMPEG_ARCH)/Makefile +--include $(SRC_PATH)/$(SUBDIR)$(ARCH)/Makefile ++-include $(SRC_PATH)/$(SUBDIR)$(FFMPEG_ARCH)/Makefile - DIRS = x86 + DIRS = x86 libmpcodecs diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist index 93ea26aa4c46..3db2a8af80d7 100644 --- a/multimedia/ffmpeg-devel/pkg-plist +++ b/multimedia/ffmpeg-devel/pkg-plist @@ -1,3 +1,4 @@ +bin/avconv bin/ffmpeg bin/ffprobe %%FFSERVER%%bin/ffserver @@ -41,7 +42,7 @@ include/libavdevice/avdevice.h include/libavfilter/avcodec.h include/libavfilter/avfilter.h include/libavfilter/avfiltergraph.h -include/libavfilter/vsink_buffer.h +include/libavfilter/buffersink.h include/libavfilter/vsrc_buffer.h include/libavformat/avformat.h include/libavformat/avio.h @@ -82,35 +83,40 @@ include/libavutil/rational.h include/libavutil/samplefmt.h include/libavutil/sha.h include/libpostproc/postprocess.h -include/postproc/postprocess.h +include/libswresample/swresample.h include/libswscale/swscale.h +include/postproc/postprocess.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.1 -lib/libavcodec.so.53.7.0 +lib/libavcodec.so.53.19.1 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.1 -lib/libavdevice.so.53.1.1 +lib/libavdevice.so.53.4.0 lib/libavfilter.a lib/libavfilter.so -lib/libavfilter.so.2.23.0 lib/libavfilter.so.1 +lib/libavfilter.so.2.43.6 lib/libavformat.a lib/libavformat.so lib/libavformat.so.1 -lib/libavformat.so.53.4.0 +lib/libavformat.so.53.14.0 lib/libavutil.a lib/libavutil.so lib/libavutil.so.1 -lib/libavutil.so.51.10.0 +lib/libavutil.so.51.20.1 lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.1 lib/libpostproc.so.51.2.0 +lib/libswresample.a +lib/libswresample.so +lib/libswresample.so.0.0.0 +lib/libswresample.so.1 lib/libswscale.a lib/libswscale.so -lib/libswscale.so.2.0.0 +lib/libswscale.so.2.1.0 lib/libswscale.so.1 libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavdevice.pc @@ -118,24 +124,19 @@ libdata/pkgconfig/libavfilter.pc libdata/pkgconfig/libavformat.pc libdata/pkgconfig/libavutil.pc libdata/pkgconfig/libpostproc.pc +libdata/pkgconfig/libswresample.pc libdata/pkgconfig/libswscale.pc %%DATADIR%%/libvpx-1080p.ffpreset %%DATADIR%%/libvpx-1080p50_60.ffpreset %%DATADIR%%/libvpx-360p.ffpreset %%DATADIR%%/libvpx-720p.ffpreset %%DATADIR%%/libvpx-720p50_60.ffpreset -%%DATADIR%%/libx264-baseline.ffpreset %%DATADIR%%/libx264-ipod320.ffpreset %%DATADIR%%/libx264-ipod640.ffpreset -%%DATADIR%%/libx264-lossless_fast.ffpreset -%%DATADIR%%/libx264-lossless_max.ffpreset -%%DATADIR%%/libx264-lossless_medium.ffpreset -%%DATADIR%%/libx264-lossless_slow.ffpreset -%%DATADIR%%/libx264-lossless_slower.ffpreset -%%DATADIR%%/libx264-lossless_ultrafast.ffpreset @dirrm %%DATADIR%%/ @dirrm include/postproc @dirrm include/libswscale +@dirrm include/libswresample @dirrm include/libpostproc @dirrm include/libavutil @dirrm include/libavformat |