* Re: [PR PATCH] [Updated] chromium: update to 103.0.5060.53.
2022-06-22 18:13 [PR PATCH] chromium: update to 103.0.5060.53 Duncaen
@ 2022-06-22 18:16 ` Duncaen
2022-06-23 14:13 ` Duncaen
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2022-06-22 18:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-103
https://github.com/void-linux/void-packages/pull/37644
chromium: update to 103.0.5060.53.
[ci skip]
* [ ] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/37644.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-103-37644.patch --]
[-- Type: text/x-diff, Size: 22853 bytes --]
From 4d3c43d67e25fd90c06c2875012f3af12cc360e7 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 22 Jun 2022 20:08:38 +0200
Subject: [PATCH] chromium: update to 103.0.5060.53.
---
srcpkgs/chromium/patches/9d080c0.patch | 196 ------------------
srcpkgs/chromium/patches/9d080c0.patch.args | 1 -
...omium-102-fenced_frame_utils-include.patch | 25 ---
.../chromium-102-regex_pattern-array.patch | 14 --
.../patches/chromium-libxml-unbundle.patch | 10 -
srcpkgs/chromium/patches/sndio.patch | 6 +-
.../chromium/patches/xxx-ppc64le-libvpx.patch | 72 -------
.../patches/xxx-ppc64le-support.patch | 118 -----------
srcpkgs/chromium/template | 4 +-
9 files changed, 5 insertions(+), 441 deletions(-)
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
delete mode 100644 srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
deleted file mode 100644
index 885ab5a1b82a..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
-From: Dylan Cutler <dylancutler@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 <dylancutler@google.com>
-> Reviewed-by: Nico Weber <thakis@chromium.org>
-> Reviewed-by: Jonathan Metzman <metzman@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 <dylancutler@google.com>
-Reviewed-by: Nico Weber <thakis@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 aaaad023474d1..55b388a437439 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 82627b03653f1..f3e563ab701bf 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
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
deleted file mode 100644
index 8bbbbe948363..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch b/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
deleted file mode 100644
index 61f904bad6a4..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 Apr 2022 16:01:01 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
-
----
- third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-index 9e2d3ad..68f4823 100644
---- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-@@ -4,6 +4,8 @@
-
- #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
-
-+#include <cstring>
-+
- #include "base/guid.h"
- #include "base/strings/string_util.h"
-
---
-2.35.1
-
diff --git a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch b/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
deleted file mode 100644
index 18058b1faa45..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/components/autofill/core/browser/BUILD.gn
-+++ b/components/autofill/core/browser/BUILD.gn
-@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
- }
-
- static_library("browser") {
-+ if (is_clang) {
-+ cflags = [
-+ "-fbracket-depth=1000",
-+ ]
-+ }
- sources = [
- "address_normalization_manager.cc",
- "address_normalization_manager.h",
diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
deleted file mode 100644
index 5699bc8f8eaf..000000000000
--- a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
- ":xml_reader",
- ":xml_writer",
- "//base/test:test_support",
-+ "//services/data_decoder:lib",
- "//services/data_decoder:xml_parser_fuzzer_deps",
- ]
- sources = [
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index bac8a63bc24f..df668d13b2a3 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -865,13 +865,13 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-
diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
--- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200
+++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200
-@@ -119,6 +119,9 @@
+@@ -125,6 +125,9 @@
# Enables runtime selection of ALSA library for audio.
use_alsa = false
+ # Enable runtime selection of sndio(7)
+ use_sndio = false
+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+ # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS
+ # video builds).
if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
deleted file mode 100644
index 6d423d4091c5..000000000000
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
-and add --enable-vsx, and change generic to ppc for the rtcd header.
-
-From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Sep 2020 19:08:25 +0200
-Subject: [PATCH] enable generation of ppc64 libvpx bits
-
-this doesn't update the gni file, that's done from
-the template by running the appropriate scripts
----
- third_party/libvpx/BUILD.gn | 4 ++++
- third_party/libvpx/generate_gni.sh | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
-index 7198e59..3300485 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -336,6 +336,8 @@ static_library("libvpx") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_ppc64
- }
-
- configs -= [ "//build/config/compiler:chromium_code" ]
-diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
-index bcf84b0..8a3f4f1 100755
---- a/third_party/libvpx/generate_gni.sh
-+++ b/third_party/libvpx/generate_gni.sh
-@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
- gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
- gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
- gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
-+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
- gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
-@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd
- lint_config linux/arm64-highbd
- lint_config linux/mipsel
- lint_config linux/mips64el
-+lint_config linux/ppc64
- lint_config linux/generic
- lint_config win/arm64
- lint_config win/ia32
-@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
- gen_rtcd_header linux/arm64-highbd armv8
- gen_rtcd_header linux/mipsel mipsel
- gen_rtcd_header linux/mips64el mips64el
-+gen_rtcd_header linux/ppc64 generic
- gen_rtcd_header linux/generic generic
- gen_rtcd_header win/arm64 armv8
- gen_rtcd_header win/ia32 x86 "${require_sse2}"
-@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then
-
- echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
-
-+ echo "Generate ppc64 source list."
-+ config=$(print_config_basic linux/ppc64)
-+ make_clean
-+ make libvpx_srcs.txt target=libs $config > /dev/null
-+ convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
-+
- echo "Generate NaCl source list."
- config=$(print_config_basic nacl)
- make_clean
---
-2.28.0
-
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index e626f8130d43..d9a2724e1e22 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3275,58 +3275,6 @@ index 30a2ab21d..60509f21d 100644
#endif
}
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 6b4566fc3..c07f732ad 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -184,6 +184,8 @@ static_library("dav1d_8bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -212,6 +214,8 @@ static_library("dav1d_10bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
- defines = [ "PREFIX" ]
- }
-
-+ cflags = dav1d_copts
-+ }
-+} else if (current_cpu == "ppc64") {
-+ static_library("dav1d_ppc") {
-+ sources = [
-+ "libdav1d/src/ppc/cpu.c",
-+ "libdav1d/src/ppc/cpu.h",
-+ ]
-+
-+ configs -= [ "//build/config/compiler:chromium_code" ]
-+ configs += [
-+ "//build/config/compiler:no_chromium_code",
-+ ":dav1d_config",
-+ ]
-+
- cflags = dav1d_copts
- }
- }
-@@ -292,5 +311,7 @@ static_library("dav1d") {
- }
- } else if (current_cpu == "arm" || current_cpu == "arm64") {
- deps += [ ":dav1d_arm" ]
-+ } else if (current_cpu == "ppc64") {
-+ deps += [ ":dav1d_ppc" ]
- }
- }
diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h
new file mode 100644
index 000000000..9fbbf75cc
@@ -3372,33 +3320,6 @@ index 000000000..9fbbf75cc
+
+#define HAVE_UNISTD_H 1
+
-diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni
-index c59cb0821..3060284a8 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -82,6 +82,11 @@ arm_template_sources = [
- "libdav1d/src/arm/mc_init_tmpl.c",
- ]
-
-+ppc64_template_sources = [
-+ "libdav1d/src/ppc/cdef_init_tmpl.c",
-+ "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
- "libdav1d/src/cdef_apply_tmpl.c",
- "libdav1d/src/cdef_tmpl.c",
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -61,6 +61,8 @@
- _Glob("libdav1d/src/arm/64/*_tmpl.S") + ["libdav1d/src/arm/64/util.S"])
- _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
-
-+ _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
-+
- template_sources = _Glob("libdav1d/src/*_tmpl.c")
- _WriteArray(fd, "template_sources", template_sources)
-
diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
index 0b4bd72f0..a0caa5e71 100644
--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
@@ -3450,17 +3371,6 @@ index 9b065bd..df3af02 100644
} else {
cpu_arch_full = current_cpu
}
-diff --git a/third_party/libgav1/options.gni b/third_party/libgav1/options.gni
-index 11af801..4b13d05 100644
---- a/third_party/libgav1/options.gni
-+++ b/third_party/libgav1/options.gni
-@@ -12,5 +12,5 @@ declare_args() {
- is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
- use_libgav1_parser =
- (is_chromeos || is_linux || is_win) &&
-- (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
-+ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
- }
diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
index e4ac22644..1c57015db 100644
--- a/third_party/lss/linux_syscall_support.h
@@ -3585,34 +3495,6 @@ index 245070d4f..b25164e95 100644
# define SQLITE_BYTEORDER 1234
# elif defined(sparc) || defined(__ppc__) || \
defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-index 4f0c5430c..54ee0829e 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
-
- if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
-- // For ARM and MIPS processors, always use C version.
-- // TODO(hclam): Implement a NEON version.
-- diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = GetCPUInfo(kSSE2) != 0;
- // For x86 processors, check if SSE2 is supported.
- if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- } else {
- diff_proc = &VectorDifference_C;
- }
-+#else
-+ // For other processors, always use C version.
-+ // TODO(hclam): Implement a NEON version.
-+ diff_proc = &VectorDifference_C;
- #endif
- }
-
diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h
index be2367b85..be4ee4233 100644
--- a/third_party/webrtc/rtc_base/system/arch.h
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 1f385fd186df..1e85fd477472 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=102.0.5005.115
+version=103.0.5060.53
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
+checksum=0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
lib32disabled=yes
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 103.0.5060.53.
2022-06-22 18:13 [PR PATCH] chromium: update to 103.0.5060.53 Duncaen
2022-06-22 18:16 ` [PR PATCH] [Updated] " Duncaen
@ 2022-06-23 14:13 ` Duncaen
2022-06-23 21:44 ` Duncaen
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2022-06-23 14:13 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 411 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-103
https://github.com/void-linux/void-packages/pull/37644
chromium: update to 103.0.5060.53.
[ci skip]
* [x] x86_64-glibc
* [ ] x86_64-musl
* [ ] aarch64-musl
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/37644.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-103-37644.patch --]
[-- Type: text/x-diff, Size: 26195 bytes --]
From f9504ed13247cafb0bc87420112b751477079645 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 22 Jun 2022 20:08:38 +0200
Subject: [PATCH] chromium: update to 103.0.5060.53.
---
.../files/musl-patches/musl-tid-caching.patch | 81 ++++++++
.../musl-patches/quiche-arena-size.patch | 11 +
srcpkgs/chromium/patches/9d080c0.patch | 196 ------------------
srcpkgs/chromium/patches/9d080c0.patch.args | 1 -
...omium-102-fenced_frame_utils-include.patch | 25 ---
.../chromium-102-regex_pattern-array.patch | 14 --
.../patches/chromium-libxml-unbundle.patch | 10 -
srcpkgs/chromium/patches/sndio.patch | 6 +-
.../chromium/patches/xxx-ppc64le-libvpx.patch | 72 -------
.../patches/xxx-ppc64le-support.patch | 118 -----------
srcpkgs/chromium/template | 4 +-
11 files changed, 97 insertions(+), 441 deletions(-)
create mode 100644 srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
create mode 100644 srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
delete mode 100644 srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
diff --git a/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
new file mode 100644
index 000000000000..bb83038cb963
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
@@ -0,0 +1,81 @@
+--- ./sandbox/linux/services/namespace_sandbox.cc.orig
++++ ./sandbox/linux/services/namespace_sandbox.cc
+@@ -209,6 +209,70 @@
+ return base::LaunchProcess(argv, launch_options_copy);
+ }
+
++#if defined(__aarch64__)
++#define TLS_ABOVE_TP
++#endif
++
++struct musl_pthread
++{
++ /* Part 1 -- these fields may be external or
++ * internal (accessed via asm) ABI. Do not change. */
++ struct pthread *self;
++#ifndef TLS_ABOVE_TP
++ uintptr_t *dtv;
++#endif
++ struct pthread *prev, *next; /* non-ABI */
++ uintptr_t sysinfo;
++#ifndef TLS_ABOVE_TP
++#ifdef CANARY_PAD
++ uintptr_t canary_pad;
++#endif
++ uintptr_t canary;
++#endif
++
++/* Part 2 -- implementation details, non-ABI. */
++ int tid;
++ int errno_val;
++ volatile int detach_state;
++ volatile int cancel;
++ volatile unsigned char canceldisable, cancelasync;
++ unsigned char tsd_used:1;
++ unsigned char dlerror_flag:1;
++ unsigned char *map_base;
++ size_t map_size;
++ void *stack;
++ size_t stack_size;
++ size_t guard_size;
++ void *result;
++ struct __ptcb *cancelbuf;
++ void **tsd;
++ struct {
++ volatile void *volatile head;
++ long off;
++ volatile void *volatile pending;
++ } robust_list;
++ int h_errno_val;
++ volatile int timer_id;
++ locale_t locale;
++ volatile int killlock[1];
++ char *dlerror_buf;
++ void *stdio_locks;
++
++ /* Part 3 -- the positions of these fields relative to
++ * the end of the structure is external and internal ABI. */
++#ifdef TLS_ABOVE_TP
++ uintptr_t canary;
++ uintptr_t *dtv;
++#endif
++};
++
++void MaybeUpdateMuslTidCache()
++{
++ pid_t real_tid = sys_gettid();
++ pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
++ *cached_tid_location = real_tid;
++}
++
+ // static
+ pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
+ const pid_t pid =
+@@ -226,6 +290,7 @@
+ #if defined(LIBC_GLIBC)
+ MaybeUpdateGlibcTidCache();
+ #endif
++ MaybeUpdateMuslTidCache();
+ return 0;
+ }
+
diff --git a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
new file mode 100644
index 000000000000..1c9182dbc810
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
@@ -0,0 +1,11 @@
+--- ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
++++ ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
+@@ -69,7 +69,7 @@
+
+ // QuicConnections currently use around 1KB of polymorphic types which would
+ // ordinarily be on the heap. Instead, store them inline in an arena.
+-using QuicConnectionArena = QuicOneBlockArena<1248>;
++using QuicConnectionArena = QuicOneBlockArena<1504>;
+
+ } // namespace quic
+
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
deleted file mode 100644
index 885ab5a1b82a..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
-From: Dylan Cutler <dylancutler@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 <dylancutler@google.com>
-> Reviewed-by: Nico Weber <thakis@chromium.org>
-> Reviewed-by: Jonathan Metzman <metzman@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 <dylancutler@google.com>
-Reviewed-by: Nico Weber <thakis@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 aaaad023474d1..55b388a437439 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 82627b03653f1..f3e563ab701bf 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
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
deleted file mode 100644
index 8bbbbe948363..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch b/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
deleted file mode 100644
index 61f904bad6a4..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 Apr 2022 16:01:01 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
-
----
- third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-index 9e2d3ad..68f4823 100644
---- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-@@ -4,6 +4,8 @@
-
- #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
-
-+#include <cstring>
-+
- #include "base/guid.h"
- #include "base/strings/string_util.h"
-
---
-2.35.1
-
diff --git a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch b/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
deleted file mode 100644
index 18058b1faa45..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/components/autofill/core/browser/BUILD.gn
-+++ b/components/autofill/core/browser/BUILD.gn
-@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
- }
-
- static_library("browser") {
-+ if (is_clang) {
-+ cflags = [
-+ "-fbracket-depth=1000",
-+ ]
-+ }
- sources = [
- "address_normalization_manager.cc",
- "address_normalization_manager.h",
diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
deleted file mode 100644
index 5699bc8f8eaf..000000000000
--- a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
- ":xml_reader",
- ":xml_writer",
- "//base/test:test_support",
-+ "//services/data_decoder:lib",
- "//services/data_decoder:xml_parser_fuzzer_deps",
- ]
- sources = [
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index bac8a63bc24f..df668d13b2a3 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -865,13 +865,13 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-
diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
--- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200
+++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200
-@@ -119,6 +119,9 @@
+@@ -125,6 +125,9 @@
# Enables runtime selection of ALSA library for audio.
use_alsa = false
+ # Enable runtime selection of sndio(7)
+ use_sndio = false
+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+ # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS
+ # video builds).
if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
deleted file mode 100644
index 6d423d4091c5..000000000000
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
-and add --enable-vsx, and change generic to ppc for the rtcd header.
-
-From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Sep 2020 19:08:25 +0200
-Subject: [PATCH] enable generation of ppc64 libvpx bits
-
-this doesn't update the gni file, that's done from
-the template by running the appropriate scripts
----
- third_party/libvpx/BUILD.gn | 4 ++++
- third_party/libvpx/generate_gni.sh | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
-index 7198e59..3300485 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -336,6 +336,8 @@ static_library("libvpx") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_ppc64
- }
-
- configs -= [ "//build/config/compiler:chromium_code" ]
-diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
-index bcf84b0..8a3f4f1 100755
---- a/third_party/libvpx/generate_gni.sh
-+++ b/third_party/libvpx/generate_gni.sh
-@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
- gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
- gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
- gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
-+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
- gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
-@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd
- lint_config linux/arm64-highbd
- lint_config linux/mipsel
- lint_config linux/mips64el
-+lint_config linux/ppc64
- lint_config linux/generic
- lint_config win/arm64
- lint_config win/ia32
-@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
- gen_rtcd_header linux/arm64-highbd armv8
- gen_rtcd_header linux/mipsel mipsel
- gen_rtcd_header linux/mips64el mips64el
-+gen_rtcd_header linux/ppc64 generic
- gen_rtcd_header linux/generic generic
- gen_rtcd_header win/arm64 armv8
- gen_rtcd_header win/ia32 x86 "${require_sse2}"
-@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then
-
- echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
-
-+ echo "Generate ppc64 source list."
-+ config=$(print_config_basic linux/ppc64)
-+ make_clean
-+ make libvpx_srcs.txt target=libs $config > /dev/null
-+ convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
-+
- echo "Generate NaCl source list."
- config=$(print_config_basic nacl)
- make_clean
---
-2.28.0
-
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index e626f8130d43..d9a2724e1e22 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3275,58 +3275,6 @@ index 30a2ab21d..60509f21d 100644
#endif
}
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 6b4566fc3..c07f732ad 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -184,6 +184,8 @@ static_library("dav1d_8bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -212,6 +214,8 @@ static_library("dav1d_10bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
- defines = [ "PREFIX" ]
- }
-
-+ cflags = dav1d_copts
-+ }
-+} else if (current_cpu == "ppc64") {
-+ static_library("dav1d_ppc") {
-+ sources = [
-+ "libdav1d/src/ppc/cpu.c",
-+ "libdav1d/src/ppc/cpu.h",
-+ ]
-+
-+ configs -= [ "//build/config/compiler:chromium_code" ]
-+ configs += [
-+ "//build/config/compiler:no_chromium_code",
-+ ":dav1d_config",
-+ ]
-+
- cflags = dav1d_copts
- }
- }
-@@ -292,5 +311,7 @@ static_library("dav1d") {
- }
- } else if (current_cpu == "arm" || current_cpu == "arm64") {
- deps += [ ":dav1d_arm" ]
-+ } else if (current_cpu == "ppc64") {
-+ deps += [ ":dav1d_ppc" ]
- }
- }
diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h
new file mode 100644
index 000000000..9fbbf75cc
@@ -3372,33 +3320,6 @@ index 000000000..9fbbf75cc
+
+#define HAVE_UNISTD_H 1
+
-diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni
-index c59cb0821..3060284a8 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -82,6 +82,11 @@ arm_template_sources = [
- "libdav1d/src/arm/mc_init_tmpl.c",
- ]
-
-+ppc64_template_sources = [
-+ "libdav1d/src/ppc/cdef_init_tmpl.c",
-+ "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
- "libdav1d/src/cdef_apply_tmpl.c",
- "libdav1d/src/cdef_tmpl.c",
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -61,6 +61,8 @@
- _Glob("libdav1d/src/arm/64/*_tmpl.S") + ["libdav1d/src/arm/64/util.S"])
- _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
-
-+ _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
-+
- template_sources = _Glob("libdav1d/src/*_tmpl.c")
- _WriteArray(fd, "template_sources", template_sources)
-
diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
index 0b4bd72f0..a0caa5e71 100644
--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
@@ -3450,17 +3371,6 @@ index 9b065bd..df3af02 100644
} else {
cpu_arch_full = current_cpu
}
-diff --git a/third_party/libgav1/options.gni b/third_party/libgav1/options.gni
-index 11af801..4b13d05 100644
---- a/third_party/libgav1/options.gni
-+++ b/third_party/libgav1/options.gni
-@@ -12,5 +12,5 @@ declare_args() {
- is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
- use_libgav1_parser =
- (is_chromeos || is_linux || is_win) &&
-- (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
-+ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
- }
diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
index e4ac22644..1c57015db 100644
--- a/third_party/lss/linux_syscall_support.h
@@ -3585,34 +3495,6 @@ index 245070d4f..b25164e95 100644
# define SQLITE_BYTEORDER 1234
# elif defined(sparc) || defined(__ppc__) || \
defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-index 4f0c5430c..54ee0829e 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
-
- if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
-- // For ARM and MIPS processors, always use C version.
-- // TODO(hclam): Implement a NEON version.
-- diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = GetCPUInfo(kSSE2) != 0;
- // For x86 processors, check if SSE2 is supported.
- if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- } else {
- diff_proc = &VectorDifference_C;
- }
-+#else
-+ // For other processors, always use C version.
-+ // TODO(hclam): Implement a NEON version.
-+ diff_proc = &VectorDifference_C;
- #endif
- }
-
diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h
index be2367b85..be4ee4233 100644
--- a/third_party/webrtc/rtc_base/system/arch.h
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 1f385fd186df..1e85fd477472 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=102.0.5005.115
+version=103.0.5060.53
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
+checksum=0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
lib32disabled=yes
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 103.0.5060.53.
2022-06-22 18:13 [PR PATCH] chromium: update to 103.0.5060.53 Duncaen
2022-06-22 18:16 ` [PR PATCH] [Updated] " Duncaen
2022-06-23 14:13 ` Duncaen
@ 2022-06-23 21:44 ` Duncaen
2022-06-25 10:21 ` Duncaen
2022-06-25 22:55 ` [PR PATCH] [Closed]: " q66
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2022-06-23 21:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-103
https://github.com/void-linux/void-packages/pull/37644
chromium: update to 103.0.5060.53.
[ci skip]
* [x] x86_64-glibc
* [ ] x86_64-musl
* [x] aarch64
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/37644.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-103-37644.patch --]
[-- Type: text/x-diff, Size: 26194 bytes --]
From 3d4650d3496ca3568a0ef2cd2fb90a2d378244c1 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 22 Jun 2022 20:08:38 +0200
Subject: [PATCH] chromium: update to 103.0.5060.53.
---
.../files/musl-patches/musl-tid-caching.patch | 81 ++++++++
.../musl-patches/quiche-arena-size.patch | 11 +
srcpkgs/chromium/patches/9d080c0.patch | 196 ------------------
srcpkgs/chromium/patches/9d080c0.patch.args | 1 -
...omium-102-fenced_frame_utils-include.patch | 25 ---
.../chromium-102-regex_pattern-array.patch | 14 --
.../patches/chromium-libxml-unbundle.patch | 10 -
srcpkgs/chromium/patches/sndio.patch | 6 +-
.../chromium/patches/xxx-ppc64le-libvpx.patch | 72 -------
.../patches/xxx-ppc64le-support.patch | 118 -----------
srcpkgs/chromium/template | 4 +-
11 files changed, 97 insertions(+), 441 deletions(-)
create mode 100644 srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
create mode 100644 srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
delete mode 100644 srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
diff --git a/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
new file mode 100644
index 000000000000..bb83038cb963
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
@@ -0,0 +1,81 @@
+--- ./sandbox/linux/services/namespace_sandbox.cc.orig
++++ ./sandbox/linux/services/namespace_sandbox.cc
+@@ -209,6 +209,70 @@
+ return base::LaunchProcess(argv, launch_options_copy);
+ }
+
++#if defined(__aarch64__)
++#define TLS_ABOVE_TP
++#endif
++
++struct musl_pthread
++{
++ /* Part 1 -- these fields may be external or
++ * internal (accessed via asm) ABI. Do not change. */
++ struct pthread *self;
++#ifndef TLS_ABOVE_TP
++ uintptr_t *dtv;
++#endif
++ struct pthread *prev, *next; /* non-ABI */
++ uintptr_t sysinfo;
++#ifndef TLS_ABOVE_TP
++#ifdef CANARY_PAD
++ uintptr_t canary_pad;
++#endif
++ uintptr_t canary;
++#endif
++
++/* Part 2 -- implementation details, non-ABI. */
++ int tid;
++ int errno_val;
++ volatile int detach_state;
++ volatile int cancel;
++ volatile unsigned char canceldisable, cancelasync;
++ unsigned char tsd_used:1;
++ unsigned char dlerror_flag:1;
++ unsigned char *map_base;
++ size_t map_size;
++ void *stack;
++ size_t stack_size;
++ size_t guard_size;
++ void *result;
++ struct __ptcb *cancelbuf;
++ void **tsd;
++ struct {
++ volatile void *volatile head;
++ long off;
++ volatile void *volatile pending;
++ } robust_list;
++ int h_errno_val;
++ volatile int timer_id;
++ locale_t locale;
++ volatile int killlock[1];
++ char *dlerror_buf;
++ void *stdio_locks;
++
++ /* Part 3 -- the positions of these fields relative to
++ * the end of the structure is external and internal ABI. */
++#ifdef TLS_ABOVE_TP
++ uintptr_t canary;
++ uintptr_t *dtv;
++#endif
++};
++
++void MaybeUpdateMuslTidCache()
++{
++ pid_t real_tid = sys_gettid();
++ pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
++ *cached_tid_location = real_tid;
++}
++
+ // static
+ pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
+ const pid_t pid =
+@@ -226,6 +290,7 @@
+ #if defined(LIBC_GLIBC)
+ MaybeUpdateGlibcTidCache();
+ #endif
++ MaybeUpdateMuslTidCache();
+ return 0;
+ }
+
diff --git a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
new file mode 100644
index 000000000000..1c9182dbc810
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
@@ -0,0 +1,11 @@
+--- ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
++++ ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
+@@ -69,7 +69,7 @@
+
+ // QuicConnections currently use around 1KB of polymorphic types which would
+ // ordinarily be on the heap. Instead, store them inline in an arena.
+-using QuicConnectionArena = QuicOneBlockArena<1248>;
++using QuicConnectionArena = QuicOneBlockArena<1504>;
+
+ } // namespace quic
+
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
deleted file mode 100644
index 885ab5a1b82a..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
-From: Dylan Cutler <dylancutler@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 <dylancutler@google.com>
-> Reviewed-by: Nico Weber <thakis@chromium.org>
-> Reviewed-by: Jonathan Metzman <metzman@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 <dylancutler@google.com>
-Reviewed-by: Nico Weber <thakis@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 aaaad023474d1..55b388a437439 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 82627b03653f1..f3e563ab701bf 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
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
deleted file mode 100644
index 8bbbbe948363..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch b/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
deleted file mode 100644
index 61f904bad6a4..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 Apr 2022 16:01:01 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
-
----
- third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-index 9e2d3ad..68f4823 100644
---- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-@@ -4,6 +4,8 @@
-
- #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
-
-+#include <cstring>
-+
- #include "base/guid.h"
- #include "base/strings/string_util.h"
-
---
-2.35.1
-
diff --git a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch b/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
deleted file mode 100644
index 18058b1faa45..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/components/autofill/core/browser/BUILD.gn
-+++ b/components/autofill/core/browser/BUILD.gn
-@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
- }
-
- static_library("browser") {
-+ if (is_clang) {
-+ cflags = [
-+ "-fbracket-depth=1000",
-+ ]
-+ }
- sources = [
- "address_normalization_manager.cc",
- "address_normalization_manager.h",
diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
deleted file mode 100644
index 5699bc8f8eaf..000000000000
--- a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
- ":xml_reader",
- ":xml_writer",
- "//base/test:test_support",
-+ "//services/data_decoder:lib",
- "//services/data_decoder:xml_parser_fuzzer_deps",
- ]
- sources = [
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index bac8a63bc24f..df668d13b2a3 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -865,13 +865,13 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-
diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
--- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200
+++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200
-@@ -119,6 +119,9 @@
+@@ -125,6 +125,9 @@
# Enables runtime selection of ALSA library for audio.
use_alsa = false
+ # Enable runtime selection of sndio(7)
+ use_sndio = false
+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+ # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS
+ # video builds).
if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
deleted file mode 100644
index 6d423d4091c5..000000000000
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
-and add --enable-vsx, and change generic to ppc for the rtcd header.
-
-From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Sep 2020 19:08:25 +0200
-Subject: [PATCH] enable generation of ppc64 libvpx bits
-
-this doesn't update the gni file, that's done from
-the template by running the appropriate scripts
----
- third_party/libvpx/BUILD.gn | 4 ++++
- third_party/libvpx/generate_gni.sh | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
-index 7198e59..3300485 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -336,6 +336,8 @@ static_library("libvpx") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_ppc64
- }
-
- configs -= [ "//build/config/compiler:chromium_code" ]
-diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
-index bcf84b0..8a3f4f1 100755
---- a/third_party/libvpx/generate_gni.sh
-+++ b/third_party/libvpx/generate_gni.sh
-@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
- gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
- gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
- gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
-+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
- gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
-@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd
- lint_config linux/arm64-highbd
- lint_config linux/mipsel
- lint_config linux/mips64el
-+lint_config linux/ppc64
- lint_config linux/generic
- lint_config win/arm64
- lint_config win/ia32
-@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
- gen_rtcd_header linux/arm64-highbd armv8
- gen_rtcd_header linux/mipsel mipsel
- gen_rtcd_header linux/mips64el mips64el
-+gen_rtcd_header linux/ppc64 generic
- gen_rtcd_header linux/generic generic
- gen_rtcd_header win/arm64 armv8
- gen_rtcd_header win/ia32 x86 "${require_sse2}"
-@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then
-
- echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
-
-+ echo "Generate ppc64 source list."
-+ config=$(print_config_basic linux/ppc64)
-+ make_clean
-+ make libvpx_srcs.txt target=libs $config > /dev/null
-+ convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
-+
- echo "Generate NaCl source list."
- config=$(print_config_basic nacl)
- make_clean
---
-2.28.0
-
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index e626f8130d43..d9a2724e1e22 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3275,58 +3275,6 @@ index 30a2ab21d..60509f21d 100644
#endif
}
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 6b4566fc3..c07f732ad 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -184,6 +184,8 @@ static_library("dav1d_8bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -212,6 +214,8 @@ static_library("dav1d_10bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
- defines = [ "PREFIX" ]
- }
-
-+ cflags = dav1d_copts
-+ }
-+} else if (current_cpu == "ppc64") {
-+ static_library("dav1d_ppc") {
-+ sources = [
-+ "libdav1d/src/ppc/cpu.c",
-+ "libdav1d/src/ppc/cpu.h",
-+ ]
-+
-+ configs -= [ "//build/config/compiler:chromium_code" ]
-+ configs += [
-+ "//build/config/compiler:no_chromium_code",
-+ ":dav1d_config",
-+ ]
-+
- cflags = dav1d_copts
- }
- }
-@@ -292,5 +311,7 @@ static_library("dav1d") {
- }
- } else if (current_cpu == "arm" || current_cpu == "arm64") {
- deps += [ ":dav1d_arm" ]
-+ } else if (current_cpu == "ppc64") {
-+ deps += [ ":dav1d_ppc" ]
- }
- }
diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h
new file mode 100644
index 000000000..9fbbf75cc
@@ -3372,33 +3320,6 @@ index 000000000..9fbbf75cc
+
+#define HAVE_UNISTD_H 1
+
-diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni
-index c59cb0821..3060284a8 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -82,6 +82,11 @@ arm_template_sources = [
- "libdav1d/src/arm/mc_init_tmpl.c",
- ]
-
-+ppc64_template_sources = [
-+ "libdav1d/src/ppc/cdef_init_tmpl.c",
-+ "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
- "libdav1d/src/cdef_apply_tmpl.c",
- "libdav1d/src/cdef_tmpl.c",
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -61,6 +61,8 @@
- _Glob("libdav1d/src/arm/64/*_tmpl.S") + ["libdav1d/src/arm/64/util.S"])
- _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
-
-+ _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
-+
- template_sources = _Glob("libdav1d/src/*_tmpl.c")
- _WriteArray(fd, "template_sources", template_sources)
-
diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
index 0b4bd72f0..a0caa5e71 100644
--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
@@ -3450,17 +3371,6 @@ index 9b065bd..df3af02 100644
} else {
cpu_arch_full = current_cpu
}
-diff --git a/third_party/libgav1/options.gni b/third_party/libgav1/options.gni
-index 11af801..4b13d05 100644
---- a/third_party/libgav1/options.gni
-+++ b/third_party/libgav1/options.gni
-@@ -12,5 +12,5 @@ declare_args() {
- is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
- use_libgav1_parser =
- (is_chromeos || is_linux || is_win) &&
-- (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
-+ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
- }
diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
index e4ac22644..1c57015db 100644
--- a/third_party/lss/linux_syscall_support.h
@@ -3585,34 +3495,6 @@ index 245070d4f..b25164e95 100644
# define SQLITE_BYTEORDER 1234
# elif defined(sparc) || defined(__ppc__) || \
defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-index 4f0c5430c..54ee0829e 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
-
- if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
-- // For ARM and MIPS processors, always use C version.
-- // TODO(hclam): Implement a NEON version.
-- diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = GetCPUInfo(kSSE2) != 0;
- // For x86 processors, check if SSE2 is supported.
- if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- } else {
- diff_proc = &VectorDifference_C;
- }
-+#else
-+ // For other processors, always use C version.
-+ // TODO(hclam): Implement a NEON version.
-+ diff_proc = &VectorDifference_C;
- #endif
- }
-
diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h
index be2367b85..be4ee4233 100644
--- a/third_party/webrtc/rtc_base/system/arch.h
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 1f385fd186df..b546c7f3918f 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=102.0.5005.115
+version=103.0.5060.53
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
+checksum=0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
lib32disabled=yes
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Updated] chromium: update to 103.0.5060.53.
2022-06-22 18:13 [PR PATCH] chromium: update to 103.0.5060.53 Duncaen
` (2 preceding siblings ...)
2022-06-23 21:44 ` Duncaen
@ 2022-06-25 10:21 ` Duncaen
2022-06-25 22:55 ` [PR PATCH] [Closed]: " q66
4 siblings, 0 replies; 6+ messages in thread
From: Duncaen @ 2022-06-25 10:21 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 406 bytes --]
There is an updated pull request by Duncaen against master on the void-packages repository
https://github.com/Duncaen/void-packages chromium-103
https://github.com/void-linux/void-packages/pull/37644
chromium: update to 103.0.5060.53.
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [x] aarch64
* [ ] i686
A patch file from https://github.com/void-linux/void-packages/pull/37644.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-chromium-103-37644.patch --]
[-- Type: text/x-diff, Size: 26194 bytes --]
From afd759c8ecf54d2267c73ff04bbfb3aa81942433 Mon Sep 17 00:00:00 2001
From: Duncaen <duncaen@voidlinux.org>
Date: Wed, 22 Jun 2022 20:08:38 +0200
Subject: [PATCH] chromium: update to 103.0.5060.53.
---
.../files/musl-patches/musl-tid-caching.patch | 81 ++++++++
.../musl-patches/quiche-arena-size.patch | 11 +
srcpkgs/chromium/patches/9d080c0.patch | 196 ------------------
srcpkgs/chromium/patches/9d080c0.patch.args | 1 -
...omium-102-fenced_frame_utils-include.patch | 25 ---
.../chromium-102-regex_pattern-array.patch | 14 --
.../patches/chromium-libxml-unbundle.patch | 10 -
srcpkgs/chromium/patches/sndio.patch | 6 +-
.../chromium/patches/xxx-ppc64le-libvpx.patch | 72 -------
.../patches/xxx-ppc64le-support.patch | 118 -----------
srcpkgs/chromium/template | 4 +-
11 files changed, 97 insertions(+), 441 deletions(-)
create mode 100644 srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
create mode 100644 srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch
delete mode 100644 srcpkgs/chromium/patches/9d080c0.patch.args
delete mode 100644 srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
delete mode 100644 srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
delete mode 100644 srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
diff --git a/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
new file mode 100644
index 000000000000..bb83038cb963
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/musl-tid-caching.patch
@@ -0,0 +1,81 @@
+--- ./sandbox/linux/services/namespace_sandbox.cc.orig
++++ ./sandbox/linux/services/namespace_sandbox.cc
+@@ -209,6 +209,70 @@
+ return base::LaunchProcess(argv, launch_options_copy);
+ }
+
++#if defined(__aarch64__)
++#define TLS_ABOVE_TP
++#endif
++
++struct musl_pthread
++{
++ /* Part 1 -- these fields may be external or
++ * internal (accessed via asm) ABI. Do not change. */
++ struct pthread *self;
++#ifndef TLS_ABOVE_TP
++ uintptr_t *dtv;
++#endif
++ struct pthread *prev, *next; /* non-ABI */
++ uintptr_t sysinfo;
++#ifndef TLS_ABOVE_TP
++#ifdef CANARY_PAD
++ uintptr_t canary_pad;
++#endif
++ uintptr_t canary;
++#endif
++
++/* Part 2 -- implementation details, non-ABI. */
++ int tid;
++ int errno_val;
++ volatile int detach_state;
++ volatile int cancel;
++ volatile unsigned char canceldisable, cancelasync;
++ unsigned char tsd_used:1;
++ unsigned char dlerror_flag:1;
++ unsigned char *map_base;
++ size_t map_size;
++ void *stack;
++ size_t stack_size;
++ size_t guard_size;
++ void *result;
++ struct __ptcb *cancelbuf;
++ void **tsd;
++ struct {
++ volatile void *volatile head;
++ long off;
++ volatile void *volatile pending;
++ } robust_list;
++ int h_errno_val;
++ volatile int timer_id;
++ locale_t locale;
++ volatile int killlock[1];
++ char *dlerror_buf;
++ void *stdio_locks;
++
++ /* Part 3 -- the positions of these fields relative to
++ * the end of the structure is external and internal ABI. */
++#ifdef TLS_ABOVE_TP
++ uintptr_t canary;
++ uintptr_t *dtv;
++#endif
++};
++
++void MaybeUpdateMuslTidCache()
++{
++ pid_t real_tid = sys_gettid();
++ pid_t* cached_tid_location = &reinterpret_cast<struct musl_pthread*>(pthread_self())->tid;
++ *cached_tid_location = real_tid;
++}
++
+ // static
+ pid_t NamespaceSandbox::ForkInNewPidNamespace(bool drop_capabilities_in_child) {
+ const pid_t pid =
+@@ -226,6 +290,7 @@
+ #if defined(LIBC_GLIBC)
+ MaybeUpdateGlibcTidCache();
+ #endif
++ MaybeUpdateMuslTidCache();
+ return 0;
+ }
+
diff --git a/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
new file mode 100644
index 000000000000..1c9182dbc810
--- /dev/null
+++ b/srcpkgs/chromium/files/musl-patches/quiche-arena-size.patch
@@ -0,0 +1,11 @@
+--- ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
++++ ./net/third_party/quiche/src/quiche/quic/core/quic_one_block_arena.h
+@@ -69,7 +69,7 @@
+
+ // QuicConnections currently use around 1KB of polymorphic types which would
+ // ordinarily be on the heap. Instead, store them inline in an arena.
+-using QuicConnectionArena = QuicOneBlockArena<1248>;
++using QuicConnectionArena = QuicOneBlockArena<1504>;
+
+ } // namespace quic
+
diff --git a/srcpkgs/chromium/patches/9d080c0.patch b/srcpkgs/chromium/patches/9d080c0.patch
deleted file mode 100644
index 885ab5a1b82a..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch
+++ /dev/null
@@ -1,196 +0,0 @@
-From 9d080c0934b848ee4a05013c78641e612fcc1e03 Mon Sep 17 00:00:00 2001
-From: Dylan Cutler <dylancutler@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 <dylancutler@google.com>
-> Reviewed-by: Nico Weber <thakis@chromium.org>
-> Reviewed-by: Jonathan Metzman <metzman@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 <dylancutler@google.com>
-Reviewed-by: Nico Weber <thakis@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 aaaad023474d1..55b388a437439 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 82627b03653f1..f3e563ab701bf 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
diff --git a/srcpkgs/chromium/patches/9d080c0.patch.args b/srcpkgs/chromium/patches/9d080c0.patch.args
deleted file mode 100644
index 8bbbbe948363..000000000000
--- a/srcpkgs/chromium/patches/9d080c0.patch.args
+++ /dev/null
@@ -1 +0,0 @@
--RNp1
diff --git a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch b/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
deleted file mode 100644
index 61f904bad6a4..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-fenced_frame_utils-include.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7c135a291184b59a59643ed6a8c40b4405ac0175 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09@googlemail.com>
-Date: Wed, 27 Apr 2022 16:01:01 +0000
-Subject: [PATCH] IWYU: add cstring for std::strlen in fenced_frame_utils
-
----
- third_party/blink/common/fenced_frame/fenced_frame_utils.cc | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-index 9e2d3ad..68f4823 100644
---- a/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-+++ b/third_party/blink/common/fenced_frame/fenced_frame_utils.cc
-@@ -4,6 +4,8 @@
-
- #include "third_party/blink/public/common/fenced_frame/fenced_frame_utils.h"
-
-+#include <cstring>
-+
- #include "base/guid.h"
- #include "base/strings/string_util.h"
-
---
-2.35.1
-
diff --git a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch b/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
deleted file mode 100644
index 18058b1faa45..000000000000
--- a/srcpkgs/chromium/patches/chromium-102-regex_pattern-array.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/components/autofill/core/browser/BUILD.gn
-+++ b/components/autofill/core/browser/BUILD.gn
-@@ -54,6 +54,11 @@ action("regex_patterns_inl_h") {
- }
-
- static_library("browser") {
-+ if (is_clang) {
-+ cflags = [
-+ "-fbracket-depth=1000",
-+ ]
-+ }
- sources = [
- "address_normalization_manager.cc",
- "address_normalization_manager.h",
diff --git a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch b/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
deleted file mode 100644
index 5699bc8f8eaf..000000000000
--- a/srcpkgs/chromium/patches/chromium-libxml-unbundle.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/build/linux/unbundle/libxml.gn
-+++ b/build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
- ":xml_reader",
- ":xml_writer",
- "//base/test:test_support",
-+ "//services/data_decoder:lib",
- "//services/data_decoder:xml_parser_fuzzer_deps",
- ]
- sources = [
diff --git a/srcpkgs/chromium/patches/sndio.patch b/srcpkgs/chromium/patches/sndio.patch
index bac8a63bc24f..df668d13b2a3 100644
--- a/srcpkgs/chromium/patches/sndio.patch
+++ b/srcpkgs/chromium/patches/sndio.patch
@@ -865,13 +865,13 @@ diff -Naur chromium-83.0.4103.97.orig/media/audio/sndio/sndio_output.h chromium-
diff -Naur chromium-83.0.4103.97.orig/media/media_options.gni chromium-83.0.4103.97/media/media_options.gni
--- a/media/media_options.gni 2020-06-03 20:40:26.000000000 +0200
+++ b/media/media_options.gni 2020-06-13 17:32:28.512395963 +0200
-@@ -119,6 +119,9 @@
+@@ -125,6 +125,9 @@
# Enables runtime selection of ALSA library for audio.
use_alsa = false
+ # Enable runtime selection of sndio(7)
+ use_sndio = false
+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+ # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS
+ # video builds).
if (is_posix && !is_android && !is_mac &&
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch b/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
deleted file mode 100644
index 6d423d4091c5..000000000000
--- a/srcpkgs/chromium/patches/xxx-ppc64le-libvpx.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Uses generic target for now. To use ppc64le, change --target to ppc64le-gnu
-and add --enable-vsx, and change generic to ppc for the rtcd header.
-
-From 18e6c5c55cfae0cfb458d8210d7bc709360a0e90 Mon Sep 17 00:00:00 2001
-From: q66 <daniel@octaforge.org>
-Date: Wed, 9 Sep 2020 19:08:25 +0200
-Subject: [PATCH] enable generation of ppc64 libvpx bits
-
-this doesn't update the gni file, that's done from
-the template by running the appropriate scripts
----
- third_party/libvpx/BUILD.gn | 4 ++++
- third_party/libvpx/generate_gni.sh | 9 +++++++++
- 2 files changed, 13 insertions(+)
-
-diff --git third_party/libvpx/BUILD.gn third_party/libvpx/BUILD.gn
-index 7198e59..3300485 100644
---- a/third_party/libvpx/BUILD.gn
-+++ b/third_party/libvpx/BUILD.gn
-@@ -336,6 +336,8 @@ static_library("libvpx") {
- } else {
- sources = libvpx_srcs_arm64
- }
-+ } else if (current_cpu == "ppc64") {
-+ sources = libvpx_srcs_ppc64
- }
-
- configs -= [ "//build/config/compiler:chromium_code" ]
-diff --git third_party/libvpx/generate_gni.sh third_party/libvpx/generate_gni.sh
-index bcf84b0..8a3f4f1 100755
---- a/third_party/libvpx/generate_gni.sh
-+++ b/third_party/libvpx/generate_gni.sh
-@@ -361,6 +361,7 @@ gen_config_files linux/arm-neon-highbd "--target=armv7-linux-gcc ${all_platforms
- gen_config_files linux/arm64-highbd "--target=armv8-linux-gcc ${all_platforms} ${HIGHBD}"
- gen_config_files linux/mipsel "--target=mips32-linux-gcc ${all_platforms}"
- gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
-+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
- gen_config_files win/arm64 "--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD}"
- gen_config_files win/ia32 "--target=x86-win32-vs14 ${all_platforms} ${x86_platforms}"
-@@ -386,6 +387,7 @@ lint_config linux/arm-neon-highbd
- lint_config linux/arm64-highbd
- lint_config linux/mipsel
- lint_config linux/mips64el
-+lint_config linux/ppc64
- lint_config linux/generic
- lint_config win/arm64
- lint_config win/ia32
-@@ -415,6 +417,7 @@ gen_rtcd_header linux/arm-neon-highbd armv7
- gen_rtcd_header linux/arm64-highbd armv8
- gen_rtcd_header linux/mipsel mipsel
- gen_rtcd_header linux/mips64el mips64el
-+gen_rtcd_header linux/ppc64 generic
- gen_rtcd_header linux/generic generic
- gen_rtcd_header win/arm64 armv8
- gen_rtcd_header win/ia32 x86 "${require_sse2}"
-@@ -500,6 +503,12 @@ if [ -z $ONLY_CONFIGS ]; then
-
- echo "MIPS64 source list is identical to MIPS source list. No need to generate it."
-
-+ echo "Generate ppc64 source list."
-+ config=$(print_config_basic linux/ppc64)
-+ make_clean
-+ make libvpx_srcs.txt target=libs $config > /dev/null
-+ convert_srcs_to_project_files libvpx_srcs.txt libvpx_srcs_ppc64
-+
- echo "Generate NaCl source list."
- config=$(print_config_basic nacl)
- make_clean
---
-2.28.0
-
diff --git a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
index e626f8130d43..d9a2724e1e22 100644
--- a/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
+++ b/srcpkgs/chromium/patches/xxx-ppc64le-support.patch
@@ -3275,58 +3275,6 @@ index 30a2ab21d..60509f21d 100644
#endif
}
-diff --git a/third_party/dav1d/BUILD.gn b/third_party/dav1d/BUILD.gn
-index 6b4566fc3..c07f732ad 100644
---- a/third_party/dav1d/BUILD.gn
-+++ b/third_party/dav1d/BUILD.gn
-@@ -184,6 +184,8 @@ static_library("dav1d_8bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -212,6 +214,8 @@ static_library("dav1d_10bit") {
- sources += arm_template_sources
- } else if (current_cpu == "arm64") {
- sources += arm_template_sources
-+ } else if (current_cpu == "ppc64") {
-+ sources += ppc64_template_sources
- }
-
- cflags = dav1d_copts
-@@ -263,6 +267,21 @@ if (current_cpu == "x86" || current_cpu == "x64") {
- defines = [ "PREFIX" ]
- }
-
-+ cflags = dav1d_copts
-+ }
-+} else if (current_cpu == "ppc64") {
-+ static_library("dav1d_ppc") {
-+ sources = [
-+ "libdav1d/src/ppc/cpu.c",
-+ "libdav1d/src/ppc/cpu.h",
-+ ]
-+
-+ configs -= [ "//build/config/compiler:chromium_code" ]
-+ configs += [
-+ "//build/config/compiler:no_chromium_code",
-+ ":dav1d_config",
-+ ]
-+
- cflags = dav1d_copts
- }
- }
-@@ -292,5 +311,7 @@ static_library("dav1d") {
- }
- } else if (current_cpu == "arm" || current_cpu == "arm64") {
- deps += [ ":dav1d_arm" ]
-+ } else if (current_cpu == "ppc64") {
-+ deps += [ ":dav1d_ppc" ]
- }
- }
diff --git a/third_party/dav1d/config/linux/ppc64/config.h b/third_party/dav1d/config/linux/ppc64/config.h
new file mode 100644
index 000000000..9fbbf75cc
@@ -3372,33 +3320,6 @@ index 000000000..9fbbf75cc
+
+#define HAVE_UNISTD_H 1
+
-diff --git a/third_party/dav1d/dav1d_generated.gni b/third_party/dav1d/dav1d_generated.gni
-index c59cb0821..3060284a8 100644
---- a/third_party/dav1d/dav1d_generated.gni
-+++ b/third_party/dav1d/dav1d_generated.gni
-@@ -82,6 +82,11 @@ arm_template_sources = [
- "libdav1d/src/arm/mc_init_tmpl.c",
- ]
-
-+ppc64_template_sources = [
-+ "libdav1d/src/ppc/cdef_init_tmpl.c",
-+ "libdav1d/src/ppc/looprestoration_init_tmpl.c",
-+]
-+
- template_sources = [
- "libdav1d/src/cdef_apply_tmpl.c",
- "libdav1d/src/cdef_tmpl.c",
---- a/third_party/dav1d/generate_source.py
-+++ b/third_party/dav1d/generate_source.py
-@@ -61,6 +61,8 @@
- _Glob("libdav1d/src/arm/64/*_tmpl.S") + ["libdav1d/src/arm/64/util.S"])
- _WriteArray(fd, "arm_template_sources", _Glob("libdav1d/src/arm/*_tmpl.c"))
-
-+ _WriteArray(fd, "ppc64_template_sources", _Glob("libdav1d/src/ppc/*_tmpl.c"))
-+
- template_sources = _Glob("libdav1d/src/*_tmpl.c")
- _WriteArray(fd, "template_sources", template_sources)
-
diff --git a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h b/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
index 0b4bd72f0..a0caa5e71 100644
--- a/third_party/dav1d/libdav1d/src/ppc/dav1d_types.h
@@ -3450,17 +3371,6 @@ index 9b065bd..df3af02 100644
} else {
cpu_arch_full = current_cpu
}
-diff --git a/third_party/libgav1/options.gni b/third_party/libgav1/options.gni
-index 11af801..4b13d05 100644
---- a/third_party/libgav1/options.gni
-+++ b/third_party/libgav1/options.gni
-@@ -12,5 +12,5 @@ declare_args() {
- is_chromeos_ash && (target_cpu == "arm" || target_cpu == "arm64")
- use_libgav1_parser =
- (is_chromeos || is_linux || is_win) &&
-- (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64")
-+ (target_cpu == "x86" || target_cpu == "x64" || target_cpu == "arm64" || target_cpu == "ppc64")
- }
diff --git a/third_party/lss/linux_syscall_support.h b/third_party/lss/linux_syscall_support.h
index e4ac22644..1c57015db 100644
--- a/third_party/lss/linux_syscall_support.h
@@ -3585,34 +3495,6 @@ index 245070d4f..b25164e95 100644
# define SQLITE_BYTEORDER 1234
# elif defined(sparc) || defined(__ppc__) || \
defined(__ARMEB__) || defined(__AARCH64EB__)
-diff --git a/third_party/webrtc/modules/desktop_capture/differ_block.cc b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-index 4f0c5430c..54ee0829e 100644
---- a/third_party/webrtc/modules/desktop_capture/differ_block.cc
-+++ b/third_party/webrtc/modules/desktop_capture/differ_block.cc
-@@ -30,11 +30,7 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- static bool (*diff_proc)(const uint8_t*, const uint8_t*) = nullptr;
-
- if (!diff_proc) {
--#if defined(WEBRTC_ARCH_ARM_FAMILY) || defined(WEBRTC_ARCH_MIPS_FAMILY)
-- // For ARM and MIPS processors, always use C version.
-- // TODO(hclam): Implement a NEON version.
-- diff_proc = &VectorDifference_C;
--#else
-+#if defined(WEBRTC_ARCH_X86_FAMILY)
- bool have_sse2 = GetCPUInfo(kSSE2) != 0;
- // For x86 processors, check if SSE2 is supported.
- if (have_sse2 && kBlockSize == 32) {
-@@ -44,6 +40,10 @@ bool VectorDifference(const uint8_t* image1, const uint8_t* image2) {
- } else {
- diff_proc = &VectorDifference_C;
- }
-+#else
-+ // For other processors, always use C version.
-+ // TODO(hclam): Implement a NEON version.
-+ diff_proc = &VectorDifference_C;
- #endif
- }
-
diff --git a/third_party/webrtc/rtc_base/system/arch.h b/third_party/webrtc/rtc_base/system/arch.h
index be2367b85..be4ee4233 100644
--- a/third_party/webrtc/rtc_base/system/arch.h
diff --git a/srcpkgs/chromium/template b/srcpkgs/chromium/template
index 1f385fd186df..b546c7f3918f 100644
--- a/srcpkgs/chromium/template
+++ b/srcpkgs/chromium/template
@@ -1,7 +1,7 @@
# Template file for 'chromium'
pkgname=chromium
# See https://chromiumdash.appspot.com/releases?platform=Linux for the latest version
-version=102.0.5005.115
+version=103.0.5060.53
revision=1
archs="i686* x86_64* aarch64* armv7l* ppc64le*"
short_desc="Google's attempt at creating a safer, faster, and more stable browser"
@@ -9,7 +9,7 @@ maintainer="Duncaen <duncaen@voidlinux.org>"
license="BSD-3-Clause"
homepage="https://www.chromium.org/"
distfiles="https://commondatastorage.googleapis.com/chromium-browser-official/${pkgname}-${version}.tar.xz"
-checksum=301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
+checksum=0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
lib32disabled=yes
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PR PATCH] [Closed]: chromium: update to 103.0.5060.53.
2022-06-22 18:13 [PR PATCH] chromium: update to 103.0.5060.53 Duncaen
` (3 preceding siblings ...)
2022-06-25 10:21 ` Duncaen
@ 2022-06-25 22:55 ` q66
4 siblings, 0 replies; 6+ messages in thread
From: q66 @ 2022-06-25 22:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 245 bytes --]
There's a closed pull request on the void-packages repository
chromium: update to 103.0.5060.53.
https://github.com/void-linux/void-packages/pull/37644
Description:
[ci skip]
* [x] x86_64-glibc
* [x] x86_64-musl
* [x] aarch64
* [x] i686
^ permalink raw reply [flat|nested] 6+ messages in thread