diff options
Diffstat (limited to 'multimedia/ffmpeg')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 69 | ||||
| -rw-r--r-- | multimedia/ffmpeg/distinfo | 6 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavcodec-libgsm.c | 11 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavformat-sierravmd.c | 12 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-libavutil-common.h | 13 | ||||
| -rw-r--r-- | multimedia/ffmpeg/pkg-plist | 50 |
6 files changed, 83 insertions, 78 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 684f032bad7a..2e033f195268 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -6,8 +6,7 @@ # $Id: Makefile 77 2008-07-27 21:50:37Z buhnux $ PORTNAME= ffmpeg -PORTVERSION= 0.5.2 -PORTREVISION= 3 +PORTVERSION= 0.6 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://ffmpeg.org/releases/ @@ -26,14 +25,13 @@ USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_SDL= yes -OPTIONS= AMR_NB "AMR Narrow Band encoder" off \ - AMR_WB "AMR Wide Band encoder" off \ +OPTIONS= AMR_NB "AMR Narrow Band encoder (opencore)" off \ + AMR_WB "AMR Wide Band encoder (opencore)" off \ DIRAC "Dirac codec via libdirac" off \ FAAC "FAAC mp4/aac audio encoder" off \ FAAD "FAAD mp4/aac audio decoder" on \ FFSERVER "Build and install ffserver" on \ GSM "GSM audio codec" off \ - IPV6 "IPV6 network support" on \ LAME "LAME MP3 encoder" off \ OPENJPEG "JPEG 2000 decoder" off \ OPTIMIZED_CFLAGS "Additional optimizations" off \ @@ -42,9 +40,7 @@ OPTIONS= AMR_NB "AMR Narrow Band encoder" off \ SPEEX "Speex audio decoder" off \ SSSE3 "Enable ssse3 support" on \ THEORA "Theora encoder (implies OGG)" on \ - VHOOK "Video hook support" off \ VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \ - X11GRAB "enable X11 grabbing" off \ X264 "H.264 encoder" on \ XVID "Xvid encoder via xvidcore" on @@ -81,11 +77,11 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --enable-shared \ --enable-gpl \ - --enable-swscale \ --enable-postproc \ --enable-avfilter \ --enable-avfilter-lavf \ --enable-pthreads \ + --enable-x11grab \ --enable-memalign-hack \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ @@ -96,9 +92,8 @@ SHLIB_VER= 1 PLIST_SUB= SHLIB_VER=${SHLIB_VER} USE_LDCONFIG= yes -DOC_FILES= Changelog COPYING.GPLv2 COPYING.GPLv3 \ - COPYING.LGPLv2.1 COPYING.LGPLv3 \ - CREDITS INSTALL MAINTAINERS README RELEASE +DOC_FILES= Changelog COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv2.1 \ + COPYING.LGPLv3 CREDITS INSTALL MAINTAINERS README # under doc subdirectory DOC_DOCFILES= APIchanges avutil.txt faq.html ffmpeg-doc.html \ ffmpeg_powerpc_performance_evaluation_howto.txt \ @@ -108,9 +103,9 @@ DOC_DOCFILES= APIchanges avutil.txt faq.html ffmpeg-doc.html \ PORTDOCS= * .if !defined(WITHOUT_SSSE3) -BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils -CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin -MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils +CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin +MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .ifndef(WITHOUT_FFSERVER) @@ -138,7 +133,7 @@ FFMPEG_CFLAGS+= -msse # PORTDOCS .ifndef(NOPORTDOCS) BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html -MAN1+= ffmpeg.1 +MAN1+= ffmpeg.1 ffprobe.1 . ifndef(WITHOUT_FFSERVER) MAN1+= ffserver.1 . endif @@ -150,18 +145,20 @@ CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif # amr +.if defined(WITH_AMR_NB) || defined (WITH_AMR_WB) +LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr +.endif + .ifdef(WITH_AMR_NB) -LIB_DEPENDS+= amrnb.3:${PORTSDIR}/audio/libamrnb -CONFIGURE_ARGS+= --enable-libamr-nb --enable-nonfree +CONFIGURE_ARGS+= --enable-libopencore-amrnb --enable-version3 .else -CONFIGURE_ARGS+= --disable-libamr-nb +CONFIGURE_ARGS+= --disable-libopencore-amrnb .endif .ifdef(WITH_AMR_WB) -LIB_DEPENDS+= amrwb.3:${PORTSDIR}/audio/libamrwb -CONFIGURE_ARGS+= --enable-libamr-wb --enable-nonfree +CONFIGURE_ARGS+= --enable-libopencore-amrwb --enable-version3 .else -CONFIGURE_ARGS+= --disable-libamr-wb +CONFIGURE_ARGS+= --disable-libopencore-amrwb .endif # dirac @@ -205,23 +202,6 @@ CONFIGURE_ARGS+= --enable-libgsm CONFIGURE_ARGS+= --disable-libgsm .endif -# vhook -.if defined(WITH_VHOOK) -USE_EFL= imlib2 -LIB_DEPENDS+= freetype.9:${PORTSDIR}/print/freetype2 -PLIST_SUB+= VHOOK="" -.else -CONFIGURE_ARGS+= --disable-vhook -PLIST_SUB+= VHOOK="@comment " -.endif - -# ipv6 -.ifndef(WITHOUT_IPV6) -CONFIGURE_ARGS+= --enable-ipv6 -.else -CONFIGURE_ARGS+= --disable-ipv6 -.endif - # mp3 .ifdef(WITH_LAME) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame @@ -282,15 +262,6 @@ FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis CONFIGURE_ARGS+= --disable-libvorbis .endif -# x11grab -.if defined(WITH_X11GRAB) && !defined(WITHOUT_X11) -USE_XORG= x11 xext -CONFIGURE_ARGS+= --enable-x11grab -.else -CONFIGURE_ARGS+= --disable-x11grab -.endif - - # x264 .ifndef(WITHOUT_X264) LIB_DEPENDS+= x264.98:${PORTSDIR}/multimedia/x264 @@ -323,10 +294,12 @@ post-patch: @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|g; \ - s|-pthread|${PTHREAD_LIBS}|g" \ + s|-pthread|${PTHREAD_LIBS}|g; \ + s|gsm/gsm.h|gsm.h|g" \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|-ldl||; s|$$(LIBMAJOR)|${SHLIB_VER}|g;' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} + @cd ${WRKSRC}/libavcodec && ${LN} -s x86 i386 && ${LN} -s x86 amd64 .ifdef(WITH_SDL) @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ diff --git a/multimedia/ffmpeg/distinfo b/multimedia/ffmpeg/distinfo index d6dc176244c6..335f1e572c7f 100644 --- a/multimedia/ffmpeg/distinfo +++ b/multimedia/ffmpeg/distinfo @@ -1,3 +1,3 @@ -MD5 (ffmpeg-0.5.2.tar.bz2) = 451eb428ca97a72c00555d50944cdb24 -SHA256 (ffmpeg-0.5.2.tar.bz2) = 4eaf0a9cdbf97e6200b6eb821e527fcb3e9bd525de3b4537e2b3bab633ee47e5 -SIZE (ffmpeg-0.5.2.tar.bz2) = 2777698 +MD5 (ffmpeg-0.6.tar.bz2) = d6142a9a5821d6a6262a6edb903faa24 +SHA256 (ffmpeg-0.6.tar.bz2) = 6730baa6750f0cbffaf5f4c04f8ddcf1ebe6c651a6eeb12ae947a228de4c8120 +SIZE (ffmpeg-0.6.tar.bz2) = 3720372 diff --git a/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c b/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c new file mode 100644 index 000000000000..62f52c8206fe --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavcodec-libgsm.c @@ -0,0 +1,11 @@ +--- libavcodec/libgsm.c.orig 2010-07-21 10:24:16.297810379 +0200 ++++ libavcodec/libgsm.c 2010-07-21 10:24:22.915234561 +0200 +@@ -28,7 +28,7 @@ + // The idiosyncrasies of GSM-in-WAV are explained at http://kbs.cs.tu-berlin.de/~jutta/toast.html + + #include "avcodec.h" +-#include <gsm/gsm.h> ++#include <gsm.h> + + // gsm.h misses some essential constants + #define GSM_BLOCK_SIZE 33 diff --git a/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c b/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c deleted file mode 100644 index 5c5e61694f70..000000000000 --- a/multimedia/ffmpeg/files/patch-libavformat-sierravmd.c +++ /dev/null @@ -1,12 +0,0 @@ ---- libavformat/sierravmd.c -+++ libavformat/sierravmd.c -@@ -154,7 +154,7 @@ static int vmd_read_header(AVFormatContext *s, - vmd->frame_table = NULL; - sound_buffers = AV_RL16(&vmd->vmd_header[808]); - raw_frame_table_size = vmd->frame_count * 6; -- if(vmd->frame_count * vmd->frames_per_block >= UINT_MAX / sizeof(vmd_frame)){ -+ if(vmd->frame_count * vmd->frames_per_block >= (UINT_MAX - sound_buffers) / sizeof(vmd_frame)){ - av_log(s, AV_LOG_ERROR, "vmd->frame_count * vmd->frames_per_block too large\n"); - return -1; - } - diff --git a/multimedia/ffmpeg/files/patch-libavutil-common.h b/multimedia/ffmpeg/files/patch-libavutil-common.h new file mode 100644 index 000000000000..9bb629bc0ab8 --- /dev/null +++ b/multimedia/ffmpeg/files/patch-libavutil-common.h @@ -0,0 +1,13 @@ +--- libavutil/common.h.orig 2010-04-26 23:01:38.000000000 +0200 ++++ libavutil/common.h 2010-07-10 16:06:27.038027901 +0200 +@@ -36,6 +36,10 @@ + #include <string.h> + #include "attributes.h" + ++#ifndef UINT64_C ++#define UINT64_C(c) (c ## UL) ++#endif ++ + //rounded division & shift + #define RSHIFT(a,b) ((a) > 0 ? ((a) + ((1<<(b))>>1))>>(b) : ((a) + ((1<<(b))>>1)-1)>>(b)) + /* assume b>0 */ diff --git a/multimedia/ffmpeg/pkg-plist b/multimedia/ffmpeg/pkg-plist index f75c19235463..0f7eb3b0cddd 100644 --- a/multimedia/ffmpeg/pkg-plist +++ b/multimedia/ffmpeg/pkg-plist @@ -1,4 +1,5 @@ bin/ffmpeg +bin/ffprobe %%FFSERVER%%bin/ffserver %%FFSERVER%%@unexec if cmp -s %D/etc/ffserver.conf %D/etc/ffserver.conf-dist; then rm -f %D/etc/ffserver.conf; fi %%FFSERVER%%etc/ffserver.conf-dist @@ -30,7 +31,10 @@ include/ffmpeg/swscale.h include/ffmpeg/vdpau.h include/ffmpeg/xvmc.h include/libavcodec/avcodec.h +include/libavcodec/avfft.h +include/libavcodec/dxva2.h include/libavcodec/opt.h +include/libavcodec/vaapi.h include/libavcodec/vdpau.h include/libavcodec/xvmc.h include/libavdevice/avdevice.h @@ -38,11 +42,14 @@ include/libavfilter/avfilter.h include/libavformat/avformat.h include/libavformat/avio.h include/libavutil/adler32.h +include/libavutil/attributes.h +include/libavutil/avconfig.h include/libavutil/avstring.h include/libavutil/avutil.h include/libavutil/base64.h include/libavutil/common.h include/libavutil/crc.h +include/libavutil/error.h include/libavutil/fifo.h include/libavutil/intfloat_readwrite.h include/libavutil/log.h @@ -50,8 +57,8 @@ include/libavutil/lzo.h include/libavutil/mathematics.h include/libavutil/md5.h include/libavutil/mem.h +include/libavutil/pixdesc.h include/libavutil/pixfmt.h -include/libavutil/random.h include/libavutil/rational.h include/libavutil/sha1.h include/libpostproc/postprocess.h @@ -60,37 +67,31 @@ include/libswscale/swscale.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.1 -lib/libavcodec.so.52.20.1 +lib/libavcodec.so.52.72.2 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.1 -lib/libavdevice.so.52.1.0 +lib/libavdevice.so.52.2.0 lib/libavfilter.a lib/libavfilter.so -lib/libavfilter.so.0.4.0 +lib/libavfilter.so.1.19.0 lib/libavfilter.so.1 lib/libavformat.a lib/libavformat.so lib/libavformat.so.1 -lib/libavformat.so.52.31.0 +lib/libavformat.so.52.64.2 lib/libavutil.a lib/libavutil.so lib/libavutil.so.1 -lib/libavutil.so.49.15.0 +lib/libavutil.so.50.15.1 lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.1 lib/libpostproc.so.51.2.0 lib/libswscale.a lib/libswscale.so -lib/libswscale.so.0.7.1 +lib/libswscale.so.0.11.0 lib/libswscale.so.1 -%%VHOOK%%lib/vhook/drawtext.so -%%VHOOK%%lib/vhook/fish.so -%%VHOOK%%lib/vhook/ppm.so -%%VHOOK%%lib/vhook/imlib2.so -%%VHOOK%%lib/vhook/null.so -%%VHOOK%%lib/vhook/watermark.so libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavdevice.pc libdata/pkgconfig/libavfilter.pc @@ -100,6 +101,10 @@ libdata/pkgconfig/libpostproc.pc libdata/pkgconfig/libswscale.pc %%DATADIR%%/libx264-baseline.ffpreset %%DATADIR%%/libx264-default.ffpreset +%%DATADIR%%/libx264-fast.ffpreset +%%DATADIR%%/libx264-fast_firstpass.ffpreset +%%DATADIR%%/libx264-faster.ffpreset +%%DATADIR%%/libx264-faster_firstpass.ffpreset %%DATADIR%%/libx264-fastfirstpass.ffpreset %%DATADIR%%/libx264-hq.ffpreset %%DATADIR%%/libx264-ipod320.ffpreset @@ -112,10 +117,25 @@ libdata/pkgconfig/libswscale.pc %%DATADIR%%/libx264-lossless_ultrafast.ffpreset %%DATADIR%%/libx264-main.ffpreset %%DATADIR%%/libx264-max.ffpreset +%%DATADIR%%/libx264-medium.ffpreset +%%DATADIR%%/libx264-medium_firstpass.ffpreset %%DATADIR%%/libx264-normal.ffpreset +%%DATADIR%%/libx264-placebo.ffpreset +%%DATADIR%%/libx264-placebo_firstpass.ffpreset +%%DATADIR%%/libx264-slow.ffpreset +%%DATADIR%%/libx264-slow_firstpass.ffpreset +%%DATADIR%%/libx264-slower.ffpreset +%%DATADIR%%/libx264-slower_firstpass.ffpreset %%DATADIR%%/libx264-slowfirstpass.ffpreset -@dirrm %%DATADIR%% -%%VHOOK%%@dirrm lib/vhook +%%DATADIR%%/libx264-superfast.ffpreset +%%DATADIR%%/libx264-superfast_firstpass.ffpreset +%%DATADIR%%/libx264-ultrafast.ffpreset +%%DATADIR%%/libx264-ultrafast_firstpass.ffpreset +%%DATADIR%%/libx264-veryfast.ffpreset +%%DATADIR%%/libx264-veryfast_firstpass.ffpreset +%%DATADIR%%/libx264-veryslow.ffpreset +%%DATADIR%%/libx264-veryslow_firstpass.ffpreset +@dirrm %%DATADIR%%/ @dirrm include/postproc @dirrm include/libswscale @dirrm include/libpostproc |