From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5AACA1580EB for ; Wed, 21 May 2025 23:12:15 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 433C7343194 for ; Wed, 21 May 2025 23:12:15 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id E9D4D1103DE; Wed, 21 May 2025 23:12:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id DEB9D1103DE for ; Wed, 21 May 2025 23:12:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 13477343194 for ; Wed, 21 May 2025 23:12:13 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7935B153E for ; Wed, 21 May 2025 23:12:11 +0000 (UTC) From: "Jakov Smolić" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jakov Smolić" Message-ID: <1747869104.50edad6a3d99a0a58feccb14ee606d59498a4961.jsmolic@gentoo> Subject: [gentoo-commits] proj/riscv:master commit in: www-client/chromium/, www-client/chromium/files/ X-VCS-Repository: proj/riscv X-VCS-Files: www-client/chromium/Manifest www-client/chromium/chromium-135.0.7049.114.ebuild www-client/chromium/chromium-135.0.7049.95.ebuild www-client/chromium/chromium-136.0.7103.113.ebuild www-client/chromium/files/chromium-137-openh264-include-path.patch www-client/chromium/files/chromium-137-pdfium-system-libpng.patch www-client/chromium/files/esbuild www-client/chromium/files/riscv-ffmpeg.patch www-client/chromium/files/riscv-highway.patch www-client/chromium/files/riscv-v8.patch X-VCS-Directories: www-client/chromium/files/ www-client/chromium/ X-VCS-Committer: jsmolic X-VCS-Committer-Name: Jakov Smolić X-VCS-Revision: 50edad6a3d99a0a58feccb14ee606d59498a4961 X-VCS-Branch: master Date: Wed, 21 May 2025 23:12:11 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8c973f21-9ff7-422c-a329-4d81ccf9a9cb X-Archives-Hash: 09b3849dd000ff9ce95b666b0a745002 commit: 50edad6a3d99a0a58feccb14ee606d59498a4961 Author: Andrew Cameron gmail com> AuthorDate: Wed May 21 10:28:42 2025 +0000 Commit: Jakov Smolić gentoo org> CommitDate: Wed May 21 23:11:44 2025 +0000 URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=50edad6a Update Chromium to 136.0.7103.113 Signed-off-by: Andrew Cameron gmail.com> Closes: https://github.com/gentoo/riscv/pull/32 Signed-off-by: Jakov Smolić gentoo.org> www-client/chromium/Manifest | 14 +- www-client/chromium/chromium-135.0.7049.95.ebuild | 1587 -------------------- ...9.114.ebuild => chromium-136.0.7103.113.ebuild} | 45 +- .../files/chromium-137-openh264-include-path.patch | 28 + .../files/chromium-137-pdfium-system-libpng.patch | 28 + www-client/chromium/files/esbuild | Bin 9437336 -> 9568408 bytes www-client/chromium/files/riscv-ffmpeg.patch | 130 +- www-client/chromium/files/riscv-highway.patch | 15 + www-client/chromium/files/riscv-v8.patch | 884 +---------- 9 files changed, 249 insertions(+), 2482 deletions(-) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 384ba5e..29ac137 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,10 +1,8 @@ -DIST chromium-135.0.7049.114-linux-testdata.tar.xz 646720320 BLAKE2B 4d5a5d0484d4342c842746b2fa7acdb2132b0a2a82cde2c53ffc31b81ec438b50c7e6c7c46a05e923c2367a623ada2127493d7ba39b99d5909f4611b663fbe99 SHA512 47e636860fb95e6e2641629b584b184efc807e62857bf4d4adfae256fa0d6cc7008706e886ac9aa21540590fe311b5995f67828e8781015ca1a0256fdd8c38f3 -DIST chromium-135.0.7049.114-linux.tar.xz 1436875692 BLAKE2B 02a36c883633bbd97da53e7fbf505277a5235c65fed91b310fb1d1a8332c5416322dffaf828ce8a23f2f8e02370402fdabc9d50f22786efc15f134f3493c5d88 SHA512 a1e5fc01b3c7a05a26142d6765c915e3efd5d432bea098483c57bf8a2662659bc343c4ffb130501a0d87c8aef20dc497e2f327f0cef6135c50c1ca16f06ce8d4 -DIST chromium-135.0.7049.95-linux-testdata.tar.xz 646334440 BLAKE2B a91a1743ead135ca79222f8edbfc9770a2eead22bd8d7995a3aa08591232cf8de36c9e0edc1f279f45fb0f940317daf118a590173f9639f76d380ff85c37835a SHA512 99ad2400a94ecbcb28d4620b3e69ee88fec5c8ab9f1d33fee69efa519bcd8e891db48bb7a2664f11532fff51f307666ad659927afe589e336535f99a2c16a068 -DIST chromium-135.0.7049.95-linux.tar.xz 1439711820 BLAKE2B 81189db3aeea190b0773f5766561e6075c6a819bdcab71e806cea86c48d7a09fe674dada684bbf15a3575caafc56133155d6ac3b2bc2451842c2d46eb750e711 SHA512 4594665f85cb202279d767ee1ac1cd4fc4f68c9b3aa3b14a510f61219d7aef3c650f8b258ce17727a643b5fa6d6b8267f2431339e41d7e8e72200e9eef9b0140 -DIST chromium-clang-llvmorg-20-init-17108-g29ed6000-3.tar.xz 54170388 BLAKE2B 1383726ef2977ddb6ca9cef7eb7f5730e9635c570c1e20c3103922242e012579b87cf7ada668a6dedec375fa821115e5c79c32b12ab486a9e427f2e00344cfdc SHA512 a2aee165ee5581f442af222b23182370349a3b0b5412d05600c2d2258f31449e986bb7e88601b26049b4a926b15938238bfe8abd01ff6eaf2df84a64812007a1 -DIST chromium-openpower-2c25ddd2bb.tar.bz2 382057 BLAKE2B ba873ae6b542448e0602d110f0dd82a08c03d2e2750b97a9f73b8b205e3d2fb6001ea85d12d21b9b069ceac5e1fc6f2af6a821f14072140e7bffe496a6de94c6 SHA512 9516cf799382a41474a8bbe7293a05a8adeddb462e20f964a3fb7f1e4a5d97147493dc9926cdcf6c9a12b22df45f212886615a9b3447e6396c1dacac011f14be -DIST chromium-patches-135.tar.bz2 10424 BLAKE2B 89d265be9e099000dd75b2073e5f175002632c1e41625cb93d80045235c631e39765a9952e1252652f8ff7dd878ed5f5b99a6b3f4a2796957d5f28bcc8daa531 SHA512 6aa2ae6b39eecff535356623bded267fa257f3e5390a9d59d65aab7f34e5b812e50e5fa9f20cb2dcbea51856f86dd1f5cd19e0e144691ef96aee28525c9abd3b +DIST chromium-136.0.7103.113-linux-testdata.tar.xz 651614116 BLAKE2B ba76c70f3b803e5881e5825612d998256c28c07545815c766809ab9185e41bb263f933fb51bef3f0658c4248c072505542b4ba3b7a77007845c3f4816301ef7a SHA512 5eedfa17054056d5f7110bb7becd4ca77dc73ab2bcc0b722dbb591acbe15d6e569f26c988c59661763a1b239e9a18955975fbae4d172536f42e081674fdbb8d6 +DIST chromium-136.0.7103.113-linux.tar.xz 1558575932 BLAKE2B 17a455d4146d942256c177502ea8a7743e899d45875b04d9a65a2cff3224cad79590a6d750c3476d4a4abe0378813e378c463c947b144157cc65b1c4422ec720 SHA512 aff1f8f96f304d15ad984f06a5806733b8cc8689973b620b8ef43bb24cb10b2201f40b48158b7a2508cfbaffad3753c811519237c0e68c7a7303be575611896f +DIST chromium-clang-llvmorg-21-init-5118-g52cd27e6-5.tar.xz 54517328 BLAKE2B 8fdc17f49f17348d648fc55aa3c603ac857bf76d3e7e0ca73d616a1458c80b8e15421e47271958d50db83f5a5d43673c10235938ecd2d3bba6072c414b20b1f0 SHA512 3397eb7157c805df82ca8f33b61b906ab2b9dd111390b78a0d4b3e79bdbdfd6896adf1106e10741b67845d081654fdde3b763abb12aa7b5e94e6ccbdde072b94 +DIST chromium-openpower-01dda91015.tar.bz2 382275 BLAKE2B b95781f5f1845b93b02f97c617618255aed140b80a87cbd259d591e32ddc2185b9793d6735dce5c71d2bbf4af51534e8680d802f204c840fb8265e7867798f8d SHA512 981677898c218c573a2942ca0d5d2bc3b7ed687fe31be6e5078c18efb2bdffe4ad8976e8c3fb2b101f69ee3abe588c659130cdd7ccf740c4efa7914f5b44b72d +DIST chromium-patches-136-2.tar.bz2 10500 BLAKE2B d943a397059d4d55871bc4f2191e40b55d92aeab8c954c24604a558149d0df3cc8590c147a685d2e21253728918d47fdf46c24363085be364bf35ab4f3938349 SHA512 f9ff50891ef23c2d129170389c56fa3cd629e8a473dc220008dcc7cdbe86284b3f522f507d1276f0adc1c457e95b33c614a54abdea13cb23cbc7a8c0f777a291 DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c -DIST chromium-rust-toolchain-ad211ced81-1-llvmorg-20-init-17108-g29ed6000.tar.xz 124591376 BLAKE2B c062e7283994ef15055a37f66a1c01dfcbcf03d16b7de48e7d017cec479f306999112dcd0f016157cfd0334349b55ae29512be3063dc6c3de90311520e90a5c1 SHA512 09be07ff0adfcc2928b28f5763a7e18bb7ef1f0cbf4a2475e3e6ae19a0a310a4a8f323375b947a48247853412119781bc9fa1422e24b96423c071f68337d6766 +DIST chromium-rust-toolchain-f7b4354283-1-llvmorg-21-init-5118-g52cd27e6.tar.xz 118223072 BLAKE2B 2173e53df32fa697932ed55b6cef016ee8e1e7202ee47d947caef82f727b75dee1b466c7dcae0210225b23cfa94acf46af2ae4db10358189f3f32f7f0d84b685 SHA512 36d686342d5e0d984cc147e0a8ce06f665759b5480b086551158e69642cf903dbbbce85484eb8e5314cd1f0aa0e869f47d74cbf33fb125d4bd09586d22b0e3a5 DIST chromium-testfonts-f26f29c9d3.tar.gz 32750602 BLAKE2B 498f8b2e0811c98dc3d4aaa75559e69c782afb4bd12328cfdb7244ddba5cae7ee47becd27b2549d7b36bed417601f70f4c192934b0f08496cef1547d0502d93c SHA512 96b090446862997c8134e2971f0e38793ecc1208d547e554c9b651ccfb4127c4de86754903fea57a7292a2823c45117bae0ec13ed87aed20c248fb779579fbde diff --git a/www-client/chromium/chromium-135.0.7049.95.ebuild b/www-client/chromium/chromium-135.0.7049.95.ebuild deleted file mode 100644 index d13e3ec..0000000 --- a/www-client/chromium/chromium-135.0.7049.95.ebuild +++ /dev/null @@ -1,1587 +0,0 @@ -# Copyright 2009-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# PACKAGING NOTES - -# Upstream roll their bundled Clang every two weeks, and the bundled Rust -# is rolled regularly and depends on that. While we do our best to build -# with system Clang, we may eventually hit the point where we need to use -# the bundled Clang due to the use of prerelease features. - -# USE=bundled-toolchain is intended for users who want to use the same toolchain -# as the upstream releases. It's also a good fallback in case we fall behind -# and need to get a release out quickly (less likely with `dev` in-tree). - -# Since m133 we are using CI-generated tarballs from -# https://github.com/chromium-linux-tarballs/chromium-tarballs/ as we have -# control over the generation and are able to avoid issues with upstream CI. - -GN_MIN_VER=0.2217 -# chromium-tools/get-chromium-toolchain-strings.py -TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35 -BUNDLED_CLANG_VER=llvmorg-20-init-17108-g29ed6000-3 -BUNDLED_RUST_VER=ad211ced81509462cdfe4c29ed10f97279a0acae-1 -RUST_SHORT_HASH=${BUNDLED_RUST_VER:0:10}-${BUNDLED_RUST_VER##*-} - -VIRTUALX_REQUIRED="pgo" - -CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he - hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr - sv sw ta te th tr uk ur vi zh-CN zh-TW" - -LLVM_COMPAT=( 19 20 ) -PYTHON_COMPAT=( python3_{11..13} ) -PYTHON_REQ_USE="xml(+)" -RUST_MIN_VER=1.78.0 -RUST_NEEDS_LLVM="yes please" -RUST_OPTIONAL="yes" # Not actually optional, but we don't need system Rust (or LLVM) with USE=bundled-toolchain - -inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 multiprocessing ninja-utils pax-utils -inherit python-any-r1 readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils - -DESCRIPTION="Open-source version of Google Chrome web browser" -HOMEPAGE="https://www.chromium.org/" -PPC64_HASH="2c25ddd2bbabaef094918fe15eb5de524d16949c" -PATCH_V="${PV%%\.*}" -SRC_URI="https://github.com/chromium-linux-tarballs/chromium-tarballs/releases/download/${PV}/chromium-${PV}-linux.tar.xz - !bundled-toolchain? ( - https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2 - ) - bundled-toolchain? ( - https://gsdview.appspot.com/chromium-browser-clang/Linux_x64/clang-${BUNDLED_CLANG_VER}.tar.xz - -> chromium-clang-${BUNDLED_CLANG_VER}.tar.xz - https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${BUNDLED_RUST_VER}-${BUNDLED_CLANG_VER%-*}.tar.xz - -> chromium-rust-toolchain-${RUST_SHORT_HASH}-${BUNDLED_CLANG_VER%-*}.tar.xz - ) - test? ( - https://github.com/chromium-linux-tarballs/chromium-tarballs/releases/download/${PV}/chromium-${PV}-linux-testdata.tar.xz - https://chromium-fonts.storage.googleapis.com/${TEST_FONT} -> chromium-testfonts-${TEST_FONT:0:10}.tar.gz - ) - ppc64? ( - https://gitlab.raptorengineering.com/raptor-engineering-public/chromium/openpower-patches/-/archive/${PPC64_HASH}/openpower-patches-${PPC64_HASH}.tar.bz2 -> chromium-openpower-${PPC64_HASH:0:10}.tar.bz2 - ) - pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )" - -LICENSE="BSD" -SLOT="0/stable" -# Dev exists mostly to give devs some breathing room for beta/stable releases; -# it shouldn't be keyworded but adventurous users can select it. -# Do _not_ drop stable keywords for amd64 on patch releases. aarch64 still needs to go through the stablereq process. -if [[ ${SLOT} != "0/dev" ]]; then - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" -fi - -IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd" -IUSE="+X ${IUSE_SYSTEM_LIBS} bindist bundled-toolchain cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo" -IUSE+=" +proprietary-codecs pulseaudio qt6 +screencast selinux test +vaapi +wayland +widevine cpu_flags_ppc_vsx3" -RESTRICT=" - !bindist? ( bindist ) - !test? ( test ) -" - -REQUIRED_USE=" - !headless? ( || ( X wayland ) ) - pgo? ( X !wayland ) - screencast? ( wayland ) - ffmpeg-chromium? ( bindist proprietary-codecs ) -" - -COMMON_X_DEPEND=" - x11-libs/libXcomposite:= - x11-libs/libXcursor:= - x11-libs/libXdamage:= - x11-libs/libXfixes:= - >=x11-libs/libXi-1.6.0:= - x11-libs/libXrandr:= - x11-libs/libXrender:= - x11-libs/libXtst:= - x11-libs/libxshmfence:= -" - -COMMON_SNAPSHOT_DEPEND=" - system-icu? ( >=dev-libs/icu-73.0:= ) - >=dev-libs/libxml2-2.12.4:=[icu] - dev-libs/nspr:= - >=dev-libs/nss-3.26:= - dev-libs/libxslt:= - media-libs/fontconfig:= - >=media-libs/freetype-2.11.0-r1:= - system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) - media-libs/libjpeg-turbo:= - system-png? ( media-libs/libpng:=[-apng(-)] ) - system-zstd? ( >=app-arch/zstd-1.5.5:= ) - >=media-libs/libwebp-0.4.0:= - media-libs/mesa:=[gbm(+)] - >=media-libs/openh264-1.6.0:= - sys-libs/zlib:= - !headless? ( - dev-libs/glib:2 - >=media-libs/alsa-lib-1.0.19:= - pulseaudio? ( media-libs/libpulse:= ) - sys-apps/pciutils:= - kerberos? ( virtual/krb5 ) - vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) - X? ( - x11-base/xorg-proto:= - x11-libs/libX11:= - x11-libs/libxcb:= - x11-libs/libXext:= - ) - x11-libs/libxkbcommon:= - wayland? ( - dev-libs/libffi:= - dev-libs/wayland:= - screencast? ( media-video/pipewire:= ) - ) - ) -" - -COMMON_DEPEND=" - ${COMMON_SNAPSHOT_DEPEND} - app-misc/jq:= - app-arch/bzip2:= - dev-libs/expat:= - net-misc/curl[ssl] - sys-apps/dbus:= - media-libs/flac:= - sys-libs/zlib:=[minizip] - !headless? ( - >=app-accessibility/at-spi2-core-2.46.0:2 - media-libs/mesa:=[X?,wayland?] - virtual/udev - x11-libs/cairo:= - x11-libs/gdk-pixbuf:2 - x11-libs/pango:= - cups? ( >=net-print/cups-1.3.11:= ) - qt6? ( dev-qt/qtbase:6[gui,widgets] ) - X? ( ${COMMON_X_DEPEND} ) - ) -" -RDEPEND="${COMMON_DEPEND} - !headless? ( - || ( - x11-libs/gtk+:3[X?,wayland?] - gui-libs/gtk:4[X?,wayland?] - ) - qt6? ( dev-qt/qtbase:6[X?,wayland?] ) - ) - virtual/ttf-fonts - selinux? ( sec-policy/selinux-chromium ) - bindist? ( - !ffmpeg-chromium? ( >=media-video/ffmpeg-6.1-r1:0/58.60.60[chromium] ) - ffmpeg-chromium? ( media-video/ffmpeg-chromium:${PV%%\.*} ) - ) -" -DEPEND="${COMMON_DEPEND} - !headless? ( - gtk4? ( gui-libs/gtk:4[X?,wayland?] ) - !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) - ) -" - -BDEPEND=" - ${COMMON_SNAPSHOT_DEPEND} - ${PYTHON_DEPS} - $(python_gen_any_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - >=app-arch/gzip-1.7 - !headless? ( - qt6? ( dev-qt/qtbase:6 ) - ) - !bundled-toolchain? ( $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} - llvm-core/lld:${LLVM_SLOT} - official? ( - !ppc64? ( !riscv? ( llvm-runtimes/compiler-rt-sanitizers:${LLVM_SLOT}[cfi] ) ) - ) ') - ${RUST_DEPEND} - ) - pgo? ( - >=dev-python/selenium-3.141.0 - >=dev-util/web_page_replay_go-20220314 - ) - >=dev-util/bindgen-0.68.0 - >=dev-build/gn-${GN_MIN_VER} - app-alternatives/ninja - dev-lang/perl - >=dev-util/gperf-3.0.3 - dev-vcs/git - >=net-libs/nodejs-7.6.0[inspector] - >=sys-devel/bison-2.4.3 - sys-devel/flex - virtual/pkgconfig -" - -if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then - EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; -fi - -DISABLE_AUTOFORMATTING="yes" -DOC_CONTENTS=" -Some web pages may require additional fonts to display properly. -Try installing some of the following packages if some characters -are not displayed properly: -- media-fonts/arphicfonts -- media-fonts/droid -- media-fonts/ipamonafont -- media-fonts/noto -- media-fonts/ja-ipafonts -- media-fonts/takao-fonts -- media-fonts/wqy-microhei -- media-fonts/wqy-zenhei - -To fix broken icons on the Downloads page, you should install an icon -theme that covers the appropriate MIME types, and configure this as your -GTK+ icon theme. - -For native file dialogs in KDE, install kde-apps/kdialog. - -To make password storage work with your desktop environment you may -have install one of the supported credentials management applications: -- app-crypt/libsecret (GNOME) -- kde-frameworks/kwallet (KDE) -If you have one of above packages installed, but don't want to use -them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS -in /etc/chromium/default. -" - -python_check_deps() { - python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" -} - -pre_build_checks() { - # Check build requirements: bugs #471810, #541816, #914220 - # We're going to start doing maths here on the size of an unpacked source tarball, - # this should make updates easier as chromium continues to balloon in size. - # xz -l /var/cache/distfiles/chromium-${PV}*.tar.xz - local base_disk=9 # Round up - use test && base_disk=$((base_disk + 5)) - local extra_disk=1 # Always include a little extra space - local memory=4 - tc-is-cross-compiler && extra_disk=$((extra_disk * 2)) - if tc-is-lto || use pgo; then - memory=$((memory * 2 + 1)) - tc-is-cross-compiler && extra_disk=$((extra_disk * 2)) # Double the requirements - use pgo && extra_disk=$((extra_disk + 4)) - fi - if is-flagq '-g?(gdb)?([1-9])'; then - if use custom-cflags; then - extra_disk=$((extra_disk + 5)) - fi - memory=$((memory * 2)) - fi - local CHECKREQS_MEMORY="${memory}G" - local CHECKREQS_DISK_BUILD="$((base_disk + extra_disk))G" - check-reqs_${EBUILD_PHASE_FUNC} -} - -pkg_pretend() { - if [[ ${MERGE_TYPE} != binary ]]; then - # The pre_build_checks are all about compilation resources, no need to run it for a binpkg - pre_build_checks - fi - - if use headless; then - local headless_unused_flags=("cups" "kerberos" "pulseaudio" "qt6" "vaapi" "wayland") - for myiuse in ${headless_unused_flags[@]}; do - use ${myiuse} && ewarn "Ignoring USE=${myiuse}, USE=headless is set." - done - fi - - if ! use bindist && use ffmpeg-chromium; then - ewarn "Ignoring USE=ffmpeg-chromium, USE=bindist is not set." - fi -} - -pkg_setup() { - if [[ ${MERGE_TYPE} != binary ]]; then - # The pre_build_checks are all about compilation resources, no need to run it for a binpkg - pre_build_checks - - # The linux:unbundle toolchain in GN grabs CC, CXX, CPP (etc) from the environment - # We'll set these to clang here then use llvm-utils functions to very explicitly set these - # to a sane value. - # This is effectively the 'force-clang' path if GCC support is re-added. - # TODO: check if the user has already selected a specific impl via make.conf and respect that. - use_lto="false" - if tc-is-lto; then - use_lto="true" - # We can rely on GN to do this for us; anecdotally without this builds - # take significantly longer with LTO enabled and it doesn't hurt anything. - filter-lto - fi - - if [ "$use_lto" = "false" ] && use official; then - einfo "USE=official selected and LTO not detected." - einfo "It is _highly_ recommended that LTO be enabled for performance reasons" - einfo "and to be consistent with the upstream \"official\" build optimisations." - fi - - if [ "$use_lto" = "false" ] && use test; then - die "Tests require CFI which requires LTO" - fi - - export use_lto - - # 936858 - if tc-ld-is-mold; then - eerror "Your toolchain is using the mold linker." - eerror "This is not supported by Chromium." - die "Please switch to a different linker." - fi - - if use !bundled-toolchain; then - llvm-r1_pkg_setup - rust_pkg_setup - fi - - # Forcing clang; respect llvm_slot_x to enable selection of impl from LLVM_COMPAT - AR=llvm-ar - CPP="${CHOST}-clang++-${LLVM_SLOT} -E" - NM=llvm-nm - CC="${CHOST}-clang-${LLVM_SLOT}" - CXX="${CHOST}-clang++-${LLVM_SLOT}" - - if tc-is-cross-compiler; then - use pgo && die "The pgo USE flag cannot be used when cross-compiling" - CPP="${CBUILD}-clang++-${LLVM_SLOT} -E" - fi - - # I hate doing this but upstream Rust have yet to come up with a better solution for - # us poor packagers. Required for Split LTO units, which are required for CFI. - export RUSTC_BOOTSTRAP=1 - - # Users should never hit this, it's purely a development convenience - if ver_test $(gn --version || die) -lt ${GN_MIN_VER}; then - die "dev-build/gn >= ${GN_MIN_VER} is required to build this Chromium" - fi - fi - - chromium_suid_sandbox_check_kernel_config -} - -src_unpack() { - unpack ${P}-linux.tar.xz - # These should only be required when we're not using the official toolchain - use !bundled-toolchain && unpack chromium-patches-${PATCH_V}.tar.bz2 - - use pgo && unpack chromium-profiler-0.2.tar - - if use test; then - # A new testdata tarball is available for each release; but testfonts tend to remain stable - # for the duration of a release. - # This unpacks directly into/over ${WORKDIR}/${P} so we can just use `unpack`. - unpack ${P}-linux-testdata.tar.xz - # This just contains a bunch of font files that need to be unpacked (or moved) to the correct location. - local testfonts_dir="${WORKDIR}/${P}/third_party/test_fonts" - local testfonts_tar="${DISTDIR}/chromium-testfonts-${TEST_FONT:0:10}.tar.gz" - tar xf "${testfonts_tar}" -C "${testfonts_dir}" || die "Failed to unpack testfonts" - fi - - # We need to manually unpack this since M126 else we'd unpack one toolchain over the other. - # Since we're doing that anyway let's unpack to sensible locations to make symlink creation easier. - if use bundled-toolchain; then - einfo "Unpacking bundled Clang ..." - mkdir -p "${WORKDIR}"/clang || die "Failed to create clang directory" - tar xf "${DISTDIR}/chromium-clang-${BUNDLED_CLANG_VER}.tar.xz" -C "${WORKDIR}/clang" || die "Failed to unpack Clang" - einfo "Unpacking bundled Rust ..." - local rust_dir="${WORKDIR}/rust-toolchain" - mkdir -p "${rust_dir}" || die "Failed to create rust toolchain directory" - tar xf "${DISTDIR}/chromium-rust-toolchain-${RUST_SHORT_HASH}-${BUNDLED_CLANG_VER%-*}.tar.xz" -C "${rust_dir}" || - die "Failed to unpack Rust" - fi - - if use ppc64; then - unpack chromium-openpower-${PPC64_HASH:0:10}.tar.bz2 - fi -} - -src_prepare() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - local PATCHES=( - "${FILESDIR}/chromium-cross-compile.patch" - "${FILESDIR}/chromium-109-system-zlib.patch" - "${FILESDIR}/chromium-111-InkDropHost-crash.patch" - "${FILESDIR}/chromium-131-unbundle-icu-target.patch" - "${FILESDIR}/chromium-134-bindgen-custom-toolchain.patch" - "${FILESDIR}/chromium-135-oauth2-client-switches.patch" - "${FILESDIR}/chromium-135-map_droppable-glibc.patch" - "${FILESDIR}/chromium-135-webrtc-pipewire.patch" - "${FILESDIR}/chromium-135-gperf.patch" - "${FILESDIR}/riscv-swiftshader.patch" - "${FILESDIR}/Debian-fix-rust-linking.patch" - "${FILESDIR}/riscv-dav1d.patch" - "${FILESDIR}/riscv-sandbox.patch" - "${FILESDIR}/riscv-ffmpeg.patch" - "${FILESDIR}/compiler-rt-riscv.patch" - "${FILESDIR}/cpuinfo.patch" - "${FILESDIR}/riscv-misc.patch" - "${FILESDIR}/chromium-134-type-mismatch-error.patch" - "${FILESDIR}/0001-chrome-runtime_api_delegate-add-riscv64-define.patch" - "${FILESDIR}/0001-extensions-common-api-runtime.json-riscv64-support.patch" - ) - - if use bundled-toolchain; then - # We need to symlink the toolchain into the expected location - einfo "Symlinking Clang toolchain to expected location ..." - mkdir -p third_party/llvm-build/ || die "Failed to create llvm-build directory" - # the 'Chromium Linux Tarballs' seem to already have 'Release+Asserts/{lib,bin}'; not sure if this is an - # upstream change - we're using the same scripts to build, theoretically. We'll still attempt to create - # llvm-build, but we'll rm Release+Asserts and symlink directly. - if [[ -d third_party/llvm-build/Release+Asserts ]]; then - rm -r third_party/llvm-build/Release+Asserts || die "Failed to remove third_party/llvm-build/Release+Asserts" - fi - ln -s "${WORKDIR}"/clang third_party/llvm-build/Release+Asserts || die "Failed to bundle Clang" - einfo "Symlinking Rust toolchain to expected location ..." - # As above, so below - if [[ -d third_party/rust-toolchain ]]; then - rm -r third_party/rust-toolchain || die "Failed to remove third_party/rust-toolchain" - fi - ln -s "${WORKDIR}"/rust-toolchain third_party/rust-toolchain || die "Failed to bundle rust" - cp "${WORKDIR}"/rust-toolchain/VERSION \ - "${WORKDIR}"/rust-toolchain/INSTALLED_VERSION || die "Failed to set rust version" - else - # We don't need our toolchain patches if we're using the official toolchain - shopt -s globstar nullglob - # 130: moved the PPC64 patches into the chromium-patches repo - local patch - for patch in "${WORKDIR}/chromium-patches-${PATCH_V}"/**/*.patch; do - if [[ ${patch} == *"ppc64le"* ]]; then - use ppc64 && PATCHES+=( "${patch}" ) - else - PATCHES+=( "${patch}" ) - fi - done - - shopt -u globstar nullglob - - # We can't use the bundled compiler builtins with the system toolchain - # `grep` is a development convenience to ensure we fail early when google changes something. - local builtins_match="if (is_clang && !is_nacl && !is_cronet_build) {" - grep -q "${builtins_match}" build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins" - sed -i -e "/${builtins_match}/,+2d" build/config/compiler/BUILD.gn - - # Strictly speaking this doesn't need to be gated (no bundled toolchain for ppc64); it keeps the logic together - if use ppc64; then - local patchset_dir="${WORKDIR}/openpower-patches-${PPC64_HASH}/patches" - # patch causes build errors on 4K page systems (https://bugs.gentoo.org/show_bug.cgi?id=940304) - local page_size_patch="ppc64le/third_party/use-sysconf-page-size-on-ppc64.patch" - local isa_3_patch="ppc64le/core/baseline-isa-3-0.patch" - # Apply the OpenPOWER patches (check for page size and isa 3.0) - openpower_patches=( $(grep -E "^ppc64le|^upstream" "${patchset_dir}/series" | grep -v "${page_size_patch}" | - grep -v "${isa_3_patch}" || die) ) - for patch in "${openpower_patches[@]}"; do - PATCHES+=( "${patchset_dir}/${patch}" ) - done - if [[ $(getconf PAGESIZE) == 65536 ]]; then - PATCHES+=( "${patchset_dir}/${page_size_patch}" ) - fi - # We use vsx3 as a proxy for 'want isa3.0' (POWER9) - if use cpu_flags_ppc_vsx3 ; then - PATCHES+=( "${patchset_dir}/${isa_3_patch}" ) - fi - fi - - # Oxidised hacks, let's keep 'em all in one place - # This is a nightly option that does not exist in older releases - # https://github.com/rust-lang/rust/commit/389a399a501a626ebf891ae0bb076c25e325ae64 - if ver_test ${RUST_SLOT} -lt "1.83.0"; then - sed '/rustflags = \[ "-Zdefault-visibility=hidden" \]/d' -i build/config/gcc/BUILD.gn || - die "Failed to remove default visibility nightly option" - fi - - # Upstream Rust replaced adler with adler2, for older versions of Rust we still need - # to tell GN that we have the older lib when it tries to copy the Rust sysroot - # into the bulid directory. - if ver_test ${RUST_SLOT} -lt "1.86.0"; then - sed -i 's/adler2/adler/' build/rust/std/BUILD.gn || - die "Failed to tell GN that we have adler and not adler2" - fi - fi - - default - - # Not included in -lite tarballs, but we should check for it anyway. - if [[ -f third_party/node/linux/node-linux-x64/bin/node ]]; then - rm third_party/node/linux/node-linux-x64/bin/node || die - else - mkdir -p third_party/node/linux/node-linux-x64/bin || die - fi - ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die - - - # if this is riscv apply wasm-node fix to get it to compile clean - if use riscv ; then - pushd third_party/node - sed -i -e 's/@rollup/rollup/' -e "s/'wasm-node',//" node_modules.py - _rollup_ver="$(jq -r .dependencies.\"@rollup/wasm-node\" package.json)" - jq ".dependencies.rollup=\"$_rollup_ver\"" package.json > package.json.new - mv package.json{.new,} - popd - third_party/node/update_npm_deps || die - rm third_party/devtools-frontend/src/third_party/esbuild/esbuild || die - cp -a ${FILESDIR}/esbuild third_party/devtools-frontend/src/third_party/esbuild/esbuild - - pushd third_party/devtools-frontend/src - sed -i -e 's/@rollup/rollup/' -e "s/'wasm-node',//" scripts/devtools_paths.py - local _rollup_ver="$(jq -r .devDependencies.\"@rollup/wasm-node\" package.json)" - jq ".devDependencies.rollup=\"$_rollup_ver\" | .devDependencies.\"@rollup/rollup-linux-riscv64-gnu\"=\"$_rollup_ver\"" package.json > package.json.new - mv package.json{.new,} - # Chromium hosts a custom registry at https://npm.skia.org/chrome-devtools/ - # and rejects some packages: - # Package fs-extra with version 11.3.0 was created 108h0m0s time ago. This is less than 1 week and so failed the audit. - sed -i /registry/d .npmrc - # Replace direct invocation of wasm rollup - sed -i 's\@rollup/wasm-node\rollup\' \ - inspector_overlay/BUILD.gn \ - front_end/models/live-metrics/web-vitals-injected/BUILD.gn \ - front_end/Images/BUILD.gn \ - front_end/panels/recorder/injected/BUILD.gn \ - scripts/build/ninja/bundle.gni - popd - python third_party/devtools-frontend/src/scripts/deps/manage_node_deps.py - fi - - # adjust python interpreter version - sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die - - # remove_bundled_libraries.py walks the source tree and looks for paths containing the substring 'third_party' - # whitelist matches use the right-most matching path component, so we need to whitelist from that point down. - local keeplibs=( - base/third_party/cityhash - base/third_party/double_conversion - base/third_party/icu - base/third_party/nspr - base/third_party/superfasthash - base/third_party/symbolize - base/third_party/xdg_user_dirs - buildtools/third_party/libc++ - buildtools/third_party/libc++abi - chrome/third_party/mozilla_security_manager - net/third_party/mozilla_security_manager - net/third_party/nss - net/third_party/quic - net/third_party/uri_template - third_party/abseil-cpp - third_party/angle - third_party/angle/src/common/third_party/xxhash - third_party/angle/src/third_party/ceval - third_party/angle/src/third_party/libXNVCtrl - third_party/angle/src/third_party/volk - third_party/anonymous_tokens - third_party/apple_apsl - third_party/axe-core - third_party/bidimapper - third_party/blink - third_party/boringssl - third_party/boringssl/src/third_party/fiat - third_party/breakpad - third_party/breakpad/breakpad/src/third_party/curl - third_party/brotli - third_party/catapult - third_party/catapult/common/py_vulcanize/third_party/rcssmin - third_party/catapult/common/py_vulcanize/third_party/rjsmin - third_party/catapult/third_party/beautifulsoup4-4.9.3 - third_party/catapult/third_party/html5lib-1.1 - third_party/catapult/third_party/polymer - third_party/catapult/third_party/six - third_party/catapult/tracing/third_party/d3 - third_party/catapult/tracing/third_party/gl-matrix - third_party/catapult/tracing/third_party/jpeg-js - third_party/catapult/tracing/third_party/jszip - third_party/catapult/tracing/third_party/mannwhitneyu - third_party/catapult/tracing/third_party/oboe - third_party/catapult/tracing/third_party/pako - third_party/ced - third_party/cld_3 - third_party/closure_compiler - third_party/content_analysis_sdk - third_party/cpuinfo - third_party/crabbyavif - third_party/crashpad - third_party/crashpad/crashpad/third_party/lss - third_party/crashpad/crashpad/third_party/zlib - third_party/crc32c - third_party/cros_system_api - third_party/d3 - third_party/dav1d - third_party/dawn - third_party/dawn/third_party/gn/webgpu-cts - third_party/dawn/third_party/khronos - third_party/depot_tools - third_party/devscripts - third_party/devtools-frontend - third_party/devtools-frontend/src/front_end/third_party/acorn - third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json - third_party/devtools-frontend/src/front_end/third_party/axe-core - third_party/devtools-frontend/src/front_end/third_party/chromium - third_party/devtools-frontend/src/front_end/third_party/codemirror - third_party/devtools-frontend/src/front_end/third_party/csp_evaluator - third_party/devtools-frontend/src/front_end/third_party/diff - third_party/devtools-frontend/src/front_end/third_party/i18n - third_party/devtools-frontend/src/front_end/third_party/intl-messageformat - third_party/devtools-frontend/src/front_end/third_party/json5 - third_party/devtools-frontend/src/front_end/third_party/lighthouse - third_party/devtools-frontend/src/front_end/third_party/lit - third_party/devtools-frontend/src/front_end/third_party/marked - third_party/devtools-frontend/src/front_end/third_party/puppeteer - third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/mitt - third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/parsel-js - third_party/devtools-frontend/src/front_end/third_party/puppeteer/package/lib/esm/third_party/rxjs - third_party/devtools-frontend/src/front_end/third_party/third-party-web - third_party/devtools-frontend/src/front_end/third_party/vscode.web-custom-data - third_party/devtools-frontend/src/front_end/third_party/wasmparser - third_party/devtools-frontend/src/front_end/third_party/web-vitals - third_party/devtools-frontend/src/third_party - third_party/distributed_point_functions - third_party/dom_distiller_js - third_party/eigen3 - third_party/emoji-segmenter - third_party/farmhash - third_party/fast_float - third_party/fdlibm - third_party/ffmpeg - third_party/fft2d - third_party/flatbuffers - third_party/fp16 - third_party/freetype - third_party/fusejs - third_party/fxdiv - third_party/gemmlowp - third_party/google_input_tools - third_party/google_input_tools/third_party/closure_library - third_party/google_input_tools/third_party/closure_library/third_party/closure - third_party/googletest - third_party/highway - third_party/hunspell - third_party/ink_stroke_modeler/src/ink_stroke_modeler - third_party/ink_stroke_modeler/src/ink_stroke_modeler/internal - third_party/ink/src/ink/brush - third_party/ink/src/ink/color - third_party/ink/src/ink/geometry - third_party/ink/src/ink/rendering - third_party/ink/src/ink/rendering/skia/common_internal - third_party/ink/src/ink/rendering/skia/native - third_party/ink/src/ink/rendering/skia/native/internal - third_party/ink/src/ink/strokes - third_party/ink/src/ink/types - third_party/inspector_protocol - third_party/ipcz - third_party/jinja2 - third_party/jsoncpp - third_party/khronos - third_party/lens_server_proto - third_party/leveldatabase - third_party/libaddressinput - third_party/libaom - third_party/libaom/source/libaom/third_party/fastfeat - third_party/libaom/source/libaom/third_party/SVT-AV1 - third_party/libaom/source/libaom/third_party/vector - third_party/libaom/source/libaom/third_party/x86inc - third_party/libc++ - third_party/libdrm - third_party/libgav1 - third_party/libjingle - third_party/libphonenumber - third_party/libsecret - third_party/libsrtp - third_party/libsync - third_party/libtess2/libtess2 - third_party/libtess2/src/Include - third_party/libtess2/src/Source - third_party/liburlpattern - third_party/libva_protected_content - third_party/libvpx - third_party/libvpx/source/libvpx/third_party/x86inc - third_party/libwebm - third_party/libx11 - third_party/libxcb-keysyms - third_party/libxml/chromium - third_party/libyuv - third_party/libzip - third_party/lit - third_party/llvm-libc - third_party/llvm-libc/src/shared/ - third_party/lottie - third_party/lss - third_party/lzma_sdk - third_party/mako - third_party/markupsafe - third_party/material_color_utilities - third_party/mesa - third_party/metrics_proto - third_party/minigbm - third_party/modp_b64 - third_party/nasm - third_party/nearby - third_party/neon_2_sse - third_party/node - third_party/omnibox_proto - third_party/one_euro_filter - third_party/openscreen - third_party/openscreen/src/third_party/ - third_party/openscreen/src/third_party/tinycbor/src/src - third_party/opus - third_party/ots - third_party/pdfium - third_party/pdfium/third_party/agg23 - third_party/pdfium/third_party/bigint - third_party/pdfium/third_party/freetype - third_party/pdfium/third_party/lcms - third_party/pdfium/third_party/libopenjpeg - third_party/pdfium/third_party/libtiff - third_party/perfetto - third_party/perfetto/protos/third_party/chromium - third_party/perfetto/protos/third_party/simpleperf - third_party/pffft - third_party/ply - third_party/polymer - third_party/private_membership - third_party/private-join-and-compute - third_party/protobuf - third_party/protobuf/third_party/utf8_range - third_party/pthreadpool - third_party/puffin - third_party/pyjson5 - third_party/pyyaml - third_party/rapidhash - third_party/re2 - third_party/rnnoise - third_party/rust - third_party/ruy - third_party/s2cellid - third_party/search_engines_data - third_party/securemessage - third_party/selenium-atoms - third_party/sentencepiece - third_party/sentencepiece/src/third_party/darts_clone - third_party/shell-encryption - third_party/simdutf - third_party/simplejson - third_party/six - third_party/skia - third_party/skia/include/third_party/vulkan - third_party/skia/third_party/vulkan - third_party/smhasher - third_party/snappy - third_party/spirv-headers - third_party/spirv-tools - third_party/sqlite - third_party/swiftshader - third_party/swiftshader/third_party/astc-encoder - third_party/swiftshader/third_party/llvm-subzero - third_party/swiftshader/third_party/marl - third_party/swiftshader/third_party/SPIRV-Headers/include/spirv - third_party/swiftshader/third_party/SPIRV-Tools - third_party/swiftshader/third_party/subzero - third_party/tensorflow_models - third_party/tensorflow-text - third_party/tflite - third_party/tflite/src/third_party/eigen3 - third_party/tflite/src/third_party/fft2d - third_party/tflite/src/third_party/xla/third_party/tsl - third_party/tflite/src/third_party/xla/xla/tsl/framework - third_party/tflite/src/third_party/xla/xla/tsl/lib/random - third_party/tflite/src/third_party/xla/xla/tsl/protobuf - third_party/tflite/src/third_party/xla/xla/tsl/util - third_party/ukey2 - third_party/unrar - third_party/utf - third_party/vulkan - third_party/wasm_tts_engine - third_party/wayland - third_party/webdriver - third_party/webgpu-cts - third_party/webrtc - third_party/webrtc/common_audio/third_party/ooura - third_party/webrtc/common_audio/third_party/spl_sqrt_floor - third_party/webrtc/modules/third_party/fft - third_party/webrtc/modules/third_party/g711 - third_party/webrtc/modules/third_party/g722 - third_party/webrtc/rtc_base/third_party/base64 - third_party/webrtc/rtc_base/third_party/sigslot - third_party/widevine - third_party/woff2 - third_party/wuffs - third_party/x11proto - third_party/xcbproto - third_party/xnnpack - third_party/zlib/google - third_party/zxcvbn-cpp - url/third_party/mozilla - v8/third_party/siphash - v8/third_party/utf8-decoder - v8/third_party/glibc - v8/third_party/inspector_protocol - v8/third_party/rapidhash-v8 - v8/third_party/v8 - v8/third_party/valgrind - - # gyp -> gn leftovers - third_party/speech-dispatcher - third_party/usb_ids - third_party/xdg-utils - ) - - if use test; then - # tar tvf /var/cache/distfiles/${P}-testdata.tar.xz | grep '^d' | grep 'third_party' | awk '{print $NF}' - keeplibs+=( - third_party/breakpad/breakpad/src/processor - third_party/fuzztest - third_party/google_benchmark/src/include/benchmark - third_party/google_benchmark/src/src - third_party/perfetto/protos/third_party/pprof - third_party/test_fonts - third_party/test_fonts/fontconfig - ) - fi - - # USE=system-* - if ! use system-harfbuzz; then - keeplibs+=( third_party/harfbuzz-ng ) - fi - - if ! use system-icu; then - keeplibs+=( third_party/icu ) - fi - - if ! use system-png; then - keeplibs+=( third_party/libpng ) - fi - - if ! use system-zstd; then - keeplibs+=( third_party/zstd ) - fi - - # Arch-specific - if use arm64 || use ppc64 ; then - keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 ) - fi - if use riscv ; then - keeplibs+=( third_party/swiftshader/third_party/llvm-16.0 ) - fi - # we need to generate ppc64 stuff because upstream does not ship it yet - # it has to be done before unbundling. - if use ppc64; then - pushd third_party/libvpx >/dev/null || die - mkdir -p source/config/linux/ppc64 || die - # requires git and clang, bug #832803 - # Revert https://chromium.googlesource.com/chromium/src/+/b463d0f40b08b4e896e7f458d89ae58ce2a27165%5E%21/third_party/libvpx/generate_gni.sh - # and https://chromium.googlesource.com/chromium/src/+/71ebcbce867dd31da5f8b405a28fcb0de0657d91%5E%21/third_party/libvpx/generate_gni.sh - # since we're not in a git repo - sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g; /^git -C/d; /git cl/d; /cd \$BASE_DIR\/\$LIBVPX_SRC_DIR/ign format --in-place \$BASE_DIR\/BUILD.gn\ngn format --in-place \$BASE_DIR\/libvpx_srcs.gni" \ - generate_gni.sh || die - ./generate_gni.sh || die - popd >/dev/null || die - - pushd third_party/ffmpeg >/dev/null || die - cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die - cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die - popd >/dev/null || die - fi - - # Sanity check keeplibs, on major version bumps it is often necessary to update this list - # and this enables us to hit them all at once. - # There are some entries that need to be whitelisted (TODO: Why? The file is understandable, the rest seem odd) - whitelist_libs=( - net/third_party/quic - third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json - third_party/libjingle - third_party/mesa - third_party/skia/third_party/vulkan - third_party/vulkan - ) - local not_found_libs=() - for lib in "${keeplibs[@]}"; do - if [[ ! -d "${lib}" ]] && ! has "${lib}" "${whitelist_libs[@]}"; then - not_found_libs+=( "${lib}" ) - fi - done - - if [[ ${#not_found_libs[@]} -gt 0 ]]; then - eerror "The following \`keeplibs\` directories were not found in the source tree:" - for lib in "${not_found_libs[@]}"; do - eerror " ${lib}" - done - die "Please update the ebuild." - fi - - # Remove most bundled libraries. Some are still needed. - einfo "Unbundling third-party libraries ..." - build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die - - # bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries - mkdir -p buildtools/third_party/eu-strip/bin || die - ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die -} - -chromium_configure() { - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - local myconf_gn="" - - if use !bundled-toolchain; then - # We already forced the "correct" clang via pkg_setup - - if tc-is-cross-compiler; then - CC="${CC} -target ${CHOST} --sysroot ${ESYSROOT}" - CXX="${CXX} -target ${CHOST} --sysroot ${ESYSROOT}" - BUILD_AR=${AR} - BUILD_CC=${CC} - BUILD_CXX=${CXX} - BUILD_NM=${NM} - fi - - strip-unsupported-flags - - myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" - # https://bugs.gentoo.org/918897#c32 - append-ldflags -Wl,--undefined-version - myconf_gn+=" use_lld=true" - - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\"" - - if tc-is-cross-compiler; then - tc-export BUILD_{AR,CC,CXX,NM} - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\"" - myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\"" - myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\"" - myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\"" - - # setup cups-config, build system only uses --libs option - if use cups; then - mkdir "${T}/cups-config" || die - cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die - export PATH="${PATH}:${T}/cups-config" - fi - - # Don't inherit PKG_CONFIG_PATH from environment - local -x PKG_CONFIG_PATH= - else - myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" - fi - - # bindgen settings - # From 127, to make bindgen work, we need to provide a location for libclang. - # We patch this in for gentoo - see chromium-*-bindgen-custom-toolchain.patch - # rust_bindgen_root = directory with `bin/bindgen` beneath it. - myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\"" - - myconf_gn+=" bindgen_libclang_path=\"$(get_llvm_prefix)/$(get_libdir)\"" - # We don't need to set 'clang_base_bath' for anything in our build - # and it defaults to the google toolchain location. Instead provide a location - # to where system clang lives sot that bindgen can find system headers (e.g. stddef.h) - myconf_gn+=" clang_base_path=\"${EPREFIX}/usr/lib/clang/${LLVM_SLOT}/\"" - - myconf_gn+=" rust_sysroot_absolute=\"$(get_rust_prefix)\"" - myconf_gn+=" rustc_version=\"${RUST_SLOT}\"" - fi - - # GN needs explicit config for Debug/Release as opposed to inferring it from build directory. - myconf_gn+=" is_debug=false" - - # enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138. - # DCHECK is fatal by default, make it configurable at runtime, #bug 807881. - myconf_gn+=" dcheck_always_on=$(usex debug true false)" - myconf_gn+=" dcheck_is_configurable=$(usex debug true false)" - - # Component build isn't generally intended for use by end users. It's mostly useful - # for development and debugging. - myconf_gn+=" is_component_build=false" - - # Disable nacl, we can't build without pnacl (http://crbug.com/269560). - myconf_gn+=" enable_nacl=false" - - # Use system-provided libraries. - # TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733). - # TODO: use_system_hunspell (upstream changes needed). - # TODO: use_system_protobuf (bug #525560). - # TODO: use_system_sqlite (http://crbug.com/22208). - - # libevent: https://bugs.gentoo.org/593458 - local gn_system_libraries=( - flac - fontconfig - freetype - # Need harfbuzz_from_pkgconfig target - #harfbuzz-ng - libjpeg - libwebp - libxml - libxslt - openh264 - zlib - ) - if use system-icu; then - gn_system_libraries+=( icu ) - fi - if use system-png; then - gn_system_libraries+=( libpng ) - fi - if use system-zstd; then - gn_system_libraries+=( zstd ) - fi - - build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die - - # TODO 131: The above call clobbers `enable_freetype = true` in the freetype gni file - # drop the last line, then append the freetype line and a new curly brace to end the block - local freetype_gni="build/config/freetype/freetype.gni" - sed -i -e '$d' ${freetype_gni} || die - echo " enable_freetype = true" >> ${freetype_gni} || die - echo "}" >> ${freetype_gni} || die - - # See dependency logic in third_party/BUILD.gn - myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)" - - # Optional dependencies. - myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)" - myconf_gn+=" enable_widevine=$(usex widevine true false)" - - if use headless; then - myconf_gn+=" use_cups=false" - myconf_gn+=" use_kerberos=false" - myconf_gn+=" use_pulseaudio=false" - myconf_gn+=" use_vaapi=false" - myconf_gn+=" rtc_use_pipewire=false" - else - myconf_gn+=" use_cups=$(usex cups true false)" - myconf_gn+=" use_kerberos=$(usex kerberos true false)" - myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)" - myconf_gn+=" use_vaapi=$(usex vaapi true false)" - myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)" - myconf_gn+=" gtk_version=$(usex gtk4 4 3)" - fi - - # Allows distributions to link pulseaudio directly (DT_NEEDED) instead of - # using dlopen. This helps with automated detection of ABI mismatches and - # prevents silent errors. - if use pulseaudio; then - myconf_gn+=" link_pulseaudio=true" - fi - - # Non-developer builds of Chromium (for example, non-Chrome browsers, or - # Chromium builds provided by Linux distros) should disable the testing config - myconf_gn+=" disable_fieldtrial_testing_config=true" - - # The sysroot is the oldest debian image that chromium supports, we don't need it - myconf_gn+=" use_sysroot=false" - - # Use in-tree libc++ (buildtools/third_party/libc++ and buildtools/third_party/libc++abi) - # instead of the system C++ library for C++ standard library support. - # default: true, but let's be explicit (forced since 120 ; USE removed 127). - myconf_gn+=" use_custom_libcxx=true" - - # Disable pseudolocales, only used for testing - myconf_gn+=" enable_pseudolocales=false" - - # Disable code formating of generated files - myconf_gn+=" blink_enable_generated_code_formatting=false" - - if use bindist ; then - # proprietary_codecs just forces Chromium to say that it can use h264/aac, - # the work is still done by ffmpeg. If this is set to no Chromium - # won't be able to load the codec even if the library can handle it - myconf_gn+=" proprietary_codecs=true" - myconf_gn+=" ffmpeg_branding=\"Chrome\"" - # build ffmpeg as an external component (libffmpeg.so) that we can remove / substitute - myconf_gn+=" is_component_ffmpeg=true" - else - ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)" - myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)" - myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\"" - fi - - # Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys . - # Note: these are for Gentoo use ONLY. For your own distribution, - # please get your own set of keys. Feel free to contact chromium@gentoo.org - # for more info. The OAuth2 credentials, however, have been left out. - # Those OAuth2 credentials have been broken for quite some time anyway. - # Instead we apply a patch to use the --oauth2-client-id= and - # --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and - # GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into - # Chromium without baked-in values. - local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc" - myconf_gn+=" google_api_key=\"${google_api_key}\"" - local myarch="$(tc-arch)" - - # Avoid CFLAGS problems, bug #352457, bug #390147. - if ! use custom-cflags; then - replace-flags "-Os" "-O2" - strip-flags - - # Debug info section overflows without component build - # Prevent linker from running out of address space, bug #471810 . - filter-flags "-g*" - - # Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646. - if [[ ${myarch} == amd64 ]]; then - filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a - fi - fi - - if [[ $myarch = amd64 ]] ; then - myconf_gn+=" target_cpu=\"x64\"" - ffmpeg_target_arch=x64 - elif [[ $myarch = arm64 ]] ; then - myconf_gn+=" target_cpu=\"arm64\"" - ffmpeg_target_arch=arm64 - elif [[ $myarch = ppc64 ]] ; then - myconf_gn+=" target_cpu=\"ppc64\"" - ffmpeg_target_arch=ppc64 - elif [[ $myarch = riscv ]] ; then - myconf_gn+=" target_cpu=\"riscv64\"" - ffmpeg_target_arch=riscv64 - else - die "Failed to determine target arch, got '$myarch'." - fi - - myconf_gn+=" treat_warnings_as_errors=false" - # Disable fatal linker warnings, bug 506268. - myconf_gn+=" fatal_linker_warnings=false" - - # Disable external code space for V8 for ppc64. It is disabled for ppc64 - # by default, but cross-compiling on amd64 enables it again. - if tc-is-cross-compiler; then - if ! use amd64 && ! use arm64; then - myconf_gn+=" v8_enable_external_code_space=false" - fi - fi - - # Only enabled for clang, but gcc has endian macros too - myconf_gn+=" v8_use_libm_trig_functions=true" - - # Bug 491582. - export TMPDIR="${WORKDIR}/temp" - mkdir -p -m 755 "${TMPDIR}" || die - - # https://bugs.gentoo.org/654216 - addpredict /dev/dri/ #nowarn - - # We don't use the same clang version as upstream, and with -Werror - # we need to make sure that we don't get superfluous warnings. - append-flags -Wno-unknown-warning-option - if tc-is-cross-compiler; then - export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option" - export BUILD_CFLAGS+=" -Wno-unknown-warning-option" - fi - - # Explicitly disable ICU data file support for system-icu/headless builds. - if use system-icu || use headless; then - myconf_gn+=" icu_use_data_file=false" - fi - - # Don't need nocompile checks and GN crashes with our config - myconf_gn+=" enable_nocompile_tests=false" - - # 131 began laying the groundwork for replacing freetype with - # "Rust-based Fontations set of libraries plus Skia path rendering" - # We now need to opt-in - myconf_gn+=" enable_freetype=true" - - # Enable ozone wayland and/or headless support - myconf_gn+=" use_ozone=true ozone_auto_platforms=false" - myconf_gn+=" ozone_platform_headless=true" - if use headless; then - myconf_gn+=" ozone_platform=\"headless\"" - myconf_gn+=" use_xkbcommon=false use_gtk=false use_qt=false" - myconf_gn+=" use_glib=false use_gio=false" - myconf_gn+=" use_pangocairo=false use_alsa=false" - myconf_gn+=" use_libpci=false use_udev=false" - myconf_gn+=" enable_print_preview=false" - myconf_gn+=" enable_remoting=false" - else - myconf_gn+=" use_system_minigbm=true" - myconf_gn+=" use_xkbcommon=true" - myconf_gn+=" use_qt5=false" - if use qt6; then - myconf_gn+=" use_qt6=true" - local cbuild_libdir=$(get_libdir) - if tc-is-cross-compiler; then - # Hack to workaround get_libdir not being able to handle CBUILD, bug #794181 - local cbuild_libdir=$($(tc-getBUILD_PKG_CONFIG) --keep-system-libs --libs-only-L libxslt) - cbuild_libdir=${cbuild_libdir:2} - cbuild_libdir=${cbuild_libdir/% } - fi - myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\"" - else - myconf_gn+=" use_qt6=false" - fi - myconf_gn+=" ozone_platform_x11=$(usex X true false)" - myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)" - myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")" - use wayland && myconf_gn+=" use_system_libffi=true" - fi - - myconf_gn+=" use_thin_lto=${use_lto}" - myconf_gn+=" thin_lto_enable_optimizations=${use_lto}" - - # Enable official builds - myconf_gn+=" is_official_build=$(usex official true false)" - if use official; then - # Allow building against system libraries in official builds - sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \ - tools/generate_shim_headers/generate_shim_headers.py || die - if use ppc64 || use riscv; then - myconf_gn+=" is_cfi=false" # requires llvm-runtimes/compiler-rt-sanitizers[cfi] - else - myconf_gn+=" is_cfi=${use_lto}" - fi - # Don't add symbols to build - myconf_gn+=" symbol_level=0" - fi - - if use pgo; then - myconf_gn+=" chrome_pgo_phase=${1}" - if [[ "$1" == "2" ]]; then - myconf_gn+=" pgo_data_path=\"${2}\"" - fi - else - # Disable PGO - myconf_gn+=" chrome_pgo_phase=0" - fi - - # skipping typecheck is only supported on amd64, bug #876157 - if ! use amd64; then - myconf_gn+=" devtools_skip_typecheck=false" - fi - - einfo "Configuring Chromium ..." - set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release - echo "$@" - "$@" || die -} - -src_configure() { - chromium_configure $(usex pgo 1 0) -} - -chromium_compile() { - - # Final link uses lots of file descriptors. - ulimit -n 2048 - - # Calling this here supports resumption via FEATURES=keepwork - python_setup - - # Don't inherit PYTHONPATH from environment, bug #789021, #812689 - local -x PYTHONPATH= - - # Build mksnapshot and pax-mark it. - if use pax-kernel; then - local x - for x in mksnapshot v8_context_snapshot_generator; do - if tc-is-cross-compiler; then - eninja -C out/Release "host/${x}" - pax-mark m "out/Release/host/${x}" - else - eninja -C out/Release "${x}" - pax-mark m "out/Release/${x}" - fi - done - fi - - # Even though ninja autodetects number of CPUs, we respect - # user's options, for debugging with -j 1 or any other reason. - eninja -C out/Release chrome chromedriver chrome_sandbox $(use test && echo "base_unittests") - - pax-mark m out/Release/chrome - - # This codepath does minimal patching, so we're at the mercy of upstream - # CFLAGS. This is fine - we're not intending to force this on users - # and we do a lot of flag 'management' anyway. - if use bundled-toolchain; then - QA_FLAGS_IGNORED=" - usr/lib64/chromium-browser/chrome - usr/lib64/chromium-browser/chrome-sandbox - usr/lib64/chromium-browser/chromedriver - usr/lib64/chromium-browser/chrome_crashpad_handler - usr/lib64/chromium-browser/libEGL.so - usr/lib64/chromium-browser/libGLESv2.so - usr/lib64/chromium-browser/libVkICD_mock_icd.so - usr/lib64/chromium-browser/libVkLayer_khronos_validation.so - usr/lib64/chromium-browser/libqt6_shim.so - usr/lib64/chromium-browser/libvk_swiftshader.so - usr/lib64/chromium-browser/libvulkan.so.1 - " - fi -} - -# This function is called from virtx, and must always return so that Xvfb -# session isn't left running. If we return 1, virtx will call die(). -chromium_profile() { - einfo "Profiling for PGO" - - pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1 - - # Remove old profdata in case profiling was interrupted. - rm -rf "${1}" || return 1 - - if ! "${EPYTHON}" ./chromium_profiler.py \ - --chrome-executable "${S}/out/Release/chrome" \ - --chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \ - --add-arg no-sandbox --add-arg disable-dev-shm-usage \ - --profile-output "${1}"; then - eerror "Profiling failed" - return 1 - fi - - popd >/dev/null || return 1 -} - -src_compile() { - if use pgo; then - local profdata - - profdata="${WORKDIR}/chromium.profdata" - - if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then - chromium_compile - virtx chromium_profile "$profdata" - - touch "${WORKDIR}/.pgo-profiled" || die - fi - - if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then - # Remove phase 1 output - rm -r out/Release || die - - chromium_configure 2 "$profdata" - - touch "${WORKDIR}/.pgo-phase-2-configured" || die - fi - - if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then - chromium_compile - touch "${WORKDIR}/.pgo-phase-2-compiled" || die - fi - else - chromium_compile - fi - - mv out/Release/chromedriver{.unstripped,} || die - - rm -f out/Release/locales/*.pak.info || die - - # Build manpage; bug #684550 - sed -e 's|@@PACKAGE@@|chromium-browser|g; - s|@@MENUNAME@@|Chromium|g;' \ - chrome/app/resources/manpage.1.in > \ - out/Release/chromium-browser.1 || die - - # Build desktop file; bug #706786 - sed -e 's|@@MENUNAME@@|Chromium|g; - s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g; - s|@@PACKAGE@@|chromium-browser|g; - s|\(^Exec=\)/usr/bin/|\1|g;' \ - chrome/installer/linux/common/desktop.template > \ - out/Release/chromium-browser-chromium.desktop || die - - # Build vk_swiftshader_icd.json; bug #827861 - sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \ - third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \ - out/Release/vk_swiftshader_icd.json || die -} - -src_test() { - # Initial list of tests to skip pulled from Alpine. Thanks Lauren! - # https://issues.chromium.org/issues/40939315 - local skip_tests=( - 'MessagePumpLibeventTest.NestedNotification*' - ClampTest.Death - OptionalTest.DereferencingNoValueCrashes - PlatformThreadTest.SetCurrentThreadTypeTest - RawPtrTest.TrivialRelocability - SafeNumerics.IntMaxOperations - StackTraceTest.TraceStackFramePointersFromBuffer - StringPieceTest.InvalidLengthDeath - StringPieceTest.OutOfBoundsDeath - ThreadPoolEnvironmentConfig.CanUseBackgroundPriorityForWorker - ValuesUtilTest.FilePath - # Gentoo-specific - AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/0 - AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/1 - AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/2 - AlternateTestParams/PartitionAllocDeathTest.RepeatedAllocReturnNullDirect/3 - AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/0 - AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/1 - AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/2 - AlternateTestParams/PartitionAllocDeathTest.RepeatedReallocReturnNullDirect/3 - CharacterEncodingTest.GetCanonicalEncodingNameByAliasName - CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGFPE - CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGILL - CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGV - CheckExitCodeAfterSignalHandlerDeathTest.CheckSIGSEGVNonCanonicalAddress - FilePathTest.FromUTF8Unsafe_And_AsUTF8Unsafe - FileTest.GetInfoForCreationTime - ICUStringConversionsTest.ConvertToUtf8AndNormalize - NumberFormattingTest.FormatPercent - PathServiceTest.CheckedGetFailure - PlatformThreadTest.CanChangeThreadType - RustLogIntegrationTest.CheckAllSeverity - StackCanary.ChangingStackCanaryCrashesOnReturn - StackTraceDeathTest.StackDumpSignalHandlerIsMallocFree - SysStrings.SysNativeMBAndWide - SysStrings.SysNativeMBToWide - SysStrings.SysWideToNativeMB - TestLauncherTools.TruncateSnippetFocusedMatchesFatalMessagesTest - ToolsSanityTest.BadVirtualCallNull - ToolsSanityTest.BadVirtualCallWrongType - CancelableEventTest.BothCancelFailureAndSucceedOccurUnderContention #new m133: TODO investigate - ) - local test_filter="-$(IFS=:; printf '%s' "${skip_tests[*]}")" - # test-launcher-bot-mode enables parallelism and plain output - ./out/Release/base_unittests --test-launcher-bot-mode \ - --test-launcher-jobs="$(makeopts_jobs)" \ - --gtest_filter="${test_filter}" || die "Tests failed!" -} - -src_install() { - local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser" - exeinto "${CHROMIUM_HOME}" - doexe out/Release/chrome - - newexe out/Release/chrome_sandbox chrome-sandbox - fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox" - - doexe out/Release/chromedriver - doexe out/Release/chrome_crashpad_handler - - ozone_auto_session () { - use X && use wayland && ! use headless && echo true || echo false - } - local sedargs=( -e - "s:/usr/lib/:/usr/$(get_libdir)/:g; - s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g" - ) - sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die - doexe chromium-launcher.sh - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser - # keep the old symlink around for consistency - dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium - - dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver - - # Allow users to override command-line options, bug #357629. - insinto /etc/chromium - newins "${FILESDIR}/chromium.default" "default" - - pushd out/Release/locales > /dev/null || die - chromium_remove_language_paks - popd - - insinto "${CHROMIUM_HOME}" - doins out/Release/*.bin - doins out/Release/*.pak - - if use bindist; then - # We built libffmpeg as a component library, but we can't distribute it - # with proprietary codec support. Remove it and make a symlink to the requested - # system library. - rm -f out/Release/libffmpeg.so \ - || die "Failed to remove bundled libffmpeg.so (with proprietary codecs)" - # symlink the libffmpeg.so from either ffmpeg-chromium or ffmpeg[chromium]. - einfo "Creating symlink to libffmpeg.so from $(usex ffmpeg-chromium ffmpeg-chromium ffmpeg[chromium])..." - dosym ../chromium/libffmpeg.so$(usex ffmpeg-chromium .${PV%%\.*} "") \ - /usr/$(get_libdir)/chromium-browser/libffmpeg.so - fi - - ( - shopt -s nullglob - local files=(out/Release/*.so out/Release/*.so.[0-9]) - [[ ${#files[@]} -gt 0 ]] && doins "${files[@]}" - ) - - # Install bundled xdg-utils, avoids installing X11 libraries with USE="-X wayland" - doins out/Release/xdg-{settings,mime} - - if ! use system-icu && ! use headless; then - doins out/Release/icudtl.dat - fi - - doins -r out/Release/locales - doins -r out/Release/MEIPreload - - # Install vk_swiftshader_icd.json; bug #827861 - doins out/Release/vk_swiftshader_icd.json - - if [[ -d out/Release/swiftshader ]]; then - insinto "${CHROMIUM_HOME}/swiftshader" - doins out/Release/swiftshader/*.so - fi - - # Install icons - local branding size - for size in 16 24 32 48 64 128 256 ; do - case ${size} in - 16|32) branding="chrome/app/theme/default_100_percent/chromium" ;; - *) branding="chrome/app/theme/chromium" ;; - esac - newicon -s ${size} "${branding}/product_logo_${size}.png" \ - chromium-browser.png - done - - # Install desktop entry - domenu out/Release/chromium-browser-chromium.desktop - - # Install GNOME default application entry (bug #303100). - insinto /usr/share/gnome-control-center/default-apps - newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml - - # Install manpage; bug #684550 - doman out/Release/chromium-browser.1 - dosym chromium-browser.1 /usr/share/man/man1/chromium.1 - - readme.gentoo_create_doc -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_desktop_database_update -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_desktop_database_update - readme.gentoo_print_elog - - if ! use headless; then - if use vaapi; then - elog "VA-API is disabled by default at runtime. You have to enable it" - elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS" - elog "in /etc/chromium/default." - fi - if use screencast; then - elog "Screencast is disabled by default at runtime. Either enable it" - elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer" - elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer" - elog "to CHROMIUM_FLAGS in /etc/chromium/default." - fi - if use gtk4; then - elog "Chromium prefers GTK3 over GTK4 at runtime. To override this" - elog "behavior you need to pass --gtk-version=4, e.g. by adding it" - elog "to CHROMIUM_FLAGS in /etc/chromium/default." - fi - fi - - if systemd_is_booted && ! [[ -f "/etc/machine-id" ]]; then - ewarn "The lack of an '/etc/machine-id' file on this system booted with systemd" - ewarn "indicates that the Gentoo handbook was not followed to completion." - ewarn "" - ewarn "Chromium is known to behave unpredictably with this system configuration;" - ewarn "please complete the configuration of this system before logging any bugs." - fi -} diff --git a/www-client/chromium/chromium-135.0.7049.114.ebuild b/www-client/chromium/chromium-136.0.7103.113.ebuild similarity index 97% rename from www-client/chromium/chromium-135.0.7049.114.ebuild rename to www-client/chromium/chromium-136.0.7103.113.ebuild index d13e3ec..b752c9f 100644 --- a/www-client/chromium/chromium-135.0.7049.114.ebuild +++ b/www-client/chromium/chromium-136.0.7103.113.ebuild @@ -15,15 +15,20 @@ EAPI=8 # and need to get a release out quickly (less likely with `dev` in-tree). # Since m133 we are using CI-generated tarballs from -# https://github.com/chromium-linux-tarballs/chromium-tarballs/ as we have -# control over the generation and are able to avoid issues with upstream CI. +# https://github.com/chromium-linux-tarballs/chromium-tarballs/ (uploaded to S3 +# and made available via https://chromium-tarballs.distfiles.gentoo.org/). + +# We do this because upstream tarballs weigh in at about 3.5x the size of our +# new "Distro tarballs" and include binaries (etc) that are not useful for +# downstream consumers (like distributions). GN_MIN_VER=0.2217 # chromium-tools/get-chromium-toolchain-strings.py TEST_FONT=f26f29c9d3bfae588207bbc9762de8d142e58935c62a86f67332819b15203b35 -BUNDLED_CLANG_VER=llvmorg-20-init-17108-g29ed6000-3 -BUNDLED_RUST_VER=ad211ced81509462cdfe4c29ed10f97279a0acae-1 +BUNDLED_CLANG_VER=llvmorg-21-init-5118-g52cd27e6-5 +BUNDLED_RUST_VER=f7b43542838f0a4a6cfdb17fbeadf45002042a77-1 RUST_SHORT_HASH=${BUNDLED_RUST_VER:0:10}-${BUNDLED_RUST_VER##*-} +NODE_VER=22.11.0 VIRTUALX_REQUIRED="pgo" @@ -43,8 +48,8 @@ inherit python-any-r1 readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg DESCRIPTION="Open-source version of Google Chrome web browser" HOMEPAGE="https://www.chromium.org/" -PPC64_HASH="2c25ddd2bbabaef094918fe15eb5de524d16949c" -PATCH_V="${PV%%\.*}" +PPC64_HASH="01dda910156deccddab855e2b6adaea2c751ae45" +PATCH_V="${PV%%\.*}-2" SRC_URI="https://github.com/chromium-linux-tarballs/chromium-tarballs/releases/download/${PV}/chromium-${PV}-linux.tar.xz !bundled-toolchain? ( https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2 @@ -64,13 +69,15 @@ SRC_URI="https://github.com/chromium-linux-tarballs/chromium-tarballs/releases/d ) pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )" -LICENSE="BSD" +# https://gitweb.gentoo.org/proj/chromium-tools.git/tree/get-chromium-licences.py +LICENSE="BSD Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD-2 Base64 Boost-1.0 CC-BY-3.0 CC-BY-4.0 Clear-BSD" +LICENSE+=" FFT2D FTL IJG ISC LGPL-2 LGPL-2.1 libpng libpng2 MIT MPL-1.1 MPL-2.0 Ms-PL openssl PSF-2" +LICENSE+=" SGI-B-2.0 SSLeay SunSoft Unicode-3.0 Unicode-DFS-2015 Unlicense unRAR UoI-NCSA X11-Lucent" SLOT="0/stable" # Dev exists mostly to give devs some breathing room for beta/stable releases; # it shouldn't be keyworded but adventurous users can select it. -# Do _not_ drop stable keywords for amd64 on patch releases. aarch64 still needs to go through the stablereq process. if [[ ${SLOT} != "0/dev" ]]; then - KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" + KEYWORDS="amd64 arm64 ~ppc64 ~riscv" fi IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd" @@ -208,9 +215,9 @@ BDEPEND=" >=dev-build/gn-${GN_MIN_VER} app-alternatives/ninja dev-lang/perl - >=dev-util/gperf-3.0.3 + >=dev-util/gperf-3.2 dev-vcs/git - >=net-libs/nodejs-7.6.0[inspector] + >=net-libs/nodejs-${NODE_VER}:0/${NODE_VER%%.*}[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig @@ -412,7 +419,7 @@ src_prepare() { "${FILESDIR}/chromium-134-bindgen-custom-toolchain.patch" "${FILESDIR}/chromium-135-oauth2-client-switches.patch" "${FILESDIR}/chromium-135-map_droppable-glibc.patch" - "${FILESDIR}/chromium-135-webrtc-pipewire.patch" + "${FILESDIR}/chromium-136-drop-nodejs-ver-check.patch" "${FILESDIR}/chromium-135-gperf.patch" "${FILESDIR}/riscv-swiftshader.patch" "${FILESDIR}/Debian-fix-rust-linking.patch" @@ -422,6 +429,8 @@ src_prepare() { "${FILESDIR}/compiler-rt-riscv.patch" "${FILESDIR}/cpuinfo.patch" "${FILESDIR}/riscv-misc.patch" + "${FILESDIR}/riscv-v8.patch" + "${FILESDIR}/riscv-highway.patch" "${FILESDIR}/chromium-134-type-mismatch-error.patch" "${FILESDIR}/0001-chrome-runtime_api_delegate-add-riscv64-define.patch" "${FILESDIR}/0001-extensions-common-api-runtime.json-riscv64-support.patch" @@ -507,6 +516,16 @@ src_prepare() { default + if [[ ${LLVM_SLOT} == "19" ]]; then + # Upstream now hard depend on a feature that was added in LLVM 20.1, but we don't want to stabilise that yet. + # Do the temp file shuffle in case someone is using something other than `gawk` + { + awk '/config\("clang_warning_suppression"\) \{/ { print $0 " }"; sub(/clang/, "xclang"); print; next } + { print }' build/config/compiler/BUILD.gn > "${T}/build.gn" && \ + mv "${T}/build.gn" build/config/compiler/BUILD.gn + } || die "Unable to disable warning suppression" + fi + # Not included in -lite tarballs, but we should check for it anyway. if [[ -f third_party/node/linux/node-linux-x64/bin/node ]]; then rm third_party/node/linux/node-linux-x64/bin/node || die @@ -515,7 +534,6 @@ src_prepare() { fi ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die - # if this is riscv apply wasm-node fix to get it to compile clean if use riscv ; then pushd third_party/node @@ -627,6 +645,7 @@ src_prepare() { third_party/devtools-frontend/src/front_end/third_party/i18n third_party/devtools-frontend/src/front_end/third_party/intl-messageformat third_party/devtools-frontend/src/front_end/third_party/json5 + third_party/devtools-frontend/src/front_end/third_party/legacy-javascript third_party/devtools-frontend/src/front_end/third_party/lighthouse third_party/devtools-frontend/src/front_end/third_party/lit third_party/devtools-frontend/src/front_end/third_party/marked diff --git a/www-client/chromium/files/chromium-137-openh264-include-path.patch b/www-client/chromium/files/chromium-137-openh264-include-path.patch new file mode 100644 index 0000000..cc3f450 --- /dev/null +++ b/www-client/chromium/files/chromium-137-openh264-include-path.patch @@ -0,0 +1,28 @@ +https://chromium-review.googlesource.com/c/chromium/src/+/6554344 +From: Matt Jolly +Date: Sat, 17 May 2025 09:01:22 +1000 +Subject: [PATCH] make openh264:encoder a public dep + +since M137 (1cc4ddb51296d65544070e42bfea8462e3f16715), the unbundle +path has had consistent build failures in +`third_party/blink/renderer/modules/mediarecorder` due to the +include path for openh264 not being set. + +The include path for openh264 should should come from `media/video` +if proprietary codecs (and openh264) is enabled. a `public_deps` +should handle this. + +Signed-off-by: Matt Jolly +--- a/media/video/BUILD.gn ++++ b/media/video/BUILD.gn +@@ -78,7 +78,7 @@ source_set("video") { + "openh264_video_encoder.cc", + "openh264_video_encoder.h", + ] +- deps += [ "//third_party/openh264:encoder" ] ++ public_deps += [ "//third_party/openh264:encoder" ] + } + + if (is_apple) { +-- +2.49.0 diff --git a/www-client/chromium/files/chromium-137-pdfium-system-libpng.patch b/www-client/chromium/files/chromium-137-pdfium-system-libpng.patch new file mode 100644 index 0000000..eb74073 --- /dev/null +++ b/www-client/chromium/files/chromium-137-pdfium-system-libpng.patch @@ -0,0 +1,28 @@ +https://pdfium-review.googlesource.com/c/pdfium/+/132130 +From: Matt Jolly +Date: Fri, 16 May 2025 14:38:04 +1000 +Subject: [PATCH] Fix build with system libpng + +`cbc692a42241970e1da492d5b14326e81ecb1061` refactored +`fxcodec::CFX_DIBAttribute` and changed the name of its members. + +Unfortunately this change appears to have been typo'd in the +'system libpng' build path, which is not checked by CI, resulting +in downstream build failures in Chromium. + +Signed-off-by: Matt Jolly +--- a/third_party/pdfium/core/fxcodec/png/png_decoder.cpp ++++ b/third_party/pdfium/core/fxcodec/png/png_decoder.cpp +@@ -52,8 +52,8 @@ void _png_load_bmp_attribute(png_structp png_ptr, + CFX_DIBAttribute* pAttribute) { + if (pAttribute) { + #if defined(PNG_pHYs_SUPPORTED) +- pAttribute->xdpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); +- pAttribute->ydpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); ++ pAttribute->x_dpi_ = png_get_x_pixels_per_meter(png_ptr, info_ptr); ++ pAttribute->y_dpi_ = png_get_y_pixels_per_meter(png_ptr, info_ptr); + png_uint_32 res_x, res_y; + int unit_type; + png_get_pHYs(png_ptr, info_ptr, &res_x, &res_y, &unit_type); +-- +2.49.0 diff --git a/www-client/chromium/files/esbuild b/www-client/chromium/files/esbuild index ccbd8bf..4d0cfb9 100755 Binary files a/www-client/chromium/files/esbuild and b/www-client/chromium/files/esbuild differ diff --git a/www-client/chromium/files/riscv-ffmpeg.patch b/www-client/chromium/files/riscv-ffmpeg.patch index 9d74d3e..19a0a23 100644 --- a/www-client/chromium/files/riscv-ffmpeg.patch +++ b/www-client/chromium/files/riscv-ffmpeg.patch @@ -1,6 +1,6 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/CREDITS.chromium b/third_party/ffmpeg/CREDITS.chromium ---- a/third_party/ffmpeg/CREDITS.chromium 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/CREDITS.chromium 2025-04-07 23:00:06.000000000 +0100 +--- a/third_party/ffmpeg/CREDITS.chromium 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/CREDITS.chromium 2025-04-26 12:54:44.000000000 +0100 @@ -131,6 +131,181 @@ ******************************************************************************** @@ -217,7 +217,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/CREDITS.chromium b/third_party/ff libavutil/fixed_dsp.c diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config.h b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config.h --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config.h 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config.h 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,797 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H @@ -227,7 +227,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc +#define CONFIG_THIS_YEAR 2025 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" -+#define CC_IDENT "clang version 21.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7b473dfe84c17319930d4019ab3f6ca0cfc03416)" ++#define CC_IDENT "clang version 21.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 52cd27e60b2421feeee5afa9269c53fb0cb366a7)" +#define OS_NAME linux +#define EXTERN_PREFIX "" +#define EXTERN_ASM @@ -1018,7 +1018,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc +#endif /* FFMPEG_CONFIG_H */ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config_components.h b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config_components.h --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config_components.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config_components.h 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config_components.h 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,2240 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H @@ -3262,13 +3262,13 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc +#endif /* FFMPEG_CONFIG_COMPONENTS_H */ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/bsf_list.c b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/bsf_list.c --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/bsf_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/bsf_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/bsf_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,2 @@ +static const FFBitStreamFilter * const bitstream_filters[] = { + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/codec_list.c b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/codec_list.c --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/codec_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/codec_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/codec_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,17 @@ +static const FFCodec * const codec_list[] = { + &ff_h264_decoder, @@ -3289,7 +3289,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/parser_list.c b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/parser_list.c --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/parser_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/parser_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/parser_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,9 @@ +static const AVCodecParser * const parser_list[] = { + &ff_aac_parser, @@ -3302,7 +3302,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,9 @@ +static const FFInputFormat * const demuxer_list[] = { + &ff_aac_demuxer, @@ -3315,19 +3315,19 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/muxer_list.c b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/muxer_list.c --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/muxer_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/muxer_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/muxer_list.c 2025-04-26 12:55:07.000000000 +0100 @@ -0,0 +1,2 @@ +static const FFOutputFormat * const muxer_list[] = { + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/protocol_list.c b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/protocol_list.c --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/protocol_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/protocol_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/protocol_list.c 2025-04-26 12:55:07.000000000 +0100 @@ -0,0 +1,2 @@ +static const URLProtocol * const url_protocols[] = { + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/avconfig.h b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/avconfig.h --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/avconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/avconfig.h 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/avconfig.h 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,6 @@ +/* Generated by ffmpeg configure */ +#ifndef AVUTIL_AVCONFIG_H @@ -3337,16 +3337,16 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc +#endif /* AVUTIL_AVCONFIG_H */ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.h --- a/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.h 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.h 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,5 @@ +/* Automatically generated by version.sh, do not manually edit! */ +#ifndef AVUTIL_FFVERSION_H +#define AVUTIL_FFVERSION_H -+#define FFMPEG_VERSION "git-2025-02-14-fbce2a7" ++#define FFMPEG_VERSION "git-2025-02-14-fbce2a76c0" +#endif /* AVUTIL_FFVERSION_H */ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config.h b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config.h --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config.h 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config.h 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,797 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_H @@ -3356,7 +3356,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri +#define CONFIG_THIS_YEAR 2025 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" -+#define CC_IDENT "clang version 21.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7b473dfe84c17319930d4019ab3f6ca0cfc03416)" ++#define CC_IDENT "clang version 21.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 52cd27e60b2421feeee5afa9269c53fb0cb366a7)" +#define OS_NAME linux +#define EXTERN_PREFIX "" +#define EXTERN_ASM @@ -4147,7 +4147,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri +#endif /* FFMPEG_CONFIG_H */ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config_components.h b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config_components.h --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config_components.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config_components.h 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config_components.h 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,2240 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H @@ -6391,13 +6391,13 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri +#endif /* FFMPEG_CONFIG_COMPONENTS_H */ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/bsf_list.c b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/bsf_list.c --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/bsf_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/bsf_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/bsf_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,2 @@ +static const FFBitStreamFilter * const bitstream_filters[] = { + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/codec_list.c b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/codec_list.c --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/codec_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/codec_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/codec_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,15 @@ +static const FFCodec * const codec_list[] = { + &ff_flac_decoder, @@ -6416,7 +6416,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/parser_list.c b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/parser_list.c --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/parser_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/parser_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/parser_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,7 @@ +static const AVCodecParser * const parser_list[] = { + &ff_flac_parser, @@ -6427,7 +6427,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,8 @@ +static const FFInputFormat * const demuxer_list[] = { + &ff_flac_demuxer, @@ -6439,19 +6439,19 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/muxer_list.c b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/muxer_list.c --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/muxer_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/muxer_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/muxer_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,2 @@ +static const FFOutputFormat * const muxer_list[] = { + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/protocol_list.c b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/protocol_list.c --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/protocol_list.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/protocol_list.c 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/protocol_list.c 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,2 @@ +static const URLProtocol * const url_protocols[] = { + NULL }; diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/avconfig.h b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/avconfig.h --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/avconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/avconfig.h 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/avconfig.h 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,6 @@ +/* Generated by ffmpeg configure */ +#ifndef AVUTIL_AVCONFIG_H @@ -6461,16 +6461,16 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri +#endif /* AVUTIL_AVCONFIG_H */ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h --- a/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h 2025-04-07 23:00:27.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h 2025-04-26 12:55:06.000000000 +0100 @@ -0,0 +1,5 @@ +/* Automatically generated by version.sh, do not manually edit! */ +#ifndef AVUTIL_FFVERSION_H +#define AVUTIL_FFVERSION_H -+#define FFMPEG_VERSION "git-2025-02-14-fbce2a7" ++#define FFMPEG_VERSION "git-2025-02-14-fbce2a76c0" +#endif /* AVUTIL_FFVERSION_H */ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/scripts/copy_config.sh b/third_party/ffmpeg/chromium/scripts/copy_config.sh ---- a/third_party/ffmpeg/chromium/scripts/copy_config.sh 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/chromium/scripts/copy_config.sh 2025-04-07 22:58:16.000000000 +0100 +--- a/third_party/ffmpeg/chromium/scripts/copy_config.sh 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/chromium/scripts/copy_config.sh 2025-04-26 12:52:05.000000000 +0100 @@ -10,7 +10,7 @@ # Copy config files for various architectures: # - ia32/x64 have config.asm, config.h @@ -6481,8 +6481,8 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/scripts/copy_config.sh b [ ! -e "build.$arch.$os/$target/config.h" ] && continue for f in config.h config_components.h config.asm libavutil/avconfig.h libavutil/ffversion.h libavcodec/bsf_list.c libavcodec/codec_list.c libavcodec/parser_list.c libavformat/demuxer_list.c libavformat/muxer_list.c libavformat/protocol_list.c; do diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_party/ffmpeg/ffmpeg_generated.gni ---- a/third_party/ffmpeg/ffmpeg_generated.gni 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/ffmpeg_generated.gni 2025-04-07 23:00:06.000000000 +0100 +--- a/third_party/ffmpeg/ffmpeg_generated.gni 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/ffmpeg_generated.gni 2025-04-26 12:54:45.000000000 +0100 @@ -14,19 +14,13 @@ use_linux_config = is_linux || is_chromeos || is_fuchsia @@ -6890,85 +6890,85 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part - ffmpeg_c_sources += [ "compat/strtod.c" ] -} diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/autorename_libavcodec_parser.c b/third_party/ffmpeg/libavcodec/autorename_libavcodec_parser.c ---- a/third_party/ffmpeg/libavcodec/autorename_libavcodec_parser.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_parser.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavcodec/autorename_libavcodec_parser.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_parser.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "parser.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/autorename_libavcodec_videodsp.c b/third_party/ffmpeg/libavcodec/autorename_libavcodec_videodsp.c ---- a/third_party/ffmpeg/libavcodec/autorename_libavcodec_videodsp.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_videodsp.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavcodec/autorename_libavcodec_videodsp.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_videodsp.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "videodsp.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c b/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c ---- a/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "aacdec.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c b/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c ---- a/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "flacdec.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavformat/autorename_libavformat_options.c b/third_party/ffmpeg/libavformat/autorename_libavformat_options.c ---- a/third_party/ffmpeg/libavformat/autorename_libavformat_options.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_options.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavformat/autorename_libavformat_options.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_options.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "options.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c b/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c ---- a/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "pcm.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c b/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c ---- a/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "utils.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavformat/autorename_libavformat_version.c b/third_party/ffmpeg/libavformat/autorename_libavformat_version.c ---- a/third_party/ffmpeg/libavformat/autorename_libavformat_version.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_version.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavformat/autorename_libavformat_version.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_version.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "version.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/autorename_libavutil_executor.c b/third_party/ffmpeg/libavutil/autorename_libavutil_executor.c ---- a/third_party/ffmpeg/libavutil/autorename_libavutil_executor.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavutil/autorename_libavutil_executor.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavutil/autorename_libavutil_executor.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_executor.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "executor.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c b/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c ---- a/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "utils.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/autorename_libavutil_version.c b/third_party/ffmpeg/libavutil/autorename_libavutil_version.c ---- a/third_party/ffmpeg/libavutil/autorename_libavutil_version.c 2025-03-31 16:23:48.000000000 +0100 -+++ b/third_party/ffmpeg/libavutil/autorename_libavutil_version.c 2025-04-07 23:00:02.000000000 +0100 +--- a/third_party/ffmpeg/libavutil/autorename_libavutil_version.c 2025-04-28 00:35:54.000000000 +0100 ++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_version.c 2025-04-26 12:54:40.000000000 +0100 @@ -1,2 +1,2 @@ -// Automatically generated on Mon Jan 13 23:55:35 2025. See crbug.com/495833. -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. #include "version.c" diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/riscv/autorename_libavutil_riscv_cpu.c b/third_party/ffmpeg/libavutil/riscv/autorename_libavutil_riscv_cpu.c --- a/third_party/ffmpeg/libavutil/riscv/autorename_libavutil_riscv_cpu.c 1970-01-01 01:00:00.000000000 +0100 -+++ b/third_party/ffmpeg/libavutil/riscv/autorename_libavutil_riscv_cpu.c 2025-04-07 23:00:02.000000000 +0100 ++++ b/third_party/ffmpeg/libavutil/riscv/autorename_libavutil_riscv_cpu.c 2025-04-26 12:54:40.000000000 +0100 @@ -0,0 +1,2 @@ -+// Automatically generated on Mon Apr 7 23:00:01 2025. See crbug.com/495833. ++// Automatically generated on Sat Apr 26 12:54:40 2025. See crbug.com/495833. +#include "cpu.c" diff --git a/www-client/chromium/files/riscv-highway.patch b/www-client/chromium/files/riscv-highway.patch new file mode 100644 index 0000000..65f5a2b --- /dev/null +++ b/www-client/chromium/files/riscv-highway.patch @@ -0,0 +1,15 @@ +Index: chromium-136.0.7103.92/third_party/highway/BUILD.gn +=================================================================== +--- chromium-136.0.7103.92.orig/third_party/highway/BUILD.gn ++++ chromium-136.0.7103.92/third_party/highway/BUILD.gn +@@ -21,6 +21,9 @@ config("libhwy_external_config") { + # for absl::uint128 is 16. + defines += [ "HWY_BROKEN_TARGETS=HWY_ALL_SVE" ] + } ++ if (target_cpu == "riscv64") { ++ defines += [ "HWY_BROKEN_TARGETS=HWY_RVV" ] ++ } + } + + source_set("libhwy") { + diff --git a/www-client/chromium/files/riscv-v8.patch b/www-client/chromium/files/riscv-v8.patch index a137aac..89f06ee 100644 --- a/www-client/chromium/files/riscv-v8.patch +++ b/www-client/chromium/files/riscv-v8.patch @@ -1,821 +1,87 @@ -From 4d24761fae4b1de87a1ba7a507e98be157a64bf4 Mon Sep 17 00:00:00 2001 -From: Alexey Pavlyutkin -Date: Thu, 13 Feb 2025 11:40:23 +0000 -Subject: [PATCH] [riscv][leaptiering] Enable leaptiering support - -Fix RISC-V build broken by unconditional enabling of leaptiering (see -6207491). - -Change-Id: I72db70b09b98410ae83d40b3251495b8bcbda207 -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/6249680 -Reviewed-by: Yahan Lu (LuYahan) -Reviewed-by: Ji Qiu -Commit-Queue: Ji Qiu -Cr-Commit-Position: refs/heads/main@{#98693} ---- - src/builtins/riscv/builtins-riscv.cc | 27 +- - src/codegen/riscv/macro-assembler-riscv.cc | 321 +++++++++++------- - src/codegen/riscv/macro-assembler-riscv.h | 48 ++- - src/codegen/riscv/register-riscv.h | 3 +- - .../backend/riscv/code-generator-riscv.cc | 41 ++- - src/maglev/riscv/maglev-assembler-riscv.cc | 3 + - 6 files changed, 286 insertions(+), 157 deletions(-) - -Index: chromium-134.0.6998.35/v8/src/builtins/riscv/builtins-riscv.cc +ndex: chromium-136.0.7103.92/v8/gni/v8.gni =================================================================== ---- chromium-134.0.6998.35.orig/v8/src/builtins/riscv/builtins-riscv.cc -+++ chromium-134.0.6998.35/v8/src/builtins/riscv/builtins-riscv.cc -@@ -996,6 +996,7 @@ void Builtins::Generate_BaselineOutOfLin - } - - void Builtins::Generate_BaselineOutOfLinePrologue(MacroAssembler* masm) { -+ ASM_CODE_COMMENT(masm); - UseScratchRegisterScope temps(masm); - temps.Include({kScratchReg, kScratchReg2, s1}); - auto descriptor = -@@ -1016,11 +1017,14 @@ void Builtins::Generate_BaselineOutOfLin - __ AssertFeedbackVector(feedback_vector, type); - } - -+#ifndef V8_ENABLE_LEAPTIERING - // Check for an tiering state. - Label flags_need_processing; - Register flags = temps.Acquire(); - __ LoadFeedbackVectorFlagsAndJumpIfNeedsProcessing( - flags, feedback_vector, CodeKind::BASELINE, &flags_need_processing); -+#endif -+ - { - UseScratchRegisterScope temps(masm); - ResetFeedbackVectorOsrUrgency(masm, feedback_vector, temps.Acquire()); -@@ -1096,6 +1100,7 @@ void Builtins::Generate_BaselineOutOfLin - // TODO(v8:11429): Document this frame setup better. - __ Ret(); - -+#ifndef V8_ENABLE_LEAPTIERING - __ bind(&flags_need_processing); - { - ASM_CODE_COMMENT_STRING(masm, "Optimized marker check"); -@@ -1104,6 +1109,7 @@ void Builtins::Generate_BaselineOutOfLin - __ OptimizeCodeOrTailCallOptimizedCodeSlot(flags, feedback_vector); - __ Trap(); - } -+#endif - - __ bind(&call_stack_guard); - { -@@ -1157,15 +1163,16 @@ void Builtins::Generate_InterpreterEntry - __ LoadFeedbackVector(feedback_vector, closure, a4, &push_stack_frame); - - #ifndef V8_JITLESS -+#ifndef V8_ENABLE_LEAPTIERING - // If feedback vector is valid, check for optimized code and update invocation - // count. -- - // Check the tiering state. - Label flags_need_processing; - Register flags = a4; - __ LoadFeedbackVectorFlagsAndJumpIfNeedsProcessing( - flags, feedback_vector, CodeKind::INTERPRETED_FUNCTION, - &flags_need_processing); -+#endif // V8_ENABLE_LEAPTIERING - ResetFeedbackVectorOsrUrgency(masm, feedback_vector, a4); - - // Increment invocation count for the function. -@@ -1323,10 +1330,13 @@ void Builtins::Generate_InterpreterEntry - __ Branch(&after_stack_check_interrupt); - - #ifndef V8_JITLESS -+#ifndef V8_ENABLE_LEAPTIERING - __ bind(&flags_need_processing); - __ OptimizeCodeOrTailCallOptimizedCodeSlot(flags, feedback_vector); -+#endif //! V8_ENABLE_LEAPTIERING - __ bind(&is_baseline); - { -+#ifndef V8_ENABLE_LEAPTIERING - // Load the feedback vector from the closure. - __ LoadTaggedField( - feedback_vector, -@@ -1347,7 +1357,6 @@ void Builtins::Generate_InterpreterEntry - __ LoadFeedbackVectorFlagsAndJumpIfNeedsProcessing( - flags, feedback_vector, CodeKind::BASELINE, &flags_need_processing); - --#ifndef V8_ENABLE_LEAPTIERING - // TODO(olivf, 42204201): This fastcase is difficult to support with the - // sandbox as it requires getting write access to the dispatch table. See - // `JSFunction::UpdateCode`. We might want to remove it for all -@@ -1357,9 +1366,9 @@ void Builtins::Generate_InterpreterEntry - static_assert(kJavaScriptCallCodeStartRegister == a2, "ABI mismatch"); - __ ReplaceClosureCodeWithOptimizedCode(a2, closure); - __ JumpCodeObject(a2, kJSEntrypointTag); --#endif // V8_ENABLE_LEAPTIERING -- - __ bind(&install_baseline_code); -+#endif // !V8_ENABLE_LEAPTIERING -+ - __ GenerateTailCallToReturnedCode(Runtime::kInstallBaselineCode); - } - #endif // !V8_JITLESS -@@ -2630,9 +2639,13 @@ void Builtins::Generate_CallFunction(Mac - // -- cp : the function context. - // ----------------------------------- - -+#ifdef V8_ENABLE_LEAPTIERING -+ __ InvokeFunctionCode(a1, no_reg, a0, InvokeType::kJump); -+#else - __ Lhu(a2, - FieldMemOperand(a2, SharedFunctionInfo::kFormalParameterCountOffset)); - __ InvokeFunctionCode(a1, no_reg, a2, a0, InvokeType::kJump); -+#endif - } - - namespace { -@@ -5084,9 +5097,13 @@ void Builtins::Generate_RestartFrameTram - // Pop return address and frame. - __ LeaveFrame(StackFrame::INTERPRETED); - -+#ifdef V8_ENABLE_LEAPTIERING -+ __ InvokeFunction(a1, a0, InvokeType::kJump, -+ ArgumentAdaptionMode::kDontAdapt); -+#else - __ li(a2, Operand(kDontAdaptArgumentsSentinel)); -- - __ InvokeFunction(a1, a2, a0, InvokeType::kJump); -+#endif - } - - #undef __ -Index: chromium-134.0.6998.35/v8/src/codegen/riscv/macro-assembler-riscv.cc +--- chromium-136.0.7103.92.orig/v8/gni/v8.gni ++++ chromium-136.0.7103.92/v8/gni/v8.gni +@@ -233,7 +233,7 @@ assert(!(v8_enable_webassembly && v8_ena + if (v8_enable_pointer_compression == "") { + v8_enable_pointer_compression = + v8_current_cpu == "arm64" || v8_current_cpu == "x64" || +- v8_current_cpu == "loong64" ++ v8_current_cpu == "loong64" || v8_current_cpu == "riscv64" + } + + # The Wasm interpreter is currently supported only on arm64 and x64, on +Index: chromium-136.0.7103.92/v8/src/codegen/riscv/assembler-riscv-inl.h =================================================================== ---- chromium-134.0.6998.35.orig/v8/src/codegen/riscv/macro-assembler-riscv.cc -+++ chromium-134.0.6998.35/v8/src/codegen/riscv/macro-assembler-riscv.cc -@@ -209,24 +209,7 @@ void MacroAssembler::GenerateTailCallToR - Jump(a2); - } - --Condition MacroAssembler::LoadFeedbackVectorFlagsAndCheckIfNeedsProcessing( -- Register flags, Register feedback_vector, Register result, -- CodeKind current_code_kind) { -- ASM_CODE_COMMENT(this); -- DCHECK(!AreAliased(flags, feedback_vector)); -- DCHECK(CodeKindCanTierUp(current_code_kind)); -- -- Lhu(flags, FieldMemOperand(feedback_vector, FeedbackVector::kFlagsOffset)); -- uint32_t kFlagsMask = FeedbackVector::kFlagsTieringStateIsAnyRequested | -- FeedbackVector::kFlagsMaybeHasTurbofanCode | -- FeedbackVector::kFlagsLogNextExecution; -- if (current_code_kind != CodeKind::MAGLEV) { -- kFlagsMask |= FeedbackVector::kFlagsMaybeHasMaglevCode; -- } -- And(result, flags, Operand(kFlagsMask)); -- return ne; --} -- -+#ifndef V8_ENABLE_LEAPTIERING - // Read off the flags in the feedback vector and check if there - // is optimized code or a tiering state that needs to be processed. - void MacroAssembler::LoadFeedbackVectorFlagsAndJumpIfNeedsProcessing( -@@ -248,22 +231,6 @@ void MacroAssembler::OptimizeCodeOrTailC - Register flags, Register feedback_vector) { - ASM_CODE_COMMENT(this); - DCHECK(!AreAliased(flags, feedback_vector)); --#ifdef V8_ENABLE_LEAPTIERING -- // In the leaptiering case, we don't load optimized code from the feedback -- // vector so only need to call CompileOptimized or FunctionLogNextExecution -- // here. See also LoadFeedbackVectorFlagsAndJumpIfNeedsProcessing above. -- Label needs_logging; -- { -- UseScratchRegisterScope temps(this); -- Register scratch = temps.Acquire(); -- And(scratch, flags, -- Operand(FeedbackVector::kFlagsTieringStateIsAnyRequested)); -- Branch(&needs_logging, eq, scratch, Operand(zero_reg)); -- } -- GenerateTailCallToReturnedCode(Runtime::kCompileOptimized); -- bind(&needs_logging); -- GenerateTailCallToReturnedCode(Runtime::kFunctionLogNextExecution); --#else - UseScratchRegisterScope temps(this); - temps.Include(t0, t1); - Label maybe_has_optimized_code, maybe_needs_logging; -@@ -296,8 +263,8 @@ void MacroAssembler::OptimizeCodeOrTailC - FeedbackVector::kMaybeOptimizedCodeOffset)); - TailCallOptimizedCodeSlot(this, optimized_code_entry, temps.Acquire(), - temps.Acquire()); --#endif // V8_ENABLE_LEAPTIERING - } -+#endif // V8_ENABLE_LEAPTIERING - - void MacroAssembler::LoadIsolateField(const Register& rd, IsolateFieldId id) { - li(rd, ExternalReference::Create(id)); -@@ -5630,7 +5597,7 @@ void MacroAssembler::StackOverflowCheck( - - void MacroAssembler::InvokePrologue(Register expected_parameter_count, - Register actual_parameter_count, -- Label* done, InvokeType type) { -+ InvokeType type) { - Label regular_invoke; - - // a0: actual arguments count -@@ -5649,8 +5616,7 @@ void MacroAssembler::InvokePrologue(Regi - Label stack_overflow; - { - UseScratchRegisterScope temps(this); -- StackOverflowCheck(expected_parameter_count, temps.Acquire(), -- temps.Acquire(), &stack_overflow); -+ StackOverflowCheck(expected_parameter_count, t0, t1, &stack_overflow); +--- chromium-136.0.7103.92.orig/v8/src/codegen/riscv/assembler-riscv-inl.h ++++ chromium-136.0.7103.92/v8/src/codegen/riscv/assembler-riscv-inl.h +@@ -115,8 +115,9 @@ void Assembler::set_target_compressed_ad + Address pc, Address constant_pool, Tagged_t target, + WritableJitAllocation* jit_allocation, ICacheFlushMode icache_flush_mode) { + if (COMPRESS_POINTERS_BOOL) { +- Assembler::set_uint32_constant_at(pc, constant_pool, target, jit_allocation, +- icache_flush_mode); ++ Assembler::set_uint32_constant_at(pc, constant_pool, ++ static_cast(target), ++ jit_allocation, icache_flush_mode); + } else { + UNREACHABLE(); } - // Underapplication. Move the arguments already in the stack, including the - // receiver and the return address. -@@ -5694,90 +5660,150 @@ void MacroAssembler::InvokePrologue(Regi - bind(®ular_invoke); - } - --void MacroAssembler::CheckDebugHook(Register fun, Register new_target, -- Register expected_parameter_count, -- Register actual_parameter_count) { -- Label skip_hook; -- { -- UseScratchRegisterScope temps(this); -- Register scratch = temps.Acquire(); -- li(scratch, -- ExternalReference::debug_hook_on_function_call_address(isolate())); -- Lb(scratch, MemOperand(scratch)); -- Branch(&skip_hook, eq, scratch, Operand(zero_reg)); -- } -- { -- // Load receiver to pass it later to DebugOnFunctionCall hook. -- UseScratchRegisterScope temps(this); -- Register receiver = temps.Acquire(); -- LoadReceiver(receiver); -+void MacroAssembler::CallDebugOnFunctionCall( -+ Register fun, Register new_target, -+ Register expected_parameter_count_or_dispatch_handle, -+ Register actual_parameter_count) { -+ ASM_CODE_COMMENT(this); -+ DCHECK(!AreAliased(t0, fun, new_target, -+ expected_parameter_count_or_dispatch_handle, -+ actual_parameter_count)); -+ -+ // Load receiver to pass it later to DebugOnFunctionCall hook. -+ LoadReceiver(t0); -+ FrameScope frame( -+ this, has_frame() ? StackFrame::NO_FRAME_TYPE : StackFrame::INTERNAL); -+ -+ SmiTag(expected_parameter_count_or_dispatch_handle); -+ SmiTag(actual_parameter_count); -+ Push(expected_parameter_count_or_dispatch_handle, actual_parameter_count); -+ -+ if (new_target.is_valid()) { -+ Push(new_target); -+ } -+ Push(fun, fun, t0); -+ CallRuntime(Runtime::kDebugOnFunctionCall); -+ Pop(fun); -+ if (new_target.is_valid()) { -+ Pop(new_target); -+ } -+ -+ Pop(expected_parameter_count_or_dispatch_handle, actual_parameter_count); -+ SmiUntag(actual_parameter_count); -+ SmiUntag(expected_parameter_count_or_dispatch_handle); -+} - -- FrameScope frame( -- this, has_frame() ? StackFrame::NO_FRAME_TYPE : StackFrame::INTERNAL); -- SmiTag(expected_parameter_count); -- Push(expected_parameter_count); -+#ifdef V8_ENABLE_LEAPTIERING -+void MacroAssembler::InvokeFunction( -+ Register function, Register actual_parameter_count, InvokeType type, -+ ArgumentAdaptionMode argument_adaption_mode) { -+ ASM_CODE_COMMENT(this); -+ // You can't call a function without a valid frame. -+ DCHECK(type == InvokeType::kJump || has_frame()); - -- SmiTag(actual_parameter_count); -- Push(actual_parameter_count); -+ // Contract with called JS functions requires that function is passed in a1. -+ // (See FullCodeGenerator::Generate().) -+ DCHECK_EQ(function, a1); - -- if (new_target.is_valid()) { -- Push(new_target); -- } -- Push(fun); -- Push(fun); -- Push(receiver); -- CallRuntime(Runtime::kDebugOnFunctionCall); -- Pop(fun); -- if (new_target.is_valid()) { -- Pop(new_target); -- } -+ // Set up the context. -+ LoadTaggedField(cp, FieldMemOperand(function, JSFunction::kContextOffset)); - -- Pop(actual_parameter_count); -- SmiUntag(actual_parameter_count); -+ InvokeFunctionCode(function, no_reg, actual_parameter_count, type, -+ argument_adaption_mode); -+} - -- Pop(expected_parameter_count); -- SmiUntag(expected_parameter_count); -- } -- bind(&skip_hook); -+void MacroAssembler::InvokeFunctionWithNewTarget( -+ Register function, Register new_target, Register actual_parameter_count, -+ InvokeType type) { -+ ASM_CODE_COMMENT(this); -+ // You can't call a function without a valid frame. -+ DCHECK(type == InvokeType::kJump || has_frame()); -+ -+ // Contract with called JS functions requires that function is passed in a1. -+ // (See FullCodeGenerator::Generate().) -+ DCHECK_EQ(function, a1); -+ -+ LoadTaggedField(cp, FieldMemOperand(function, JSFunction::kContextOffset)); -+ -+ InvokeFunctionCode(function, new_target, actual_parameter_count, type); - } - --void MacroAssembler::InvokeFunctionCode(Register function, Register new_target, -- Register expected_parameter_count, -- Register actual_parameter_count, -- InvokeType type) { -+void MacroAssembler::InvokeFunctionCode( -+ Register function, Register new_target, Register actual_parameter_count, -+ InvokeType type, ArgumentAdaptionMode argument_adaption_mode) { -+ ASM_CODE_COMMENT(this); - // You can't call a function without a valid frame. - DCHECK_IMPLIES(type == InvokeType::kCall, has_frame()); - DCHECK_EQ(function, a1); - DCHECK_IMPLIES(new_target.is_valid(), new_target == a3); - -+ Register dispatch_handle = kJavaScriptCallDispatchHandleRegister; -+ Lw(dispatch_handle, -+ FieldMemOperand(function, JSFunction::kDispatchHandleOffset)); -+ - // On function call, call into the debugger if necessary. -- CheckDebugHook(function, new_target, expected_parameter_count, -- actual_parameter_count); -+ Label debug_hook, continue_after_hook; -+ { -+ li(t0, ExternalReference::debug_hook_on_function_call_address(isolate())); -+ Lb(t0, MemOperand(t0, 0)); -+ BranchShort(&debug_hook, ne, t0, Operand(zero_reg)); -+ } -+ bind(&continue_after_hook); - - // Clear the new.target register if not given. - if (!new_target.is_valid()) { - LoadRoot(a3, RootIndex::kUndefinedValue); - } - -- Label done; -- InvokePrologue(expected_parameter_count, actual_parameter_count, &done, type); -+ Register scratch = s1; -+ if (argument_adaption_mode == ArgumentAdaptionMode::kAdapt) { -+ Register expected_parameter_count = a2; -+ LoadParameterCountFromJSDispatchTable(expected_parameter_count, -+ dispatch_handle, scratch); -+ InvokePrologue(expected_parameter_count, actual_parameter_count, type); -+ } -+ - // We call indirectly through the code field in the function to - // allow recompilation to take effect without changing any of the - // call sites. -- constexpr int unused_argument_count = 0; -+ LoadEntrypointFromJSDispatchTable(kJavaScriptCallCodeStartRegister, -+ dispatch_handle, scratch); - switch (type) { - case InvokeType::kCall: -- CallJSFunction(function, unused_argument_count); -+ Call(kJavaScriptCallCodeStartRegister); - break; - case InvokeType::kJump: -- JumpJSFunction(function); -+ Jump(kJavaScriptCallCodeStartRegister); - break; - } -+ Label done; -+ Branch(&done); -+ -+ // Deferred debug hook. -+ bind(&debug_hook); -+ CallDebugOnFunctionCall(function, new_target, dispatch_handle, -+ actual_parameter_count); -+ Branch(&continue_after_hook); - -- // Continue here if InvokePrologue does handle the invocation due to -- // mismatched parameter counts. - bind(&done); - } -+#else // !V8_ENABLE_LEAPTIERING -+void MacroAssembler::InvokeFunction(Register function, -+ Register expected_parameter_count, -+ Register actual_parameter_count, -+ InvokeType type) { -+ // You can't call a function without a valid frame. -+ DCHECK_IMPLIES(type == InvokeType::kCall, has_frame()); -+ -+ // Contract with called JS functions requires that function is passed in a1. -+ DCHECK_EQ(function, a1); -+ -+ // Get the function and setup the context. -+ LoadTaggedField(cp, FieldMemOperand(a1, JSFunction::kContextOffset)); -+ -+ InvokeFunctionCode(a1, no_reg, expected_parameter_count, -+ actual_parameter_count, type); -+} - - void MacroAssembler::InvokeFunctionWithNewTarget( - Register function, Register new_target, Register actual_parameter_count, -@@ -5804,23 +5830,44 @@ void MacroAssembler::InvokeFunctionWithN - actual_parameter_count, type); - } - --void MacroAssembler::InvokeFunction(Register function, -- Register expected_parameter_count, -- Register actual_parameter_count, -- InvokeType type) { -+void MacroAssembler::InvokeFunctionCode(Register function, Register new_target, -+ Register expected_parameter_count, -+ Register actual_parameter_count, -+ InvokeType type) { - // You can't call a function without a valid frame. - DCHECK_IMPLIES(type == InvokeType::kCall, has_frame()); -- -- // Contract with called JS functions requires that function is passed in a1. - DCHECK_EQ(function, a1); -+ DCHECK_IMPLIES(new_target.is_valid(), new_target == a3); - -- // Get the function and setup the context. -- LoadTaggedField(cp, FieldMemOperand(a1, JSFunction::kContextOffset)); -+ // On function call, call into the debugger if necessary. -+ CheckDebugHook(function, new_target, expected_parameter_count, -+ actual_parameter_count); - -- InvokeFunctionCode(a1, no_reg, expected_parameter_count, -- actual_parameter_count, type); --} -+ // Clear the new.target register if not given. -+ if (!new_target.is_valid()) { -+ LoadRoot(a3, RootIndex::kUndefinedValue); -+ } - -+ Label done; -+ InvokePrologue(expected_parameter_count, actual_parameter_count, &done, type); -+ // We call indirectly through the code field in the function to -+ // allow recompilation to take effect without changing any of the -+ // call sites. -+ constexpr int unused_argument_count = 0; -+ switch (type) { -+ case InvokeType::kCall: -+ CallJSFunction(function, unused_argument_count); -+ break; -+ case InvokeType::kJump: -+ JumpJSFunction(function); -+ break; -+ } -+ -+ // Continue here if InvokePrologue does handle the invocation due to -+ // mismatched parameter counts. -+ bind(&done); -+} -+#endif // V8_ENABLE_LEAPTIERING - // --------------------------------------------------------------------------- - // Support functions. - -@@ -7240,14 +7287,30 @@ void MacroAssembler::ComputeCodeStartAdd - // 2. test kMarkedForDeoptimizationBit in those flags; and - // 3. if it is not zero then it jumps to the builtin. - void MacroAssembler::BailoutIfDeoptimized() { -- int offset = InstructionStream::kCodeOffset - InstructionStream::kHeaderSize; -- LoadProtectedPointerField( -- kScratchReg, MemOperand(kJavaScriptCallCodeStartRegister, offset)); -- Lw(kScratchReg, FieldMemOperand(kScratchReg, Code::kFlagsOffset)); -- And(kScratchReg, kScratchReg, -- Operand(1 << Code::kMarkedForDeoptimizationBit)); -- TailCallBuiltin(Builtin::kCompileLazyDeoptimizedCode, ne, kScratchReg, -+ ASM_CODE_COMMENT(this); -+ UseScratchRegisterScope temps(this); -+ Register scratch = temps.Acquire(); -+ if (v8_flags.debug_code || !V8_ENABLE_LEAPTIERING_BOOL) { -+ int offset = -+ InstructionStream::kCodeOffset - InstructionStream::kHeaderSize; -+ LoadProtectedPointerField( -+ scratch, MemOperand(kJavaScriptCallCodeStartRegister, offset)); -+ Lw(scratch, FieldMemOperand(scratch, Code::kFlagsOffset)); -+ } -+ -+#ifdef V8_ENABLE_LEAPTIERING -+ if (v8_flags.debug_code) { -+ Label not_deoptimized; -+ And(scratch, scratch, Operand(1 << Code::kMarkedForDeoptimizationBit)); -+ Branch(¬_deoptimized, eq, scratch, Operand(zero_reg)); -+ Abort(AbortReason::kInvalidDeoptimizedCode); -+ bind(¬_deoptimized); -+ } -+#else -+ And(scratch, scratch, Operand(1 << Code::kMarkedForDeoptimizationBit)); -+ TailCallBuiltin(Builtin::kCompileLazyDeoptimizedCode, ne, scratch, - Operand(zero_reg)); -+#endif - } - - void MacroAssembler::CallForDeoptimization(Builtin target, int, Label* exit, -@@ -7303,22 +7366,20 @@ void MacroAssembler::JumpCodeObject(Regi - } - - void MacroAssembler::CallJSFunction(Register function_object, -- uint16_t argument_count) { -- DCHECK_WITH_MSG(!V8_ENABLE_LEAPTIERING_BOOL, -- "argument_count is only used with Leaptiering"); -+ [[maybe_unused]] uint16_t argument_count) { - ASM_CODE_COMMENT(this); - Register code = kJavaScriptCallCodeStartRegister; - #ifdef V8_ENABLE_LEAPTIERING -- UseScratchRegisterScope temps(this); -- Register dispatch_handle = t0; -+ Register dispatch_handle = kJavaScriptCallDispatchHandleRegister; - Register parameter_count = t1; -+ UseScratchRegisterScope temps(this); - Register scratch = temps.Acquire(); - Lw(dispatch_handle, - FieldMemOperand(function_object, JSFunction::kDispatchHandleOffset)); - LoadEntrypointAndParameterCountFromJSDispatchTable(code, parameter_count, - dispatch_handle, scratch); - Label match; -- Branch(&match, le, parameter_count, Immediate(argument_count)); -+ Branch(&match, le, parameter_count, Operand(argument_count)); - // If the parameter count doesn't match, we force a safe crash by setting the - // code entrypoint to zero, causing a nullptr dereference during the call. - mv(code, zero_reg); -@@ -7366,13 +7427,14 @@ void MacroAssembler::JumpJSFunction(Regi - ASM_CODE_COMMENT(this); - Register code = kJavaScriptCallCodeStartRegister; - #ifdef V8_ENABLE_LEAPTIERING -- LoadCodeEntrypointFromJSDispatchTable( -- code, -- FieldMemOperand(function_object, JSFunction::kDispatchHandleOffset)); -+ Register dispatch_handle = kJavaScriptCallDispatchHandleRegister; -+ UseScratchRegisterScope temps(this); -+ Register scratch = temps.Acquire(); -+ Lw(dispatch_handle, -+ FieldMemOperand(function_object, JSFunction::kDispatchHandleOffset)); -+ LoadEntrypointFromJSDispatchTable(code, dispatch_handle, scratch); - DCHECK_EQ(jump_mode, JumpMode::kJump); -- DCHECK_NE(code, t6); -- mv(t6, code); -- Jump(t6); -+ Jump(code); - #elif V8_ENABLE_SANDBOX - // When the sandbox is enabled, we can directly fetch the entrypoint pointer - // from the code pointer table instead of going through the Code object. In -@@ -7465,11 +7527,13 @@ void MacroAssembler::LoadEntrypointFromJ - Register scratch) { - DCHECK(!AreAliased(destination, scratch)); - ASM_CODE_COMMENT(this); -+ Register index = destination; - li(scratch, ExternalReference::js_dispatch_table_address()); - srli(index, dispatch_handle, kJSDispatchHandleShift); - slli(index, index, kJSDispatchTableEntrySizeLog2); - AddWord(scratch, scratch, index); -- Ld(destination, MemOperand(scratch, JSDispatchEntry::kEntrypointOffset)); -+ LoadWord(destination, -+ MemOperand(scratch, JSDispatchEntry::kEntrypointOffset)); - } - - void MacroAssembler::LoadEntrypointFromJSDispatchTable( -@@ -7486,7 +7550,7 @@ void MacroAssembler::LoadEntrypointFromJ - static_assert(!JSDispatchTable::kSupportsCompaction); - int offset = JSDispatchTable::OffsetOfEntry(dispatch_handle) + - JSDispatchEntry::kEntrypointOffset; -- Ld(destination, MemOperand(scratch, offset)); -+ LoadWord(destination, MemOperand(scratch, offset)); - } - - void MacroAssembler::LoadParameterCountFromJSDispatchTable( -@@ -7494,12 +7558,14 @@ void MacroAssembler::LoadParameterCountF - DCHECK(!AreAliased(destination, scratch)); - ASM_CODE_COMMENT(this); - Register index = destination; -- li(scratch, ExternalReference::js_dispatch_table_address()); - srli(index, dispatch_handle, kJSDispatchHandleShift); - slli(index, index, kJSDispatchTableEntrySizeLog2); -+ li(scratch, ExternalReference::js_dispatch_table_address()); - AddWord(scratch, scratch, index); -+#ifdef V8_TARGET_ARCH_64_BIT - static_assert(JSDispatchEntry::kParameterCountMask == 0xffff); -- Lh(destination, MemOperand(scratch, JSDispatchEntry::kCodeObjectOffset)); -+#endif -+ Lhu(destination, MemOperand(scratch, JSDispatchEntry::kCodeObjectOffset)); - } - - void MacroAssembler::LoadEntrypointAndParameterCountFromJSDispatchTable( -@@ -7512,10 +7578,11 @@ void MacroAssembler::LoadEntrypointAndPa - srli(index, dispatch_handle, kJSDispatchHandleShift); - slli(index, index, kJSDispatchTableEntrySizeLog2); - AddWord(scratch, scratch, index); -- -- Ld(entrypoint, MemOperand(scratch, JSDispatchEntry::kEntrypointOffset)); -+ LoadWord(entrypoint, MemOperand(scratch, JSDispatchEntry::kEntrypointOffset)); -+#ifdef V8_TARGET_ARCH_64_BIT - static_assert(JSDispatchEntry::kParameterCountMask == 0xffff); -- Lh(parameter_count, MemOperand(scratch, JSDispatchEntry::kCodeObjectOffset)); -+#endif -+ Lhu(parameter_count, MemOperand(scratch, JSDispatchEntry::kCodeObjectOffset)); - } - #endif - -Index: chromium-134.0.6998.35/v8/src/codegen/riscv/macro-assembler-riscv.h +Index: chromium-136.0.7103.92/v8/src/execution/riscv/simulator-riscv.h =================================================================== ---- chromium-134.0.6998.35.orig/v8/src/codegen/riscv/macro-assembler-riscv.h -+++ chromium-134.0.6998.35/v8/src/codegen/riscv/macro-assembler-riscv.h -@@ -1600,23 +1600,47 @@ class V8_EXPORT_PRIVATE MacroAssembler : - // ------------------------------------------------------------------------- - // JavaScript invokes. - -- // Invoke the JavaScript function code by either calling or jumping. -- void InvokeFunctionCode(Register function, Register new_target, -- Register expected_parameter_count, -- Register actual_parameter_count, InvokeType type); -- -- // On function call, call into the debugger if necessary. -- void CheckDebugHook(Register fun, Register new_target, -- Register expected_parameter_count, -- Register actual_parameter_count); -+ // On function call, call into the debugger. -+ void CallDebugOnFunctionCall( -+ Register fun, Register new_target, -+ Register expected_parameter_count_or_dispatch_handle, -+ Register actual_parameter_count); -+ -+ // The way we invoke JSFunctions differs depending on whether leaptiering is -+ // enabled. As such, these functions exist in two variants. In the future, -+ // leaptiering will be used on all platforms. At that point, the -+ // non-leaptiering variants will disappear. - -+#ifdef V8_ENABLE_LEAPTIERING - // Invoke the JavaScript function in the given register. Changes the - // current context to the context in the function before invoking. -+ void InvokeFunction(Register function, Register actual_parameter_count, -+ InvokeType type, -+ ArgumentAdaptionMode argument_adaption_mode = -+ ArgumentAdaptionMode::kAdapt); -+ // Invoke the JavaScript function in the given register. -+ // Changes the current context to the context in the function before invoking. - void InvokeFunctionWithNewTarget(Register function, Register new_target, - Register actual_parameter_count, - InvokeType type); -+ // Invoke the JavaScript function code by either calling or jumping. -+ void InvokeFunctionCode(Register function, Register new_target, -+ Register actual_parameter_count, InvokeType type, -+ ArgumentAdaptionMode argument_adaption_mode = -+ ArgumentAdaptionMode::kAdapt); -+#else - void InvokeFunction(Register function, Register expected_parameter_count, - Register actual_parameter_count, InvokeType type); -+ // Invoke the JavaScript function in the given register. Changes the -+ // current context to the context in the function before invoking. -+ void InvokeFunctionWithNewTarget(Register function, Register new_target, -+ Register actual_parameter_count, -+ InvokeType type); -+ // Invoke the JavaScript function code by either calling or jumping. -+ void InvokeFunctionCode(Register function, Register new_target, -+ Register expected_parameter_count, -+ Register actual_parameter_count, InvokeType type); -+#endif - - // ---- InstructionStream generation helpers ---- - -@@ -1657,14 +1681,13 @@ class V8_EXPORT_PRIVATE MacroAssembler : - Register closure); - void GenerateTailCallToReturnedCode(Runtime::FunctionId function_id); - -- Condition LoadFeedbackVectorFlagsAndCheckIfNeedsProcessing( -- Register flags, Register feedback_vector, Register result, -- CodeKind current_code_kind); -+#ifndef V8_ENABLE_LEAPTIERING - void LoadFeedbackVectorFlagsAndJumpIfNeedsProcessing( - Register flags, Register feedback_vector, CodeKind current_code_kind, - Label* flags_need_processing); - void OptimizeCodeOrTailCallOptimizedCodeSlot(Register flags, - Register feedback_vector); -+#endif - - // ------------------------------------------------------------------------- - // Support functions. -@@ -1883,8 +1906,7 @@ class V8_EXPORT_PRIVATE MacroAssembler : - - // Helper functions for generating invokes. - void InvokePrologue(Register expected_parameter_count, -- Register actual_parameter_count, Label* done, -- InvokeType type); -+ Register actual_parameter_count, InvokeType type); +--- chromium-136.0.7103.92.orig/v8/src/execution/riscv/simulator-riscv.h ++++ chromium-136.0.7103.92/v8/src/execution/riscv/simulator-riscv.h +@@ -538,6 +538,7 @@ class Simulator : public SimulatorBase { + // Return central stack view, without additional safety margins. + // Users, for example wasm::StackMemory, can add their own. + base::Vector GetCentralStackView() const; ++ static constexpr int JSStackLimitMargin() { return kAdditionalStackMargin; } - // Compute memory operands for safepoint stack slots. - static int SafepointRegisterStackIndex(int reg_code); -Index: chromium-134.0.6998.35/v8/src/codegen/riscv/register-riscv.h -=================================================================== ---- chromium-134.0.6998.35.orig/v8/src/codegen/riscv/register-riscv.h -+++ chromium-134.0.6998.35/v8/src/codegen/riscv/register-riscv.h -@@ -301,8 +301,7 @@ constexpr Register kJavaScriptCallCodeSt - constexpr Register kJavaScriptCallTargetRegister = kJSFunctionRegister; - constexpr Register kJavaScriptCallNewTargetRegister = a3; - constexpr Register kJavaScriptCallExtraArg1Register = a2; --// Leaptiering is not currently available on riscv64. --constexpr Register kJavaScriptCallDispatchHandleRegister = no_reg; -+constexpr Register kJavaScriptCallDispatchHandleRegister = a4; + void IterateRegistersAndStack(::heap::base::StackVisitor* visitor); - constexpr Register kRuntimeCallFunctionRegister = a1; - constexpr Register kRuntimeCallArgCountRegister = a0; -Index: chromium-134.0.6998.35/v8/src/compiler/backend/riscv/code-generator-riscv.cc +Index: chromium-136.0.7103.92/v8/src/maglev/riscv/maglev-ir-riscv.cc =================================================================== ---- chromium-134.0.6998.35.orig/v8/src/compiler/backend/riscv/code-generator-riscv.cc -+++ chromium-134.0.6998.35/v8/src/compiler/backend/riscv/code-generator-riscv.cc -@@ -706,6 +706,36 @@ void CodeGenerator::AssembleCodeStartReg - kJavaScriptCallCodeStartRegister, Operand(kScratchReg)); - } - -+#ifdef V8_ENABLE_LEAPTIERING -+// Check that {kJavaScriptCallDispatchHandleRegister} is correct. -+void CodeGenerator::AssembleDispatchHandleRegisterCheck() { -+ DCHECK(linkage()->GetIncomingDescriptor()->IsJSFunctionCall()); -+ -+ // We currently don't check this for JS builtins as those are sometimes -+ // called directly (e.g. from other builtins) and not through the dispatch -+ // table. This is fine as builtin functions don't use the dispatch handle, -+ // but we could enable this check in the future if we make sure to pass the -+ // kInvalidDispatchHandle whenever we do a direct call to a JS builtin. -+ if (Builtins::IsBuiltinId(info()->builtin())) { -+ return; -+ } +--- chromium-136.0.7103.92.orig/v8/src/maglev/riscv/maglev-ir-riscv.cc ++++ chromium-136.0.7103.92/v8/src/maglev/riscv/maglev-ir-riscv.cc +@@ -224,6 +224,40 @@ void CheckedIntPtrToInt32::GenerateCode( + Operand(std::numeric_limits::min())); + } + ++void CheckFloat64SameValue::SetValueLocationConstraints() { ++ UseRegister(target_input()); ++ // We need two because LoadFPRImmediate needs to acquire one as well in the ++ // case where value() is not 0.0 or -0.0. ++ set_temporaries_needed((value().get_scalar() == 0) ? 1 : 2); ++ set_double_temporaries_needed( ++ value().is_nan() || (value().get_scalar() == 0) ? 0 : 1); ++} + -+ // For now, we only ensure that the register references a valid dispatch -+ // entry with the correct parameter count. In the future, we may also be able -+ // to check that the entry points back to this code. -+ UseScratchRegisterScope temps(masm()); -+ Register actual_parameter_count = temps.Acquire(); -+ { -+ UseScratchRegisterScope temps(masm()); -+ Register scratch = temps.Acquire(); -+ __ LoadParameterCountFromJSDispatchTable( -+ actual_parameter_count, kJavaScriptCallDispatchHandleRegister, scratch); ++void CheckFloat64SameValue::GenerateCode(MaglevAssembler* masm, ++ const ProcessingState& state) { ++ Label* fail = __ GetDeoptLabel(this, deoptimize_reason()); ++ MaglevAssembler::TemporaryRegisterScope temps(masm); ++ DoubleRegister target = ToDoubleRegister(target_input()); ++ if (value().is_nan()) { ++ __ JumpIfNotNan(target, fail); ++ } else { ++ DoubleRegister double_scratch = temps.AcquireScratchDouble(); ++ Register scratch = temps.AcquireScratch(); ++ __ Move(double_scratch, value().get_scalar()); ++ __ CompareF64(scratch, EQ, double_scratch, target); ++ __ BranchFalseF(scratch, fail); ++ if (value().get_scalar() == 0) { // +0.0 or -0.0. ++ __ MacroAssembler::Move(scratch, target); ++ __ And(scratch, scratch, Operand(1ULL << 63)); ++ if (value().get_bits() == 0) { ++ __ BranchTrueF(scratch, fail); ++ } else { ++ __ BranchFalseF(scratch, fail); ++ } ++ } + } -+ __ Assert(eq, AbortReason::kWrongFunctionDispatchHandle, -+ actual_parameter_count, Operand(parameter_count_)); +} -+#endif // V8_ENABLE_LEAPTIERING + - // Check if the code object is marked for deoptimization. If it is, then it - // jumps to the CompileLazyDeoptimizedCode builtin. In order to do this we need - // to: -@@ -713,16 +743,7 @@ void CodeGenerator::AssembleCodeStartReg - // the flags in the referenced {Code} object; - // 2. test kMarkedForDeoptimizationBit in those flags; and - // 3. if it is not zero then it jumps to the builtin. --void CodeGenerator::BailoutIfDeoptimized() { -- int offset = InstructionStream::kCodeOffset - InstructionStream::kHeaderSize; -- __ LoadProtectedPointerField( -- kScratchReg, MemOperand(kJavaScriptCallCodeStartRegister, offset)); -- __ Lw(kScratchReg, FieldMemOperand(kScratchReg, Code::kFlagsOffset)); -- __ And(kScratchReg, kScratchReg, -- Operand(1 << Code::kMarkedForDeoptimizationBit)); -- __ TailCallBuiltin(Builtin::kCompileLazyDeoptimizedCode, ne, kScratchReg, -- Operand(zero_reg)); --} -+void CodeGenerator::BailoutIfDeoptimized() { __ BailoutIfDeoptimized(); } - - // Assembles an instruction after register allocation, producing machine code. - CodeGenerator::CodeGenResult CodeGenerator::AssembleArchInstruction( -Index: chromium-134.0.6998.35/v8/src/maglev/riscv/maglev-assembler-riscv.cc -=================================================================== ---- chromium-134.0.6998.35.orig/v8/src/maglev/riscv/maglev-assembler-riscv.cc -+++ chromium-134.0.6998.35/v8/src/maglev/riscv/maglev-assembler-riscv.cc -@@ -127,6 +127,7 @@ void MaglevAssembler::OSRPrologue(Graph* - } - - void MaglevAssembler::Prologue(Graph* graph) { -+ ASM_CODE_COMMENT(this); - MaglevAssembler::TemporaryRegisterScope temps(this); - // We add two extra registers to the scope. Ideally we could add all the - // allocatable general registers, except Context, JSFunction, NewTarget and -@@ -147,6 +148,7 @@ void MaglevAssembler::Prologue(Graph* gr - } - - // Tiering support. -+#ifndef V8_ENABLE_LEAPTIERING - if (v8_flags.turbofan) { - using D = MaglevOptimizeCodeOrTailCallOptimizedCodeSlotDescriptor; - Register flags = D::GetRegisterParameter(D::kFlags); -@@ -169,6 +171,7 @@ void MaglevAssembler::Prologue(Graph* gr - TailCallBuiltin(Builtin::kMaglevOptimizeCodeOrTailCallOptimizedCodeSlot, - needs_processing, flag_reg, Operand(zero_reg)); - } -+#endif - - EnterFrame(StackFrame::MAGLEV); - // Save arguments in frame. + void Int32AddWithOverflow::SetValueLocationConstraints() { + UseRegister(left_input()); + UseRegister(right_input());