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

[Antonio Rojas]

    Date: Sunday, January 30, 2022 @ 10:28:14
  Author: arojas
Revision: 1120209

ffmpeg 5 rebuild

Modified:
  electron/trunk/PKGBUILD

----------+
 PKGBUILD |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-01-30 10:24:05 UTC (rev 1120208)
+++ PKGBUILD	2022-01-30 10:28:14 UTC (rev 1120209)
@@ -6,7 +6,7 @@
 _chromiumver=96.0.4664.110
 _gcc_patchset=4
 # shellcheck disable=SC2034
-pkgrel=1
+pkgrel=2
 
 _major_ver=${pkgver%%.*}
 if [[ ${_use_suffix} != 0 ]]; then
@@ -175,9 +175,13 @@
   patch -Np1 -i ../patches/chromium-96-DrmRenderNodePathFinder-include.patch
   patch -Np1 -i ../patches/chromium-96-CouponDB-include.patch
 
+  # Patches to build with ffmpeg 4.4; remove when ffmpeg 5.0 moves to stable
+  if ! pkg-config --atleast-version 59 libavformat; then
+    patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch
+    patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch
+  fi
+
   patch -Np1 -i ../unbundle-fix-visibility-of-build-config-freetype.patch
-  patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch
-  patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch
   patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
   patch -Np1 -i ../wayland-fix-binding-to-wrong-version.patch
   patch -Np0 -i ../unexpire-accelerated-video-decode-flag.patch