diff --git a/meta-chromium/recipes-browser/chromium/chromium-gn.inc b/meta-chromium/recipes-browser/chromium/chromium-gn.inc index d90a5ee2..e582f4fa 100644 --- a/meta-chromium/recipes-browser/chromium/chromium-gn.inc +++ b/meta-chromium/recipes-browser/chromium/chromium-gn.inc @@ -26,6 +26,7 @@ SRC_URI += "\ file://0009-Adjust-the-Rust-build-to-our-needs.patch \ file://0010-Don-t-require-profiler_builtins.rlib.patch \ file://0011-Disable-crabbyavif-to-fix-build-errors.patch \ + file://0012-Revert-Allow-and-use-std-hardware_destructive_interf.patch \ " # ARM/AArch64-specific patches. SRC_URI:append:aarch64 = "${@bb.utils.contains('TUNE_FEATURES', 'crypto', '', ' file://arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch', d)}" diff --git a/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_129.0.6668.100.bb b/meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_130.0.6723.58.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_129.0.6668.100.bb rename to meta-chromium/recipes-browser/chromium/chromium-ozone-wayland_130.0.6723.58.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium-x11_129.0.6668.100.bb b/meta-chromium/recipes-browser/chromium/chromium-x11_130.0.6723.58.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/chromium-x11_129.0.6668.100.bb rename to meta-chromium/recipes-browser/chromium/chromium-x11_130.0.6723.58.bb diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc index 3c1c03b5..bdbe2093 100644 --- a/meta-chromium/recipes-browser/chromium/chromium.inc +++ b/meta-chromium/recipes-browser/chromium/chromium.inc @@ -4,7 +4,7 @@ HOMEPAGE = "https://www.chromium.org/Home" CVE_PRODUCT = "chromium:chromium google:chrome" SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz" -SRC_URI[sha256sum] = "281daed29a5cb546f6273130035d9980666d2232f356ad95fc06af3c90121bc2" +SRC_URI[sha256sum] = "aa296edec7275d19feade5ef32cbe7dfdd41594d4c0c1afd94bbf4d310c38c4e" S = "${WORKDIR}/chromium-${PV}" @@ -72,10 +72,8 @@ LIC_FILES_CHKSUM = "\ file://${S}/base/third_party/xdg_user_dirs/LICENSE;md5=d998f250c491c329a8254dd1ca62c647 \ file://${S}/chrome/browser/resources/chromeos/accessibility/chromevox/third_party/tamachiyomi/LICENSE;md5=15772cfcf7016e701ce54554516c0688 \ file://${S}/chrome/installer/mac/third_party/bsdiff/LICENSE;md5=0dbe7a50f028269750631fcbded3846a \ - file://${S}/chrome/installer/mac/third_party/xz/LICENSE;md5=3afc9a82601f26d2f6c3bae01aad57fa \ + file://${S}/chrome/installer/mac/third_party/xz/LICENSE;md5=84982e6bf3ed99ef2647e48626ffa984 \ file://${S}/chrome/third_party/mozilla_security_manager/LICENSE;md5=0c259b853bbf067b361100ce560adce7 \ - file://${S}/courgette/third_party/bsdiff/LICENCE;md5=7c2ad392281bc3d9b04a31102ee7abdd \ - file://${S}/courgette/third_party/divsufsort/LICENSE;md5=e261f081e52882dad3ff0225497ce451 \ file://${S}/ios/third_party/blink/LICENSE;md5=9fdb47308c4e0a2b6d07c5af39e5da1a \ file://${S}/ios/third_party/lottie/LICENSE;md5=1e714768add1e7fdb1288bac703bad06 \ file://${S}/ios/third_party/material_components_ios/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -94,32 +92,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/net/third_party/uri_template/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/abseil-cpp/LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915 \ file://${S}/third_party/accessibility-audit/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/android_arch_core_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/android_arch_core_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/android_arch_lifecycle_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/android_arch_lifecycle_livedata/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/android_arch_lifecycle_livedata_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/android_arch_lifecycle_runtime/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/android_arch_lifecycle_viewmodel/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_asynclayoutinflater/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_collections/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_coordinatorlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_cursoradapter/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_customview/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_documentfile/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_drawerlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_interpolator/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_loader/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_localbroadcastmanager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_print/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_slidingpanelayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_android_support_support_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_support_compat/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_support_core_ui/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_support_core_utils/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_swiperefreshlayout/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_versionedparcelable/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - file://${S}/third_party/android_deps/libs/com_android_support_viewpager/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_google_android_annotations/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \ file://${S}/third_party/android_deps/libs/com_google_android_datatransport_transport_api/LICENSE;md5=7f7d74108ee1b7a743cca7d9a86784d6 \ file://${S}/third_party/android_deps/libs/com_google_android_gms_play_services_auth/LICENSE;md5=b8c82a390fc5a5bba473726868fc5e5d \ @@ -149,6 +122,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/libs/com_google_code_findbugs_jsr305/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_google_code_gson_gson/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_google_dagger_dagger/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/libs/com_google_dagger_hilt_core/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_google_errorprone_error_prone_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_google_firebase_firebase_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_google_firebase_firebase_common/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -165,6 +139,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/libs/com_google_guava_guava_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_google_j2objc_j2objc_annotations/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/com_google_protobuf_protobuf_javalite/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ + file://${S}/third_party/android_deps/libs/com_squareup_okio_okio_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/io_grpc_grpc_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/io_grpc_grpc_binder/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/io_grpc_grpc_context/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -172,6 +147,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/libs/io_grpc_grpc_protobuf_lite/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/io_grpc_grpc_stub/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/io_perfmark_perfmark_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/libs/jakarta_inject_jakarta_inject_api/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/javax_inject_javax_inject/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_checkerframework_checker_compat_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \ file://${S}/third_party/android_deps/libs/org_checkerframework_checker_qual/LICENSE;md5=f32f668c1f4eea36fb53fc4cc7d96385 \ @@ -183,13 +159,13 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_android/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_coroutines_guava/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ + file://${S}/third_party/android_deps/libs/org_jetbrains_kotlinx_kotlinx_serialization_core_jvm/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_media/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_opengl/LICENSE;md5=d10e92761a860d4113a7a525c78daf13 \ file://${S}/third_party/android_provider/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_sdk/LICENSE;md5=a9559ed17808a8b10eec6672f993ce75 \ file://${S}/third_party/android_swipe_refresh/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ file://${S}/third_party/android_toolchain/NOTICE;md5=350d21a23b5ad67f48caa7a8e55d32c0 \ - file://${S}/third_party/android_toolchain_canary/NOTICE;md5=350d21a23b5ad67f48caa7a8e55d32c0 \ file://${S}/third_party/angle/LICENSE;md5=7abdb66a6948f39c2f469140db5184e2 \ file://${S}/third_party/angle/src/common/third_party/xxhash/LICENSE;md5=cb91c07001f1ca6fd50b6bd4f042946a \ file://${S}/third_party/angle/src/libANGLE/renderer/vulkan/shaders/src/third_party/etc_decoder/LICENSE;md5=100356b560682b0ae7739e09db42f319 \ @@ -210,7 +186,6 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/beto-core/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \ file://${S}/third_party/bidimapper/LICENSE;md5=2b42edef8fa55315f34f2370b4715ca9 \ file://${S}/third_party/bidimapper/licenses/LICENSE.mitt;md5=4ed316158806c1e39b6b6e457c85b10f \ - file://${S}/third_party/bidimapper/licenses/LICENSE.urlpattern_polyfill;md5=ea10d22371bd2e01c25f274ce6b4e072 \ file://${S}/third_party/bidimapper/licenses/LICENSE.zod;md5=7aa01d261c2ac4ca667875e22474c798 \ file://${S}/third_party/blink/LICENSE_FOR_ABOUT_CREDITS;md5=11e90d553b211de885f245900c4ccf89 \ file://${S}/third_party/boringssl/src/LICENSE;md5=2ca501bc96ce9ed0814e2c592c3f9593 \ @@ -231,13 +206,13 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/catapult/third_party/httplib2/LICENSE;md5=56e5e931172b6164b62dc7c4aba6c8cf \ file://${S}/third_party/catapult/third_party/ijson/LICENSE.txt;md5=2809bd5857eee6be054555222fd89712 \ file://${S}/third_party/catapult/third_party/oauth2client/LICENSE;md5=88f599f710b9d48dad0929ebd090fc1a \ + file://${S}/third_party/catapult/third_party/pipeline/LICENSE;md5=8f7bb094c7232b058c7e9f2e431f389c \ file://${S}/third_party/catapult/third_party/polymer/LICENSE.polymer;md5=324f45ce459ffd97e41d175a4e95a4be \ file://${S}/third_party/catapult/third_party/polymer3/LICENSE.polymer;md5=a798ede8c314cbc7a31b41bce0008d57 \ file://${S}/third_party/catapult/third_party/pyfakefs/COPYING;md5=34400b68072d710fecd0a2940a0d1658 \ file://${S}/third_party/catapult/third_party/pyparsing/LICENSE;md5=657a566233888513e1f07ba13e2f47f1 \ file://${S}/third_party/catapult/third_party/python_gflags/COPYING;md5=c80d1a3b623f72bb85a4c75b556551df \ file://${S}/third_party/catapult/third_party/redux/LICENSE.md;md5=a0e9a029c575a47069a637f579057679 \ - file://${S}/third_party/catapult/third_party/requests_toolbelt/LICENSE;md5=71760e0f1dda8cff91b0bc9246caf571 \ file://${S}/third_party/catapult/third_party/six/LICENSE;md5=43cfc9e4ac0e377acfb9b76f56b8415d \ file://${S}/third_party/catapult/third_party/typ/LICENSE;md5=6c4db32a2fa8717faffa1d4f10136f47 \ file://${S}/third_party/catapult/third_party/vinn/third_party/v8/LICENSE;md5=4fbc731ec49a1773a0db52c6b0eabb87 \ @@ -248,7 +223,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/catapult/tracing/third_party/jpeg-js/LICENSE;md5=11ed819ab28c14377693b9c990511293 \ file://${S}/third_party/catapult/tracing/third_party/oboe/LICENCE;md5=a50188ab5dc0b5b3963791e0c5f43c6b \ file://${S}/third_party/catapult/tracing/third_party/pako/LICENSE;md5=a4f08d6b2d1bf3f3a1bc296a6109a25b \ - file://${S}/third_party/ced/LICENSE;md5=f63cd7e51ca7b7aac748e20dc60e083f \ + file://${S}/third_party/ced/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \ file://${S}/third_party/chromevox/LICENSE;md5=45739090b454125d851ac7bb1bbd23a2 \ file://${S}/third_party/chromevox/third_party/closure-library/LICENSE;md5=e23fadd6ceef8c618fc1c65191d846fa \ file://${S}/third_party/chromevox/third_party/sre/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \ @@ -288,6 +263,7 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/mitt/LICENSE;md5=dd3fad292d640766ce5bcb6cb97c109e \ file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/parsel/LICENSE;md5=3df37ae2a2559e34c226b7734e5a1d08 \ file://${S}/third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs/LICENSE;md5=ddcbb07c54c85eff62e3e6ebab2fa6dd \ + file://${S}/third_party/devtools-frontend/src/front_end/third_party/third-party-web/LICENSE;md5=fdc2dc205eb6e6da8e9d1add67084a96 \ file://${S}/third_party/devtools-frontend/src/front_end/third_party/wasmparser/package/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93 \ file://${S}/third_party/devtools-frontend/src/front_end/third_party/web-vitals/package/LICENSE;md5=2c4a96430ec4639e0a80babbfb239a96 \ file://${S}/third_party/distributed_point_functions/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ @@ -389,13 +365,15 @@ LIC_FILES_CHKSUM = "\ file://${S}/third_party/openscreen/src/LICENSE;md5=5ff965dafeb8e99de6698664decb9e89 \ file://${S}/third_party/openscreen/src/third_party/protobuf/LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b \ file://${S}/third_party/openscreen/src/third_party/tinycbor/src/LICENSE;md5=6c1ac30774dd6476b42b5b020cd2aa5f \ - file://${S}/third_party/openscreen/src/third_party/zlib/LICENSE;md5=469589957479fb6060a12dada84ce5a7 \ file://${S}/third_party/opus/src/COPYING;md5=e304cdf74c2a1b0a33a5084c128a23a3 \ file://${S}/third_party/ots/LICENSE;md5=e06eff2aa65b917034a81599bea73dc4 \ file://${S}/third_party/pdfium/LICENSE;md5=c93507531cc9bb8e24a05f2a1a4036c7 \ + file://${S}/third_party/pdfium/third_party/agg23/copying;md5=d501f87982fe576fa1bfdf4f0ae741af \ file://${S}/third_party/pdfium/third_party/fp16/LICENSE;md5=855dd24c28c76c916c5c2301b1958728 \ file://${S}/third_party/pdfium/third_party/freetype/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ - file://${S}/third_party/perfetto/LICENSE;md5=d2572d98547d43906b53615f856a8c2d \ + file://${S}/third_party/pdfium/third_party/libopenjpeg/LICENSE;md5=c648878b4840d7babaade1303e7f108c \ + file://${S}/third_party/pdfium/third_party/libtiff/LICENSE.md;md5=a3e32d664d6db1386b4689c8121531c3 \ + file://${S}/third_party/perfetto/LICENSE;md5=65fc11c16d093b463bafae828ec00d41 \ file://${S}/third_party/pffft/LICENSE;md5=0f39e43e9bc20e7e103e54750e1ec3a2 \ file://${S}/third_party/polymer/LICENSE.polymer;md5=324f45ce459ffd97e41d175a4e95a4be \ file://${S}/third_party/private-join-and-compute/src/LICENSE;md5=175792518e4ac015ab6696d16c4f607e \ diff --git a/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch b/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch index 1b2fa53c..334c82ce 100644 --- a/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch +++ b/meta-chromium/recipes-browser/chromium/files/0001-Drop-GN-compiler-settings-conflicting-with-OE.patch @@ -19,10 +19,10 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 48 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 45086d6..dfbb2ab 100644 +index 765345a..19b7912 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1211,27 +1211,6 @@ config("compiler_cpu_abi") { +@@ -1216,27 +1216,6 @@ config("compiler_cpu_abi") { "-msse3", ] } @@ -50,7 +50,7 @@ index 45086d6..dfbb2ab 100644 } else if (current_cpu == "mipsel" && !is_nacl) { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { -@@ -1239,9 +1218,6 @@ config("compiler_cpu_abi") { +@@ -1244,9 +1223,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mipsel-linux-android" ] ldflags += [ "--target=mipsel-linux-android" ] @@ -60,7 +60,7 @@ index 45086d6..dfbb2ab 100644 } } else { cflags += [ "-EL" ] -@@ -1321,8 +1297,6 @@ config("compiler_cpu_abi") { +@@ -1326,8 +1302,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -69,7 +69,7 @@ index 45086d6..dfbb2ab 100644 } else { cflags += [ "-EB" ] ldflags += [ "-EB" ] -@@ -1370,9 +1344,6 @@ config("compiler_cpu_abi") { +@@ -1375,9 +1349,6 @@ config("compiler_cpu_abi") { if (is_android) { cflags += [ "--target=mips64el-linux-android" ] ldflags += [ "--target=mips64el-linux-android" ] @@ -79,7 +79,7 @@ index 45086d6..dfbb2ab 100644 } } else { cflags += [ -@@ -1430,8 +1401,6 @@ config("compiler_cpu_abi") { +@@ -1435,8 +1406,6 @@ config("compiler_cpu_abi") { ldflags += [ "-Wl,--hash-style=sysv" ] if (custom_toolchain == "") { if (is_clang) { @@ -88,7 +88,7 @@ index 45086d6..dfbb2ab 100644 } else { cflags += [ "-EB", -@@ -1600,23 +1569,6 @@ config("compiler_deterministic") { +@@ -1605,23 +1574,6 @@ config("compiler_deterministic") { } } } diff --git a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch index 9ed28746..29302a81 100644 --- a/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch +++ b/meta-chromium/recipes-browser/chromium/files/0002-v8-qemu-wrapper.patch @@ -29,10 +29,10 @@ index f46bec2..5438365 100644 "root_out_dir") + "/v8_context_snapshot_generator", diff --git a/v8/BUILD.gn b/v8/BUILD.gn -index 19e0d2b..85d40c8 100644 +index 87b2129..384ca1c 100644 --- a/v8/BUILD.gn +++ b/v8/BUILD.gn -@@ -2256,6 +2256,7 @@ template("run_torque") { +@@ -2237,6 +2237,7 @@ template("run_torque") { } args = [ @@ -40,7 +40,7 @@ index 19e0d2b..85d40c8 100644 "./" + rebase_path( get_label_info(":torque($toolchain)", "root_out_dir") + "/torque", root_build_dir), -@@ -2419,6 +2420,7 @@ action("generate_bytecode_builtins_list") { +@@ -2400,6 +2401,7 @@ action("generate_bytecode_builtins_list") { outputs = [ "$target_gen_dir/builtins-generated/bytecodes-builtins-list.h" ] deps = [ ":bytecode_builtins_list_generator($v8_generator_toolchain)" ] args = [ @@ -48,15 +48,15 @@ index 19e0d2b..85d40c8 100644 "./" + rebase_path( get_label_info( ":bytecode_builtins_list_generator($v8_generator_toolchain)", -@@ -2473,6 +2475,7 @@ template("run_mksnapshot") { +@@ -2472,6 +2474,7 @@ template("run_mksnapshot") { } - args = [ + args += [ + "./v8-qemu-wrapper.sh", "./" + rebase_path(get_label_info(":mksnapshot($v8_snapshot_toolchain)", "root_out_dir") + "/mksnapshot", root_build_dir), -@@ -7452,6 +7455,7 @@ if (v8_enable_i18n_support) { +@@ -7436,6 +7439,7 @@ if (v8_enable_i18n_support) { outputs = [ output_file ] args = [ diff --git a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch index 23aaa3fc..981ee623 100644 --- a/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch +++ b/meta-chromium/recipes-browser/chromium/files/0004-Delete-compiler-options-not-available-in-release-ver.patch @@ -13,10 +13,10 @@ Signed-off-by: Randy MacLeod 1 file changed, 5 insertions(+) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index dfbb2ab..16f5b23 100644 +index 19b7912..6b15c5b 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -1891,6 +1891,11 @@ config("default_warnings") { +@@ -1902,6 +1902,11 @@ config("default_warnings") { } cflags += [ diff --git a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch index 3702b70f..8f2440a2 100644 --- a/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch +++ b/meta-chromium/recipes-browser/chromium/files/0005-avoid-link-latomic-failure-on-CentOS-8-host.patch @@ -18,10 +18,10 @@ Signed-off-by: Randy MacLeod 2 files changed, 4 insertions(+) diff --git a/base/BUILD.gn b/base/BUILD.gn -index 2561c27..7eca069 100644 +index 9247e9b..7b01f13 100644 --- a/base/BUILD.gn +++ b/base/BUILD.gn -@@ -1117,7 +1117,9 @@ component("base") { +@@ -1101,7 +1101,9 @@ component("base") { # Needed for if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. diff --git a/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch b/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch index 1569dab3..b7aed658 100644 --- a/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch +++ b/meta-chromium/recipes-browser/chromium/files/0006-Don-t-pass-unknown-LLVM-options.patch @@ -17,10 +17,10 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 18 deletions(-) diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn -index 16f5b23..0dc5b57 100644 +index 6b15c5b..5448810 100644 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -581,24 +581,6 @@ config("compiler") { +@@ -584,24 +584,6 @@ config("compiler") { } } diff --git a/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch b/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch index 7fe1860c..299a442c 100644 --- a/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch +++ b/meta-chromium/recipes-browser/chromium/files/0008-Use-the-correct-path-to-libclang_rt.builtins.a.patch @@ -21,10 +21,10 @@ Signed-off-by: Max Ihlenfeldt 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn -index fcca59b..496f3c3 100644 +index 9b8719a..a7106b3 100644 --- a/build/config/clang/BUILD.gn +++ b/build/config/clang/BUILD.gn -@@ -190,14 +190,15 @@ template("clang_lib") { +@@ -189,14 +189,15 @@ template("clang_lib") { } else if (is_apple) { _dir = "darwin" } else if (is_linux || is_chromeos) { diff --git a/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch b/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch index a3f9be59..f7a8b235 100644 --- a/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch +++ b/meta-chromium/recipes-browser/chromium/files/0009-Adjust-the-Rust-build-to-our-needs.patch @@ -23,7 +23,7 @@ Signed-off-by: Max Ihlenfeldt 4 files changed, 52 insertions(+), 19 deletions(-) diff --git a/build/config/rust.gni b/build/config/rust.gni -index fd4c683..25fcb4e 100644 +index b7e3c88..d0abc26 100644 --- a/build/config/rust.gni +++ b/build/config/rust.gni @@ -97,6 +97,11 @@ declare_args() { @@ -38,7 +38,7 @@ index fd4c683..25fcb4e 100644 } # Use a separate declare_args so these variables' defaults can depend on the -@@ -184,12 +189,19 @@ if (enable_rust) { +@@ -191,12 +196,19 @@ if (enable_rust) { # other toolchains. rust_abi_target = "" if (is_linux || is_chromeos) { @@ -61,7 +61,7 @@ index fd4c683..25fcb4e 100644 } else if (current_cpu == "arm") { if (arm_float_abi == "hard") { float_suffix = "hf" -@@ -198,15 +210,15 @@ if (is_linux || is_chromeos) { +@@ -205,15 +217,15 @@ if (is_linux || is_chromeos) { } if (arm_arch == "armv7-a" || arm_arch == "armv7") { # No way to inform Rust about the -a suffix. diff --git a/meta-chromium/recipes-browser/chromium/files/0011-Disable-crabbyavif-to-fix-build-errors.patch b/meta-chromium/recipes-browser/chromium/files/0011-Disable-crabbyavif-to-fix-build-errors.patch index f000c6f0..bbf7b8c4 100644 --- a/meta-chromium/recipes-browser/chromium/files/0011-Disable-crabbyavif-to-fix-build-errors.patch +++ b/meta-chromium/recipes-browser/chromium/files/0011-Disable-crabbyavif-to-fix-build-errors.patch @@ -18,10 +18,10 @@ Signed-off-by: Max Ihlenfeldt 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/third_party/blink/renderer/platform/image-decoders/BUILD.gn b/third_party/blink/renderer/platform/image-decoders/BUILD.gn -index 687033e..4006422 100644 +index 6668b18..761c5fe 100644 --- a/third_party/blink/renderer/platform/image-decoders/BUILD.gn +++ b/third_party/blink/renderer/platform/image-decoders/BUILD.gn -@@ -74,12 +74,9 @@ component("image_decoders") { +@@ -76,12 +76,9 @@ component("image_decoders") { sources += [ "avif/avif_image_decoder.cc", "avif/avif_image_decoder.h", @@ -34,7 +34,7 @@ index 687033e..4006422 100644 "//third_party/libavif", "//third_party/libavifinfo", ] -@@ -121,10 +118,7 @@ source_set("unit_tests") { +@@ -123,9 +120,6 @@ source_set("unit_tests") { } if (enable_av1_decoder) { @@ -45,7 +45,6 @@ index 687033e..4006422 100644 + sources += [ "avif/avif_image_decoder_test.cc" ] } } - diff --git a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc b/third_party/blink/renderer/platform/image-decoders/image_decoder.cc index f208b65..4fb788f 100644 --- a/third_party/blink/renderer/platform/image-decoders/image_decoder.cc diff --git a/meta-chromium/recipes-browser/chromium/files/0012-Revert-Allow-and-use-std-hardware_destructive_interf.patch b/meta-chromium/recipes-browser/chromium/files/0012-Revert-Allow-and-use-std-hardware_destructive_interf.patch new file mode 100644 index 00000000..0b01da73 --- /dev/null +++ b/meta-chromium/recipes-browser/chromium/files/0012-Revert-Allow-and-use-std-hardware_destructive_interf.patch @@ -0,0 +1,116 @@ +From c39e22626372eef009bac036c3758dc34e7bcdc9 Mon Sep 17 00:00:00 2001 +From: Max Ihlenfeldt +Date: Mon, 21 Oct 2024 10:08:17 +0000 +Subject: [PATCH] Revert "Allow (and use) + std::hardware_destructive_interference_size." + +libcxx only defines `std::hardware_{con,de}structive_interference_size` +if `__GCC_{CON,DE}STRUCTIVE_SIZE` are defined. clang only defines these +since version 19.1, see +https://github.com/llvm/llvm-project/commit/72c373bf. + +As Scarthgap uses clang 18.1, we need to revert +https://crrev.com/c/5767325, which uses +`std::hardware_destructive_interference_size`. + +Upstream-Status: Inappropriate [specific to older versions of clang] +Signed-off-by: Max Ihlenfeldt +--- + .../providers/cast/channel/enum_table.h | 4 +- + styleguide/c++/c++-features.md | 54 ++++++++++--------- + 2 files changed, 31 insertions(+), 27 deletions(-) + +diff --git a/components/media_router/common/providers/cast/channel/enum_table.h b/components/media_router/common/providers/cast/channel/enum_table.h +index 18fd272..20dc7d9 100644 +--- a/components/media_router/common/providers/cast/channel/enum_table.h ++++ b/components/media_router/common/providers/cast/channel/enum_table.h +@@ -12,7 +12,6 @@ + + #include + #include +-#include + #include + #include + #include +@@ -368,7 +367,8 @@ class EnumTable { + + private: + #ifdef ARCH_CPU_64_BITS +- alignas(std::hardware_destructive_interference_size) ++ // Align the data on a cache line boundary. ++ alignas(64) + #endif + std::initializer_list data_; + bool is_sorted_; +diff --git a/styleguide/c++/c++-features.md b/styleguide/c++/c++-features.md +index 50da4b1..020666f 100644 +--- a/styleguide/c++/c++-features.md ++++ b/styleguide/c++/c++-features.md +@@ -574,6 +574,35 @@ Overlaps with utilities in `base/strings/string_number_conversions.h`, which are + easier to use correctly. + *** + ++### std::hardware_{con,de}structive_interference_size [banned] ++ ++```c++ ++struct SharedData { ++ ReadOnlyFrequentlyUsed data; ++ alignas(std::hardware_destructive_interference_size) std::atomic counter; ++}; ++``` ++ ++**Description:** The `std::hardware_destructive_interference_size` constant is ++useful to avoid false sharing (destructive interference) between variables that ++would otherwise occupy the same cacheline. In contrast, ++`std::hardware_constructive_interference_size` is helpful to promote true ++sharing (constructive interference), e.g. to support better locality for ++non-contended data. ++ ++**Documentation:** ++[`std::hardware_destructive_interference_size`](https://en.cppreference.com/w/cpp/thread/hardware_destructive_interference_size), ++[`std::hardware_constructive_interference_size`](https://en.cppreference.com/w/cpp/thread/hardware_destructive_interference_size) ++ ++**Notes:** ++*** promo ++Banned for now since these are ++[not supported yet](https://github.com/llvm/llvm-project/issues/60174). Allow ++once supported. ++ ++[Discussion thread](https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4) ++*** ++ + ### std::in_place{_type,_index}[_t] [banned] + + ```c++ +@@ -1177,31 +1206,6 @@ avoiding the need to use the `erase(remove(...` paradigm. + [Migration bug](https://crbug.com/1414639) + *** + +-### std::hardware_{con,de}structive_interference_size [allowed] +- +-```c++ +-struct SharedData { +- ReadOnlyFrequentlyUsed data; +- alignas(std::hardware_destructive_interference_size) std::atomic counter; +-}; +-``` +- +-**Description:** The `std::hardware_destructive_interference_size` constant is +-useful to avoid false sharing (destructive interference) between variables that +-would otherwise occupy the same cacheline. In contrast, +-`std::hardware_constructive_interference_size` is helpful to promote true +-sharing (constructive interference), e.g. to support better locality for +-non-contended data. +- +-**Documentation:** +-[`std::hardware_destructive_interference_size`](https://en.cppreference.com/w/cpp/thread/hardware_destructive_interference_size), +-[`std::hardware_constructive_interference_size`](https://en.cppreference.com/w/cpp/thread/hardware_destructive_interference_size) +- +-**Notes:** +-*** promo +-[Discussion thread](https://groups.google.com/a/chromium.org/g/cxx/c/cwktrFxxUY4) +-*** +- + ### std::is_[un]bounded_array [allowed] + + ```c++ diff --git a/meta-chromium/recipes-browser/chromium/files/arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch b/meta-chromium/recipes-browser/chromium/files/arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch index 88c349a6..8d482b6b 100644 --- a/meta-chromium/recipes-browser/chromium/files/arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch +++ b/meta-chromium/recipes-browser/chromium/files/arm/0001-Fix-AES-crypto-SIGILL-on-rpi4-64.patch @@ -15,7 +15,7 @@ Signed-off-by: Khem Raj 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn -index f44ece0..62efeb4 100644 +index 52e239f..ef92a2f 100644 --- a/third_party/boringssl/BUILD.gn +++ b/third_party/boringssl/BUILD.gn @@ -102,7 +102,7 @@ if (enable_rust) { diff --git a/meta-chromium/recipes-browser/chromium/gn-native_129.0.6668.100.bb b/meta-chromium/recipes-browser/chromium/gn-native_130.0.6723.58.bb similarity index 100% rename from meta-chromium/recipes-browser/chromium/gn-native_129.0.6668.100.bb rename to meta-chromium/recipes-browser/chromium/gn-native_130.0.6723.58.bb