diff options
Diffstat (limited to 'multimedia/ffmpeg-devel')
| -rw-r--r-- | multimedia/ffmpeg-devel/Makefile | 40 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/distinfo | 4 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/files/patch-configure | 20 | ||||
| -rw-r--r-- | multimedia/ffmpeg-devel/pkg-plist | 24 |
4 files changed, 54 insertions, 34 deletions
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile index 58a353057f0a..6e1997687616 100644 --- a/multimedia/ffmpeg-devel/Makefile +++ b/multimedia/ffmpeg-devel/Makefile @@ -6,7 +6,7 @@ # PORTNAME= ffmpeg -DISTVERSION= 2011-02-07 +DISTVERSION= 2011-03-21 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mm @@ -22,7 +22,10 @@ CONFLICTS= ffmpeg-0.* LATEST_LINK= ffmpeg-devel -GIT_SNAPSHOT= 5bea615dc383cf3617c5057db4fbc6832fc64137 +LICENSE= GPLv2 LGPL21 +LICENSE_COMB= multi + +GIT_SNAPSHOT= cf740790677b5101b59e33f4f40d375068c04ada GIT_SUFFIX= ${GIT_SNAPSHOT:C/^(.......).*$/\1/g} USE_XZ= yes @@ -48,9 +51,10 @@ OPTIONS= ALSA "Enable alsa input/output device" off \ SCHROEDINGER "Dirac codec via libschroedinger" on \ SDL "SDL support (build ffplay)" off \ SPEEX "Speex audio decoder" off \ - SSSE3 "SSSE3 support" on \ + SSSE3 "Use binutils from ports (SSSE3 support)" on \ THEORA "Theora encoder (implies OGG)" on \ - VDPAU "NVidia vdpau support" off \ + VAAPI "VAAPI decoder support" off \ + VDPAU "NVidia vdpau support" off \ VORBIS "Vorbis encoder via libvorbis (implies OGG)" on \ VP8 "VP8 codec via libvpx" on \ X264 "H.264 encoder" on \ @@ -101,8 +105,7 @@ CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ - --extra-libs="${PTHREAD_LIBS}" \ - --disable-debug + --extra-libs="${PTHREAD_LIBS}" SHLIB_VER= 1 PLIST_SUB= SHLIB_VER=${SHLIB_VER} USE_LDCONFIG= yes @@ -116,6 +119,12 @@ DOC_DOCFILES= APIchanges TODO avutil.txt developer.html faq.html \ snow.txt soc.txt swscale.txt tablegen.txt viterbi.txt PORTDOCS= * +.if !defined(WITH_DEBUG) +CONFIGURE_ARGS+= --disable-debug +.else +CONFIGURE_ARGS+= --disable-stripping +.endif + .if !defined(WITHOUT_CPUDETECT) CONFIGURE_ARGS+= --enable-runtime-cpudetect .endif @@ -169,17 +178,19 @@ CONFIGURE_ARGS+= --disable-indev=alsa \ # amr .if defined(WITH_AMR_NB) || defined (WITH_AMR_WB) +LICENSE= GPLv3 LGPL3 +CONFIGURE_ARGS+= --enable-version3 LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr .endif .ifdef(WITH_AMR_NB) -CONFIGURE_ARGS+= --enable-libopencore-amrnb --enable-version3 +CONFIGURE_ARGS+= --enable-libopencore-amrnb .else CONFIGURE_ARGS+= --disable-libopencore-amrnb .endif .ifdef(WITH_AMR_WB) -CONFIGURE_ARGS+= --enable-libopencore-amrwb --enable-version3 +CONFIGURE_ARGS+= --enable-libopencore-amrwb .else CONFIGURE_ARGS+= --disable-libopencore-amrwb .endif @@ -194,6 +205,7 @@ CONFIGURE_ARGS+= --disable-libdirac # faac .ifdef(WITH_FAAC) +RESTRICTED= linking to libfaac restricts redistribution LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac CONFIGURE_ARGS+= --enable-libfaac --enable-nonfree .else @@ -288,6 +300,14 @@ CONFIGURE_ARGS+= --enable-libtheora CONFIGURE_ARGS+= --disable-libtheora .endif +# vaapi +.ifndef(WITHOUT_VAAPI) +LIB_DEPENDS+= va.1:${PORTSDIR}/multimedia/libva +CONFIGURE_ARGS+= --enable-vaapi +.else +CONFIGURE_ARGS+= --disable-vaapi +.endif + # vdpau .ifndef(WITHOUT_VDPAU) LIB_DEPENDS+= vdpau.1:${PORTSDIR}/multimedia/libvdpau @@ -315,7 +335,11 @@ CONFIGURE_ARGS+= --disable-libvpx # x264 .ifdef(WITH_X264) +. if exists(${LOCALBASE}/lib/libx264.so.114) +LIB_DEPENDS+= x264.114:${PORTSDIR}/multimedia/x264-devel +. else LIB_DEPENDS+= x264.110:${PORTSDIR}/multimedia/x264 +. endif CONFIGURE_ARGS+= --enable-libx264 .else CONFIGURE_ARGS+= --disable-libx264 diff --git a/multimedia/ffmpeg-devel/distinfo b/multimedia/ffmpeg-devel/distinfo index 7e5d5f231de9..c941a0ac0e21 100644 --- a/multimedia/ffmpeg-devel/distinfo +++ b/multimedia/ffmpeg-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-5bea615.tar.xz) = a580a71761138af295b84be784dde58890a0337222fb9d0841dd77e32cc44cf0 -SIZE (ffmpeg-5bea615.tar.xz) = 3467092 +SHA256 (ffmpeg-cf74079.tar.xz) = acce17a20cc10ff485d50228a6e31c270329d7b758898f1b1a35747d97be6263 +SIZE (ffmpeg-cf74079.tar.xz) = 3664568 diff --git a/multimedia/ffmpeg-devel/files/patch-configure b/multimedia/ffmpeg-devel/files/patch-configure index ff4ce0c621cf..94858426f80c 100644 --- a/multimedia/ffmpeg-devel/files/patch-configure +++ b/multimedia/ffmpeg-devel/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2010-11-04 11:38:39.000000000 +0100 -+++ configure 2010-12-13 00:26:47.034162631 +0100 -@@ -1556,7 +1556,7 @@ +--- configure.orig 2011-03-21 19:36:45.000000000 +0100 ++++ configure 2011-03-22 08:01:47.676984034 +0100 +@@ -1629,7 +1629,7 @@ nm_opts='-g' # machine @@ -9,7 +9,7 @@ cpu="generic" # OS -@@ -1603,7 +1603,7 @@ +@@ -1675,7 +1675,7 @@ CC_O='-o $@' @@ -18,7 +18,7 @@ host_libs='-lm' target_path='$(CURDIR)' -@@ -2249,7 +2249,7 @@ +@@ -2323,7 +2323,7 @@ die "C compiler test failed." fi @@ -27,18 +27,20 @@ check_cflags -std=c99 check_cc -D_FILE_OFFSET_BITS=64 <<EOF && add_cppflags -D_FILE_OFFSET_BITS=64 #include <stdlib.h> -@@ -2824,8 +2824,8 @@ - fi - fi +@@ -2917,9 +2917,9 @@ + + texi2html -version > /dev/null 2>&1 && enable texi2html || disable texi2html +-check_header linux/fb.h -check_header linux/videodev.h -check_header linux/videodev2.h ++#check_header linux/fb.h +#check_header linux/videodev.h +#check_header linux/videodev2.h check_header sys/videoio.h check_func_headers "windows.h vfw.h" capCreateCaptureWindow "$vfwcap_indev_extralibs" -@@ -3144,7 +3144,7 @@ +@@ -3242,7 +3242,7 @@ SRC_PATH_BARE=$source_path BUILD_ROOT="$PWD" CC_IDENT=$cc_ident diff --git a/multimedia/ffmpeg-devel/pkg-plist b/multimedia/ffmpeg-devel/pkg-plist index 9e25f5b20bdd..8e58651d47ea 100644 --- a/multimedia/ffmpeg-devel/pkg-plist +++ b/multimedia/ffmpeg-devel/pkg-plist @@ -37,11 +37,6 @@ include/libavcodec/opt.h include/libavcodec/vaapi.h include/libavcodec/vdpau.h include/libavcodec/xvmc.h -include/libavcore/audioconvert.h -include/libavcore/avcore.h -include/libavcore/imgutils.h -include/libavcore/parseutils.h -include/libavcore/samplefmt.h include/libavdevice/avdevice.h include/libavfilter/avfilter.h include/libavfilter/avfiltergraph.h @@ -50,6 +45,7 @@ include/libavformat/avio.h include/libavformat/version.h include/libavutil/adler32.h include/libavutil/attributes.h +include/libavutil/audioconvert.h include/libavutil/avassert.h include/libavutil/avconfig.h include/libavutil/avstring.h @@ -64,6 +60,7 @@ include/libavutil/eval.h include/libavutil/fifo.h include/libavutil/file.h include/libavutil/intfloat_readwrite.h +include/libavutil/imgutils.h include/libavutil/intreadwrite.h include/libavutil/lfg.h include/libavutil/log.h @@ -72,10 +69,12 @@ include/libavutil/mathematics.h include/libavutil/md5.h include/libavutil/mem.h include/libavutil/opt.h +include/libavutil/parseutils.h include/libavutil/pixdesc.h include/libavutil/pixfmt.h include/libavutil/random_seed.h include/libavutil/rational.h +include/libavutil/samplefmt.h include/libavutil/sha1.h include/libpostproc/postprocess.h include/postproc/postprocess.h @@ -83,27 +82,23 @@ include/libswscale/swscale.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.1 -lib/libavcodec.so.52.110.0 -lib/libavcore.a -lib/libavcore.so -lib/libavcore.so.0.16.1 -lib/libavcore.so.1 +lib/libavcodec.so.52.114.0 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.1 -lib/libavdevice.so.52.2.3 +lib/libavdevice.so.52.3.0 lib/libavfilter.a lib/libavfilter.so -lib/libavfilter.so.1.74.0 +lib/libavfilter.so.1.76.0 lib/libavfilter.so.1 lib/libavformat.a lib/libavformat.so lib/libavformat.so.1 -lib/libavformat.so.52.97.0 +lib/libavformat.so.52.103.0 lib/libavutil.a lib/libavutil.so lib/libavutil.so.1 -lib/libavutil.so.50.37.0 +lib/libavutil.so.50.40.0 lib/libpostproc.a lib/libpostproc.so lib/libpostproc.so.1 @@ -113,7 +108,6 @@ lib/libswscale.so lib/libswscale.so.0.12.0 lib/libswscale.so.1 libdata/pkgconfig/libavcodec.pc -libdata/pkgconfig/libavcore.pc libdata/pkgconfig/libavdevice.pc libdata/pkgconfig/libavfilter.pc libdata/pkgconfig/libavformat.pc |