Skip to content

Commit 39eef30

Browse files
committed
chromium: update to 93.0.4577.82
Stable release announcements since our latest update: https://chromereleases.googleblog.com/2021/09/stable-channel-update-for-desktop.html License changes --------------- Added licenses: * third_party/android_deps/libs/com_google_android_play_core/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2996943 * third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7/LICENSE * third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2988561 * third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE * third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2945894 * third_party/distributed_point_functions/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2844089 Removed licenses: * third_party/angle/src/third_party/compiler/LICENSE - https://chromium-review.googlesource.com/c/angle/angle/+/2940902 * tools/grit/third_party/six/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2950410 Updated licenses: * third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE - https://chromium-review.googlesource.com/c/chromium/src/+/2945894 * third_party/ffmpeg/CREDITS.chromium - https://chromium-review.googlesource.com/c/chromium/third_party/ffmpeg/+/2885985 * third_party/harfbuzz-ng/src/COPYING - harfbuzz/harfbuzz@19cb449 * third_party/vulkan_memory_allocator/LICENSE.txt - GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator@aa18374 * third_party/wayland-protocols/src/COPYING - https://gitlab.freedesktop.org/wayland/wayland-protocols/-/commit/f828a4381ee17ef51e34d2b3416f3d7a90dfc22a Test-built with: * chromium-x11 * dunfell, clang, MACHINE="intel-core2-32" * dunfell, clang, MACHINE="intel-corei7-64" * dunfell, clang, MACHINE="raspberrypi3" * hardknott, MACHINE="raspberrypi3" * chromium-ozone-wayland: * dunfell, clang, MACHINE="intel-corei7-64" * dunfell, clang, MACHINE="qemuarm64" * dunfell, clang, MACHINE="m3ulcb" * hardknott, clang, MACHINE="raspberrypi3"
1 parent 3ae42a6 commit 39eef30

19 files changed

+228
-240
lines changed

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ SRC_URI += " \
1919
file://0010-avoid-link-latomic-failure-on-CentOS-8-host.patch \
2020
file://0012-Fix-font-rendering-with-glibc-2.33.patch \
2121
file://0001-nomerge-attribute-on-declaration-is-only-available-s.patch \
22-
file://0001-DCScan-Fix-builds-with-system-sysroots.patch \
23-
file://0001-ARM64-VRegister-from_code-expected-to-be-constexpr.patch \
24-
file://fix-harfbuzz-supp-size-error.patch \
2522
file://fix-ruy-numeric-limits-error.patch \
2623
file://0001-exception_handler.cc-Match-the-types-for-SIGSTKSZ.patch \
2724
file://chromium-freetype-2.11.patch \
25+
file://0001-Make-Display-and-X11-available-in-the-same-build.patch \
2826
"
2927

3028
SRC_URI:append:libc-musl = "\

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

Lines changed: 12 additions & 8 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] = "e9e4926870377c87d0bfd0317f742cf2"
8-
SRC_URI[sha256sum] = "d97d337d0d70e959a75f1f510f5d78d2b57b5bf24573b7ade9fff9f26a7cfd11"
7+
SRC_URI[md5sum] = "5d59c8619445f74d6c9b9650f16f8430"
8+
SRC_URI[sha256sum] = "5d66214858fcba11a8f733d7a6fab61ed10e13e7df4ed37e63b66a0370fb2853"
99

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

@@ -161,6 +161,7 @@ LIC_FILES_CHKSUM = "\
161161
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
162162
file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_vision_common/LICENSE;md5=92b728c587a67a1b9577e9ca141ca520 \
163163
file://${S}/third_party/android_deps/libs/com_google_android_material_material/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
164+
file://${S}/third_party/android_deps/libs/com_google_android_play_core/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \
164165
file://${S}/third_party/android_deps/libs/com_google_code_findbugs_jsr305/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
165166
file://${S}/third_party/android_deps/libs/com_google_dagger_dagger/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
166167
file://${S}/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -181,11 +182,15 @@ LIC_FILES_CHKSUM = "\
181182
file://${S}/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
182183
file://${S}/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \
183184
file://${S}/third_party/android_deps/libs/javax_inject_javax_inject/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
184-
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE;md5=7f35d874eaad08606d5d622d4fe38c32 \
185+
file://${S}/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \
185186
file://${S}/third_party/android_deps/libs/org_codehaus_mojo_animal_sniffer_annotations/LICENSE;md5=a5dd953e661e22a77f7b8062ae790f6a \
186187
file://${S}/third_party/android_deps/libs/org_jetbrains_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
187188
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
188189
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
190+
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk7/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
191+
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlin_kotlin_stdlib_jdk8/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
192+
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
193+
file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
189194
file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
190195
file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \
191196
file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
@@ -194,7 +199,6 @@ LIC_FILES_CHKSUM = "\
194199
file://${S}/third_party/angle/LICENSE;md5=7abdb66a6948f39c2f469140db5184e2 \
195200
file://${S}/third_party/angle/src/common/third_party/xxhash/LICENSE;md5=cb91c07001f1ca6fd50b6bd4f042946a \
196201
file://${S}/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/ffx_spd/LICENSE;md5=64356ee6f79c94525e102a3264a62653 \
197-
file://${S}/third_party/angle/src/third_party/compiler/LICENSE;md5=0353c43961ee447c6432ea5c16485528 \
198202
file://${S}/third_party/apple_apsl/LICENSE;md5=c8c14a9f985552dba8d3edbd76660088 \
199203
file://${S}/third_party/arcore-android-sdk-client/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
200204
file://${S}/third_party/arcore-android-sdk/LICENSE;md5=c1bc4f7fbdd7a5a3f2c0dfefd457665e \
@@ -217,14 +221,15 @@ LIC_FILES_CHKSUM = "\
217221
file://${S}/third_party/dawn/LICENSE;md5=302a09339e8de37ba06c121279be1707 \
218222
file://${S}/third_party/decklink/LICENSE;md5=85b197f7b7b1ef270b01a1b6377be50e \
219223
file://${S}/third_party/devtools-frontend/src/LICENSE;md5=537e0b52077bf0a616d0a0c8a79bc9d5 \
224+
file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
220225
file://${S}/third_party/dom_distiller_js/LICENSE;md5=1399a5b89c7ed8167d261770432511e8 \
221226
file://${S}/third_party/eigen3/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
222227
file://${S}/third_party/emoji-metadata/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
223228
file://${S}/third_party/emoji-segmenter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
224229
file://${S}/third_party/expat/src/expat/COPYING;md5=9e2ce3b3c4c0f2670883a23bbd7c37a9 \
225230
file://${S}/third_party/farmhash/LICENSE;md5=7dfaa79e2b070897e495fec386e3acfc \
226231
file://${S}/third_party/fdlibm/LICENSE;md5=b17367d6c97e638599071d99a3049dfe \
227-
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=28c3eb351f68aa1d038e0e299dad5637 \
232+
file://${S}/third_party/ffmpeg/CREDITS.chromium;md5=aa2247c58648fadacf4d7f865259eebe \
228233
file://${S}/third_party/fft2d/LICENSE;md5=a062f975da2ca26745be122d5a0b1356 \
229234
file://${S}/third_party/flac/COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197 \
230235
file://${S}/third_party/flatbuffers/LICENSE;md5=a873c5645c184d51e0f9b34e1d7cf559 \
@@ -243,7 +248,7 @@ LIC_FILES_CHKSUM = "\
243248
file://${S}/third_party/grpc/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
244249
file://${S}/third_party/gvr-android-keyboard/LICENSE;md5=67d07a07ec29a50a3ded12b2ba952257 \
245250
file://${S}/third_party/gvr-android-sdk/LICENSE;md5=50b9d1f02b2ee0d8a568ccf4d35216e2 \
246-
file://${S}/third_party/harfbuzz-ng/src/COPYING;md5=8f787620b7d3866d9552fd1924c07572 \
251+
file://${S}/third_party/harfbuzz-ng/src/COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \
247252
file://${S}/third_party/highway/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \
248253
file://${S}/third_party/hunspell/COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325 \
249254
file://${S}/third_party/hyphenation-patterns/LICENSE;md5=53b217e6f2560833cbb279119065ae61 \
@@ -357,8 +362,8 @@ LIC_FILES_CHKSUM = "\
357362
file://${S}/third_party/vulkan-deps/vulkan-loader/src/LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac \
358363
file://${S}/third_party/vulkan-deps/vulkan-tools/src/LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57 \
359364
file://${S}/third_party/vulkan-deps/vulkan-validation-layers/src/LICENSE.txt;md5=8df9e8826734226d08cb412babfa599c \
360-
file://${S}/third_party/vulkan_memory_allocator/LICENSE.txt;md5=bff949090c46187eb309d8a8b19b310c \
361365
file://${S}/third_party/wayland-protocols/src/COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \
366+
file://${S}/third_party/vulkan_memory_allocator/LICENSE.txt;md5=28469cb09e41bc708efbb6a69fb39a29 \
362367
file://${S}/third_party/wayland/src/COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \
363368
file://${S}/third_party/web-animations-js/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
364369
file://${S}/third_party/webrtc/LICENSE;md5=ad296492125bc71530d06234d9bfebe0 \
@@ -370,7 +375,6 @@ LIC_FILES_CHKSUM = "\
370375
file://${S}/third_party/xdg-utils/LICENSE;md5=a5367a90934098d6b05af3b746405014 \
371376
file://${S}/third_party/zlib/LICENSE;md5=f09575dbfb09420642318b413159496f \
372377
file://${S}/third_party/zxcvbn-cpp/LICENSE.txt;md5=50f9303d0b3adb4952217b0d8c00d83f \
373-
file://${S}/tools/grit/third_party/six/LICENSE;md5=6f00d4a50713fa859858dd9abaa35b21 \
374378
file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
375379
file://${S}/v8/LICENSE;md5=6611673a9587a522034a4be8f4df564c \
376380
file://${S}/v8/LICENSE.fdlibm;md5=b17367d6c97e638599071d99a3049dfe \

meta-chromium/recipes-browser/chromium/files/0001-ARM64-VRegister-from_code-expected-to-be-constexpr.patch

Lines changed: 0 additions & 59 deletions
This file was deleted.

meta-chromium/recipes-browser/chromium/files/0001-DCScan-Fix-builds-with-system-sysroots.patch

Lines changed: 0 additions & 44 deletions
This file was deleted.
Lines changed: 131 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,131 @@
1+
Upstream-Status: Backport
2+
3+
Signed-off-by: Maksim Sisov <msisov@igalia.com>
4+
---
5+
From 729cbcf172c81076d418fdb8ee2c19791e7369de Mon Sep 17 00:00:00 2001
6+
From: Alexis Hetu <sugoi@google.com>
7+
Date: Fri, 23 Jul 2021 11:18:18 -0400
8+
Subject: [PATCH] Make Display and X11 available in the same build
9+
MIME-Version: 1.0
10+
Content-Type: text/plain; charset=UTF-8
11+
Content-Transfer-Encoding: 8bit
12+
13+
Chromium can use the 'use_ozone' and 'use_x11' build flags
14+
simultaneously, so we need the Vulkan display to still be
15+
selectable, even when the 'use_x11' flag is used.
16+
17+
This is required to make SwANGLE work with Ozone/Wayland, which
18+
is going to use EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE
19+
when SwANGLE is requested.
20+
21+
Bug: chromium:1231934
22+
Change-Id: I2ac1d3d9bc231608d7f77e9a2540f4c538840076
23+
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3049351
24+
Reviewed-by: Jamie Madill <jmadill@chromium.org>
25+
Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
26+
Commit-Queue: Alexis Hétu <sugoi@chromium.org>
27+
---
28+
BUILD.gn | 8 ++++----
29+
third_party/angle/gni/angle.gni | 4 ++--
30+
third_party/angle/src/libANGLE/Display.cpp | 6 +++---
31+
third_party/angle/util/display/DisplayPixmap.cpp | 2 +-
32+
third_party/angle/util/display/DisplayWindow.cpp | 2 +-
33+
5 files changed, 11 insertions(+), 11 deletions(-)
34+
35+
diff --git a/third_party/angle/BUILD.gn b/third_party/angle/BUILD.gn
36+
index 51fc98ab3..788ad1eea 100644
37+
--- a/third_party/angle/BUILD.gn
38+
+++ b/third_party/angle/BUILD.gn
39+
@@ -141,10 +141,10 @@ config("internal_config") {
40+
if (angle_use_vulkan_null_display) {
41+
defines += [ "ANGLE_USE_VULKAN_NULL_DISPLAY" ]
42+
} else if (angle_use_vulkan_display) {
43+
- defines += [
44+
- "ANGLE_USE_VULKAN_DISPLAY",
45+
- "EGL_NO_X11",
46+
- ]
47+
+ defines += [ "ANGLE_USE_VULKAN_DISPLAY" ]
48+
+ if (!angle_use_x11) {
49+
+ defines += [ "EGL_NO_X11" ]
50+
+ }
51+
if (angle_vulkan_display_mode == "simple") {
52+
defines += [ "ANGLE_VULKAN_DISPLAY_MODE_SIMPLE" ]
53+
} else if (angle_vulkan_display_mode == "headless") {
54+
55+
diff --git a/third_party/angle/gni/angle.gni b/third_party/angle/gni/angle.gni
56+
index 8938b6172..9b0ca3af3 100644
57+
--- a/third_party/angle/gni/angle.gni
58+
+++ b/third_party/angle/gni/angle.gni
59+
@@ -41,8 +41,7 @@ if (angle_has_build) {
60+
}
61+
62+
angle_use_x11 = use_x11 && !is_ggp
63+
- angle_use_vulkan_display =
64+
- is_linux && !use_x11 && !is_ggp && (!use_ozone || is_chromecast)
65+
+ angle_use_vulkan_display = is_linux && !is_ggp
66+
} else {
67+
declare_args() {
68+
is_ubsan = false
69+
@@ -60,7 +59,7 @@ if (angle_has_build) {
70+
}
71+
72+
declare_args() {
73+
- angle_use_vulkan_display = is_linux && !angle_use_x11 && !is_ggp
74+
+ angle_use_vulkan_display = is_linux && !is_ggp
75+
}
76+
}
77+
78+
diff --git a/third_party/angle/src/libANGLE/Display.cpp b/third_party/angle/src/libANGLE/Display.cpp
79+
index 5bb886cb1..4ab94f1de 100644
80+
--- a/third_party/angle/src/libANGLE/Display.cpp
81+
+++ b/third_party/angle/src/libANGLE/Display.cpp
82+
@@ -390,8 +390,8 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib displayType,
83+
impl = rx::CreateVulkanXcbDisplay(state);
84+
break;
85+
}
86+
- break;
87+
-# elif defined(ANGLE_USE_VULKAN_DISPLAY)
88+
+# endif
89+
+# if defined(ANGLE_USE_VULKAN_DISPLAY)
90+
if (platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_SIMPLE_ANGLE &&
91+
rx::IsVulkanSimpleDisplayAvailable())
92+
{
93+
@@ -407,8 +407,8 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib displayType,
94+
// Not supported creation type on vulkan display, fail display creation.
95+
impl = nullptr;
96+
}
97+
- break;
98+
# endif
99+
+ break;
100+
# elif defined(ANGLE_PLATFORM_ANDROID)
101+
if (rx::IsVulkanAndroidDisplayAvailable())
102+
{
103+
diff --git a/third_party/angle/util/display/DisplayPixmap.cpp b/third_party/angle/util/display/DisplayPixmap.cpp
104+
index 27d2734a3..67c087455 100644
105+
--- a/third_party/angle/util/display/DisplayPixmap.cpp
106+
+++ b/third_party/angle/util/display/DisplayPixmap.cpp
107+
@@ -8,7 +8,7 @@
108+
109+
#include "util/OSPixmap.h"
110+
111+
-#if defined(ANGLE_USE_VULKAN_DISPLAY)
112+
+#if defined(ANGLE_USE_VULKAN_DISPLAY) && defined(EGL_NO_X11)
113+
OSPixmap *CreateOSPixmap()
114+
{
115+
return nullptr;
116+
diff --git a/third_party/angle/util/display/DisplayWindow.cpp b/third_party/angle/util/display/DisplayWindow.cpp
117+
index d11f52262..6cd0053cb 100644
118+
--- a/third_party/angle/util/display/DisplayWindow.cpp
119+
+++ b/third_party/angle/util/display/DisplayWindow.cpp
120+
@@ -79,7 +79,7 @@ void DisplayWindow::signalTestEvent()
121+
}
122+
123+
// static
124+
-#if defined(ANGLE_USE_VULKAN_DISPLAY)
125+
+#if defined(ANGLE_USE_VULKAN_DISPLAY) && defined(EGL_NO_X11)
126+
OSWindow *OSWindow::New()
127+
{
128+
return new DisplayWindow();
129+
--
130+
2.25.1
131+

0 commit comments

Comments
 (0)