Updated to 3.4

3 files changed, 50 insertions, 132 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3a21207e6aaa..3a58688d474d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Sat Sep 16 21:05:21 UTC 2017
+# Wed Oct 18 08:42:19 UTC 2017
 pkgbase = ffmpeg-full-nvenc
 	pkgdesc = Record, convert, and stream audio and video (all codecs including Nvidia NVENC)
-	pkgver = 3.3.4
+	pkgver = 3.4
 	pkgrel = 1
 	epoch = 1
 	url = http://ffmpeg.org/
@@ -13,8 +13,9 @@ pkgbase = ffmpeg-full-nvenc
 	makedepends = flite
 	makedepends = libmfx
 	makedepends = libvdpau
-	makedepends = yasm
+	makedepends = nasm
 	makedepends = opencl-headers
+	makedepends = libvmaf
 	depends = alsa-lib
 	depends = bzip2
 	depends = celt
@@ -42,17 +43,18 @@ pkgbase = ffmpeg-full-nvenc
 	depends = libilbc
 	depends = libmodplug
 	depends = libomxil-bellagio
+	depends = libmysofa
 	depends = libpulse
+	depends = librsvg
 	depends = libsoxr
 	depends = libssh
 	depends = libtheora
 	depends = libva
 	depends = libvdpau
 	depends = libwebp
+	depends = libxml2
 	depends = libxv
 	depends = mesa
-	depends = netcdf
-	depends = nut-multimedia-git
 	depends = openal
 	depends = opencore-amr
 	depends = opencv
@@ -64,7 +66,6 @@ pkgbase = ffmpeg-full-nvenc
 	depends = opus
 	depends = rubberband
 	depends = rtmpdump
-	depends = schroedinger
 	depends = sdl2
 	depends = smbclient
 	depends = speex
@@ -108,15 +109,14 @@ pkgbase = ffmpeg-full-nvenc
 	conflicts = ffmpeg-git
 	conflicts = ffmpeg-full-git
 	conflicts = ffmpeg-full-extra
-	source = https://ffmpeg.org/releases/ffmpeg-3.3.4.tar.xz
-	source = https://ffmpeg.org/releases/ffmpeg-3.3.4.tar.xz.asc
+	source = https://ffmpeg.org/releases/ffmpeg-3.4.tar.xz
+	source = https://ffmpeg.org/releases/ffmpeg-3.4.tar.xz.asc
 	source = UNREDISTRIBUTABLE.txt
-	source = ffmpeg-openjpeg2.2.patch
-	sha256sums = 98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957
+	sha256sums = aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef
 	sha256sums = SKIP
 	sha256sums = e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4
-	sha256sums = 490598f78d7879af8ef5b8d7f92ada83d0ee64f9609f6c7b989eb331c2539f68
 	depends_x86_64 = cuda
+	depends_x86_64 = nvidia-utils
 	optdepends_x86_64 = intel-media-sdk: for Intel QSV support (Experimental! See PKGBUILD of that package for additional info)
 
 pkgname = ffmpeg-full-nvenc
diff --git a/PKGBUILD b/PKGBUILD
index 0ce0c8bac24b..6d380c120363 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,11 +13,12 @@
 #
 # Add "--enable-decklink \" to configure flags
 # if you have decklink-sdk installed
-#
+# Add "--enable-libndi_newtek \" to configure flags
+# if you have ndi-sdk installed
 
 pkgname=ffmpeg-full-nvenc
 _pkgbasename=ffmpeg
-pkgver=3.3.4
+pkgver=3.4
 pkgrel=1
 epoch=1
 pkgdesc="Record, convert, and stream audio and video (all codecs including Nvidia NVENC)"
@@ -28,16 +29,16 @@ depends=('alsa-lib' 'bzip2' 'celt' 'chromaprint-fftw' 'fontconfig' 'frei0r-plugi
          'fribidi' 'glibc' 'gnutls' 'gsm' 'jack' 'kvazaar' 'ladspa' 'lame' 'libass' 
          'libavc1394' 'libbluray' 'libbs2b' 'libcaca' 'libcdio-paranoia' 'libdc1394'
          'libfdk-aac' 'libgme' 'libiec61883' 'libilbc' 'libmodplug' 'libomxil-bellagio'
-         'libpulse' 'libsoxr' 'libssh' 'libtheora' 'libva' 'libvdpau' 'libwebp'
-         'libxv' 'mesa' 'netcdf' 'nut-multimedia-git' 'openal' 'opencore-amr'
+         'libmysofa' 'libpulse' 'librsvg' 'libsoxr' 'libssh' 'libtheora' 'libva' 
+         'libvdpau' 'libwebp' 'libxml2' 'libxv' 'mesa' 'openal' 'opencore-amr'
          'opencv' 'opencl-driver' 'opencl-icd-loader' 'openh264' 
-         'openjpeg2' 'libopenmpt-svn' 'opus' 'rubberband' 'rtmpdump' 'schroedinger'
+         'openjpeg2' 'libopenmpt-svn' 'opus' 'rubberband' 'rtmpdump'
          'sdl2' 'smbclient' 'speex' 'shine' 'tesseract' 'twolame' 'v4l-utils'
          'vid.stab' 'vo-amrwbenc' 'libxcb' 'xvidcore' 'xz' 'wavpack' 'zeromq' 'zimg'
          'zlib' 'zvbi' 'libvorbisenc.so' 'libvorbis.so' 'libvpx.so' 'libx264.so'
          'libx265.so' 'snappy' 'sndio' 'xavs')
-depends_x86_64=('cuda')
-makedepends=('flite' 'libmfx' 'libvdpau' 'yasm' 'opencl-headers')
+depends_x86_64=('cuda' 'nvidia-utils')
+makedepends=('flite' 'libmfx' 'libvdpau' 'nasm' 'opencl-headers' 'libvmaf')
 optdepends=('avxsynth-git: for Avisynth support'
             'blackmagic-decklink-sdk: for Blackmagic DeckLink support; need to add --enable-decklink option in this PKGBUILD')
 optdepends_x86_64=('intel-media-sdk: for Intel QSV support (Experimental! See PKGBUILD of that package for additional info)')
@@ -46,18 +47,11 @@ provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
           'libswscale.so' 'ffmpeg' 'qt-faststart')
 source=(https://ffmpeg.org/releases/$_pkgbasename-$pkgver.tar.xz{,.asc}
-        'UNREDISTRIBUTABLE.txt'
-        'ffmpeg-openjpeg2.2.patch')
+        'UNREDISTRIBUTABLE.txt')
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
-sha256sums=('98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957'
+sha256sums=('aeee06e4d8b18d852c61ebbfe5e1bb7014b1e118e8728c1c2115f91e51bffbef'
             'SKIP'
-            'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4'
-            '490598f78d7879af8ef5b8d7f92ada83d0ee64f9609f6c7b989eb331c2539f68')
-
-prepare() {
-  cd $_pkgbasename-$pkgver
-  patch -Np1 -i ../ffmpeg-openjpeg2.2.patch
-}
+            'e0c1b126862072a71e18b9580a6b01afc76a54aa6e642d2c413ba0ac9d3010c4')
 
 build() {
   cd $_pkgbasename-$pkgver
@@ -65,11 +59,25 @@ build() {
   # Add x86_64 (opt)depends to the build
   if [ "$CARCH" = "x86_64" ]
   then
-      _cuda="--enable-cuda"
-      _cuvid="--enable-cuvid"
-      _libnpp="--enable-libnpp"
-      _cflags="--extra-cflags=-I/opt/cuda/include"
-      _ldflags="--extra-ldflags=-L/opt/cuda/lib64 -Wl,-rpath -Wl,/opt/intel/mediasdk/lib64:/opt/intel/mediasdk/plugins"
+      local _cuda='--enable-cuda'
+      local _cudasdk='--enable-cuda-sdk'
+      local _cuvid='--enable-cuvid'
+      local _libnpp='--enable-libnpp'
+      local _cflags='--extra-cflags=-I/opt/cuda/include'
+      
+      # '-L/usr/lib/nvidia' (for cuda_sdk) needs to be enabled only on
+      # systems with nvidia-340xx-utils or nvidia-304xx-utils
+      if pacman -Qqs '^nvidia-340xx-utils$' | grep -q '^nvidia-340xx-utils$' ||
+         pacman -Qqs '^nvidia-304xx-utils$' | grep -q '^nvidia-304xx-utils$'
+      then
+          local _nvidia_340xx_ldflags='-L/usr/lib/nvidia'
+      fi
+      local _ldflags="--extra-ldflags=-L/opt/cuda/lib64 ${_nvidia_340xx_ldflags}"
+      local _ldflags="${_ldflags} -Wl,-rpath -Wl,/opt/intel/mediasdk/lib64:/opt/intel/mediasdk/plugins"
+      
+      # strictly specifying nvcc path is needed if package is installing
+      # cuda for the first time (nvcc path will be in $PATH only after relogin)
+      sed -i "s@^nvcc_default=.*@nvcc_default='/opt/cuda/bin/nvcc'@" configure
   fi
 
   msg "Starting configure..."
@@ -93,15 +101,18 @@ build() {
     \
     \
     $_cuda \
+    $_cudasdk \
     $_cuvid \
     $_libnpp \
     \
+    --enable-libdrm \
     --enable-libmfx \
     --enable-nvenc \
     --enable-omx \
     --enable-omx-rpi \
     \
     \
+    --enable-alsa \
     --enable-avisynth \
     --enable-chromaprint \
     --enable-decoder=atrac3 \
@@ -113,6 +124,7 @@ build() {
     --enable-gpl \
     --enable-gray \
     --enable-iconv \
+    --enable-jack \
     --enable-ladspa \
     --enable-libass \
     --enable-libbluray \
@@ -131,7 +143,7 @@ build() {
     --enable-libkvazaar \
     --enable-libmodplug \
     --enable-libmp3lame \
-    --enable-libnut \
+    --enable-libmysofa \
     --enable-libopencore-amrnb \
     --enable-libopencore-amrwb \
     --enable-libopencv \
@@ -140,9 +152,9 @@ build() {
     --enable-libopenmpt \
     --enable-libopus \
     --enable-libpulse \
+    --enable-librsvg \
     --enable-librubberband \
     --enable-librtmp  \
-    --enable-libschroedinger \
     --enable-libshine \
     --enable-libsmbclient \
     --enable-libsnappy \
@@ -154,6 +166,7 @@ build() {
     --enable-libtwolame \
     --enable-libv4l2 \
     --enable-libvidstab \
+    --enable-libvmaf \
     --enable-libvo-amrwbenc \
     --enable-libvorbis \
     --enable-libvpx \
@@ -167,19 +180,19 @@ build() {
     --enable-libxcb-xfixes \
     --enable-libxcb-shape \
     --enable-libxvid \
+    --enable-libxml2 \
     --enable-libzimg \
     --enable-libzmq \
     --enable-libzvbi \
     --enable-lzma \
-    --enable-netcdf \
     --enable-openal \
     --enable-opencl \
     --enable-opengl \
     --enable-openssl \
+    --enable-sndio \
     --enable-sdl2 \
     --enable-vaapi \
     --enable-vdpau \
-    --enable-videotoolbox \
     --enable-xlib \
     --enable-zlib
 
diff --git a/ffmpeg-openjpeg2.2.patch b/ffmpeg-openjpeg2.2.patch
deleted file mode 100644
index d23c91453dc3..000000000000
--- a/ffmpeg-openjpeg2.2.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff -rupN ffmpeg-3.3.3.orig/configure ffmpeg-3.3.3/configure
---- ffmpeg-3.3.3.orig/configure	2017-07-29 19:49:29.000000000 +0200
-+++ ffmpeg-3.3.3/configure	2017-08-15 13:21:28.782566614 +0200
-@@ -1875,6 +1875,7 @@ HEADERS_LIST="
-     machine_ioctl_meteor_h
-     malloc_h
-     opencv2_core_core_c_h
-+    openjpeg_2_2_openjpeg_h
-     openjpeg_2_1_openjpeg_h
-     openjpeg_2_0_openjpeg_h
-     openjpeg_1_5_openjpeg_h
-@@ -5805,7 +5806,9 @@ enabled libopencv         && { check_hea
-                                  require opencv opencv2/core/core_c.h cvCreateImageHeader -lopencv_core -lopencv_imgproc; } ||
-                                require_pkg_config opencv opencv/cxcore.h cvCreateImageHeader; }
- enabled libopenh264       && require_pkg_config openh264 wels/codec_api.h WelsGetCodecVersion
--enabled libopenjpeg       && { { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+enabled libopenjpeg       && { { check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-+                               check_lib openjpeg-2.2/openjpeg.h opj_version -lopenjp2 ||
-+                               { check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                check_lib openjpeg-2.1/openjpeg.h opj_version -lopenjp2 ||
-                                { check_lib openjpeg-2.0/openjpeg.h opj_version -lopenjp2 -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-                                { check_lib openjpeg-1.5/openjpeg.h opj_version -lopenjpeg -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } ||
-diff -rupN ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c ffmpeg-3.3.3/libavcodec/libopenjpegdec.c
---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegdec.c	2017-07-29 19:49:30.000000000 +0200
-+++ ffmpeg-3.3.3/libavcodec/libopenjpegdec.c	2017-08-15 13:21:28.869233484 +0200
-@@ -34,7 +34,9 @@
- #include "internal.h"
- #include "thread.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -44,7 +46,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -429,7 +431,7 @@ static int libopenjpeg_decode_frame(AVCo
-     opj_stream_set_read_function(stream, stream_read);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &reader);
-diff -rupN ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c ffmpeg-3.3.3/libavcodec/libopenjpegenc.c
---- ffmpeg-3.3.3.orig/libavcodec/libopenjpegenc.c	2017-07-29 19:49:30.000000000 +0200
-+++ ffmpeg-3.3.3/libavcodec/libopenjpegenc.c	2017-08-15 13:21:28.869233484 +0200
-@@ -32,7 +32,9 @@
- #include "avcodec.h"
- #include "internal.h"
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H
-+#  include <openjpeg-2.2/openjpeg.h>
-+#elif HAVE_OPENJPEG_2_1_OPENJPEG_H
- #  include <openjpeg-2.1/openjpeg.h>
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  include <openjpeg-2.0/openjpeg.h>
-@@ -42,7 +44,7 @@
- #  include <openjpeg.h>
- #endif
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H || HAVE_OPENJPEG_2_0_OPENJPEG_H
- #  define OPENJPEG_MAJOR_VERSION 2
- #  define OPJ(x) OPJ_##x
- #else
-@@ -305,7 +307,7 @@ static av_cold int libopenjpeg_encode_in
- 
-     opj_set_default_encoder_parameters(&ctx->enc_params);
- 
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     switch (ctx->cinema_mode) {
-     case OPJ_CINEMA2K_24:
-         ctx->enc_params.rsiz = OPJ_PROFILE_CINEMA_2K;
-@@ -769,7 +771,7 @@ static int libopenjpeg_encode_frame(AVCo
-     opj_stream_set_write_function(stream, stream_write);
-     opj_stream_set_skip_function(stream, stream_skip);
-     opj_stream_set_seek_function(stream, stream_seek);
--#if HAVE_OPENJPEG_2_1_OPENJPEG_H
-+#if HAVE_OPENJPEG_2_2_OPENJPEG_H || HAVE_OPENJPEG_2_1_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer, NULL);
- #elif HAVE_OPENJPEG_2_0_OPENJPEG_H
-     opj_stream_set_user_data(stream, &writer);