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

Nicola Squartini tensor5 at gemini.archlinux.org
Tue Apr 12 03:25:16 UTC 2022


    Date: Tuesday, April 12, 2022 @ 03:25:16
  Author: tensor5
Revision: 1185927

upgpkg: electron 18.0.3-1

Added:
  electron/trunk/enable-GlobalMediaControlsCastStartStop.patch
  electron/trunk/webrtc-check-existence-of-cursor-metadata.patch
Modified:
  electron/trunk/PKGBUILD

-------------------------------------------------+
 PKGBUILD                                        |   15 ++++++++--
 enable-GlobalMediaControlsCastStartStop.patch   |   32 ++++++++++++++++++++++
 webrtc-check-existence-of-cursor-metadata.patch |   31 +++++++++++++++++++++
 3 files changed, 75 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-12 03:20:11 UTC (rev 1185926)
+++ PKGBUILD	2022-04-12 03:25:16 UTC (rev 1185927)
@@ -1,9 +1,9 @@
 # Maintainer: Nicola Squartini <tensor5 at gmail.com>
 
 _use_suffix=0
-pkgver=18.0.1
-_commit=72c48aa400ce39897dbce8a7bc5fae775dc01608
-_chromiumver=100.0.4896.60
+pkgver=18.0.3
+_commit=0a80eb4a9cf420624c50f3f2df60ebfeba1eb5b2
+_chromiumver=100.0.4896.75
 _gcc_patchset=4
 # shellcheck disable=SC2034
 pkgrel=1
@@ -55,6 +55,8 @@
         'std-vector-non-const.patch'
         'use-system-libraries-in-node.patch'
         'webcodecs-stop-using-AudioOpusEncoder.patch'
+        'webrtc-check-existence-of-cursor-metadata.patch'
+        'enable-GlobalMediaControlsCastStartStop.patch'
         'sql-make-VirtualCursor-standard-layout-type.patch'
        )
 # shellcheck disable=SC2034
@@ -68,6 +70,8 @@
             '880abb38ea94058ad553eaec9989cb33aa3b10c54b44afcfddacef3e975152de'
             'c70652a8b24c237bcfd27469de32797a2cb46d9f0d63d897bb6418314a25644c'
             '064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af'
+            '88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95'
+            '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
             'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a'
            )
 
@@ -164,7 +168,12 @@
   echo "Applying local patches..."
   # Upstream fixes
   patch -Np1 -i ../webcodecs-stop-using-AudioOpusEncoder.patch
+  patch -Np1 -d third_party/webrtc <../webrtc-check-existence-of-cursor-metadata.patch
 
+  # Revert kGlobalMediaControlsCastStartStop enabled by default
+  # https://crbug.com/1314342
+  patch -Rp1 -F3 -i ../enable-GlobalMediaControlsCastStartStop.patch
+
   # https://chromium-review.googlesource.com/c/chromium/src/+/2862724
   patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch
 

Added: enable-GlobalMediaControlsCastStartStop.patch
===================================================================
--- enable-GlobalMediaControlsCastStartStop.patch	                        (rev 0)
+++ enable-GlobalMediaControlsCastStartStop.patch	2022-04-12 03:25:16 UTC (rev 1185927)
@@ -0,0 +1,32 @@
+From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001
+From: Muyao Xu <muyaoxu at google.com>
+Date: Thu, 20 Jan 2022 23:46:21 +0000
+Subject: [PATCH] [Zenith] Enable GlobalMediaControlsCastStartStop flag by
+ default
+
+The feature is rolled out to 100% stable through finch for M96+.
+This CL enables it by default and fixes some unit tests failures.
+
+Bug: 1287242, 1287305
+Change-Id: I7e5c9625b77379fef253c41ef292a0dd6fc366fb
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3388416
+Reviewed-by: Takumi Fujimoto <takumif at chromium.org>
+Commit-Queue: Muyao Xu <muyaoxu at google.com>
+Cr-Commit-Position: refs/heads/main@{#961658}
+---
+ chrome/browser/media/router/media_router_feature.cc | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc
+index f28f9b0b802..a8d544f7d6d 100644
+--- a/chrome/browser/media/router/media_router_feature.cc
++++ b/chrome/browser/media/router/media_router_feature.cc
+@@ -33,7 +33,7 @@ const base::Feature kMediaRouter{"MediaRouter",
+ const base::Feature kCastAllowAllIPsFeature{"CastAllowAllIPs",
+                                             base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kGlobalMediaControlsCastStartStop{
+-    "GlobalMediaControlsCastStartStop", base::FEATURE_DISABLED_BY_DEFAULT};
++    "GlobalMediaControlsCastStartStop", base::FEATURE_ENABLED_BY_DEFAULT};
+ const base::Feature kAllowAllSitesToInitiateMirroring{
+     "AllowAllSitesToInitiateMirroring", base::FEATURE_DISABLED_BY_DEFAULT};
+ const base::Feature kDialMediaRouteProvider{"DialMediaRouteProvider",

Added: webrtc-check-existence-of-cursor-metadata.patch
===================================================================
--- webrtc-check-existence-of-cursor-metadata.patch	                        (rev 0)
+++ webrtc-check-existence-of-cursor-metadata.patch	2022-04-12 03:25:16 UTC (rev 1185927)
@@ -0,0 +1,31 @@
+From c2cd814cdd8cbf8dda6ccec2266327a5321fbde8 Mon Sep 17 00:00:00 2001
+From: Jan Grulich <grulja at gmail.com>
+Date: Tue, 15 Mar 2022 14:31:55 +0100
+Subject: [PATCH] PipeWire capturer: check existence of cursor metadata
+
+Check whether there are any cursor metadata before we try to validate
+and use them, otherwise we might crash on this.
+
+Bug: webrtc:13429
+Change-Id: I365da59a189b6b974cebafc94fec49d5b942efae
+Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/255601
+Reviewed-by: Alexander Cooper <alcooper at chromium.org>
+Commit-Queue: Alexander Cooper <alcooper at chromium.org>
+Cr-Commit-Position: refs/heads/main@{#36240}
+---
+ .../desktop_capture/linux/wayland/shared_screencast_stream.cc   | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+index a8c86e26..9e81df4c 100644
+--- a/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
++++ b/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc
+@@ -650,7 +650,7 @@ void SharedScreenCastStreamPrivate::ProcessBuffer(pw_buffer* buffer) {
+     const struct spa_meta_cursor* cursor =
+         static_cast<struct spa_meta_cursor*>(spa_buffer_find_meta_data(
+             spa_buffer, SPA_META_Cursor, sizeof(*cursor)));
+-    if (spa_meta_cursor_is_valid(cursor)) {
++    if (cursor && spa_meta_cursor_is_valid(cursor)) {
+       struct spa_meta_bitmap* bitmap = nullptr;
+ 
+       if (cursor->bitmap_offset)



More information about the arch-commits mailing list