[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg2 Changes 2.2:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c741dcdad7ea
branches:  trunk
changeset: 632587:c741dcdad7ea
user:      adam <adam%pkgsrc.org@localhost>
date:      Tue Apr 01 10:51:49 2014 +0000

description:
Changes 2.2:
- HNM version 4 demuxer and video decoder
- Live HDS muxer
- setsar/setdar filters now support variables in ratio expressions
- elbg filter
- string validation in ffprobe
- support for decoding through VDPAU in ffmpeg (the -hwaccel option)
- complete Voxware MetaSound decoder
- remove mp3_header_compress bitstream filter
- Windows resource files for shared libraries
- aeval filter
- stereoscopic 3d metadata handling
- WebP encoding via libwebp
- ATRAC3+ decoder
- VP8 in Ogg demuxing
- side & metadata support in NUT
- framepack filter
- XYZ12 rawvideo support in NUT
- Exif metadata support in WebP decoder
- OpenGL device
- Use metadata_header_padding to control padding in ID3 tags (currently used in
  MP3, AIFF, and OMA files), FLAC header, and the AVI "junk" block.
- Mirillis FIC video decoder
- Support DNx444
- libx265 encoder
- dejudder filter
- Autodetect VDA like all other hardware accelerations

diffstat:

 multimedia/ffmpeg2/Makefile.common                    |   4 +-
 multimedia/ffmpeg2/PLIST                              |  63 +++++-------------
 multimedia/ffmpeg2/distinfo                           |  13 ++-
 multimedia/ffmpeg2/options.mk                         |  16 +++-
 multimedia/ffmpeg2/patches/patch-configure            |  18 ++--
 multimedia/ffmpeg2/patches/patch-libavcodec_libx265.c |  23 ++++++
 multimedia/ffmpeg2/patches/patch-libavutil_x86_cpu.c  |  12 +-
 7 files changed, 77 insertions(+), 72 deletions(-)

diffs (truncated from 339 to 300 lines):

diff -r 8c44db69a297 -r c741dcdad7ea multimedia/ffmpeg2/Makefile.common
--- a/multimedia/ffmpeg2/Makefile.common        Tue Apr 01 09:57:07 2014 +0000
+++ b/multimedia/ffmpeg2/Makefile.common        Tue Apr 01 10:51:49 2014 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.10 2014/02/25 07:32:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2014/04/01 10:51:49 adam Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=      ffmpeg-2.1.4
+DISTNAME=      ffmpeg-2.2
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.bz2
diff -r 8c44db69a297 -r c741dcdad7ea multimedia/ffmpeg2/PLIST
--- a/multimedia/ffmpeg2/PLIST  Tue Apr 01 09:57:07 2014 +0000
+++ b/multimedia/ffmpeg2/PLIST  Tue Apr 01 10:51:49 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2013/12/09 22:28:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2014/04/01 10:51:49 adam Exp $
 bin/ffmpeg2
 bin/ffprobe2
 bin/ffserver2
@@ -42,8 +42,10 @@
 include/ffmpeg2/libavutil/cpu.h
 include/ffmpeg2/libavutil/crc.h
 include/ffmpeg2/libavutil/dict.h
+include/ffmpeg2/libavutil/downmix_info.h
 include/ffmpeg2/libavutil/error.h
 include/ffmpeg2/libavutil/eval.h
+include/ffmpeg2/libavutil/ffversion.h
 include/ffmpeg2/libavutil/fifo.h
 include/ffmpeg2/libavutil/file.h
 include/ffmpeg2/libavutil/frame.h
@@ -55,6 +57,7 @@
 include/ffmpeg2/libavutil/lfg.h
 include/ffmpeg2/libavutil/log.h
 include/ffmpeg2/libavutil/lzo.h
+include/ffmpeg2/libavutil/macros.h
 include/ffmpeg2/libavutil/mathematics.h
 include/ffmpeg2/libavutil/md5.h
 include/ffmpeg2/libavutil/mem.h
@@ -71,6 +74,7 @@
 include/ffmpeg2/libavutil/samplefmt.h
 include/ffmpeg2/libavutil/sha.h
 include/ffmpeg2/libavutil/sha512.h
+include/ffmpeg2/libavutil/stereo3d.h
 include/ffmpeg2/libavutil/time.h
 include/ffmpeg2/libavutil/timecode.h
 include/ffmpeg2/libavutil/timestamp.h
@@ -85,23 +89,23 @@
 lib/ffmpeg2/libavcodec.a
 lib/ffmpeg2/libavcodec.so
 lib/ffmpeg2/libavcodec.so.55
-lib/ffmpeg2/libavcodec.so.55.39.101
+lib/ffmpeg2/libavcodec.so.55.52.102
 lib/ffmpeg2/libavdevice.a
 lib/ffmpeg2/libavdevice.so
 lib/ffmpeg2/libavdevice.so.55
-lib/ffmpeg2/libavdevice.so.55.5.100
+lib/ffmpeg2/libavdevice.so.55.10.100
 lib/ffmpeg2/libavfilter.a
 lib/ffmpeg2/libavfilter.so
-lib/ffmpeg2/libavfilter.so.3
-lib/ffmpeg2/libavfilter.so.3.90.100
+lib/ffmpeg2/libavfilter.so.4
+lib/ffmpeg2/libavfilter.so.4.2.100
 lib/ffmpeg2/libavformat.a
 lib/ffmpeg2/libavformat.so
 lib/ffmpeg2/libavformat.so.55
-lib/ffmpeg2/libavformat.so.55.19.104
+lib/ffmpeg2/libavformat.so.55.33.100
 lib/ffmpeg2/libavutil.a
 lib/ffmpeg2/libavutil.so
 lib/ffmpeg2/libavutil.so.52
-lib/ffmpeg2/libavutil.so.52.48.101
+lib/ffmpeg2/libavutil.so.52.66.100
 lib/ffmpeg2/libpostproc.a
 lib/ffmpeg2/libpostproc.so
 lib/ffmpeg2/libpostproc.so.52
@@ -109,11 +113,11 @@
 lib/ffmpeg2/libswresample.a
 lib/ffmpeg2/libswresample.so
 lib/ffmpeg2/libswresample.so.0
-lib/ffmpeg2/libswresample.so.0.17.104
+lib/ffmpeg2/libswresample.so.0.18.100
 lib/ffmpeg2/libswscale.a
 lib/ffmpeg2/libswscale.so
 lib/ffmpeg2/libswscale.so.2
-lib/ffmpeg2/libswscale.so.2.5.101
+lib/ffmpeg2/libswscale.so.2.5.102
 lib/ffmpeg2/pkgconfig/libavcodec.pc
 lib/ffmpeg2/pkgconfig/libavdevice.pc
 lib/ffmpeg2/pkgconfig/libavfilter.pc
@@ -122,63 +126,34 @@
 lib/ffmpeg2/pkgconfig/libpostproc.pc
 lib/ffmpeg2/pkgconfig/libswresample.pc
 lib/ffmpeg2/pkgconfig/libswscale.pc
-share/doc/ffmpeg/developer.html
-share/doc/ffmpeg/faq.html
-share/doc/ffmpeg/fate.html
-share/doc/ffmpeg/ffmpeg-all.html
-share/doc/ffmpeg/ffmpeg-bitstream-filters.html
-share/doc/ffmpeg/ffmpeg-codecs.html
-share/doc/ffmpeg/ffmpeg-devices.html
-share/doc/ffmpeg/ffmpeg-filters.html
-share/doc/ffmpeg/ffmpeg-formats.html
-share/doc/ffmpeg/ffmpeg-protocols.html
-share/doc/ffmpeg/ffmpeg-resampler.html
-share/doc/ffmpeg/ffmpeg-scaler.html
-share/doc/ffmpeg/ffmpeg-utils.html
-share/doc/ffmpeg/ffmpeg.html
-share/doc/ffmpeg/ffprobe-all.html
-share/doc/ffmpeg/ffprobe.html
-share/doc/ffmpeg/ffserver-all.html
-share/doc/ffmpeg/ffserver.html
-share/doc/ffmpeg/general.html
-share/doc/ffmpeg/git-howto.html
-share/doc/ffmpeg/libavcodec.html
-share/doc/ffmpeg/libavdevice.html
-share/doc/ffmpeg/libavfilter.html
-share/doc/ffmpeg/libavformat.html
-share/doc/ffmpeg/libavutil.html
-share/doc/ffmpeg/libswresample.html
-share/doc/ffmpeg/libswscale.html
-share/doc/ffmpeg/nut.html
-share/doc/ffmpeg/platform.html
-share/doc/ffmpeg2/avutil.txt
 share/doc/ffmpeg2/build_system.txt
 share/doc/ffmpeg2/errno.txt
 share/doc/ffmpeg2/ffmpeg.txt
 share/doc/ffmpeg2/filter_design.txt
-share/doc/ffmpeg2/git-howto.txt
 share/doc/ffmpeg2/issue_tracker.txt
 share/doc/ffmpeg2/mips.txt
 share/doc/ffmpeg2/multithreading.txt
 share/doc/ffmpeg2/optimization.txt
 share/doc/ffmpeg2/rate_distortion.txt
 share/doc/ffmpeg2/snow.txt
-share/doc/ffmpeg2/soc.txt
 share/doc/ffmpeg2/swresample.txt
 share/doc/ffmpeg2/swscale.txt
 share/doc/ffmpeg2/tablegen.txt
-share/doc/ffmpeg2/viterbi.txt
 share/examples/ffmpeg2/ffserver.conf
 share/ffmpeg2/examples/Makefile
 share/ffmpeg2/examples/README
-share/ffmpeg2/examples/decoding_encoding.c
-share/ffmpeg2/examples/demuxing.c
+share/ffmpeg2/examples/avcodec.c
+share/ffmpeg2/examples/avio_reading.c
+share/ffmpeg2/examples/demuxing_decoding.c
+share/ffmpeg2/examples/filter_audio.c
 share/ffmpeg2/examples/filtering_audio.c
 share/ffmpeg2/examples/filtering_video.c
 share/ffmpeg2/examples/metadata.c
 share/ffmpeg2/examples/muxing.c
+share/ffmpeg2/examples/remuxing.c
 share/ffmpeg2/examples/resampling_audio.c
 share/ffmpeg2/examples/scaling_video.c
+share/ffmpeg2/examples/transcode_aac.c
 share/ffmpeg2/ffprobe.xsd
 share/ffmpeg2/libvpx-1080p.ffpreset
 share/ffmpeg2/libvpx-1080p50_60.ffpreset
diff -r 8c44db69a297 -r c741dcdad7ea multimedia/ffmpeg2/distinfo
--- a/multimedia/ffmpeg2/distinfo       Tue Apr 01 09:57:07 2014 +0000
+++ b/multimedia/ffmpeg2/distinfo       Tue Apr 01 10:51:49 2014 +0000
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.8 2014/02/25 07:32:53 adam Exp $
+$NetBSD: distinfo,v 1.9 2014/04/01 10:51:49 adam Exp $
 
-SHA1 (ffmpeg-2.1.4.tar.bz2) = 99c2f7af3e6d5f4a962ae8bf627d3c53bc282fec
-RMD160 (ffmpeg-2.1.4.tar.bz2) = 66584f0264d1585bebf163f3cccf688f039a5bdd
-Size (ffmpeg-2.1.4.tar.bz2) = 6638914 bytes
+SHA1 (ffmpeg-2.2.tar.bz2) = 889a3a802e2ae9de2758e55c0ccae168d6b3301a
+RMD160 (ffmpeg-2.2.tar.bz2) = 5c0c764df7bf80b2b4cecc414dfd2b2cd41053e3
+Size (ffmpeg-2.2.tar.bz2) = 7024765 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
-SHA1 (patch-configure) = 6ff1b0cced416bac7afbc1a5801b5c4485a9b6b2
+SHA1 (patch-configure) = 032f7386bf68240971d0d6a59e291d48f23acf32
+SHA1 (patch-libavcodec_libx265.c) = 121113876a1089f07b4dc65c26a0a552b0d25d0d
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e
-SHA1 (patch-libavutil_x86_cpu.c) = 3a8b7048af047657f6b36e30e64ffd2b3a1bb0b1
+SHA1 (patch-libavutil_x86_cpu.c) = ece66a5b22130754c11c643dae48171d04d3246f
diff -r 8c44db69a297 -r c741dcdad7ea multimedia/ffmpeg2/options.mk
--- a/multimedia/ffmpeg2/options.mk     Tue Apr 01 09:57:07 2014 +0000
+++ b/multimedia/ffmpeg2/options.mk     Tue Apr 01 10:51:49 2014 +0000
@@ -1,13 +1,11 @@
-# $NetBSD: options.mk,v 1.1 2013/08/04 10:29:02 adam Exp $
+# $NetBSD: options.mk,v 1.2 2014/04/01 10:51:49 adam Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ffmpeg2
-PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 xvid \
+PKG_SUPPORTED_OPTIONS= faac lame ass libvpx theora vorbis x264 x265 xvid \
                        opencore-amr
 PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
-#PKG_OPTIONS_OPTIONAL_GROUPS=  aac-decoder
-#PKG_OPTIONS_GROUP.aac-decoder=        faac
 
 # Add VDPAU if it is available
 .include "../../multimedia/libvdpau/available.mk"
@@ -93,13 +91,21 @@
 .if !empty(PKG_OPTIONS:Mx264)
 # ABI change between 20090326 and 20100201
 BUILDLINK_API_DEPENDS.x264-devel+=     x264-devel>=20111207
-#BUILDLINK_API_DEPENDS.x264-devel+=    x264-devel<20110102
 CONFIGURE_ARGS+=       --enable-libx264
 .include "../../multimedia/x264-devel/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --disable-libx264
 .endif
 
+# x265 support
+# XXX: x265-devel is NOT yet in pkgsrc, but leave it here for testing purposes
+.if !empty(PKG_OPTIONS:Mx265)
+CONFIGURE_ARGS+=       --enable-libx265
+.include "../../multimedia/x265-devel/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --disable-libx265
+.endif
+
 # VDPAU support
 .if !empty(PKG_OPTIONS:Mvdpau)
 CONFIGURE_ARGS+=       --enable-vdpau
diff -r 8c44db69a297 -r c741dcdad7ea multimedia/ffmpeg2/patches/patch-configure
--- a/multimedia/ffmpeg2/patches/patch-configure        Tue Apr 01 09:57:07 2014 +0000
+++ b/multimedia/ffmpeg2/patches/patch-configure        Tue Apr 01 10:51:49 2014 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-configure,v 1.2 2013/10/30 07:08:23 adam Exp $
+$NetBSD: patch-configure,v 1.3 2014/04/01 10:51:49 adam Exp $
 
---- configure.orig     2013-10-28 00:58:04.000000000 +0000
+--- configure.orig     2014-03-23 22:08:02.000000000 +0000
 +++ configure
-@@ -3514,6 +3514,11 @@ case $target_os in
+@@ -3716,6 +3716,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -14,7 +14,7 @@
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -3872,10 +3877,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -4101,10 +4106,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -31,7 +31,7 @@
  
  check_inline_asm inline_asm_labels '"1:\n"'
  
-@@ -4448,6 +4456,7 @@ enabled xmm_clobber_test &&
+@@ -4727,6 +4735,7 @@ enabled xmm_clobber_test &&
                    -Wl,--wrap,sws_scale ||
      disable xmm_clobber_test
  
@@ -39,7 +39,7 @@
  echo "X{};" > $TMPV
  if test_ldflags -Wl,--version-script,$TMPV; then
      append SHFLAGS '-Wl,--version-script,\$(SUBDIR)lib\$(NAME).ver'
-@@ -4460,6 +4469,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
+@@ -4739,6 +4748,7 @@ __asm__(".symver ff_foo,av_foo@VERSION")
  void ff_foo(void) {}
  EOF
  fi
@@ -47,12 +47,12 @@
  
  if [ -z "$optflags" ]; then
      if enabled small; then
-@@ -4945,7 +4955,7 @@ Version: $version
+@@ -5259,7 +5269,7 @@ Version: $version
  Requires: $(enabled shared || echo $requires)
  Requires.private: $(enabled shared && echo $requires)
  Conflicts:
--Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
-+Libs: -L\${libdir} -Wl,-R\${libdir} -l${shortname} $(enabled shared || echo $libs)
+-Libs: -L\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
++Libs: -L\${libdir} -Wl,-R\${libdir} $(enabled rpath && echo "-Wl,-rpath,\${libdir}") -l${shortname} $(enabled shared || echo $libs)
  Libs.private: $(enabled shared && echo $libs)
  Cflags: -I\${includedir}
  EOF
diff -r 8c44db69a297 -r c741dcdad7ea multimedia/ffmpeg2/patches/patch-libavcodec_libx265.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/multimedia/ffmpeg2/patches/patch-libavcodec_libx265.c     Tue Apr 01 10:51:49 2014 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-libavcodec_libx265.c,v 1.1 2014/04/01 10:51:49 adam Exp $
+
+Fix building with newer x265.
+
+--- libavcodec/libx265.c.orig  2014-03-25 13:51:11.000000000 +0000
++++ libavcodec/libx265.c
+@@ -120,11 +121,11 @@ static av_cold int libx265_encode_init(A
+     av_reduce(&sar_num, &sar_den,
+               avctx->sample_aspect_ratio.num,
+               avctx->sample_aspect_ratio.den, 4096);
+-    ctx->params->bEnableVuiParametersPresentFlag = 1;
+-    ctx->params->bEnableAspectRatioIdc           = 1;