Skip to content

Conversation

adalessandro
Copy link
Contributor

Issue: #901
Follow up of: #902

chromium: Update to 136.0.7103.113
    
Release notes:
    https://chromereleases.googleblog.com/2025/05/stable-channel-update-for-desktop_14.html

The current nodejs version in scarthgap is v20.18.2, but chromium
requires v22.11.0. As scarthgap is LTS release, a major update can't be
merged upstream, thus this PR adds the dependency backport to meta-browser.

@adalessandro adalessandro marked this pull request as draft July 22, 2025 15:26
@adalessandro adalessandro force-pushed the wip/adalessandro/scarthgap/136.0.7103.113 branch 3 times, most recently from 0fd8a8e to 0d82376 Compare July 22, 2025 15:56
@adalessandro adalessandro marked this pull request as ready for review July 23, 2025 12:50
@adalessandro
Copy link
Contributor Author

@kraj @otavio this is ready for review.

Copy link
Collaborator

@kraj kraj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@adalessandro adalessandro marked this pull request as draft July 29, 2025 18:42
@AndreasUfert
Copy link

Is there any ETA for this PR to be merged?

@kraj
Copy link
Collaborator

kraj commented Aug 26, 2025

its still in draft state @adalessandro ?

@adalessandro
Copy link
Contributor Author

its still in draft state @adalessandro ?

Sorry for the long delay, was on holidays and totally missed these messages. Let me do a quick check and will update this PR.

BasketsAlaaf and others added 2 commits September 17, 2025 10:52
…#882)

This adds a section to the readme, explaining the solution to a build
error discussed in OSSystems#845.

Adding this in the readme makes it easier to be found.

Signed-off-by: Matthias Schoepfer <msc@fp-robotics.com>
The current nodejs version in scarthgap is v20.18.2, but chromium
requires v22.11.0. As scarthgap is LTS release, a major update can't be
merged upstream, thus we add the dependency backport here.

This commit backports nodejs v22.11.0 from meta-openembedded master
branch commit:

commit 6652b031d7d4d9cabf16d481f3b82115f7d8e15a
Author: J. S. <schonm@gmail.com>
Date:   Fri Nov 1 13:18:40 2024 -0400

    nodejs: upgrade 20.18.0 -> 22.11.0

    This moves us from the previous Long Term Support version codenamed 'Iron' to the newly
    released Long Term Support version 22.11.0  Codename 'Jod'

    Changelog: https://github.com/nodejs/node/blob/main/doc/changelogs/CHANGELOG_V22.md#22.11.0

    License-Update:

        Add amaro dependency under MIT License.
        Add swc dependency under Aapche License Version 2.0.
        Add simdjson dependency under Apache License Version 2.0.
        Add on-exit-leak-free under MIT License.
        Remove ESLint.
        Remove base64 dependency.

    Removed patchs:

        182d9c05e78.patch - This was a backport to 20.x it is now integrated in 22.x

    Added patches:

      Two small patches here to use Bourne Shell instad of BASH.
        0001-custom-env.patch
        0001-positional-args.patch

      This patch from nodejs/node@686da19abb that addressed CVE-2024-22017
        0001-deps-disable-io_uring-support-in-libuv.patch

      Other patches were refreshed.

    Signed-off-by: Jason Schonberg <schonm@gmail.com>
    Signed-off-by: Khem Raj <raj.khem@gmail.com>

Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
@adalessandro adalessandro force-pushed the wip/adalessandro/scarthgap/136.0.7103.113 branch from 0d82376 to 09fa415 Compare September 17, 2025 13:54
adalessandro and others added 2 commits September 17, 2025 11:33
Release notes:
    https://chromereleases.googleblog.com/2025/05/stable-channel-update-for-desktop_14.html

Build and patch changes:
------------------------

Added patches:
  * 0014-Revert-Remove-libavif-based-AVIF-decoder.patch
  * 0015-Revert-Remove-third_party-libavif.patch

Updated patches:
  * 0016-Disable-crabbyavif-to-fix-build-errors.patch
  * Rebased remaining patches.

Removed patches:
  * 0015-Revert-Connect-the-Rust-log-crate-to-the-base-loggin.patch

License changes:
----------------

Added licenses:
  * TBD

Removed licenses:
  * TBD

Updated licenses:
  * TBD

Test-built:
-----------

* chromium-ozone-wayland
  * master, clang, MACHINE=qemux86-64, qemuarm, qemuarm64

* chromium-x11
  * master, clang, MACHINE=qemux86-64, qemuarm, qemuarm64

Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
Add configuration options to enable hardware video decoding using
stateless V4L2 M2M device. This allows offloading e.g. h264 video
playback to Hantro VPU on i.MX8MP where this was tested. To make
that work, enable 'use-v4l2' and 'proprietary-codecs' PACKAGECONFIG.

This commit was implemented with much great help from Jianfeng Liu .

Signed-off-by: Marek Vasut <marex@denx.de>
@adalessandro adalessandro force-pushed the wip/adalessandro/scarthgap/136.0.7103.113 branch from 09fa415 to 781a8de Compare September 17, 2025 14:34
Chromium 136.0.7103.113 now expects adler2 by default. Rework patch to
apply cleanly on the recent update.

Signed-off-by: Ariel D'Alessandro <ariel.dalessandro@collabora.com>
@adalessandro adalessandro force-pushed the wip/adalessandro/scarthgap/136.0.7103.113 branch from ad322ce to 361a3a3 Compare September 18, 2025 14:37
@adalessandro
Copy link
Contributor Author

adalessandro commented Sep 18, 2025

Well - looks like due to the recent Rust version update in meta-lts-mixins, now another error got triggered:

| [27142/56941] "python3" "../../build/toolchain/gcc_link_wrapper.py" --output="./chrome_crashpad_handler" -- x86_64-poky-linux-clang++ -target x86_64-poky-linux  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -mlittle-endian -Qunused-arguments -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot -fuse-ld=lld -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -flto=thin -Wl,--thinlto-jobs=all -Wl,-mllvm,-import-instr-limit=30 -Wl,-mllvm,-disable-auto-upgrade-debug-info -Wl,-mllvm,-inlinehint-threshold=360 -fwhole-program-vtables -Wl,--undefined-version -Wl,--no-call-graph-profile-sort -m64 -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -Wl,--lto-O0 -rdynamic -pie -Wl,--disable-new-dtags prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libstd.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/liballoc.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libcfg_if.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libcompiler_builtins.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libcore.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libgetopts.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libhashbrown.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libpanic_abort.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libpanic_unwind.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/librustc_demangle.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libstd_detect.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libtest.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libunicode_width.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libunwind.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libaddr2line.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libadler2.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libgimli.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/liblibc.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libmemchr.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libminiz_oxide.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libobject.rlib -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed   -fmacro-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113=/usr/src/debug/chromium-ozone-wayland/136.0.7103.113  -fdebug-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113=/usr/src/debug/chromium-ozone-wayland/136.0.7103.113  -fmacro-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113/out/Release=/usr/src/debug/chromium-ozone-wayland/136.0.7103.113  -fdebug-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113/out/Release=/usr/src/debug/chromium-ozone-wayland/136.0.7103.113  -fdebug-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot=  -fmacro-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot=  -fdebug-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot-native=  -Wl,-z,relro,-z,now  -stdlib=libc++ -o "./chrome_crashpad_handler" -Wl,--start-group @"./chrome_crashpad_handler.rsp" -Wl,--end-group   /workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot-native/usr/lib/clang/latest/lib/linux/libclang_rt.builtins-x86_64.a -latomic -ldl -lpthread -lrt -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -Wl,--start-group obj/third_party/rust/cxx/v1/lib/libcxx_lib.rlib obj/third_party/rust/foldhash/v0_1/lib/libfoldhash_lib.rlib obj/base/libbase_crust_ulogger.rlib obj/base/libbase_clogging_ulog_useverity_ubindgen.rlib obj/build/rust/chromium_prelude/libchromium.rlib obj/third_party/rust/log/v0_4/lib/liblog_lib.rlib obj/third_party/rust/serde_json_lenient/v0_2/wrapper/libthird_uparty_srust_sserde_ujson_ulenient_sv0_u2_swrapper_cwrapper.rlib obj/third_party/rust/serde/v1/lib/libserde_lib.rlib obj/third_party/rust/serde_json_lenient/v0_2/lib/libserde_json_lenient_lib.rlib obj/third_party/rust/itoa/v1/lib/libitoa_lib.rlib obj/third_party/rust/memchr/v2/lib/libmemchr_lib.rlib obj/third_party/rust/ryu/v1/lib/libryu_lib.rlib -Wl,--end-group
| FAILED: chrome_crashpad_handler
| "python3" "../../build/toolchain/gcc_link_wrapper.py" --output="./chrome_crashpad_handler" -- x86_64-poky-linux-clang++ -target x86_64-poky-linux  -m64 -march=core2 -mtune=core2 -msse3 -mfpmath=sse -mlittle-endian -Qunused-arguments -fstack-protector-strong  -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot -fuse-ld=lld -Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,--icf=all -Wl,--color-diagnostics -Wl,-mllvm,-instcombine-lower-dbg-declare=0 -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy=cache_size=10\%:cache_size_bytes=40g:cache_size_files=100000 -flto=thin -Wl,--thinlto-jobs=all -Wl,-mllvm,-import-instr-limit=30 -Wl,-mllvm,-disable-auto-upgrade-debug-info -Wl,-mllvm,-inlinehint-threshold=360 -fwhole-program-vtables -Wl,--undefined-version -Wl,--no-call-graph-profile-sort -m64 -Wl,-O2 -Wl,--gc-sections -Wl,-z,defs -Wl,--as-needed -Wl,--lto-O0 -rdynamic -pie -Wl,--disable-new-dtags prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libstd.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/liballoc.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libcfg_if.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libcompiler_builtins.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libcore.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libgetopts.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libhashbrown.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libpanic_abort.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libpanic_unwind.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/librustc_demangle.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libstd_detect.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libtest.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libunicode_width.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libunwind.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libaddr2line.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libadler2.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libgimli.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/liblibc.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libmemchr.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libminiz_oxide.rlib prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/libobject.rlib -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed   -fmacro-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113=/usr/src/debug/chromium-ozone-wayland/136.0.7103.113  -fdebug-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113=/usr/src/debug/chromium-ozone-wayland/136.0.7103.113  -fmacro-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113/out/Release=/usr/src/debug/chromium-ozone-wayland/136.0.7103.113  -fdebug-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/chromium-136.0.7103.113/out/Release=/usr/src/debug/chromium-ozone-wayland/136.0.7103.113  -fdebug-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot=  -fmacro-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot=  -fdebug-prefix-map=/workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot-native=  -Wl,-z,relro,-z,now  -stdlib=libc++ -o "./chrome_crashpad_handler" -Wl,--start-group @"./chrome_crashpad_handler.rsp" -Wl,--end-group   /workdir/build/tmp/work/core2-64-poky-linux/chromium-ozone-wayland/136.0.7103.113/recipe-sysroot-native/usr/lib/clang/latest/lib/linux/libclang_rt.builtins-x86_64.a -latomic -ldl -lpthread -lrt -lgmodule-2.0 -lgobject-2.0 -lgthread-2.0 -lglib-2.0 -Wl,--start-group obj/third_party/rust/cxx/v1/lib/libcxx_lib.rlib obj/third_party/rust/foldhash/v0_1/lib/libfoldhash_lib.rlib obj/base/libbase_crust_ulogger.rlib obj/base/libbase_clogging_ulog_useverity_ubindgen.rlib obj/build/rust/chromium_prelude/libchromium.rlib obj/third_party/rust/log/v0_4/lib/liblog_lib.rlib obj/third_party/rust/serde_json_lenient/v0_2/wrapper/libthird_uparty_srust_sserde_ujson_ulenient_sv0_u2_swrapper_cwrapper.rlib obj/third_party/rust/serde/v1/lib/libserde_lib.rlib obj/third_party/rust/serde_json_lenient/v0_2/lib/libserde_json_lenient_lib.rlib obj/third_party/rust/itoa/v1/lib/libitoa_lib.rlib obj/third_party/rust/memchr/v2/lib/libmemchr_lib.rlib obj/third_party/rust/ryu/v1/lib/libryu_lib.rlib -Wl,--end-group
| x86_64-poky-linux-ld.lld: error: undefined symbol: __rustc::__rust_realloc
| >>> referenced by cxx.58837eec157061c3-cgu.0
| >>>               libcxx_lib.cxx.58837eec157061c3-cgu.0.rcgu.o:(alloc::raw_vec::finish_grow::heaf8cf365f42da90) in archive obj/third_party/rust/cxx/v1/lib/libcxx_lib.rlib
| >>> referenced by cxx.58837eec157061c3-cgu.0
| >>>               libcxx_lib.cxx.58837eec157061c3-cgu.0.rcgu.o:(cxxbridge1$exception) in archive obj/third_party/rust/cxx/v1/lib/libcxx_lib.rlib
| >>> referenced by alloc.6c6c077c6a8a232a-cgu.6
| >>>               alloc-e0a07394e00399b7.alloc.6c6c077c6a8a232a-cgu.6.rcgu.o:(alloc::ffi::c_str::CString::from_vec_unchecked::h4a77687f297afd8e) in archive prebuilt_rustc_sysroot/lib/rustlib/x86_64-poky-linux-gnu/lib/liballoc.rlib
| >>> referenced 21 more times
| 
[ ... and similar ... ]

@adalessandro
Copy link
Contributor Author

As this PR has become pretty old now, closing in favor of MRs #920 and #921 , updating chromium to 138.0.7204.157

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

4 participants