CVS commit: pkgsrc/multimedia/ffmpeg3

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Oct 18 20:25:41 UTC 2017

Modified Files:
        pkgsrc/multimedia/ffmpeg3: Makefile.common PLIST buildlink3.mk distinfo
            options.mk
        pkgsrc/multimedia/ffmpeg3/patches: patch-Makefile patch-configure

Log Message:
ffmpeg3: update to 3.4

version 3.4:
- deflicker video filter
- doubleweave video filter
- lumakey video filter
- pixscope video filter
- oscilloscope video filter
- config.log and other configuration files moved into ffbuild/ directory
- update cuvid/nvenc headers to Video Codec SDK 8.0.14
- afir audio filter
- scale_cuda CUDA based video scale filter
- librsvg support for svg rasterization
- crossfeed audio filter
- spec compliant VP9 muxing support in MP4
- remove the libnut muxer/demuxer wrappers
- remove the libschroedinger encoder/decoder wrappers
- surround audio filter
- sofalizer filter switched to libmysofa
- Gremlin Digital Video demuxer and decoder
- headphone audio filter
- superequalizer audio filter
- roberts video filter
- The x86 assembler default switched from yasm to nasm, pass
  --x86asmexe=yasm to configure to restore the old behavior.
- additional frame format support for Interplay MVE movies
- support for decoding through D3D11VA in ffmpeg
- limiter video filter
- libvmaf video filter
- Dolby E decoder and SMPTE 337M demuxer
- unpremultiply video filter
- tlut2 video filter
- floodfill video filter
- pseudocolor video filter
- raw G.726 muxer and demuxer, left- and right-justified
- NewTek NDI input/output device
- Some video filters with several inputs now use a common set of options:
  blend, libvmaf, lut3d, overlay, psnr, ssim.
  They must always be used by name.
- FITS demuxer and decoder
- FITS muxer and encoder
- add --disable-autodetect build switch
- drop deprecated qtkit input device (use avfoundation instead)
- despill video filter
- haas audio filter
- SUP/PGS subtitle muxer
- convolve video filter
- VP9 tile threading support
- KMS screen grabber
- CUDA thumbnail filter
- V4L2 mem2mem HW assisted codecs
- Rockchip MPP hardware decoding
- vmafmotion video filter
- use MIME type "G726" for little-endian G.726, "AAL2-G726" for big-endian G.726


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/multimedia/ffmpeg3/Makefile.common
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg3/PLIST
cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/ffmpeg3/buildlink3.mk
cvs rdiff -u -r1.22 -r1.23 pkgsrc/multimedia/ffmpeg3/distinfo
cvs rdiff -u -r1.9 -r1.10 pkgsrc/multimedia/ffmpeg3/options.mk
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/multimedia/ffmpeg3/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ffmpeg3/Makefile.common
diff -u pkgsrc/multimedia/ffmpeg3/Makefile.common:1.21 pkgsrc/multimedia/ffmpeg3/Makefile.common:1.22
--- pkgsrc/multimedia/ffmpeg3/Makefile.common:1.21      Tue Sep 12 06:39:31 2017
+++ pkgsrc/multimedia/ffmpeg3/Makefile.common   Wed Oct 18 20:25:41 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.21 2017/09/12 06:39:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.22 2017/10/18 20:25:41 adam Exp $
 # used by multimedia/ffmpeg3/Makefile
 # used by multimedia/ffplay3/Makefile
 
-DISTNAME=      ffmpeg-3.3.4
+DISTNAME=      ffmpeg-3.4
 CATEGORIES=    multimedia
 MASTER_SITES=  http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=  .tar.bz2
@@ -68,7 +68,7 @@ SUBST_SED.sunwspro+=  -e "s/-std=c99/-xc9
 SUBST_SED.sunwspro+=   -e "s/-Wl,-rpath-link,/-L /g"
 .endif
 
-BUILD_DEPENDS+=        yasm>=0.7.2:../../devel/yasm
+BUILD_DEPENDS+=        nasm>=2.13:../../devel/nasm
 
 REPLACE_PERL+= doc/texi2pod.pl
 REPLACE_SH+=   configure version.sh

Index: pkgsrc/multimedia/ffmpeg3/PLIST
diff -u pkgsrc/multimedia/ffmpeg3/PLIST:1.10 pkgsrc/multimedia/ffmpeg3/PLIST:1.11
--- pkgsrc/multimedia/ffmpeg3/PLIST:1.10        Sat Jul 22 12:29:00 2017
+++ pkgsrc/multimedia/ffmpeg3/PLIST     Wed Oct 18 20:25:41 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2017/07/22 12:29:00 adam Exp $
+@comment $NetBSD: PLIST,v 1.11 2017/10/18 20:25:41 adam Exp $
 bin/ffmpeg3
 bin/ffprobe3
 bin/ffserver3
@@ -65,10 +65,13 @@ include/ffmpeg3/libavutil/hash.h
 include/ffmpeg3/libavutil/hmac.h
 include/ffmpeg3/libavutil/hwcontext.h
 include/ffmpeg3/libavutil/hwcontext_cuda.h
+include/ffmpeg3/libavutil/hwcontext_d3d11va.h
+include/ffmpeg3/libavutil/hwcontext_drm.h
 include/ffmpeg3/libavutil/hwcontext_dxva2.h
 include/ffmpeg3/libavutil/hwcontext_qsv.h
 include/ffmpeg3/libavutil/hwcontext_vaapi.h
 include/ffmpeg3/libavutil/hwcontext_vdpau.h
+include/ffmpeg3/libavutil/hwcontext_videotoolbox.h
 include/ffmpeg3/libavutil/imgutils.h
 include/ffmpeg3/libavutil/intfloat.h
 include/ffmpeg3/libavutil/intreadwrite.h
@@ -116,39 +119,39 @@ include/ffmpeg3/libswscale/version.h
 lib/ffmpeg3/libavcodec.a
 lib/ffmpeg3/libavcodec.so
 lib/ffmpeg3/libavcodec.so.57
-lib/ffmpeg3/libavcodec.so.57.89.100
+lib/ffmpeg3/libavcodec.so.57.107.100
 lib/ffmpeg3/libavdevice.a
 lib/ffmpeg3/libavdevice.so
 lib/ffmpeg3/libavdevice.so.57
-lib/ffmpeg3/libavdevice.so.57.6.100
+lib/ffmpeg3/libavdevice.so.57.10.100
 lib/ffmpeg3/libavfilter.a
 lib/ffmpeg3/libavfilter.so
 lib/ffmpeg3/libavfilter.so.6
-lib/ffmpeg3/libavfilter.so.6.82.100
+lib/ffmpeg3/libavfilter.so.6.107.100
 lib/ffmpeg3/libavformat.a
 lib/ffmpeg3/libavformat.so
 lib/ffmpeg3/libavformat.so.57
-lib/ffmpeg3/libavformat.so.57.71.100
+lib/ffmpeg3/libavformat.so.57.83.100
 lib/ffmpeg3/libavresample.a
 lib/ffmpeg3/libavresample.so
 lib/ffmpeg3/libavresample.so.3
-lib/ffmpeg3/libavresample.so.3.5.0
+lib/ffmpeg3/libavresample.so.3.7.0
 lib/ffmpeg3/libavutil.a
 lib/ffmpeg3/libavutil.so
 lib/ffmpeg3/libavutil.so.55
-lib/ffmpeg3/libavutil.so.55.58.100
+lib/ffmpeg3/libavutil.so.55.78.100
 lib/ffmpeg3/libpostproc.a
 lib/ffmpeg3/libpostproc.so
 lib/ffmpeg3/libpostproc.so.54
-lib/ffmpeg3/libpostproc.so.54.5.100
+lib/ffmpeg3/libpostproc.so.54.7.100
 lib/ffmpeg3/libswresample.a
 lib/ffmpeg3/libswresample.so
 lib/ffmpeg3/libswresample.so.2
-lib/ffmpeg3/libswresample.so.2.7.100
+lib/ffmpeg3/libswresample.so.2.9.100
 lib/ffmpeg3/libswscale.a
 lib/ffmpeg3/libswscale.so
 lib/ffmpeg3/libswscale.so.4
-lib/ffmpeg3/libswscale.so.4.6.100
+lib/ffmpeg3/libswscale.so.4.8.100
 lib/ffmpeg3/pkgconfig/libavcodec.pc
 lib/ffmpeg3/pkgconfig/libavdevice.pc
 lib/ffmpeg3/pkgconfig/libavfilter.pc
@@ -223,6 +226,7 @@ share/doc/ffmpeg3/snow.txt
 share/doc/ffmpeg3/swresample.txt
 share/doc/ffmpeg3/swscale.txt
 share/doc/ffmpeg3/tablegen.txt
+share/doc/ffmpeg3/undefined.txt
 share/doc/ffmpeg3/writing_filters.txt
 share/examples/ffmpeg3/ffserver.conf
 share/ffmpeg3/examples/Makefile
@@ -239,6 +243,7 @@ share/ffmpeg3/examples/filter_audio.c
 share/ffmpeg3/examples/filtering_audio.c
 share/ffmpeg3/examples/filtering_video.c
 share/ffmpeg3/examples/http_multiclient.c
+share/ffmpeg3/examples/hw_decode.c
 share/ffmpeg3/examples/metadata.c
 share/ffmpeg3/examples/muxing.c
 share/ffmpeg3/examples/qsvdec.c

Index: pkgsrc/multimedia/ffmpeg3/buildlink3.mk
diff -u pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.6 pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.7
--- pkgsrc/multimedia/ffmpeg3/buildlink3.mk:1.6 Fri Feb 24 21:48:08 2017
+++ pkgsrc/multimedia/ffmpeg3/buildlink3.mk     Wed Oct 18 20:25:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2017/02/24 21:48:08 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2017/10/18 20:25:41 adam Exp $
 
 BUILDLINK_TREE+=       ffmpeg3
 
@@ -10,7 +10,7 @@ BUILDLINK_ABI_DEPENDS.ffmpeg3+=       ffmpeg3>
 BUILDLINK_PKGSRCDIR.ffmpeg3?=  ../../multimedia/ffmpeg3
 
 pkgbase := ffmpeg3
-.  include "../../mk/pkg-build-options.mk"
+.include "../../mk/pkg-build-options.mk"
 
 .include "../../mk/bsd.fast.prefs.mk"
 

Index: pkgsrc/multimedia/ffmpeg3/distinfo
diff -u pkgsrc/multimedia/ffmpeg3/distinfo:1.22 pkgsrc/multimedia/ffmpeg3/distinfo:1.23
--- pkgsrc/multimedia/ffmpeg3/distinfo:1.22     Tue Sep 12 06:39:31 2017
+++ pkgsrc/multimedia/ffmpeg3/distinfo  Wed Oct 18 20:25:41 2017
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.22 2017/09/12 06:39:31 adam Exp $
+$NetBSD: distinfo,v 1.23 2017/10/18 20:25:41 adam Exp $
 
-SHA1 (ffmpeg-3.3.4.tar.bz2) = 6cf8f6d927d705b1844f601d93dd4036bd8d5b5d
-RMD160 (ffmpeg-3.3.4.tar.bz2) = 652ce9876a21b68e7da76b47debb8c39b542a461
-SHA512 (ffmpeg-3.3.4.tar.bz2) = d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a
-Size (ffmpeg-3.3.4.tar.bz2) = 9944256 bytes
-SHA1 (patch-Makefile) = acbb261efbb87e0ddacb827b3484033180b9fb83
-SHA1 (patch-configure) = 9ab46d77e8368011d098de3fae36127cdbfd6627
+SHA1 (ffmpeg-3.4.tar.bz2) = 6cfb7f4549a5b2dce6a8442ce16c76739c09dd6d
+RMD160 (ffmpeg-3.4.tar.bz2) = ea510945e0d28f7df27a22b00bd68e85ee093414
+SHA512 (ffmpeg-3.4.tar.bz2) = 43a8825140efdd41e2dd53fb0475adeb74e003842690cbc189aea0f1af696eec675951db30f9742d063f4e31ae6883256bdceaf2cc73d1dab0d144f72a0741e0
+Size (ffmpeg-3.4.tar.bz2) = 10171702 bytes
+SHA1 (patch-Makefile) = 0c35f53878b0420aeea49d8ccb249279e705eb40
+SHA1 (patch-configure) = ed50009ff973844427af7b5720af6493ebfce298
 SHA1 (patch-doc_Makefile) = 50ee7aaf74f8a5c439b11f141b5408322659543a
 SHA1 (patch-libavutil_common.h) = d0f1093bc82567807b39dde990ee347f90a082c9
 SHA1 (patch-libavutil_x86_asm.h) = 8f48f9e8ec08b5176bb40fc0021f3bb913dbef22

Index: pkgsrc/multimedia/ffmpeg3/options.mk
diff -u pkgsrc/multimedia/ffmpeg3/options.mk:1.9 pkgsrc/multimedia/ffmpeg3/options.mk:1.10
--- pkgsrc/multimedia/ffmpeg3/options.mk:1.9    Tue Oct  3 12:39:42 2017
+++ pkgsrc/multimedia/ffmpeg3/options.mk        Wed Oct 18 20:25:41 2017
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.9 2017/10/03 12:39:42 wiz Exp $
+# $NetBSD: options.mk,v 1.10 2017/10/18 20:25:41 adam Exp $
 
 # Global and legacy options
 
@@ -141,14 +141,16 @@ CONFIGURE_ARGS+=  --enable-libopus
 
 # Raspberry Pi support
 .if !empty(PKG_OPTIONS:Mrpi)
-.include "../../misc/raspberrypi-userland/buildlink3.mk"
+CONFIGURE_ARGS+=       --disable-xvmc
+CONFIGURE_ARGS+=       --enable-omx-rpi
+CONFIGURE_ARGS+=       --enable-mmal
 SUBST_CLASSES+=                vc
 SUBST_STAGE.vc=                pre-configure
 SUBST_MESSAGE.vc=      Fixing path to VideoCore libraries.
 SUBST_FILES.vc=                configure
 SUBST_SED.vc+=         -e 's;-isystem/opt/vc;-I${PREFIX};g'
 SUBST_SED.vc+=         -e 's;/opt/vc;${PREFIX};g'
-CONFIGURE_ARGS+=       --enable-omx-rpi --enable-mmal --disable-xvmc
+.include "../../misc/raspberrypi-userland/buildlink3.mk"
 .endif
 
 # XviD support

Index: pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile
diff -u pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile:1.2 pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile:1.3
--- pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile:1.2        Wed May 17 15:28:51 2017
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-Makefile    Wed Oct 18 20:25:41 2017
@@ -1,17 +1,15 @@
-$NetBSD: patch-Makefile,v 1.2 2017/05/17 15:28:51 he Exp $
+$NetBSD: patch-Makefile,v 1.3 2017/10/18 20:25:41 adam Exp $
 
 Do "install -c".
 
---- Makefile.orig      2016-01-15 16:58:32.000000000 +0000
+--- Makefile.orig      2017-10-15 15:59:36.000000000 +0000
 +++ Makefile
-@@ -159,8 +159,8 @@ install-progs: install-progs-yes $(AVPRO
+@@ -126,7 +126,7 @@ install-libs: install-libs-yes
  
- install-data: $(DATA_FILES) $(EXAMPLES_FILES)
-       $(Q)mkdir -p "$(DATADIR)/examples"
+ install-data: $(DATA_FILES)
+       $(Q)mkdir -p "$(DATADIR)"
 -      $(INSTALL) -m 644 $(DATA_FILES) "$(DATADIR)"
--      $(INSTALL) -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
 +      $(INSTALL) -c -m 644 $(DATA_FILES) "$(DATADIR)"
-+      $(INSTALL) -c -m 644 $(EXAMPLES_FILES) "$(DATADIR)/examples"
  
- uninstall: uninstall-libs uninstall-headers uninstall-progs uninstall-data
+ uninstall: uninstall-libs uninstall-headers uninstall-data
  

Index: pkgsrc/multimedia/ffmpeg3/patches/patch-configure
diff -u pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.4 pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.5
--- pkgsrc/multimedia/ffmpeg3/patches/patch-configure:1.4       Wed May 17 15:28:51 2017
+++ pkgsrc/multimedia/ffmpeg3/patches/patch-configure   Wed Oct 18 20:25:41 2017
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.4 2017/05/17 15:28:51 he Exp $
+$NetBSD: patch-configure,v 1.5 2017/10/18 20:25:41 adam Exp $
 
 Enable PIC on non-i386 NetBSD.
 
---- configure.orig     2016-10-27 16:17:39.000000000 +0000
+--- configure.orig     2017-10-15 15:59:36.000000000 +0000
 +++ configure
-@@ -4676,6 +4676,11 @@ case $target_os in
+@@ -4939,6 +4939,11 @@ case $target_os in
          ;;
      netbsd)
          disable symver
@@ -16,7 +16,7 @@ Enable PIC on non-i386 NetBSD.
          oss_indev_extralibs="-lossaudio"
          oss_outdev_extralibs="-lossaudio"
          enabled gcc || check_ldflags -Wl,-zmuldefs
-@@ -5138,10 +5143,13 @@ check_cc <<EOF && enable attribute_may_a
+@@ -5359,10 +5364,13 @@ check_cc <<EOF && enable attribute_may_a
  union { int x; } __attribute__((may_alias)) x;
  EOF
  
@@ -31,14 +31,5 @@ Enable PIC on non-i386 NetBSD.
  EOF
 -od -t x1 $TMPO | grep -q '42 *49 *47 *45' && enable bigendian
  
- if ! enabled ppc64 || enabled bigendian; then
-     disable vsx
-@@ -6805,7 +6814,7 @@ Version: $version
- Requires: $(enabled shared || echo $requires)
- Requires.private: $(enabled shared && echo $requires)
- Conflicts:
--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
+ check_cc <<EOF && enable const_nan
+ #include <math.h>