Add fix for v4l2 memory leak. Update and reorganize dependencies.

Added a patch for the bug that I reported[1] on the ffmpeg bug
tracker. It's now fixed[2] on the current git master.

libopenmpt and openh264 are now on the official repositories.

No need to depend on libopenmpt-svn anymore, since the repository
one is obviously in good shape.

References
----------
[1] https://trac.ffmpeg.org/ticket/9844
[2] https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/30aa0c3f4873a92c5e3da8ba8cf030de56bf4cf7

2 files changed, 82 insertions, 87 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 23e584de3453..b2a13535cf1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,125 +1,125 @@
 pkgbase = ffmpeg-full
 	pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)
 	pkgver = 5.1
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.ffmpeg.org/
 	arch = x86_64
 	license = custom: nonfree and unredistributable
+	makedepends = clang
+	makedepends = amf-headers
+	makedepends = ffnvcodec-headers
 	makedepends = nasm
 	makedepends = opencl-headers
 	makedepends = vulkan-headers
-	makedepends = ffnvcodec-headers
-	makedepends = clang
-	makedepends = amf-headers
 	makedepends = decklink-sdk
 	depends = alsa-lib
+	depends = aom
+	depends = aribb24
 	depends = avisynthplus
 	depends = bzip2
+	depends = celt
+	depends = codec2
+	depends = cuda
+	depends = dav1d
+	depends = fontconfig
+	depends = freetype2
+	depends = fribidi
+	depends = glslang
 	depends = frei0r-plugins
-	depends = libgcrypt
 	depends = gmp
 	depends = gnutls
+	depends = gsm
+	depends = intel-media-sdk
+	depends = jack
+	depends = kvazaar
 	depends = ladspa
+	depends = lame
+	depends = libavc1394
 	depends = lcms2
-	depends = aom
-	depends = aribb24
+	depends = lensfun-git
 	depends = libass
 	depends = libbluray
 	depends = libbs2b
 	depends = libcaca
-	depends = celt
 	depends = libcdio-paranoia
-	depends = codec2
-	depends = dav1d
 	depends = libdc1394
-	depends = libavc1394
+	depends = libdrm
 	depends = libfdk-aac
-	depends = fontconfig
-	depends = freetype2
-	depends = fribidi
-	depends = glslang
-	depends = spirv-tools
 	depends = libgme
-	depends = gsm
+	depends = libgl
+	depends = libgcrypt
 	depends = libiec61883
 	depends = libilbc
-	depends = jack
 	depends = libjxl-git
-	depends = kvazaar
 	depends = libmodplug
-	depends = lame
-	depends = opencore-amr
-	depends = openjpeg2
-	depends = opus
+	depends = libmysofa
+	depends = libomxil-bellagio
 	depends = libplacebo
 	depends = libpulse
 	depends = librabbitmq-c
-	depends = rav1e
 	depends = librsvg
+	depends = libssh
+	depends = libsoxr
+	depends = libtheora
+	depends = libva
+	depends = libvdpau
+	depends = libvorbis
+	depends = libvpx
+	depends = libx11
+	depends = libxcb
+	depends = libxext
+	depends = libxml2
+	depends = libxv
+	depends = libwebp
+	depends = lilv
+	depends = lv2
+	depends = ocl-icd
+	depends = openal
+	depends = opencore-amr
+	depends = openh264
+	depends = openjpeg2
+	depends = libopenmpt
+	depends = opus
+	depends = rav1e
 	depends = rubberband
 	depends = rtmpdump
+	depends = sdl2
 	depends = smbclient
 	depends = snappy
-	depends = libsoxr
+	depends = sndio
 	depends = speex
+	depends = spirv-tools
 	depends = srt
-	depends = libssh
 	depends = svt-av1
 	depends = svt-hevc
 	depends = svt-vp9
 	depends = tesseract
-	depends = libtheora
 	depends = twolame
 	depends = v4l-utils
+	depends = vapoursynth
 	depends = vid.stab
 	depends = vmaf
-	depends = libvorbis
-	depends = libvpx
-	depends = libwebp
+	depends = vulkan-icd-loader
 	depends = x264
 	depends = x265
-	depends = libxcb
 	depends = xvidcore
-	depends = libxml2
-	depends = zimg
-	depends = zeromq
-	depends = zvbi
-	depends = lv2
-	depends = lilv
 	depends = xz
-	depends = libmysofa
-	depends = openal
-	depends = ocl-icd
-	depends = libgl
-	depends = sndio
-	depends = sdl2
-	depends = vapoursynth
-	depends = vulkan-icd-loader
-	depends = libxv
-	depends = libx11
-	depends = libxext
+	depends = zeromq
+	depends = zimg
 	depends = zlib
-	depends = cuda
-	depends = libomxil-bellagio
-	depends = libdrm
-	depends = intel-media-sdk
-	depends = libva
-	depends = libvdpau
+	depends = zvbi
 	depends = chromaprint-fftw
 	depends = davs2
 	depends = flite1
 	depends = libklvanc-git
-	depends = openh264
-	depends = libopenmpt-svn
 	depends = librist
+	depends = pocketsphinx
+	depends = rockchip-mpp
 	depends = shine
 	depends = uavs3d-git
 	depends = vo-amrwbenc
 	depends = xavs
 	depends = xavs2
-	depends = pocketsphinx
-	depends = rockchip-mpp
-	depends = lensfun-git
 	provides = libavcodec.so
 	provides = libavdevice.so
 	provides = libavfilter.so
@@ -136,6 +136,7 @@ pkgbase = ffmpeg-full
 	source = 030-ffmpeg-add-svt-vp9-gd9ef3cc.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/d9ef3cc13159143b9afc776c04f67cdfa6284046/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch
 	source = 040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch
 	source = 060-ffmpeg-fix-segfault-with-avisynthplus.patch
+	source = 070-ffmpeg-fix-v4l2-memory-leak.patch::https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/30aa0c3f4873a92c5e3da8ba8cf030de56bf4cf7
 	source = LICENSE
 	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
 	sha256sums = 55eb6aab5ee235550fa54a33eaf8bf1b4ec66c01453182b12f6a993d75698b03
@@ -144,6 +145,7 @@ pkgbase = ffmpeg-full
 	sha256sums = e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c
 	sha256sums = 2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c
 	sha256sums = b1d68f626168f2409a4b0987acf5b208e7ced2ddab49b11990a10f458d377e9a
+	sha256sums = 9e4e290378028cd4474c36d3e3a25f77d4f40424dbd3115632e20c5734b50979
 	sha256sums = 04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36
 
 pkgname = ffmpeg-full
diff --git a/PKGBUILD b/PKGBUILD
index 44aac329675e..833d838515cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,38 +3,28 @@
 
 pkgname=ffmpeg-full
 pkgver=5.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including libfdk-aac)'
 arch=('x86_64')
 url='https://www.ffmpeg.org/'
 license=('custom: nonfree and unredistributable')
-depends=(
-    # official repositories:
-        'alsa-lib' 'avisynthplus' 'bzip2' 'frei0r-plugins' 'libgcrypt' 'gmp' 'gnutls'
-        'ladspa' 'lcms2' 'aom' 'aribb24' 'libass' 'libbluray' 'libbs2b' 'libcaca'
-        'celt' 'libcdio-paranoia' 'codec2' 'dav1d' 'libdc1394' 'libavc1394' 'libfdk-aac'
-        'fontconfig' 'freetype2' 'fribidi' 'glslang' 'spirv-tools' 'libgme' 'gsm'
-        'libiec61883' 'libilbc' 'jack' 'libjxl-git' 'kvazaar' 'libmodplug' 'lame'
-        'opencore-amr' 'openjpeg2' 'opus' 'libplacebo' 'libpulse' 'librabbitmq-c'
-        'rav1e' 'librsvg' 'rubberband' 'rtmpdump' 'smbclient' 'snappy' 'libsoxr' 'speex'
-        'srt' 'libssh' 'svt-av1' 'svt-hevc' 'svt-vp9' 'tesseract' 'libtheora' 'twolame'
-        'v4l-utils' 'vid.stab' 'vmaf' 'libvorbis' 'libvpx' 'libwebp' 'x264' 'x265'
-        'libxcb' 'xvidcore' 'libxml2' 'zimg' 'zeromq' 'zvbi' 'lv2' 'lilv' 'xz'
-        'libmysofa' 'openal' 'ocl-icd' 'libgl' 'sndio' 'sdl2' 'vapoursynth'
-        'vulkan-icd-loader' 'libxv' 'libx11' 'libxext' 'zlib' 'cuda'
-        'libomxil-bellagio' 'libdrm' 'intel-media-sdk' 'libva' 'libvdpau'
-    # AUR:
-        'chromaprint-fftw' 'davs2' 'flite1' 'libklvanc-git' 'openh264'
-        'libopenmpt-svn' 'librist' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs'
-        'xavs2' 'pocketsphinx' 'rockchip-mpp' 'lensfun-git'
-)
-makedepends=(
-    # official repositories:
-        'nasm' 'opencl-headers' 'vulkan-headers' 'ffnvcodec-headers' 'clang'
-        'amf-headers'
-    # AUR:
-        'decklink-sdk'
-)
+depends=('alsa-lib' 'aom' 'aribb24' 'avisynthplus' 'bzip2' 'celt' 'codec2' 'cuda'
+         'dav1d' 'fontconfig' 'freetype2' 'fribidi' 'glslang' 'frei0r-plugins' 'gmp'
+         'gnutls' 'gsm' 'intel-media-sdk' 'jack' 'kvazaar' 'ladspa' 'lame' 'libavc1394'
+         'lcms2' 'lensfun-git' 'libass' 'libbluray' 'libbs2b' 'libcaca' 'libcdio-paranoia'
+         'libdc1394' 'libdrm' 'libfdk-aac' 'libgme' 'libgl' 'libgcrypt' 'libiec61883'
+         'libilbc' 'libjxl-git' 'libmodplug' 'libmysofa' 'libomxil-bellagio' 'libplacebo'
+         'libpulse' 'librabbitmq-c' 'librsvg' 'libssh' 'libsoxr' 'libtheora' 'libva'
+         'libvdpau' 'libvorbis' 'libvpx' 'libx11' 'libxcb' 'libxext' 'libxml2' 'libxv'
+         'libwebp' 'lilv' 'lv2' 'ocl-icd' 'openal' 'opencore-amr' 'openh264' 'openjpeg2'
+         'libopenmpt' 'opus' 'rav1e' 'rubberband' 'rtmpdump' 'sdl2' 'smbclient' 'snappy'
+         'sndio' 'speex' 'spirv-tools' 'srt' 'svt-av1' 'svt-hevc' 'svt-vp9' 'tesseract'
+         'twolame' 'v4l-utils' 'vapoursynth' 'vid.stab' 'vmaf' 'vulkan-icd-loader' 'x264'
+         'x265' 'xvidcore' 'xz' 'zeromq' 'zimg' 'zlib' 'zvbi'
+         'chromaprint-fftw' 'davs2' 'flite1' 'libklvanc-git' 'librist' 'pocketsphinx'
+         'rockchip-mpp' 'shine' 'uavs3d-git' 'vo-amrwbenc' 'xavs' 'xavs2')
+makedepends=('clang' 'amf-headers' 'ffnvcodec-headers' 'nasm' 'opencl-headers'
+             'vulkan-headers' 'decklink-sdk')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavutil.so' 'libpostproc.so' 'libswscale.so' 'libswresample.so'
           'ffmpeg')
@@ -47,6 +37,7 @@ source=("https://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
         "030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"::"https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/${_svt_vp9_ver}/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch"
         '040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch'
         '060-ffmpeg-fix-segfault-with-avisynthplus.patch'
+        '070-ffmpeg-fix-v4l2-memory-leak.patch'::'https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/30aa0c3f4873a92c5e3da8ba8cf030de56bf4cf7'
         'LICENSE')
 sha256sums=('55eb6aab5ee235550fa54a33eaf8bf1b4ec66c01453182b12f6a993d75698b03'
             'SKIP'
@@ -54,6 +45,7 @@ sha256sums=('55eb6aab5ee235550fa54a33eaf8bf1b4ec66c01453182b12f6a993d75698b03'
             'e310eedb3dc88c8ad6ffcd6cb6bde1f593ded330ea99b0356724c9d22bcfde4c'
             '2df82046908015bf26bc1303275cf52ba01fa380029a54ea6415373e389e423c'
             'b1d68f626168f2409a4b0987acf5b208e7ced2ddab49b11990a10f458d377e9a'
+            '9e4e290378028cd4474c36d3e3a25f77d4f40424dbd3115632e20c5734b50979'
             '04a7176400907fd7db0d69116b99de49e582a6e176b3bfb36a03e50a4cb26a36')
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
 
@@ -64,6 +56,7 @@ prepare() {
     patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/030-ffmpeg-add-svt-vp9-g${_svt_vp9_ver:0:7}.patch"
     patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/040-ffmpeg-add-av_stream_get_first_dts-for-chromium.patch"
     patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/060-ffmpeg-fix-segfault-with-avisynthplus.patch"
+    patch -d "ffmpeg-${pkgver}" -Np1 -i "${srcdir}/070-ffmpeg-fix-v4l2-memory-leak.patch"
 }
 
 build() {