Update to 4.2.3

Match some changes/patches with upstream.

3 files changed, 40 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cee51f56c643..1524f0d72bbb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg-libfdk_aac
 	pkgdesc = Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)
-	pkgver = 4.2.2
-	pkgrel = 4
+	pkgver = 4.2.3
+	pkgrel = 1
 	epoch = 1
 	url = https://ffmpeg.org/
 	arch = x86_64
@@ -58,7 +58,9 @@ pkgbase = ffmpeg-libfdk_aac
 	depends = opus
 	depends = sdl2
 	depends = speex
+	depends = srt
 	depends = v4l-utils
+	depends = vmaf
 	depends = xz
 	depends = zlib
 	depends = libfdk-aac
@@ -73,10 +75,12 @@ pkgbase = ffmpeg-libfdk_aac
 	provides = libpostproc.so
 	provides = libswresample.so
 	provides = libswscale.so
-	provides = ffmpeg=4.2.2
+	provides = ffmpeg=4.2.3
 	conflicts = ffmpeg
-	source = git+https://git.ffmpeg.org/ffmpeg.git#tag=192d1d34eb3668fa27f433e96036340e1e5077a0
+	source = git+https://git.ffmpeg.org/ffmpeg.git#tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
+	source = vmaf-model-path.patch
 	sha256sums = SKIP
+	sha256sums = 8dff51f84a5f7460f8893f0514812f5d2bd668c3276ef7ab7713c99b71d7bd8d
 
 pkgname = ffmpeg-libfdk_aac
 
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 \
diff --git a/vmaf-model-path.patch b/vmaf-model-path.patch
new file mode 100644
index 000000000000..abd65cdf730a
--- /dev/null
+++ b/vmaf-model-path.patch
@@ -0,0 +1,13 @@
+diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
+index 249e50c720..9b791e19b1 100644
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+ 
+ static const AVOption libvmaf_options[] = {
+-    {"model_path",  "Set the model to be used for computing vmaf.",                     OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++    {"model_path",  "Set the model to be used for computing vmaf.",                     OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+     {"log_path",  "Set the file path to be used to store logs.",                        OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+     {"log_fmt",  "Set the format of the log (xml or json).",                            OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+     {"enable_transform",  "Enables transform for computing vmaf.",                      OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},