Skip to content

Commit 98b68ba

Browse files
shr-projectotavio
authored andcommitted
chromium: update all patches to have git header
* this way devtool modify will work much better when rebasing the patches for new version * update musl patches to apply on 89.0.4389.90 version * 0001-IWYU-include-algorithm-to-use-std-lower_bound-in-ui-.patch 0001-IWYU-launch_manager.h-uses-std-vector.patch weren't used at all since: commit e9fd952 Author: Maksim Sisov <msisov@igalia.com> Date: Tue Feb 11 15:14:19 2020 +0200 chromium: update to 80.0.3987.100 * 0001-Pass-no-static-libstdc-to-gen.py.patch is used only by gn-native, move it to gn directory Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
1 parent 36535f6 commit 98b68ba

File tree

38 files changed

+475
-415
lines changed

38 files changed

+475
-415
lines changed

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

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,39 @@ OUTPUT_DIR = "out/Release"
99
B = "${S}/${OUTPUT_DIR}"
1010

1111
SRC_URI += " \
12-
file://oe-clang-fixes.patch \
13-
file://v8-qemu-wrapper.patch \
14-
file://wrapper-extra-flags.patch \
15-
file://do-not-specify-march-on-arm.patch \
16-
file://add_internal_define_armv7ve.patch \
17-
file://delete_not_yet_released_clang_warnings.patch \
18-
file://chromium-Move-CharAllocator-definition-to-a-header-f.patch \
19-
file://0003-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch \
20-
file://0001-RandBytes-Stop-including-sys-random.h-on-Linux.patch \
21-
file://0001-link-atomic-for-target-only.patch \
22-
file://0001-Fix-use-of-DCHECK-with-std-unique_ptr.patch \
23-
file://0001-IWYU-add-ctime-for-std-time.patch \
24-
file://0001-mojo-Include-string.h-for-strncpy-declaration.patch \
12+
file://0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch \
13+
file://0002-v8-qemu-wrapper.patch \
14+
file://0003-wrapper-extra-flags.patch \
15+
file://0004-BUILD-do-not-specify-march-on-arm.patch \
16+
file://0005-Consider-armv7ve-define.patch \
17+
file://0006-Delete-compiler-options-not-available-in-release-ver.patch \
18+
file://0007-Move-CharAllocator-definition-to-a-header-file.patch \
19+
file://0008-Fix-sandbox-Aw-snap-for-syscalls-403-and-407.patch \
20+
file://0009-RandBytes-Stop-including-sys-random.h-on-Linux.patch \
21+
file://0010-avoid-link-latomic-failure-on-CentOS-8-host.patch \
22+
file://0011-Fix-use-of-DCHECK-with-std-unique_ptr.patch \
23+
file://0012-IWYU-add-ctime-for-std-time.patch \
24+
file://0013-mojo-Include-string.h-for-strncpy-declaration.patch \
2525
"
2626

2727
SRC_URI_append_libc-musl = "\
28-
file://musl/musl_no_mallinfo.patch \
29-
file://musl/musl_no_execinfo.patch \
30-
file://musl/musl_TEMP_FAILURE_RETRY.patch \
31-
file://musl/musl_fix-stack.patch \
32-
file://musl/musl_breakpad.patch \
33-
file://musl/musl_fontconfig.patch \
34-
file://musl/musl_libc_malloc.patch \
35-
file://musl/musl_gnu_libc-version.patch \
36-
file://musl/musl_resolver.patch \
37-
file://musl/musl_off64_t.patch \
38-
file://musl/musl_crashpad.patch \
39-
file://musl/musl_fix_stack_trace.patch \
40-
file://musl/musl_portable_msghdr.patch \
41-
file://musl/musl_no__environ.patch \
42-
file://musl/musl_no_mallopt.patch \
43-
file://musl/musl_undef_mmap64.patch \
44-
file://musl/musl_no_sbrk.patch \
28+
file://musl/0001-mallinfo-implementation-is-glibc-specific.patch \
29+
file://musl/0002-execinfo-implementation-is-glibc-specific.patch \
30+
file://musl/0003-Define-TEMP_FAILURE_RETRY-and-__si_fields.patch \
31+
file://musl/0004-blink-Fix-build-with-musl.patch \
32+
file://musl/0005-breakpad-Fix-build-with-musl.patch \
33+
file://musl/0006-fontconfig-Musl-does-not-have-rand_r-API.patch \
34+
file://musl/0007-__libc_malloc-is-internal-to-glibc.patch \
35+
file://musl/0008-gnu_libc_version-API-is-glibc-specific.patch \
36+
file://musl/0009-provide-res_ninit-and-nclose-APIs-on-non-glibc-linux.patch \
37+
file://musl/0010-__off64_t-is-internal-private-define-from-glibc.patch \
38+
file://musl/0011-crashpad-Fix-build-with-musl.patch \
39+
file://musl/0012-debug-Fix-build-with-musl.patch \
40+
file://musl/0013-socket-initialize-msghdr-in-a-compatible-manner.patch \
41+
file://musl/0014-no-__environ-in-musl.patch \
42+
file://musl/0015-mallopt-is-glibc-specific-API.patch \
43+
file://musl/0016-tcmalloc-undef-mmap64.patch \
44+
file://musl/0017-tcmalloc-no-__sbrk.patch \
4545
"
4646

4747
# Append instead of assigning; the gtk-icon-cache class inherited above also

meta-chromium/recipes-browser/chromium/files/0001-IWYU-include-algorithm-to-use-std-lower_bound-in-ui-.patch

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

meta-chromium/recipes-browser/chromium/files/0001-IWYU-launch_manager.h-uses-std-vector.patch

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

meta-chromium/recipes-browser/chromium/files/0001-RandBytes-Stop-including-sys-random.h-on-Linux.patch

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

meta-chromium/recipes-browser/chromium/files/oe-clang-fixes.patch renamed to meta-chromium/recipes-browser/chromium/files/0001-Remove-the-GN-settings-done-for-clang-that-conflict-.patch

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
Upstream-Status: Inappropriate [OE-Specific]
2-
3-
Signed-off-by: Maksim Sisov <msisov@igalia.com>
4-
---
5-
From 95f567249a376b49ad98371d66046da8a35da787 Mon Sep 17 00:00:00 2001
1+
From cab3c06864569577158626e500b2253687fc09ba Mon Sep 17 00:00:00 2001
62
From: Khem Raj <raj.khem@gmail.com>
73
Date: Mon, 29 Apr 2019 12:00:19 +0300
84
Subject: [PATCH] Remove the GN settings done for clang that conflict with OE
@@ -23,7 +19,7 @@ Rebased-by: Maksim Sisov <msisov@igalia.com>
2319
1 file changed, 26 deletions(-)
2420

2521
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
26-
index 5928c561b5a3..aed313f59c5a 100644
22+
index 5928c561b5..aed313f59c 100644
2723
--- a/build/config/compiler/BUILD.gn
2824
+++ b/build/config/compiler/BUILD.gn
2925
@@ -782,10 +782,6 @@ config("compiler_cpu_abi") {
@@ -99,7 +95,5 @@ index 5928c561b5a3..aed313f59c5a 100644
9995
- cflags += [ "-no-canonical-prefixes" ]
10096
- }
10197
}
102-
98+
10399
config("clang_revision") {
104-
--
105-
2.25.1

meta-chromium/recipes-browser/chromium/files/0001-ozone-add-va-api-support-to-wayland.patch

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
1-
Upstream-Status: pending
2-
3-
Signed-off-by: Maksim Sisov <msisov@igalia.com>
4-
---
5-
From f7b9671c85859ef66c9c729cb15124f306bd3098 Mon Sep 17 00:00:00 2001
1+
From ddb186d8904d6ec80d1084a1cc495b824381a565 Mon Sep 17 00:00:00 2001
62
From: Maksim Sisov <msisov@igalia.com>
73
Date: Wed, 20 Jan 2021 09:50:22 +0200
84
Subject: [PATCH] ozone/wayland: add VA-API support.
95

10-
This patch ads VA-API support utilizing old VA-API path used for
6+
This patch ads VA-API support utilizing old VA-API path used for
117
ChromeOS, which can be buggy on some devices (currently tested
128
on Intel Gen8 and Gen9 with Gen8 having some minor bugs).
139

1410
It's known that a new VA-API is being developed atm and once it's ready,
1511
we will switch to a new path, which should be more stable.
1612

13+
Upstream-Status: Pending
14+
15+
Signed-off-by: Maksim Sisov <msisov@igalia.com>
1716
---
1817
media/gpu/vaapi/vaapi_picture_factory.cc | 12 ++++--
1918
.../gpu/vaapi/vaapi_picture_native_pixmap.cc | 17 +++++++-
@@ -24,7 +23,7 @@ we will switch to a new path, which should be more stable.
2423
6 files changed, 58 insertions(+), 33 deletions(-)
2524

2625
diff --git a/media/gpu/vaapi/vaapi_picture_factory.cc b/media/gpu/vaapi/vaapi_picture_factory.cc
27-
index 50d5f245f83c..093070deec83 100644
26+
index 50d5f245f8..093070deec 100644
2827
--- a/media/gpu/vaapi/vaapi_picture_factory.cc
2928
+++ b/media/gpu/vaapi/vaapi_picture_factory.cc
3029
@@ -46,10 +46,10 @@ VaapiPictureFactory::VaapiPictureFactory() {
@@ -56,7 +55,7 @@ index 50d5f245f83c..093070deec83 100644
5655
return gfx::BufferFormat::RGBX_8888;
5756
}
5857
diff --git a/media/gpu/vaapi/vaapi_picture_native_pixmap.cc b/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
59-
index 941f24cc5959..42975746b5fb 100644
58+
index 941f24cc59..42975746b5 100644
6059
--- a/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
6160
+++ b/media/gpu/vaapi/vaapi_picture_native_pixmap.cc
6261
@@ -12,6 +12,7 @@
@@ -91,7 +90,7 @@ index 941f24cc5959..42975746b5fb 100644
9190

9291
bool VaapiPictureNativePixmap::AllowOverlay() const {
9392
diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
94-
index 9d9cb7a1713c..212e236581b8 100644
93+
index 9d9cb7a171..212e236581 100644
9594
--- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
9695
+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc
9796
@@ -184,12 +184,6 @@ bool VaapiVideoDecodeAccelerator::Initialize(const Config& config,
@@ -167,7 +166,7 @@ index 9d9cb7a1713c..212e236581b8 100644
167166

168167
bool VaapiVideoDecodeAccelerator::IsBufferAllocationModeReducedOrSuperReduced()
169168
diff --git a/media/gpu/vaapi/vaapi_wrapper.cc b/media/gpu/vaapi/vaapi_wrapper.cc
170-
index 78133749fe64..b967d69bc12b 100644
169+
index 78133749fe..b967d69bc1 100644
171170
--- a/media/gpu/vaapi/vaapi_wrapper.cc
172171
+++ b/media/gpu/vaapi/vaapi_wrapper.cc
173172
@@ -626,8 +626,8 @@ bool VADisplayState::InitializeOnce() {
@@ -192,7 +191,7 @@ index 78133749fe64..b967d69bc12b 100644
192191
#if BUILDFLAG(IS_CHROMEOS_ASH)
193192
paths[kModuleVa_prot].push_back(std::string("libva.so.") + va_suffix);
194193
diff --git a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
195-
index 0e419c88b06d..334c51512933 100644
194+
index 0e419c88b0..334c515129 100644
196195
--- a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
197196
+++ b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.cc
198197
@@ -16,6 +16,7 @@
@@ -229,7 +228,7 @@ index 0e419c88b06d..334c51512933 100644
229228
}
230229

231230
diff --git a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
232-
index a9b3932b1a80..9cdf4a990d75 100644
231+
index a9b3932b1a..9cdf4a990d 100644
233232
--- a/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
234233
+++ b/ui/ozone/platform/wayland/gpu/gbm_pixmap_wayland.h
235234
@@ -71,6 +71,9 @@ class GbmPixmapWayland : public gfx::NativePixmap {
@@ -242,6 +241,3 @@ index a9b3932b1a80..9cdf4a990d75 100644
242241
DISALLOW_COPY_AND_ASSIGN(GbmPixmapWayland);
243242
};
244243

245-
--
246-
2.25.1
247-

meta-chromium/recipes-browser/chromium/files/v8-qemu-wrapper.patch renamed to meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,39 @@
1-
Upstream-Status: Inappropriate [embedder specific]
1+
From b611909b9cc2b29afa64ace5933fcf8dffc0b623 Mon Sep 17 00:00:00 2001
2+
From: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
3+
Date: Tue, 7 Nov 2017 15:24:32 +0100
4+
Subject: [PATCH] v8: qemu wrapper
25

36
The patch below makes the V8 binaries run during the build be invoked through
47
QEMU, as they are built for the target.
58

9+
Upstream-Status: Inappropriate [embedder specific]
10+
611
Signed-off-by: Raphael Kubo da Costa <raphael.kubo.da.costa@intel.com>
712
Signed-off-by: Maksim Sisov <msisov@igalia.com>
13+
---
14+
tools/v8_context_snapshot/BUILD.gn | 1 +
15+
v8/BUILD.gn | 4 ++++
16+
2 files changed, 5 insertions(+)
817

918
diff --git a/tools/v8_context_snapshot/BUILD.gn b/tools/v8_context_snapshot/BUILD.gn
10-
index 6e86a543558c..eee89b37064e 100644
19+
index 6e86a54355..eee89b3706 100644
1120
--- a/tools/v8_context_snapshot/BUILD.gn
1221
+++ b/tools/v8_context_snapshot/BUILD.gn
1322
@@ -56,6 +56,7 @@ if (use_v8_context_snapshot) {
1423
output_path = rebase_path(output_file, root_build_dir)
15-
24+
1625
args = [
1726
+ "./v8-qemu-wrapper.sh",
1827
"./" + rebase_path(
1928
get_label_info(
2029
":v8_context_snapshot_generator($v8_snapshot_toolchain)",
21-
2230
diff --git a/v8/BUILD.gn b/v8/BUILD.gn
2331
index f39529a3a9..8bceaa498a 100644
2432
--- a/v8/BUILD.gn
2533
+++ b/v8/BUILD.gn
2634
@@ -1434,6 +1434,7 @@ template("run_torque") {
2735
}
28-
36+
2937
args = [
3038
+ "./v8-qemu-wrapper.sh",
3139
"./" + rebase_path(
@@ -41,15 +49,15 @@ index f39529a3a9..8bceaa498a 100644
4149
":bytecode_builtins_list_generator($v8_generator_toolchain)",
4250
@@ -1595,6 +1597,7 @@ template("run_mksnapshot") {
4351
data = []
44-
52+
4553
args = [
4654
+ "./v8-qemu-wrapper.sh",
4755
"./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)",
4856
"root_out_dir") + "/mksnapshot",
4957
root_build_dir),
5058
@@ -4809,6 +4812,7 @@ if (v8_enable_i18n_support) {
5159
outputs = [ output_file ]
52-
60+
5361
args = [
5462
+ "./v8-qemu-wrapper.sh",
5563
"./" + rebase_path(

0 commit comments

Comments
 (0)