summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--enable-GlobalMediaControlsCastStartStop.patch32
3 files changed, 42 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d19e093734c5..e024160d0c63 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = chromium-no-extras
pkgdesc = Chromium without hangout services, widevine, pipewire, or chromedriver
pkgver = 100.0.4896.75
- pkgrel = 1
+ pkgrel = 2
url = https://www.chromium.org/Home
arch = x86_64
license = BSD
@@ -55,6 +55,7 @@ pkgbase = chromium-no-extras
source = https://github.com/stha09/chromium-patches/releases/download/chromium-100-patchset-4/chromium-100-patchset-4.tar.xz
source = webcodecs-stop-using-AudioOpusEncoder.patch
source = webrtc-check-existence-of-cursor-metadata.patch
+ source = enable-GlobalMediaControlsCastStartStop.patch
source = sql-make-VirtualCursor-standard-layout-type.patch
source = use-oauth2-client-switches-as-default.patch
sha256sums = 244ed352dfaa1ab6b1f0877c4884fd17aa7d7133fa52f129a9fb01325ea0c0c0
@@ -62,6 +63,7 @@ pkgbase = chromium-no-extras
sha256sums = a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80
sha256sums = 064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af
sha256sums = 88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95
+ sha256sums = 779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6
sha256sums = b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a
sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711
diff --git a/PKGBUILD b/PKGBUILD
index a61bab463250..7e9af7237dd3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,7 +11,7 @@
pkgname=chromium-no-extras
_pkgname=chromium
pkgver=100.0.4896.75
-pkgrel=1
+pkgrel=2
_launcher_ver=8
_gcc_patchset=4
pkgdesc="Chromium without hangout services, widevine, pipewire, or chromedriver"
@@ -35,6 +35,7 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$_pkg
https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz
webcodecs-stop-using-AudioOpusEncoder.patch
webrtc-check-existence-of-cursor-metadata.patch
+ enable-GlobalMediaControlsCastStartStop.patch
sql-make-VirtualCursor-standard-layout-type.patch
use-oauth2-client-switches-as-default.patch)
sha256sums=('244ed352dfaa1ab6b1f0877c4884fd17aa7d7133fa52f129a9fb01325ea0c0c0'
@@ -42,6 +43,7 @@ sha256sums=('244ed352dfaa1ab6b1f0877c4884fd17aa7d7133fa52f129a9fb01325ea0c0c0'
'a6120e7d4eb5e131b87b6ab3b922e0c6cd78e15501e54cfb2019875173688d80'
'064daaa2b9d95b96ec04d8ddebf4af441f92263d123365b58fe73966866080af'
'88b2c8d9c6c1917f6632453f18aad7a3fd94d605eecb6c77ae2394ac5856ba95'
+ '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6'
'b94b2e88f63cfb7087486508b8139599c89f96d7a4181c61fec4b4e250ca327a'
'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
@@ -102,6 +104,10 @@ prepare() {
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
diff --git a/enable-GlobalMediaControlsCastStartStop.patch b/enable-GlobalMediaControlsCastStartStop.patch
new file mode 100644
index 000000000000..e0d4544de482
--- /dev/null
+++ b/enable-GlobalMediaControlsCastStartStop.patch
@@ -0,0 +1,32 @@
+From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001
+From: Muyao Xu <muyaoxu@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@chromium.org>
+Commit-Queue: Muyao Xu <muyaoxu@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",