Date: Wednesday, September 1, 2021 @ 03:48:02 Author: foutrelis Revision: 422803
upgpkg: chromium 93.0.4577.63-1: new upstream release Added: chromium/trunk/chromium-93-ffmpeg-4.4.patch chromium/trunk/replace-blacklist-with-ignorelist.patch Modified: chromium/trunk/PKGBUILD Deleted: chromium/trunk/chromium-freetype-2.11.patch chromium/trunk/extend-enable-accelerated-video-decode-flag.patch ---------------------------------------------------+ PKGBUILD | 33 ++- chromium-93-ffmpeg-4.4.patch | 36 +++ chromium-freetype-2.11.patch | 50 ----- extend-enable-accelerated-video-decode-flag.patch | 35 --- replace-blacklist-with-ignorelist.patch | 196 ++++++++++++++++++++ 5 files changed, 253 insertions(+), 97 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-09-01 01:40:20 UTC (rev 422802) +++ PKGBUILD 2021-09-01 03:48:02 UTC (rev 422803) @@ -4,10 +4,10 @@ # Contributor: Daniel J Griffiths <ghost1...@archlinux.us> pkgname=chromium -pkgver=92.0.4515.159 +pkgver=93.0.4577.63 pkgrel=1 _launcher_ver=8 -_gcc_patchset=7 +_gcc_patchset=6 pkgdesc="A web browser built for speed, simplicity, and security" arch=('x86_64') url="https://www.chromium.org/Home" @@ -16,7 +16,7 @@ 'ttf-liberation' 'systemd' 'dbus' 'libpulse' 'pciutils' 'libva' 'desktop-file-utils' 'hicolor-icon-theme') makedepends=('python' 'gn' 'ninja' 'clang' 'lld' 'gperf' 'nodejs' 'pipewire' - 'java-runtime-headless' 'python2') + 'java-runtime-headless') optdepends=('pipewire: WebRTC desktop sharing under Wayland' 'kdialog: support for native dialogs in Plasma' 'org.freedesktop.secrets: password storage backend on GNOME / Xfce' @@ -24,20 +24,20 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$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 - extend-enable-accelerated-video-decode-flag.patch linux-sandbox-syscall-broker-use-struct-kernel_stat.patch linux-sandbox-fix-fstatat-crash.patch + replace-blacklist-with-ignorelist.patch sql-make-VirtualCursor-standard-layout-type.patch - chromium-freetype-2.11.patch + chromium-93-ffmpeg-4.4.patch use-oauth2-client-switches-as-default.patch) -sha256sums=('d97d337d0d70e959a75f1f510f5d78d2b57b5bf24573b7ade9fff9f26a7cfd11' +sha256sums=('eaf34fa6c2f24054655fbb2376b6e3ddee4cf4868c1324c921e71a45cfc94853' '213e50f48b67feb4441078d50b0fd431df34323be15be97c55302d3fdac4483a' - '53a2cbb1b58d652d5424ff9040b6a51b9dc6348ce3edc68344cd0d25f1f4beb2' - '66db9132d6f5e06aa26e5de0924f814224a76a9bdf4b61afce161fb1d7643b22' + 'a44ffd9e25fcbd8b3cc778871890e4da6fe12600ad549c807e1d03f61f0cdf73' '268e18ad56e5970157b51ec9fc8eb58ba93e313ea1e49c842a1ed0820d9c1fa3' '253348550d54b8ae317fd250f772f506d2bae49fb5dc75fe15d872ea3d0e04a5' + 'd3344ba39b8c6ed202334ba7f441c70d81ddf8cdb15af1aa8c16e9a3a75fbb35' 'dd317f85e5abfdcfc89c6f23f4c8edbcdebdd5e083dcec770e5da49ee647d150' - '7ef689cd6b2f85f2b76b2a10ecede003cfa0c2da15acc998ecbc445f2c95ced6' + '1a9e074f417f8ffd78bcd6874d8e2e74a239905bf662f76a7755fa40dc476b57' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') # Possible replacements are listed in build/linux/unbundle/replace_gn_files.py @@ -92,11 +92,13 @@ # runtime -- this allows signing into Chromium without baked-in values patch -Np1 -i ../use-oauth2-client-switches-as-default.patch - # Fix build with FreeType 2.11 (patch from Gentoo) - patch -Np1 -i ../chromium-freetype-2.11.patch + # Fix build with older ffmpeg + patch -Np1 -i ../chromium-93-ffmpeg-4.4.patch + # Revert transition to -fsanitize-ignorelist (needs newer clang) + patch -Rp1 -i ../replace-blacklist-with-ignorelist.patch + # Upstream fixes - patch -Np1 -i ../extend-enable-accelerated-video-decode-flag.patch patch -Np1 -i ../linux-sandbox-syscall-broker-use-struct-kernel_stat.patch patch -Np1 -i ../linux-sandbox-fix-fstatat-crash.patch @@ -104,7 +106,13 @@ patch -Np1 -i ../sql-make-VirtualCursor-standard-layout-type.patch # Fixes for building with libstdc++ instead of libc++ + patch -Np1 -i ../patches/chromium-93-pdfium-include.patch patch -Np1 -i ../patches/chromium-90-ruy-include.patch + patch -Np1 -i ../patches/chromium-93-HashPasswordManager-include.patch + patch -Np1 -i ../patches/chromium-93-BluetoothLowEnergyScanFilter-include.patch + patch -Np1 -i ../patches/chromium-93-ClassProperty-include.patch + patch -Np1 -i ../patches/chromium-93-DevToolsEmbedderMessageDispatcher-include.patch + patch -Np1 -i ../patches/chromium-93-ScopedTestDialogAutoConfirm-include.patch # Link to system tools required by the build mkdir -p third_party/node/linux/node-linux-x64/bin @@ -145,6 +153,7 @@ 'is_official_build=true' # implies is_cfi=true on x86_64 'treat_warnings_as_errors=false' 'fieldtrial_testing_like_official_build=true' + 'blink_enable_generated_code_formatting=false' 'ffmpeg_branding="Chrome"' 'proprietary_codecs=true' 'rtc_use_pipewire=true' Added: chromium-93-ffmpeg-4.4.patch =================================================================== --- chromium-93-ffmpeg-4.4.patch (rev 0) +++ chromium-93-ffmpeg-4.4.patch 2021-09-01 03:48:02 UTC (rev 422803) @@ -0,0 +1,36 @@ +diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc +index ac4713b07268..492a9a37d096 100644 +--- a/media/filters/ffmpeg_demuxer.cc ++++ b/media/filters/ffmpeg_demuxer.cc +@@ -427,11 +427,11 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + scoped_refptr<DecoderBuffer> buffer; + + if (type() == DemuxerStream::TEXT) { +- size_t id_size = 0; ++ int id_size = 0; + uint8_t* id_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_WEBVTT_IDENTIFIER, &id_size); + +- size_t settings_size = 0; ++ int settings_size = 0; + uint8_t* settings_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_WEBVTT_SETTINGS, &settings_size); + +@@ -443,7 +443,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + buffer = DecoderBuffer::CopyFrom(packet->data, packet->size, + side_data.data(), side_data.size()); + } else { +- size_t side_data_size = 0; ++ int side_data_size = 0; + uint8_t* side_data = av_packet_get_side_data( + packet.get(), AV_PKT_DATA_MATROSKA_BLOCKADDITIONAL, &side_data_size); + +@@ -504,7 +504,7 @@ void FFmpegDemuxerStream::EnqueuePacket(ScopedAVPacket packet) { + packet->size - data_offset); + } + +- size_t skip_samples_size = 0; ++ int skip_samples_size = 0; + const uint32_t* skip_samples_ptr = + reinterpret_cast<const uint32_t*>(av_packet_get_side_data( + packet.get(), AV_PKT_DATA_SKIP_SAMPLES, &skip_samples_size)); Deleted: chromium-freetype-2.11.patch =================================================================== --- chromium-freetype-2.11.patch 2021-09-01 01:40:20 UTC (rev 422802) +++ chromium-freetype-2.11.patch 2021-09-01 03:48:02 UTC (rev 422803) @@ -1,50 +0,0 @@ ---- a/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp -+++ b/third_party/skia/src/ports/SkFontHost_FreeType_common.cpp -@@ -712,7 +712,11 @@ void colrv1_draw_paint(SkCanvas* canvas, - canvas->drawPaint(colrPaint); - break; - } -+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 -+ case FT_COLR_PAINTFORMAT_TRANSFORM: -+#else - case FT_COLR_PAINTFORMAT_TRANSFORMED: -+#endif - case FT_COLR_PAINTFORMAT_TRANSLATE: - case FT_COLR_PAINTFORMAT_ROTATE: - case FT_COLR_PAINTFORMAT_SKEW: -@@ -759,10 +763,17 @@ void colrv1_transform(SkCanvas* canvas, FT_Face face, FT_COLR_Paint colrv1_paint - SkMatrix transform; - - switch (colrv1_paint.format) { -+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 -+ case FT_COLR_PAINTFORMAT_TRANSFORM: { -+ transform = ToSkMatrix(colrv1_paint.u.transform.affine); -+ break; -+ } -+#else - case FT_COLR_PAINTFORMAT_TRANSFORMED: { - transform = ToSkMatrix(colrv1_paint.u.transformed.affine); - break; - } -+#endif - case FT_COLR_PAINTFORMAT_TRANSLATE: { - transform = SkMatrix::Translate( - SkFixedToScalar(colrv1_paint.u.translate.dx), -@@ -880,10 +891,17 @@ bool colrv1_traverse_paint(SkCanvas* canvas, - traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID, - FT_COLOR_NO_ROOT_TRANSFORM); - break; -+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11 -+ case FT_COLR_PAINTFORMAT_TRANSFORM: -+ colrv1_transform(canvas, face, paint); -+ traverse_result = colrv1_traverse_paint(canvas, palette, face, -+ paint.u.transform.paint, visited_set); -+#else - case FT_COLR_PAINTFORMAT_TRANSFORMED: - colrv1_transform(canvas, face, paint); - traverse_result = colrv1_traverse_paint(canvas, palette, face, - paint.u.transformed.paint, visited_set); -+#endif - break; - case FT_COLR_PAINTFORMAT_TRANSLATE: - colrv1_transform(canvas, face, paint); Deleted: extend-enable-accelerated-video-decode-flag.patch =================================================================== --- extend-enable-accelerated-video-decode-flag.patch 2021-09-01 01:40:20 UTC (rev 422802) +++ extend-enable-accelerated-video-decode-flag.patch 2021-09-01 03:48:02 UTC (rev 422803) @@ -1,35 +0,0 @@ -From e48f18eba0eae199ba7bc8a6a09ebf39799447c1 Mon Sep 17 00:00:00 2001 -From: Ted Meyer <tmathme...@chromium.org> -Date: Wed, 2 Jun 2021 05:35:22 +0000 -Subject: [PATCH] Extend enable-accelerated-video-decode flag for linux to m93 - -It appears that there is insistence that the flag be totally removed or -have its end-milestone increased, I can't just let it wait until the -feature is working again and then re-enable it. So i've moved it to 93. - -R=dalecurtis - -Fixed: 1207478 -Change-Id: I26a5e790cd390825516b4a4b6af88e89b2d4f4eb -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2918478 -Reviewed-by: Dale Curtis <dalecur...@chromium.org> -Reviewed-by: Ted Meyer <tmathme...@chromium.org> -Commit-Queue: Ted Meyer <tmathme...@chromium.org> -Cr-Commit-Position: refs/heads/master@{#888312} ---- - chrome/browser/flag-metadata.json | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/chrome/browser/flag-metadata.json b/chrome/browser/flag-metadata.json -index 67e0330436..34542671f2 100644 ---- a/chrome/browser/flag-metadata.json -+++ b/chrome/browser/flag-metadata.json -@@ -1193,7 +1193,7 @@ - { - "name": "enable-accelerated-video-decode", - "owners": [ "media-...@chromium.org" ], -- "expiry_milestone": 90 -+ "expiry_milestone": 93 - }, - { - "name": "enable-accessibility-live-caption", Added: replace-blacklist-with-ignorelist.patch =================================================================== --- replace-blacklist-with-ignorelist.patch (rev 0) +++ replace-blacklist-with-ignorelist.patch 2021-09-01 03:48:02 UTC (rev 422803) @@ -0,0 +1,196 @@ +From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001 +From: Dylan Cutler <dylancut...@google.com> +Date: Wed, 26 May 2021 16:39:52 +0000 +Subject: [PATCH] Reland "Replace 'blacklist' with 'ignorelist' in + ./tools/msan/." + +This is a reland of 3b6263f2eece1264b052dfdcbc03b851d5abfb48 + +Relanding now that https://chromium-review.googlesource.com/c/chromiumos/overlays/chromiumos-overlay/+/2897974 is merged + +Original change's description: +> Replace 'blacklist' with 'ignorelist' in ./tools/msan/. +> +> Bug: 1097272, 1097268 +> Change-Id: Id5c8227a5bfb1ffaec82d3168b609085b10c8297 +> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2867730 +> Commit-Queue: Dylan Cutler <dylancut...@google.com> +> Reviewed-by: Nico Weber <tha...@chromium.org> +> Reviewed-by: Jonathan Metzman <metz...@chromium.org> +> Cr-Commit-Position: refs/heads/master@{#883035} + +Bug: 1097272 +Bug: 1097268 +Change-Id: I11a5bc8972680c95fb1dab95ed3b707ed76f4667 +Cq-Include-Trybots: luci.chromium.try:chromeos-amd64-generic-cfi-thin-lto-rel +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2911096 +Commit-Queue: Dylan Cutler <dylancut...@google.com> +Reviewed-by: Nico Weber <tha...@chromium.org> +Cr-Commit-Position: refs/heads/master@{#886773} +--- + build/config/sanitizers/BUILD.gn | 44 ++++++++++---------- + build_overrides/build.gni | 14 +++---- + tools/msan/{blacklist.txt => ignorelist.txt} | 0 + 3 files changed, 29 insertions(+), 29 deletions(-) + rename tools/msan/{blacklist.txt => ignorelist.txt} (100%) + +diff --git a/build/config/sanitizers/BUILD.gn b/build/config/sanitizers/BUILD.gn +index aaaad023474d..55b388a43743 100644 +--- a/build/config/sanitizers/BUILD.gn ++++ b/build/config/sanitizers/BUILD.gn +@@ -272,11 +272,11 @@ config("asan_flags") { + if (is_asan) { + cflags += [ "-fsanitize=address" ] + if (is_win) { +- if (!defined(asan_win_blacklist_path)) { +- asan_win_blacklist_path = ++ if (!defined(asan_win_blocklist_path)) { ++ asan_win_blocklist_path = + rebase_path("//tools/memory/asan/blocklist_win.txt", root_build_dir) + } +- cflags += [ "-fsanitize-blacklist=$asan_win_blacklist_path" ] ++ cflags += [ "-fsanitize-ignorelist=$asan_win_blocklist_path" ] + } + } + } +@@ -306,13 +306,13 @@ config("link_shared_library") { + config("cfi_flags") { + cflags = [] + if (is_cfi && current_toolchain == default_toolchain) { +- if (!defined(cfi_blacklist_path)) { +- cfi_blacklist_path = ++ if (!defined(cfi_ignorelist_path)) { ++ cfi_ignorelist_path = + rebase_path("//tools/cfi/ignores.txt", root_build_dir) + } + cflags += [ + "-fsanitize=cfi-vcall", +- "-fsanitize-blacklist=$cfi_blacklist_path", ++ "-fsanitize-ignorelist=$cfi_ignorelist_path", + ] + + if (use_cfi_cast) { +@@ -409,14 +409,14 @@ config("msan_flags") { + if (is_msan) { + assert(is_linux || is_chromeos, + "msan only supported on linux x86_64/ChromeOS") +- if (!defined(msan_blacklist_path)) { +- msan_blacklist_path = +- rebase_path("//tools/msan/blacklist.txt", root_build_dir) ++ if (!defined(msan_ignorelist_path)) { ++ msan_ignorelist_path = ++ rebase_path("//tools/msan/ignorelist.txt", root_build_dir) + } + cflags = [ + "-fsanitize=memory", + "-fsanitize-memory-track-origins=$msan_track_origins", +- "-fsanitize-blacklist=$msan_blacklist_path", ++ "-fsanitize-ignorelist=$msan_ignorelist_path", + ] + } + } +@@ -424,13 +424,13 @@ config("msan_flags") { + config("tsan_flags") { + if (is_tsan) { + assert(is_linux || is_chromeos, "tsan only supported on linux x86_64") +- if (!defined(tsan_blacklist_path)) { +- tsan_blacklist_path = ++ if (!defined(tsan_ignorelist_path)) { ++ tsan_ignorelist_path = + rebase_path("//tools/memory/tsan_v2/ignores.txt", root_build_dir) + } + cflags = [ + "-fsanitize=thread", +- "-fsanitize-blacklist=$tsan_blacklist_path", ++ "-fsanitize-ignorelist=$tsan_ignorelist_path", + ] + } + } +@@ -438,8 +438,8 @@ config("tsan_flags") { + config("ubsan_flags") { + cflags = [] + if (is_ubsan) { +- if (!defined(ubsan_blacklist_path)) { +- ubsan_blacklist_path = ++ if (!defined(ubsan_ignorelist_path)) { ++ ubsan_ignorelist_path = + rebase_path("//tools/ubsan/ignorelist.txt", root_build_dir) + } + cflags += [ +@@ -456,7 +456,7 @@ config("ubsan_flags") { + "-fsanitize=signed-integer-overflow", + "-fsanitize=unreachable", + "-fsanitize=vla-bound", +- "-fsanitize-blacklist=$ubsan_blacklist_path", ++ "-fsanitize-ignorelist=$ubsan_ignorelist_path", + ] + + # Chromecast ubsan builds fail to compile with these +@@ -486,8 +486,8 @@ config("ubsan_no_recover") { + + config("ubsan_security_flags") { + if (is_ubsan_security) { +- if (!defined(ubsan_security_blacklist_path)) { +- ubsan_security_blacklist_path = ++ if (!defined(ubsan_security_ignorelist_path)) { ++ ubsan_security_ignorelist_path = + rebase_path("//tools/ubsan/security_ignorelist.txt", root_build_dir) + } + cflags = [ +@@ -495,7 +495,7 @@ config("ubsan_security_flags") { + "-fsanitize=shift", + "-fsanitize=signed-integer-overflow", + "-fsanitize=vla-bound", +- "-fsanitize-blacklist=$ubsan_security_blacklist_path", ++ "-fsanitize-ignorelist=$ubsan_security_ignorelist_path", + ] + } + } +@@ -508,13 +508,13 @@ config("ubsan_null_flags") { + + config("ubsan_vptr_flags") { + if (is_ubsan_vptr) { +- if (!defined(ubsan_vptr_blacklist_path)) { +- ubsan_vptr_blacklist_path = ++ if (!defined(ubsan_vptr_ignorelist_path)) { ++ ubsan_vptr_ignorelist_path = + rebase_path("//tools/ubsan/vptr_ignorelist.txt", root_build_dir) + } + cflags = [ + "-fsanitize=vptr", +- "-fsanitize-blacklist=$ubsan_vptr_blacklist_path", ++ "-fsanitize-ignorelist=$ubsan_vptr_ignorelist_path", + ] + } + } +diff --git a/build_overrides/build.gni b/build_overrides/build.gni +index 82627b03653f..f3e563ab701b 100644 +--- a/build_overrides/build.gni ++++ b/build_overrides/build.gni +@@ -42,15 +42,15 @@ declare_args() { + # Allows different projects to specify their own suppression/ignore lists for + # sanitizer tools. + # asan_suppressions_file = "path/to/asan_suppressions.cc" +-# asan_win_blacklist_path = "path/to/asan/blocklist_win.txt" ++# asan_win_ignorelist_path = "path/to/asan/blocklist_win.txt" + # lsan_suppressions_file = "path/to/lsan_suppressions.cc" + # tsan_suppressions_file = "path/to/tsan_suppressions.cc" +-# tsan_blacklist_path = "path/to/tsan/ignores.txt" +-# msan_blacklist_path = "path/to/msan/blacklist.txt" +-# ubsan_blacklist_path = "path/to/ubsan/blacklist.txt" +-# ubsan_vptr_blacklist_path = "path/to/ubsan/vptr_blacklist.txt" +-# ubsan_security_blacklist_path = "path/to/ubsan/security_blacklist.txt" +-# cfi_blacklist_path = "path/to/cfi/ignores.txt" ++# tsan_ignorelist_path = "path/to/tsan/ignores.txt" ++# msan_ignorelist_path = "path/to/msan/ignorelist.txt" ++# ubsan_ignorelist_path = "path/to/ubsan/ignorelist.txt" ++# ubsan_vptr_ignorelist_path = "path/to/ubsan/vptr_ignorelist.txt" ++# ubsan_security_ignorelist_path = "path/to/ubsan/security_ignorelist.txt" ++# cfi_ignorelist_path = "path/to/cfi/ignores.txt" + + declare_args() { + # Android 32-bit non-component, non-clang builds cannot have symbol_level=2 +diff --git a/tools/msan/blacklist.txt b/tools/msan/ignorelist.txt +similarity index 100% +rename from tools/msan/blacklist.txt +rename to tools/msan/ignorelist.txt