Update to 4.2.3

Match some changes/patches with upstream.

1 files changed, 19 insertions, 5 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 600d4406080d..f6ed17b2aeae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 
 _name=ffmpeg
 pkgname=ffmpeg-libfdk_aac
-pkgver=4.2.2
-pkgrel=4
+pkgver=4.2.3
+pkgrel=1
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
 arch=(x86_64)
@@ -64,7 +64,9 @@ depends=(
   opus
   sdl2
   speex
+  srt
   v4l-utils
+  vmaf
   xz
   zlib
   libfdk-aac
@@ -91,9 +93,14 @@ provides=(
   libswscale.so
   "ffmpeg=$pkgver"
 )
+  
 conflicts=("$_name")
-source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=192d1d34eb3668fa27f433e96036340e1e5077a0)
-sha256sums=('SKIP')
+source=(git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+        vmaf-model-path.patch)
+sha256sums=(
+  SKIP
+  8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
+)
 pkgver() {
   cd ffmpeg
 
@@ -103,7 +110,11 @@ pkgver() {
 prepare() {
   cd ffmpeg
 
-  git cherry-pick -n dc0806dd25882f41f6085c8356712f95fded56c7
+  # lavf/mp3dec: don't adjust start time; packets are not adjusted
+  # https://crbug.com/1062037
+  git cherry-pick -n 460132c9980f8a1f501a1f69477bca49e1641233
+
+  patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
 }
 build() {
   cd ffmpeg
@@ -113,6 +124,7 @@ build() {
     --disable-debug \
     --disable-static \
     --disable-stripping \
+    --enable-avisynth \
     --enable-fontconfig \
     --enable-gmp \
     --enable-gpl \
@@ -137,10 +149,12 @@ build() {
     --enable-libpulse \
     --enable-libsoxr \
     --enable-libspeex \
+    --enable-libsrt \
     --enable-libssh \
     --enable-libtheora \
     --enable-libv4l2 \
     --enable-libvidstab \
+    --enable-libvmaf \
     --enable-libvorbis \
     --enable-libvpx \
     --enable-libwebp \