Here is an update to an FFmpeg snapshot from master on 20140810. Build tested so far with everything but the 4 KDE4 ports.
Vadim, can you please check this with k3b, mlt, kfilemetadata, and nepomuk? OK? Index: graphics/ffmpeg/Makefile =================================================================== RCS file: /home/cvs/ports/graphics/ffmpeg/Makefile,v retrieving revision 1.104 diff -u -p -u -p -r1.104 Makefile --- graphics/ffmpeg/Makefile 25 Jul 2014 20:37:58 -0000 1.104 +++ graphics/ffmpeg/Makefile 11 Aug 2014 01:14:06 -0000 @@ -2,23 +2,22 @@ COMMENT= audio/video converter and streamer -V= 20140412 +V= 20140810 DISTNAME= ffmpeg-git-${V} PKGNAME= ffmpeg-${V} -REVISION= 0 CATEGORIES= graphics multimedia MASTER_SITES= http://comstyle.com/source/ EXTRACT_SUFX= .tar.xz -SHARED_LIBS= avcodec 20.0 \ - avdevice 8.0 \ - avfilter 6.0 \ - avformat 18.0 \ - avresample 0.1 \ - avutil 11.2 \ - postproc 15.2 \ - swresample 0.2 \ - swscale 5.2 +SHARED_LIBS= avcodec 21.0 \ + avdevice 9.0 \ + avfilter 7.0 \ + avformat 19.0 \ + avresample 1.0 \ + avutil 12.0 \ + postproc 16.0 \ + swresample 1.0 \ + swscale 6.0 HOMEPAGE= http://ffmpeg.org/ @@ -133,10 +132,10 @@ CONFIGURE_ENV+= LIBavcodec_EXTRALIBS="${ LIBpostproc_LINKFLAGS="" \ LIBswresample_LINKFLAGS="" \ LIBswscale_LINKFLAGS="" \ - LIBavcodec_REQUIRES="libavutil opus schroedinger-1.0 speex theoraenc vpx x264" \ - LIBavdevice_REQUIRES="libavcodec libavfilter libavformat libavutil" \ + LIBavcodec_REQUIRES="libavutil libswresample opus schroedinger-1.0 speex theoraenc vpx x264" \ + LIBavdevice_REQUIRES="libavcodec libavfilter libavformat libavutil libpostproc libswresample libswscale" \ LIBavfilter_REQUIRES="libavcodec libavformat libavresample libavutil libpostproc libswresample libswscale" \ - LIBavformat_REQUIRES="libavcodec libavutil" \ + LIBavformat_REQUIRES="libavcodec libavutil libswresample" \ LIBavresample_REQUIRES="libavutil" \ LIBavutil_REQUIRES="" \ LIBpostproc_REQUIRES="libavutil" \ @@ -157,10 +156,10 @@ VERSION_FLAGS= libavcodec_VERSION=${LIBa MAKE_ENV= V=1 MAKE_FLAGS= ${VERSION_FLAGS} \ - LIBavcodec_EXTRALIBS="-lavutil ${LIBavcodec_EXTRALIBS}" \ - LIBavdevice_EXTRALIBS="-lavcodec -lavfilter -lavformat -lavutil ${LIBavdevice_EXTRALIBS}" \ + LIBavcodec_EXTRALIBS="-lavutil -lswresample ${LIBavcodec_EXTRALIBS}" \ + LIBavdevice_EXTRALIBS="-lavcodec -lavfilter -lavformat -lavutil -lpostproc -lswresample -lswscale ${LIBavdevice_EXTRALIBS}" \ LIBavfilter_EXTRALIBS="-lavcodec -lavformat -lavresample -lavutil -lpostproc -lswresample -lswscale ${LIBavfilter_EXTRALIBS}" \ - LIBavformat_EXTRALIBS="-lavcodec -lavutil ${LIBavformat_EXTRALIBS}" \ + LIBavformat_EXTRALIBS="-lavcodec -lavutil -lswresample ${LIBavformat_EXTRALIBS}" \ LIBavresample_EXTRALIBS="-lavutil ${LIBavresample_EXTRALIBS}" \ LIBavutil_EXTRALIBS="${LIBavutil_EXTRALIBS}" \ LIBpostproc_EXTRALIBS="-lavutil ${LIBpostproc_EXTRALIBS}" \ @@ -177,9 +176,6 @@ ALL_TARGET= all tools/qt-faststart TEST_TARGET= check HTML_DOCS= developer faq ffmpeg ffplay ffprobe ffserver general libavfilter - -post-extract: - @rm ${WRKSRC}/VERSION pre-configure: @mkdir -p ${WRKTMP} Index: graphics/ffmpeg/distinfo =================================================================== RCS file: /home/cvs/ports/graphics/ffmpeg/distinfo,v retrieving revision 1.30 diff -u -p -u -p -r1.30 distinfo --- graphics/ffmpeg/distinfo 16 May 2014 01:34:50 -0000 1.30 +++ graphics/ffmpeg/distinfo 11 Aug 2014 01:15:00 -0000 @@ -1,2 +1,2 @@ -SHA256 (ffmpeg-git-20140412.tar.xz) = yst7treEQowV/1kBZtpjphZ8AEtjUOqLzrTJUPGA2hc= -SIZE (ffmpeg-git-20140412.tar.xz) = 5792316 +SHA256 (ffmpeg-git-20140810.tar.xz) = 1yR5E7oR6twORJ9rbd7iWMFZAfKegkIGZxdf19V2rXU= +SIZE (ffmpeg-git-20140810.tar.xz) = 6168568 Index: graphics/ffmpeg/patches/patch-configure =================================================================== RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-configure,v retrieving revision 1.39 diff -u -p -u -p -r1.39 patch-configure --- graphics/ffmpeg/patches/patch-configure 16 May 2014 01:34:50 -0000 1.39 +++ graphics/ffmpeg/patches/patch-configure 11 Aug 2014 01:15:21 -0000 @@ -1,15 +1,15 @@ $OpenBSD: patch-configure,v 1.39 2014/05/16 01:34:50 brad Exp $ ---- configure.orig Mon Mar 24 23:08:28 2014 -+++ configure Mon Mar 24 23:12:38 2014 -@@ -1606,7 +1606,6 @@ HAVE_LIST=" +--- configure.orig Sun Aug 10 21:09:03 2014 ++++ configure Sun Aug 10 21:15:16 2014 +@@ -1630,7 +1630,6 @@ HEADERS_LIST=" + mach_mach_time_h + machine_ioctl_bt848_h machine_ioctl_meteor_h - machine_rw_barrier - makeinfo - malloc_h - MapViewOfFile - memalign - MemoryBarrier -@@ -3723,7 +3722,7 @@ case $target_os in + openjpeg_1_5_openjpeg_h + OpenGL_gl3_h + poll_h +@@ -3970,7 +3969,7 @@ case $target_os in openbsd|bitrig) disable symver SHFLAGS='-shared' @@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.39 2014/05 SLIB_INSTALL_LINKS= oss_indev_extralibs="-lossaudio" oss_outdev_extralibs="-lossaudio" -@@ -4054,7 +4053,7 @@ die_license_disabled version3 libvo_amrwbenc +@@ -4301,7 +4300,7 @@ die_license_disabled version3 libvo_amrwbenc enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; } @@ -27,23 +27,26 @@ $OpenBSD: patch-configure,v 1.39 2014/05 enable_weak_pic() { disabled pic && return -@@ -4695,7 +4694,6 @@ check_disable_warning -Wno-pointer-sign +@@ -5026,7 +5025,6 @@ check_disable_warning -Wno-pointer-sign check_ldflags -Wl,--warn-common check_ldflags -Wl,-rpath-link=libpostproc:libswresample:libswscale:libavfilter:libavdevice:libavformat:libavcodec:libavutil:libavresample - enabled rpath && add_ldflags -Wl,-rpath=$libdir + enabled rpath && add_ldflags -Wl,-rpath,$libdir -test_ldflags -Wl,-Bsymbolic && append SHFLAGS -Wl,-Bsymbolic # add some strip flags # -wN '..@*' is more selective than -x, but not available everywhere. -@@ -5245,6 +5243,7 @@ pkgconfig_generate(){ +@@ -5645,8 +5643,8 @@ pkgconfig_generate(){ + comment=$2 version=$3 libs=$4 - requires=$5 +- requires=$(map 'lib_version $v' $(eval echo \$${name#lib}_deps)) +- requires=${requires%, } ++ requires=$5 + linkflags=$6 enabled ${name#lib} || return 0 mkdir -p $name cat <<EOF > $name/$name${build_suffix}.pc -@@ -5259,7 +5258,7 @@ Version: $version +@@ -5661,7 +5659,7 @@ Version: $version Requires: $(enabled shared || echo $requires) Requires.private: $(enabled shared && echo $requires) Conflicts: @@ -52,19 +55,11 @@ $OpenBSD: patch-configure,v 1.39 2014/05 Libs.private: $(enabled shared && echo $libs) Cflags: -I\${includedir} EOF -@@ -5295,12 +5294,12 @@ lavfi_libs=${lavfi_libs%, } - lavd_libs="libavformat${build_suffix} = $LIBAVFORMAT_VERSION" - enabled lavfi_indev && prepend lavd_libs "libavfilter${build_suffix} = $LIBAVFILTER_VERSION," - --pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBM" --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" "$lavd_libs" --pkgconfig_generate libavfilter "FFmpeg audio/video filtering library" "$LIBAVFILTER_VERSION" "$extralibs" "$lavfi_libs" --pkgconfig_generate libpostproc "FFmpeg postprocessing library" "$LIBPOSTPROC_VERSION" "" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" --pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$extralibs" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" --pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" --pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" "libavutil${build_suffix} = $LIBAVUTIL_VERSION" +@@ -5694,3 +5692,13 @@ pkgconfig_generate libpostproc "FFmpeg postprocessin + pkgconfig_generate libavresample "Libav audio resampling library" "$LIBAVRESAMPLE_VERSION" "$LIBM" + pkgconfig_generate libswscale "FFmpeg image rescaling library" "$LIBSWSCALE_VERSION" "$LIBM" + pkgconfig_generate libswresample "FFmpeg audio resampling library" "$LIBSWRESAMPLE_VERSION" "$LIBM" ++ +pkgconfig_generate libavutil "FFmpeg utility library" "$LIBAVUTIL_VERSION" "$LIBavutil_EXTRALIBS" "$LIBavutil_REQUIRES" "$LIBavutil_LINKFLAGS" +pkgconfig_generate libavcodec "FFmpeg codec library" "$LIBAVCODEC_VERSION" "$LIBavcodec_EXTRALIBS" "$LIBavcodec_REQUIRES" "$LIBavcodec_LINKFLAGS" +pkgconfig_generate libavformat "FFmpeg container format library" "$LIBAVFORMAT_VERSION" "$LIBavformat_EXTRALIBS" "$LIBavformat_REQUIRES" "$LIBavformat_LINKFLAGS" Index: graphics/ffmpeg/patches/patch-doc_examples_transcode_aac_c =================================================================== RCS file: graphics/ffmpeg/patches/patch-doc_examples_transcode_aac_c diff -N graphics/ffmpeg/patches/patch-doc_examples_transcode_aac_c --- graphics/ffmpeg/patches/patch-doc_examples_transcode_aac_c 16 May 2014 01:34:50 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-doc_examples_transcode_aac_c,v 1.1 2014/05/16 01:34:50 brad Exp $ - -Fix building this example. - -https://trac.ffmpeg.org/ticket/3613 - ---- doc/examples/transcode_aac.c.orig Tue May 6 00:21:42 2014 -+++ doc/examples/transcode_aac.c Tue May 6 00:22:31 2014 -@@ -52,7 +52,7 @@ - * @param error Error code to be converted - * @return Corresponding error text (not thread-safe) - */ --static char *const get_error_text(const int error) -+static const char *get_error_text(const int error) - { - static char error_buffer[255]; - av_strerror(error, error_buffer, sizeof(error_buffer)); Index: graphics/ffmpeg/patches/patch-libavutil_lzo_c =================================================================== RCS file: graphics/ffmpeg/patches/patch-libavutil_lzo_c diff -N graphics/ffmpeg/patches/patch-libavutil_lzo_c --- graphics/ffmpeg/patches/patch-libavutil_lzo_c 25 Jul 2014 20:37:58 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,45 +0,0 @@ -$OpenBSD: patch-libavutil_lzo_c,v 1.2 2014/07/25 20:37:58 brad Exp $ - -Fix LZO integer overflow issues. CVE-2014-4610 - ---- libavutil/lzo.c.orig Fri Jul 25 16:01:08 2014 -+++ libavutil/lzo.c Fri Jul 25 16:09:37 2014 -@@ -22,6 +22,7 @@ - #include <string.h> - - #include "avutil.h" -+#include "avassert.h" - #include "common.h" - #include "intreadwrite.h" - #include "lzo.h" -@@ -65,8 +66,13 @@ static inline int get_len(LZOContext *c, int x, int ma - { - int cnt = x & mask; - if (!cnt) { -- while (!(x = get_byte(c))) -+ while (!(x = get_byte(c))) { -+ if (cnt >= INT_MAX - 1000) { -+ c->error |= AV_LZO_ERROR; -+ break; -+ } - cnt += 255; -+ } - cnt += mask + x; - } - return cnt; -@@ -80,6 +86,7 @@ static inline void copy(LZOContext *c, int cnt) - { - register const uint8_t *src = c->in; - register uint8_t *dst = c->out; -+ av_assert0(cnt >= 0); - if (cnt > c->in_end - src) { - cnt = FFMAX(c->in_end - src, 0); - c->error |= AV_LZO_INPUT_DEPLETED; -@@ -111,6 +118,7 @@ static inline void copy(LZOContext *c, int cnt) - static inline void copy_backptr(LZOContext *c, int back, int cnt) - { - register uint8_t *dst = c->out; -+ av_assert0(cnt > 0); - if (dst - c->out_start < back) { - c->error |= AV_LZO_INVALID_BACKPTR; - return; Index: graphics/ffmpeg/patches/patch-version_sh =================================================================== RCS file: /home/cvs/ports/graphics/ffmpeg/patches/patch-version_sh,v retrieving revision 1.7 diff -u -p -u -p -r1.7 patch-version_sh --- graphics/ffmpeg/patches/patch-version_sh 16 May 2014 01:34:50 -0000 1.7 +++ graphics/ffmpeg/patches/patch-version_sh 1 Aug 2014 23:28:12 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-version_sh,v 1.7 2014/05/16 01:34:50 brad Exp $ ---- version.sh.orig Tue Mar 11 01:57:36 2014 -+++ version.sh Tue Mar 11 02:39:44 2014 +--- version.sh.orig Fri Aug 1 19:24:21 2014 ++++ version.sh Fri Aug 1 19:28:08 2014 @@ -2,6 +2,9 @@ # Usage: version.sh <ffmpeg-root-dir> <output-version.h> <extra-version> @@ -10,4 +10,4 @@ $OpenBSD: patch-version_sh,v 1.7 2014/05 + # check for git short hash if ! test "$revision"; then - revision=$(cd "$1" && git describe --tags --match N 2> /dev/null) + if (cd "$1" && grep git RELEASE 2> /dev/null >/dev/null) ; then Index: graphics/ffmpeg/pkg/PLIST =================================================================== RCS file: /home/cvs/ports/graphics/ffmpeg/pkg/PLIST,v retrieving revision 1.28 diff -u -p -u -p -r1.28 PLIST --- graphics/ffmpeg/pkg/PLIST 16 May 2014 01:34:50 -0000 1.28 +++ graphics/ffmpeg/pkg/PLIST 6 Aug 2014 03:22:51 -0000 @@ -7,6 +7,7 @@ include/libavcodec/ include/libavcodec/avcodec.h include/libavcodec/avfft.h +include/libavcodec/dv_profile.h include/libavcodec/dxva2.h include/libavcodec/old_codec_ids.h include/libavcodec/vaapi.h @@ -52,6 +53,7 @@ include/libavutil/common.h include/libavutil/cpu.h include/libavutil/crc.h include/libavutil/dict.h +include/libavutil/display.h include/libavutil/downmix_info.h include/libavutil/error.h include/libavutil/eval.h @@ -59,6 +61,7 @@ include/libavutil/ffversion.h include/libavutil/fifo.h include/libavutil/file.h include/libavutil/frame.h +include/libavutil/hash.h include/libavutil/hmac.h include/libavutil/imgutils.h include/libavutil/intfloat.h @@ -76,14 +79,17 @@ include/libavutil/old_pix_fmts.h include/libavutil/opt.h include/libavutil/parseutils.h include/libavutil/pixdesc.h +include/libavutil/pixelutils.h include/libavutil/pixfmt.h include/libavutil/random_seed.h include/libavutil/rational.h +include/libavutil/replaygain.h include/libavutil/ripemd.h include/libavutil/samplefmt.h include/libavutil/sha.h include/libavutil/sha512.h include/libavutil/stereo3d.h +include/libavutil/threadmessage.h include/libavutil/time.h include/libavutil/timecode.h include/libavutil/timestamp.h @@ -116,7 +122,6 @@ lib/libswresample.a @lib lib/libswresample.so.${LIBswresample_VERSION} lib/libswscale.a @lib lib/libswscale.so.${LIBswscale_VERSION} -lib/pkgconfig/ lib/pkgconfig/libavcodec.pc lib/pkgconfig/libavdevice.pc lib/pkgconfig/libavfilter.pc @@ -189,8 +194,8 @@ share/ffmpeg/ share/ffmpeg/examples/ share/ffmpeg/examples/Makefile share/ffmpeg/examples/README -share/ffmpeg/examples/avcodec.c share/ffmpeg/examples/avio_reading.c +share/ffmpeg/examples/decoding_encoding.c share/ffmpeg/examples/demuxing_decoding.c share/ffmpeg/examples/filter_audio.c share/ffmpeg/examples/filtering_audio.c @@ -201,11 +206,10 @@ share/ffmpeg/examples/remuxing.c share/ffmpeg/examples/resampling_audio.c share/ffmpeg/examples/scaling_video.c share/ffmpeg/examples/transcode_aac.c +share/ffmpeg/examples/transcoding.c share/ffmpeg/ffprobe.xsd share/ffmpeg/libvpx-1080p.ffpreset share/ffmpeg/libvpx-1080p50_60.ffpreset share/ffmpeg/libvpx-360p.ffpreset share/ffmpeg/libvpx-720p.ffpreset share/ffmpeg/libvpx-720p50_60.ffpreset -share/ffmpeg/libx264-ipod320.ffpreset -share/ffmpeg/libx264-ipod640.ffpreset Index: x11/mplayer/Makefile =================================================================== RCS file: /home/cvs/ports/x11/mplayer/Makefile,v retrieving revision 1.238 diff -u -p -u -p -r1.238 Makefile --- x11/mplayer/Makefile 12 Jul 2014 22:01:53 -0000 1.238 +++ x11/mplayer/Makefile 11 Aug 2014 01:31:58 -0000 @@ -8,14 +8,14 @@ ONLY_FOR_ARCHS = ${GCC4_ARCHS} COMMENT = movie player supporting many formats V = 20140412 -FFMPEG_V = 20140412 +FFMPEG_V = 20140810 SUBST_VARS += PREFIX CONFDIR # Distfiles must be hand-rolled, see README N = mplayer DISTNAME = mplayer-${V} -REVISION = 0 +REVISION = 1 EXTRACT_SUFX = .tar.xz CATEGORIES = x11 multimedia -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.