Index: head/multimedia/ffmpeg-devel/Makefile =================================================================== --- head/multimedia/ffmpeg-devel/Makefile (revision 305862) +++ head/multimedia/ffmpeg-devel/Makefile (revision 305863) @@ -1,531 +1,530 @@ # New ports collection makefile for: ffmpeg-devel # Date created: 2009-08-12 # Whom: Martin Matuska # # $FreeBSD$ # PORTNAME= ffmpeg -DISTVERSION= 2012-08-06 -PORTREVISION= 1 +DISTVERSION= 2012-10-13 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= http://git.videolan.org/ PKGNAMESUFFIX= -devel DISTNAME= ffmpeg-${GIT_SUFFIX} MAINTAINER= mm@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPLv2 LICENSE_FILE_LGPL21= ${WRKSRC}/COPYING.LGPLv2.1 BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \ ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils \ texi2html:${PORTSDIR}/textproc/texi2html LATEST_LINK= ffmpeg${PKGNAMESUFFIX} -GIT_SNAPSHOT= 388243bb27f3d9b8f50d54268a784d55a7171f10 +GIT_SNAPSHOT= 79133fd0e58f3564e790eb2858b24db18182cef1 GIT_SUFFIX= ${GIT_SNAPSHOT:C/^(.......).*$/\1/g} FETCH_ARGS= -pRr -o ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} FETCH_URL= "http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${GIT_SNAPSHOT};sf=tgz" HAS_CONFIGURE= yes CONFIGURE_LOG= config.err USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_SDL= yes USE_PERL5_BUILD= yes USE_PKGCONFIG= build OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \ FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \ LIBBLURAY LIBV4L MODPLUG OPENAL OPENCV OPENJPEG OPENSSL \ OPTIMIZED_CFLAGS PULSEAUDIO RTMP SCHROEDINGER SDL SPEEX \ THEORA VAAPI VDPAU VO_AACENC VO_AMRWBENC VORBIS VPX \ X11GRAB X264 XVID OPTIONS_DEFAULT= FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS OPENCV \ SCHROEDINGER THEORA VORBIS VPX X264 XVID ASS_DESC= Subtitles rendering via libass CDIO_DESC= Audio CD grabbing with libcdio FDK_AAC_DESC= AAC audio encoding via Fraunhofer FDK FFSERVER_DESC= Build and install ffserver LIBV4L_DESC= Video for Linux support MODPLUG_DESC= Mod support via libmodplug OPENAL_DESC= OpenAL 1.1 capture support X11GRAB_DESC= Enable x11 grabbing FFPROGS= ffmpeg ffprobe INSTALL_TARGET= install-progs install-data install-libs install-headers FFMPEG_SUFFIX= -devel PLIST_SUB+= SUFF="${FFMPEG_SUFFIX}" MAN1= ffmpeg${FFMPEG_SUFFIX}.1 ffprobe${FFMPEG_SUFFIX}.1 USE_LDCONFIG= ${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX} DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} .include # ssl .if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS) USE_OPENSSL= yes FFMPEG_NONFREE= yes .endif # x11grab .if ${PORT_OPTIONS:MX11GRAB} USE_XORG= x11 xext xfixes CONFIGURE_ARGS+= --enable-x11grab .endif .include DATADIR= ${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX} DOCSDIR= ${PREFIX}/share/doc/${PORTNAME}${PKGNAMESUFFIX} CONFIGURE_ENV+= COMPILER_PATH=${LOCALBASE}/bin MAKE_ENV+= COMPILER_PATH=${LOCALBASE}/bin CONFIGURE_ARGS+=--prefix="${PREFIX}" \ --mandir="${PREFIX}/man" \ --incdir="${PREFIX}/include/ffmpeg${FFMPEG_SUFFIX}" \ --libdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --shlibdir="${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}" \ --datadir="${DATADIR}" \ --build-suffix="${FFMPEG_SUFFIX}" \ --progs-suffix="${FFMPEG_SUFFIX}" \ --enable-shared \ --enable-gpl \ --enable-postproc \ --enable-avfilter \ --enable-pthreads \ --enable-memalign-hack \ --disable-libstagefright-h264 \ --disable-libutvideo \ --cc="${CC}" \ --extra-cflags="${FFMPEG_CFLAGS} -I${LOCALBASE}/include" \ --extra-ldflags="-L${LOCALBASE}/lib ${FFMPEG_LDFLAGS}" \ --extra-libs="${PTHREAD_LIBS}" DOC_FILES= Changelog CREDITS INSTALL LICENSE MAINTAINERS README # under doc subdirectory DOC_DOCFILES= APIchanges RELEASE_NOTES *.txt *.html PORTDOCS= * .if ${PORT_OPTIONS:MDEBUG} CONFIGURE_ARGS+= --disable-stripping .else CONFIGURE_ARGS+= --disable-debug .endif .if ${PORT_OPTIONS:MFFSERVER} USE_RC_SUBR= ffserver${FFMPEG_SUFFIX} .endif # sse hardware vector support .if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64") _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 _NO_BUILTIN_VECTOR= yes .endif # builtin vector, requires mmx and sse .if !defined(_NO_BUILTIN_VECTOR) && defined(_BUILTIN_VECTOR) FFMPEG_CFLAGS+= -msse .endif # optimizations .if ${PORT_OPTIONS:MOPTIMIZED_CFLAGS} CFLAGS+= -O3 -ffast-math -fno-finite-math-only -fomit-frame-pointer .endif # aacplus .if ${PORT_OPTIONS:MAACPLUS} FFMPEG_NONFREE= yes LIB_DEPENDS+= aacplus:${PORTSDIR}/audio/libaacplus CONFIGURE_ARGS+= --enable-libaacplus .else CONFIGURE_ARGS+= --disable-libaacplus .endif # alsa .if ${PORT_OPTIONS:MALSA} LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib .else CONFIGURE_ARGS+= --disable-indev=alsa \ --disable-outdev=alsa .endif # Opencore AMR NB .if ${PORT_OPTIONS:MAMR_NB} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= opencore-amrnb:${PORTSDIR}/audio/opencore-amr CONFIGURE_ARGS+= --enable-libopencore-amrnb .else CONFIGURE_ARGS+= --disable-libopencore-amrnb .endif # Opencore AMR WB .if ${PORT_OPTIONS:MAMR_WB} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= opencore-amrwb:${PORTSDIR}/audio/opencore-amr CONFIGURE_ARGS+= --enable-libopencore-amrwb .else CONFIGURE_ARGS+= --disable-libopencore-amrwb .endif # ass .if ${PORT_OPTIONS:MASS} LIB_DEPENDS+= ass:${PORTSDIR}/multimedia/libass CONFIGURE_ARGS+= --enable-libass .else CONFIGURE_ARGS+= --disable-libass .endif # cdio .if ${PORT_OPTIONS:MCDIO} LIB_DEPENDS+= cdio:${PORTSDIR}/sysutils/libcdio CONFIGURE_ARGS+= --enable-libcdio .else CONFIGURE_ARGS+= --disable-libcdio .endif # celt .if ${PORT_OPTIONS:MCELT} LIB_DEPENDS+= celt0:${PORTSDIR}/audio/celt CONFIGURE_ARGS+= --enable-libcelt .else CONFIGURE_ARGS+= --disable-libcelt .endif # faac .if ${PORT_OPTIONS:MFAAC} FFMPEG_NONFREE= yes LIB_DEPENDS+= faac:${PORTSDIR}/audio/faac CONFIGURE_ARGS+= --enable-libfaac .else CONFIGURE_ARGS+= --disable-libfaac .endif # fdk_aac .if ${PORT_OPTIONS:MFDK_AAC} FFMPEG_NONFREE= yes LIB_DEPENDS+= fdk-aac:${PORTSDIR}/audio/fdk-aac CONFIGURE_ARGS+= --enable-libfdk-aac .else CONFIGURE_ARGS+= --disable-libfdk-aac .endif # ffserver .if ${PORT_OPTIONS:MFFSERVER} PLIST_SUB+= FFSERVER="" MAN1+= ffserver${FFMPEG_SUFFIX}.1 FFPROGS+= ffserver . if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffserver.html . endif .else PLIST_SUB+= FFSERVER="@comment " CONFIGURE_ARGS+= --disable-ffserver .endif # fontconfig .if ${PORT_OPTIONS:MFONTCONFIG} LIB_DEPENDS+= fontconfig:${PORTSDIR}/x11-fonts/fontconfig CONFIGURE_ARGS+= --enable-fontconfig .else CONFIGURE_ARGS+= --disable-fontconfig .endif # freetype .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --enable-libfreetype .else CONFIGURE_ARGS+= --disable-libfreetype .endif # frei0r .if ${PORT_OPTIONS:MFREI0R} BUILD_DEPENDS+= ${LOCALBASE}/include/frei0r.h:${PORTSDIR}/graphics/frei0r CONFIGURE_ARGS+= --enable-frei0r .else CONFIGURE_ARGS+= --disable-frei0r .endif # gnutls .if ${PORT_OPTIONS:MGNUTLS} LIB_DEPENDS+= gnutls:${PORTSDIR}/security/gnutls CONFIGURE_ARGS+= --enable-gnutls .else CONFIGURE_ARGS+= --disable-gnutls .endif # gsm .if ${PORT_OPTIONS:MGSM} LIB_DEPENDS+= gsm:${PORTSDIR}/audio/gsm CONFIGURE_ARGS+= --enable-libgsm .else CONFIGURE_ARGS+= --disable-libgsm .endif # lame .if ${PORT_OPTIONS:MLAME} LIB_DEPENDS+= mp3lame:${PORTSDIR}/audio/lame CONFIGURE_ARGS+= --enable-libmp3lame .else CONFIGURE_ARGS+= --disable-libmp3lame .endif # libbluray .if ${PORT_OPTIONS:MLIBBLURAY} LIB_DEPENDS+= bluray:${PORTSDIR}/multimedia/libbluray CONFIGURE_ARGS+= --enable-libbluray .else CONFIGURE_ARGS+= --disable-libbluray .endif # libv4l .if ${PORT_OPTIONS:MLIBV4L} LIB_DEPENDS+= v4l2:${PORTSDIR}/multimedia/libv4l CONFIGURE_ARGS+= --enable-libv4l2 .else CONFIGURE_ARGS+= --disable-libv4l2 .endif # modplug .if ${PORT_OPTIONS:MMODPLUG} LIB_DEPENDS+= modplug:${PORTSDIR}/audio/libmodplug CONFIGURE_ARGS+= --enable-libmodplug .else CONFIGURE_ARGS+= --disable-libmodplug .endif # OpenAL .if ${PORT_OPTIONS:MOPENAL} LIB_DEPENDS+= openal:${PORTSDIR}/audio/openal-soft CONFIGURE_ARGS+= --enable-openal .else CONFIGURE_ARGS+= --disable-openal .endif # opencv .if ${PORT_OPTIONS:MOPENCV} LIB_DEPENDS+= opencv_imgproc:${PORTSDIR}/graphics/opencv-core CONFIGURE_ARGS+= --enable-libopencv .else CONFIGURE_ARGS+= --disable-libopencv .endif # openjpeg .if ${PORT_OPTIONS:MOPENJPEG} LIB_DEPENDS+= openjpeg:${PORTSDIR}/graphics/openjpeg CONFIGURE_ARGS+= --enable-libopenjpeg .else CONFIGURE_ARGS+= --disable-libopenjpeg .endif # pulseaudio .if ${PORT_OPTIONS:MPULSEAUDIO} LIB_DEPENDS+= pulse:${PORTSDIR}/audio/pulseaudio CONFIGURE_ARGS+= --enable-libpulse .else CONFIGURE_ARGS+= --disable-libpulse .endif # rtmp .if ${PORT_OPTIONS:MRTMP} LIB_DEPENDS+= rtmp:${PORTSDIR}/multimedia/rtmpdump CONFIGURE_ARGS+= --enable-librtmp .else CONFIGURE_ARGS+= --disable-librtmp .endif # schroedinger .if ${PORT_OPTIONS:MSCHROEDINGER} LIB_DEPENDS+= schroedinger-1.0.11:${PORTSDIR}/multimedia/schroedinger CONFIGURE_ARGS+= --enable-libschroedinger .else CONFIGURE_ARGS+= --disable-libschroedinger .endif # sdl .if ${PORT_OPTIONS:MSDL} USE_SDL+= sdl PLIST_FILES+= bin/ffplay${FFMPEG_SUFFIX} FFPROGS+= ffplay MAN1+= ffplay${FFMPEG_SUFFIX}.1 .if ${PORT_OPTIONS:MDOCS} DOC_DOCFILES+= ffplay.html .endif .else CONFIGURE_ARGS+= --disable-ffplay .endif # speex .if ${PORT_OPTIONS:MSPEEX} LIB_DEPENDS+= speex:${PORTSDIR}/audio/speex CONFIGURE_ARGS+= --enable-libspeex .else CONFIGURE_ARGS+= --disable-libspeex .endif # theora .if ${PORT_OPTIONS:MTHEORA} LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora CONFIGURE_ARGS+= --enable-libtheora .else CONFIGURE_ARGS+= --disable-libtheora .endif # vaapi .if ${PORT_OPTIONS:MVAAPI} LIB_DEPENDS+= va:${PORTSDIR}/multimedia/libva CONFIGURE_ARGS+= --enable-vaapi .else CONFIGURE_ARGS+= --disable-vaapi .endif # vdpau .if ${PORT_OPTIONS:MVDPAU} BUILD_DEPENDS+= ${LOCALBASE}/include/vdpau/vdpau.h:${PORTSDIR}/multimedia/libvdpau CONFIGURE_ARGS+= --enable-vdpau .else CONFIGURE_ARGS+= --disable-vdpau .endif # vo-aacenc .if ${PORT_OPTIONS:MVO_AACENC} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= vo-aacenc:${PORTSDIR}/audio/vo-aacenc CONFIGURE_ARGS+= --enable-libvo-aacenc .else CONFIGURE_ARGS+= --disable-libvo-aacenc .endif # vo-amrwbenc .if ${PORT_OPTIONS:MVO_AMRWBENC} FFMPEG_LICENSE_GPL3= yes LIB_DEPENDS+= vo-amrwbenc:${PORTSDIR}/audio/vo-amrwbenc CONFIGURE_ARGS+= --enable-libvo-amrwbenc .else CONFIGURE_ARGS+= --disable-libvo-amrwbenc .endif # vorbis .if ${PORT_OPTIONS:MVORBIS} LIB_DEPENDS+= vorbisenc:${PORTSDIR}/audio/libvorbis CONFIGURE_ARGS+= --enable-libvorbis FFMPEG_CFLAGS+= -I${LOCALBASE}/include/vorbis .else CONFIGURE_ARGS+= --disable-libvorbis .endif # vp8 .if ${PORT_OPTIONS:MVPX} LIB_DEPENDS+= vpx:${PORTSDIR}/multimedia/libvpx CONFIGURE_ARGS+= --enable-libvpx .else CONFIGURE_ARGS+= --disable-libvpx .endif # x264 .if ${PORT_OPTIONS:MX264} LIB_DEPENDS+= x264:${PORTSDIR}/multimedia/x264 CONFIGURE_ARGS+= --enable-libx264 .else CONFIGURE_ARGS+= --disable-libx264 .endif # xvid .if ${PORT_OPTIONS:MXVID} LIB_DEPENDS+= xvidcore:${PORTSDIR}/multimedia/xvid CONFIGURE_ARGS+= --enable-libxvid .else CONFIGURE_ARGS+= --disable-libxvid .endif # License knobs .if defined(FFMPEG_NONFREE) RESTRICTED= linking to libfaac or libaacplus restricts redistribution CONFIGURE_ARGS+= --enable-nonfree .endif .if defined(FFMPEG_LICENSE_GPL3) CONFIGURE_ARGS+= --enable-version3 LICENSE= GPLv3 LGPL3 LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING.GPLv3 LICENSE_FILE_LGPL3= ${WRKSRC}/COPYING.LGPLv3 .endif do-fetch: @if [ ! -f ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \ ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} ${FETCH_URL} ${FETCH_AFTER_ARGS}; \ fi; post-patch: # {C,LD}FLAGS safeness @${REINPLACE_CMD} -e 's|$$(LIBDIR)/pkgconfig|${PREFIX}/libdata/pkgconfig|' \ ${WRKSRC}/library.mak @${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver${FFMPEG_SUFFIX}.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||' \ -e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \ ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} @${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \ ${WRKSRC}/doc/texi2pod.pl .if ${PORT_OPTIONS:MSDL} @${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 Index: head/multimedia/ffmpeg-devel/distinfo =================================================================== --- head/multimedia/ffmpeg-devel/distinfo (revision 305862) +++ head/multimedia/ffmpeg-devel/distinfo (revision 305863) @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-388243b.tar.gz) = ea65d0359ea0f629b25f529923f5fc344c0852390df694bfdb0af877bca92f73 -SIZE (ffmpeg-388243b.tar.gz) = 7475800 +SHA256 (ffmpeg-79133fd.tar.gz) = 4198d6a6a2515acca7854081417dc20abc6ce3521c77d63f5def84033ecf872a +SIZE (ffmpeg-79133fd.tar.gz) = 7689996 Index: head/multimedia/ffmpeg-devel/files/patch-configure =================================================================== --- head/multimedia/ffmpeg-devel/files/patch-configure (revision 305862) +++ head/multimedia/ffmpeg-devel/files/patch-configure (revision 305863) @@ -1,95 +1,98 @@ ---- configure.orig 2012-08-06 10:06:26.000000000 +0200 -+++ configure 2012-08-12 09:48:55.838509614 +0200 -@@ -1924,7 +1924,7 @@ +--- configure.orig 2012-10-13 10:22:27.000000000 +0200 ++++ configure 2012-10-13 10:55:30.573237451 +0200 +@@ -2041,7 +2041,7 @@ nogas=":" # machine -arch_default=$(uname -m) +arch_default=$(uname -p) cpu="generic" # OS -@@ -3506,10 +3506,10 @@ - makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo +@@ -3744,10 +3744,10 @@ + perl --version > /dev/null 2>&1 && enable perl || disable perl pod2man --help > /dev/null 2>&1 && enable pod2man || disable pod2man -check_header linux/fb.h -check_header linux/videodev.h -check_header linux/videodev2.h -check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete +#check_header linux/fb.h +#check_header linux/videodev.h +#check_header linux/videodev2.h +#check_struct linux/videodev2.h "struct v4l2_frmivalenum" discrete check_header sys/videoio.h -@@ -3897,7 +3897,7 @@ +@@ -4152,7 +4152,7 @@ SRC_PATH:=\$(SRC_PATH:.%=..%) endif CC_IDENT=$cc_ident -ARCH=$arch +FFMPEG_ARCH=$arch CC=$cc CXX=$cxx AS=$as -@@ -4093,13 +4093,13 @@ - requires=$5 - enabled ${name#lib} || return 0 - mkdir -p $name --cat < $name/$name.pc -+cat < $name/${name}${build_suffix}.pc +@@ -4355,13 +4355,13 @@ + requires=$5 + enabled ${name#lib} || return 0 + mkdir -p $name +- cat < $name/$name.pc ++ cat < $name/${name}${build_suffix}.pc prefix=$prefix exec_prefix=\${prefix} libdir=$libdir includedir=$incdir -Name: $name +Name: ${name}${build_suffix} Description: $comment Version: $version Requires: $(enabled shared || echo $requires) -@@ -4113,7 +4113,7 @@ +@@ -4375,7 +4375,7 @@ mkdir -p doc/examples/pc-uninstalled includedir=${source_path} [ "$includedir" = . ] && includedir="\${pcfiledir}/../../.." --cat < doc/examples/pc-uninstalled/$name.pc -+cat < doc/examples/pc-uninstalled/${name}${build_suffix}.pc +- cat < doc/examples/pc-uninstalled/$name.pc ++ cat < doc/examples/pc-uninstalled/${name}${build_suffix}.pc prefix= exec_prefix= libdir=\${pcfiledir}/../../../$name -@@ -4130,22 +4130,22 @@ +@@ -4392,25 +4392,25 @@ } libavfilter_pc_deps="" -enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec = $LIBAVCODEC_VERSION," -enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat = $LIBAVFORMAT_VERSION," -enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale = $LIBSWSCALE_VERSION," -enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample = $LIBSWRESAMPLE_VERSION," -enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc = $LIBPOSTPROC_VERSION," +enabled libavfilter_deps_avcodec && prepend libavfilter_pc_deps "libavcodec${build_suffix} = $LIBAVCODEC_VERSION," +enabled libavfilter_deps_avformat && prepend libavfilter_pc_deps "libavformat${build_suffix} = $LIBAVFORMAT_VERSION," +enabled libavfilter_deps_swscale && prepend libavfilter_pc_deps "libswscale${build_suffix} = $LIBSWSCALE_VERSION," +enabled libavfilter_deps_swresample && prepend libavfilter_pc_deps "libswresample${build_suffix} = $LIBSWRESAMPLE_VERSION," +enabled libavfilter_deps_postproc && prepend libavfilter_pc_deps "libpostproc${build_suffix} = $LIBPOSTPROC_VERSION," libavfilter_pc_deps=${libavfilter_pc_deps%, } -libavdevice_pc_deps="libavformat = $LIBAVFORMAT_VERSION" -enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter = $LIBAVFILTER_VERSION," +libavdevice_pc_deps="libavformat${build_suffix} = $LIBAVFORMAT_VERSION" +enabled lavfi_indev && prepend libavdevice_pc_deps "libavfilter${build_suffix} = $LIBAVFILTER_VERSION," pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM" -pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil = $LIBAVUTIL_VERSION" -pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec = $LIBAVCODEC_VERSION" +pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" +pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$extralibs" "libavcodec${build_suffix} = $LIBAVCODEC_VERSION" pkgconfig_generate libavdevice "FFmpeg device handling library" "$LIBAVDEVICE_VERSION" "$extralibs" "$libavdevice_pc_deps" pkgconfig_generate libavfilter "FFmpeg video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$libavfilter_pc_deps" -pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil = $LIBAVUTIL_VERSION" +pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" -pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" -pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil = $LIBAVUTIL_VERSION" +pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" +pkgconfig_generate libswresample "FFmpeg audio rescaling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" + + fix_ffmpeg_remote(){ + git_remote_from=$1 Index: head/multimedia/ffmpeg-devel/files/patch-doc-Makefile =================================================================== --- head/multimedia/ffmpeg-devel/files/patch-doc-Makefile (revision 305862) +++ head/multimedia/ffmpeg-devel/files/patch-doc-Makefile (revision 305863) @@ -1,11 +1,11 @@ ---- doc/Makefile.orig 2012-08-06 10:06:26.000000000 +0200 -+++ doc/Makefile 2012-08-12 09:53:14.566506176 +0200 -@@ -54,7 +54,7 @@ +--- doc/Makefile.orig 2012-10-13 10:22:27.000000000 +0200 ++++ doc/Makefile 2012-10-13 10:56:02.141525689 +0200 +@@ -58,7 +58,7 @@ install-man: - ifdef HAVE_POD2MAN + ifdef CONFIG_MANPAGES -install-progs-$(CONFIG_DOC): install-man +#install-progs-$(CONFIG_DOC): install-man install-man: $(MANPAGES) $(Q)mkdir -p "$(MANDIR)/man1" Index: head/multimedia/ffmpeg-devel/files/patch-library.mak =================================================================== --- head/multimedia/ffmpeg-devel/files/patch-library.mak (revision 305862) +++ head/multimedia/ffmpeg-devel/files/patch-library.mak (revision 305863) @@ -1,24 +1,24 @@ ---- library.mak.orig 2012-05-25 20:02:16.000000000 +0200 -+++ library.mak 2012-08-12 09:31:55.551526509 +0200 -@@ -74,9 +74,9 @@ +--- library.mak.orig 2012-10-13 10:22:27.000000000 +0200 ++++ library.mak 2012-10-13 10:57:11.333238227 +0200 +@@ -76,9 +76,9 @@ $(Q)mkdir -p "$(INCINSTDIR)" $$(INSTALL) -m 644 $$^ "$(INCINSTDIR)" -install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc - $(Q)mkdir -p "$(LIBDIR)/pkgconfig" - $$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig" +install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME)$(BUILDSUF).pc + $(Q)mkdir -p "$(prefix)/libdata/pkgconfig" + $$(INSTALL) -m 644 $$^ "$(prefix)/libdata/pkgconfig" uninstall-libs:: -$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \ -@@ -88,7 +88,7 @@ +@@ -90,7 +90,7 @@ uninstall-headers:: - $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS)) $(addprefix "$(INCINSTDIR)/",$(BUILT_HEADERS)) + $(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS)) - $(RM) "$(LIBDIR)/pkgconfig/lib$(NAME).pc" + $(RM) "$(prefix)/libdata/pkgconfig/lib$(NAME).pc" -rmdir "$(INCINSTDIR)" endef Index: head/multimedia/ffmpeg-devel/pkg-plist =================================================================== --- head/multimedia/ffmpeg-devel/pkg-plist (revision 305862) +++ head/multimedia/ffmpeg-devel/pkg-plist (revision 305863) @@ -1,140 +1,146 @@ bin/ffmpeg%%SUFF%% bin/ffprobe%%SUFF%% %%FFSERVER%%bin/ffserver%%SUFF%% %%FFSERVER%%@unexec if cmp -s %D/etc/ffserver%%SUFF%%.conf %D/etc/ffserver%%SUFF%%.conf-dist; then rm -f %D/etc/ffserver%%SUFF%%.conf; fi %%FFSERVER%%etc/ffserver%%SUFF%%.conf-dist %%FFSERVER%%@exec [ -f %B/ffserver%%SUFF%%.conf ] || cp %B/%f %B/ffserver%%SUFF%%.conf include/ffmpeg%%SUFF%%/libavcodec/avcodec.h include/ffmpeg%%SUFF%%/libavcodec/avfft.h include/ffmpeg%%SUFF%%/libavcodec/dxva2.h +include/ffmpeg%%SUFF%%/libavcodec/old_codec_ids.h include/ffmpeg%%SUFF%%/libavcodec/vaapi.h include/ffmpeg%%SUFF%%/libavcodec/vda.h include/ffmpeg%%SUFF%%/libavcodec/vdpau.h include/ffmpeg%%SUFF%%/libavcodec/version.h include/ffmpeg%%SUFF%%/libavcodec/xvmc.h include/ffmpeg%%SUFF%%/libavdevice/avdevice.h include/ffmpeg%%SUFF%%/libavdevice/version.h include/ffmpeg%%SUFF%%/libavfilter/asrc_abuffer.h include/ffmpeg%%SUFF%%/libavfilter/avcodec.h include/ffmpeg%%SUFF%%/libavfilter/avfilter.h include/ffmpeg%%SUFF%%/libavfilter/avfiltergraph.h include/ffmpeg%%SUFF%%/libavfilter/buffersink.h include/ffmpeg%%SUFF%%/libavfilter/buffersrc.h include/ffmpeg%%SUFF%%/libavfilter/version.h include/ffmpeg%%SUFF%%/libavformat/avformat.h include/ffmpeg%%SUFF%%/libavformat/avio.h include/ffmpeg%%SUFF%%/libavformat/version.h include/ffmpeg%%SUFF%%/libavutil/adler32.h include/ffmpeg%%SUFF%%/libavutil/aes.h include/ffmpeg%%SUFF%%/libavutil/attributes.h include/ffmpeg%%SUFF%%/libavutil/audio_fifo.h include/ffmpeg%%SUFF%%/libavutil/audioconvert.h include/ffmpeg%%SUFF%%/libavutil/avassert.h include/ffmpeg%%SUFF%%/libavutil/avconfig.h include/ffmpeg%%SUFF%%/libavutil/avstring.h include/ffmpeg%%SUFF%%/libavutil/avutil.h include/ffmpeg%%SUFF%%/libavutil/base64.h include/ffmpeg%%SUFF%%/libavutil/blowfish.h include/ffmpeg%%SUFF%%/libavutil/bprint.h include/ffmpeg%%SUFF%%/libavutil/bswap.h include/ffmpeg%%SUFF%%/libavutil/common.h include/ffmpeg%%SUFF%%/libavutil/cpu.h include/ffmpeg%%SUFF%%/libavutil/crc.h include/ffmpeg%%SUFF%%/libavutil/dict.h include/ffmpeg%%SUFF%%/libavutil/error.h include/ffmpeg%%SUFF%%/libavutil/eval.h include/ffmpeg%%SUFF%%/libavutil/fifo.h include/ffmpeg%%SUFF%%/libavutil/file.h include/ffmpeg%%SUFF%%/libavutil/imgutils.h include/ffmpeg%%SUFF%%/libavutil/intfloat.h include/ffmpeg%%SUFF%%/libavutil/intfloat_readwrite.h include/ffmpeg%%SUFF%%/libavutil/intreadwrite.h include/ffmpeg%%SUFF%%/libavutil/lfg.h include/ffmpeg%%SUFF%%/libavutil/log.h include/ffmpeg%%SUFF%%/libavutil/lzo.h include/ffmpeg%%SUFF%%/libavutil/mathematics.h include/ffmpeg%%SUFF%%/libavutil/md5.h include/ffmpeg%%SUFF%%/libavutil/mem.h +include/ffmpeg%%SUFF%%/libavutil/old_pix_fmts.h include/ffmpeg%%SUFF%%/libavutil/opt.h include/ffmpeg%%SUFF%%/libavutil/parseutils.h include/ffmpeg%%SUFF%%/libavutil/pixdesc.h include/ffmpeg%%SUFF%%/libavutil/pixfmt.h include/ffmpeg%%SUFF%%/libavutil/random_seed.h include/ffmpeg%%SUFF%%/libavutil/rational.h include/ffmpeg%%SUFF%%/libavutil/samplefmt.h include/ffmpeg%%SUFF%%/libavutil/sha.h include/ffmpeg%%SUFF%%/libavutil/time.h include/ffmpeg%%SUFF%%/libavutil/timecode.h include/ffmpeg%%SUFF%%/libavutil/timestamp.h include/ffmpeg%%SUFF%%/libavutil/version.h include/ffmpeg%%SUFF%%/libavutil/xtea.h include/ffmpeg%%SUFF%%/libpostproc/postprocess.h +include/ffmpeg%%SUFF%%/libpostproc/version.h include/ffmpeg%%SUFF%%/libswresample/swresample.h +include/ffmpeg%%SUFF%%/libswresample/version.h include/ffmpeg%%SUFF%%/libswscale/swscale.h include/ffmpeg%%SUFF%%/libswscale/version.h lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.49.100 +lib/ffmpeg%%SUFF%%/libavcodec%%SUFF%%.so.54.65.100 lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.2.100 +lib/ffmpeg%%SUFF%%/libavdevice%%SUFF%%.so.54.3.100 lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3 -lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.5.102 +lib/ffmpeg%%SUFF%%/libavfilter%%SUFF%%.so.3.19.102 lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54 -lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.22.101 +lib/ffmpeg%%SUFF%%/libavformat%%SUFF%%.so.54.32.100 lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.a lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51 -lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.66.101 +lib/ffmpeg%%SUFF%%/libavutil%%SUFF%%.so.51.76.100 lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.a lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52 -lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.0.100 +lib/ffmpeg%%SUFF%%/libpostproc%%SUFF%%.so.52.1.100 lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.a lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0 -lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.15.100 +lib/ffmpeg%%SUFF%%/libswresample%%SUFF%%.so.0.16.100 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.a lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2 lib/ffmpeg%%SUFF%%/libswscale%%SUFF%%.so.2.1.101 libdata/pkgconfig/libavcodec%%SUFF%%.pc libdata/pkgconfig/libavdevice%%SUFF%%.pc libdata/pkgconfig/libavfilter%%SUFF%%.pc libdata/pkgconfig/libavformat%%SUFF%%.pc libdata/pkgconfig/libavutil%%SUFF%%.pc libdata/pkgconfig/libpostproc%%SUFF%%.pc libdata/pkgconfig/libswresample%%SUFF%%.pc libdata/pkgconfig/libswscale%%SUFF%%.pc %%DATADIR%%/examples/Makefile %%DATADIR%%/examples/decoding_encoding.c +%%DATADIR%%/examples/demuxing.c %%DATADIR%%/examples/filtering_audio.c %%DATADIR%%/examples/filtering_video.c %%DATADIR%%/examples/metadata.c %%DATADIR%%/examples/muxing.c +%%DATADIR%%/examples/scaling_video.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 lib/ffmpeg%%SUFF%% @dirrm include/ffmpeg%%SUFF%%/libswscale @dirrm include/ffmpeg%%SUFF%%/libswresample @dirrm include/ffmpeg%%SUFF%%/libpostproc @dirrm include/ffmpeg%%SUFF%%/libavutil @dirrm include/ffmpeg%%SUFF%%/libavformat @dirrm include/ffmpeg%%SUFF%%/libavfilter @dirrm include/ffmpeg%%SUFF%%/libavdevice @dirrm include/ffmpeg%%SUFF%%/libavcodec @dirrm include/ffmpeg%%SUFF%%