Date: Tuesday, November 29, 2022 @ 20:40:29 Author: foutrelis Revision: 462780
upgpkg: chromium 108.0.5359.71-1 Added: chromium/trunk/disable-GlobalMediaControlsCastStartStop.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/REVERT-enable-GlobalMediaControlsCastStartStop.patch chromium/trunk/unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch ----------------------------------------------------------+ PKGBUILD | 29 ++++----- REVERT-enable-GlobalMediaControlsCastStartStop.patch | 32 ---------- disable-GlobalMediaControlsCastStartStop.patch | 13 ++++ unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch | 38 ------------- 4 files changed, 26 insertions(+), 86 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-29 19:01:20 UTC (rev 462779) +++ PKGBUILD 2022-11-29 20:40:29 UTC (rev 462780) @@ -4,10 +4,10 @@ # Contributor: Daniel J Griffiths <[email protected]> pkgname=chromium -pkgver=107.0.5304.121 +pkgver=108.0.5359.71 pkgrel=1 _launcher_ver=8 -_gcc_patchset=1 +_gcc_patchset=2 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') url="https://www.chromium.org/Home"; @@ -25,21 +25,19 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz - unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch re-fix-TFLite-build-error-on-linux-with-system-zlib.patch - REVERT-enable-GlobalMediaControlsCastStartStop.patch REVERT-roll-src-third_party-ffmpeg-m102.patch REVERT-roll-src-third_party-ffmpeg-m106.patch + disable-GlobalMediaControlsCastStartStop.patch angle-wayland-include-protocol.patch use-oauth2-client-switches-as-default.patch) -sha256sums=('12b0ab045715a18abaf0c833c98c1001a43da4aae9690bb571b369d61f74e08b' +sha256sums=('cb6ca080c492ede34df7bf9c4eca45576e6306865985465bd0319c96bb71ff5d' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - '2b26c16f8326803ef287fb443a17bc139a440673955c5a6a38e9368bcaeed7c4' - 'b908f37c5a886e855953f69e4dd6b90baa35e79f5c74673f7425f2cdb642eb00' + '40ef8af65e78901bb8554eddbbb5ebc55c0b8e7927f6ca51b2a353d1c7c50652' '9015b9d6d5b4c1e7248d6477a4b4b6bd6a3ebdc57225d2d8efcd79fc61790716' - '779fb13f2494209d3a7f1f23a823e59b9dded601866d3ab095937a1a04e19ac6' '30df59a9e2d95dcb720357ec4a83d9be51e59cc5551365da4c0073e68ccdec44' '4c12d31d020799d31355faa7d1fe2a5a807f7458e7f0c374adf55edb37032152' + '7f3b1b22d6a271431c1f9fc92b6eb49c6d80b8b3f868bdee07a6a1a16630a302' 'cd0d9d2a1d6a522d47c3c0891dabe4ad72eabbebc0fe5642b9e22efa3d5ee572' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') @@ -56,7 +54,7 @@ [icu]=icu [jsoncpp]=jsoncpp [libaom]=aom - #[libavif]=libavif # needs https://github.com/AOMediaCodec/libavif/commit/d22d4de94120 + [libavif]=libavif [libdrm]= [libjpeg]=libjpeg [libpng]=libpng @@ -103,13 +101,8 @@ patch -Np1 -i ../use-oauth2-client-switches-as-default.patch # Upstream fixes - patch -Np1 -i ../unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch patch -Np1 -i ../re-fix-TFLite-build-error-on-linux-with-system-zlib.patch - # Revert kGlobalMediaControlsCastStartStop enabled by default - # https://crbug.com/1314342 - patch -Rp1 -F3 -i ../REVERT-enable-GlobalMediaControlsCastStartStop.patch - # Revert ffmpeg roll requiring new channel layout API support # https://crbug.com/1325301 patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m102.patch @@ -116,6 +109,10 @@ # Revert switch from AVFrame::pkt_duration to AVFrame::duration patch -Rp1 -i ../REVERT-roll-src-third_party-ffmpeg-m106.patch + # Disable kGlobalMediaControlsCastStartStop by default + # https://crbug.com/1314342 + patch -Np1 -i ../disable-GlobalMediaControlsCastStartStop.patch + # https://crbug.com/angleproject/7582 patch -Np0 -i ../angle-wayland-include-protocol.patch @@ -171,9 +168,9 @@ 'link_pulseaudio=true' 'use_custom_libcxx=false' 'use_gnome_keyring=false' - 'use_qt=false' # look into enabling this for M108 + 'use_qt=false' # look into enabling this 'use_sysroot=false' - 'use_system_libwayland_server=true' + 'use_system_libwayland=true' 'use_system_wayland_scanner=true' 'enable_hangout_services_extension=true' 'enable_widevine=true' Deleted: REVERT-enable-GlobalMediaControlsCastStartStop.patch =================================================================== --- REVERT-enable-GlobalMediaControlsCastStartStop.patch 2022-11-29 19:01:20 UTC (rev 462779) +++ REVERT-enable-GlobalMediaControlsCastStartStop.patch 2022-11-29 20:40:29 UTC (rev 462780) @@ -1,32 +0,0 @@ -From b58f0f2725a8c1a8a131f9984b5fd53b54119dba Mon Sep 17 00:00:00 2001 -From: Muyao Xu <[email protected]> -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 <[email protected]> -Commit-Queue: Muyao Xu <[email protected]> -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: disable-GlobalMediaControlsCastStartStop.patch =================================================================== --- disable-GlobalMediaControlsCastStartStop.patch (rev 0) +++ disable-GlobalMediaControlsCastStartStop.patch 2022-11-29 20:40:29 UTC (rev 462780) @@ -0,0 +1,13 @@ +diff --git a/chrome/browser/media/router/media_router_feature.cc b/chrome/browser/media/router/media_router_feature.cc +index 862329ef314..47c89123876 100644 +--- a/chrome/browser/media/router/media_router_feature.cc ++++ b/chrome/browser/media/router/media_router_feature.cc +@@ -54,7 +54,7 @@ BASE_FEATURE(kGlobalMediaControlsCastStartStop, + #else + BASE_FEATURE(kGlobalMediaControlsCastStartStop, + "GlobalMediaControlsCastStartStop", +- base::FEATURE_ENABLED_BY_DEFAULT); ++ base::FEATURE_DISABLED_BY_DEFAULT); + #endif // BUILDFLAG(IS_CHROMEOS) + + #endif // !BUILDFLAG(IS_ANDROID) Deleted: unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch =================================================================== --- unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch 2022-11-29 19:01:20 UTC (rev 462779) +++ unbundle-jsoncpp-avoid-CFI-faults-with-is_cfi-true.patch 2022-11-29 20:40:29 UTC (rev 462780) @@ -1,38 +0,0 @@ -From ed8d931e35f81d8566835a579caf7d61368f85b7 Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras <[email protected]> -Date: Tue, 27 Sep 2022 22:20:41 +0000 -Subject: [PATCH] unbundle/jsoncpp: avoid CFI faults with is_cfi=true - -Ensure jsoncpp symbols have public visibility and are thus excluded from -CFI checks and whole-program optimization. This is achieved by defining -JSON_DLL_BUILD which in turn causes json/config.h to define JSON_API as -__attribute__((visibility("default"))). The latter macro is used to tag -jsoncpp classes and namespace functions throughout jsoncpp's headers. - -BUG=1365218 - -Change-Id: I56277737b7d9ecaeb5e17c8d21a2e55f3d5d5bc9 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3919652 -Reviewed-by: Thomas Anderson <[email protected]> -Commit-Queue: Thomas Anderson <[email protected]> -Cr-Commit-Position: refs/heads/main@{#1052077} ---- - build/linux/unbundle/jsoncpp.gn | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/build/linux/unbundle/jsoncpp.gn b/build/linux/unbundle/jsoncpp.gn -index 544f9d13c9..e84a0ef27a 100644 ---- a/build/linux/unbundle/jsoncpp.gn -+++ b/build/linux/unbundle/jsoncpp.gn -@@ -3,6 +3,11 @@ import("//build/shim_headers.gni") - - pkg_config("jsoncpp_config") { - packages = [ "jsoncpp" ] -+ -+ # Defining JSON_DLL_BUILD applies public visibility to jsoncpp classes -+ # thus deactivating CFI checks for them. This avoids CFI violations in -+ # virtual calls to system jsoncpp library (https://crbug.com/1365218). -+ defines = [ "JSON_DLL_BUILD" ] - } - - shim_headers("jsoncpp_shim") {
