Index: head/multimedia/ffmpeg-devel/Makefile =================================================================== --- head/multimedia/ffmpeg-devel/Makefile (revision 271454) +++ head/multimedia/ffmpeg-devel/Makefile (revision 271455) @@ -1,415 +1,418 @@ # New ports collection makefile for: ffmpeg-devel # Date created: 2009-08-12 # Whom: Martin Matuska # # $FreeBSD$ # PORTNAME= ffmpeg DISTVERSION= 2011-03-21 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= mm DISTNAME= ffmpeg-${GIT_SUFFIX} MAINTAINER= mm@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm CONFLICTS= ffmpeg-0.* LATEST_LINK= ffmpeg-devel LICENSE= GPLv2 LGPL21 +LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 +LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 LICENSE_COMB= multi GIT_SNAPSHOT= cf740790677b5101b59e33f4f40d375068c04ada GIT_SUFFIX= ${GIT_SNAPSHOT:C/^(.......).*$/\1/g} USE_XZ= yes HAS_CONFIGURE= yes CONFIGURE_LOG= config.err USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_SDL= yes OPTIONS= ALSA "Enable alsa input/output device" off \ AMR_NB "AMR Narrow Band encoder (opencore)" on \ AMR_WB "AMR Wide Band decoder (opencore)" on \ CPUDETECT "Enable runtime CPU detection" on \ DIRAC "Dirac codec via libdirac" off \ FAAC "FAAC mp4/aac audio encoder" off \ FFSERVER "Build and install ffserver" on \ FREI0R "Frei0r wrapper filter" off \ GSM "GSM audio codec" off \ LAME "LAME MP3 encoder" off \ OPENCV "OpenCV video filtering support" off \ OPENJPEG "JPEG 2000 decoder" off \ OPTIMIZED_CFLAGS "Additional optimizations" off \ SCHROEDINGER "Dirac codec via libschroedinger" on \ SDL "SDL support (build ffplay)" off \ SPEEX "Speex audio decoder" off \ SSSE3 "Use binutils from ports (SSSE3 support)" on \ THEORA "Theora encoder (implies OGG)" on \ 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 \ XVID "Xvid encoder via xvidcore" on COMPAT_HEADERS=libavcodec/avcodec.h \ libavcodec/opt.h \ libavcodec/vdpau.h \ libavcodec/xvmc.h \ libavdevice/avdevice.h \ libavfilter/avfilter.h \ libavformat/avformat.h \ libavformat/avio.h \ libavutil/adler32.h \ libavutil/avstring.h \ libavutil/avutil.h \ libavutil/base64.h \ libavutil/common.h \ libavutil/crc.h \ libavutil/fifo.h \ libavutil/intfloat_readwrite.h \ libavutil/log.h \ libavutil/lzo.h \ libavutil/mathematics.h \ libavutil/md5.h \ libavutil/mem.h \ libavutil/pixfmt.h \ libavutil/rational.h \ libavutil/sha1.h \ libpostproc/postprocess.h \ libswscale/swscale.h .include .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-pthreads \ --enable-x11grab \ --enable-memalign-hack \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ --extra-libs="${PTHREAD_LIBS}" 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 LICENSE MAINTAINERS README +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 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 .if !defined(WITHOUT_SSSE3) BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin .endif .ifndef(WITHOUT_FFSERVER) USE_RC_SUBR= ffserver .endif # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") WITH_BUILTIN_VECTOR= yes .else CONFIGURE_ARGS+= --disable-sse .endif # mmx support .if defined(MACHINE_CPU) && ${MACHINE_CPU:Mmmx} == "" && ${MACHINE_CPU:Mamd64} == "" CONFIGURE_ARGS+= --disable-mmx WITHOUT_BUILTIN_VECTOR= yes .endif # builtin vector, requires mmx and sse .if !defined(WITHOUT_BUILTIN_VECTOR) && defined(WITH_BUILTIN_VECTOR) FFMPEG_CFLAGS+= -msse .endif # PORTDOCS .ifndef(NOPORTDOCS) BUILD_DEPENDS+= texi2html:${PORTSDIR}/textproc/texi2html MAN1+= ffmpeg.1 ffprobe.1 .endif # optimizations .ifdef(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif #alsa .if defined(WITH_ALSA) LIB_DEPENDS+= asound.2:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+= --disable-indev=alsa \ --disable-outdev=alsa .endif # amr -.if defined(WITH_AMR_NB) || defined (WITH_AMR_WB) +.if defined(WITH_AMR_NB) || defined(WITH_AMR_WB) LICENSE= GPLv3 LGPL3 +LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 +LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 CONFIGURE_ARGS+= --enable-version3 LIB_DEPENDS+= opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr .endif .ifdef(WITH_AMR_NB) CONFIGURE_ARGS+= --enable-libopencore-amrnb .else CONFIGURE_ARGS+= --disable-libopencore-amrnb .endif .ifdef(WITH_AMR_WB) CONFIGURE_ARGS+= --enable-libopencore-amrwb .else CONFIGURE_ARGS+= --disable-libopencore-amrwb .endif # dirac .ifdef(WITH_DIRAC) LIB_DEPENDS+= dirac_encoder.1:${PORTSDIR}/multimedia/dirac CONFIGURE_ARGS+= --enable-libdirac .else CONFIGURE_ARGS+= --disable-libdirac .endif # faac .ifdef(WITH_FAAC) RESTRICTED= linking to libfaac restricts redistribution LIB_DEPENDS+= faac.0:${PORTSDIR}/audio/faac CONFIGURE_ARGS+= --enable-libfaac --enable-nonfree .else CONFIGURE_ARGS+= --disable-libfaac .endif # ffserver .ifndef(WITHOUT_FFSERVER) PLIST_SUB+= FFSERVER="" . ifndef(NOPORTDOCS) MAN1+= ffserver.1 DOC_DOCFILES+= ffserver.html . endif .else PLIST_SUB+= FFSERVER="@comment " CONFIGURE_ARGS+= --disable-ffserver .endif # frei0r .ifdef(WITH_FREI0R) BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r CONFIGURE_ARGS+= --enable-frei0r .else CONFIGURE_ARGS+= --disable-frei0r .endif # gsm .ifdef(WITH_GSM) LIB_DEPENDS+= gsm.1:${PORTSDIR}/audio/gsm CONFIGURE_ARGS+= --enable-libgsm .else CONFIGURE_ARGS+= --disable-libgsm .endif # mp3 .ifdef(WITH_LAME) LIB_DEPENDS+= mp3lame.0:${PORTSDIR}/audio/lame CONFIGURE_ARGS+= --enable-libmp3lame .else CONFIGURE_ARGS+= --disable-libmp3lame .endif # opencv .ifdef(WITH_OPENCV) LIB_DEPENDS+= cv.2:${PORTSDIR}/graphics/opencv CONFIGURE_ARGS+= --enable-libopencv .else CONFIGURE_ARGS+= --disable-libopencv .endif # openjpeg .ifdef(WITH_OPENJPEG) LIB_DEPENDS+= openjpeg.2:${PORTSDIR}/graphics/openjpeg CONFIGURE_ARGS+= --enable-libopenjpeg .else CONFIGURE_ARGS+= --disable-libopenjpeg .endif # schroedinger .ifndef(WITHOUT_SCHROEDINGER) LIB_DEPENDS+= schroedinger-1.0.10:${PORTSDIR}/multimedia/schroedinger CONFIGURE_ARGS+= --enable-libschroedinger .else CONFIGURE_ARGS+= --disable-libschroedinger .endif # sdl .ifdef(WITH_SDL) USE_SDL+= sdl PLIST_FILES+= bin/ffplay .if !defined(NOPORTDOCS) MAN1+= ffplay.1 DOC_DOCFILES+= ffplay.html .endif .else CONFIGURE_ARGS+= --disable-ffplay .endif # speex .ifdef(WITH_SPEEX) LIB_DEPENDS+= speex.1:${PORTSDIR}/audio/speex CONFIGURE_ARGS+= --enable-libspeex .else CONFIGURE_ARGS+= --disable-libspeex .endif # theora .ifndef(WITHOUT_THEORA) LIB_DEPENDS+= theora.0:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+= --enable-libtheora .else 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 CONFIGURE_ARGS+= --enable-vdpau .else CONFIGURE_ARGS+= --disable-vdpau .endif # vorbis .ifndef(WITHOUT_VORBIS) LIB_DEPENDS+= vorbisenc.2:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --enable-libvorbis FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis .else CONFIGURE_ARGS+= --disable-libvorbis .endif # vp8 .ifndef(WITHOUT_VP8) LIB_DEPENDS+= vpx.0:${PORTSDIR}/multimedia/libvpx CONFIGURE_ARGS+= --enable-libvpx .else CONFIGURE_ARGS+= --disable-libvpx .endif # 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 .endif # xvid .ifndef(WITHOUT_XVID) LIB_DEPENDS+= xvidcore.4:${PORTSDIR}/multimedia/xvid CONFIGURE_ARGS+= --enable-libxvid .else CONFIGURE_ARGS+= --disable-libxvid .endif pre-configure: .if defined(WITHOUT_OGG) && (!defined(WITHOUT_VORBIS) || !defined(WITHOUT_THEORA)) @${ECHO_MSG} WITH_VORBIS or WITH_THEORA defined, libogg will be built .endif post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/subdir.mak @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \ ${WRKSRC}/ffserver.c @${REINPLACE_CMD} -E \ -e "s|(EXTRALIBS[[:space:]]*=)|\1-L${LOCALBASE}/lib |g; \ s|%%LOCALBASE%%|${LOCALBASE}|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} .ifdef(WITH_SDL) @${REINPLACE_CMD} -E \ -e 's|sdl-config|${SDL_CONFIG}|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${FIND} ${WRKSRC} -type f | \ ${XARGS} -n 10 ${REINPLACE_CMD} -E \ -e 's|#include Property changes on: head/multimedia/ffmpeg-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.137 \ No newline at end of property +1.138 \ No newline at end of property Index: head/multimedia/ffmpeg-devel/pkg-plist =================================================================== --- head/multimedia/ffmpeg-devel/pkg-plist (revision 271454) +++ head/multimedia/ffmpeg-devel/pkg-plist (revision 271455) @@ -1,157 +1,156 @@ 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 %%FFSERVER%%@exec [ -f %B/ffserver.conf ] || cp %B/%f %B/ffserver.conf include/ffmpeg/adler32.h include/ffmpeg/avcodec.h include/ffmpeg/avdevice.h include/ffmpeg/avfilter.h include/ffmpeg/avformat.h include/ffmpeg/avio.h include/ffmpeg/avstring.h include/ffmpeg/avutil.h include/ffmpeg/base64.h include/ffmpeg/common.h include/ffmpeg/crc.h include/ffmpeg/fifo.h include/ffmpeg/intfloat_readwrite.h include/ffmpeg/log.h include/ffmpeg/lzo.h include/ffmpeg/mathematics.h include/ffmpeg/md5.h include/ffmpeg/mem.h include/ffmpeg/opt.h include/ffmpeg/pixfmt.h include/ffmpeg/postprocess.h include/ffmpeg/rational.h include/ffmpeg/sha1.h 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 include/libavfilter/avfilter.h include/libavfilter/avfiltergraph.h include/libavformat/avformat.h 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 include/libavutil/avutil.h include/libavutil/base64.h include/libavutil/bswap.h include/libavutil/common.h include/libavutil/cpu.h include/libavutil/crc.h include/libavutil/error.h 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 include/libavutil/lzo.h 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 include/libswscale/swscale.h lib/libavcodec.a lib/libavcodec.so lib/libavcodec.so.1 lib/libavcodec.so.52.114.0 lib/libavdevice.a lib/libavdevice.so lib/libavdevice.so.1 lib/libavdevice.so.52.3.0 lib/libavfilter.a lib/libavfilter.so lib/libavfilter.so.1.76.0 lib/libavfilter.so.1 lib/libavformat.a lib/libavformat.so lib/libavformat.so.1 lib/libavformat.so.52.103.0 lib/libavutil.a lib/libavutil.so lib/libavutil.so.1 lib/libavutil.so.50.40.0 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.12.0 lib/libswscale.so.1 libdata/pkgconfig/libavcodec.pc libdata/pkgconfig/libavdevice.pc libdata/pkgconfig/libavfilter.pc libdata/pkgconfig/libavformat.pc libdata/pkgconfig/libavutil.pc libdata/pkgconfig/libpostproc.pc libdata/pkgconfig/libswscale.pc %%DATADIR%%/libx264-baseline.ffpreset %%DATADIR%%/libx264-fast.ffpreset %%DATADIR%%/libx264-fast_firstpass.ffpreset %%DATADIR%%/libx264-faster.ffpreset %%DATADIR%%/libx264-faster_firstpass.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 %%DATADIR%%/libx264-main.ffpreset %%DATADIR%%/libx264-medium.ffpreset %%DATADIR%%/libx264-medium_firstpass.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-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 @dirrm include/libavutil @dirrm include/libavformat @dirrm include/libavfilter @dirrm include/libavdevice -@dirrm include/libavcore @dirrm include/libavcodec @dirrm include/ffmpeg Property changes on: head/multimedia/ffmpeg-devel/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.33 \ No newline at end of property +1.34 \ No newline at end of property