Update svt-av1. Remove legacy nvidia-340xx. Add openvino disabled.

- Now that svt-av1 0.84 is out, it seems that this stable version
  is suitable to be used here.

- Removed support for legacay nvidia-340xx drivers since I do not
  use it anymore.

- Added intel-openvino option in disabled mode. This is a new
  upstream option[1][2]. It looks like that ffmpeg segfaults
  when using it with an unsupported cpu. Users wanting to
  experiment with it will need to add -I and -L options with
  the corresponding include and library paths.

References
----------
[1] http://git.videolan.org/?p=ffmpeg.git;a=commit;h=ff37ebaf30e675227655d9055069471bb45e5ceb
[2] http://git.videolan.org/?p=ffmpeg.git;a=commit;h=9bcf2aa47756c253238903f3e5ef6c96d927cfe6

2 files changed, 10 insertions, 19 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2adb9f2c0352..e2aa728f04f3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ffmpeg-full-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)
-	pkgver = 4.4.r98323.gb35968e060
+	pkgver = 4.4.r98404.gc2d000ec27
 	pkgrel = 1
 	url = https://www.ffmpeg.org/
 	arch = x86_64
@@ -131,13 +131,13 @@ pkgbase = ffmpeg-full-git
 	source = 010-ffmpeg-fix-vmaf-model-path.patch
 	source = 020-ffmpeg-add-svt-hevc-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
 	source = 030-ffmpeg-add-svt-hevc-docs-1.4.3.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v1.4.3/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch
-	source = 040-ffmpeg-add-svt-av1-g7341224.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/7341224705ca83ae5f7a0ee78777e981b4656754/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
+	source = 040-ffmpeg-add-svt-av1-0.8.4.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v0.8.4/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch
 	source = LICENSE
 	sha256sums = SKIP
 	sha256sums = b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02
 	sha256sums = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6
 	sha256sums = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0
-	sha256sums = 09842ef78c66f39280ca62c9f6e14f9192ab253989ef23eefc52b3bf89d45bef
+	sha256sums = 65240283f30906482f8002c1f0d2763e5a2501008179480cc94afa4bdaab5ed5
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
 
 pkgname = ffmpeg-full-git
diff --git a/PKGBUILD b/PKGBUILD
index a83284964bc5..c5522a127f99 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Maintainer: Daniel Bermond <dbermond@archlinux.org>
 
 _svt_hevc_ver='1.4.3'
-_svt_av1_ver='7341224705ca83ae5f7a0ee78777e981b4656754'
+_svt_av1_ver='0.8.4'
 
 pkgname=ffmpeg-full-git
-pkgver=4.4.r98323.gb35968e060
+pkgver=4.4.r98404.gc2d000ec27
 pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac; git version)'
 arch=('x86_64')
@@ -44,13 +44,13 @@ source=('git+https://git.ffmpeg.org/ffmpeg.git'
         '010-ffmpeg-fix-vmaf-model-path.patch'
         "020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch"
         "030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/v${_svt_hevc_ver}/ffmpeg_plugin/0002-doc-Add-libsvt_hevc-encoder-docs.patch"
-        "040-ffmpeg-add-svt-av1-g${_svt_av1_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch"
+        "040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-AV1/v${_svt_av1_ver}/ffmpeg_plugin/0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch"
         'LICENSE')
 sha256sums=('SKIP'
             'b6fcef2f4cbb1daa47d17245702fbd67ab3289b6b16f090ab99b9c2669453a02'
             '878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6'
             '1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0'
-            '09842ef78c66f39280ca62c9f6e14f9192ab253989ef23eefc52b3bf89d45bef'
+            '65240283f30906482f8002c1f0d2763e5a2501008179480cc94afa4bdaab5ed5'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
 
 prepare() {
@@ -58,7 +58,7 @@ prepare() {
     patch -d ffmpeg -Np1 -i "${srcdir}/010-ffmpeg-fix-vmaf-model-path.patch"
     patch -d ffmpeg -Np1 -i "${srcdir}/020-ffmpeg-add-svt-hevc-${_svt_hevc_ver}.patch"
     patch -d ffmpeg -Np1 -i "${srcdir}/030-ffmpeg-add-svt-hevc-docs-${_svt_hevc_ver}.patch"
-    patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-av1-g${_svt_av1_ver:0:7}.patch"
+    patch -d ffmpeg -Np1 -i "${srcdir}/040-ffmpeg-add-svt-av1-${_svt_av1_ver}.patch"
 }
 
 pkgver() {
@@ -73,22 +73,12 @@ pkgver() {
 
 build() {
     cd ffmpeg
-    
-    local _ldflags='-L/opt/cuda/lib64'
-    
-    # set path of -lcuda on systems with legacy nvidia-340xx drivers
-    # (libcuda.so.x, required by --enable-cuda-nvcc)
-    if pacman -Qs '^nvidia-340xx-utils' >/dev/null 2>&1
-    then
-        _ldflags+=' -L/usr/lib/nvidia'
-    fi
-    
     printf '%s\n' '  -> Running ffmpeg configure script...'
     
     ./configure \
         --prefix='/usr' \
         --extra-cflags='-I/opt/cuda/include -I/usr/include/tensorflow' \
-        --extra-ldflags="$_ldflags" \
+        --extra-ldflags='-L/opt/cuda/lib64' \
         \
         --disable-rpath \
         --enable-gpl \
@@ -145,6 +135,7 @@ build() {
         --enable-libopenh264 \
         --enable-libopenjpeg \
         --enable-libopenmpt \
+        --disable-libopenvino \
         --enable-libopus \
         --enable-libpulse \
         --enable-librabbitmq \