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

[Evangelos Foutras]

    Date: Tuesday, July 14, 2020 @ 21:57:06
  Author: foutrelis
Revision: 663807

upgpkg: electron6 6.1.9-7: add patch for ffmpeg 4.3 (FS#67020)

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

---------------------------+
 PKGBUILD                  |    5 ++++-
 chromium-ffmpeg-4.3.patch |   21 +++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-14 21:57:04 UTC (rev 663806)
+++ PKGBUILD	2020-07-14 21:57:06 UTC (rev 663807)
@@ -5,7 +5,7 @@
 pkgver=6.1.9
 _commit=26ee9476def66d6a57f12df9918145c303afa4ff
 _chromiumver=76.0.3809.146
-pkgrel=6
+pkgrel=7
 pkgdesc='Build cross platform desktop apps with web technologies'
 arch=('x86_64')
 url='https://electronjs.org/'
@@ -30,6 +30,7 @@
         'perfetto-gcc10.patch'
         'webrtc-gcc10.patch'
         'glslang-remove-setAllocator.patch'
+        'chromium-ffmpeg-4.3.patch'
         'chromium-skia-harmony.patch')
 sha512sums=('SKIP'
             'SKIP'
@@ -43,6 +44,7 @@
             '047606dacc67dc689bac9d30540331c4f4a56f5ff664115c779b13376918a0279fa0466099aa5e36a6541faa7479ae567ac50a4d4b482cdc34c95ae04aceb51d'
             'a4340a6b338768d51600853d101f7b4e06c7b733bda71f1e193c457edac3bb07887f7c307e60e26edf2fda47986788df8c4645b6ce26dae0d1e0b091f4520e91'
             'e34562b4b6cf4f0afa3f23afe7336fed4614201b39bfb73871899081161f5927d273c1da14b3ab7edeeb803300ba6e07c1ddf7261e8be12555cbfc4fe0a0d23c'
+            '70c30709a9bb6abc7a61a17cdc90cb2c4bad907f13f3bdd595906d87f7ad9a45100f237885e08d3dd4373a19a0716e8a4fa72a3950b7f779c8755cf0349f63d2'
             '6fa7c5f737b3f86274b1f768aadf863dd7542fca9c8885d5c3804590bd04c288394c54b2003234be37d961f48b5470ce15254ba64b2716f8aceb181e1fd3c7c0')
 
 _system_libs=('ffmpeg'
@@ -135,6 +137,7 @@
       "${_system_libs[@]}"
 
   echo 'Applying local patches...'
+  patch -Np1 -i ../chromium-ffmpeg-4.3.patch
   patch -Np0 -i ../chromium-skia-harmony.patch
   patch -Np1 -i ../icu65.patch
   patch -Np1 -d v8 <../icu67.patch

Added: chromium-ffmpeg-4.3.patch
===================================================================
--- chromium-ffmpeg-4.3.patch	                        (rev 0)
+++ chromium-ffmpeg-4.3.patch	2020-07-14 21:57:06 UTC (rev 663807)
@@ -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)