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

[Leonidas Spyropoulos]

    Date: Tuesday, February 15, 2022 @ 22:52:27
  Author: artafinde
Revision: 1133398

electron15: ffmpeg 5 rebuild

Modified:
  electron15/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-02-15 21:50:27 UTC (rev 1133397)
+++ PKGBUILD	2022-02-15 22:52:27 UTC (rev 1133398)
@@ -6,7 +6,7 @@
 _chromiumver=94.0.4606.81
 _gcc_patchset=3
 # shellcheck disable=SC2034
-pkgrel=2
+pkgrel=3
 
 _major_ver=${pkgver%%.*}
 if [[ ${_use_suffix} != 0 ]]; then
@@ -179,13 +179,17 @@
   patch -Np1 -i ../patches/chromium-90-ruy-include.patch
   patch -Np1 -i ../patches/chromium-94-CustomSpaces-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 ../gn-visibility-gmock.patch
   patch -Np1 -i ../gn-visibility-mojo.patch
   patch -Np1 -i ../gn-visibility-webrtc.patch
   patch -Rp1 -i ../add-a-TODO-about-a-missing-pnacl-flag.patch
-  patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch
-  patch -Rp1 -i ../chromium-94-ffmpeg-roll.patch
   patch -d third_party/jinja2 -Np1 -i ../../../jinja-python-3.10.patch
   patch -Rp1 -i ../replace-blacklist-with-ignorelist.patch
   patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch