[arch-commits] Commit in ffmpeg/trunk (PKGBUILD)

[Maxime Gauduin]

    Date: Tuesday, June 16, 2020 @ 10:36:56
  Author: alucryd
Revision: 389297

upgpkg: ffmpeg 2:4.2.3-1

Modified:
  ffmpeg/trunk/PKGBUILD

----------+
 PKGBUILD |   12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-06-16 07:46:46 UTC (rev 389296)
+++ PKGBUILD	2020-06-16 10:36:56 UTC (rev 389297)
@@ -5,9 +5,9 @@
 # Contributor: Paul Mattal <paul at archlinux.org>
 
 pkgname=ffmpeg
-pkgver=4.3
+pkgver=4.2.3
 pkgrel=1
-epoch=1
+epoch=2
 pkgdesc='Complete solution to record, convert and stream audio and video'
 arch=(x86_64)
 url=https://ffmpeg.org/
@@ -34,7 +34,6 @@
   libmodplug
   libomxil-bellagio
   libpulse
-  librav1e.so
   libraw1394
   libsoxr
   libssh
@@ -90,7 +89,7 @@
   libswresample.so
   libswscale.so
 )
-_tag=8e12af29d1a3f95c9e952d78354e3c8b1c0431a8
+_tag=d3b963cc41824a3c5b2758ac896fb23e20a87875
 source=(
   git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
   vmaf-model-path.patch
@@ -113,6 +112,10 @@
   # https://crbug.com/1062037
   git cherry-pick -n 460132c9980f8a1f501a1f69477bca49e1641233
 
+  # backport avisynthplus support
+  git show 6d8cddd1c67758636843f6a08295b3896c2e9ef8 -- libavformat/avisynth.c | git apply -
+  git show 56f59246293de417d27ea7e27cb9a7727ee579fb -- libavformat/avisynth.c | git apply -
+
   patch -Np1 -i "${srcdir}"/vmaf-model-path.patch
 }
 
@@ -148,7 +151,6 @@
     --enable-libopenjpeg \
     --enable-libopus \
     --enable-libpulse \
-    --enable-librav1e \
     --enable-libsoxr \
     --enable-libspeex \
     --enable-libsrt \