Skip to content

Commit 03a2663

Browse files
committed
chromium: update to 95.0.4638.69
Release notes - https://chromereleases.googleblog.com/2021/10/stable-channel-update-for-desktop_28.html License changes: --------------- Added licenses: * net/third_party/mozilla_win/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3052905 Removed licenses: * third_party/google_android_play_core/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/3085922 --------------- Test-built with: * chromium-x11 * dunfell, clang (dunfell branch), MACHINE="intel-core2-32" * dunfell, clang (dunfell branch), MACHINE="intel-corei7-64" * dunfell, clang (dunfell branch), MACHINE="raspberrypi3" * hardknott, clang (hardknott branch), MACHINE="raspberrypi3" * honister, clang, MACHINE="intel-core2-32" * chromium-ozone-wayland: * dunfell, clang (dunfell branch), MACHINE="intel-corei7-64" * dunfell, clang (dunfell branch), MACHINE="qemuarm64" * dunfell, clang (dunfell branch), MACHINE="m3ulcb" * hardknott, clang (hardknott branch), MACHINE="raspberrypi3 * honister, clang, MACHINE="intel-corei7-64"
1 parent 550fb5e commit 03a2663

19 files changed

+276
-173
lines changed

meta-chromium/recipes-browser/chromium/chromium-gn.inc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,10 @@ SRC_URI += " \
1818
file://0007-Delete-compiler-options-not-available-in-release-ver.patch \
1919
file://0008-avoid-link-latomic-failure-on-CentOS-8-host.patch \
2020
file://0009-nomerge-attribute-on-declaration-is-only-available-s.patch \
21-
file://0010-fix-ruy-numeric-limits-error.patch \
2221
file://0011-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
2322
file://0013-Revert-Use-ffile-compilation-dir-instead-of-fdebug-c.patch \
2423
file://0014-ozone-wayland-don-t-build-xcb-for-pure-wayland-build.patch \
25-
file://0015-build-use-python3.patch \
24+
file://0016-Make-the-build-linux-unbundle-scripts-run-with-Pytho.patch \
2625
file://jinja-python-3.10.patch \
2726
"
2827

meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_94.0.4606.71.bb renamed to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_95.0.4638.69.bb

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ DEPENDS += "\
1111
"
1212

1313
SRC_URI += "\
14-
file://chromium-ozone-wayland/0001-ozone-add-va-api-support-to-wayland.patch \
14+
file://chromium-wayland/0001-ozone-add-va-api-support-to-wayland.patch \
15+
file://chromium-wayland/0001-ozone-wayland-do-not-create-surface-sync-if-buffers-.patch \
1516
"
1617

1718
GN_ARGS += "\
@@ -30,14 +31,5 @@ GN_ARGS += "\
3031
use_gtk=false \
3132
"
3233

33-
# Ozone is default via finch since M94 and default via compile time
34-
# changes since M95. However, use_x11 still must be disable to provide
35-
# a pure Wayland build. Since M95, use_x11 is controlled via
36-
# ozone_platform_x11 and won't be needed to be altered here, but rather
37-
# through the mentioned ozone_platform_x11 arg.
38-
# TODO(msisov): remove this once recipe is updated to M95.
39-
GN_ARGS += "use_x11=false"
40-
4134
# The chromium binary must always be started with those arguments.
4235
CHROMIUM_EXTRA_ARGS:append = " --ozone-platform=wayland"
43-

meta-chromium/recipes-browser/chromium/chromium-x11_94.0.4606.71.bb

Lines changed: 0 additions & 35 deletions
This file was deleted.
Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
require chromium-gn.inc
2+
3+
REQUIRED_DISTRO_FEATURES = "x11"
4+
5+
DEPENDS += "\
6+
libx11 \
7+
libxcomposite \
8+
libxcursor \
9+
libxdamage \
10+
libxext \
11+
libxfixes \
12+
libxi \
13+
libxrandr \
14+
libxrender \
15+
libxscrnsaver \
16+
libxtst \
17+
"
18+
19+
# Ozone is default path on Linux since M95.
20+
# Disable all backends except x11 to ensure this is
21+
# x11 only recipe.
22+
GN_ARGS += "\
23+
ozone_auto_platforms=false \
24+
ozone_platform_x11=true \
25+
"
26+
27+
# Compatibility glue while we have both chromium-x11 and
28+
# chromium-wayland recipes, and the former used to be called just
29+
# "chromium".
30+
PROVIDES = "chromium"

meta-chromium/recipes-browser/chromium/chromium.inc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ HOMEPAGE = "https://www.chromium.org/Home"
44
CVE_PRODUCT = "chromium:chromium google:chrome"
55

66
SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
7-
SRC_URI[md5sum] = "4b329a88fb91ed032972ad5ddd734200"
8-
SRC_URI[sha256sum] = "cabbba2e608c5ec110850b14ee5fead2608c44447a52edb80e2ba8261be3dc5b"
7+
SRC_URI[md5sum] = "db4d461655a9b9d6b01809531f04cb91"
8+
SRC_URI[sha256sum] = "38a37d737c6c9a7198402ca614746b2dbb7abbb793bb2cb02dc796b62a22efe7"
99

1010
S = "${WORKDIR}/chromium-${PV}"
1111

@@ -90,6 +90,7 @@ LIC_FILES_CHKSUM = "\
9090
file://${S}/ios/third_party/motion_transitioning_objc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
9191
file://${S}/native_client/LICENSE;md5=cbbd27594afd089daa160d3a16dd515a \
9292
file://${S}/native_client_sdk/src/libraries/third_party/newlib-extras/README;md5=e944d73ca3817b7ca8656eafb9497fed \
93+
file://${S}/net/third_party/mozilla_win/LICENSE;md5=9b13a17f35cae227ee726ee0108d72a2 \
9394
file://${S}/net/third_party/nss/LICENSE;md5=3b1e88e1b9c0b5a4b2881d46cce06a18 \
9495
file://${S}/net/third_party/quiche/src/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \
9596
file://${S}/net/third_party/uri_template/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -241,7 +242,6 @@ LIC_FILES_CHKSUM = "\
241242
file://${S}/third_party/gemmlowp/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
242243
file://${S}/third_party/gif_player/LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
243244
file://${S}/third_party/google-closure-library/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \
244-
file://${S}/third_party/google_android_play_core/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
245245
file://${S}/third_party/google_input_tools/LICENSE;md5=ff0b0f0202337c9d4ae2d869797049d3 \
246246
file://${S}/third_party/google_toolbox_for_mac/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
247247
file://${S}/third_party/google_trust_services/src/LICENSE;md5=0fca02217a5d49a14dfe2d11837bb34d \

meta-chromium/recipes-browser/chromium/files/0001-limit-number-of-LTO-jobs.patch

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ Thus, use the previously used number of threads.
1616
2 files changed, 11 insertions(+), 6 deletions(-)
1717

1818
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
19-
index d7073ad38f0bf..326786bce9b09 100644
19+
index 219a2be0e1a1f..ae42271d99e49 100644
2020
--- a/build/config/compiler/BUILD.gn
2121
+++ b/build/config/compiler/BUILD.gn
22-
@@ -663,7 +663,7 @@ config("compiler") {
22+
@@ -664,7 +664,7 @@ config("compiler") {
2323

2424
if (is_win) {
2525
ldflags += [
@@ -28,7 +28,7 @@ index d7073ad38f0bf..326786bce9b09 100644
2828
"-mllvm:-import-instr-limit=$import_instr_limit",
2929
"/lldltocache:" +
3030
rebase_path("$root_out_dir/thinlto-cache", root_build_dir),
31-
@@ -676,11 +676,11 @@ config("compiler") {
31+
@@ -677,11 +677,11 @@ config("compiler") {
3232
# usage in crbug.com/1038040. Note this will increase build time in
3333
# Chrome OS.
3434

@@ -46,10 +46,10 @@ index d7073ad38f0bf..326786bce9b09 100644
4646
ldflags +=
4747
[ "-Wl,-cache_path_lto," +
4848
diff --git a/build/config/compiler/compiler.gni b/build/config/compiler/compiler.gni
49-
index 6f1faaf10fa67..822bfca12efd7 100644
49+
index 932d4dff2cf81..20d8773d27525 100644
5050
--- a/build/config/compiler/compiler.gni
5151
+++ b/build/config/compiler/compiler.gni
52-
@@ -76,6 +76,11 @@ declare_args() {
52+
@@ -80,6 +80,11 @@ declare_args() {
5353
# If true, use Goma for ThinLTO code generation where applicable.
5454
use_goma_thin_lto = false
5555

meta-chromium/recipes-browser/chromium/files/0002-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ Upstream-Status: Inappropriate [OE-Specific]
1515
Signed-off-by: Khem Raj <raj.khem@gmail.com>
1616
Rebased-by: Maksim Sisov <msisov@igalia.com>
1717
---
18-
build/config/compiler/BUILD.gn | 26 --------------------------
19-
1 file changed, 26 deletions(-)
18+
build/config/compiler/BUILD.gn | 36 ----------------------------------
19+
1 file changed, 36 deletions(-)
2020

2121
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
22-
index 326786bce9b09..dc78a44626729 100644
22+
index ae42271d99e49..eb397d8722994 100644
2323
--- a/build/config/compiler/BUILD.gn
2424
+++ b/build/config/compiler/BUILD.gn
25-
@@ -865,10 +865,6 @@ config("compiler_cpu_abi") {
25+
@@ -895,10 +895,6 @@ config("compiler_cpu_abi") {
2626
]
2727
}
2828
} else if (current_cpu == "arm") {
@@ -33,7 +33,7 @@ index 326786bce9b09..dc78a44626729 100644
3333
if (!is_nacl) {
3434
cflags += [
3535
"-march=$arm_arch",
36-
@@ -878,11 +874,6 @@ config("compiler_cpu_abi") {
36+
@@ -908,11 +904,6 @@ config("compiler_cpu_abi") {
3737
if (arm_tune != "") {
3838
cflags += [ "-mtune=$arm_tune" ]
3939
}
@@ -45,7 +45,7 @@ index 326786bce9b09..dc78a44626729 100644
4545
} else if (current_cpu == "mipsel" && !is_nacl) {
4646
ldflags += [ "-Wl,--hash-style=sysv" ]
4747
if (custom_toolchain == "") {
48-
@@ -890,9 +881,6 @@ config("compiler_cpu_abi") {
48+
@@ -920,9 +911,6 @@ config("compiler_cpu_abi") {
4949
if (is_android) {
5050
cflags += [ "--target=mipsel-linux-android" ]
5151
ldflags += [ "--target=mipsel-linux-android" ]
@@ -55,7 +55,7 @@ index 326786bce9b09..dc78a44626729 100644
5555
}
5656
} else {
5757
cflags += [ "-EL" ]
58-
@@ -972,8 +960,6 @@ config("compiler_cpu_abi") {
58+
@@ -1002,8 +990,6 @@ config("compiler_cpu_abi") {
5959
ldflags += [ "-Wl,--hash-style=sysv" ]
6060
if (custom_toolchain == "") {
6161
if (is_clang) {
@@ -64,7 +64,7 @@ index 326786bce9b09..dc78a44626729 100644
6464
} else {
6565
cflags += [ "-EB" ]
6666
ldflags += [ "-EB" ]
67-
@@ -1021,9 +1007,6 @@ config("compiler_cpu_abi") {
67+
@@ -1051,9 +1037,6 @@ config("compiler_cpu_abi") {
6868
if (is_android) {
6969
cflags += [ "--target=mips64el-linux-android" ]
7070
ldflags += [ "--target=mips64el-linux-android" ]
@@ -74,7 +74,7 @@ index 326786bce9b09..dc78a44626729 100644
7474
}
7575
} else {
7676
cflags += [
77-
@@ -1081,8 +1064,6 @@ config("compiler_cpu_abi") {
77+
@@ -1111,8 +1094,6 @@ config("compiler_cpu_abi") {
7878
ldflags += [ "-Wl,--hash-style=sysv" ]
7979
if (custom_toolchain == "") {
8080
if (is_clang) {
@@ -83,7 +83,7 @@ index 326786bce9b09..dc78a44626729 100644
8383
} else {
8484
cflags += [
8585
"-EB",
86-
@@ -1254,13 +1235,6 @@ config("compiler_deterministic") {
86+
@@ -1284,23 +1265,6 @@ config("compiler_deterministic") {
8787
}
8888
}
8989
}
@@ -93,6 +93,16 @@ index 326786bce9b09..dc78a44626729 100644
9393
- # really need it and it can mess up the goma cache entries.
9494
- if (is_clang && !is_nacl) {
9595
- cflags += [ "-no-canonical-prefixes" ]
96+
-
97+
- # Same for links: Let the compiler driver invoke the linker
98+
- # with a relative path and pass relative paths to built-in
99+
- # libraries. Not needed on Windows because we call the linker
100+
- # directly there, not through the compiler driver.
101+
- # We don't link on goma, so this change is just for cleaner
102+
- # internal linker invocations, for people who work on the build.
103+
- if (!is_win) {
104+
- ldflags += [ "-no-canonical-prefixes" ]
105+
- }
96106
- }
97107
}
98108

meta-chromium/recipes-browser/chromium/files/0003-v8-qemu-wrapper.patch

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,35 @@ index 6e86a543558c9..eee89b37064e2 100644
2929
":v8_context_snapshot_generator($v8_snapshot_toolchain)",
3030

3131
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
32-
index 3e48fb11bf..24129494fd 100644
32+
index 5c7d931b27..aad8800dce 100644
3333
--- a/v8/BUILD.gn
3434
+++ b/v8/BUILD.gn
35-
@@ -1690,6 +1690,7 @@ template("run_torque") {
35+
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
36+
@@ -1721,6 +1721,7 @@ template("run_torque") {
3637
}
3738

3839
args = [
3940
+ "./v8-qemu-wrapper.sh",
4041
"./" + rebase_path(
4142
get_label_info(":torque($toolchain)", "root_out_dir") + "/torque",
4243
root_build_dir),
43-
@@ -1822,6 +1823,7 @@ action("generate_bytecode_builtins_list") {
44+
@@ -1853,6 +1854,7 @@ action("generate_bytecode_builtins_list") {
4445
outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ]
4546
deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ]
4647
args = [
4748
+ "./v8-qemu-wrapper.sh",
4849
"./" + rebase_path(
4950
get_label_info(
5051
":bytecode_builtins_list_generator($v8_generator_toolchain)",
51-
@@ -1867,6 +1869,7 @@ template("run_mksnapshot") {
52+
@@ -1898,6 +1900,7 @@ template("run_mksnapshot") {
5253
data = []
5354

5455
args = [
5556
+ "./v8-qemu-wrapper.sh",
5657
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
5758
"root_out_dir") + "/mksnapshot",
5859
root_build_dir),
59-
@@ -5508,6 +5511,7 @@ if (v8_enable_i18n_support) {
60+
@@ -5611,6 +5614,7 @@ if (v8_enable_i18n_support) {
6061
outputs = [ output_file ]
6162

6263
args = [

meta-chromium/recipes-browser/chromium/files/0005-BUILD-do-not-specify-march-on-arm.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1818
1 file changed, 10 deletions(-)
1919

2020
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
21-
index dc78a44626729..55b742b15f0cc 100644
21+
index eb397d8722994..e1f4b3cef6be3 100644
2222
--- a/build/config/compiler/BUILD.gn
2323
+++ b/build/config/compiler/BUILD.gn
24-
@@ -864,16 +864,6 @@ config("compiler_cpu_abi") {
24+
@@ -894,16 +894,6 @@ config("compiler_cpu_abi") {
2525
"-msse3",
2626
]
2727
}

meta-chromium/recipes-browser/chromium/files/0007-Delete-compiler-options-not-available-in-release-ver.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
1111
1 file changed, 5 insertions(+)
1212

1313
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
14-
index 55b742b15f0cc..c3e99a6545ffa 100644
14+
index e1f4b3cef6be3..794bad82720c0 100644
1515
--- a/build/config/compiler/BUILD.gn
1616
+++ b/build/config/compiler/BUILD.gn
17-
@@ -1580,6 +1580,11 @@ config("default_warnings") {
17+
@@ -1609,6 +1609,11 @@ config("default_warnings") {
1818
cflags += [
1919
"-Wenum-compare-conditional",
2020

0 commit comments

Comments
 (0)