[arch-commits] Commit in electron/trunk (PKGBUILD chromium-ffmpeg-4.3.patch)

Evangelos Foutras foutrelis at archlinux.org
Tue Jul 14 21:56:33 UTC 2020


    Date: Tuesday, July 14, 2020 @ 21:56:32
  Author: foutrelis
Revision: 663803

upgpkg: electron 9.1.0-3: add patch for ffmpeg 4.3 (FS#67020)

Added:
  electron/trunk/chromium-ffmpeg-4.3.patch
Modified:
  electron/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |    8 +++++---
 chromium-ffmpeg-4.3.patch |   21 +++++++++++++++++++++
 2 files changed, 26 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-14 21:50:38 UTC (rev 663802)
+++ PKGBUILD	2020-07-14 21:56:32 UTC (rev 663803)
@@ -4,7 +4,7 @@
 pkgver=9.1.0
 _commit=a822d2639a9c9c2c670e91d73f78e921865ce38e
 _chromiumver=83.0.4103.122
-pkgrel=2
+pkgrel=3
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('x86_64')
 url='https://electronjs.org/'
@@ -26,6 +26,7 @@
         'add-missing-algorithm-header-in-crx_install_error.cc.patch'
         'avoid-double-destruction-of-ServiceWorkerObjectHost.patch'
         'chromium-83-gcc-10.patch'
+        'chromium-ffmpeg-4.3.patch'
         'chromium-skia-harmony.patch'
         'clean-up-a-call-to-set_utf8.patch'
         'include-memory-header-to-get-the-definition-of-std-u.patch'
@@ -42,6 +43,7 @@
             '0e2a78e4aa7272ab0ff4a4c467750e01bad692a026ad9828aaf06d2a9418b9d8'
             'd793842e9584bf75e3779918297ba0ffa6dd05394ef5b2bf5fb73aa9c86a7e2f'
             '3e5ba8c0a70a4bc673deec0c61eb2b58f05a4c784cbdb7c8118be1eb6580db6d'
+            '5390304b5f544868985ce00a3ec082d4ece2dacb1c73cdb35dd4facfea12449a'
             '771292942c0901092a402cc60ee883877a99fb804cb54d568c8c6c94565a48e1'
             '58c41713eb6fb33b6eef120f4324fa1fb8123b1fbc4ecbe5662f1f9779b9b6af'
             '071326135bc25226aa165639dff80a03670a17548f2d2ff5cc4f40982b39c52a'
@@ -48,8 +50,7 @@
             '675fb3d6276cce569a641436465f58d5709d1d4a5f62b7052989479fd4aaea24'
             '50687079426094f2056d1f4806dc30fc8d6bad16190520e57ba087ec5db1d778'
             '3d7f20e1d2ee7d73ed25e708c0d59a0cb215fcce10a379e3d48a856533c4b0b7'
-            'e042024423027ad3ef729a7e4709bdf9714aea49d64cfbbf46a645a05703abc2'
-           )
+            'e042024423027ad3ef729a7e4709bdf9714aea49d64cfbbf46a645a05703abc2')
 
 _system_libs=('ffmpeg'
               'flac'
@@ -133,6 +134,7 @@
   patch -Np1 -i ../add-missing-algorithm-header-in-crx_install_error.cc.patch
   patch -Np1 -i ../avoid-double-destruction-of-ServiceWorkerObjectHost.patch
   patch -Np1 -i ../chromium-83-gcc-10.patch
+  patch -Np1 -i ../chromium-ffmpeg-4.3.patch
   patch -Np0 -i ../chromium-skia-harmony.patch
   patch -Np1 -i ../clean-up-a-call-to-set_utf8.patch
   patch -Np1 -i ../include-memory-header-to-get-the-definition-of-std-u.patch

Added: chromium-ffmpeg-4.3.patch
===================================================================
--- chromium-ffmpeg-4.3.patch	                        (rev 0)
+++ chromium-ffmpeg-4.3.patch	2020-07-14 21:56:32 UTC (rev 663803)
@@ -0,0 +1,21 @@
+diff --git a/media/base/media.cc b/media/base/media.cc
+index c282ee49a03..a298b40c79b 100644
+--- a/media/base/media.cc
++++ b/media/base/media.cc
+@@ -14,6 +14,7 @@
+ #include "third_party/libyuv/include/libyuv.h"
+ 
+ #if BUILDFLAG(ENABLE_FFMPEG)
++#include <limits>
+ #include "third_party/ffmpeg/ffmpeg_features.h"  // nogncheck
+ extern "C" {
+ #include <libavutil/cpu.h>
+@@ -41,7 +42,7 @@ class MediaInitializer {
+ 
+ #if BUILDFLAG(USE_ALLOCATOR_SHIM)
+     // Remove allocation limit from ffmpeg, so calls go down to shim layer.
+-    av_max_alloc(0);
++    av_max_alloc(std::numeric_limits<size_t>::max());
+ #endif  // BUILDFLAG(USE_ALLOCATOR_SHIM)
+ 
+ #endif  // BUILDFLAG(ENABLE_FFMPEG)



More information about the arch-commits mailing list