From: "Jakov Smolić" <jsmolic@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/riscv:master commit in: www-client/chromium/files/, www-client/chromium/
Date: Wed, 15 Jan 2025 23:27:26 +0000 (UTC) [thread overview]
Message-ID: <1736983637.a3497033fa3db7d2cce42faed6474c4cae0d782f.jsmolic@gentoo> (raw)
commit: a3497033fa3db7d2cce42faed6474c4cae0d782f
Author: Andrew Cameron <apcameron <AT> gmail <DOT> com>
AuthorDate: Sat Jan 4 11:28:23 2025 +0000
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org>
CommitDate: Wed Jan 15 23:27:17 2025 +0000
URL: https://gitweb.gentoo.org/proj/riscv.git/commit/?id=a3497033
Update Chromium to 129.0.6668.100
Tested on my Visionfive 2
Signed-off-by: Andrew Cameron <apcameron <AT> gmail.com>
Closes: https://github.com/gentoo/riscv/pull/21
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org>
www-client/chromium/Manifest | 11 +-
www-client/chromium/chromium-128.0.6613.119.ebuild | 1467 ------
www-client/chromium/chromium-128.0.6613.137.ebuild | 1467 ------
...13.ebuild => chromium-129.0.6668.100-r1.ebuild} | 166 +-
.../chromium/files/Debian-fix-rust-linking.patch | 18 +-
...e-runtime_api_delegate-add-riscv64-define.patch | 33 +
...s-common-api-runtime.json-riscv64-support.patch | 36 +
www-client/chromium/files/riscv-cargo.patch | 32 +
www-client/chromium/files/riscv-ffmpeg.patch | 4812 ++------------------
www-client/chromium/files/riscv-misc.patch | 41 +
www-client/chromium/files/riscv-sandbox.patch | 443 +-
www-client/chromium/files/riscv.patch | 19 +-
12 files changed, 834 insertions(+), 7711 deletions(-)
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 60692e8..9f92372 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,10 +1,7 @@
-DIST chromium-128-clang.tar.xz 51489372 BLAKE2B 352a585e3acf0f0685ab2eaeb13e847195119bc6e3694f7fc20eeabdb25821019187e52997618214ccb469766c2982f489c6bdc643a339c1cfbe3e5fb3a131d4 SHA512 bc448096975111ff6ff5a9f82a6acb2bb244e9c344a8e6ef8bcdee5a06d0004955f76f6566f01519da5cc2eae08a2df2dd0ac5afee38dbc2ba918e735f338422
-DIST chromium-128-rust.tar.xz 148907072 BLAKE2B 9b28d1eca65d3e62ef142f96d9b3371bb65c6778414e5b64f0ad02c4aace219974f1cb292c9a6d9c443e3ed4f61192248ccaf9b18079cbd5a5f5c3abfe79d485 SHA512 5469490b23656a83d6198a087ddb82dd342fd8a426b32193218f7174395053f2ec7aaced5c464b8b16cdbddc252f80a98ca2a4b88742d2b0c910f2d2bfa7e431
-DIST chromium-128.0.6613.113.tar.xz 6711639096 BLAKE2B 1719b97aa30584b1d997d5fa894d23ec5b8063f9fdb53b9a7cd760896634a71a9c547e6a65d1db3c5e6308233c39dcf09db3a78d52ef960313c2c7b4381e6a46 SHA512 57ecf8d5d741a9a3ba9bb1ffd1e75ee83c14a0c552657063fca9bd4e5eec82b5ccafe81e1cea26cbb29992ce418bdcce11794e7ba3f7a860648df270cb2cd2cf
-DIST chromium-128.0.6613.119.tar.xz 6718742128 BLAKE2B b47eb124c249bae074883cdf1e98eaddd2aae1b5575960fea68632bd4684a1a28f59b41894935b02609f75de60f44b61d418ee0065bf005272a066133dca2946 SHA512 a3a1411b21885ce0c29574355d52a1bfad84299fdc99daf191d70f911f191d482f0e4a3d181faa1a1a7b031727f482fd3d95b6d9e1280167c0610f731356d11f
-DIST chromium-128.0.6613.137.tar.xz 6724182764 BLAKE2B 9f4d77b058af1619a4a13beac31ea463bd3d02086c172fb074d510b3f1dcba284fb1fa9ac5883ade2c2855f851a22bcbd4503960b4a27bc5844f16ad81558aba SHA512 3be85d2270a70ce3779b57e5d011e45312c67607e9e7c7f7ef396c515e37fed767105dfe0cc1f76830b007cebc05662f5318750c656c8a9765a25fa62036df6e
-DIST chromium-patches-128.tar.bz2 5087 BLAKE2B b0321fb45390a282afeeeb8fb4d6014d6e6b708e6851235e0897ac77d524160b4d33476aa70532df45d0ccf233fee3b4028cd4d845667dc6a2a46ecebfeb6752 SHA512 978908d27dc6fc620209486a9ad7f73babde8710728960f44f2680445276516e59a85c08656af2663d9e197df45874f24a1f19f14a21798fbcf7c5a10bb19371
+DIST chromium-129-clang.tar.xz 52250752 BLAKE2B c7223a1f4a9f52eb631b968ecaea528d19aa14ded23e03e530ad6c46e7e1579a7a010cb347489f1b963013b4f26358be94aeff0f98b5eceb7b1f1e49e8acdfd3 SHA512 43681d64d4480e3f69afd3021037af6910e9c64052edefdb72e99b0a85cd94c4a8eb4095188784d7fa7f52fae10a9bd9db53f2bb80e89f709f92af7ce6403976
+DIST chromium-129-rust.tar.xz 152042272 BLAKE2B acde4dc9c0fe232d16f07f3e4b719ea762627e234970866e0de56ec3959c4cd0a7b1b09cf5ccecd50efd1cc35dcf224be3b398c1ea19a79731d6db13c94fa7a9 SHA512 bef8e56cf73de5cefd5fe0bb9836ef65012406ff3d364d36624d30e7b5cdb2634d17ac9e49a60ccb0ac5dd57cf4311b587c5ff0cec26b2fc6e15274abe0dc85b
+DIST chromium-129.0.6668.100.tar.xz 6677334468 BLAKE2B b68896322673762ce49ac18dcd731011516f3eff3e98561bcfc2404fea7e5bf8c39fa8c5b19e0dc26f188ec8787ba2b729580024a0ca205c891eaf48a4a0e134 SHA512 366be6dbde59e979186174525431d4823449e0c031bb4dc290f747c7525de44f3e2c821a0c4cd1bbb47ae3bee9fa24efdaa465d8d883791f6c63f20760a4fb48
+DIST chromium-patches-129.tar.bz2 5071 BLAKE2B 080e1af8b0560a3c5365674e7c8d592310bbd2e273311b775b8112e410d91ccd48f170adbcf77cff566ad32de196217410663ac7b9e7e65544b6730fb1890aca SHA512 0a5bbc07dc9085b07332d5c6dd74940a9d55c4d0677f5603e75763ba54156f43664839d438f350bc86f3efc85aae452476e7f7040e06e60727847b156d1f0ab9
DIST chromium-ppc64le-gentoo-patches-1.tar.xz 5636 BLAKE2B 1d898939df023c59285b27bee552470483ea06375d1ee8d6947b89c5927c23cc7bfec6b49f3b376ece931d11a56f8e2a45791e0f92ad61974fc8c34c1082d89c SHA512 8a71cb007e47cda8e5fe5d185729389e65c48bd322c8ee8b3986bee8571427b959628f2666bda646a3f89ae64197c0957d3626845ff03461dbd5dee4c964d07c
DIST chromium-profiler-0.2.tar 259952640 BLAKE2B 5e82389fce00b267280d633b26551231c558b80f0c92cd7d60271095a3503365ab673e7a46dc5f74f8a82db1f21262cb24dcc0531d954bab5fb3b175dab3394d SHA512 9fa89a5ab728419683e7495ae676567480987d68a2d589f2aa97bfcbcf123f3c8f97f8bca5f65e5e3f6e41475535add473ded83b9c7a33bb4746a9d05b298a6c
-DIST chromium_128.0.6613.119-1raptor0~deb12u1.debian.tar.xz 8673272 BLAKE2B 0ae1ead2b8d0ce196d5d16e132194da12d3dde3b43c270f794630c3427d38aaac6c6a289ac64b4748354e9d4d20ae8597076b64a4b7a7e1225c66a9f86e9f7ff SHA512 c896f8f07aa44cd6950375b36fe89fc2780ff9867e01feab71100c8551b22d3c89c5ba9e80cffbad22ff8575d20fc782b70969a51c68384fd8de62a09c4ffdcf
DIST chromium_128.0.6613.84-1raptor0~deb12u1.debian.tar.xz 8674292 BLAKE2B 74c8556f578231cd133ce3a11306ce38d32332a3db7b0f32a63df1806201933e69e9ff01e66d7ccef279f2134e0a69c89365d7a08a7a7e7d69816a188ae0b91c SHA512 b1b85bc99493676d466e648c00eb7e337efbcb197e9ed5ae6394133721db828583340df5ebfa45a3dccc72f400ad6ada637d400d8e2fae35c1322ca5e15dc10e
diff --git a/www-client/chromium/chromium-128.0.6613.119.ebuild b/www-client/chromium/chromium-128.0.6613.119.ebuild
deleted file mode 100644
index 687d896..0000000
--- a/www-client/chromium/chromium-128.0.6613.119.ebuild
+++ /dev/null
@@ -1,1467 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# Google 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 will eventually hit the point where we need to use
-# the bundled Clang due to the use of prerelease features. We've been lucky
-# enough so far that this hasn't been an issue.
-# We use llvm-utils.eclass directly due to chromium's inherent Googliness.
-
-# GN is bundled with Chromium, but we always use the system version. Remember to
-# check for upstream changes to GN and update ebuild (and version below) as required.
-
-# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
-# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
-# then we remove ffmpeg from the image to ensure that the built package is distributable
-# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
-# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
-
-# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
-# no reason not to. Todo: Re-enable USE=system-ffmpeg.
-
-GN_MIN_VER=0.2165
-RUST_MIN_VER=1.78.0
-# chromium-tools/get-chromium-toolchain-strings.sh
-GOOGLE_CLANG_VER=llvmorg-19-init-14561-gecea8371-3000
-GOOGLE_RUST_VER=3cf924b934322fd7b514600a7dc84fc517515346-3
-
-: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
-
-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"
-
-# While prerelease llvm is actually used in the google build, until we have a
-# sane way to select 'rust built with this llvm slot' that isn't stable and testing
-# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PATCHSET_PPC64="128.0.6613.84-1raptor0~deb12u1"
-PATCH_V="${PV%%\.*}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
- system-toolchain? (
- https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
- )
- !system-toolchain? (
- https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
- -> chromium-${PV%%\.*}-clang.tar.xz
- https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%?????}.tar.xz
- -> chromium-${PV%%\.*}-rust.tar.xz
- )
- ppc64? (
- https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
- https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
- )
- pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="
- !headless? ( || ( X wayland ) )
- pgo? ( X !wayland )
- qt6? ( qt5 )
- 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:=
- x11-libs/libdrm:=
- !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-arch/bzip2:=
- dev-libs/expat:=
- net-misc/curl[ssl]
- sys-apps/dbus:=
- media-libs/flac:=
- sys-libs/zlib:=[minizip]
- !headless? (
- X? ( ${COMMON_X_DEPEND} )
- >=app-accessibility/at-spi2-core-2.46.0:2
- media-libs/mesa:=[X?,wayland?]
- cups? ( >=net-print/cups-1.3.11:= )
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/pango:=
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtwidgets:5
- )
- qt6? ( dev-qt/qtbase:6[gui,widgets] )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !headless? (
- || (
- x11-libs/gtk+:3[X?,wayland?]
- gui-libs/gtk:4[X?,wayland?]
- )
- qt5? ( dev-qt/qtgui:5[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?] )
- )
-"
-
-depend_clang_llvm_version() {
- echo "sys-devel/clang:$1"
- echo "sys-devel/llvm:$1"
- echo "=sys-devel/lld-$1*"
- echo "virtual/rust:0/llvm-${1}[profiler(-)]"
- echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
-}
-
-# Parse LLVM_COMPAT and generate a usedep for each version
-depend_clang_llvm_versions() {
- if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
- depend_clang_llvm_version ${#LLVM_COMPAT[0]}
- else
- echo "|| ("
- for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
- echo "("
- depend_clang_llvm_version ${LLVM_COMPAT[i]}
- echo ")"
- done
- echo ")"
- fi
-}
-
-BDEPEND="
- ${COMMON_SNAPSHOT_DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- >=app-arch/gzip-1.7
- !headless? (
- qt5? ( dev-qt/qtcore:5 )
- qt6? ( dev-qt/qtbase:6 )
- )
- system-toolchain? (
- $(depend_clang_llvm_versions)
- 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}
- dev-build/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.
- local BASE_DISK=24
- local EXTRA_DISK=1
- local CHECKREQS_MEMORY="4G"
- tc-is-cross-compiler && EXTRA_DISK=2
- if tc-is-lto || use pgo; then
- CHECKREQS_MEMORY="9G"
- tc-is-cross-compiler && EXTRA_DISK=4
- use pgo && EXTRA_DISK=8
- fi
- if is-flagq '-g?(gdb)?([1-9])'; then
- if use custom-cflags; then
- EXTRA_DISK=13
- fi
- CHECKREQS_MEMORY="16G"
- fi
- 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" "qt5" "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
-}
-
-# Chromium should build with any version of clang that we support
-# but we may need to pick the "best" one for a build (highest installed,
-# rust is built against it, etc.)
-# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
-# and output the _highest_ slot that is actually available on a system.
-chromium_pick_llvm_slot() {
- # LLVM_COMPAT is always going to be oldest to newest (or one value)
- # let's flip it and check from newest to oldest and return the first one we find.
- local slot
- for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
- slot=${LLVM_COMPAT[i]}
- if has_version "sys-devel/clang:${slot}" && \
- has_version "sys-devel/llvm:${slot}" && \
- has_version "sys-devel/lld:${slot}" && \
- has_version "virtual/rust:0/llvm-${slot}" && \
- ( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
-
- echo "${slot}"
- return
- fi
- done
-
- die_msg="
-No suitable clang/llvm/lld slot found.
-Slots checked: ${LLVM_COMPAT[*]}.
-"
- die "${die_msg}"
-}
-
-# We need the rust version in src_configure and pkg_setup
-chromium_extract_rust_version() {
- [[ ${MERGE_TYPE} == binary ]] && return
- local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
- rustc_version=${rustc_version[0]#rust-bin-}
- rustc_version=${rustc_version#rust-}
-
- [[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
- echo $rustc_version
-}
-
-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
-
- if use system-toolchain; then
- # 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.
- if ! tc-is-lto && 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
-
- # 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
-
- LLVM_SLOT=$(chromium_pick_llvm_slot)
- export LLVM_SLOT # used in src_configure for rust-y business
- AR=llvm-ar
- CPP="${CHOST}-clang++ -E"
- NM=llvm-nm
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
-
- if tc-is-cross-compiler; then
- use pgo && die "The pgo USE flag cannot be used when cross-compiling"
- CPP="${CBUILD}-clang++ -E"
- fi
-
- # The llvm-r1_pkg_setup we have at home.
- # We prepend the path _first_ to explicitly use the selected slot.
- llvm_prepend_path "${LLVM_SLOT}"
-
- llvm_fix_clang_version CC CPP CXX
- llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
- llvm_fix_tool_path READELF STRINGS STRIP
-
- # Set LLVM_CONFIG to help Meson (bug #907965) but only do it
- # for empty ESYSROOT (as a proxy for "are we cross-compiling?").
- if [[ -z ${ESYSROOT} ]] ; then
- llvm_fix_tool_path LLVM_CONFIG
- fi
-
- einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
-
- local rustc_ver=$(chromium_extract_rust_version)
- if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
- eerror "Rust >=${RUST_MIN_VER} is required"
- eerror "Please run 'eselect rust' and select the correct rust version"
- die "Selected rust version is too old"
- else
- einfo "Using rust ${rustc_ver} to build"
- fi
-
- fi
- # 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() {
- # In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
- # so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
- # one toolchain over the other. The addtional control over over unpacking also helps us
- # ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
- # package by just not unpacking it unless we're using the bundled toolchain.
- unpack ${P}.tar.xz
- if use system-toolchain; then
- unpack chromium-patches-${PATCH_V}.tar.bz2
- else
- unpack chromium-${PV%%\.*}-clang.tar.xz
- local rust_dir="${WORKDIR}/rust-toolchain"
- mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
- tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
- fi
-
- use pgo && unpack chromium-profiler-0.2.tar
-
- if use ppc64; then
- unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
- unpack chromium-ppc64le-gentoo-patches-1.tar.xz
- fi
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- # disable global media controls, crashes with libstdc++
- sed -i -e \
- "/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
- "chrome/browser/media/router/media_router_feature.cc" || die
-
- local PATCHES=(
- "${FILESDIR}/chromium-cross-compile.patch"
- "${FILESDIR}/chromium-109-system-zlib.patch"
- "${FILESDIR}/chromium-111-InkDropHost-crash.patch"
- "${FILESDIR}/chromium-126-oauth2-client-switches.patch"
- "${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
- "${FILESDIR}/chromium-127-updater-systemd.patch"
- "${FILESDIR}/swiftshader-MCDissassembler.patch"
- "${FILESDIR}/swiftshader-use-llvm16.patch"
- "${FILESDIR}/Debian-fix-rust-linking.patch"
- "${FILESDIR}/riscv-dav1d.patch"
- "${FILESDIR}/riscv-sandbox.patch"
- "${FILESDIR}/riscv-ffmpeg.patch"
- "${FILESDIR}/riscv.patch"
- "${FILESDIR}/cpuinfo.patch"
- "${FILESDIR}/riscv-v8.patch"
- )
-
- # 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
- sed -i '/source_set("unit_tests") {/,/}/d' \
- chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
- sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
- || die "Failed to remove dependencies on bad target"
-
- if use system-toolchain; then
- # The patchset is really only required if we're using the system-toolchain
- PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
- # We can't use the bundled compiler builtins
- sed -i -e \
- "/if (is_clang && toolchain_has_rust) {/,+2d" \
- build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
- else
- mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
- ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
- ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
- echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
- die "Failed to set clang version"
- 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"
- fi
-
- if use ppc64 ; then
- local p
- for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
- if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
- eapply "${WORKDIR}/debian/patches/${p}"
- fi
- done
- PATCHES+=( "${WORKDIR}/ppc64le" )
- PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
- fi
-
- default
-
- rm third_party/node/linux/node-linux-x64/bin/node || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- # adjust python interpreter version
- sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
- 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
- courgette/third_party
- 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/lighthouse
- third_party/devtools-frontend/src/front_end/third_party/lit
- third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
- 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/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/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/iccjpeg
- third_party/inspector_protocol
- third_party/ipcz
- third_party/jinja2
- third_party/jsoncpp
- third_party/jstemplate
- 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/libavif
- third_party/libc++
- third_party/libevent
- third_party/libgav1
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libsync
- third_party/libudev
- 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/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/pthreadpool
- third_party/puffin
- third_party/pyjson5
- third_party/pyyaml
- third_party/qcms
- third_party/re2
- third_party/rnnoise
- third_party/rust
- third_party/ruy
- third_party/s2cellid
- third_party/securemessage
- third_party/selenium-atoms
- third_party/sentencepiece
- third_party/sentencepiece/src/third_party/darts_clone
- third_party/shell-encryption
- 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/util
- third_party/tflite/src/third_party/xla/xla/tsl/framework
- third_party/ukey2
- third_party/unrar
- third_party/utf
- third_party/vulkan
- 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/src/third_party/siphash
- v8/src/third_party/utf8-decoder
- v8/src/third_party/valgrind
- v8/third_party/glibc
- v8/third_party/inspector_protocol
- v8/third_party/v8
-
- # gyp -> gn leftovers
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- )
-
- # 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
-
- if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
- keeplibs+=( third_party/llvm )
- 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
-
- einfo "Unbundling third-party libraries ..."
- # Remove most bundled libraries. Some are still needed.
- 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=""
-
- # We already forced the "correct" clang via pkg_setup
- if use system-toolchain; then
- 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/\""
-
- # from get_llvm_prefix
- local prefix=${ESYSROOT}
- [[ ${1} == -b ]] && prefix=${BROOT}
- myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(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}/\""
-
- # We need to provide this to GN in both the path to rust _and_ the version
- local rustc_ver=$(chromium_extract_rust_version)
- if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
- myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
- else
- myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
- fi
- myconf_gn+=" rustc_version=\"${rustc_ver}\""
- 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
- libdrm
- 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
-
- # 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"
-
- # 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_libdrm=true"
- myconf_gn+=" use_system_minigbm=true"
- myconf_gn+=" use_xkbcommon=true"
- if use qt5 || use qt6; then
- 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
- if use qt5; then
- if tc-is-cross-compiler; then
- myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
- else
- myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
- fi
- fi
- if use qt6; then
- myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
- fi
-
- myconf_gn+=" use_qt=true"
- myconf_gn+=" use_qt6=$(usex qt6 true false)"
- else
- myconf_gn+=" use_qt=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
-
- # Results in undefined references in chrome linking, may require CFI to work
- if use arm64; then
- myconf_gn+=" arm_control_flow_integrity=\"none\""
- fi
-
- # 936673: Updater (which we don't use) depends on libsystemd
- # This _should_ always be disabled if we're not building a
- # "Chrome" branded browser, but obviously this is not always sufficient.
- myconf_gn+=" enable_updater=false"
-
- local use_lto="false"
- if tc-is-lto; then
- use_lto="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
- # Req's LTO; TODO: not compatible with -fno-split-lto-unit
- myconf_gn+=" is_cfi=false"
- # 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
-
- pax-mark m out/Release/chrome
-
- if ! use system-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/libqt5_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_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
- if use qt5 && use qt6; then
- elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
- elog "environment. To override you need to pass --qt-version=5 or"
- elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
- elog "/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-128.0.6613.137.ebuild b/www-client/chromium/chromium-128.0.6613.137.ebuild
deleted file mode 100644
index 26fe209..0000000
--- a/www-client/chromium/chromium-128.0.6613.137.ebuild
+++ /dev/null
@@ -1,1467 +0,0 @@
-# Copyright 2009-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# PACKAGING NOTES
-
-# Google 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 will eventually hit the point where we need to use
-# the bundled Clang due to the use of prerelease features. We've been lucky
-# enough so far that this hasn't been an issue.
-# We use llvm-utils.eclass directly due to chromium's inherent Googliness.
-
-# GN is bundled with Chromium, but we always use the system version. Remember to
-# check for upstream changes to GN and update ebuild (and version below) as required.
-
-# For binhost users, if USE=bindist is set, we configure Chromium in a way that it is able
-# to use proprietary codecs, and so that ffmpeg is an external component (libffmpeg.so),
-# then we remove ffmpeg from the image to ensure that the built package is distributable
-# (i.e. we don't owe royalties). A suitable libffmpeg.so is symlinked in its place;
-# as a result of this, ffmpeg[chromium] or ffmpeg-chromium must be installed on the system.
-
-# For non-binhost builds, we build the bundled ffmpeg and enable proprietary codecs because there's
-# no reason not to. Todo: Re-enable USE=system-ffmpeg.
-
-GN_MIN_VER=0.2165
-RUST_MIN_VER=1.78.0
-# chromium-tools/get-chromium-toolchain-strings.sh
-GOOGLE_CLANG_VER=llvmorg-19-init-14561-gecea8371-3000
-GOOGLE_RUST_VER=3cf924b934322fd7b514600a7dc84fc517515346-3
-
-: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
-
-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"
-
-# While prerelease llvm is actually used in the google build, until we have a
-# sane way to select 'rust built with this llvm slot' that isn't stable and testing
-# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
-LLVM_COMPAT=( {17..18} )
-PYTHON_COMPAT=( python3_{11..13} )
-PYTHON_REQ_USE="xml(+)"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://www.chromium.org/"
-PATCHSET_PPC64="128.0.6613.119-1raptor0~deb12u1"
-PATCH_V="${PV%%\.*}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
- system-toolchain? (
- https://gitlab.com/Matt.Jolly/chromium-patches/-/archive/${PATCH_V}/chromium-patches-${PATCH_V}.tar.bz2
- )
- !system-toolchain? (
- https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
- -> chromium-${PV%%\.*}-clang.tar.xz
- https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%?????}.tar.xz
- -> chromium-${PV%%\.*}-rust.tar.xz
- )
- ppc64? (
- https://quickbuild.io/~raptor-engineering-public/+archive/ubuntu/chromium/+files/chromium_${PATCHSET_PPC64}.debian.tar.xz
- https://deps.gentoo.zip/chromium-ppc64le-gentoo-patches-1.tar.xz
- )
- pgo? ( https://github.com/elkablo/chromium-profiler/releases/download/v0.2/chromium-profiler-0.2.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv"
-IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
-IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
-IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
-RESTRICT="!bindist? ( bindist )"
-
-REQUIRED_USE="
- !headless? ( || ( X wayland ) )
- pgo? ( X !wayland )
- qt6? ( qt5 )
- 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:=
- x11-libs/libdrm:=
- !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-arch/bzip2:=
- dev-libs/expat:=
- net-misc/curl[ssl]
- sys-apps/dbus:=
- media-libs/flac:=
- sys-libs/zlib:=[minizip]
- !headless? (
- X? ( ${COMMON_X_DEPEND} )
- >=app-accessibility/at-spi2-core-2.46.0:2
- media-libs/mesa:=[X?,wayland?]
- cups? ( >=net-print/cups-1.3.11:= )
- virtual/udev
- x11-libs/cairo:=
- x11-libs/gdk-pixbuf:2
- x11-libs/pango:=
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtwidgets:5
- )
- qt6? ( dev-qt/qtbase:6[gui,widgets] )
- )
-"
-RDEPEND="${COMMON_DEPEND}
- !headless? (
- || (
- x11-libs/gtk+:3[X?,wayland?]
- gui-libs/gtk:4[X?,wayland?]
- )
- qt5? ( dev-qt/qtgui:5[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?] )
- )
-"
-
-depend_clang_llvm_version() {
- echo "sys-devel/clang:$1"
- echo "sys-devel/llvm:$1"
- echo "=sys-devel/lld-$1*"
- echo "virtual/rust:0/llvm-${1}[profiler(-)]"
- echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
-}
-
-# Parse LLVM_COMPAT and generate a usedep for each version
-depend_clang_llvm_versions() {
- if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
- depend_clang_llvm_version ${#LLVM_COMPAT[0]}
- else
- echo "|| ("
- for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
- echo "("
- depend_clang_llvm_version ${LLVM_COMPAT[i]}
- echo ")"
- done
- echo ")"
- fi
-}
-
-BDEPEND="
- ${COMMON_SNAPSHOT_DEPEND}
- ${PYTHON_DEPS}
- $(python_gen_any_dep '
- dev-python/setuptools[${PYTHON_USEDEP}]
- ')
- >=app-arch/gzip-1.7
- !headless? (
- qt5? ( dev-qt/qtcore:5 )
- qt6? ( dev-qt/qtbase:6 )
- )
- system-toolchain? (
- $(depend_clang_llvm_versions)
- 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}
- dev-build/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.
- local BASE_DISK=24
- local EXTRA_DISK=1
- local CHECKREQS_MEMORY="4G"
- tc-is-cross-compiler && EXTRA_DISK=2
- if tc-is-lto || use pgo; then
- CHECKREQS_MEMORY="9G"
- tc-is-cross-compiler && EXTRA_DISK=4
- use pgo && EXTRA_DISK=8
- fi
- if is-flagq '-g?(gdb)?([1-9])'; then
- if use custom-cflags; then
- EXTRA_DISK=13
- fi
- CHECKREQS_MEMORY="16G"
- fi
- 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" "qt5" "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
-}
-
-# Chromium should build with any version of clang that we support
-# but we may need to pick the "best" one for a build (highest installed,
-# rust is built against it, etc.)
-# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
-# and output the _highest_ slot that is actually available on a system.
-chromium_pick_llvm_slot() {
- # LLVM_COMPAT is always going to be oldest to newest (or one value)
- # let's flip it and check from newest to oldest and return the first one we find.
- local slot
- for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
- slot=${LLVM_COMPAT[i]}
- if has_version "sys-devel/clang:${slot}" && \
- has_version "sys-devel/llvm:${slot}" && \
- has_version "sys-devel/lld:${slot}" && \
- has_version "virtual/rust:0/llvm-${slot}" && \
- ( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
-
- echo "${slot}"
- return
- fi
- done
-
- die_msg="
-No suitable clang/llvm/lld slot found.
-Slots checked: ${LLVM_COMPAT[*]}.
-"
- die "${die_msg}"
-}
-
-# We need the rust version in src_configure and pkg_setup
-chromium_extract_rust_version() {
- [[ ${MERGE_TYPE} == binary ]] && return
- local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
- rustc_version=${rustc_version[0]#rust-bin-}
- rustc_version=${rustc_version#rust-}
-
- [[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
- echo $rustc_version
-}
-
-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
-
- if use system-toolchain; then
- # 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.
- if ! tc-is-lto && 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
-
- # 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
-
- LLVM_SLOT=$(chromium_pick_llvm_slot)
- export LLVM_SLOT # used in src_configure for rust-y business
- AR=llvm-ar
- CPP="${CHOST}-clang++ -E"
- NM=llvm-nm
- CC=${CHOST}-clang
- CXX=${CHOST}-clang++
-
- if tc-is-cross-compiler; then
- use pgo && die "The pgo USE flag cannot be used when cross-compiling"
- CPP="${CBUILD}-clang++ -E"
- fi
-
- # The llvm-r1_pkg_setup we have at home.
- # We prepend the path _first_ to explicitly use the selected slot.
- llvm_prepend_path "${LLVM_SLOT}"
-
- llvm_fix_clang_version CC CPP CXX
- llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
- llvm_fix_tool_path READELF STRINGS STRIP
-
- # Set LLVM_CONFIG to help Meson (bug #907965) but only do it
- # for empty ESYSROOT (as a proxy for "are we cross-compiling?").
- if [[ -z ${ESYSROOT} ]] ; then
- llvm_fix_tool_path LLVM_CONFIG
- fi
-
- einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
-
- local rustc_ver=$(chromium_extract_rust_version)
- if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
- eerror "Rust >=${RUST_MIN_VER} is required"
- eerror "Please run 'eselect rust' and select the correct rust version"
- die "Selected rust version is too old"
- else
- einfo "Using rust ${rustc_ver} to build"
- fi
-
- fi
- # 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() {
- # In 126 Chromium upstream decided to change the way that the rust toolchain is packaged
- # so now we get a fancy src_unpack function to ensure that we don't accidentally unpack
- # one toolchain over the other. The addtional control over over unpacking also helps us
- # ensure that GN doesn't try and use some bundled tool (like bindgen) instead of the system
- # package by just not unpacking it unless we're using the bundled toolchain.
- unpack ${P}.tar.xz
- if use system-toolchain; then
- unpack chromium-patches-${PATCH_V}.tar.bz2
- else
- unpack chromium-${PV%%\.*}-clang.tar.xz
- local rust_dir="${WORKDIR}/rust-toolchain"
- mkdir -p ${rust_dir} || die "Failed to create rust toolchain directory"
- tar xf "${DISTDIR}/chromium-${PV%%\.*}-rust.tar.xz" -C ${rust_dir} || die "Failed to unpack rust toolchain"
- fi
-
- use pgo && unpack chromium-profiler-0.2.tar
-
- if use ppc64; then
- unpack chromium_${PATCHSET_PPC64}.debian.tar.xz
- unpack chromium-ppc64le-gentoo-patches-1.tar.xz
- fi
-}
-
-src_prepare() {
- # Calling this here supports resumption via FEATURES=keepwork
- python_setup
-
- # disable global media controls, crashes with libstdc++
- sed -i -e \
- "/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
- "chrome/browser/media/router/media_router_feature.cc" || die
-
- local PATCHES=(
- "${FILESDIR}/chromium-cross-compile.patch"
- "${FILESDIR}/chromium-109-system-zlib.patch"
- "${FILESDIR}/chromium-111-InkDropHost-crash.patch"
- "${FILESDIR}/chromium-126-oauth2-client-switches.patch"
- "${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
- "${FILESDIR}/chromium-127-updater-systemd.patch"
- "${FILESDIR}/swiftshader-MCDissassembler.patch"
- "${FILESDIR}/swiftshader-use-llvm16.patch"
- "${FILESDIR}/Debian-fix-rust-linking.patch"
- "${FILESDIR}/riscv-dav1d.patch"
- "${FILESDIR}/riscv-sandbox.patch"
- "${FILESDIR}/riscv-ffmpeg.patch"
- "${FILESDIR}/riscv.patch"
- "${FILESDIR}/cpuinfo.patch"
- "${FILESDIR}/riscv-v8.patch"
- )
-
- # 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
- sed -i '/source_set("unit_tests") {/,/}/d' \
- chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
- sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
- || die "Failed to remove dependencies on bad target"
-
- if use system-toolchain; then
- # The patchset is really only required if we're using the system-toolchain
- PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
- # We can't use the bundled compiler builtins
- sed -i -e \
- "/if (is_clang && toolchain_has_rust) {/,+2d" \
- build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
- else
- mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
- ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
- ln -s "${WORKDIR}"/lib third_party/llvm-build/Release+Asserts/lib || die "Failed to symlink llvm lib"
- echo "${GOOGLE_CLANG_VER}" > third_party/llvm-build/Release+Asserts/cr_build_revision || \
- die "Failed to set clang version"
- 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"
- fi
-
- if use ppc64 ; then
- local p
- for p in $(grep -v "^#" "${WORKDIR}"/debian/patches/series | grep "^ppc64le" || die); do
- if [[ ! $p =~ "fix-breakpad-compile.patch" ]]; then
- eapply "${WORKDIR}/debian/patches/${p}"
- fi
- done
- PATCHES+=( "${WORKDIR}/ppc64le" )
- PATCHES+=( "${WORKDIR}/debian/patches/fixes/rust-clanglib.patch" )
- fi
-
- default
-
- rm third_party/node/linux/node-linux-x64/bin/node || die
- ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
- # adjust python interpreter version
- sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
- 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
- courgette/third_party
- 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/lighthouse
- third_party/devtools-frontend/src/front_end/third_party/lit
- third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
- 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/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/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/iccjpeg
- third_party/inspector_protocol
- third_party/ipcz
- third_party/jinja2
- third_party/jsoncpp
- third_party/jstemplate
- 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/libavif
- third_party/libc++
- third_party/libevent
- third_party/libgav1
- third_party/libjingle
- third_party/libphonenumber
- third_party/libsecret
- third_party/libsrtp
- third_party/libsync
- third_party/libudev
- 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/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/pthreadpool
- third_party/puffin
- third_party/pyjson5
- third_party/pyyaml
- third_party/qcms
- third_party/re2
- third_party/rnnoise
- third_party/rust
- third_party/ruy
- third_party/s2cellid
- third_party/securemessage
- third_party/selenium-atoms
- third_party/sentencepiece
- third_party/sentencepiece/src/third_party/darts_clone
- third_party/shell-encryption
- 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/util
- third_party/tflite/src/third_party/xla/xla/tsl/framework
- third_party/ukey2
- third_party/unrar
- third_party/utf
- third_party/vulkan
- 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/src/third_party/siphash
- v8/src/third_party/utf8-decoder
- v8/src/third_party/valgrind
- v8/third_party/glibc
- v8/third_party/inspector_protocol
- v8/third_party/v8
-
- # gyp -> gn leftovers
- third_party/speech-dispatcher
- third_party/usb_ids
- third_party/xdg-utils
- )
-
- # 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
-
- if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then
- keeplibs+=( third_party/llvm )
- 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
-
- einfo "Unbundling third-party libraries ..."
- # Remove most bundled libraries. Some are still needed.
- 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=""
-
- # We already forced the "correct" clang via pkg_setup
- if use system-toolchain; then
- 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/\""
-
- # from get_llvm_prefix
- local prefix=${ESYSROOT}
- [[ ${1} == -b ]] && prefix=${BROOT}
- myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(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}/\""
-
- # We need to provide this to GN in both the path to rust _and_ the version
- local rustc_ver=$(chromium_extract_rust_version)
- if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
- myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
- else
- myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
- fi
- myconf_gn+=" rustc_version=\"${rustc_ver}\""
- 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
- libdrm
- 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
-
- # 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"
-
- # 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_libdrm=true"
- myconf_gn+=" use_system_minigbm=true"
- myconf_gn+=" use_xkbcommon=true"
- if use qt5 || use qt6; then
- 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
- if use qt5; then
- if tc-is-cross-compiler; then
- myconf_gn+=" moc_qt5_path=\"${EPREFIX}/${cbuild_libdir}/qt5/bin\""
- else
- myconf_gn+=" moc_qt5_path=\"$(qt5_get_bindir)\""
- fi
- fi
- if use qt6; then
- myconf_gn+=" moc_qt6_path=\"${EPREFIX}/usr/${cbuild_libdir}/qt6/libexec\""
- fi
-
- myconf_gn+=" use_qt=true"
- myconf_gn+=" use_qt6=$(usex qt6 true false)"
- else
- myconf_gn+=" use_qt=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
-
- # Results in undefined references in chrome linking, may require CFI to work
- if use arm64; then
- myconf_gn+=" arm_control_flow_integrity=\"none\""
- fi
-
- # 936673: Updater (which we don't use) depends on libsystemd
- # This _should_ always be disabled if we're not building a
- # "Chrome" branded browser, but obviously this is not always sufficient.
- myconf_gn+=" enable_updater=false"
-
- local use_lto="false"
- if tc-is-lto; then
- use_lto="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
- # Req's LTO; TODO: not compatible with -fno-split-lto-unit
- myconf_gn+=" is_cfi=false"
- # 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
-
- pax-mark m out/Release/chrome
-
- if ! use system-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/libqt5_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_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
- if use qt5 && use qt6; then
- elog "Chromium automatically selects Qt5 or Qt6 based on your desktop"
- elog "environment. To override you need to pass --qt-version=5 or"
- elog "--qt-version=6, e.g. by adding it to CHROMIUM_FLAGS in"
- elog "/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-128.0.6613.113.ebuild b/www-client/chromium/chromium-129.0.6668.100-r1.ebuild
similarity index 89%
rename from www-client/chromium/chromium-128.0.6613.113.ebuild
rename to www-client/chromium/chromium-129.0.6668.100-r1.ebuild
index c16e043..80d0a5d 100644
--- a/www-client/chromium/chromium-128.0.6613.113.ebuild
+++ b/www-client/chromium/chromium-129.0.6668.100-r1.ebuild
@@ -25,10 +25,9 @@ EAPI=8
# no reason not to. Todo: Re-enable USE=system-ffmpeg.
GN_MIN_VER=0.2165
-RUST_MIN_VER=1.78.0
# chromium-tools/get-chromium-toolchain-strings.sh
-GOOGLE_CLANG_VER=llvmorg-19-init-14561-gecea8371-3000
-GOOGLE_RUST_VER=3cf924b934322fd7b514600a7dc84fc517515346-3
+GOOGLE_CLANG_VER=llvmorg-20-init-1009-g7088a5ed-10
+GOOGLE_RUST_VER=595316b4006932405a63862d8fe65f71a6356293-5
: ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no}
@@ -38,15 +37,15 @@ CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu
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"
-# While prerelease llvm is actually used in the google build, until we have a
-# sane way to select 'rust built with this llvm slot' that isn't stable and testing
-# subslots we will have to restrict LLVM_COMPAT to stable and testing keywords.
-LLVM_COMPAT=( {17..18} )
+LLVM_COMPAT=( 18 )
PYTHON_COMPAT=( python3_{11..13} )
PYTHON_REQ_USE="xml(+)"
+RUST_MIN_VER=1.78.0
+RUST_NEEDS_LLVM=1
+RUST_OPTIONAL=1
-inherit check-reqs chromium-2 desktop flag-o-matic llvm-utils ninja-utils pax-utils
-inherit python-any-r1 qmake-utils readme.gentoo-r1 systemd toolchain-funcs virtualx xdg-utils
+inherit check-reqs chromium-2 desktop flag-o-matic llvm-r1 ninja-utils pax-utils
+inherit python-any-r1 qmake-utils readme.gentoo-r1 rust systemd toolchain-funcs virtualx xdg-utils
DESCRIPTION="Open-source version of Google Chrome web browser"
HOMEPAGE="https://www.chromium.org/"
@@ -59,7 +58,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
!system-toolchain? (
https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/clang-${GOOGLE_CLANG_VER}.tar.xz
-> chromium-${PV%%\.*}-clang.tar.xz
- https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%?????}.tar.xz
+ https://commondatastorage.googleapis.com/chromium-browser-clang/Linux_x64/rust-toolchain-${GOOGLE_RUST_VER}-${GOOGLE_CLANG_VER%???}.tar.xz
-> chromium-${PV%%\.*}-rust.tar.xz
)
ppc64? (
@@ -70,7 +69,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
LICENSE="BSD"
SLOT="0/stable"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv"
+KEYWORDS="amd64 arm64 ~riscv"
IUSE_SYSTEM_LIBS="+system-harfbuzz +system-icu +system-png +system-zstd"
IUSE="+X ${IUSE_SYSTEM_LIBS} bindist cups debug ffmpeg-chromium gtk4 +hangouts headless kerberos +official pax-kernel pgo +proprietary-codecs pulseaudio"
IUSE+=" qt5 qt6 +screencast selinux +system-toolchain +vaapi +wayland +widevine"
@@ -182,29 +181,6 @@ DEPEND="${COMMON_DEPEND}
)
"
-depend_clang_llvm_version() {
- echo "sys-devel/clang:$1"
- echo "sys-devel/llvm:$1"
- echo "=sys-devel/lld-$1*"
- echo "virtual/rust:0/llvm-${1}[profiler(-)]"
- echo "pgo? ( sys-libs/compiler-rt-sanitizers:${1}[profile] )"
-}
-
-# Parse LLVM_COMPAT and generate a usedep for each version
-depend_clang_llvm_versions() {
- if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then
- depend_clang_llvm_version ${#LLVM_COMPAT[0]}
- else
- echo "|| ("
- for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
- echo "("
- depend_clang_llvm_version ${LLVM_COMPAT[i]}
- echo ")"
- done
- echo ")"
- fi
-}
-
BDEPEND="
${COMMON_SNAPSHOT_DEPEND}
${PYTHON_DEPS}
@@ -217,7 +193,12 @@ BDEPEND="
qt6? ( dev-qt/qtbase:6 )
)
system-toolchain? (
- $(depend_clang_llvm_versions)
+ $(llvm_gen_dep "
+ llvm-core/clang:\${LLVM_SLOT}
+ llvm-core/llvm:\${LLVM_SLOT}
+ llvm-core/lld:\${LLVM_SLOT}
+ ")
+ ${RUST_DEPEND}
pgo? (
>=dev-python/selenium-3.141.0
>=dev-util/web_page_replay_go-20220314
@@ -313,47 +294,6 @@ pkg_pretend() {
fi
}
-# Chromium should build with any version of clang that we support
-# but we may need to pick the "best" one for a build (highest installed,
-# rust is built against it, etc.)
-# Check each slot in LLVM_COMPAT to see if clang/llvm/lld are available
-# and output the _highest_ slot that is actually available on a system.
-chromium_pick_llvm_slot() {
- # LLVM_COMPAT is always going to be oldest to newest (or one value)
- # let's flip it and check from newest to oldest and return the first one we find.
- local slot
- for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do
- slot=${LLVM_COMPAT[i]}
- if has_version "sys-devel/clang:${slot}" && \
- has_version "sys-devel/llvm:${slot}" && \
- has_version "sys-devel/lld:${slot}" && \
- has_version "virtual/rust:0/llvm-${slot}" && \
- ( ! use pgo || has_version "sys-libs/compiler-rt-sanitizers:${slot}" ) ; then
-
- echo "${slot}"
- return
- fi
- done
-
- die_msg="
-No suitable clang/llvm/lld slot found.
-Slots checked: ${LLVM_COMPAT[*]}.
-"
- die "${die_msg}"
-}
-
-# We need the rust version in src_configure and pkg_setup
-chromium_extract_rust_version() {
- [[ ${MERGE_TYPE} == binary ]] && return
- local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
- rustc_version=${rustc_version[0]#rust-bin-}
- rustc_version=${rustc_version#rust-}
-
- [[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
-
- echo $rustc_version
-}
-
pkg_setup() {
if [[ ${MERGE_TYPE} != binary ]]; then
# The pre_build_checks are all about compilation resources, no need to run it for a binpkg
@@ -361,10 +301,7 @@ pkg_setup() {
if use system-toolchain; then
# 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.
if ! tc-is-lto && use official; then
einfo "USE=official selected and LTO not detected."
einfo "It is _highly_ recommended that LTO be enabled for performance reasons"
@@ -378,8 +315,7 @@ pkg_setup() {
die "Please switch to a different linker."
fi
- LLVM_SLOT=$(chromium_pick_llvm_slot)
- export LLVM_SLOT # used in src_configure for rust-y business
+ # We're forcing clang here; user choice is respected via llvm_slot_x USE
AR=llvm-ar
CPP="${CHOST}-clang++ -E"
NM=llvm-nm
@@ -391,32 +327,10 @@ pkg_setup() {
CPP="${CBUILD}-clang++ -E"
fi
- # The llvm-r1_pkg_setup we have at home.
- # We prepend the path _first_ to explicitly use the selected slot.
- llvm_prepend_path "${LLVM_SLOT}"
-
- llvm_fix_clang_version CC CPP CXX
- llvm_fix_tool_path ADDR2LINE AR AS LD NM OBJCOPY OBJDUMP RANLIB
- llvm_fix_tool_path READELF STRINGS STRIP
-
- # Set LLVM_CONFIG to help Meson (bug #907965) but only do it
- # for empty ESYSROOT (as a proxy for "are we cross-compiling?").
- if [[ -z ${ESYSROOT} ]] ; then
- llvm_fix_tool_path LLVM_CONFIG
- fi
-
- einfo "Using LLVM/Clang slot ${LLVM_SLOT} to build"
-
- local rustc_ver=$(chromium_extract_rust_version)
- if ver_test "${rustc_ver}" -lt "${RUST_MIN_VER}"; then
- eerror "Rust >=${RUST_MIN_VER} is required"
- eerror "Please run 'eselect rust' and select the correct rust version"
- die "Selected rust version is too old"
- else
- einfo "Using rust ${rustc_ver} to build"
- fi
-
+ llvm-r1_pkg_setup
+ rust_pkg_setup
fi
+
# 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"
@@ -457,7 +371,7 @@ src_prepare() {
# disable global media controls, crashes with libstdc++
sed -i -e \
"/\"GlobalMediaControlsCastStartStop\"/,+4{s/ENABLED/DISABLED/;}" \
- "chrome/browser/media/router/media_router_feature.cc" || die
+ "chrome/browser/media/router/media_router_feature.cc"
local PATCHES=(
"${FILESDIR}/chromium-cross-compile.patch"
@@ -465,31 +379,27 @@ src_prepare() {
"${FILESDIR}/chromium-111-InkDropHost-crash.patch"
"${FILESDIR}/chromium-126-oauth2-client-switches.patch"
"${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch"
- "${FILESDIR}/chromium-127-updater-systemd.patch"
"${FILESDIR}/swiftshader-MCDissassembler.patch"
"${FILESDIR}/swiftshader-use-llvm16.patch"
"${FILESDIR}/Debian-fix-rust-linking.patch"
"${FILESDIR}/riscv-dav1d.patch"
+ "${FILESDIR}/riscv-cargo.patch"
"${FILESDIR}/riscv-sandbox.patch"
"${FILESDIR}/riscv-ffmpeg.patch"
"${FILESDIR}/riscv.patch"
"${FILESDIR}/cpuinfo.patch"
- "${FILESDIR}/riscv-v8.patch"
+ "${FILESDIR}/riscv-misc.patch"
)
- # 127: test deps are broken for ui/lens with system ICU "//third_party/icu:icuuc_public"
- sed -i '/source_set("unit_tests") {/,/}/d' \
- chrome/browser/ui/lens/BUILD.gn || die "Failed to remove bad test target"
- sed -i '/lens:unit_tests/d' chrome/test/BUILD.gn components/BUILD.gn \
- || die "Failed to remove dependencies on bad target"
-
if use system-toolchain; then
# The patchset is really only required if we're using the system-toolchain
PATCHES+=( "${WORKDIR}/chromium-patches-${PATCH_V}" )
- # We can't use the bundled compiler builtins
- sed -i -e \
- "/if (is_clang && toolchain_has_rust) {/,+2d" \
- build/config/compiler/BUILD.gn || die "Failed to disable bundled compiler builtins"
+ # 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
+
else
mkdir -p third_party/llvm-build/Release+Asserts || die "Failed to bundle llvm"
ln -s "${WORKDIR}"/bin third_party/llvm-build/Release+Asserts/bin || die "Failed to symlink llvm bin"
@@ -650,7 +560,6 @@ src_prepare() {
third_party/libsecret
third_party/libsrtp
third_party/libsync
- third_party/libudev
third_party/liburlpattern
third_party/libva_protected_content
third_party/libvpx
@@ -704,6 +613,7 @@ src_prepare() {
third_party/pyjson5
third_party/pyyaml
third_party/qcms
+ third_party/rapidhash
third_party/re2
third_party/rnnoise
third_party/rust
@@ -888,23 +798,15 @@ chromium_configure() {
# rust_bindgen_root = directory with `bin/bindgen` beneath it.
myconf_gn+=" rust_bindgen_root=\"${EPREFIX}/usr/\""
- # from get_llvm_prefix
- local prefix=${ESYSROOT}
- [[ ${1} == -b ]] && prefix=${BROOT}
- myconf_gn+=" bindgen_libclang_path=\"${prefix}/usr/lib/llvm/${LLVM_SLOT}/$(get_libdir)\""
+ 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}/\""
# We need to provide this to GN in both the path to rust _and_ the version
- local rustc_ver=$(chromium_extract_rust_version)
- if [[ "$(eselect --brief rust show 2>/dev/null)" == *"bin"* ]]; then
- myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/opt/rust-bin-${rustc_ver}/\""
- else
- myconf_gn+=" rust_sysroot_absolute=\"${EPREFIX}/usr/lib/rust/${rustc_ver}/\""
- fi
- myconf_gn+=" rustc_version=\"${rustc_ver}\""
+ 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.
@@ -1167,6 +1069,8 @@ chromium_configure() {
sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
tools/generate_shim_headers/generate_shim_headers.py || die
# Req's LTO; TODO: not compatible with -fno-split-lto-unit
+ # split-lto-unit can be enabled with RUSTC_BOOTSTRAP=1 (and an updated compiler patch),
+ # however I still got weird linking errors with CFI _and_ the split unit LTO OOMed after using 100G.
myconf_gn+=" is_cfi=false"
# Don't add symbols to build
myconf_gn+=" symbol_level=0"
diff --git a/www-client/chromium/files/Debian-fix-rust-linking.patch b/www-client/chromium/files/Debian-fix-rust-linking.patch
index 8be91bf..1fc0efb 100644
--- a/www-client/chromium/files/Debian-fix-rust-linking.patch
+++ b/www-client/chromium/files/Debian-fix-rust-linking.patch
@@ -1,8 +1,6 @@
-Index: chromium-121.0.6167.75/build/toolchain/gcc_toolchain.gni
-===================================================================
---- chromium-121.0.6167.75.orig/build/toolchain/gcc_toolchain.gni
-+++ chromium-121.0.6167.75/build/toolchain/gcc_toolchain.gni
-@@ -464,7 +464,13 @@ template("single_gcc_toolchain") {
+--- a/build/toolchain/gcc_toolchain.gni 2024-08-19 14:13:35.233954725 +0200
++++ b/build/toolchain/gcc_toolchain.gni 2024-08-22 00:56:01.438433033 +0200
+@@ -441,7 +441,13 @@
# -soname flag is not available on aix ld
soname_flag = "-Wl,-soname=\"$soname\""
}
@@ -17,7 +15,7 @@ Index: chromium-121.0.6167.75/build/toolchain/gcc_toolchain.gni
# Generate a map file to be used for binary size analysis.
# Map file adds ~10% to the link time on a z620.
-@@ -576,7 +582,13 @@ template("single_gcc_toolchain") {
+@@ -553,7 +559,13 @@
whole_archive_flag = "-Wl,--whole-archive"
no_whole_archive_flag = "-Wl,--no-whole-archive"
}
@@ -32,19 +30,19 @@ Index: chromium-121.0.6167.75/build/toolchain/gcc_toolchain.gni
if (defined(invoker.strip)) {
strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\""
-@@ -615,7 +627,13 @@ template("single_gcc_toolchain")
+@@ -617,8 +629,12 @@
# We need to specify link groups, at least, for single pass linkers. I.e.
# Rust libraries are alpha-sorted instead of by dependencies so they fail
# to link if not properly ordered or grouped.
- link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" $end_group_flag {{solibs}} {{libs}} $start_group_flag {{rlibs}} $end_group_flag"
+-
+ if (target_cpu == "riscv64") {
-+ # Work around linker failures due to Rust libraries and the use of whole-archive
+ link_command = "$ld -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" @\"$rspfile\" {{solibs}} {{libs}} {{rlibs}} -Wl,--end-group"
+ }
+ else {
-+ link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" {{solibs}} $end_group_flag {{libs}} {{rlibs}}"
++ link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" $end_group_flag {{solibs}} {{libs}} $start_group_flag {{rlibs}} $end_group_flag"
+ }
-
# Generate a map file to be used for binary size analysis.
# Map file adds ~10% to the link time on a z620.
+ # With target_os="android", libchrome.so.map.gz is ~20MB.
diff --git a/www-client/chromium/files/chrome-runtime_api_delegate-add-riscv64-define.patch b/www-client/chromium/files/chrome-runtime_api_delegate-add-riscv64-define.patch
new file mode 100644
index 0000000..930574c
--- /dev/null
+++ b/www-client/chromium/files/chrome-runtime_api_delegate-add-riscv64-define.patch
@@ -0,0 +1,33 @@
+From 81033cc7b695b94f8932c29f7812c41fb057aa2b Mon Sep 17 00:00:00 2001
+From: kxxt <rsworktech@outlook.com>
+Date: Sun, 25 Aug 2024 10:46:25 +0200
+Subject: [PATCH] chrome: runtime_api_delegate: add riscv64 define
+
+---
+ .../extensions/api/runtime/chrome_runtime_api_delegate.cc | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+index 0c2f88ce0d92c..113a8e0010075 100644
+--- a/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
++++ b/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
+@@ -303,6 +303,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
+ info->arch = extensions::api::runtime::PlatformArch::kMips;
+ } else if (strcmp(arch, "mips64el") == 0) {
+ info->arch = extensions::api::runtime::PlatformArch::kMips64;
++ } else if (strcmp(arch, "riscv64") == 0) {
++ info->arch = extensions::api::runtime::PlatformArch::kRiscv64;
+ } else {
+ NOTREACHED_IN_MIGRATION();
+ return false;
+@@ -319,6 +321,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
+ info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kMips;
+ } else if (strcmp(nacl_arch, "mips64") == 0) {
+ info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kMips64;
++ } else if (strcmp(arch, "riscv64") == 0) {
++ info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kRiscv64;
+ } else {
+ NOTREACHED_IN_MIGRATION();
+ return false;
+--
+2.39.2
diff --git a/www-client/chromium/files/extensions-common-api-runtime.json-riscv64-support.patch b/www-client/chromium/files/extensions-common-api-runtime.json-riscv64-support.patch
new file mode 100644
index 0000000..5c9fec6
--- /dev/null
+++ b/www-client/chromium/files/extensions-common-api-runtime.json-riscv64-support.patch
@@ -0,0 +1,36 @@
+From 688e2d4d0880e596656f2f079357767d24950c62 Mon Sep 17 00:00:00 2001
+From: kxxt <rsworktech@outlook.com>
+Date: Sat, 10 Feb 2024 09:49:46 +0800
+Subject: [PATCH] extensions/common/api/runtime.json: riscv64 support
+
+---
+ extensions/common/api/runtime.json | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/extensions/common/api/runtime.json b/extensions/common/api/runtime.json
+index 65a024c03011e..9965a83545807 100644
+--- a/extensions/common/api/runtime.json
++++ b/extensions/common/api/runtime.json
+@@ -98,7 +98,8 @@
+ {"name": "x86-32", "description": "Specifies the processer architecture as x86-32."},
+ {"name": "x86-64", "description": "Specifies the processer architecture as x86-64."},
+ {"name": "mips", "description": "Specifies the processer architecture as mips."},
+- {"name": "mips64", "description": "Specifies the processer architecture as mips64."}
++ {"name": "mips64", "description": "Specifies the processer architecture as mips64."},
++ {"name": "riscv64", "description": "Specifies the processer architecture as riscv64."}
+ ],
+ "description": "The machine's processor architecture."
+ },
+@@ -111,7 +112,8 @@
+ {"name": "x86-32", "description": "Specifies the native client architecture as x86-32."},
+ {"name": "x86-64", "description": "Specifies the native client architecture as x86-64."},
+ {"name": "mips", "description": "Specifies the native client architecture as mips."},
+- {"name": "mips64", "description": "Specifies the native client architecture as mips64."}
++ {"name": "mips64", "description": "Specifies the native client architecture as mips64."},
++ {"name": "riscv64", "description": "Specifies the native client architecture as riscv64."}
+ ]
+ },
+ {
+--
+2.43.0
+
diff --git a/www-client/chromium/files/riscv-cargo.patch b/www-client/chromium/files/riscv-cargo.patch
new file mode 100644
index 0000000..35412dd
--- /dev/null
+++ b/www-client/chromium/files/riscv-cargo.patch
@@ -0,0 +1,32 @@
+From c50dab84e0c911f7b89532700fca27d42a77b3c1 Mon Sep 17 00:00:00 2001
+From: kxxt <rsworktech@outlook.com>
+Date: Fri, 13 Sep 2024 12:48:44 +0000
+Subject: [PATCH] cargo_crate.gni: add riscv64 and loong64 cases
+
+This CL syncs the condition of 64 bit pointer with
+https://github.com/chromium/chromium/blob/31f058a669fd063cab3439df5c877ed3005d9832/base/allocator/partition_allocator/partition_alloc.gni#L21-L24
+
+Bug: none
+Change-Id: Id2f1cfaa0c5167fb61c74505aba03716337b071f
+Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5850670
+Commit-Queue: Nico Weber <thakis@chromium.org>
+Reviewed-by: Nico Weber <thakis@chromium.org>
+Reviewed-by: Arthur Eubanks <aeubanks@google.com>
+Cr-Commit-Position: refs/heads/main@{#1355138}
+---
+
+diff --git a/build/rust/cargo_crate.gni b/build/rust/cargo_crate.gni
+index e5d1b2f8..7290451 100644
+--- a/build/rust/cargo_crate.gni
++++ b/build/rust/cargo_crate.gni
+@@ -429,7 +429,8 @@
+ rust_abi_target,
+ ]
+ }
+- if (current_cpu == "arm64" || current_cpu == "x64") {
++ if (current_cpu == "arm64" || current_cpu == "x64" ||
++ current_cpu == "loong64" || current_cpu == "riscv64") {
+ args += [
+ "--pointer-width",
+ "64",
+
diff --git a/www-client/chromium/files/riscv-ffmpeg.patch b/www-client/chromium/files/riscv-ffmpeg.patch
index f2fb1f2..6a21d07 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 2024-08-13 10:43:45.203116000 +0100
-+++ b/third_party/ffmpeg/CREDITS.chromium 2024-08-18 23:57:19.000000000 +0100
+--- a/third_party/ffmpeg/CREDITS.chromium 2024-10-02 03:50:24.635323500 +0100
++++ b/third_party/ffmpeg/CREDITS.chromium 2024-10-05 16:34:43.806521178 +0100
@@ -131,6 +131,62 @@
********************************************************************************
@@ -64,904 +64,19 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/CREDITS.chromium b/third_party/ff
libavformat/oggparsetheora.c
Copyright (C) 2005 Matthieu CASTET, Alex Beregszaszi
-@@ -157,31 +213,6 @@
-
- ********************************************************************************
-
--libavutil/x86/x86inc.asm
--
--x86inc.asm: x86 abstraction layer
--
-- Copyright (C) 2005-2024 x264 project
--
-- Authors: Loren Merritt <lorenm@u.washington.edu>
-- Henrik Gramner <henrik@gramner.com>
-- Anton Mitrofanov <BugMaster@narod.ru>
-- Fiona Glaser <fiona@x264.com>
--
-- Permission to use, copy, modify, and/or distribute this software for any
-- purpose with or without fee is hereby granted, provided that the above
-- copyright notice and this permission notice appear in all copies.
--
-- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
--
--********************************************************************************
--
- libavcodec/mips/compute_antialias_fixed.h
- libavcodec/mips/compute_antialias_float.h
- libavutil/fixed_dsp.c
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/config.h b/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/config.h
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/config.h 2024-08-13 10:43:45.215117000 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/config.h 2024-08-19 01:29:21.000000000 +0100
-@@ -1,14 +1,13 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cro
ss-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/p
rojects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang -
-enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/code
/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2024
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
--#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)"
-+#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
- #define OS_NAME darwin
--#define av_restrict restrict
- #define EXTERN_PREFIX "_"
- #define EXTERN_ASM _
- #define BUILDSUF ""
-@@ -60,6 +59,7 @@
- #define HAVE_VSX 0
- #define HAVE_RV 0
- #define HAVE_RVV 0
-+#define HAVE_RV_ZVBB 0
- #define HAVE_AESNI 0
- #define HAVE_AMD3DNOW 0
- #define HAVE_AMD3DNOWEXT 0
-@@ -78,7 +78,6 @@
- #define HAVE_SSE42 0
- #define HAVE_SSSE3 0
- #define HAVE_XOP 0
--#define HAVE_CPUNOP 0
- #define HAVE_I686 0
- #define HAVE_MIPSFPU 0
- #define HAVE_MIPS32R2 0
-@@ -112,6 +111,7 @@
- #define HAVE_VSX_EXTERNAL 0
- #define HAVE_RV_EXTERNAL 0
- #define HAVE_RVV_EXTERNAL 0
-+#define HAVE_RV_ZVBB_EXTERNAL 0
- #define HAVE_AESNI_EXTERNAL 0
- #define HAVE_AMD3DNOW_EXTERNAL 0
- #define HAVE_AMD3DNOWEXT_EXTERNAL 0
-@@ -130,7 +130,6 @@
- #define HAVE_SSE42_EXTERNAL 0
- #define HAVE_SSSE3_EXTERNAL 0
- #define HAVE_XOP_EXTERNAL 0
--#define HAVE_CPUNOP_EXTERNAL 0
- #define HAVE_I686_EXTERNAL 0
- #define HAVE_MIPSFPU_EXTERNAL 0
- #define HAVE_MIPS32R2_EXTERNAL 0
-@@ -164,6 +163,7 @@
- #define HAVE_VSX_INLINE 0
- #define HAVE_RV_INLINE 0
- #define HAVE_RVV_INLINE 0
-+#define HAVE_RV_ZVBB_INLINE 0
- #define HAVE_AESNI_INLINE 0
- #define HAVE_AMD3DNOW_INLINE 0
- #define HAVE_AMD3DNOWEXT_INLINE 0
-@@ -182,7 +182,6 @@
- #define HAVE_SSE42_INLINE 0
- #define HAVE_SSSE3_INLINE 0
- #define HAVE_XOP_INLINE 0
--#define HAVE_CPUNOP_INLINE 0
- #define HAVE_I686_INLINE 0
- #define HAVE_MIPSFPU_INLINE 0
- #define HAVE_MIPS32R2_INLINE 0
-@@ -220,6 +219,7 @@
- #define HAVE_BIGENDIAN 0
- #define HAVE_FAST_UNALIGNED 1
- #define HAVE_ARPA_INET_H 0
-+#define HAVE_ASM_HWPROBE_H 0
- #define HAVE_ASM_TYPES_H 0
- #define HAVE_CDIO_PARANOIA_H 0
- #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-@@ -246,6 +246,7 @@
- #define HAVE_OPENGL_GL3_H 0
- #define HAVE_POLL_H 1
- #define HAVE_PTHREAD_NP_H 0
-+#define HAVE_SYS_HWPROBE_H 0
- #define HAVE_SYS_PARAM_H 1
- #define HAVE_SYS_RESOURCE_H 1
- #define HAVE_SYS_SELECT_H 1
-@@ -419,6 +420,7 @@
- #define HAVE_STRUCT_SOCKADDR_STORAGE 0
- #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
- #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-+#define HAVE_STRUCT_MFXCONFIGINTERFACE 0
- #define HAVE_GZIP 1
- #define HAVE_LIBDRM_GETFB2 0
- #define HAVE_MAKEINFO 0
-@@ -429,6 +431,7 @@
- #define HAVE_OPENCL_DXVA2 0
- #define HAVE_OPENCL_VAAPI_BEIGNET 0
- #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+#define HAVE_OPENCL_VIDEOTOOLBOX 0
- #define HAVE_PERL 1
- #define HAVE_POD2MAN 1
- #define HAVE_TEXI2HTML 0
-@@ -468,6 +471,8 @@
- #define CONFIG_FREI0R 0
- #define CONFIG_LIBCDIO 0
- #define CONFIG_LIBDAVS2 0
-+#define CONFIG_LIBDVDNAV 0
-+#define CONFIG_LIBDVDREAD 0
- #define CONFIG_LIBRUBBERBAND 0
- #define CONFIG_LIBVIDSTAB 0
- #define CONFIG_LIBX264 0
-@@ -517,6 +522,7 @@
- #define CONFIG_LIBJXL 0
- #define CONFIG_LIBKLVANC 0
- #define CONFIG_LIBKVAZAAR 0
-+#define CONFIG_LIBLC3 0
- #define CONFIG_LIBMODPLUG 0
- #define CONFIG_LIBMP3LAME 0
- #define CONFIG_LIBMYSOFA 0
-@@ -547,6 +553,7 @@
- #define CONFIG_LIBTENSORFLOW 0
- #define CONFIG_LIBTESSERACT 0
- #define CONFIG_LIBTHEORA 0
-+#define CONFIG_LIBTORCH 0
- #define CONFIG_LIBTWOLAME 0
- #define CONFIG_LIBUAVS3D 0
- #define CONFIG_LIBV4L2 0
-@@ -596,7 +603,6 @@
- #define CONFIG_OPENCL 0
- #define CONFIG_AMF 0
- #define CONFIG_AUDIOTOOLBOX 0
--#define CONFIG_CRYSTALHD 0
- #define CONFIG_CUDA 0
- #define CONFIG_CUDA_LLVM 0
- #define CONFIG_CUVID 0
-@@ -640,6 +646,7 @@
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 0
- #define CONFIG_FAST_UNALIGNED 1
-+#define CONFIG_IAMF 0
- #define CONFIG_LSP 0
- #define CONFIG_PIXELUTILS 0
- #define CONFIG_NETWORK 0
-@@ -688,7 +695,8 @@
- #define CONFIG_DEFLATE_WRAPPER 0
- #define CONFIG_DIRAC_PARSE 1
- #define CONFIG_DNN 0
--#define CONFIG_DOVI_RPU 0
-+#define CONFIG_DOVI_RPUDEC 0
-+#define CONFIG_DOVI_RPUENC 0
- #define CONFIG_DVPROFILE 0
- #define CONFIG_EVCPARSE 0
- #define CONFIG_EXIF 0
-@@ -720,10 +728,12 @@
- #define CONFIG_INFLATE_WRAPPER 0
- #define CONFIG_INTRAX8 0
- #define CONFIG_ISO_MEDIA 1
-+#define CONFIG_ISO_WRITER 0
- #define CONFIG_IVIDSP 0
- #define CONFIG_JPEGTABLES 0
- #define CONFIG_LGPLV3 0
- #define CONFIG_LIBX262 0
-+#define CONFIG_LIBX264_HDR10 0
- #define CONFIG_LLAUDDSP 0
- #define CONFIG_LLVIDDSP 0
- #define CONFIG_LLVIDENCDSP 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/config_components.h b/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/config_components.h
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/config_components.h 2024-08-13 10:43:45.215117000 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/config_components.h 2024-08-19 01:29:21.000000000 +0100
-@@ -11,6 +11,7 @@
- #define CONFIG_DTS2PTS_BSF 0
- #define CONFIG_DV_ERROR_MARKER_BSF 0
- #define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EVC_FRAME_MERGE_BSF 0
- #define CONFIG_EXTRACT_EXTRADATA_BSF 0
- #define CONFIG_FILTER_UNITS_BSF 0
- #define CONFIG_H264_METADATA_BSF 0
-@@ -23,7 +24,6 @@
- #define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
- #define CONFIG_MJPEG2JPEG_BSF 0
- #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
--#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
- #define CONFIG_MPEG2_METADATA_BSF 0
- #define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
- #define CONFIG_MOV2TEXTSUB_BSF 0
-@@ -45,7 +45,6 @@
- #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
- #define CONFIG_VVC_METADATA_BSF 0
- #define CONFIG_VVC_MP4TOANNEXB_BSF 0
--#define CONFIG_EVC_FRAME_MERGE_BSF 0
- #define CONFIG_AASC_DECODER 0
- #define CONFIG_AIC_DECODER 0
- #define CONFIG_ALIAS_PIX_DECODER 0
-@@ -64,7 +63,6 @@
- #define CONFIG_AVRN_DECODER 0
- #define CONFIG_AVS_DECODER 0
- #define CONFIG_AVUI_DECODER 0
--#define CONFIG_AYUV_DECODER 0
- #define CONFIG_BETHSOFTVID_DECODER 0
- #define CONFIG_BFI_DECODER 0
- #define CONFIG_BINK_DECODER 0
-@@ -131,7 +129,6 @@
- #define CONFIG_H263P_DECODER 0
- #define CONFIG_H263_V4L2M2M_DECODER 0
- #define CONFIG_H264_DECODER 1
--#define CONFIG_H264_CRYSTALHD_DECODER 0
- #define CONFIG_H264_V4L2M2M_DECODER 0
- #define CONFIG_H264_MEDIACODEC_DECODER 0
- #define CONFIG_H264_MMAL_DECODER 0
-@@ -179,13 +176,11 @@
- #define CONFIG_MPEG1VIDEO_DECODER 0
- #define CONFIG_MPEG2VIDEO_DECODER 0
- #define CONFIG_MPEG4_DECODER 0
--#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
- #define CONFIG_MPEG4_V4L2M2M_DECODER 0
- #define CONFIG_MPEG4_MMAL_DECODER 0
- #define CONFIG_MPEGVIDEO_DECODER 0
- #define CONFIG_MPEG1_V4L2M2M_DECODER 0
- #define CONFIG_MPEG2_MMAL_DECODER 0
--#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
- #define CONFIG_MPEG2_V4L2M2M_DECODER 0
- #define CONFIG_MPEG2_QSV_DECODER 0
- #define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-@@ -194,7 +189,6 @@
- #define CONFIG_MSMPEG4V1_DECODER 0
- #define CONFIG_MSMPEG4V2_DECODER 0
- #define CONFIG_MSMPEG4V3_DECODER 0
--#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
- #define CONFIG_MSP2_DECODER 0
- #define CONFIG_MSRLE_DECODER 0
- #define CONFIG_MSS1_DECODER 0
-@@ -293,7 +287,6 @@
- #define CONFIG_VBN_DECODER 0
- #define CONFIG_VBLE_DECODER 0
- #define CONFIG_VC1_DECODER 0
--#define CONFIG_VC1_CRYSTALHD_DECODER 0
- #define CONFIG_VC1IMAGE_DECODER 0
- #define CONFIG_VC1_MMAL_DECODER 0
- #define CONFIG_VC1_QSV_DECODER 0
-@@ -325,7 +318,6 @@
- #define CONFIG_WMV1_DECODER 0
- #define CONFIG_WMV2_DECODER 0
- #define CONFIG_WMV3_DECODER 0
--#define CONFIG_WMV3_CRYSTALHD_DECODER 0
- #define CONFIG_WMV3IMAGE_DECODER 0
- #define CONFIG_WNV1_DECODER 0
- #define CONFIG_XAN_WC3_DECODER 0
-@@ -592,6 +584,7 @@
- #define CONFIG_LIBGSM_MS_DECODER 0
- #define CONFIG_LIBILBC_DECODER 0
- #define CONFIG_LIBJXL_DECODER 0
-+#define CONFIG_LIBLC3_DECODER 0
- #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
- #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
- #define CONFIG_LIBOPUS_DECODER 1
-@@ -639,7 +632,6 @@
- #define CONFIG_ASV2_ENCODER 0
- #define CONFIG_AVRP_ENCODER 0
- #define CONFIG_AVUI_ENCODER 0
--#define CONFIG_AYUV_ENCODER 0
- #define CONFIG_BITPACKED_ENCODER 0
- #define CONFIG_BMP_ENCODER 0
- #define CONFIG_CFHD_ENCODER 0
-@@ -821,6 +813,7 @@
- #define CONFIG_LIBGSM_MS_ENCODER 0
- #define CONFIG_LIBILBC_ENCODER 0
- #define CONFIG_LIBJXL_ENCODER 0
-+#define CONFIG_LIBLC3_ENCODER 0
- #define CONFIG_LIBMP3LAME_ENCODER 0
- #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
- #define CONFIG_LIBOPENJPEG_ENCODER 0
-@@ -1573,6 +1566,8 @@
- #define CONFIG_HSTACK_QSV_FILTER 0
- #define CONFIG_VSTACK_QSV_FILTER 0
- #define CONFIG_XSTACK_QSV_FILTER 0
-+#define CONFIG_PAD_VAAPI_FILTER 0
-+#define CONFIG_DRAWBOX_VAAPI_FILTER 0
- #define CONFIG_ALLRGB_FILTER 0
- #define CONFIG_ALLYUV_FILTER 0
- #define CONFIG_CELLAUTO_FILTER 0
-@@ -1706,6 +1701,7 @@
- #define CONFIG_DV_DEMUXER 0
- #define CONFIG_DVBSUB_DEMUXER 0
- #define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_DVDVIDEO_DEMUXER 0
- #define CONFIG_DXA_DEMUXER 0
- #define CONFIG_EA_DEMUXER 0
- #define CONFIG_EA_CDATA_DEMUXER 0
-@@ -1767,6 +1763,7 @@
- #define CONFIG_KUX_DEMUXER 0
- #define CONFIG_KVAG_DEMUXER 0
- #define CONFIG_LAF_DEMUXER 0
-+#define CONFIG_LC3_DEMUXER 0
- #define CONFIG_LMLM4_DEMUXER 0
- #define CONFIG_LOAS_DEMUXER 0
- #define CONFIG_LUODAT_DEMUXER 0
-@@ -1850,6 +1847,7 @@
- #define CONFIG_QOA_DEMUXER 0
- #define CONFIG_R3D_DEMUXER 0
- #define CONFIG_RAWVIDEO_DEMUXER 0
-+#define CONFIG_RCWT_DEMUXER 0
- #define CONFIG_REALTEXT_DEMUXER 0
- #define CONFIG_REDSPARK_DEMUXER 0
- #define CONFIG_RKA_DEMUXER 0
-@@ -1987,6 +1985,7 @@
- #define CONFIG_AC4_MUXER 0
- #define CONFIG_ADTS_MUXER 0
- #define CONFIG_ADX_MUXER 0
-+#define CONFIG_AEA_MUXER 0
- #define CONFIG_AIFF_MUXER 0
- #define CONFIG_ALP_MUXER 0
- #define CONFIG_AMR_MUXER 0
-@@ -2026,7 +2025,6 @@
- #define CONFIG_F4V_MUXER 0
- #define CONFIG_FFMETADATA_MUXER 0
- #define CONFIG_FIFO_MUXER 0
--#define CONFIG_FIFO_TEST_MUXER 0
- #define CONFIG_FILMSTRIP_MUXER 0
- #define CONFIG_FITS_MUXER 0
- #define CONFIG_FLAC_MUXER 0
-@@ -2060,6 +2058,7 @@
- #define CONFIG_JACOSUB_MUXER 0
- #define CONFIG_KVAG_MUXER 0
- #define CONFIG_LATM_MUXER 0
-+#define CONFIG_LC3_MUXER 0
- #define CONFIG_LRC_MUXER 0
- #define CONFIG_M4V_MUXER 0
- #define CONFIG_MD5_MUXER 0
-@@ -2162,6 +2161,7 @@
- #define CONFIG_WV_MUXER 0
- #define CONFIG_YUV4MPEGPIPE_MUXER 0
- #define CONFIG_CHROMAPRINT_MUXER 0
-+#define CONFIG_ANDROID_CONTENT_PROTOCOL 0
- #define CONFIG_ASYNC_PROTOCOL 0
- #define CONFIG_BLURAY_PROTOCOL 0
- #define CONFIG_CACHE_PROTOCOL 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/libavformat/demuxer_list.c b/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/libavformat/demuxer_list.c
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/libavformat/demuxer_list.c 2024-08-13 10:43:45.215117000 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/libavformat/demuxer_list.c 2024-08-19 01:29:21.000000000 +0100
-@@ -1,4 +1,4 @@
--static const AVInputFormat * const demuxer_list[] = {
-+static const FFInputFormat * const demuxer_list[] = {
- &ff_aac_demuxer,
- &ff_flac_demuxer,
- &ff_matroska_demuxer,
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/libavutil/ffversion.h
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/libavutil/ffversion.h 2024-08-13 10:43:45.219117400 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/arm64/libavutil/ffversion.h 2024-08-19 01:29:21.000000000 +0100
-@@ -1,5 +1,5 @@
- /* Automatically generated by version.sh, do not manually edit! */
- #ifndef AVUTIL_FFVERSION_H
- #define AVUTIL_FFVERSION_H
--#define FFMPEG_VERSION "N-115016-g631703bfb9"
-+#define FFMPEG_VERSION "N-116569-gd0c8e13654"
- #endif /* AVUTIL_FFVERSION_H */
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config.asm b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config.asm
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config.asm 2024-08-13 10:43:45.219117400 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config.asm 2024-08-19 01:29:21.000000000 +0100
-@@ -44,6 +44,7 @@
- %define HAVE_VSX 0
- %define HAVE_RV 0
- %define HAVE_RVV 0
-+%define HAVE_RV_ZVBB 0
- %define HAVE_AESNI 1
- %define HAVE_AMD3DNOW 1
- %define HAVE_AMD3DNOWEXT 1
-@@ -62,7 +63,6 @@
- %define HAVE_SSE42 1
- %define HAVE_SSSE3 1
- %define HAVE_XOP 1
--%define HAVE_CPUNOP 0
- %define HAVE_I686 1
- %define HAVE_MIPSFPU 0
- %define HAVE_MIPS32R2 0
-@@ -96,6 +96,7 @@
- %define HAVE_VSX_EXTERNAL 0
- %define HAVE_RV_EXTERNAL 0
- %define HAVE_RVV_EXTERNAL 0
-+%define HAVE_RV_ZVBB_EXTERNAL 0
- %define HAVE_AESNI_EXTERNAL 1
- %define HAVE_AMD3DNOW_EXTERNAL 1
- %define HAVE_AMD3DNOWEXT_EXTERNAL 1
-@@ -114,7 +115,6 @@
- %define HAVE_SSE42_EXTERNAL 1
- %define HAVE_SSSE3_EXTERNAL 1
- %define HAVE_XOP_EXTERNAL 1
--%define HAVE_CPUNOP_EXTERNAL 0
- %define HAVE_I686_EXTERNAL 0
- %define HAVE_MIPSFPU_EXTERNAL 0
- %define HAVE_MIPS32R2_EXTERNAL 0
-@@ -148,6 +148,7 @@
- %define HAVE_VSX_INLINE 0
- %define HAVE_RV_INLINE 0
- %define HAVE_RVV_INLINE 0
-+%define HAVE_RV_ZVBB_INLINE 0
- %define HAVE_AESNI_INLINE 1
- %define HAVE_AMD3DNOW_INLINE 1
- %define HAVE_AMD3DNOWEXT_INLINE 1
-@@ -166,7 +167,6 @@
- %define HAVE_SSE42_INLINE 1
- %define HAVE_SSSE3_INLINE 1
- %define HAVE_XOP_INLINE 1
--%define HAVE_CPUNOP_INLINE 0
- %define HAVE_I686_INLINE 0
- %define HAVE_MIPSFPU_INLINE 0
- %define HAVE_MIPS32R2_INLINE 0
-@@ -204,6 +204,7 @@
- %define HAVE_BIGENDIAN 0
- %define HAVE_FAST_UNALIGNED 1
- %define HAVE_ARPA_INET_H 0
-+%define HAVE_ASM_HWPROBE_H 0
- %define HAVE_ASM_TYPES_H 0
- %define HAVE_CDIO_PARANOIA_H 0
- %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-@@ -230,6 +231,7 @@
- %define HAVE_OPENGL_GL3_H 0
- %define HAVE_POLL_H 1
- %define HAVE_PTHREAD_NP_H 0
-+%define HAVE_SYS_HWPROBE_H 0
- %define HAVE_SYS_PARAM_H 1
- %define HAVE_SYS_RESOURCE_H 1
- %define HAVE_SYS_SELECT_H 1
-@@ -403,6 +405,7 @@
- %define HAVE_STRUCT_SOCKADDR_STORAGE 0
- %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
- %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-+%define HAVE_STRUCT_MFXCONFIGINTERFACE 0
- %define HAVE_GZIP 1
- %define HAVE_LIBDRM_GETFB2 0
- %define HAVE_MAKEINFO 0
-@@ -413,6 +416,7 @@
- %define HAVE_OPENCL_DXVA2 0
- %define HAVE_OPENCL_VAAPI_BEIGNET 0
- %define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+%define HAVE_OPENCL_VIDEOTOOLBOX 0
- %define HAVE_PERL 1
- %define HAVE_POD2MAN 1
- %define HAVE_TEXI2HTML 0
-@@ -452,6 +456,8 @@
- %define CONFIG_FREI0R 0
- %define CONFIG_LIBCDIO 0
- %define CONFIG_LIBDAVS2 0
-+%define CONFIG_LIBDVDNAV 0
-+%define CONFIG_LIBDVDREAD 0
- %define CONFIG_LIBRUBBERBAND 0
- %define CONFIG_LIBVIDSTAB 0
- %define CONFIG_LIBX264 0
-@@ -501,6 +507,7 @@
- %define CONFIG_LIBJXL 0
- %define CONFIG_LIBKLVANC 0
- %define CONFIG_LIBKVAZAAR 0
-+%define CONFIG_LIBLC3 0
- %define CONFIG_LIBMODPLUG 0
- %define CONFIG_LIBMP3LAME 0
- %define CONFIG_LIBMYSOFA 0
-@@ -531,6 +538,7 @@
- %define CONFIG_LIBTENSORFLOW 0
- %define CONFIG_LIBTESSERACT 0
- %define CONFIG_LIBTHEORA 0
-+%define CONFIG_LIBTORCH 0
- %define CONFIG_LIBTWOLAME 0
- %define CONFIG_LIBUAVS3D 0
- %define CONFIG_LIBV4L2 0
-@@ -580,7 +588,6 @@
- %define CONFIG_OPENCL 0
- %define CONFIG_AMF 0
- %define CONFIG_AUDIOTOOLBOX 0
--%define CONFIG_CRYSTALHD 0
- %define CONFIG_CUDA 0
- %define CONFIG_CUDA_LLVM 0
- %define CONFIG_CUVID 0
-@@ -624,6 +631,7 @@
- %define CONFIG_ERROR_RESILIENCE 0
- %define CONFIG_FAAN 0
- %define CONFIG_FAST_UNALIGNED 1
-+%define CONFIG_IAMF 0
- %define CONFIG_LSP 0
- %define CONFIG_PIXELUTILS 0
- %define CONFIG_NETWORK 0
-@@ -672,7 +680,8 @@
- %define CONFIG_DEFLATE_WRAPPER 0
- %define CONFIG_DIRAC_PARSE 1
- %define CONFIG_DNN 0
--%define CONFIG_DOVI_RPU 0
-+%define CONFIG_DOVI_RPUDEC 0
-+%define CONFIG_DOVI_RPUENC 0
- %define CONFIG_DVPROFILE 0
- %define CONFIG_EVCPARSE 0
- %define CONFIG_EXIF 0
-@@ -704,10 +713,12 @@
- %define CONFIG_INFLATE_WRAPPER 0
- %define CONFIG_INTRAX8 0
- %define CONFIG_ISO_MEDIA 1
-+%define CONFIG_ISO_WRITER 0
- %define CONFIG_IVIDSP 0
- %define CONFIG_JPEGTABLES 0
- %define CONFIG_LGPLV3 0
- %define CONFIG_LIBX262 0
-+%define CONFIG_LIBX264_HDR10 0
- %define CONFIG_LLAUDDSP 0
- %define CONFIG_LLVIDDSP 0
- %define CONFIG_LLVIDENCDSP 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config.h b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config.h
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config.h 2024-08-13 10:43:45.219117400 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config.h 2024-08-19 01:29:21.000000000 +0100
-@@ -1,14 +1,13 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cro
ss-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/
projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang -
-enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/cod
e/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2024
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
--#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)"
-+#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
- #define OS_NAME darwin
--#define av_restrict restrict
- #define EXTERN_PREFIX "_"
- #define EXTERN_ASM _
- #define BUILDSUF ""
-@@ -59,6 +58,7 @@
- #define HAVE_VSX 0
- #define HAVE_RV 0
- #define HAVE_RVV 0
-+#define HAVE_RV_ZVBB 0
- #define HAVE_AESNI 1
- #define HAVE_AMD3DNOW 1
- #define HAVE_AMD3DNOWEXT 1
-@@ -77,7 +77,6 @@
- #define HAVE_SSE42 1
- #define HAVE_SSSE3 1
- #define HAVE_XOP 1
--#define HAVE_CPUNOP 0
- #define HAVE_I686 1
- #define HAVE_MIPSFPU 0
- #define HAVE_MIPS32R2 0
-@@ -111,6 +110,7 @@
- #define HAVE_VSX_EXTERNAL 0
- #define HAVE_RV_EXTERNAL 0
- #define HAVE_RVV_EXTERNAL 0
-+#define HAVE_RV_ZVBB_EXTERNAL 0
- #define HAVE_AESNI_EXTERNAL 1
- #define HAVE_AMD3DNOW_EXTERNAL 1
- #define HAVE_AMD3DNOWEXT_EXTERNAL 1
-@@ -129,7 +129,6 @@
- #define HAVE_SSE42_EXTERNAL 1
- #define HAVE_SSSE3_EXTERNAL 1
- #define HAVE_XOP_EXTERNAL 1
--#define HAVE_CPUNOP_EXTERNAL 0
- #define HAVE_I686_EXTERNAL 0
- #define HAVE_MIPSFPU_EXTERNAL 0
- #define HAVE_MIPS32R2_EXTERNAL 0
-@@ -163,6 +162,7 @@
- #define HAVE_VSX_INLINE 0
- #define HAVE_RV_INLINE 0
- #define HAVE_RVV_INLINE 0
-+#define HAVE_RV_ZVBB_INLINE 0
- #define HAVE_AESNI_INLINE 1
- #define HAVE_AMD3DNOW_INLINE 1
- #define HAVE_AMD3DNOWEXT_INLINE 1
-@@ -181,7 +181,6 @@
- #define HAVE_SSE42_INLINE 1
- #define HAVE_SSSE3_INLINE 1
- #define HAVE_XOP_INLINE 1
--#define HAVE_CPUNOP_INLINE 0
- #define HAVE_I686_INLINE 0
- #define HAVE_MIPSFPU_INLINE 0
- #define HAVE_MIPS32R2_INLINE 0
-@@ -219,6 +218,7 @@
- #define HAVE_BIGENDIAN 0
- #define HAVE_FAST_UNALIGNED 1
- #define HAVE_ARPA_INET_H 0
-+#define HAVE_ASM_HWPROBE_H 0
- #define HAVE_ASM_TYPES_H 0
- #define HAVE_CDIO_PARANOIA_H 0
- #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-@@ -245,6 +245,7 @@
- #define HAVE_OPENGL_GL3_H 0
- #define HAVE_POLL_H 1
- #define HAVE_PTHREAD_NP_H 0
-+#define HAVE_SYS_HWPROBE_H 0
- #define HAVE_SYS_PARAM_H 1
- #define HAVE_SYS_RESOURCE_H 1
- #define HAVE_SYS_SELECT_H 1
-@@ -418,6 +419,7 @@
- #define HAVE_STRUCT_SOCKADDR_STORAGE 0
- #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
- #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-+#define HAVE_STRUCT_MFXCONFIGINTERFACE 0
- #define HAVE_GZIP 1
- #define HAVE_LIBDRM_GETFB2 0
- #define HAVE_MAKEINFO 0
-@@ -428,6 +430,7 @@
- #define HAVE_OPENCL_DXVA2 0
- #define HAVE_OPENCL_VAAPI_BEIGNET 0
- #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+#define HAVE_OPENCL_VIDEOTOOLBOX 0
- #define HAVE_PERL 1
- #define HAVE_POD2MAN 1
- #define HAVE_TEXI2HTML 0
-@@ -467,6 +470,8 @@
- #define CONFIG_FREI0R 0
- #define CONFIG_LIBCDIO 0
- #define CONFIG_LIBDAVS2 0
-+#define CONFIG_LIBDVDNAV 0
-+#define CONFIG_LIBDVDREAD 0
- #define CONFIG_LIBRUBBERBAND 0
- #define CONFIG_LIBVIDSTAB 0
- #define CONFIG_LIBX264 0
-@@ -516,6 +521,7 @@
- #define CONFIG_LIBJXL 0
- #define CONFIG_LIBKLVANC 0
- #define CONFIG_LIBKVAZAAR 0
-+#define CONFIG_LIBLC3 0
- #define CONFIG_LIBMODPLUG 0
- #define CONFIG_LIBMP3LAME 0
- #define CONFIG_LIBMYSOFA 0
-@@ -546,6 +552,7 @@
- #define CONFIG_LIBTENSORFLOW 0
- #define CONFIG_LIBTESSERACT 0
- #define CONFIG_LIBTHEORA 0
-+#define CONFIG_LIBTORCH 0
- #define CONFIG_LIBTWOLAME 0
- #define CONFIG_LIBUAVS3D 0
- #define CONFIG_LIBV4L2 0
-@@ -595,7 +602,6 @@
- #define CONFIG_OPENCL 0
- #define CONFIG_AMF 0
- #define CONFIG_AUDIOTOOLBOX 0
--#define CONFIG_CRYSTALHD 0
- #define CONFIG_CUDA 0
- #define CONFIG_CUDA_LLVM 0
- #define CONFIG_CUVID 0
-@@ -639,6 +645,7 @@
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 0
- #define CONFIG_FAST_UNALIGNED 1
-+#define CONFIG_IAMF 0
- #define CONFIG_LSP 0
- #define CONFIG_PIXELUTILS 0
- #define CONFIG_NETWORK 0
-@@ -687,7 +694,8 @@
- #define CONFIG_DEFLATE_WRAPPER 0
- #define CONFIG_DIRAC_PARSE 1
- #define CONFIG_DNN 0
--#define CONFIG_DOVI_RPU 0
-+#define CONFIG_DOVI_RPUDEC 0
-+#define CONFIG_DOVI_RPUENC 0
- #define CONFIG_DVPROFILE 0
- #define CONFIG_EVCPARSE 0
- #define CONFIG_EXIF 0
-@@ -719,10 +727,12 @@
- #define CONFIG_INFLATE_WRAPPER 0
- #define CONFIG_INTRAX8 0
- #define CONFIG_ISO_MEDIA 1
-+#define CONFIG_ISO_WRITER 0
- #define CONFIG_IVIDSP 0
- #define CONFIG_JPEGTABLES 0
- #define CONFIG_LGPLV3 0
- #define CONFIG_LIBX262 0
-+#define CONFIG_LIBX264_HDR10 0
- #define CONFIG_LLAUDDSP 0
- #define CONFIG_LLVIDDSP 0
- #define CONFIG_LLVIDENCDSP 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config_components.h b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config_components.h
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config_components.h 2024-08-13 10:43:45.219117400 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/config_components.h 2024-08-19 01:29:21.000000000 +0100
-@@ -11,6 +11,7 @@
- #define CONFIG_DTS2PTS_BSF 0
- #define CONFIG_DV_ERROR_MARKER_BSF 0
- #define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EVC_FRAME_MERGE_BSF 0
- #define CONFIG_EXTRACT_EXTRADATA_BSF 0
- #define CONFIG_FILTER_UNITS_BSF 0
- #define CONFIG_H264_METADATA_BSF 0
-@@ -23,7 +24,6 @@
- #define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
- #define CONFIG_MJPEG2JPEG_BSF 0
- #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
--#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
- #define CONFIG_MPEG2_METADATA_BSF 0
- #define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
- #define CONFIG_MOV2TEXTSUB_BSF 0
-@@ -45,7 +45,6 @@
- #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
- #define CONFIG_VVC_METADATA_BSF 0
- #define CONFIG_VVC_MP4TOANNEXB_BSF 0
--#define CONFIG_EVC_FRAME_MERGE_BSF 0
- #define CONFIG_AASC_DECODER 0
- #define CONFIG_AIC_DECODER 0
- #define CONFIG_ALIAS_PIX_DECODER 0
-@@ -64,7 +63,6 @@
- #define CONFIG_AVRN_DECODER 0
- #define CONFIG_AVS_DECODER 0
- #define CONFIG_AVUI_DECODER 0
--#define CONFIG_AYUV_DECODER 0
- #define CONFIG_BETHSOFTVID_DECODER 0
- #define CONFIG_BFI_DECODER 0
- #define CONFIG_BINK_DECODER 0
-@@ -131,7 +129,6 @@
- #define CONFIG_H263P_DECODER 0
- #define CONFIG_H263_V4L2M2M_DECODER 0
- #define CONFIG_H264_DECODER 1
--#define CONFIG_H264_CRYSTALHD_DECODER 0
- #define CONFIG_H264_V4L2M2M_DECODER 0
- #define CONFIG_H264_MEDIACODEC_DECODER 0
- #define CONFIG_H264_MMAL_DECODER 0
-@@ -179,13 +176,11 @@
- #define CONFIG_MPEG1VIDEO_DECODER 0
- #define CONFIG_MPEG2VIDEO_DECODER 0
- #define CONFIG_MPEG4_DECODER 0
--#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
- #define CONFIG_MPEG4_V4L2M2M_DECODER 0
- #define CONFIG_MPEG4_MMAL_DECODER 0
- #define CONFIG_MPEGVIDEO_DECODER 0
- #define CONFIG_MPEG1_V4L2M2M_DECODER 0
- #define CONFIG_MPEG2_MMAL_DECODER 0
--#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
- #define CONFIG_MPEG2_V4L2M2M_DECODER 0
- #define CONFIG_MPEG2_QSV_DECODER 0
- #define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-@@ -194,7 +189,6 @@
- #define CONFIG_MSMPEG4V1_DECODER 0
- #define CONFIG_MSMPEG4V2_DECODER 0
- #define CONFIG_MSMPEG4V3_DECODER 0
--#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
- #define CONFIG_MSP2_DECODER 0
- #define CONFIG_MSRLE_DECODER 0
- #define CONFIG_MSS1_DECODER 0
-@@ -293,7 +287,6 @@
- #define CONFIG_VBN_DECODER 0
- #define CONFIG_VBLE_DECODER 0
- #define CONFIG_VC1_DECODER 0
--#define CONFIG_VC1_CRYSTALHD_DECODER 0
- #define CONFIG_VC1IMAGE_DECODER 0
- #define CONFIG_VC1_MMAL_DECODER 0
- #define CONFIG_VC1_QSV_DECODER 0
-@@ -325,7 +318,6 @@
- #define CONFIG_WMV1_DECODER 0
- #define CONFIG_WMV2_DECODER 0
- #define CONFIG_WMV3_DECODER 0
--#define CONFIG_WMV3_CRYSTALHD_DECODER 0
- #define CONFIG_WMV3IMAGE_DECODER 0
- #define CONFIG_WNV1_DECODER 0
- #define CONFIG_XAN_WC3_DECODER 0
-@@ -592,6 +584,7 @@
- #define CONFIG_LIBGSM_MS_DECODER 0
- #define CONFIG_LIBILBC_DECODER 0
- #define CONFIG_LIBJXL_DECODER 0
-+#define CONFIG_LIBLC3_DECODER 0
- #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
- #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
- #define CONFIG_LIBOPUS_DECODER 1
-@@ -639,7 +632,6 @@
- #define CONFIG_ASV2_ENCODER 0
- #define CONFIG_AVRP_ENCODER 0
- #define CONFIG_AVUI_ENCODER 0
--#define CONFIG_AYUV_ENCODER 0
- #define CONFIG_BITPACKED_ENCODER 0
- #define CONFIG_BMP_ENCODER 0
- #define CONFIG_CFHD_ENCODER 0
-@@ -821,6 +813,7 @@
- #define CONFIG_LIBGSM_MS_ENCODER 0
- #define CONFIG_LIBILBC_ENCODER 0
- #define CONFIG_LIBJXL_ENCODER 0
-+#define CONFIG_LIBLC3_ENCODER 0
- #define CONFIG_LIBMP3LAME_ENCODER 0
- #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
- #define CONFIG_LIBOPENJPEG_ENCODER 0
-@@ -1573,6 +1566,8 @@
- #define CONFIG_HSTACK_QSV_FILTER 0
- #define CONFIG_VSTACK_QSV_FILTER 0
- #define CONFIG_XSTACK_QSV_FILTER 0
-+#define CONFIG_PAD_VAAPI_FILTER 0
-+#define CONFIG_DRAWBOX_VAAPI_FILTER 0
- #define CONFIG_ALLRGB_FILTER 0
- #define CONFIG_ALLYUV_FILTER 0
- #define CONFIG_CELLAUTO_FILTER 0
-@@ -1706,6 +1701,7 @@
- #define CONFIG_DV_DEMUXER 0
- #define CONFIG_DVBSUB_DEMUXER 0
- #define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_DVDVIDEO_DEMUXER 0
- #define CONFIG_DXA_DEMUXER 0
- #define CONFIG_EA_DEMUXER 0
- #define CONFIG_EA_CDATA_DEMUXER 0
-@@ -1767,6 +1763,7 @@
- #define CONFIG_KUX_DEMUXER 0
- #define CONFIG_KVAG_DEMUXER 0
- #define CONFIG_LAF_DEMUXER 0
-+#define CONFIG_LC3_DEMUXER 0
- #define CONFIG_LMLM4_DEMUXER 0
- #define CONFIG_LOAS_DEMUXER 0
- #define CONFIG_LUODAT_DEMUXER 0
-@@ -1850,6 +1847,7 @@
- #define CONFIG_QOA_DEMUXER 0
- #define CONFIG_R3D_DEMUXER 0
- #define CONFIG_RAWVIDEO_DEMUXER 0
-+#define CONFIG_RCWT_DEMUXER 0
- #define CONFIG_REALTEXT_DEMUXER 0
- #define CONFIG_REDSPARK_DEMUXER 0
- #define CONFIG_RKA_DEMUXER 0
-@@ -1987,6 +1985,7 @@
- #define CONFIG_AC4_MUXER 0
- #define CONFIG_ADTS_MUXER 0
- #define CONFIG_ADX_MUXER 0
-+#define CONFIG_AEA_MUXER 0
- #define CONFIG_AIFF_MUXER 0
- #define CONFIG_ALP_MUXER 0
- #define CONFIG_AMR_MUXER 0
-@@ -2026,7 +2025,6 @@
- #define CONFIG_F4V_MUXER 0
- #define CONFIG_FFMETADATA_MUXER 0
- #define CONFIG_FIFO_MUXER 0
--#define CONFIG_FIFO_TEST_MUXER 0
- #define CONFIG_FILMSTRIP_MUXER 0
- #define CONFIG_FITS_MUXER 0
- #define CONFIG_FLAC_MUXER 0
-@@ -2060,6 +2058,7 @@
- #define CONFIG_JACOSUB_MUXER 0
- #define CONFIG_KVAG_MUXER 0
- #define CONFIG_LATM_MUXER 0
-+#define CONFIG_LC3_MUXER 0
- #define CONFIG_LRC_MUXER 0
- #define CONFIG_M4V_MUXER 0
- #define CONFIG_MD5_MUXER 0
-@@ -2162,6 +2161,7 @@
- #define CONFIG_WV_MUXER 0
- #define CONFIG_YUV4MPEGPIPE_MUXER 0
- #define CONFIG_CHROMAPRINT_MUXER 0
-+#define CONFIG_ANDROID_CONTENT_PROTOCOL 0
- #define CONFIG_ASYNC_PROTOCOL 0
- #define CONFIG_BLURAY_PROTOCOL 0
- #define CONFIG_CACHE_PROTOCOL 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/libavformat/demuxer_list.c b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/libavformat/demuxer_list.c
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/libavformat/demuxer_list.c 2024-08-13 10:43:45.219117400 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/libavformat/demuxer_list.c 2024-08-19 01:29:21.000000000 +0100
-@@ -1,4 +1,4 @@
--static const AVInputFormat * const demuxer_list[] = {
-+static const FFInputFormat * const demuxer_list[] = {
- &ff_aac_demuxer,
- &ff_flac_demuxer,
- &ff_matroska_demuxer,
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/libavutil/ffversion.h
---- a/third_party/ffmpeg/chromium/config/Chrome/ios/x64/libavutil/ffversion.h 2024-08-13 10:43:45.219117400 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chrome/ios/x64/libavutil/ffversion.h 2024-08-19 01:29:21.000000000 +0100
-@@ -1,5 +1,5 @@
- /* Automatically generated by version.sh, do not manually edit! */
- #ifndef AVUTIL_FFVERSION_H
- #define AVUTIL_FFVERSION_H
--#define FFMPEG_VERSION "N-115016-g631703bfb9"
-+#define FFMPEG_VERSION "N-116569-gd0c8e13654"
- #endif /* AVUTIL_FFVERSION_H */
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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config.h 2024-10-05 16:34:43.806521178 +0100
@@ -0,0 +1,782 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/media/Recorded_TV/chrome/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=riscv64 --extra-cflags='-march=rv64gc' --enable-cross-
compile --target-os=linux --sysroot=/media/Recorded_TV/chrome/chromium/src/build/linux/debian_sid_riscv64-sysroot --extra-cflags='--target=riscv64-linux-gnu' --extra-ldflags='--target=riscv64-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/porter/Workspaces/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=riscv64 --extra-cflags='-march=rv64gc' --enable-cross-co
mpile --target-os=linux --sysroot=/home/porter/Workspaces/chromium/src/build/linux/debian_sid_riscv64-sysroot --extra-cflags='--target=riscv64-linux-gnu' --extra-ldflags='--target=riscv64-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define CONFIG_THIS_YEAR 2024
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
++#define CC_IDENT "clang version 20.0.0git (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 7088a5ed880f29129ec844c66068e8cb61ca98bf)"
+#define OS_NAME linux
+#define EXTERN_PREFIX ""
+#define EXTERN_ASM
@@ -1200,7 +315,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc
+#define HAVE_OPENGL_GL3_H 0
+#define HAVE_POLL_H 1
+#define HAVE_PTHREAD_NP_H 0
-+#define HAVE_SYS_HWPROBE_H 0
++#define HAVE_SYS_HWPROBE_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SYS_SELECT_H 1
@@ -1335,7 +450,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/risc
+#define HAVE_INLINE_ASM_LABELS 1
+#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+#define HAVE_PRAGMA_DEPRECATED 1
-+#define HAVE_RSYNC_CONTIMEOUT 1
++#define HAVE_RSYNC_CONTIMEOUT 0
+#define HAVE_SYMVER_ASM_LABEL 1
+#define HAVE_SYMVER_GNU_ASM 1
+#define HAVE_VFP_ARGS 0
@@ -1737,7 +852,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config_components.h 2024-10-05 16:34:43.813187846 +0100
@@ -0,0 +1,2218 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H
@@ -3959,13 +3074,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/bsf_list.c 2024-10-05 16:34:43.813187846 +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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/codec_list.c 2024-10-05 16:34:43.813187846 +0100
@@ -0,0 +1,17 @@
+static const FFCodec * const codec_list[] = {
+ &ff_h264_decoder,
@@ -3986,7 +3101,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/parser_list.c 2024-10-05 16:34:43.813187846 +0100
@@ -0,0 +1,9 @@
+static const AVCodecParser * const parser_list[] = {
+ &ff_aac_parser,
@@ -3999,7 +3114,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c 2024-10-05 16:34:43.813187846 +0100
@@ -0,0 +1,9 @@
+static const FFInputFormat * const demuxer_list[] = {
+ &ff_aac_demuxer,
@@ -4012,19 +3127,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/muxer_list.c 2024-10-05 16:34:43.813187846 +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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/protocol_list.c 2024-10-05 16:34:43.813187846 +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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/avconfig.h 2024-10-05 16:34:43.816521179 +0100
@@ -0,0 +1,6 @@
+/* Generated by ffmpeg configure */
+#ifndef AVUTIL_AVCONFIG_H
@@ -4034,879 +3149,115 @@ 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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.h 2024-10-05 16:34:43.816521179 +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-2024-05-24-bc1ee906ce"
++#define FFMPEG_VERSION "git-2024-08-15-14d16cd143"
+#endif /* AVUTIL_FFVERSION_H */
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/config.h b/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/config.h
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/config.h 2024-08-13 10:43:45.235118600 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/config.h 2024-08-19 01:29:20.000000000 +0100
-@@ -1,14 +1,13 @@
- /* Automatically generated by configure - do not modify! */
- #ifndef FFMPEG_CONFIG_H
- #define FFMPEG_CONFIG_H
--/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cro
ss-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/p
rojects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64'" -- elide long configuration string from binary */
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang -
-enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/code
/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64'" -- elide long configuration string from binary */
- #define FFMPEG_LICENSE "LGPL version 2.1 or later"
- #define CONFIG_THIS_YEAR 2024
- #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
- #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
--#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)"
-+#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
- #define OS_NAME darwin
--#define av_restrict restrict
- #define EXTERN_PREFIX "_"
- #define EXTERN_ASM _
- #define BUILDSUF ""
-@@ -60,6 +59,7 @@
- #define HAVE_VSX 0
- #define HAVE_RV 0
- #define HAVE_RVV 0
-+#define HAVE_RV_ZVBB 0
- #define HAVE_AESNI 0
- #define HAVE_AMD3DNOW 0
- #define HAVE_AMD3DNOWEXT 0
-@@ -78,7 +78,6 @@
- #define HAVE_SSE42 0
- #define HAVE_SSSE3 0
- #define HAVE_XOP 0
--#define HAVE_CPUNOP 0
- #define HAVE_I686 0
- #define HAVE_MIPSFPU 0
- #define HAVE_MIPS32R2 0
-@@ -112,6 +111,7 @@
- #define HAVE_VSX_EXTERNAL 0
- #define HAVE_RV_EXTERNAL 0
- #define HAVE_RVV_EXTERNAL 0
-+#define HAVE_RV_ZVBB_EXTERNAL 0
- #define HAVE_AESNI_EXTERNAL 0
- #define HAVE_AMD3DNOW_EXTERNAL 0
- #define HAVE_AMD3DNOWEXT_EXTERNAL 0
-@@ -130,7 +130,6 @@
- #define HAVE_SSE42_EXTERNAL 0
- #define HAVE_SSSE3_EXTERNAL 0
- #define HAVE_XOP_EXTERNAL 0
--#define HAVE_CPUNOP_EXTERNAL 0
- #define HAVE_I686_EXTERNAL 0
- #define HAVE_MIPSFPU_EXTERNAL 0
- #define HAVE_MIPS32R2_EXTERNAL 0
-@@ -164,6 +163,7 @@
- #define HAVE_VSX_INLINE 0
- #define HAVE_RV_INLINE 0
- #define HAVE_RVV_INLINE 0
-+#define HAVE_RV_ZVBB_INLINE 0
- #define HAVE_AESNI_INLINE 0
- #define HAVE_AMD3DNOW_INLINE 0
- #define HAVE_AMD3DNOWEXT_INLINE 0
-@@ -182,7 +182,6 @@
- #define HAVE_SSE42_INLINE 0
- #define HAVE_SSSE3_INLINE 0
- #define HAVE_XOP_INLINE 0
--#define HAVE_CPUNOP_INLINE 0
- #define HAVE_I686_INLINE 0
- #define HAVE_MIPSFPU_INLINE 0
- #define HAVE_MIPS32R2_INLINE 0
-@@ -220,6 +219,7 @@
- #define HAVE_BIGENDIAN 0
- #define HAVE_FAST_UNALIGNED 1
- #define HAVE_ARPA_INET_H 0
-+#define HAVE_ASM_HWPROBE_H 0
- #define HAVE_ASM_TYPES_H 0
- #define HAVE_CDIO_PARANOIA_H 0
- #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-@@ -246,6 +246,7 @@
- #define HAVE_OPENGL_GL3_H 0
- #define HAVE_POLL_H 1
- #define HAVE_PTHREAD_NP_H 0
-+#define HAVE_SYS_HWPROBE_H 0
- #define HAVE_SYS_PARAM_H 1
- #define HAVE_SYS_RESOURCE_H 1
- #define HAVE_SYS_SELECT_H 1
-@@ -419,6 +420,7 @@
- #define HAVE_STRUCT_SOCKADDR_STORAGE 0
- #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
- #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-+#define HAVE_STRUCT_MFXCONFIGINTERFACE 0
- #define HAVE_GZIP 1
- #define HAVE_LIBDRM_GETFB2 0
- #define HAVE_MAKEINFO 0
-@@ -429,6 +431,7 @@
- #define HAVE_OPENCL_DXVA2 0
- #define HAVE_OPENCL_VAAPI_BEIGNET 0
- #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+#define HAVE_OPENCL_VIDEOTOOLBOX 0
- #define HAVE_PERL 1
- #define HAVE_POD2MAN 1
- #define HAVE_TEXI2HTML 0
-@@ -468,6 +471,8 @@
- #define CONFIG_FREI0R 0
- #define CONFIG_LIBCDIO 0
- #define CONFIG_LIBDAVS2 0
-+#define CONFIG_LIBDVDNAV 0
-+#define CONFIG_LIBDVDREAD 0
- #define CONFIG_LIBRUBBERBAND 0
- #define CONFIG_LIBVIDSTAB 0
- #define CONFIG_LIBX264 0
-@@ -517,6 +522,7 @@
- #define CONFIG_LIBJXL 0
- #define CONFIG_LIBKLVANC 0
- #define CONFIG_LIBKVAZAAR 0
-+#define CONFIG_LIBLC3 0
- #define CONFIG_LIBMODPLUG 0
- #define CONFIG_LIBMP3LAME 0
- #define CONFIG_LIBMYSOFA 0
-@@ -547,6 +553,7 @@
- #define CONFIG_LIBTENSORFLOW 0
- #define CONFIG_LIBTESSERACT 0
- #define CONFIG_LIBTHEORA 0
-+#define CONFIG_LIBTORCH 0
- #define CONFIG_LIBTWOLAME 0
- #define CONFIG_LIBUAVS3D 0
- #define CONFIG_LIBV4L2 0
-@@ -596,7 +603,6 @@
- #define CONFIG_OPENCL 0
- #define CONFIG_AMF 0
- #define CONFIG_AUDIOTOOLBOX 0
--#define CONFIG_CRYSTALHD 0
- #define CONFIG_CUDA 0
- #define CONFIG_CUDA_LLVM 0
- #define CONFIG_CUVID 0
-@@ -640,6 +646,7 @@
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 0
- #define CONFIG_FAST_UNALIGNED 1
-+#define CONFIG_IAMF 0
- #define CONFIG_LSP 0
- #define CONFIG_PIXELUTILS 0
- #define CONFIG_NETWORK 0
-@@ -688,7 +695,8 @@
- #define CONFIG_DEFLATE_WRAPPER 0
- #define CONFIG_DIRAC_PARSE 1
- #define CONFIG_DNN 0
--#define CONFIG_DOVI_RPU 0
-+#define CONFIG_DOVI_RPUDEC 0
-+#define CONFIG_DOVI_RPUENC 0
- #define CONFIG_DVPROFILE 0
- #define CONFIG_EVCPARSE 0
- #define CONFIG_EXIF 0
-@@ -720,10 +728,12 @@
- #define CONFIG_INFLATE_WRAPPER 0
- #define CONFIG_INTRAX8 0
- #define CONFIG_ISO_MEDIA 1
-+#define CONFIG_ISO_WRITER 0
- #define CONFIG_IVIDSP 0
- #define CONFIG_JPEGTABLES 0
- #define CONFIG_LGPLV3 0
- #define CONFIG_LIBX262 0
-+#define CONFIG_LIBX264_HDR10 0
- #define CONFIG_LLAUDDSP 0
- #define CONFIG_LLVIDDSP 0
- #define CONFIG_LLVIDENCDSP 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/config_components.h b/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/config_components.h
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/config_components.h 2024-08-13 10:43:45.235118600 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/config_components.h 2024-08-19 01:29:21.000000000 +0100
-@@ -11,6 +11,7 @@
- #define CONFIG_DTS2PTS_BSF 0
- #define CONFIG_DV_ERROR_MARKER_BSF 0
- #define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EVC_FRAME_MERGE_BSF 0
- #define CONFIG_EXTRACT_EXTRADATA_BSF 0
- #define CONFIG_FILTER_UNITS_BSF 0
- #define CONFIG_H264_METADATA_BSF 0
-@@ -23,7 +24,6 @@
- #define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
- #define CONFIG_MJPEG2JPEG_BSF 0
- #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
--#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
- #define CONFIG_MPEG2_METADATA_BSF 0
- #define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
- #define CONFIG_MOV2TEXTSUB_BSF 0
-@@ -45,7 +45,6 @@
- #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
- #define CONFIG_VVC_METADATA_BSF 0
- #define CONFIG_VVC_MP4TOANNEXB_BSF 0
--#define CONFIG_EVC_FRAME_MERGE_BSF 0
- #define CONFIG_AASC_DECODER 0
- #define CONFIG_AIC_DECODER 0
- #define CONFIG_ALIAS_PIX_DECODER 0
-@@ -64,7 +63,6 @@
- #define CONFIG_AVRN_DECODER 0
- #define CONFIG_AVS_DECODER 0
- #define CONFIG_AVUI_DECODER 0
--#define CONFIG_AYUV_DECODER 0
- #define CONFIG_BETHSOFTVID_DECODER 0
- #define CONFIG_BFI_DECODER 0
- #define CONFIG_BINK_DECODER 0
-@@ -131,7 +129,6 @@
- #define CONFIG_H263P_DECODER 0
- #define CONFIG_H263_V4L2M2M_DECODER 0
- #define CONFIG_H264_DECODER 0
--#define CONFIG_H264_CRYSTALHD_DECODER 0
- #define CONFIG_H264_V4L2M2M_DECODER 0
- #define CONFIG_H264_MEDIACODEC_DECODER 0
- #define CONFIG_H264_MMAL_DECODER 0
-@@ -179,13 +176,11 @@
- #define CONFIG_MPEG1VIDEO_DECODER 0
- #define CONFIG_MPEG2VIDEO_DECODER 0
- #define CONFIG_MPEG4_DECODER 0
--#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
- #define CONFIG_MPEG4_V4L2M2M_DECODER 0
- #define CONFIG_MPEG4_MMAL_DECODER 0
- #define CONFIG_MPEGVIDEO_DECODER 0
- #define CONFIG_MPEG1_V4L2M2M_DECODER 0
- #define CONFIG_MPEG2_MMAL_DECODER 0
--#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
- #define CONFIG_MPEG2_V4L2M2M_DECODER 0
- #define CONFIG_MPEG2_QSV_DECODER 0
- #define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-@@ -194,7 +189,6 @@
- #define CONFIG_MSMPEG4V1_DECODER 0
- #define CONFIG_MSMPEG4V2_DECODER 0
- #define CONFIG_MSMPEG4V3_DECODER 0
--#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
- #define CONFIG_MSP2_DECODER 0
- #define CONFIG_MSRLE_DECODER 0
- #define CONFIG_MSS1_DECODER 0
-@@ -293,7 +287,6 @@
- #define CONFIG_VBN_DECODER 0
- #define CONFIG_VBLE_DECODER 0
- #define CONFIG_VC1_DECODER 0
--#define CONFIG_VC1_CRYSTALHD_DECODER 0
- #define CONFIG_VC1IMAGE_DECODER 0
- #define CONFIG_VC1_MMAL_DECODER 0
- #define CONFIG_VC1_QSV_DECODER 0
-@@ -325,7 +318,6 @@
- #define CONFIG_WMV1_DECODER 0
- #define CONFIG_WMV2_DECODER 0
- #define CONFIG_WMV3_DECODER 0
--#define CONFIG_WMV3_CRYSTALHD_DECODER 0
- #define CONFIG_WMV3IMAGE_DECODER 0
- #define CONFIG_WNV1_DECODER 0
- #define CONFIG_XAN_WC3_DECODER 0
-@@ -592,6 +584,7 @@
- #define CONFIG_LIBGSM_MS_DECODER 0
- #define CONFIG_LIBILBC_DECODER 0
- #define CONFIG_LIBJXL_DECODER 0
-+#define CONFIG_LIBLC3_DECODER 0
- #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
- #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
- #define CONFIG_LIBOPUS_DECODER 1
-@@ -639,7 +632,6 @@
- #define CONFIG_ASV2_ENCODER 0
- #define CONFIG_AVRP_ENCODER 0
- #define CONFIG_AVUI_ENCODER 0
--#define CONFIG_AYUV_ENCODER 0
- #define CONFIG_BITPACKED_ENCODER 0
- #define CONFIG_BMP_ENCODER 0
- #define CONFIG_CFHD_ENCODER 0
-@@ -821,6 +813,7 @@
- #define CONFIG_LIBGSM_MS_ENCODER 0
- #define CONFIG_LIBILBC_ENCODER 0
- #define CONFIG_LIBJXL_ENCODER 0
-+#define CONFIG_LIBLC3_ENCODER 0
- #define CONFIG_LIBMP3LAME_ENCODER 0
- #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
- #define CONFIG_LIBOPENJPEG_ENCODER 0
-@@ -1573,6 +1566,8 @@
- #define CONFIG_HSTACK_QSV_FILTER 0
- #define CONFIG_VSTACK_QSV_FILTER 0
- #define CONFIG_XSTACK_QSV_FILTER 0
-+#define CONFIG_PAD_VAAPI_FILTER 0
-+#define CONFIG_DRAWBOX_VAAPI_FILTER 0
- #define CONFIG_ALLRGB_FILTER 0
- #define CONFIG_ALLYUV_FILTER 0
- #define CONFIG_CELLAUTO_FILTER 0
-@@ -1706,6 +1701,7 @@
- #define CONFIG_DV_DEMUXER 0
- #define CONFIG_DVBSUB_DEMUXER 0
- #define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_DVDVIDEO_DEMUXER 0
- #define CONFIG_DXA_DEMUXER 0
- #define CONFIG_EA_DEMUXER 0
- #define CONFIG_EA_CDATA_DEMUXER 0
-@@ -1767,6 +1763,7 @@
- #define CONFIG_KUX_DEMUXER 0
- #define CONFIG_KVAG_DEMUXER 0
- #define CONFIG_LAF_DEMUXER 0
-+#define CONFIG_LC3_DEMUXER 0
- #define CONFIG_LMLM4_DEMUXER 0
- #define CONFIG_LOAS_DEMUXER 0
- #define CONFIG_LUODAT_DEMUXER 0
-@@ -1850,6 +1847,7 @@
- #define CONFIG_QOA_DEMUXER 0
- #define CONFIG_R3D_DEMUXER 0
- #define CONFIG_RAWVIDEO_DEMUXER 0
-+#define CONFIG_RCWT_DEMUXER 0
- #define CONFIG_REALTEXT_DEMUXER 0
- #define CONFIG_REDSPARK_DEMUXER 0
- #define CONFIG_RKA_DEMUXER 0
-@@ -1987,6 +1985,7 @@
- #define CONFIG_AC4_MUXER 0
- #define CONFIG_ADTS_MUXER 0
- #define CONFIG_ADX_MUXER 0
-+#define CONFIG_AEA_MUXER 0
- #define CONFIG_AIFF_MUXER 0
- #define CONFIG_ALP_MUXER 0
- #define CONFIG_AMR_MUXER 0
-@@ -2026,7 +2025,6 @@
- #define CONFIG_F4V_MUXER 0
- #define CONFIG_FFMETADATA_MUXER 0
- #define CONFIG_FIFO_MUXER 0
--#define CONFIG_FIFO_TEST_MUXER 0
- #define CONFIG_FILMSTRIP_MUXER 0
- #define CONFIG_FITS_MUXER 0
- #define CONFIG_FLAC_MUXER 0
-@@ -2060,6 +2058,7 @@
- #define CONFIG_JACOSUB_MUXER 0
- #define CONFIG_KVAG_MUXER 0
- #define CONFIG_LATM_MUXER 0
-+#define CONFIG_LC3_MUXER 0
- #define CONFIG_LRC_MUXER 0
- #define CONFIG_M4V_MUXER 0
- #define CONFIG_MD5_MUXER 0
-@@ -2162,6 +2161,7 @@
- #define CONFIG_WV_MUXER 0
- #define CONFIG_YUV4MPEGPIPE_MUXER 0
- #define CONFIG_CHROMAPRINT_MUXER 0
-+#define CONFIG_ANDROID_CONTENT_PROTOCOL 0
- #define CONFIG_ASYNC_PROTOCOL 0
- #define CONFIG_BLURAY_PROTOCOL 0
- #define CONFIG_CACHE_PROTOCOL 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/libavformat/demuxer_list.c b/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/libavformat/demuxer_list.c
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/libavformat/demuxer_list.c 2024-08-13 10:43:45.235118600 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/libavformat/demuxer_list.c 2024-08-19 01:29:21.000000000 +0100
-@@ -1,4 +1,4 @@
--static const AVInputFormat * const demuxer_list[] = {
-+static const FFInputFormat * const demuxer_list[] = {
- &ff_flac_demuxer,
- &ff_matroska_demuxer,
- &ff_mov_demuxer,
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/libavutil/ffversion.h
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/libavutil/ffversion.h 2024-08-13 10:43:45.235118600 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/arm64/libavutil/ffversion.h 2024-08-19 01:29:21.000000000 +0100
-@@ -1,5 +1,5 @@
- /* Automatically generated by version.sh, do not manually edit! */
- #ifndef AVUTIL_FFVERSION_H
- #define AVUTIL_FFVERSION_H
--#define FFMPEG_VERSION "N-115016-g631703bfb9"
-+#define FFMPEG_VERSION "N-116569-gd0c8e13654"
- #endif /* AVUTIL_FFVERSION_H */
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config.asm b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config.asm
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config.asm 2024-08-13 10:43:45.235118600 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config.asm 2024-08-19 01:29:21.000000000 +0100
-@@ -44,6 +44,7 @@
- %define HAVE_VSX 0
- %define HAVE_RV 0
- %define HAVE_RVV 0
-+%define HAVE_RV_ZVBB 0
- %define HAVE_AESNI 1
- %define HAVE_AMD3DNOW 1
- %define HAVE_AMD3DNOWEXT 1
-@@ -62,7 +63,6 @@
- %define HAVE_SSE42 1
- %define HAVE_SSSE3 1
- %define HAVE_XOP 1
--%define HAVE_CPUNOP 0
- %define HAVE_I686 1
- %define HAVE_MIPSFPU 0
- %define HAVE_MIPS32R2 0
-@@ -96,6 +96,7 @@
- %define HAVE_VSX_EXTERNAL 0
- %define HAVE_RV_EXTERNAL 0
- %define HAVE_RVV_EXTERNAL 0
-+%define HAVE_RV_ZVBB_EXTERNAL 0
- %define HAVE_AESNI_EXTERNAL 1
- %define HAVE_AMD3DNOW_EXTERNAL 1
+diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.asm b/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.asm
+--- a/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.asm 2024-10-02 03:50:24.656325800 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.asm 2024-10-05 16:34:43.816521179 +0100
+@@ -102,8 +102,8 @@
%define HAVE_AMD3DNOWEXT_EXTERNAL 1
-@@ -114,7 +115,6 @@
- %define HAVE_SSE42_EXTERNAL 1
- %define HAVE_SSSE3_EXTERNAL 1
- %define HAVE_XOP_EXTERNAL 1
--%define HAVE_CPUNOP_EXTERNAL 0
- %define HAVE_I686_EXTERNAL 0
- %define HAVE_MIPSFPU_EXTERNAL 0
- %define HAVE_MIPS32R2_EXTERNAL 0
-@@ -148,6 +148,7 @@
- %define HAVE_VSX_INLINE 0
- %define HAVE_RV_INLINE 0
- %define HAVE_RVV_INLINE 0
-+%define HAVE_RV_ZVBB_INLINE 0
- %define HAVE_AESNI_INLINE 1
- %define HAVE_AMD3DNOW_INLINE 1
- %define HAVE_AMD3DNOWEXT_INLINE 1
-@@ -166,7 +167,6 @@
- %define HAVE_SSE42_INLINE 1
- %define HAVE_SSSE3_INLINE 1
- %define HAVE_XOP_INLINE 1
--%define HAVE_CPUNOP_INLINE 0
- %define HAVE_I686_INLINE 0
- %define HAVE_MIPSFPU_INLINE 0
- %define HAVE_MIPS32R2_INLINE 0
-@@ -204,6 +204,7 @@
- %define HAVE_BIGENDIAN 0
- %define HAVE_FAST_UNALIGNED 1
- %define HAVE_ARPA_INET_H 0
-+%define HAVE_ASM_HWPROBE_H 0
- %define HAVE_ASM_TYPES_H 0
- %define HAVE_CDIO_PARANOIA_H 0
- %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-@@ -230,6 +231,7 @@
- %define HAVE_OPENGL_GL3_H 0
- %define HAVE_POLL_H 1
- %define HAVE_PTHREAD_NP_H 0
-+%define HAVE_SYS_HWPROBE_H 0
- %define HAVE_SYS_PARAM_H 1
- %define HAVE_SYS_RESOURCE_H 1
- %define HAVE_SYS_SELECT_H 1
-@@ -403,6 +405,7 @@
- %define HAVE_STRUCT_SOCKADDR_STORAGE 0
- %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
- %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-+%define HAVE_STRUCT_MFXCONFIGINTERFACE 0
- %define HAVE_GZIP 1
- %define HAVE_LIBDRM_GETFB2 0
- %define HAVE_MAKEINFO 0
-@@ -413,6 +416,7 @@
- %define HAVE_OPENCL_DXVA2 0
- %define HAVE_OPENCL_VAAPI_BEIGNET 0
- %define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+%define HAVE_OPENCL_VIDEOTOOLBOX 0
+ %define HAVE_AVX_EXTERNAL 1
+ %define HAVE_AVX2_EXTERNAL 1
+-%define HAVE_AVX512_EXTERNAL 1
+-%define HAVE_AVX512ICL_EXTERNAL 1
++%define HAVE_AVX512_EXTERNAL 0
++%define HAVE_AVX512ICL_EXTERNAL 0
+ %define HAVE_FMA3_EXTERNAL 1
+ %define HAVE_FMA4_EXTERNAL 1
+ %define HAVE_MMX_EXTERNAL 1
+@@ -366,7 +366,7 @@
+ %define HAVE_INLINE_ASM_LABELS 1
+ %define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+ %define HAVE_PRAGMA_DEPRECATED 1
+-%define HAVE_RSYNC_CONTIMEOUT 1
++%define HAVE_RSYNC_CONTIMEOUT 0
+ %define HAVE_SYMVER_ASM_LABEL 1
+ %define HAVE_SYMVER_GNU_ASM 1
+ %define HAVE_VFP_ARGS 0
+@@ -420,7 +420,7 @@
%define HAVE_PERL 1
%define HAVE_POD2MAN 1
%define HAVE_TEXI2HTML 0
-@@ -452,6 +456,8 @@
- %define CONFIG_FREI0R 0
- %define CONFIG_LIBCDIO 0
- %define CONFIG_LIBDAVS2 0
-+%define CONFIG_LIBDVDNAV 0
-+%define CONFIG_LIBDVDREAD 0
- %define CONFIG_LIBRUBBERBAND 0
- %define CONFIG_LIBVIDSTAB 0
- %define CONFIG_LIBX264 0
-@@ -501,6 +507,7 @@
- %define CONFIG_LIBJXL 0
- %define CONFIG_LIBKLVANC 0
- %define CONFIG_LIBKVAZAAR 0
-+%define CONFIG_LIBLC3 0
- %define CONFIG_LIBMODPLUG 0
- %define CONFIG_LIBMP3LAME 0
- %define CONFIG_LIBMYSOFA 0
-@@ -531,6 +538,7 @@
- %define CONFIG_LIBTENSORFLOW 0
- %define CONFIG_LIBTESSERACT 0
- %define CONFIG_LIBTHEORA 0
-+%define CONFIG_LIBTORCH 0
- %define CONFIG_LIBTWOLAME 0
- %define CONFIG_LIBUAVS3D 0
- %define CONFIG_LIBV4L2 0
-@@ -580,7 +588,6 @@
- %define CONFIG_OPENCL 0
- %define CONFIG_AMF 0
- %define CONFIG_AUDIOTOOLBOX 0
--%define CONFIG_CRYSTALHD 0
- %define CONFIG_CUDA 0
- %define CONFIG_CUDA_LLVM 0
- %define CONFIG_CUVID 0
-@@ -624,6 +631,7 @@
- %define CONFIG_ERROR_RESILIENCE 0
- %define CONFIG_FAAN 0
- %define CONFIG_FAST_UNALIGNED 1
-+%define CONFIG_IAMF 0
- %define CONFIG_LSP 0
- %define CONFIG_PIXELUTILS 0
- %define CONFIG_NETWORK 0
-@@ -672,7 +680,8 @@
- %define CONFIG_DEFLATE_WRAPPER 0
- %define CONFIG_DIRAC_PARSE 1
- %define CONFIG_DNN 0
--%define CONFIG_DOVI_RPU 0
-+%define CONFIG_DOVI_RPUDEC 0
-+%define CONFIG_DOVI_RPUENC 0
- %define CONFIG_DVPROFILE 0
- %define CONFIG_EVCPARSE 0
- %define CONFIG_EXIF 0
-@@ -704,10 +713,12 @@
- %define CONFIG_INFLATE_WRAPPER 0
- %define CONFIG_INTRAX8 0
- %define CONFIG_ISO_MEDIA 1
-+%define CONFIG_ISO_WRITER 0
- %define CONFIG_IVIDSP 0
- %define CONFIG_JPEGTABLES 0
- %define CONFIG_LGPLV3 0
- %define CONFIG_LIBX262 0
-+%define CONFIG_LIBX264_HDR10 0
- %define CONFIG_LLAUDDSP 0
- %define CONFIG_LLVIDDSP 0
- %define CONFIG_LLVIDENCDSP 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config.h b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config.h
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config.h 2024-08-13 10:43:45.235118600 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config.h 2024-08-19 01:29:21.000000000 +0100
-@@ -1,14 +1,13 @@
+-%define HAVE_XMLLINT 1
++%define HAVE_XMLLINT 0
+ %define HAVE_ZLIB_GZIP 0
+ %define HAVE_OPENVINO2 0
+ %define CONFIG_DOC 0
+diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.h b/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.h
+--- a/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.h 2024-10-02 03:50:24.656325800 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/x64/config.h 2024-10-05 16:34:43.816521179 +0100
+@@ -1,12 +1,12 @@
/* Automatically generated by configure - do not modify! */
#ifndef FFMPEG_CONFIG_H
#define FFMPEG_CONFIG_H
--/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cro
ss-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/
projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64'" -- elide long configuration string from binary */
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang -
-enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/cod
e/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64'" -- elide long configuration string from binary */
+-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --ena
ble-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/porter/Workspaces/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=
clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
#define FFMPEG_LICENSE "LGPL version 2.1 or later"
#define CONFIG_THIS_YEAR 2024
#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
--#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)"
-+#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
- #define OS_NAME darwin
--#define av_restrict restrict
- #define EXTERN_PREFIX "_"
- #define EXTERN_ASM _
- #define BUILDSUF ""
-@@ -59,6 +58,7 @@
- #define HAVE_VSX 0
- #define HAVE_RV 0
- #define HAVE_RVV 0
-+#define HAVE_RV_ZVBB 0
- #define HAVE_AESNI 1
- #define HAVE_AMD3DNOW 1
- #define HAVE_AMD3DNOWEXT 1
-@@ -77,7 +77,6 @@
- #define HAVE_SSE42 1
- #define HAVE_SSSE3 1
- #define HAVE_XOP 1
--#define HAVE_CPUNOP 0
- #define HAVE_I686 1
- #define HAVE_MIPSFPU 0
- #define HAVE_MIPS32R2 0
-@@ -111,6 +110,7 @@
- #define HAVE_VSX_EXTERNAL 0
- #define HAVE_RV_EXTERNAL 0
- #define HAVE_RVV_EXTERNAL 0
-+#define HAVE_RV_ZVBB_EXTERNAL 0
- #define HAVE_AESNI_EXTERNAL 1
- #define HAVE_AMD3DNOW_EXTERNAL 1
+-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project ecea8371ff03c15fb3dc27ee4108b98335fd2d63)"
++#define CC_IDENT "clang version 20.0.0git (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 7088a5ed880f29129ec844c66068e8cb61ca98bf)"
+ #define OS_NAME linux
+ #define EXTERN_PREFIX ""
+ #define EXTERN_ASM
+@@ -116,8 +116,8 @@
#define HAVE_AMD3DNOWEXT_EXTERNAL 1
-@@ -129,7 +129,6 @@
- #define HAVE_SSE42_EXTERNAL 1
- #define HAVE_SSSE3_EXTERNAL 1
- #define HAVE_XOP_EXTERNAL 1
--#define HAVE_CPUNOP_EXTERNAL 0
- #define HAVE_I686_EXTERNAL 0
- #define HAVE_MIPSFPU_EXTERNAL 0
- #define HAVE_MIPS32R2_EXTERNAL 0
-@@ -163,6 +162,7 @@
- #define HAVE_VSX_INLINE 0
- #define HAVE_RV_INLINE 0
- #define HAVE_RVV_INLINE 0
-+#define HAVE_RV_ZVBB_INLINE 0
- #define HAVE_AESNI_INLINE 1
- #define HAVE_AMD3DNOW_INLINE 1
- #define HAVE_AMD3DNOWEXT_INLINE 1
-@@ -181,7 +181,6 @@
- #define HAVE_SSE42_INLINE 1
- #define HAVE_SSSE3_INLINE 1
- #define HAVE_XOP_INLINE 1
--#define HAVE_CPUNOP_INLINE 0
- #define HAVE_I686_INLINE 0
- #define HAVE_MIPSFPU_INLINE 0
- #define HAVE_MIPS32R2_INLINE 0
-@@ -219,6 +218,7 @@
- #define HAVE_BIGENDIAN 0
- #define HAVE_FAST_UNALIGNED 1
- #define HAVE_ARPA_INET_H 0
-+#define HAVE_ASM_HWPROBE_H 0
- #define HAVE_ASM_TYPES_H 0
- #define HAVE_CDIO_PARANOIA_H 0
- #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-@@ -245,6 +245,7 @@
- #define HAVE_OPENGL_GL3_H 0
- #define HAVE_POLL_H 1
- #define HAVE_PTHREAD_NP_H 0
-+#define HAVE_SYS_HWPROBE_H 0
- #define HAVE_SYS_PARAM_H 1
- #define HAVE_SYS_RESOURCE_H 1
- #define HAVE_SYS_SELECT_H 1
-@@ -418,6 +419,7 @@
- #define HAVE_STRUCT_SOCKADDR_STORAGE 0
- #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
- #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-+#define HAVE_STRUCT_MFXCONFIGINTERFACE 0
- #define HAVE_GZIP 1
- #define HAVE_LIBDRM_GETFB2 0
- #define HAVE_MAKEINFO 0
-@@ -428,6 +430,7 @@
- #define HAVE_OPENCL_DXVA2 0
- #define HAVE_OPENCL_VAAPI_BEIGNET 0
- #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+#define HAVE_OPENCL_VIDEOTOOLBOX 0
+ #define HAVE_AVX_EXTERNAL 1
+ #define HAVE_AVX2_EXTERNAL 1
+-#define HAVE_AVX512_EXTERNAL 1
+-#define HAVE_AVX512ICL_EXTERNAL 1
++#define HAVE_AVX512_EXTERNAL 0
++#define HAVE_AVX512ICL_EXTERNAL 0
+ #define HAVE_FMA3_EXTERNAL 1
+ #define HAVE_FMA4_EXTERNAL 1
+ #define HAVE_MMX_EXTERNAL 1
+@@ -380,7 +380,7 @@
+ #define HAVE_INLINE_ASM_LABELS 1
+ #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+ #define HAVE_PRAGMA_DEPRECATED 1
+-#define HAVE_RSYNC_CONTIMEOUT 1
++#define HAVE_RSYNC_CONTIMEOUT 0
+ #define HAVE_SYMVER_ASM_LABEL 1
+ #define HAVE_SYMVER_GNU_ASM 1
+ #define HAVE_VFP_ARGS 0
+@@ -434,7 +434,7 @@
#define HAVE_PERL 1
#define HAVE_POD2MAN 1
#define HAVE_TEXI2HTML 0
-@@ -467,6 +470,8 @@
- #define CONFIG_FREI0R 0
- #define CONFIG_LIBCDIO 0
- #define CONFIG_LIBDAVS2 0
-+#define CONFIG_LIBDVDNAV 0
-+#define CONFIG_LIBDVDREAD 0
- #define CONFIG_LIBRUBBERBAND 0
- #define CONFIG_LIBVIDSTAB 0
- #define CONFIG_LIBX264 0
-@@ -516,6 +521,7 @@
- #define CONFIG_LIBJXL 0
- #define CONFIG_LIBKLVANC 0
- #define CONFIG_LIBKVAZAAR 0
-+#define CONFIG_LIBLC3 0
- #define CONFIG_LIBMODPLUG 0
- #define CONFIG_LIBMP3LAME 0
- #define CONFIG_LIBMYSOFA 0
-@@ -546,6 +552,7 @@
- #define CONFIG_LIBTENSORFLOW 0
- #define CONFIG_LIBTESSERACT 0
- #define CONFIG_LIBTHEORA 0
-+#define CONFIG_LIBTORCH 0
- #define CONFIG_LIBTWOLAME 0
- #define CONFIG_LIBUAVS3D 0
- #define CONFIG_LIBV4L2 0
-@@ -595,7 +602,6 @@
- #define CONFIG_OPENCL 0
- #define CONFIG_AMF 0
- #define CONFIG_AUDIOTOOLBOX 0
--#define CONFIG_CRYSTALHD 0
- #define CONFIG_CUDA 0
- #define CONFIG_CUDA_LLVM 0
- #define CONFIG_CUVID 0
-@@ -639,6 +645,7 @@
- #define CONFIG_ERROR_RESILIENCE 0
- #define CONFIG_FAAN 0
- #define CONFIG_FAST_UNALIGNED 1
-+#define CONFIG_IAMF 0
- #define CONFIG_LSP 0
- #define CONFIG_PIXELUTILS 0
- #define CONFIG_NETWORK 0
-@@ -687,7 +694,8 @@
- #define CONFIG_DEFLATE_WRAPPER 0
- #define CONFIG_DIRAC_PARSE 1
- #define CONFIG_DNN 0
--#define CONFIG_DOVI_RPU 0
-+#define CONFIG_DOVI_RPUDEC 0
-+#define CONFIG_DOVI_RPUENC 0
- #define CONFIG_DVPROFILE 0
- #define CONFIG_EVCPARSE 0
- #define CONFIG_EXIF 0
-@@ -719,10 +727,12 @@
- #define CONFIG_INFLATE_WRAPPER 0
- #define CONFIG_INTRAX8 0
- #define CONFIG_ISO_MEDIA 1
-+#define CONFIG_ISO_WRITER 0
- #define CONFIG_IVIDSP 0
- #define CONFIG_JPEGTABLES 0
- #define CONFIG_LGPLV3 0
- #define CONFIG_LIBX262 0
-+#define CONFIG_LIBX264_HDR10 0
- #define CONFIG_LLAUDDSP 0
- #define CONFIG_LLVIDDSP 0
- #define CONFIG_LLVIDENCDSP 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config_components.h b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config_components.h
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config_components.h 2024-08-13 10:43:45.235118600 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/config_components.h 2024-08-19 01:29:21.000000000 +0100
-@@ -11,6 +11,7 @@
- #define CONFIG_DTS2PTS_BSF 0
- #define CONFIG_DV_ERROR_MARKER_BSF 0
- #define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EVC_FRAME_MERGE_BSF 0
- #define CONFIG_EXTRACT_EXTRADATA_BSF 0
- #define CONFIG_FILTER_UNITS_BSF 0
- #define CONFIG_H264_METADATA_BSF 0
-@@ -23,7 +24,6 @@
- #define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
- #define CONFIG_MJPEG2JPEG_BSF 0
- #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
--#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
- #define CONFIG_MPEG2_METADATA_BSF 0
- #define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
- #define CONFIG_MOV2TEXTSUB_BSF 0
-@@ -45,7 +45,6 @@
- #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
- #define CONFIG_VVC_METADATA_BSF 0
- #define CONFIG_VVC_MP4TOANNEXB_BSF 0
--#define CONFIG_EVC_FRAME_MERGE_BSF 0
- #define CONFIG_AASC_DECODER 0
- #define CONFIG_AIC_DECODER 0
- #define CONFIG_ALIAS_PIX_DECODER 0
-@@ -64,7 +63,6 @@
- #define CONFIG_AVRN_DECODER 0
- #define CONFIG_AVS_DECODER 0
- #define CONFIG_AVUI_DECODER 0
--#define CONFIG_AYUV_DECODER 0
- #define CONFIG_BETHSOFTVID_DECODER 0
- #define CONFIG_BFI_DECODER 0
- #define CONFIG_BINK_DECODER 0
-@@ -131,7 +129,6 @@
- #define CONFIG_H263P_DECODER 0
- #define CONFIG_H263_V4L2M2M_DECODER 0
- #define CONFIG_H264_DECODER 0
--#define CONFIG_H264_CRYSTALHD_DECODER 0
- #define CONFIG_H264_V4L2M2M_DECODER 0
- #define CONFIG_H264_MEDIACODEC_DECODER 0
- #define CONFIG_H264_MMAL_DECODER 0
-@@ -179,13 +176,11 @@
- #define CONFIG_MPEG1VIDEO_DECODER 0
- #define CONFIG_MPEG2VIDEO_DECODER 0
- #define CONFIG_MPEG4_DECODER 0
--#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
- #define CONFIG_MPEG4_V4L2M2M_DECODER 0
- #define CONFIG_MPEG4_MMAL_DECODER 0
- #define CONFIG_MPEGVIDEO_DECODER 0
- #define CONFIG_MPEG1_V4L2M2M_DECODER 0
- #define CONFIG_MPEG2_MMAL_DECODER 0
--#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
- #define CONFIG_MPEG2_V4L2M2M_DECODER 0
- #define CONFIG_MPEG2_QSV_DECODER 0
- #define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-@@ -194,7 +189,6 @@
- #define CONFIG_MSMPEG4V1_DECODER 0
- #define CONFIG_MSMPEG4V2_DECODER 0
- #define CONFIG_MSMPEG4V3_DECODER 0
--#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
- #define CONFIG_MSP2_DECODER 0
- #define CONFIG_MSRLE_DECODER 0
- #define CONFIG_MSS1_DECODER 0
-@@ -293,7 +287,6 @@
- #define CONFIG_VBN_DECODER 0
- #define CONFIG_VBLE_DECODER 0
- #define CONFIG_VC1_DECODER 0
--#define CONFIG_VC1_CRYSTALHD_DECODER 0
- #define CONFIG_VC1IMAGE_DECODER 0
- #define CONFIG_VC1_MMAL_DECODER 0
- #define CONFIG_VC1_QSV_DECODER 0
-@@ -325,7 +318,6 @@
- #define CONFIG_WMV1_DECODER 0
- #define CONFIG_WMV2_DECODER 0
- #define CONFIG_WMV3_DECODER 0
--#define CONFIG_WMV3_CRYSTALHD_DECODER 0
- #define CONFIG_WMV3IMAGE_DECODER 0
- #define CONFIG_WNV1_DECODER 0
- #define CONFIG_XAN_WC3_DECODER 0
-@@ -592,6 +584,7 @@
- #define CONFIG_LIBGSM_MS_DECODER 0
- #define CONFIG_LIBILBC_DECODER 0
- #define CONFIG_LIBJXL_DECODER 0
-+#define CONFIG_LIBLC3_DECODER 0
- #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
- #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
- #define CONFIG_LIBOPUS_DECODER 1
-@@ -639,7 +632,6 @@
- #define CONFIG_ASV2_ENCODER 0
- #define CONFIG_AVRP_ENCODER 0
- #define CONFIG_AVUI_ENCODER 0
--#define CONFIG_AYUV_ENCODER 0
- #define CONFIG_BITPACKED_ENCODER 0
- #define CONFIG_BMP_ENCODER 0
- #define CONFIG_CFHD_ENCODER 0
-@@ -821,6 +813,7 @@
- #define CONFIG_LIBGSM_MS_ENCODER 0
- #define CONFIG_LIBILBC_ENCODER 0
- #define CONFIG_LIBJXL_ENCODER 0
-+#define CONFIG_LIBLC3_ENCODER 0
- #define CONFIG_LIBMP3LAME_ENCODER 0
- #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
- #define CONFIG_LIBOPENJPEG_ENCODER 0
-@@ -1573,6 +1566,8 @@
- #define CONFIG_HSTACK_QSV_FILTER 0
- #define CONFIG_VSTACK_QSV_FILTER 0
- #define CONFIG_XSTACK_QSV_FILTER 0
-+#define CONFIG_PAD_VAAPI_FILTER 0
-+#define CONFIG_DRAWBOX_VAAPI_FILTER 0
- #define CONFIG_ALLRGB_FILTER 0
- #define CONFIG_ALLYUV_FILTER 0
- #define CONFIG_CELLAUTO_FILTER 0
-@@ -1706,6 +1701,7 @@
- #define CONFIG_DV_DEMUXER 0
- #define CONFIG_DVBSUB_DEMUXER 0
- #define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_DVDVIDEO_DEMUXER 0
- #define CONFIG_DXA_DEMUXER 0
- #define CONFIG_EA_DEMUXER 0
- #define CONFIG_EA_CDATA_DEMUXER 0
-@@ -1767,6 +1763,7 @@
- #define CONFIG_KUX_DEMUXER 0
- #define CONFIG_KVAG_DEMUXER 0
- #define CONFIG_LAF_DEMUXER 0
-+#define CONFIG_LC3_DEMUXER 0
- #define CONFIG_LMLM4_DEMUXER 0
- #define CONFIG_LOAS_DEMUXER 0
- #define CONFIG_LUODAT_DEMUXER 0
-@@ -1850,6 +1847,7 @@
- #define CONFIG_QOA_DEMUXER 0
- #define CONFIG_R3D_DEMUXER 0
- #define CONFIG_RAWVIDEO_DEMUXER 0
-+#define CONFIG_RCWT_DEMUXER 0
- #define CONFIG_REALTEXT_DEMUXER 0
- #define CONFIG_REDSPARK_DEMUXER 0
- #define CONFIG_RKA_DEMUXER 0
-@@ -1987,6 +1985,7 @@
- #define CONFIG_AC4_MUXER 0
- #define CONFIG_ADTS_MUXER 0
- #define CONFIG_ADX_MUXER 0
-+#define CONFIG_AEA_MUXER 0
- #define CONFIG_AIFF_MUXER 0
- #define CONFIG_ALP_MUXER 0
- #define CONFIG_AMR_MUXER 0
-@@ -2026,7 +2025,6 @@
- #define CONFIG_F4V_MUXER 0
- #define CONFIG_FFMETADATA_MUXER 0
- #define CONFIG_FIFO_MUXER 0
--#define CONFIG_FIFO_TEST_MUXER 0
- #define CONFIG_FILMSTRIP_MUXER 0
- #define CONFIG_FITS_MUXER 0
- #define CONFIG_FLAC_MUXER 0
-@@ -2060,6 +2058,7 @@
- #define CONFIG_JACOSUB_MUXER 0
- #define CONFIG_KVAG_MUXER 0
- #define CONFIG_LATM_MUXER 0
-+#define CONFIG_LC3_MUXER 0
- #define CONFIG_LRC_MUXER 0
- #define CONFIG_M4V_MUXER 0
- #define CONFIG_MD5_MUXER 0
-@@ -2162,6 +2161,7 @@
- #define CONFIG_WV_MUXER 0
- #define CONFIG_YUV4MPEGPIPE_MUXER 0
- #define CONFIG_CHROMAPRINT_MUXER 0
-+#define CONFIG_ANDROID_CONTENT_PROTOCOL 0
- #define CONFIG_ASYNC_PROTOCOL 0
- #define CONFIG_BLURAY_PROTOCOL 0
- #define CONFIG_CACHE_PROTOCOL 0
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/libavformat/demuxer_list.c b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/libavformat/demuxer_list.c
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/libavformat/demuxer_list.c 2024-08-13 10:43:45.235118600 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/libavformat/demuxer_list.c 2024-08-19 01:29:21.000000000 +0100
-@@ -1,4 +1,4 @@
--static const AVInputFormat * const demuxer_list[] = {
-+static const FFInputFormat * const demuxer_list[] = {
- &ff_flac_demuxer,
- &ff_matroska_demuxer,
- &ff_mov_demuxer,
-diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/libavutil/ffversion.h
---- a/third_party/ffmpeg/chromium/config/Chromium/ios/x64/libavutil/ffversion.h 2024-08-13 10:43:45.239119000 +0100
-+++ b/third_party/ffmpeg/chromium/config/Chromium/ios/x64/libavutil/ffversion.h 2024-08-19 01:29:21.000000000 +0100
+-#define HAVE_XMLLINT 1
++#define HAVE_XMLLINT 0
+ #define HAVE_ZLIB_GZIP 0
+ #define HAVE_OPENVINO2 0
+ #define CONFIG_DOC 0
+diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chrome/linux/x64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chrome/linux/x64/libavutil/ffversion.h
+--- a/third_party/ffmpeg/chromium/config/Chrome/linux/x64/libavutil/ffversion.h 2024-10-02 03:50:24.657326000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chrome/linux/x64/libavutil/ffversion.h 2024-10-05 16:34:43.816521179 +0100
@@ -1,5 +1,5 @@
/* Automatically generated by version.sh, do not manually edit! */
#ifndef AVUTIL_FFVERSION_H
#define AVUTIL_FFVERSION_H
--#define FFMPEG_VERSION "N-115016-g631703bfb9"
-+#define FFMPEG_VERSION "N-116569-gd0c8e13654"
+-#define FFMPEG_VERSION "N-116575-gd941d9677b"
++#define FFMPEG_VERSION "git-2024-08-15-14d16cd143"
#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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config.h 2024-10-05 16:34:43.819854513 +0100
@@ -0,0 +1,782 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/media/Recorded_TV/chrome/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=riscv64 --extra-cflags='-march=rv64gc' --enable-cross-
compile --target-os=linux --sysroot=/media/Recorded_TV/chrome/chromium/src/build/linux/debian_sid_riscv64-sysroot --extra-cflags='--target=riscv64-linux-gnu' --extra-ldflags='--target=riscv64-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/porter/Workspaces/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=riscv64 --extra-cflags='-march=rv64gc' --enable-cross-co
mpile --target-os=linux --sysroot=/home/porter/Workspaces/chromium/src/build/linux/debian_sid_riscv64-sysroot --extra-cflags='--target=riscv64-linux-gnu' --extra-ldflags='--target=riscv64-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define CONFIG_THIS_YEAR 2024
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
++#define CC_IDENT "clang version 20.0.0git (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 7088a5ed880f29129ec844c66068e8cb61ca98bf)"
+#define OS_NAME linux
+#define EXTERN_PREFIX ""
+#define EXTERN_ASM
@@ -5145,7 +3496,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri
+#define HAVE_OPENGL_GL3_H 0
+#define HAVE_POLL_H 1
+#define HAVE_PTHREAD_NP_H 0
-+#define HAVE_SYS_HWPROBE_H 0
++#define HAVE_SYS_HWPROBE_H 1
+#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_RESOURCE_H 1
+#define HAVE_SYS_SELECT_H 1
@@ -5280,7 +3631,7 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/ri
+#define HAVE_INLINE_ASM_LABELS 1
+#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+#define HAVE_PRAGMA_DEPRECATED 1
-+#define HAVE_RSYNC_CONTIMEOUT 1
++#define HAVE_RSYNC_CONTIMEOUT 0
+#define HAVE_SYMVER_ASM_LABEL 1
+#define HAVE_SYMVER_GNU_ASM 1
+#define HAVE_VFP_ARGS 0
@@ -5682,7 +4033,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config_components.h 2024-10-05 16:34:43.823187846 +0100
@@ -0,0 +1,2218 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_COMPONENTS_H
@@ -7904,13 +6255,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/bsf_list.c 2024-10-05 16:34:43.823187846 +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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/codec_list.c 2024-10-05 16:34:43.823187846 +0100
@@ -0,0 +1,15 @@
+static const FFCodec * const codec_list[] = {
+ &ff_flac_decoder,
@@ -7929,7 +6280,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/parser_list.c 2024-10-05 16:34:43.823187846 +0100
@@ -0,0 +1,7 @@
+static const AVCodecParser * const parser_list[] = {
+ &ff_flac_parser,
@@ -7940,7 +6291,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c 2024-10-05 16:34:43.823187846 +0100
@@ -0,0 +1,8 @@
+static const FFInputFormat * const demuxer_list[] = {
+ &ff_flac_demuxer,
@@ -7952,19 +6303,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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/muxer_list.c 2024-10-05 16:34:43.826521179 +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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/protocol_list.c 2024-10-05 16:34:43.826521179 +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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/avconfig.h 2024-10-05 16:34:43.826521179 +0100
@@ -0,0 +1,6 @@
+/* Generated by ffmpeg configure */
+#ifndef AVUTIL_AVCONFIG_H
@@ -7974,17 +6325,118 @@ 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 2024-08-19 01:29:20.000000000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h 2024-10-05 16:34:43.826521179 +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-2024-05-24-bc1ee906ce"
++#define FFMPEG_VERSION "git-2024-08-15-14d16cd143"
+#endif /* AVUTIL_FFVERSION_H */
+diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm b/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm
+--- a/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm 2024-10-02 03:50:24.674327900 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.asm 2024-10-05 16:34:43.826521179 +0100
+@@ -102,8 +102,8 @@
+ %define HAVE_AMD3DNOWEXT_EXTERNAL 1
+ %define HAVE_AVX_EXTERNAL 1
+ %define HAVE_AVX2_EXTERNAL 1
+-%define HAVE_AVX512_EXTERNAL 1
+-%define HAVE_AVX512ICL_EXTERNAL 1
++%define HAVE_AVX512_EXTERNAL 0
++%define HAVE_AVX512ICL_EXTERNAL 0
+ %define HAVE_FMA3_EXTERNAL 1
+ %define HAVE_FMA4_EXTERNAL 1
+ %define HAVE_MMX_EXTERNAL 1
+@@ -366,7 +366,7 @@
+ %define HAVE_INLINE_ASM_LABELS 1
+ %define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+ %define HAVE_PRAGMA_DEPRECATED 1
+-%define HAVE_RSYNC_CONTIMEOUT 1
++%define HAVE_RSYNC_CONTIMEOUT 0
+ %define HAVE_SYMVER_ASM_LABEL 1
+ %define HAVE_SYMVER_GNU_ASM 1
+ %define HAVE_VFP_ARGS 0
+@@ -420,7 +420,7 @@
+ %define HAVE_PERL 1
+ %define HAVE_POD2MAN 1
+ %define HAVE_TEXI2HTML 0
+-%define HAVE_XMLLINT 1
++%define HAVE_XMLLINT 0
+ %define HAVE_ZLIB_GZIP 0
+ %define HAVE_OPENVINO2 0
+ %define CONFIG_DOC 0
+diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h b/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h
+--- a/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h 2024-10-02 03:50:24.674327900 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/x64/config.h 2024-10-05 16:34:43.826521179 +0100
+@@ -1,12 +1,12 @@
+ /* Automatically generated by configure - do not modify! */
+ #ifndef FFMPEG_CONFIG_H
+ #define FFMPEG_CONFIG_H
+-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --ena
ble-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/porter/Workspaces/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=
clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */
+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
+ #define CONFIG_THIS_YEAR 2024
+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
+-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project ecea8371ff03c15fb3dc27ee4108b98335fd2d63)"
++#define CC_IDENT "clang version 20.0.0git (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 7088a5ed880f29129ec844c66068e8cb61ca98bf)"
+ #define OS_NAME linux
+ #define EXTERN_PREFIX ""
+ #define EXTERN_ASM
+@@ -116,8 +116,8 @@
+ #define HAVE_AMD3DNOWEXT_EXTERNAL 1
+ #define HAVE_AVX_EXTERNAL 1
+ #define HAVE_AVX2_EXTERNAL 1
+-#define HAVE_AVX512_EXTERNAL 1
+-#define HAVE_AVX512ICL_EXTERNAL 1
++#define HAVE_AVX512_EXTERNAL 0
++#define HAVE_AVX512ICL_EXTERNAL 0
+ #define HAVE_FMA3_EXTERNAL 1
+ #define HAVE_FMA4_EXTERNAL 1
+ #define HAVE_MMX_EXTERNAL 1
+@@ -380,7 +380,7 @@
+ #define HAVE_INLINE_ASM_LABELS 1
+ #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
+ #define HAVE_PRAGMA_DEPRECATED 1
+-#define HAVE_RSYNC_CONTIMEOUT 1
++#define HAVE_RSYNC_CONTIMEOUT 0
+ #define HAVE_SYMVER_ASM_LABEL 1
+ #define HAVE_SYMVER_GNU_ASM 1
+ #define HAVE_VFP_ARGS 0
+@@ -434,7 +434,7 @@
+ #define HAVE_PERL 1
+ #define HAVE_POD2MAN 1
+ #define HAVE_TEXI2HTML 0
+-#define HAVE_XMLLINT 1
++#define HAVE_XMLLINT 0
+ #define HAVE_ZLIB_GZIP 0
+ #define HAVE_OPENVINO2 0
+ #define CONFIG_DOC 0
+diff '--color=auto' -Naur a/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h b/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h
+--- a/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h 2024-10-02 03:50:24.675328000 +0100
++++ b/third_party/ffmpeg/chromium/config/Chromium/linux/x64/libavutil/ffversion.h 2024-10-05 16:34:43.829854513 +0100
+@@ -1,5 +1,5 @@
+ /* Automatically generated by version.sh, do not manually edit! */
+ #ifndef AVUTIL_FFVERSION_H
+ #define AVUTIL_FFVERSION_H
+-#define FFMPEG_VERSION "N-116575-gd941d9677b"
++#define FFMPEG_VERSION "git-2024-08-15-14d16cd143"
+ #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 2024-10-02 03:50:24.681328800 +0100
++++ b/third_party/ffmpeg/chromium/scripts/copy_config.sh 2024-10-05 16:34:43.829854513 +0100
+@@ -10,7 +10,7 @@
+ # Copy config files for various architectures:
+ # - ia32/x64 have config.asm, config.h
+ # - arm/arm-neon have config.h
+- for arch in arm arm-neon arm64 ia32 x64 mipsel mips64el; do
++ for arch in arm arm-neon arm64 ia32 x64 mipsel mips64el riscv64; do
+ # Don't waste time on non-existent configs, if no config.h then skip.
+ [ ! -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 2024-08-13 10:43:45.287123200 +0100
-+++ b/third_party/ffmpeg/ffmpeg_generated.gni 2024-08-18 23:57:20.000000000 +0100
-@@ -14,18 +14,12 @@
+--- a/third_party/ffmpeg/ffmpeg_generated.gni 2024-10-02 03:50:24.721333300 +0100
++++ b/third_party/ffmpeg/ffmpeg_generated.gni 2024-10-05 16:34:43.829854513 +0100
+@@ -14,10 +14,8 @@
use_linux_config = is_linux || is_chromeos || is_fuchsia
@@ -7992,119 +6444,24 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part
- (is_android && current_cpu == "arm" && arm_use_neon) ||
- (is_android && current_cpu == "x86") || is_apple || is_win ||
- use_linux_config) {
-+if (use_linux_config && current_cpu == "riscv64") {
++if ((use_linux_config && current_cpu == "riscv64") ||
++ (use_linux_config && current_cpu == "x64")) {
ffmpeg_c_sources += [
"libavcodec/ac3_channel_layout_tab.c",
"libavcodec/ac3_parser.c",
- "libavcodec/adts_parser.c",
- "libavcodec/allcodecs.c",
-- "libavcodec/autorename_libavcodec_flacdsp.c",
-- "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
-- "libavcodec/autorename_libavcodec_vorbisdsp.c",
- "libavcodec/avcodec.c",
- "libavcodec/avdct.c",
- "libavcodec/avfft.c",
-@@ -45,6 +39,7 @@
- "libavcodec/flac_parser.c",
- "libavcodec/flacdata.c",
- "libavcodec/flacdec.c",
-+ "libavcodec/flacdsp.c",
- "libavcodec/get_buffer.c",
- "libavcodec/golomb.c",
- "libavcodec/imgconvert.c",
-@@ -62,6 +57,7 @@
- "libavcodec/mpegaudiodec_common.c",
- "libavcodec/mpegaudiodec_fixed.c",
- "libavcodec/mpegaudiodecheader.c",
-+ "libavcodec/mpegaudiodsp.c",
- "libavcodec/mpegaudiodsp_data.c",
- "libavcodec/mpegaudiodsp_fixed.c",
- "libavcodec/mpegaudiodsp_float.c",
-@@ -80,6 +76,8 @@
- "libavcodec/qsv_api.c",
- "libavcodec/raw.c",
- "libavcodec/refstruct.c",
-+ "libavcodec/riscv/flacdsp_init.c",
-+ "libavcodec/riscv/vorbisdsp_init.c",
- "libavcodec/threadprogress.c",
- "libavcodec/to_upper4.c",
- "libavcodec/utils.c",
-@@ -89,6 +87,7 @@
- "libavcodec/vorbis_data.c",
- "libavcodec/vorbis_parser.c",
- "libavcodec/vorbisdec.c",
-+ "libavcodec/vorbisdsp.c",
- "libavcodec/vp9_parser.c",
- "libavcodec/xiph.c",
- "libavformat/allformats.c",
-@@ -143,11 +142,6 @@
- "libavutil/aes.c",
- "libavutil/aes_ctr.c",
- "libavutil/ambient_viewing_environment.c",
-- "libavutil/autorename_libavutil_cpu.c",
-- "libavutil/autorename_libavutil_fixed_dsp.c",
-- "libavutil/autorename_libavutil_float_dsp.c",
-- "libavutil/autorename_libavutil_imgutils.c",
-- "libavutil/autorename_libavutil_tx_float.c",
- "libavutil/autorename_libavutil_utils.c",
- "libavutil/autorename_libavutil_version.c",
- "libavutil/avstring.c",
-@@ -156,6 +150,7 @@
- "libavutil/buffer.c",
- "libavutil/camellia.c",
- "libavutil/channel_layout.c",
-+ "libavutil/cpu.c",
- "libavutil/crc.c",
- "libavutil/csp.c",
- "libavutil/detection_bbox.c",
-@@ -170,12 +165,15 @@
- "libavutil/fifo.c",
- "libavutil/file_open.c",
- "libavutil/film_grain_params.c",
-+ "libavutil/fixed_dsp.c",
-+ "libavutil/float_dsp.c",
- "libavutil/frame.c",
- "libavutil/hdr_dynamic_metadata.c",
- "libavutil/hdr_dynamic_vivid_metadata.c",
- "libavutil/hwcontext.c",
- "libavutil/hwcontext_stub.c",
- "libavutil/iamf.c",
-+ "libavutil/imgutils.c",
- "libavutil/integer.c",
- "libavutil/intmath.c",
- "libavutil/lfg.c",
-@@ -193,6 +191,9 @@
- "libavutil/random_seed.c",
- "libavutil/rational.c",
- "libavutil/reverse.c",
-+ "libavutil/riscv/autorename_libavutil_riscv_cpu.c",
-+ "libavutil/riscv/fixed_dsp_init.c",
-+ "libavutil/riscv/float_dsp_init.c",
- "libavutil/samplefmt.c",
- "libavutil/sha.c",
- "libavutil/slicethread.c",
-@@ -205,19 +206,36 @@
- "libavutil/timestamp.c",
- "libavutil/twofish.c",
- "libavutil/tx.c",
-+ "libavutil/tx_float.c",
- "libavutil/uuid.c",
- "libavutil/video_enc_params.c",
- "libavutil/video_hint.c",
+@@ -211,16 +209,26 @@
]
-+ ffmpeg_gas_sources += [
-+ "libavcodec/riscv/flacdsp_rvv.S",
-+ "libavcodec/riscv/vorbisdsp_rvv.S",
-+ "libavutil/riscv/fixed_dsp_rvv.S",
-+ "libavutil/riscv/float_dsp_rvv.S",
-+ ]
}
--if ((is_apple && ffmpeg_branding == "Chrome") ||
+-if ((current_cpu == "arm64" && ffmpeg_branding == "Chrome") ||
+- (current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
+- (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
+- (is_apple && ffmpeg_branding == "Chrome") ||
- (is_win && ffmpeg_branding == "Chrome") ||
- (use_linux_config && ffmpeg_branding == "Chrome")) {
-+if (use_linux_config && current_cpu == "riscv64" &&
-+ ffmpeg_branding == "Chrome") {
++if ((use_linux_config && current_cpu == "riscv64" &&
++ ffmpeg_branding == "Chrome") ||
++ (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome")) {
ffmpeg_c_sources += [
+ "libavcodec/aac/aacdec.c",
+ "libavcodec/aac/aacdec_float.c",
@@ -8118,13 +6475,14 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part
+ "libavcodec/aactab.c",
+ "libavcodec/adts_header.c",
"libavcodec/atsc_a53.c",
-- "libavcodec/autorename_libavcodec_videodsp.c",
++ "libavcodec/autorename_libavcodec_sbrdsp.c",
+ "libavcodec/autorename_libavcodec_videodsp.c",
"libavcodec/cabac.c",
+ "libavcodec/cbrt_data.c",
"libavcodec/h2645_parse.c",
"libavcodec/h2645_sei.c",
"libavcodec/h2645_vui.c",
-@@ -242,253 +260,24 @@
+@@ -245,46 +253,27 @@
"libavcodec/h264pred.c",
"libavcodec/h264qpel.c",
"libavcodec/h274.c",
@@ -8132,37 +6490,6 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part
- ]
-}
-
--if ((is_apple && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-- (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-- (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-- (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-- (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-- ffmpeg_c_sources += [
-- "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
-- "libavcodec/x86/h264_intrapred_init.c",
-- "libavcodec/x86/h264_qpel.c",
-- "libavcodec/x86/h264chroma_init.c",
-- "libavcodec/x86/h264dsp_init.c",
-- ]
-- ffmpeg_asm_sources += [
-- "libavcodec/x86/autorename_libavcodec_x86_videodsp.asm",
-- "libavcodec/x86/fpel.asm",
-- "libavcodec/x86/h264_chromamc.asm",
-- "libavcodec/x86/h264_chromamc_10bit.asm",
-- "libavcodec/x86/h264_deblock.asm",
-- "libavcodec/x86/h264_deblock_10bit.asm",
-- "libavcodec/x86/h264_idct.asm",
-- "libavcodec/x86/h264_idct_10bit.asm",
-- "libavcodec/x86/h264_intrapred.asm",
-- "libavcodec/x86/h264_intrapred_10bit.asm",
-- "libavcodec/x86/h264_qpel_10bit.asm",
-- "libavcodec/x86/h264_qpel_8bit.asm",
-- "libavcodec/x86/h264_weight.asm",
-- "libavcodec/x86/h264_weight_10bit.asm",
-- "libavcodec/x86/qpel.asm",
-- ]
--}
--
-if ((current_cpu == "arm64" && ffmpeg_branding == "Chrome") ||
- (current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
- (is_android && current_cpu == "arm" && arm_use_neon &&
@@ -8186,60 +6513,86 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part
- "libavcodec/autorename_libavcodec_sbrdsp.c",
- "libavcodec/cbrt_data.c",
"libavcodec/kbdwin.c",
-+ "libavcodec/riscv/aacpsdsp_init.c",
-+ "libavcodec/riscv/h264_chroma_init_riscv.c",
-+ "libavcodec/riscv/h264dsp_init.c",
-+ "libavcodec/riscv/sbrdsp_init.c",
-+ "libavcodec/sbrdsp.c",
"libavcodec/sinewin.c",
+ "libavcodec/startcode.c",
-+ "libavcodec/videodsp.c",
"libavformat/apetag.c",
"libavformat/autorename_libavformat_aacdec.c",
"libavformat/img2.c",
]
--}
--
--if ((is_apple && current_cpu == "arm64" && ffmpeg_branding == "Chrome") ||
-- (is_win && current_cpu == "arm64" && ffmpeg_branding == "Chrome") ||
-- (use_linux_config && current_cpu == "arm64" &&
-- ffmpeg_branding == "Chrome")) {
-- ffmpeg_c_sources += [
+ }
+
+-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
+- (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
+- (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
++if (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") {
++ ffmpeg_c_sources += [
++ "libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c",
++ "libavcodec/x86/autorename_libavcodec_x86_h264dsp_init.c",
++ "libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c",
++ "libavcodec/x86/h264_intrapred_init.c",
++ "libavcodec/x86/h264_qpel.c",
++ "libavcodec/x86/h264chroma_init.c",
++ "libavcodec/x86/videodsp_init.c",
++ ]
+ ffmpeg_asm_sources += [
+ "libavcodec/x86/aacpsdsp.asm",
+- "libavcodec/x86/autorename_libavcodec_x86_videodsp.asm",
+ "libavcodec/x86/fpel.asm",
+ "libavcodec/x86/h264_chromamc.asm",
+ "libavcodec/x86/h264_chromamc_10bit.asm",
+@@ -300,36 +289,23 @@
+ "libavcodec/x86/h264_weight_10bit.asm",
+ "libavcodec/x86/qpel.asm",
+ "libavcodec/x86/sbrdsp.asm",
++ "libavcodec/x86/videodsp.asm",
+ ]
+ }
+
+-if (current_cpu == "arm64" && ffmpeg_branding == "Chrome") {
++if (use_linux_config && current_cpu == "x64") {
+ ffmpeg_c_sources += [
+- "libavcodec/aarch64/aacpsdsp_init_aarch64.c",
+- "libavcodec/aarch64/autorename_libavcodec_aarch64_videodsp_init.c",
- "libavcodec/aarch64/h264chroma_init_aarch64.c",
- "libavcodec/aarch64/h264dsp_init_aarch64.c",
- "libavcodec/aarch64/h264pred_init.c",
- "libavcodec/aarch64/h264qpel_init_aarch64.c",
-- "libavcodec/aarch64/videodsp_init.c",
+- "libavcodec/aarch64/sbrdsp_init_aarch64.c",
- ]
- ffmpeg_gas_sources += [
+- ffmpeg_gas_sources += [
+- "libavcodec/aarch64/autorename_libavcodec_aarch64_aacpsdsp_neon.S",
- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264cmc_neon.S",
- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264dsp_neon.S",
- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264idct_neon.S",
- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264pred_neon.S",
- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264qpel_neon.S",
- "libavcodec/aarch64/autorename_libavcodec_aarch64_hpeldsp_neon.S",
+- "libavcodec/aarch64/autorename_libavcodec_aarch64_sbrdsp_neon.S",
- "libavcodec/aarch64/videodsp.S",
-- ]
++ "libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c",
++ "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
++ "libavcodec/x86/constants.c",
++ "libavcodec/x86/mpegaudiodsp.c",
++ "libavutil/x86/autorename_libavutil_x86_cpu.c",
++ "libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c",
++ "libavutil/x86/autorename_libavutil_x86_float_dsp_init.c",
++ "libavutil/x86/imgutils_init.c",
++ "libavutil/x86/lls_init.c",
++ "libavutil/x86/tx_float_init.c",
+ ]
-}
-
-if (current_cpu == "x64" || (is_win && current_cpu == "x86") ||
- (use_linux_config && current_cpu == "x86")) {
- ffmpeg_c_sources +=
- [ "libavutil/x86/autorename_libavutil_x86_tx_float_init.c" ]
-- ffmpeg_asm_sources += [
-- "libavcodec/x86/dct32.asm",
-- "libavcodec/x86/flacdsp.asm",
-- "libavcodec/x86/imdct36.asm",
-- "libavcodec/x86/vorbisdsp.asm",
-- "libavutil/x86/cpuid.asm",
-- "libavutil/x86/fixed_dsp.asm",
-- "libavutil/x86/float_dsp.asm",
-- "libavutil/x86/imgutils.asm",
-- "libavutil/x86/lls.asm",
-- "libavutil/x86/tx_float.asm",
-- ]
--}
--
+ ffmpeg_asm_sources += [
+ "libavcodec/x86/dct32.asm",
+ "libavcodec/x86/flacdsp.asm",
+@@ -344,133 +320,35 @@
+ ]
+ }
+
-if (current_cpu == "x64" || (is_android && current_cpu == "x86") ||
- (is_win && current_cpu == "x86") ||
- (use_linux_config && current_cpu == "x86")) {
@@ -8253,13 +6606,8 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part
- "libavutil/x86/fixed_dsp_init.c",
- "libavutil/x86/imgutils_init.c",
- "libavutil/x86/lls_init.c",
-+ "libavcodec/riscv/aacpsdsp_rvv.S",
-+ "libavcodec/riscv/h264_mc_chroma.S",
-+ "libavcodec/riscv/sbrdsp_rvv.S",
-+ "libavcodec/riscv/startcode_rvb.S",
-+ "libavcodec/riscv/startcode_rvv.S",
- ]
- }
+- ]
+-}
-
-if ((is_android && current_cpu == "arm" && arm_use_neon) ||
- (use_linux_config && current_cpu == "arm" && arm_use_neon) ||
@@ -8312,8 +6660,24 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part
- ]
-}
-
+-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
+- (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
+- (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
+- (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
+- ffmpeg_c_sources += [
+- "libavcodec/x86/aacpsdsp_init.c",
+- "libavcodec/x86/h264_intrapred_init.c",
+- "libavcodec/x86/h264_qpel.c",
+- "libavcodec/x86/h264chroma_init.c",
+- "libavcodec/x86/h264dsp_init.c",
+- "libavcodec/x86/sbrdsp_init.c",
+- "libavcodec/x86/videodsp_init.c",
+- ]
+-}
+-
-if (use_linux_config && current_cpu == "arm" && arm_use_neon &&
-- ffmpeg_branding == "Chrome") {
++if (use_linux_config && current_cpu == "riscv64" &&
+ ffmpeg_branding == "Chrome") {
- ffmpeg_gas_sources += [
- "libavcodec/arm/h264cmc_neon.S",
- "libavcodec/arm/h264dsp_neon.S",
@@ -8321,68 +6685,58 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part
- "libavcodec/arm/h264pred_neon.S",
- "libavcodec/arm/h264qpel_neon.S",
- "libavcodec/arm/hpeldsp_neon.S",
-- ]
--}
--
--if (current_cpu == "arm64" && ffmpeg_branding == "Chrome") {
-- ffmpeg_c_sources += [
-- "libavcodec/aarch64/aacpsdsp_init_aarch64.c",
-- "libavcodec/aarch64/sbrdsp_init_aarch64.c",
-- ]
-- ffmpeg_gas_sources += [
-- "libavcodec/aarch64/autorename_libavcodec_aarch64_aacpsdsp_neon.S",
-- "libavcodec/aarch64/autorename_libavcodec_aarch64_sbrdsp_neon.S",
-- ]
++ ffmpeg_c_sources += [
++ "libavcodec/riscv/aacpsdsp_init.c",
++ "libavcodec/riscv/h264_chroma_init_riscv.c",
++ "libavcodec/riscv/h264dsp_init.c",
++ "libavcodec/riscv/sbrdsp_init.c",
+ ]
-}
-
-if ((is_android && current_cpu == "arm" && arm_use_neon) ||
- (use_linux_config && current_cpu == "arm" && arm_use_neon)) {
- ffmpeg_c_sources += [ "libavutil/arm/float_dsp_init_neon.c" ]
-- ffmpeg_gas_sources += [
+ ffmpeg_gas_sources += [
- "libavcodec/arm/vorbisdsp_neon.S",
- "libavutil/arm/float_dsp_neon.S",
-- ]
--}
--
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-- (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-- (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-- (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-- ffmpeg_c_sources += [
-- "libavcodec/x86/aacpsdsp_init.c",
-- "libavcodec/x86/sbrdsp_init.c",
-- ]
--}
--
++ "libavcodec/riscv/aacpsdsp_rvv.S",
++ "libavcodec/riscv/h264_mc_chroma.S",
++ "libavcodec/riscv/sbrdsp_rvv.S",
++ "libavcodec/riscv/startcode_rvb.S",
++ "libavcodec/riscv/startcode_rvv.S",
+ ]
+ }
+
-if ((is_android && current_cpu == "arm" && arm_use_neon &&
- ffmpeg_branding == "Chrome") ||
- (use_linux_config && current_cpu == "arm" && arm_use_neon &&
- ffmpeg_branding == "Chrome") ||
- (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome")) {
-- ffmpeg_c_sources += [
++if (use_linux_config && current_cpu == "riscv64") {
+ ffmpeg_c_sources += [
- "libavcodec/arm/aacpsdsp_init_arm.c",
- "libavcodec/arm/sbrdsp_init_arm.c",
-- ]
--}
--
--if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-- (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-- (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-- ffmpeg_asm_sources += [
-- "libavcodec/x86/aacpsdsp.asm",
-- "libavcodec/x86/sbrdsp.asm",
-- ]
++ "libavcodec/riscv/flacdsp_init.c",
++ "libavcodec/riscv/vorbisdsp_init.c",
++ "libavutil/riscv/cpu.c",
++ "libavutil/riscv/fixed_dsp_init.c",
++ "libavutil/riscv/float_dsp_init.c",
+ ]
-}
-
-if ((is_android && current_cpu == "arm" && arm_use_neon &&
- ffmpeg_branding == "Chrome") ||
- (use_linux_config && current_cpu == "arm" && arm_use_neon &&
- ffmpeg_branding == "Chrome")) {
-- ffmpeg_gas_sources += [
+ ffmpeg_gas_sources += [
- "libavcodec/arm/aacpsdsp_neon.S",
- "libavcodec/arm/sbrdsp_neon.S",
-- ]
--}
++ "libavcodec/riscv/flacdsp_rvv.S",
++ "libavcodec/riscv/vorbisdsp_rvv.S",
++ "libavutil/riscv/fixed_dsp_rvv.S",
++ "libavutil/riscv/float_dsp_rvv.S",
+ ]
+ }
-
-if ((is_android && current_cpu == "arm" && arm_use_neon) ||
- (is_android && current_cpu == "arm64") ||
@@ -8390,2396 +6744,180 @@ diff '--color=auto' -Naur a/third_party/ffmpeg/ffmpeg_generated.gni b/third_part
- (is_android && current_cpu == "x86")) {
- ffmpeg_c_sources += [ "compat/strtod.c" ]
-}
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/autorename_libavcodec_flacdsp.c b/third_party/ffmpeg/libavcodec/autorename_libavcodec_flacdsp.c
+--- a/third_party/ffmpeg/libavcodec/autorename_libavcodec_flacdsp.c 2024-10-02 03:50:25.062372700 +0100
++++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_flacdsp.c 2024-10-05 16:34:43.829854513 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "flacdsp.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/autorename_libavcodec_mpegaudiodsp.c b/third_party/ffmpeg/libavcodec/autorename_libavcodec_mpegaudiodsp.c
+--- a/third_party/ffmpeg/libavcodec/autorename_libavcodec_mpegaudiodsp.c 2024-10-02 03:50:25.062372700 +0100
++++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_mpegaudiodsp.c 2024-10-05 16:34:43.829854513 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "mpegaudiodsp.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/autorename_libavcodec_sbrdsp.c b/third_party/ffmpeg/libavcodec/autorename_libavcodec_sbrdsp.c
+--- a/third_party/ffmpeg/libavcodec/autorename_libavcodec_sbrdsp.c 2024-10-02 03:50:25.063372600 +0100
++++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_sbrdsp.c 2024-10-05 16:34:43.829854513 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "sbrdsp.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 2024-10-02 03:50:25.063372600 +0100
++++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_videodsp.c 2024-10-05 16:34:43.829854513 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "videodsp.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/autorename_libavcodec_vorbisdsp.c b/third_party/ffmpeg/libavcodec/autorename_libavcodec_vorbisdsp.c
+--- a/third_party/ffmpeg/libavcodec/autorename_libavcodec_vorbisdsp.c 2024-10-02 03:50:25.063372600 +0100
++++ b/third_party/ffmpeg/libavcodec/autorename_libavcodec_vorbisdsp.c 2024-10-05 16:34:43.829854513 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "vorbisdsp.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c
+--- a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c 1970-01-01 01:00:00.000000000 +0100
++++ b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c 2024-10-05 16:34:43.829854513 +0100
+@@ -0,0 +1,2 @@
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
++#include "aacpsdsp_init.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c
+--- a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c 1970-01-01 01:00:00.000000000 +0100
++++ b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c 2024-10-05 16:34:43.833187847 +0100
+@@ -0,0 +1,2 @@
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
++#include "flacdsp_init.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_h264dsp_init.c b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_h264dsp_init.c
+--- a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_h264dsp_init.c 1970-01-01 01:00:00.000000000 +0100
++++ b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_h264dsp_init.c 2024-10-05 16:34:43.833187847 +0100
+@@ -0,0 +1,2 @@
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
++#include "h264dsp_init.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c
+--- a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c 1970-01-01 01:00:00.000000000 +0100
++++ b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c 2024-10-05 16:34:43.833187847 +0100
+@@ -0,0 +1,2 @@
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
++#include "sbrdsp_init.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c
+--- a/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c 2024-10-02 03:50:25.603434800 +0100
++++ b/third_party/ffmpeg/libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c 2024-10-05 16:34:43.833187847 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "vorbisdsp_init.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 2024-08-13 10:43:45.959181500 +0100
-+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c 2024-08-18 23:57:15.000000000 +0100
+--- a/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c 2024-10-02 03:50:25.818459500 +0100
++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_aacdec.c 2024-10-05 16:34:43.833187847 +0100
@@ -1,2 +1,2 @@
--// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. 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 2024-08-13 10:43:45.959181500 +0100
-+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c 2024-08-18 23:57:15.000000000 +0100
+--- a/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c 2024-10-02 03:50:25.818459500 +0100
++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_flacdec.c 2024-10-05 16:34:43.833187847 +0100
@@ -1,2 +1,2 @@
--// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. 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 2024-08-13 10:43:45.959181500 +0100
-+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_options.c 2024-08-18 23:57:15.000000000 +0100
+--- a/third_party/ffmpeg/libavformat/autorename_libavformat_options.c 2024-10-02 03:50:25.818459500 +0100
++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_options.c 2024-10-05 16:34:43.833187847 +0100
@@ -1,2 +1,2 @@
--// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. 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 2024-08-13 10:43:45.959181500 +0100
-+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c 2024-08-18 23:57:15.000000000 +0100
+--- a/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c 2024-10-02 03:50:25.818459500 +0100
++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_pcm.c 2024-10-05 16:34:43.833187847 +0100
@@ -1,2 +1,2 @@
--// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. 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 2024-08-13 10:43:45.959181500 +0100
-+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c 2024-08-18 23:57:15.000000000 +0100
+--- a/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c 2024-10-02 03:50:25.818459500 +0100
++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_utils.c 2024-10-05 16:34:43.833187847 +0100
@@ -1,2 +1,2 @@
--// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. 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 2024-08-13 10:43:45.959181500 +0100
-+++ b/third_party/ffmpeg/libavformat/autorename_libavformat_version.c 2024-08-18 23:57:15.000000000 +0100
+--- a/third_party/ffmpeg/libavformat/autorename_libavformat_version.c 2024-10-02 03:50:25.818459500 +0100
++++ b/third_party/ffmpeg/libavformat/autorename_libavformat_version.c 2024-10-05 16:34:43.833187847 +0100
@@ -1,2 +1,2 @@
--// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
#include "version.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c b/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c
+--- a/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2024-10-02 03:50:25.950474700 +0100
++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_cpu.c 2024-10-05 16:34:43.836521180 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "cpu.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/autorename_libavutil_fixed_dsp.c b/third_party/ffmpeg/libavutil/autorename_libavutil_fixed_dsp.c
+--- a/third_party/ffmpeg/libavutil/autorename_libavutil_fixed_dsp.c 2024-10-02 03:50:25.950474700 +0100
++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_fixed_dsp.c 2024-10-05 16:34:43.836521180 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "fixed_dsp.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/autorename_libavutil_float_dsp.c b/third_party/ffmpeg/libavutil/autorename_libavutil_float_dsp.c
+--- a/third_party/ffmpeg/libavutil/autorename_libavutil_float_dsp.c 2024-10-02 03:50:25.950474700 +0100
++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_float_dsp.c 2024-10-05 16:34:43.836521180 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "float_dsp.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/autorename_libavutil_imgutils.c b/third_party/ffmpeg/libavutil/autorename_libavutil_imgutils.c
+--- a/third_party/ffmpeg/libavutil/autorename_libavutil_imgutils.c 2024-10-02 03:50:25.950474700 +0100
++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_imgutils.c 2024-10-05 16:34:43.836521180 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "imgutils.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/autorename_libavutil_tx_float.c b/third_party/ffmpeg/libavutil/autorename_libavutil_tx_float.c
+--- a/third_party/ffmpeg/libavutil/autorename_libavutil_tx_float.c 2024-10-02 03:50:25.950474700 +0100
++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_tx_float.c 2024-10-05 16:34:43.836521180 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "tx_float.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 2024-08-13 10:43:46.075191700 +0100
-+++ b/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c 2024-08-18 23:57:15.000000000 +0100
+--- a/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c 2024-10-02 03:50:25.950474700 +0100
++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_utils.c 2024-10-05 16:34:43.836521180 +0100
@@ -1,2 +1,2 @@
--// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. 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 2024-08-13 10:43:46.075191700 +0100
-+++ b/third_party/ffmpeg/libavutil/autorename_libavutil_version.c 2024-08-18 23:57:15.000000000 +0100
+--- a/third_party/ffmpeg/libavutil/autorename_libavutil_version.c 2024-10-02 03:50:25.950474700 +0100
++++ b/third_party/ffmpeg/libavutil/autorename_libavutil_version.c 2024-10-05 16:34:43.836521180 +0100
@@ -1,2 +1,2 @@
--// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. 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 2024-08-18 23:57:15.000000000 +0100
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_cpu.c b/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_cpu.c
+--- a/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_cpu.c 2024-10-02 03:50:25.987479000 +0100
++++ b/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_cpu.c 2024-10-05 16:34:43.836521180 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "cpu.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c b/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c
+--- a/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c 1970-01-01 01:00:00.000000000 +0100
++++ b/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c 2024-10-05 16:34:43.836521180 +0100
@@ -0,0 +1,2 @@
-+// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+#include "cpu.c"
-diff '--color=auto' -Naur a/third_party/ffmpeg/riscv-ffmpeg.patch b/third_party/ffmpeg/riscv-ffmpeg.patch
---- a/third_party/ffmpeg/riscv-ffmpeg.patch 1970-01-01 01:00:00.000000000 +0100
-+++ b/third_party/ffmpeg/riscv-ffmpeg.patch 2024-08-19 02:20:10.000000000 +0100
-@@ -0,0 +1,2327 @@
-+ CREDITS.chromium | 81 ++++--
-+ chromium/config/Chrome/ios/arm64/config.h | 26 +-
-+ .../config/Chrome/ios/arm64/config_components.h | 22 +-
-+ .../Chrome/ios/arm64/libavformat/demuxer_list.c | 2 +-
-+ .../config/Chrome/ios/arm64/libavutil/ffversion.h | 2 +-
-+ chromium/config/Chrome/ios/x64/config.asm | 21 +-
-+ chromium/config/Chrome/ios/x64/config.h | 26 +-
-+ chromium/config/Chrome/ios/x64/config_components.h | 22 +-
-+ .../Chrome/ios/x64/libavformat/demuxer_list.c | 2 +-
-+ .../config/Chrome/ios/x64/libavutil/ffversion.h | 2 +-
-+ chromium/config/Chromium/ios/arm64/config.h | 26 +-
-+ .../config/Chromium/ios/arm64/config_components.h | 22 +-
-+ .../Chromium/ios/arm64/libavformat/demuxer_list.c | 2 +-
-+ .../Chromium/ios/arm64/libavutil/ffversion.h | 2 +-
-+ chromium/config/Chromium/ios/x64/config.asm | 21 +-
-+ chromium/config/Chromium/ios/x64/config.h | 26 +-
-+ .../config/Chromium/ios/x64/config_components.h | 22 +-
-+ .../Chromium/ios/x64/libavformat/demuxer_list.c | 2 +-
-+ .../config/Chromium/ios/x64/libavutil/ffversion.h | 2 +-
-+ ffmpeg_generated.gni | 303 ++++-----------------
-+ libavformat/autorename_libavformat_aacdec.c | 2 +-
-+ libavformat/autorename_libavformat_flacdec.c | 2 +-
-+ libavformat/autorename_libavformat_options.c | 2 +-
-+ libavformat/autorename_libavformat_pcm.c | 2 +-
-+ libavformat/autorename_libavformat_utils.c | 2 +-
-+ libavformat/autorename_libavformat_version.c | 2 +-
-+ libavutil/autorename_libavutil_utils.c | 2 +-
-+ libavutil/autorename_libavutil_version.c | 2 +-
-+ 28 files changed, 266 insertions(+), 384 deletions(-)
-+
-+diff --git a/CREDITS.chromium b/CREDITS.chromium
-+index ccd7f4afa5..e12dcc247a 100644
-+--- a/CREDITS.chromium
-++++ b/CREDITS.chromium
-+@@ -129,6 +129,62 @@ incompatible with the GPLv2 and v3. To the best of our knowledge, they are
-+ compatible with the LGPL.
-+
-+
-++********************************************************************************
-++
-++libavcodec/riscv/startcode_rvb.S
-++
-++Copyright © 2024 Rémi Denis-Courmont.
-++
-++Redistribution and use in source and binary forms, with or without
-++modification, are permitted provided that the following conditions are met:
-++
-++1. Redistributions of source code must retain the above copyright notice,
-++this list of conditions and the following disclaimer.
-++
-++2. Redistributions in binary form must reproduce the above copyright notice,
-++this list of conditions and the following disclaimer in the documentation
-++and/or other materials provided with the distribution.
-++
-++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-++AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-++ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-++LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-++CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-++SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-++INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-++CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-++ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-++POSSIBILITY OF SUCH DAMAGE.
-++
-++********************************************************************************
-++
-++libavcodec/riscv/startcode_rvv.S
-++
-++Copyright © 2024 Rémi Denis-Courmont.
-++
-++Redistribution and use in source and binary forms, with or without
-++modification, are permitted provided that the following conditions are met:
-++
-++1. Redistributions of source code must retain the above copyright notice,
-++this list of conditions and the following disclaimer.
-++
-++2. Redistributions in binary form must reproduce the above copyright notice,
-++this list of conditions and the following disclaimer in the documentation
-++and/or other materials provided with the distribution.
-++
-++THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-++AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-++IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-++ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-++LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-++CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-++SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-++INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-++CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-++ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-++POSSIBILITY OF SUCH DAMAGE.
-++
-+ ********************************************************************************
-+
-+ libavformat/oggparsetheora.c
-+@@ -157,31 +213,6 @@ DEALINGS IN THE SOFTWARE.
-+
-+ ********************************************************************************
-+
-+-libavutil/x86/x86inc.asm
-+-
-+-x86inc.asm: x86 abstraction layer
-+-
-+- Copyright (C) 2005-2024 x264 project
-+-
-+- Authors: Loren Merritt <lorenm@u.washington.edu>
-+- Henrik Gramner <henrik@gramner.com>
-+- Anton Mitrofanov <BugMaster@narod.ru>
-+- Fiona Glaser <fiona@x264.com>
-+-
-+- Permission to use, copy, modify, and/or distribute this software for any
-+- purpose with or without fee is hereby granted, provided that the above
-+- copyright notice and this permission notice appear in all copies.
-+-
-+- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-+- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-+- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-+- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-+-
-+-********************************************************************************
-+-
-+ libavcodec/mips/compute_antialias_fixed.h
-+ libavcodec/mips/compute_antialias_float.h
-+ libavutil/fixed_dsp.c
-+diff --git a/chromium/config/Chrome/ios/arm64/config.h b/chromium/config/Chrome/ios/arm64/config.h
-+index a9b33e0a22..5a1a06ad85 100644
-+--- a/chromium/config/Chrome/ios/arm64/config.h
-++++ b/chromium/config/Chrome/ios/arm64/config.h
-+@@ -1,14 +1,13 @@
-+ /* Automatically generated by configure - do not modify! */
-+ #ifndef FFMPEG_CONFIG_H
-+ #define FFMPEG_CONFIG_H
-+-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cr
oss-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/
projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
-++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang
--enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/cod
e/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
-+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+ #define CONFIG_THIS_YEAR 2024
-+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)"
-++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
-+ #define OS_NAME darwin
-+-#define av_restrict restrict
-+ #define EXTERN_PREFIX "_"
-+ #define EXTERN_ASM _
-+ #define BUILDSUF ""
-+@@ -60,6 +59,7 @@
-+ #define HAVE_VSX 0
-+ #define HAVE_RV 0
-+ #define HAVE_RVV 0
-++#define HAVE_RV_ZVBB 0
-+ #define HAVE_AESNI 0
-+ #define HAVE_AMD3DNOW 0
-+ #define HAVE_AMD3DNOWEXT 0
-+@@ -78,7 +78,6 @@
-+ #define HAVE_SSE42 0
-+ #define HAVE_SSSE3 0
-+ #define HAVE_XOP 0
-+-#define HAVE_CPUNOP 0
-+ #define HAVE_I686 0
-+ #define HAVE_MIPSFPU 0
-+ #define HAVE_MIPS32R2 0
-+@@ -112,6 +111,7 @@
-+ #define HAVE_VSX_EXTERNAL 0
-+ #define HAVE_RV_EXTERNAL 0
-+ #define HAVE_RVV_EXTERNAL 0
-++#define HAVE_RV_ZVBB_EXTERNAL 0
-+ #define HAVE_AESNI_EXTERNAL 0
-+ #define HAVE_AMD3DNOW_EXTERNAL 0
-+ #define HAVE_AMD3DNOWEXT_EXTERNAL 0
-+@@ -130,7 +130,6 @@
-+ #define HAVE_SSE42_EXTERNAL 0
-+ #define HAVE_SSSE3_EXTERNAL 0
-+ #define HAVE_XOP_EXTERNAL 0
-+-#define HAVE_CPUNOP_EXTERNAL 0
-+ #define HAVE_I686_EXTERNAL 0
-+ #define HAVE_MIPSFPU_EXTERNAL 0
-+ #define HAVE_MIPS32R2_EXTERNAL 0
-+@@ -164,6 +163,7 @@
-+ #define HAVE_VSX_INLINE 0
-+ #define HAVE_RV_INLINE 0
-+ #define HAVE_RVV_INLINE 0
-++#define HAVE_RV_ZVBB_INLINE 0
-+ #define HAVE_AESNI_INLINE 0
-+ #define HAVE_AMD3DNOW_INLINE 0
-+ #define HAVE_AMD3DNOWEXT_INLINE 0
-+@@ -182,7 +182,6 @@
-+ #define HAVE_SSE42_INLINE 0
-+ #define HAVE_SSSE3_INLINE 0
-+ #define HAVE_XOP_INLINE 0
-+-#define HAVE_CPUNOP_INLINE 0
-+ #define HAVE_I686_INLINE 0
-+ #define HAVE_MIPSFPU_INLINE 0
-+ #define HAVE_MIPS32R2_INLINE 0
-+@@ -220,6 +219,7 @@
-+ #define HAVE_BIGENDIAN 0
-+ #define HAVE_FAST_UNALIGNED 1
-+ #define HAVE_ARPA_INET_H 0
-++#define HAVE_ASM_HWPROBE_H 0
-+ #define HAVE_ASM_TYPES_H 0
-+ #define HAVE_CDIO_PARANOIA_H 0
-+ #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+@@ -246,6 +246,7 @@
-+ #define HAVE_OPENGL_GL3_H 0
-+ #define HAVE_POLL_H 1
-+ #define HAVE_PTHREAD_NP_H 0
-++#define HAVE_SYS_HWPROBE_H 0
-+ #define HAVE_SYS_PARAM_H 1
-+ #define HAVE_SYS_RESOURCE_H 1
-+ #define HAVE_SYS_SELECT_H 1
-+@@ -419,6 +420,7 @@
-+ #define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+ #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
-+ #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-++#define HAVE_STRUCT_MFXCONFIGINTERFACE 0
-+ #define HAVE_GZIP 1
-+ #define HAVE_LIBDRM_GETFB2 0
-+ #define HAVE_MAKEINFO 0
-+@@ -429,6 +431,7 @@
-+ #define HAVE_OPENCL_DXVA2 0
-+ #define HAVE_OPENCL_VAAPI_BEIGNET 0
-+ #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-++#define HAVE_OPENCL_VIDEOTOOLBOX 0
-+ #define HAVE_PERL 1
-+ #define HAVE_POD2MAN 1
-+ #define HAVE_TEXI2HTML 0
-+@@ -468,6 +471,8 @@
-+ #define CONFIG_FREI0R 0
-+ #define CONFIG_LIBCDIO 0
-+ #define CONFIG_LIBDAVS2 0
-++#define CONFIG_LIBDVDNAV 0
-++#define CONFIG_LIBDVDREAD 0
-+ #define CONFIG_LIBRUBBERBAND 0
-+ #define CONFIG_LIBVIDSTAB 0
-+ #define CONFIG_LIBX264 0
-+@@ -517,6 +522,7 @@
-+ #define CONFIG_LIBJXL 0
-+ #define CONFIG_LIBKLVANC 0
-+ #define CONFIG_LIBKVAZAAR 0
-++#define CONFIG_LIBLC3 0
-+ #define CONFIG_LIBMODPLUG 0
-+ #define CONFIG_LIBMP3LAME 0
-+ #define CONFIG_LIBMYSOFA 0
-+@@ -547,6 +553,7 @@
-+ #define CONFIG_LIBTENSORFLOW 0
-+ #define CONFIG_LIBTESSERACT 0
-+ #define CONFIG_LIBTHEORA 0
-++#define CONFIG_LIBTORCH 0
-+ #define CONFIG_LIBTWOLAME 0
-+ #define CONFIG_LIBUAVS3D 0
-+ #define CONFIG_LIBV4L2 0
-+@@ -596,7 +603,6 @@
-+ #define CONFIG_OPENCL 0
-+ #define CONFIG_AMF 0
-+ #define CONFIG_AUDIOTOOLBOX 0
-+-#define CONFIG_CRYSTALHD 0
-+ #define CONFIG_CUDA 0
-+ #define CONFIG_CUDA_LLVM 0
-+ #define CONFIG_CUVID 0
-+@@ -640,6 +646,7 @@
-+ #define CONFIG_ERROR_RESILIENCE 0
-+ #define CONFIG_FAAN 0
-+ #define CONFIG_FAST_UNALIGNED 1
-++#define CONFIG_IAMF 0
-+ #define CONFIG_LSP 0
-+ #define CONFIG_PIXELUTILS 0
-+ #define CONFIG_NETWORK 0
-+@@ -688,7 +695,8 @@
-+ #define CONFIG_DEFLATE_WRAPPER 0
-+ #define CONFIG_DIRAC_PARSE 1
-+ #define CONFIG_DNN 0
-+-#define CONFIG_DOVI_RPU 0
-++#define CONFIG_DOVI_RPUDEC 0
-++#define CONFIG_DOVI_RPUENC 0
-+ #define CONFIG_DVPROFILE 0
-+ #define CONFIG_EVCPARSE 0
-+ #define CONFIG_EXIF 0
-+@@ -720,10 +728,12 @@
-+ #define CONFIG_INFLATE_WRAPPER 0
-+ #define CONFIG_INTRAX8 0
-+ #define CONFIG_ISO_MEDIA 1
-++#define CONFIG_ISO_WRITER 0
-+ #define CONFIG_IVIDSP 0
-+ #define CONFIG_JPEGTABLES 0
-+ #define CONFIG_LGPLV3 0
-+ #define CONFIG_LIBX262 0
-++#define CONFIG_LIBX264_HDR10 0
-+ #define CONFIG_LLAUDDSP 0
-+ #define CONFIG_LLVIDDSP 0
-+ #define CONFIG_LLVIDENCDSP 0
-+diff --git a/chromium/config/Chrome/ios/arm64/config_components.h b/chromium/config/Chrome/ios/arm64/config_components.h
-+index 78ba358a27..8ebce4c9b5 100644
-+--- a/chromium/config/Chrome/ios/arm64/config_components.h
-++++ b/chromium/config/Chrome/ios/arm64/config_components.h
-+@@ -11,6 +11,7 @@
-+ #define CONFIG_DTS2PTS_BSF 0
-+ #define CONFIG_DV_ERROR_MARKER_BSF 0
-+ #define CONFIG_EAC3_CORE_BSF 0
-++#define CONFIG_EVC_FRAME_MERGE_BSF 0
-+ #define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+ #define CONFIG_FILTER_UNITS_BSF 0
-+ #define CONFIG_H264_METADATA_BSF 0
-+@@ -23,7 +24,6 @@
-+ #define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
-+ #define CONFIG_MJPEG2JPEG_BSF 0
-+ #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+-#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
-+ #define CONFIG_MPEG2_METADATA_BSF 0
-+ #define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
-+ #define CONFIG_MOV2TEXTSUB_BSF 0
-+@@ -45,7 +45,6 @@
-+ #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
-+ #define CONFIG_VVC_METADATA_BSF 0
-+ #define CONFIG_VVC_MP4TOANNEXB_BSF 0
-+-#define CONFIG_EVC_FRAME_MERGE_BSF 0
-+ #define CONFIG_AASC_DECODER 0
-+ #define CONFIG_AIC_DECODER 0
-+ #define CONFIG_ALIAS_PIX_DECODER 0
-+@@ -64,7 +63,6 @@
-+ #define CONFIG_AVRN_DECODER 0
-+ #define CONFIG_AVS_DECODER 0
-+ #define CONFIG_AVUI_DECODER 0
-+-#define CONFIG_AYUV_DECODER 0
-+ #define CONFIG_BETHSOFTVID_DECODER 0
-+ #define CONFIG_BFI_DECODER 0
-+ #define CONFIG_BINK_DECODER 0
-+@@ -131,7 +129,6 @@
-+ #define CONFIG_H263P_DECODER 0
-+ #define CONFIG_H263_V4L2M2M_DECODER 0
-+ #define CONFIG_H264_DECODER 1
-+-#define CONFIG_H264_CRYSTALHD_DECODER 0
-+ #define CONFIG_H264_V4L2M2M_DECODER 0
-+ #define CONFIG_H264_MEDIACODEC_DECODER 0
-+ #define CONFIG_H264_MMAL_DECODER 0
-+@@ -179,13 +176,11 @@
-+ #define CONFIG_MPEG1VIDEO_DECODER 0
-+ #define CONFIG_MPEG2VIDEO_DECODER 0
-+ #define CONFIG_MPEG4_DECODER 0
-+-#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
-+ #define CONFIG_MPEG4_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG4_MMAL_DECODER 0
-+ #define CONFIG_MPEGVIDEO_DECODER 0
-+ #define CONFIG_MPEG1_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG2_MMAL_DECODER 0
-+-#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
-+ #define CONFIG_MPEG2_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG2_QSV_DECODER 0
-+ #define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-+@@ -194,7 +189,6 @@
-+ #define CONFIG_MSMPEG4V1_DECODER 0
-+ #define CONFIG_MSMPEG4V2_DECODER 0
-+ #define CONFIG_MSMPEG4V3_DECODER 0
-+-#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
-+ #define CONFIG_MSP2_DECODER 0
-+ #define CONFIG_MSRLE_DECODER 0
-+ #define CONFIG_MSS1_DECODER 0
-+@@ -293,7 +287,6 @@
-+ #define CONFIG_VBN_DECODER 0
-+ #define CONFIG_VBLE_DECODER 0
-+ #define CONFIG_VC1_DECODER 0
-+-#define CONFIG_VC1_CRYSTALHD_DECODER 0
-+ #define CONFIG_VC1IMAGE_DECODER 0
-+ #define CONFIG_VC1_MMAL_DECODER 0
-+ #define CONFIG_VC1_QSV_DECODER 0
-+@@ -325,7 +318,6 @@
-+ #define CONFIG_WMV1_DECODER 0
-+ #define CONFIG_WMV2_DECODER 0
-+ #define CONFIG_WMV3_DECODER 0
-+-#define CONFIG_WMV3_CRYSTALHD_DECODER 0
-+ #define CONFIG_WMV3IMAGE_DECODER 0
-+ #define CONFIG_WNV1_DECODER 0
-+ #define CONFIG_XAN_WC3_DECODER 0
-+@@ -592,6 +584,7 @@
-+ #define CONFIG_LIBGSM_MS_DECODER 0
-+ #define CONFIG_LIBILBC_DECODER 0
-+ #define CONFIG_LIBJXL_DECODER 0
-++#define CONFIG_LIBLC3_DECODER 0
-+ #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
-+ #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-+ #define CONFIG_LIBOPUS_DECODER 1
-+@@ -639,7 +632,6 @@
-+ #define CONFIG_ASV2_ENCODER 0
-+ #define CONFIG_AVRP_ENCODER 0
-+ #define CONFIG_AVUI_ENCODER 0
-+-#define CONFIG_AYUV_ENCODER 0
-+ #define CONFIG_BITPACKED_ENCODER 0
-+ #define CONFIG_BMP_ENCODER 0
-+ #define CONFIG_CFHD_ENCODER 0
-+@@ -821,6 +813,7 @@
-+ #define CONFIG_LIBGSM_MS_ENCODER 0
-+ #define CONFIG_LIBILBC_ENCODER 0
-+ #define CONFIG_LIBJXL_ENCODER 0
-++#define CONFIG_LIBLC3_ENCODER 0
-+ #define CONFIG_LIBMP3LAME_ENCODER 0
-+ #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+ #define CONFIG_LIBOPENJPEG_ENCODER 0
-+@@ -1573,6 +1566,8 @@
-+ #define CONFIG_HSTACK_QSV_FILTER 0
-+ #define CONFIG_VSTACK_QSV_FILTER 0
-+ #define CONFIG_XSTACK_QSV_FILTER 0
-++#define CONFIG_PAD_VAAPI_FILTER 0
-++#define CONFIG_DRAWBOX_VAAPI_FILTER 0
-+ #define CONFIG_ALLRGB_FILTER 0
-+ #define CONFIG_ALLYUV_FILTER 0
-+ #define CONFIG_CELLAUTO_FILTER 0
-+@@ -1706,6 +1701,7 @@
-+ #define CONFIG_DV_DEMUXER 0
-+ #define CONFIG_DVBSUB_DEMUXER 0
-+ #define CONFIG_DVBTXT_DEMUXER 0
-++#define CONFIG_DVDVIDEO_DEMUXER 0
-+ #define CONFIG_DXA_DEMUXER 0
-+ #define CONFIG_EA_DEMUXER 0
-+ #define CONFIG_EA_CDATA_DEMUXER 0
-+@@ -1767,6 +1763,7 @@
-+ #define CONFIG_KUX_DEMUXER 0
-+ #define CONFIG_KVAG_DEMUXER 0
-+ #define CONFIG_LAF_DEMUXER 0
-++#define CONFIG_LC3_DEMUXER 0
-+ #define CONFIG_LMLM4_DEMUXER 0
-+ #define CONFIG_LOAS_DEMUXER 0
-+ #define CONFIG_LUODAT_DEMUXER 0
-+@@ -1850,6 +1847,7 @@
-+ #define CONFIG_QOA_DEMUXER 0
-+ #define CONFIG_R3D_DEMUXER 0
-+ #define CONFIG_RAWVIDEO_DEMUXER 0
-++#define CONFIG_RCWT_DEMUXER 0
-+ #define CONFIG_REALTEXT_DEMUXER 0
-+ #define CONFIG_REDSPARK_DEMUXER 0
-+ #define CONFIG_RKA_DEMUXER 0
-+@@ -1987,6 +1985,7 @@
-+ #define CONFIG_AC4_MUXER 0
-+ #define CONFIG_ADTS_MUXER 0
-+ #define CONFIG_ADX_MUXER 0
-++#define CONFIG_AEA_MUXER 0
-+ #define CONFIG_AIFF_MUXER 0
-+ #define CONFIG_ALP_MUXER 0
-+ #define CONFIG_AMR_MUXER 0
-+@@ -2026,7 +2025,6 @@
-+ #define CONFIG_F4V_MUXER 0
-+ #define CONFIG_FFMETADATA_MUXER 0
-+ #define CONFIG_FIFO_MUXER 0
-+-#define CONFIG_FIFO_TEST_MUXER 0
-+ #define CONFIG_FILMSTRIP_MUXER 0
-+ #define CONFIG_FITS_MUXER 0
-+ #define CONFIG_FLAC_MUXER 0
-+@@ -2060,6 +2058,7 @@
-+ #define CONFIG_JACOSUB_MUXER 0
-+ #define CONFIG_KVAG_MUXER 0
-+ #define CONFIG_LATM_MUXER 0
-++#define CONFIG_LC3_MUXER 0
-+ #define CONFIG_LRC_MUXER 0
-+ #define CONFIG_M4V_MUXER 0
-+ #define CONFIG_MD5_MUXER 0
-+@@ -2162,6 +2161,7 @@
-+ #define CONFIG_WV_MUXER 0
-+ #define CONFIG_YUV4MPEGPIPE_MUXER 0
-+ #define CONFIG_CHROMAPRINT_MUXER 0
-++#define CONFIG_ANDROID_CONTENT_PROTOCOL 0
-+ #define CONFIG_ASYNC_PROTOCOL 0
-+ #define CONFIG_BLURAY_PROTOCOL 0
-+ #define CONFIG_CACHE_PROTOCOL 0
-+diff --git a/chromium/config/Chrome/ios/arm64/libavformat/demuxer_list.c b/chromium/config/Chrome/ios/arm64/libavformat/demuxer_list.c
-+index 920b22bfa7..29f1f59381 100644
-+--- a/chromium/config/Chrome/ios/arm64/libavformat/demuxer_list.c
-++++ b/chromium/config/Chrome/ios/arm64/libavformat/demuxer_list.c
-+@@ -1,4 +1,4 @@
-+-static const AVInputFormat * const demuxer_list[] = {
-++static const FFInputFormat * const demuxer_list[] = {
-+ &ff_aac_demuxer,
-+ &ff_flac_demuxer,
-+ &ff_matroska_demuxer,
-+diff --git a/chromium/config/Chrome/ios/arm64/libavutil/ffversion.h b/chromium/config/Chrome/ios/arm64/libavutil/ffversion.h
-+index e32799b284..63ce2ac5f8 100644
-+--- a/chromium/config/Chrome/ios/arm64/libavutil/ffversion.h
-++++ b/chromium/config/Chrome/ios/arm64/libavutil/ffversion.h
-+@@ -1,5 +1,5 @@
-+ /* Automatically generated by version.sh, do not manually edit! */
-+ #ifndef AVUTIL_FFVERSION_H
-+ #define AVUTIL_FFVERSION_H
-+-#define FFMPEG_VERSION "N-115016-g631703bfb9"
-++#define FFMPEG_VERSION "N-116569-gd0c8e13654"
-+ #endif /* AVUTIL_FFVERSION_H */
-+diff --git a/chromium/config/Chrome/ios/x64/config.asm b/chromium/config/Chrome/ios/x64/config.asm
-+index d13f207b0c..61fe976c14 100644
-+--- a/chromium/config/Chrome/ios/x64/config.asm
-++++ b/chromium/config/Chrome/ios/x64/config.asm
-+@@ -44,6 +44,7 @@
-+ %define HAVE_VSX 0
-+ %define HAVE_RV 0
-+ %define HAVE_RVV 0
-++%define HAVE_RV_ZVBB 0
-+ %define HAVE_AESNI 1
-+ %define HAVE_AMD3DNOW 1
-+ %define HAVE_AMD3DNOWEXT 1
-+@@ -62,7 +63,6 @@
-+ %define HAVE_SSE42 1
-+ %define HAVE_SSSE3 1
-+ %define HAVE_XOP 1
-+-%define HAVE_CPUNOP 0
-+ %define HAVE_I686 1
-+ %define HAVE_MIPSFPU 0
-+ %define HAVE_MIPS32R2 0
-+@@ -96,6 +96,7 @@
-+ %define HAVE_VSX_EXTERNAL 0
-+ %define HAVE_RV_EXTERNAL 0
-+ %define HAVE_RVV_EXTERNAL 0
-++%define HAVE_RV_ZVBB_EXTERNAL 0
-+ %define HAVE_AESNI_EXTERNAL 1
-+ %define HAVE_AMD3DNOW_EXTERNAL 1
-+ %define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+@@ -114,7 +115,6 @@
-+ %define HAVE_SSE42_EXTERNAL 1
-+ %define HAVE_SSSE3_EXTERNAL 1
-+ %define HAVE_XOP_EXTERNAL 1
-+-%define HAVE_CPUNOP_EXTERNAL 0
-+ %define HAVE_I686_EXTERNAL 0
-+ %define HAVE_MIPSFPU_EXTERNAL 0
-+ %define HAVE_MIPS32R2_EXTERNAL 0
-+@@ -148,6 +148,7 @@
-+ %define HAVE_VSX_INLINE 0
-+ %define HAVE_RV_INLINE 0
-+ %define HAVE_RVV_INLINE 0
-++%define HAVE_RV_ZVBB_INLINE 0
-+ %define HAVE_AESNI_INLINE 1
-+ %define HAVE_AMD3DNOW_INLINE 1
-+ %define HAVE_AMD3DNOWEXT_INLINE 1
-+@@ -166,7 +167,6 @@
-+ %define HAVE_SSE42_INLINE 1
-+ %define HAVE_SSSE3_INLINE 1
-+ %define HAVE_XOP_INLINE 1
-+-%define HAVE_CPUNOP_INLINE 0
-+ %define HAVE_I686_INLINE 0
-+ %define HAVE_MIPSFPU_INLINE 0
-+ %define HAVE_MIPS32R2_INLINE 0
-+@@ -204,6 +204,7 @@
-+ %define HAVE_BIGENDIAN 0
-+ %define HAVE_FAST_UNALIGNED 1
-+ %define HAVE_ARPA_INET_H 0
-++%define HAVE_ASM_HWPROBE_H 0
-+ %define HAVE_ASM_TYPES_H 0
-+ %define HAVE_CDIO_PARANOIA_H 0
-+ %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+@@ -230,6 +231,7 @@
-+ %define HAVE_OPENGL_GL3_H 0
-+ %define HAVE_POLL_H 1
-+ %define HAVE_PTHREAD_NP_H 0
-++%define HAVE_SYS_HWPROBE_H 0
-+ %define HAVE_SYS_PARAM_H 1
-+ %define HAVE_SYS_RESOURCE_H 1
-+ %define HAVE_SYS_SELECT_H 1
-+@@ -403,6 +405,7 @@
-+ %define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+ %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
-+ %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-++%define HAVE_STRUCT_MFXCONFIGINTERFACE 0
-+ %define HAVE_GZIP 1
-+ %define HAVE_LIBDRM_GETFB2 0
-+ %define HAVE_MAKEINFO 0
-+@@ -413,6 +416,7 @@
-+ %define HAVE_OPENCL_DXVA2 0
-+ %define HAVE_OPENCL_VAAPI_BEIGNET 0
-+ %define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-++%define HAVE_OPENCL_VIDEOTOOLBOX 0
-+ %define HAVE_PERL 1
-+ %define HAVE_POD2MAN 1
-+ %define HAVE_TEXI2HTML 0
-+@@ -452,6 +456,8 @@
-+ %define CONFIG_FREI0R 0
-+ %define CONFIG_LIBCDIO 0
-+ %define CONFIG_LIBDAVS2 0
-++%define CONFIG_LIBDVDNAV 0
-++%define CONFIG_LIBDVDREAD 0
-+ %define CONFIG_LIBRUBBERBAND 0
-+ %define CONFIG_LIBVIDSTAB 0
-+ %define CONFIG_LIBX264 0
-+@@ -501,6 +507,7 @@
-+ %define CONFIG_LIBJXL 0
-+ %define CONFIG_LIBKLVANC 0
-+ %define CONFIG_LIBKVAZAAR 0
-++%define CONFIG_LIBLC3 0
-+ %define CONFIG_LIBMODPLUG 0
-+ %define CONFIG_LIBMP3LAME 0
-+ %define CONFIG_LIBMYSOFA 0
-+@@ -531,6 +538,7 @@
-+ %define CONFIG_LIBTENSORFLOW 0
-+ %define CONFIG_LIBTESSERACT 0
-+ %define CONFIG_LIBTHEORA 0
-++%define CONFIG_LIBTORCH 0
-+ %define CONFIG_LIBTWOLAME 0
-+ %define CONFIG_LIBUAVS3D 0
-+ %define CONFIG_LIBV4L2 0
-+@@ -580,7 +588,6 @@
-+ %define CONFIG_OPENCL 0
-+ %define CONFIG_AMF 0
-+ %define CONFIG_AUDIOTOOLBOX 0
-+-%define CONFIG_CRYSTALHD 0
-+ %define CONFIG_CUDA 0
-+ %define CONFIG_CUDA_LLVM 0
-+ %define CONFIG_CUVID 0
-+@@ -624,6 +631,7 @@
-+ %define CONFIG_ERROR_RESILIENCE 0
-+ %define CONFIG_FAAN 0
-+ %define CONFIG_FAST_UNALIGNED 1
-++%define CONFIG_IAMF 0
-+ %define CONFIG_LSP 0
-+ %define CONFIG_PIXELUTILS 0
-+ %define CONFIG_NETWORK 0
-+@@ -672,7 +680,8 @@
-+ %define CONFIG_DEFLATE_WRAPPER 0
-+ %define CONFIG_DIRAC_PARSE 1
-+ %define CONFIG_DNN 0
-+-%define CONFIG_DOVI_RPU 0
-++%define CONFIG_DOVI_RPUDEC 0
-++%define CONFIG_DOVI_RPUENC 0
-+ %define CONFIG_DVPROFILE 0
-+ %define CONFIG_EVCPARSE 0
-+ %define CONFIG_EXIF 0
-+@@ -704,10 +713,12 @@
-+ %define CONFIG_INFLATE_WRAPPER 0
-+ %define CONFIG_INTRAX8 0
-+ %define CONFIG_ISO_MEDIA 1
-++%define CONFIG_ISO_WRITER 0
-+ %define CONFIG_IVIDSP 0
-+ %define CONFIG_JPEGTABLES 0
-+ %define CONFIG_LGPLV3 0
-+ %define CONFIG_LIBX262 0
-++%define CONFIG_LIBX264_HDR10 0
-+ %define CONFIG_LLAUDDSP 0
-+ %define CONFIG_LLVIDDSP 0
-+ %define CONFIG_LLVIDENCDSP 0
-+diff --git a/chromium/config/Chrome/ios/x64/config.h b/chromium/config/Chrome/ios/x64/config.h
-+index 9df971603d..cdeb923914 100644
-+--- a/chromium/config/Chrome/ios/x64/config.h
-++++ b/chromium/config/Chrome/ios/x64/config.h
-+@@ -1,14 +1,13 @@
-+ /* Automatically generated by configure - do not modify! */
-+ #ifndef FFMPEG_CONFIG_H
-+ #define FFMPEG_CONFIG_H
-+-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cr
oss-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov
/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
-++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang
--enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/co
de/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
-+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+ #define CONFIG_THIS_YEAR 2024
-+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)"
-++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
-+ #define OS_NAME darwin
-+-#define av_restrict restrict
-+ #define EXTERN_PREFIX "_"
-+ #define EXTERN_ASM _
-+ #define BUILDSUF ""
-+@@ -59,6 +58,7 @@
-+ #define HAVE_VSX 0
-+ #define HAVE_RV 0
-+ #define HAVE_RVV 0
-++#define HAVE_RV_ZVBB 0
-+ #define HAVE_AESNI 1
-+ #define HAVE_AMD3DNOW 1
-+ #define HAVE_AMD3DNOWEXT 1
-+@@ -77,7 +77,6 @@
-+ #define HAVE_SSE42 1
-+ #define HAVE_SSSE3 1
-+ #define HAVE_XOP 1
-+-#define HAVE_CPUNOP 0
-+ #define HAVE_I686 1
-+ #define HAVE_MIPSFPU 0
-+ #define HAVE_MIPS32R2 0
-+@@ -111,6 +110,7 @@
-+ #define HAVE_VSX_EXTERNAL 0
-+ #define HAVE_RV_EXTERNAL 0
-+ #define HAVE_RVV_EXTERNAL 0
-++#define HAVE_RV_ZVBB_EXTERNAL 0
-+ #define HAVE_AESNI_EXTERNAL 1
-+ #define HAVE_AMD3DNOW_EXTERNAL 1
-+ #define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+@@ -129,7 +129,6 @@
-+ #define HAVE_SSE42_EXTERNAL 1
-+ #define HAVE_SSSE3_EXTERNAL 1
-+ #define HAVE_XOP_EXTERNAL 1
-+-#define HAVE_CPUNOP_EXTERNAL 0
-+ #define HAVE_I686_EXTERNAL 0
-+ #define HAVE_MIPSFPU_EXTERNAL 0
-+ #define HAVE_MIPS32R2_EXTERNAL 0
-+@@ -163,6 +162,7 @@
-+ #define HAVE_VSX_INLINE 0
-+ #define HAVE_RV_INLINE 0
-+ #define HAVE_RVV_INLINE 0
-++#define HAVE_RV_ZVBB_INLINE 0
-+ #define HAVE_AESNI_INLINE 1
-+ #define HAVE_AMD3DNOW_INLINE 1
-+ #define HAVE_AMD3DNOWEXT_INLINE 1
-+@@ -181,7 +181,6 @@
-+ #define HAVE_SSE42_INLINE 1
-+ #define HAVE_SSSE3_INLINE 1
-+ #define HAVE_XOP_INLINE 1
-+-#define HAVE_CPUNOP_INLINE 0
-+ #define HAVE_I686_INLINE 0
-+ #define HAVE_MIPSFPU_INLINE 0
-+ #define HAVE_MIPS32R2_INLINE 0
-+@@ -219,6 +218,7 @@
-+ #define HAVE_BIGENDIAN 0
-+ #define HAVE_FAST_UNALIGNED 1
-+ #define HAVE_ARPA_INET_H 0
-++#define HAVE_ASM_HWPROBE_H 0
-+ #define HAVE_ASM_TYPES_H 0
-+ #define HAVE_CDIO_PARANOIA_H 0
-+ #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+@@ -245,6 +245,7 @@
-+ #define HAVE_OPENGL_GL3_H 0
-+ #define HAVE_POLL_H 1
-+ #define HAVE_PTHREAD_NP_H 0
-++#define HAVE_SYS_HWPROBE_H 0
-+ #define HAVE_SYS_PARAM_H 1
-+ #define HAVE_SYS_RESOURCE_H 1
-+ #define HAVE_SYS_SELECT_H 1
-+@@ -418,6 +419,7 @@
-+ #define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+ #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
-+ #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-++#define HAVE_STRUCT_MFXCONFIGINTERFACE 0
-+ #define HAVE_GZIP 1
-+ #define HAVE_LIBDRM_GETFB2 0
-+ #define HAVE_MAKEINFO 0
-+@@ -428,6 +430,7 @@
-+ #define HAVE_OPENCL_DXVA2 0
-+ #define HAVE_OPENCL_VAAPI_BEIGNET 0
-+ #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-++#define HAVE_OPENCL_VIDEOTOOLBOX 0
-+ #define HAVE_PERL 1
-+ #define HAVE_POD2MAN 1
-+ #define HAVE_TEXI2HTML 0
-+@@ -467,6 +470,8 @@
-+ #define CONFIG_FREI0R 0
-+ #define CONFIG_LIBCDIO 0
-+ #define CONFIG_LIBDAVS2 0
-++#define CONFIG_LIBDVDNAV 0
-++#define CONFIG_LIBDVDREAD 0
-+ #define CONFIG_LIBRUBBERBAND 0
-+ #define CONFIG_LIBVIDSTAB 0
-+ #define CONFIG_LIBX264 0
-+@@ -516,6 +521,7 @@
-+ #define CONFIG_LIBJXL 0
-+ #define CONFIG_LIBKLVANC 0
-+ #define CONFIG_LIBKVAZAAR 0
-++#define CONFIG_LIBLC3 0
-+ #define CONFIG_LIBMODPLUG 0
-+ #define CONFIG_LIBMP3LAME 0
-+ #define CONFIG_LIBMYSOFA 0
-+@@ -546,6 +552,7 @@
-+ #define CONFIG_LIBTENSORFLOW 0
-+ #define CONFIG_LIBTESSERACT 0
-+ #define CONFIG_LIBTHEORA 0
-++#define CONFIG_LIBTORCH 0
-+ #define CONFIG_LIBTWOLAME 0
-+ #define CONFIG_LIBUAVS3D 0
-+ #define CONFIG_LIBV4L2 0
-+@@ -595,7 +602,6 @@
-+ #define CONFIG_OPENCL 0
-+ #define CONFIG_AMF 0
-+ #define CONFIG_AUDIOTOOLBOX 0
-+-#define CONFIG_CRYSTALHD 0
-+ #define CONFIG_CUDA 0
-+ #define CONFIG_CUDA_LLVM 0
-+ #define CONFIG_CUVID 0
-+@@ -639,6 +645,7 @@
-+ #define CONFIG_ERROR_RESILIENCE 0
-+ #define CONFIG_FAAN 0
-+ #define CONFIG_FAST_UNALIGNED 1
-++#define CONFIG_IAMF 0
-+ #define CONFIG_LSP 0
-+ #define CONFIG_PIXELUTILS 0
-+ #define CONFIG_NETWORK 0
-+@@ -687,7 +694,8 @@
-+ #define CONFIG_DEFLATE_WRAPPER 0
-+ #define CONFIG_DIRAC_PARSE 1
-+ #define CONFIG_DNN 0
-+-#define CONFIG_DOVI_RPU 0
-++#define CONFIG_DOVI_RPUDEC 0
-++#define CONFIG_DOVI_RPUENC 0
-+ #define CONFIG_DVPROFILE 0
-+ #define CONFIG_EVCPARSE 0
-+ #define CONFIG_EXIF 0
-+@@ -719,10 +727,12 @@
-+ #define CONFIG_INFLATE_WRAPPER 0
-+ #define CONFIG_INTRAX8 0
-+ #define CONFIG_ISO_MEDIA 1
-++#define CONFIG_ISO_WRITER 0
-+ #define CONFIG_IVIDSP 0
-+ #define CONFIG_JPEGTABLES 0
-+ #define CONFIG_LGPLV3 0
-+ #define CONFIG_LIBX262 0
-++#define CONFIG_LIBX264_HDR10 0
-+ #define CONFIG_LLAUDDSP 0
-+ #define CONFIG_LLVIDDSP 0
-+ #define CONFIG_LLVIDENCDSP 0
-+diff --git a/chromium/config/Chrome/ios/x64/config_components.h b/chromium/config/Chrome/ios/x64/config_components.h
-+index 78ba358a27..8ebce4c9b5 100644
-+--- a/chromium/config/Chrome/ios/x64/config_components.h
-++++ b/chromium/config/Chrome/ios/x64/config_components.h
-+@@ -11,6 +11,7 @@
-+ #define CONFIG_DTS2PTS_BSF 0
-+ #define CONFIG_DV_ERROR_MARKER_BSF 0
-+ #define CONFIG_EAC3_CORE_BSF 0
-++#define CONFIG_EVC_FRAME_MERGE_BSF 0
-+ #define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+ #define CONFIG_FILTER_UNITS_BSF 0
-+ #define CONFIG_H264_METADATA_BSF 0
-+@@ -23,7 +24,6 @@
-+ #define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
-+ #define CONFIG_MJPEG2JPEG_BSF 0
-+ #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+-#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
-+ #define CONFIG_MPEG2_METADATA_BSF 0
-+ #define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
-+ #define CONFIG_MOV2TEXTSUB_BSF 0
-+@@ -45,7 +45,6 @@
-+ #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
-+ #define CONFIG_VVC_METADATA_BSF 0
-+ #define CONFIG_VVC_MP4TOANNEXB_BSF 0
-+-#define CONFIG_EVC_FRAME_MERGE_BSF 0
-+ #define CONFIG_AASC_DECODER 0
-+ #define CONFIG_AIC_DECODER 0
-+ #define CONFIG_ALIAS_PIX_DECODER 0
-+@@ -64,7 +63,6 @@
-+ #define CONFIG_AVRN_DECODER 0
-+ #define CONFIG_AVS_DECODER 0
-+ #define CONFIG_AVUI_DECODER 0
-+-#define CONFIG_AYUV_DECODER 0
-+ #define CONFIG_BETHSOFTVID_DECODER 0
-+ #define CONFIG_BFI_DECODER 0
-+ #define CONFIG_BINK_DECODER 0
-+@@ -131,7 +129,6 @@
-+ #define CONFIG_H263P_DECODER 0
-+ #define CONFIG_H263_V4L2M2M_DECODER 0
-+ #define CONFIG_H264_DECODER 1
-+-#define CONFIG_H264_CRYSTALHD_DECODER 0
-+ #define CONFIG_H264_V4L2M2M_DECODER 0
-+ #define CONFIG_H264_MEDIACODEC_DECODER 0
-+ #define CONFIG_H264_MMAL_DECODER 0
-+@@ -179,13 +176,11 @@
-+ #define CONFIG_MPEG1VIDEO_DECODER 0
-+ #define CONFIG_MPEG2VIDEO_DECODER 0
-+ #define CONFIG_MPEG4_DECODER 0
-+-#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
-+ #define CONFIG_MPEG4_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG4_MMAL_DECODER 0
-+ #define CONFIG_MPEGVIDEO_DECODER 0
-+ #define CONFIG_MPEG1_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG2_MMAL_DECODER 0
-+-#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
-+ #define CONFIG_MPEG2_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG2_QSV_DECODER 0
-+ #define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-+@@ -194,7 +189,6 @@
-+ #define CONFIG_MSMPEG4V1_DECODER 0
-+ #define CONFIG_MSMPEG4V2_DECODER 0
-+ #define CONFIG_MSMPEG4V3_DECODER 0
-+-#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
-+ #define CONFIG_MSP2_DECODER 0
-+ #define CONFIG_MSRLE_DECODER 0
-+ #define CONFIG_MSS1_DECODER 0
-+@@ -293,7 +287,6 @@
-+ #define CONFIG_VBN_DECODER 0
-+ #define CONFIG_VBLE_DECODER 0
-+ #define CONFIG_VC1_DECODER 0
-+-#define CONFIG_VC1_CRYSTALHD_DECODER 0
-+ #define CONFIG_VC1IMAGE_DECODER 0
-+ #define CONFIG_VC1_MMAL_DECODER 0
-+ #define CONFIG_VC1_QSV_DECODER 0
-+@@ -325,7 +318,6 @@
-+ #define CONFIG_WMV1_DECODER 0
-+ #define CONFIG_WMV2_DECODER 0
-+ #define CONFIG_WMV3_DECODER 0
-+-#define CONFIG_WMV3_CRYSTALHD_DECODER 0
-+ #define CONFIG_WMV3IMAGE_DECODER 0
-+ #define CONFIG_WNV1_DECODER 0
-+ #define CONFIG_XAN_WC3_DECODER 0
-+@@ -592,6 +584,7 @@
-+ #define CONFIG_LIBGSM_MS_DECODER 0
-+ #define CONFIG_LIBILBC_DECODER 0
-+ #define CONFIG_LIBJXL_DECODER 0
-++#define CONFIG_LIBLC3_DECODER 0
-+ #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
-+ #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-+ #define CONFIG_LIBOPUS_DECODER 1
-+@@ -639,7 +632,6 @@
-+ #define CONFIG_ASV2_ENCODER 0
-+ #define CONFIG_AVRP_ENCODER 0
-+ #define CONFIG_AVUI_ENCODER 0
-+-#define CONFIG_AYUV_ENCODER 0
-+ #define CONFIG_BITPACKED_ENCODER 0
-+ #define CONFIG_BMP_ENCODER 0
-+ #define CONFIG_CFHD_ENCODER 0
-+@@ -821,6 +813,7 @@
-+ #define CONFIG_LIBGSM_MS_ENCODER 0
-+ #define CONFIG_LIBILBC_ENCODER 0
-+ #define CONFIG_LIBJXL_ENCODER 0
-++#define CONFIG_LIBLC3_ENCODER 0
-+ #define CONFIG_LIBMP3LAME_ENCODER 0
-+ #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+ #define CONFIG_LIBOPENJPEG_ENCODER 0
-+@@ -1573,6 +1566,8 @@
-+ #define CONFIG_HSTACK_QSV_FILTER 0
-+ #define CONFIG_VSTACK_QSV_FILTER 0
-+ #define CONFIG_XSTACK_QSV_FILTER 0
-++#define CONFIG_PAD_VAAPI_FILTER 0
-++#define CONFIG_DRAWBOX_VAAPI_FILTER 0
-+ #define CONFIG_ALLRGB_FILTER 0
-+ #define CONFIG_ALLYUV_FILTER 0
-+ #define CONFIG_CELLAUTO_FILTER 0
-+@@ -1706,6 +1701,7 @@
-+ #define CONFIG_DV_DEMUXER 0
-+ #define CONFIG_DVBSUB_DEMUXER 0
-+ #define CONFIG_DVBTXT_DEMUXER 0
-++#define CONFIG_DVDVIDEO_DEMUXER 0
-+ #define CONFIG_DXA_DEMUXER 0
-+ #define CONFIG_EA_DEMUXER 0
-+ #define CONFIG_EA_CDATA_DEMUXER 0
-+@@ -1767,6 +1763,7 @@
-+ #define CONFIG_KUX_DEMUXER 0
-+ #define CONFIG_KVAG_DEMUXER 0
-+ #define CONFIG_LAF_DEMUXER 0
-++#define CONFIG_LC3_DEMUXER 0
-+ #define CONFIG_LMLM4_DEMUXER 0
-+ #define CONFIG_LOAS_DEMUXER 0
-+ #define CONFIG_LUODAT_DEMUXER 0
-+@@ -1850,6 +1847,7 @@
-+ #define CONFIG_QOA_DEMUXER 0
-+ #define CONFIG_R3D_DEMUXER 0
-+ #define CONFIG_RAWVIDEO_DEMUXER 0
-++#define CONFIG_RCWT_DEMUXER 0
-+ #define CONFIG_REALTEXT_DEMUXER 0
-+ #define CONFIG_REDSPARK_DEMUXER 0
-+ #define CONFIG_RKA_DEMUXER 0
-+@@ -1987,6 +1985,7 @@
-+ #define CONFIG_AC4_MUXER 0
-+ #define CONFIG_ADTS_MUXER 0
-+ #define CONFIG_ADX_MUXER 0
-++#define CONFIG_AEA_MUXER 0
-+ #define CONFIG_AIFF_MUXER 0
-+ #define CONFIG_ALP_MUXER 0
-+ #define CONFIG_AMR_MUXER 0
-+@@ -2026,7 +2025,6 @@
-+ #define CONFIG_F4V_MUXER 0
-+ #define CONFIG_FFMETADATA_MUXER 0
-+ #define CONFIG_FIFO_MUXER 0
-+-#define CONFIG_FIFO_TEST_MUXER 0
-+ #define CONFIG_FILMSTRIP_MUXER 0
-+ #define CONFIG_FITS_MUXER 0
-+ #define CONFIG_FLAC_MUXER 0
-+@@ -2060,6 +2058,7 @@
-+ #define CONFIG_JACOSUB_MUXER 0
-+ #define CONFIG_KVAG_MUXER 0
-+ #define CONFIG_LATM_MUXER 0
-++#define CONFIG_LC3_MUXER 0
-+ #define CONFIG_LRC_MUXER 0
-+ #define CONFIG_M4V_MUXER 0
-+ #define CONFIG_MD5_MUXER 0
-+@@ -2162,6 +2161,7 @@
-+ #define CONFIG_WV_MUXER 0
-+ #define CONFIG_YUV4MPEGPIPE_MUXER 0
-+ #define CONFIG_CHROMAPRINT_MUXER 0
-++#define CONFIG_ANDROID_CONTENT_PROTOCOL 0
-+ #define CONFIG_ASYNC_PROTOCOL 0
-+ #define CONFIG_BLURAY_PROTOCOL 0
-+ #define CONFIG_CACHE_PROTOCOL 0
-+diff --git a/chromium/config/Chrome/ios/x64/libavformat/demuxer_list.c b/chromium/config/Chrome/ios/x64/libavformat/demuxer_list.c
-+index 920b22bfa7..29f1f59381 100644
-+--- a/chromium/config/Chrome/ios/x64/libavformat/demuxer_list.c
-++++ b/chromium/config/Chrome/ios/x64/libavformat/demuxer_list.c
-+@@ -1,4 +1,4 @@
-+-static const AVInputFormat * const demuxer_list[] = {
-++static const FFInputFormat * const demuxer_list[] = {
-+ &ff_aac_demuxer,
-+ &ff_flac_demuxer,
-+ &ff_matroska_demuxer,
-+diff --git a/chromium/config/Chrome/ios/x64/libavutil/ffversion.h b/chromium/config/Chrome/ios/x64/libavutil/ffversion.h
-+index e32799b284..63ce2ac5f8 100644
-+--- a/chromium/config/Chrome/ios/x64/libavutil/ffversion.h
-++++ b/chromium/config/Chrome/ios/x64/libavutil/ffversion.h
-+@@ -1,5 +1,5 @@
-+ /* Automatically generated by version.sh, do not manually edit! */
-+ #ifndef AVUTIL_FFVERSION_H
-+ #define AVUTIL_FFVERSION_H
-+-#define FFMPEG_VERSION "N-115016-g631703bfb9"
-++#define FFMPEG_VERSION "N-116569-gd0c8e13654"
-+ #endif /* AVUTIL_FFVERSION_H */
-+diff --git a/chromium/config/Chromium/ios/arm64/config.h b/chromium/config/Chromium/ios/arm64/config.h
-+index 0428a7286b..9eeb65d015 100644
-+--- a/chromium/config/Chromium/ios/arm64/config.h
-++++ b/chromium/config/Chromium/ios/arm64/config.h
-+@@ -1,14 +1,13 @@
-+ /* Automatically generated by configure - do not modify! */
-+ #ifndef FFMPEG_CONFIG_H
-+ #define FFMPEG_CONFIG_H
-+-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cr
oss-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov/
projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64'" -- elide long configuration string from binary */
-++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang
--enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=arm64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/cod
e/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=arm64 --extra-cflags='-arch arm64' --extra-ldflags='-arch arm64'" -- elide long configuration string from binary */
-+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+ #define CONFIG_THIS_YEAR 2024
-+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)"
-++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
-+ #define OS_NAME darwin
-+-#define av_restrict restrict
-+ #define EXTERN_PREFIX "_"
-+ #define EXTERN_ASM _
-+ #define BUILDSUF ""
-+@@ -60,6 +59,7 @@
-+ #define HAVE_VSX 0
-+ #define HAVE_RV 0
-+ #define HAVE_RVV 0
-++#define HAVE_RV_ZVBB 0
-+ #define HAVE_AESNI 0
-+ #define HAVE_AMD3DNOW 0
-+ #define HAVE_AMD3DNOWEXT 0
-+@@ -78,7 +78,6 @@
-+ #define HAVE_SSE42 0
-+ #define HAVE_SSSE3 0
-+ #define HAVE_XOP 0
-+-#define HAVE_CPUNOP 0
-+ #define HAVE_I686 0
-+ #define HAVE_MIPSFPU 0
-+ #define HAVE_MIPS32R2 0
-+@@ -112,6 +111,7 @@
-+ #define HAVE_VSX_EXTERNAL 0
-+ #define HAVE_RV_EXTERNAL 0
-+ #define HAVE_RVV_EXTERNAL 0
-++#define HAVE_RV_ZVBB_EXTERNAL 0
-+ #define HAVE_AESNI_EXTERNAL 0
-+ #define HAVE_AMD3DNOW_EXTERNAL 0
-+ #define HAVE_AMD3DNOWEXT_EXTERNAL 0
-+@@ -130,7 +130,6 @@
-+ #define HAVE_SSE42_EXTERNAL 0
-+ #define HAVE_SSSE3_EXTERNAL 0
-+ #define HAVE_XOP_EXTERNAL 0
-+-#define HAVE_CPUNOP_EXTERNAL 0
-+ #define HAVE_I686_EXTERNAL 0
-+ #define HAVE_MIPSFPU_EXTERNAL 0
-+ #define HAVE_MIPS32R2_EXTERNAL 0
-+@@ -164,6 +163,7 @@
-+ #define HAVE_VSX_INLINE 0
-+ #define HAVE_RV_INLINE 0
-+ #define HAVE_RVV_INLINE 0
-++#define HAVE_RV_ZVBB_INLINE 0
-+ #define HAVE_AESNI_INLINE 0
-+ #define HAVE_AMD3DNOW_INLINE 0
-+ #define HAVE_AMD3DNOWEXT_INLINE 0
-+@@ -182,7 +182,6 @@
-+ #define HAVE_SSE42_INLINE 0
-+ #define HAVE_SSSE3_INLINE 0
-+ #define HAVE_XOP_INLINE 0
-+-#define HAVE_CPUNOP_INLINE 0
-+ #define HAVE_I686_INLINE 0
-+ #define HAVE_MIPSFPU_INLINE 0
-+ #define HAVE_MIPS32R2_INLINE 0
-+@@ -220,6 +219,7 @@
-+ #define HAVE_BIGENDIAN 0
-+ #define HAVE_FAST_UNALIGNED 1
-+ #define HAVE_ARPA_INET_H 0
-++#define HAVE_ASM_HWPROBE_H 0
-+ #define HAVE_ASM_TYPES_H 0
-+ #define HAVE_CDIO_PARANOIA_H 0
-+ #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+@@ -246,6 +246,7 @@
-+ #define HAVE_OPENGL_GL3_H 0
-+ #define HAVE_POLL_H 1
-+ #define HAVE_PTHREAD_NP_H 0
-++#define HAVE_SYS_HWPROBE_H 0
-+ #define HAVE_SYS_PARAM_H 1
-+ #define HAVE_SYS_RESOURCE_H 1
-+ #define HAVE_SYS_SELECT_H 1
-+@@ -419,6 +420,7 @@
-+ #define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+ #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
-+ #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-++#define HAVE_STRUCT_MFXCONFIGINTERFACE 0
-+ #define HAVE_GZIP 1
-+ #define HAVE_LIBDRM_GETFB2 0
-+ #define HAVE_MAKEINFO 0
-+@@ -429,6 +431,7 @@
-+ #define HAVE_OPENCL_DXVA2 0
-+ #define HAVE_OPENCL_VAAPI_BEIGNET 0
-+ #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-++#define HAVE_OPENCL_VIDEOTOOLBOX 0
-+ #define HAVE_PERL 1
-+ #define HAVE_POD2MAN 1
-+ #define HAVE_TEXI2HTML 0
-+@@ -468,6 +471,8 @@
-+ #define CONFIG_FREI0R 0
-+ #define CONFIG_LIBCDIO 0
-+ #define CONFIG_LIBDAVS2 0
-++#define CONFIG_LIBDVDNAV 0
-++#define CONFIG_LIBDVDREAD 0
-+ #define CONFIG_LIBRUBBERBAND 0
-+ #define CONFIG_LIBVIDSTAB 0
-+ #define CONFIG_LIBX264 0
-+@@ -517,6 +522,7 @@
-+ #define CONFIG_LIBJXL 0
-+ #define CONFIG_LIBKLVANC 0
-+ #define CONFIG_LIBKVAZAAR 0
-++#define CONFIG_LIBLC3 0
-+ #define CONFIG_LIBMODPLUG 0
-+ #define CONFIG_LIBMP3LAME 0
-+ #define CONFIG_LIBMYSOFA 0
-+@@ -547,6 +553,7 @@
-+ #define CONFIG_LIBTENSORFLOW 0
-+ #define CONFIG_LIBTESSERACT 0
-+ #define CONFIG_LIBTHEORA 0
-++#define CONFIG_LIBTORCH 0
-+ #define CONFIG_LIBTWOLAME 0
-+ #define CONFIG_LIBUAVS3D 0
-+ #define CONFIG_LIBV4L2 0
-+@@ -596,7 +603,6 @@
-+ #define CONFIG_OPENCL 0
-+ #define CONFIG_AMF 0
-+ #define CONFIG_AUDIOTOOLBOX 0
-+-#define CONFIG_CRYSTALHD 0
-+ #define CONFIG_CUDA 0
-+ #define CONFIG_CUDA_LLVM 0
-+ #define CONFIG_CUVID 0
-+@@ -640,6 +646,7 @@
-+ #define CONFIG_ERROR_RESILIENCE 0
-+ #define CONFIG_FAAN 0
-+ #define CONFIG_FAST_UNALIGNED 1
-++#define CONFIG_IAMF 0
-+ #define CONFIG_LSP 0
-+ #define CONFIG_PIXELUTILS 0
-+ #define CONFIG_NETWORK 0
-+@@ -688,7 +695,8 @@
-+ #define CONFIG_DEFLATE_WRAPPER 0
-+ #define CONFIG_DIRAC_PARSE 1
-+ #define CONFIG_DNN 0
-+-#define CONFIG_DOVI_RPU 0
-++#define CONFIG_DOVI_RPUDEC 0
-++#define CONFIG_DOVI_RPUENC 0
-+ #define CONFIG_DVPROFILE 0
-+ #define CONFIG_EVCPARSE 0
-+ #define CONFIG_EXIF 0
-+@@ -720,10 +728,12 @@
-+ #define CONFIG_INFLATE_WRAPPER 0
-+ #define CONFIG_INTRAX8 0
-+ #define CONFIG_ISO_MEDIA 1
-++#define CONFIG_ISO_WRITER 0
-+ #define CONFIG_IVIDSP 0
-+ #define CONFIG_JPEGTABLES 0
-+ #define CONFIG_LGPLV3 0
-+ #define CONFIG_LIBX262 0
-++#define CONFIG_LIBX264_HDR10 0
-+ #define CONFIG_LLAUDDSP 0
-+ #define CONFIG_LLVIDDSP 0
-+ #define CONFIG_LLVIDENCDSP 0
-+diff --git a/chromium/config/Chromium/ios/arm64/config_components.h b/chromium/config/Chromium/ios/arm64/config_components.h
-+index 7d2f7ea320..9b4b898861 100644
-+--- a/chromium/config/Chromium/ios/arm64/config_components.h
-++++ b/chromium/config/Chromium/ios/arm64/config_components.h
-+@@ -11,6 +11,7 @@
-+ #define CONFIG_DTS2PTS_BSF 0
-+ #define CONFIG_DV_ERROR_MARKER_BSF 0
-+ #define CONFIG_EAC3_CORE_BSF 0
-++#define CONFIG_EVC_FRAME_MERGE_BSF 0
-+ #define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+ #define CONFIG_FILTER_UNITS_BSF 0
-+ #define CONFIG_H264_METADATA_BSF 0
-+@@ -23,7 +24,6 @@
-+ #define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
-+ #define CONFIG_MJPEG2JPEG_BSF 0
-+ #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+-#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
-+ #define CONFIG_MPEG2_METADATA_BSF 0
-+ #define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
-+ #define CONFIG_MOV2TEXTSUB_BSF 0
-+@@ -45,7 +45,6 @@
-+ #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
-+ #define CONFIG_VVC_METADATA_BSF 0
-+ #define CONFIG_VVC_MP4TOANNEXB_BSF 0
-+-#define CONFIG_EVC_FRAME_MERGE_BSF 0
-+ #define CONFIG_AASC_DECODER 0
-+ #define CONFIG_AIC_DECODER 0
-+ #define CONFIG_ALIAS_PIX_DECODER 0
-+@@ -64,7 +63,6 @@
-+ #define CONFIG_AVRN_DECODER 0
-+ #define CONFIG_AVS_DECODER 0
-+ #define CONFIG_AVUI_DECODER 0
-+-#define CONFIG_AYUV_DECODER 0
-+ #define CONFIG_BETHSOFTVID_DECODER 0
-+ #define CONFIG_BFI_DECODER 0
-+ #define CONFIG_BINK_DECODER 0
-+@@ -131,7 +129,6 @@
-+ #define CONFIG_H263P_DECODER 0
-+ #define CONFIG_H263_V4L2M2M_DECODER 0
-+ #define CONFIG_H264_DECODER 0
-+-#define CONFIG_H264_CRYSTALHD_DECODER 0
-+ #define CONFIG_H264_V4L2M2M_DECODER 0
-+ #define CONFIG_H264_MEDIACODEC_DECODER 0
-+ #define CONFIG_H264_MMAL_DECODER 0
-+@@ -179,13 +176,11 @@
-+ #define CONFIG_MPEG1VIDEO_DECODER 0
-+ #define CONFIG_MPEG2VIDEO_DECODER 0
-+ #define CONFIG_MPEG4_DECODER 0
-+-#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
-+ #define CONFIG_MPEG4_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG4_MMAL_DECODER 0
-+ #define CONFIG_MPEGVIDEO_DECODER 0
-+ #define CONFIG_MPEG1_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG2_MMAL_DECODER 0
-+-#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
-+ #define CONFIG_MPEG2_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG2_QSV_DECODER 0
-+ #define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-+@@ -194,7 +189,6 @@
-+ #define CONFIG_MSMPEG4V1_DECODER 0
-+ #define CONFIG_MSMPEG4V2_DECODER 0
-+ #define CONFIG_MSMPEG4V3_DECODER 0
-+-#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
-+ #define CONFIG_MSP2_DECODER 0
-+ #define CONFIG_MSRLE_DECODER 0
-+ #define CONFIG_MSS1_DECODER 0
-+@@ -293,7 +287,6 @@
-+ #define CONFIG_VBN_DECODER 0
-+ #define CONFIG_VBLE_DECODER 0
-+ #define CONFIG_VC1_DECODER 0
-+-#define CONFIG_VC1_CRYSTALHD_DECODER 0
-+ #define CONFIG_VC1IMAGE_DECODER 0
-+ #define CONFIG_VC1_MMAL_DECODER 0
-+ #define CONFIG_VC1_QSV_DECODER 0
-+@@ -325,7 +318,6 @@
-+ #define CONFIG_WMV1_DECODER 0
-+ #define CONFIG_WMV2_DECODER 0
-+ #define CONFIG_WMV3_DECODER 0
-+-#define CONFIG_WMV3_CRYSTALHD_DECODER 0
-+ #define CONFIG_WMV3IMAGE_DECODER 0
-+ #define CONFIG_WNV1_DECODER 0
-+ #define CONFIG_XAN_WC3_DECODER 0
-+@@ -592,6 +584,7 @@
-+ #define CONFIG_LIBGSM_MS_DECODER 0
-+ #define CONFIG_LIBILBC_DECODER 0
-+ #define CONFIG_LIBJXL_DECODER 0
-++#define CONFIG_LIBLC3_DECODER 0
-+ #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
-+ #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-+ #define CONFIG_LIBOPUS_DECODER 1
-+@@ -639,7 +632,6 @@
-+ #define CONFIG_ASV2_ENCODER 0
-+ #define CONFIG_AVRP_ENCODER 0
-+ #define CONFIG_AVUI_ENCODER 0
-+-#define CONFIG_AYUV_ENCODER 0
-+ #define CONFIG_BITPACKED_ENCODER 0
-+ #define CONFIG_BMP_ENCODER 0
-+ #define CONFIG_CFHD_ENCODER 0
-+@@ -821,6 +813,7 @@
-+ #define CONFIG_LIBGSM_MS_ENCODER 0
-+ #define CONFIG_LIBILBC_ENCODER 0
-+ #define CONFIG_LIBJXL_ENCODER 0
-++#define CONFIG_LIBLC3_ENCODER 0
-+ #define CONFIG_LIBMP3LAME_ENCODER 0
-+ #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+ #define CONFIG_LIBOPENJPEG_ENCODER 0
-+@@ -1573,6 +1566,8 @@
-+ #define CONFIG_HSTACK_QSV_FILTER 0
-+ #define CONFIG_VSTACK_QSV_FILTER 0
-+ #define CONFIG_XSTACK_QSV_FILTER 0
-++#define CONFIG_PAD_VAAPI_FILTER 0
-++#define CONFIG_DRAWBOX_VAAPI_FILTER 0
-+ #define CONFIG_ALLRGB_FILTER 0
-+ #define CONFIG_ALLYUV_FILTER 0
-+ #define CONFIG_CELLAUTO_FILTER 0
-+@@ -1706,6 +1701,7 @@
-+ #define CONFIG_DV_DEMUXER 0
-+ #define CONFIG_DVBSUB_DEMUXER 0
-+ #define CONFIG_DVBTXT_DEMUXER 0
-++#define CONFIG_DVDVIDEO_DEMUXER 0
-+ #define CONFIG_DXA_DEMUXER 0
-+ #define CONFIG_EA_DEMUXER 0
-+ #define CONFIG_EA_CDATA_DEMUXER 0
-+@@ -1767,6 +1763,7 @@
-+ #define CONFIG_KUX_DEMUXER 0
-+ #define CONFIG_KVAG_DEMUXER 0
-+ #define CONFIG_LAF_DEMUXER 0
-++#define CONFIG_LC3_DEMUXER 0
-+ #define CONFIG_LMLM4_DEMUXER 0
-+ #define CONFIG_LOAS_DEMUXER 0
-+ #define CONFIG_LUODAT_DEMUXER 0
-+@@ -1850,6 +1847,7 @@
-+ #define CONFIG_QOA_DEMUXER 0
-+ #define CONFIG_R3D_DEMUXER 0
-+ #define CONFIG_RAWVIDEO_DEMUXER 0
-++#define CONFIG_RCWT_DEMUXER 0
-+ #define CONFIG_REALTEXT_DEMUXER 0
-+ #define CONFIG_REDSPARK_DEMUXER 0
-+ #define CONFIG_RKA_DEMUXER 0
-+@@ -1987,6 +1985,7 @@
-+ #define CONFIG_AC4_MUXER 0
-+ #define CONFIG_ADTS_MUXER 0
-+ #define CONFIG_ADX_MUXER 0
-++#define CONFIG_AEA_MUXER 0
-+ #define CONFIG_AIFF_MUXER 0
-+ #define CONFIG_ALP_MUXER 0
-+ #define CONFIG_AMR_MUXER 0
-+@@ -2026,7 +2025,6 @@
-+ #define CONFIG_F4V_MUXER 0
-+ #define CONFIG_FFMETADATA_MUXER 0
-+ #define CONFIG_FIFO_MUXER 0
-+-#define CONFIG_FIFO_TEST_MUXER 0
-+ #define CONFIG_FILMSTRIP_MUXER 0
-+ #define CONFIG_FITS_MUXER 0
-+ #define CONFIG_FLAC_MUXER 0
-+@@ -2060,6 +2058,7 @@
-+ #define CONFIG_JACOSUB_MUXER 0
-+ #define CONFIG_KVAG_MUXER 0
-+ #define CONFIG_LATM_MUXER 0
-++#define CONFIG_LC3_MUXER 0
-+ #define CONFIG_LRC_MUXER 0
-+ #define CONFIG_M4V_MUXER 0
-+ #define CONFIG_MD5_MUXER 0
-+@@ -2162,6 +2161,7 @@
-+ #define CONFIG_WV_MUXER 0
-+ #define CONFIG_YUV4MPEGPIPE_MUXER 0
-+ #define CONFIG_CHROMAPRINT_MUXER 0
-++#define CONFIG_ANDROID_CONTENT_PROTOCOL 0
-+ #define CONFIG_ASYNC_PROTOCOL 0
-+ #define CONFIG_BLURAY_PROTOCOL 0
-+ #define CONFIG_CACHE_PROTOCOL 0
-+diff --git a/chromium/config/Chromium/ios/arm64/libavformat/demuxer_list.c b/chromium/config/Chromium/ios/arm64/libavformat/demuxer_list.c
-+index 1908ba19e7..570a6441d3 100644
-+--- a/chromium/config/Chromium/ios/arm64/libavformat/demuxer_list.c
-++++ b/chromium/config/Chromium/ios/arm64/libavformat/demuxer_list.c
-+@@ -1,4 +1,4 @@
-+-static const AVInputFormat * const demuxer_list[] = {
-++static const FFInputFormat * const demuxer_list[] = {
-+ &ff_flac_demuxer,
-+ &ff_matroska_demuxer,
-+ &ff_mov_demuxer,
-+diff --git a/chromium/config/Chromium/ios/arm64/libavutil/ffversion.h b/chromium/config/Chromium/ios/arm64/libavutil/ffversion.h
-+index e32799b284..63ce2ac5f8 100644
-+--- a/chromium/config/Chromium/ios/arm64/libavutil/ffversion.h
-++++ b/chromium/config/Chromium/ios/arm64/libavutil/ffversion.h
-+@@ -1,5 +1,5 @@
-+ /* Automatically generated by version.sh, do not manually edit! */
-+ #ifndef AVUTIL_FFVERSION_H
-+ #define AVUTIL_FFVERSION_H
-+-#define FFMPEG_VERSION "N-115016-g631703bfb9"
-++#define FFMPEG_VERSION "N-116569-gd0c8e13654"
-+ #endif /* AVUTIL_FFVERSION_H */
-+diff --git a/chromium/config/Chromium/ios/x64/config.asm b/chromium/config/Chromium/ios/x64/config.asm
-+index e6a75b6deb..85470e7fa0 100644
-+--- a/chromium/config/Chromium/ios/x64/config.asm
-++++ b/chromium/config/Chromium/ios/x64/config.asm
-+@@ -44,6 +44,7 @@
-+ %define HAVE_VSX 0
-+ %define HAVE_RV 0
-+ %define HAVE_RVV 0
-++%define HAVE_RV_ZVBB 0
-+ %define HAVE_AESNI 1
-+ %define HAVE_AMD3DNOW 1
-+ %define HAVE_AMD3DNOWEXT 1
-+@@ -62,7 +63,6 @@
-+ %define HAVE_SSE42 1
-+ %define HAVE_SSSE3 1
-+ %define HAVE_XOP 1
-+-%define HAVE_CPUNOP 0
-+ %define HAVE_I686 1
-+ %define HAVE_MIPSFPU 0
-+ %define HAVE_MIPS32R2 0
-+@@ -96,6 +96,7 @@
-+ %define HAVE_VSX_EXTERNAL 0
-+ %define HAVE_RV_EXTERNAL 0
-+ %define HAVE_RVV_EXTERNAL 0
-++%define HAVE_RV_ZVBB_EXTERNAL 0
-+ %define HAVE_AESNI_EXTERNAL 1
-+ %define HAVE_AMD3DNOW_EXTERNAL 1
-+ %define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+@@ -114,7 +115,6 @@
-+ %define HAVE_SSE42_EXTERNAL 1
-+ %define HAVE_SSSE3_EXTERNAL 1
-+ %define HAVE_XOP_EXTERNAL 1
-+-%define HAVE_CPUNOP_EXTERNAL 0
-+ %define HAVE_I686_EXTERNAL 0
-+ %define HAVE_MIPSFPU_EXTERNAL 0
-+ %define HAVE_MIPS32R2_EXTERNAL 0
-+@@ -148,6 +148,7 @@
-+ %define HAVE_VSX_INLINE 0
-+ %define HAVE_RV_INLINE 0
-+ %define HAVE_RVV_INLINE 0
-++%define HAVE_RV_ZVBB_INLINE 0
-+ %define HAVE_AESNI_INLINE 1
-+ %define HAVE_AMD3DNOW_INLINE 1
-+ %define HAVE_AMD3DNOWEXT_INLINE 1
-+@@ -166,7 +167,6 @@
-+ %define HAVE_SSE42_INLINE 1
-+ %define HAVE_SSSE3_INLINE 1
-+ %define HAVE_XOP_INLINE 1
-+-%define HAVE_CPUNOP_INLINE 0
-+ %define HAVE_I686_INLINE 0
-+ %define HAVE_MIPSFPU_INLINE 0
-+ %define HAVE_MIPS32R2_INLINE 0
-+@@ -204,6 +204,7 @@
-+ %define HAVE_BIGENDIAN 0
-+ %define HAVE_FAST_UNALIGNED 1
-+ %define HAVE_ARPA_INET_H 0
-++%define HAVE_ASM_HWPROBE_H 0
-+ %define HAVE_ASM_TYPES_H 0
-+ %define HAVE_CDIO_PARANOIA_H 0
-+ %define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+@@ -230,6 +231,7 @@
-+ %define HAVE_OPENGL_GL3_H 0
-+ %define HAVE_POLL_H 1
-+ %define HAVE_PTHREAD_NP_H 0
-++%define HAVE_SYS_HWPROBE_H 0
-+ %define HAVE_SYS_PARAM_H 1
-+ %define HAVE_SYS_RESOURCE_H 1
-+ %define HAVE_SYS_SELECT_H 1
-+@@ -403,6 +405,7 @@
-+ %define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+ %define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
-+ %define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-++%define HAVE_STRUCT_MFXCONFIGINTERFACE 0
-+ %define HAVE_GZIP 1
-+ %define HAVE_LIBDRM_GETFB2 0
-+ %define HAVE_MAKEINFO 0
-+@@ -413,6 +416,7 @@
-+ %define HAVE_OPENCL_DXVA2 0
-+ %define HAVE_OPENCL_VAAPI_BEIGNET 0
-+ %define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-++%define HAVE_OPENCL_VIDEOTOOLBOX 0
-+ %define HAVE_PERL 1
-+ %define HAVE_POD2MAN 1
-+ %define HAVE_TEXI2HTML 0
-+@@ -452,6 +456,8 @@
-+ %define CONFIG_FREI0R 0
-+ %define CONFIG_LIBCDIO 0
-+ %define CONFIG_LIBDAVS2 0
-++%define CONFIG_LIBDVDNAV 0
-++%define CONFIG_LIBDVDREAD 0
-+ %define CONFIG_LIBRUBBERBAND 0
-+ %define CONFIG_LIBVIDSTAB 0
-+ %define CONFIG_LIBX264 0
-+@@ -501,6 +507,7 @@
-+ %define CONFIG_LIBJXL 0
-+ %define CONFIG_LIBKLVANC 0
-+ %define CONFIG_LIBKVAZAAR 0
-++%define CONFIG_LIBLC3 0
-+ %define CONFIG_LIBMODPLUG 0
-+ %define CONFIG_LIBMP3LAME 0
-+ %define CONFIG_LIBMYSOFA 0
-+@@ -531,6 +538,7 @@
-+ %define CONFIG_LIBTENSORFLOW 0
-+ %define CONFIG_LIBTESSERACT 0
-+ %define CONFIG_LIBTHEORA 0
-++%define CONFIG_LIBTORCH 0
-+ %define CONFIG_LIBTWOLAME 0
-+ %define CONFIG_LIBUAVS3D 0
-+ %define CONFIG_LIBV4L2 0
-+@@ -580,7 +588,6 @@
-+ %define CONFIG_OPENCL 0
-+ %define CONFIG_AMF 0
-+ %define CONFIG_AUDIOTOOLBOX 0
-+-%define CONFIG_CRYSTALHD 0
-+ %define CONFIG_CUDA 0
-+ %define CONFIG_CUDA_LLVM 0
-+ %define CONFIG_CUVID 0
-+@@ -624,6 +631,7 @@
-+ %define CONFIG_ERROR_RESILIENCE 0
-+ %define CONFIG_FAAN 0
-+ %define CONFIG_FAST_UNALIGNED 1
-++%define CONFIG_IAMF 0
-+ %define CONFIG_LSP 0
-+ %define CONFIG_PIXELUTILS 0
-+ %define CONFIG_NETWORK 0
-+@@ -672,7 +680,8 @@
-+ %define CONFIG_DEFLATE_WRAPPER 0
-+ %define CONFIG_DIRAC_PARSE 1
-+ %define CONFIG_DNN 0
-+-%define CONFIG_DOVI_RPU 0
-++%define CONFIG_DOVI_RPUDEC 0
-++%define CONFIG_DOVI_RPUENC 0
-+ %define CONFIG_DVPROFILE 0
-+ %define CONFIG_EVCPARSE 0
-+ %define CONFIG_EXIF 0
-+@@ -704,10 +713,12 @@
-+ %define CONFIG_INFLATE_WRAPPER 0
-+ %define CONFIG_INTRAX8 0
-+ %define CONFIG_ISO_MEDIA 1
-++%define CONFIG_ISO_WRITER 0
-+ %define CONFIG_IVIDSP 0
-+ %define CONFIG_JPEGTABLES 0
-+ %define CONFIG_LGPLV3 0
-+ %define CONFIG_LIBX262 0
-++%define CONFIG_LIBX264_HDR10 0
-+ %define CONFIG_LLAUDDSP 0
-+ %define CONFIG_LLVIDDSP 0
-+ %define CONFIG_LLVIDENCDSP 0
-+diff --git a/chromium/config/Chromium/ios/x64/config.h b/chromium/config/Chromium/ios/x64/config.h
-+index aad723d910..59f14e9b14 100644
-+--- a/chromium/config/Chromium/ios/x64/config.h
-++++ b/chromium/config/Chromium/ios/x64/config.h
-+@@ -1,14 +1,13 @@
-+ /* Automatically generated by configure - do not modify! */
-+ #ifndef FFMPEG_CONFIG_H
-+ #define FFMPEG_CONFIG_H
-+-/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-cr
oss-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/ezemtsov/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/ezemtsov
/projects/chromium/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64'" -- elide long configuration string from binary */
-++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/dalecurtis/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang
--enable-cross-compile --cc=clang --ld=ld64.lld --nm=llvm-nm --ar=llvm-ar --target-os=darwin --extra-cflags='--target=x86_64-apple-macosx' --extra-cflags=-F/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks --extra-cflags='-mmacosx-version-min=10.10' --extra-cflags=-fblocks --extra-cflags=-nostdinc --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include --extra-cflags=-isystem/usr/local/google/home/dalecurtis/code/chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/dalecurtis/code/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/dalecurtis/co
de/chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/lib --extra-ldflags=-lSystem --extra-ldflags=-macosx_version_min --extra-ldflags=10.10 --extra-ldflags=-sdk_version --extra-ldflags=10.10 --extra-ldflags=-platform_version --extra-ldflags=macos --extra-ldflags=10.10 --extra-ldflags=10.10 --arch=x86_64 --extra-cflags=-m64 --extra-ldflags='-arch x86_64'" -- elide long configuration string from binary */
-+ #define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+ #define CONFIG_THIS_YEAR 2024
-+ #define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-+ #define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)"
-++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)"
-+ #define OS_NAME darwin
-+-#define av_restrict restrict
-+ #define EXTERN_PREFIX "_"
-+ #define EXTERN_ASM _
-+ #define BUILDSUF ""
-+@@ -59,6 +58,7 @@
-+ #define HAVE_VSX 0
-+ #define HAVE_RV 0
-+ #define HAVE_RVV 0
-++#define HAVE_RV_ZVBB 0
-+ #define HAVE_AESNI 1
-+ #define HAVE_AMD3DNOW 1
-+ #define HAVE_AMD3DNOWEXT 1
-+@@ -77,7 +77,6 @@
-+ #define HAVE_SSE42 1
-+ #define HAVE_SSSE3 1
-+ #define HAVE_XOP 1
-+-#define HAVE_CPUNOP 0
-+ #define HAVE_I686 1
-+ #define HAVE_MIPSFPU 0
-+ #define HAVE_MIPS32R2 0
-+@@ -111,6 +110,7 @@
-+ #define HAVE_VSX_EXTERNAL 0
-+ #define HAVE_RV_EXTERNAL 0
-+ #define HAVE_RVV_EXTERNAL 0
-++#define HAVE_RV_ZVBB_EXTERNAL 0
-+ #define HAVE_AESNI_EXTERNAL 1
-+ #define HAVE_AMD3DNOW_EXTERNAL 1
-+ #define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+@@ -129,7 +129,6 @@
-+ #define HAVE_SSE42_EXTERNAL 1
-+ #define HAVE_SSSE3_EXTERNAL 1
-+ #define HAVE_XOP_EXTERNAL 1
-+-#define HAVE_CPUNOP_EXTERNAL 0
-+ #define HAVE_I686_EXTERNAL 0
-+ #define HAVE_MIPSFPU_EXTERNAL 0
-+ #define HAVE_MIPS32R2_EXTERNAL 0
-+@@ -163,6 +162,7 @@
-+ #define HAVE_VSX_INLINE 0
-+ #define HAVE_RV_INLINE 0
-+ #define HAVE_RVV_INLINE 0
-++#define HAVE_RV_ZVBB_INLINE 0
-+ #define HAVE_AESNI_INLINE 1
-+ #define HAVE_AMD3DNOW_INLINE 1
-+ #define HAVE_AMD3DNOWEXT_INLINE 1
-+@@ -181,7 +181,6 @@
-+ #define HAVE_SSE42_INLINE 1
-+ #define HAVE_SSSE3_INLINE 1
-+ #define HAVE_XOP_INLINE 1
-+-#define HAVE_CPUNOP_INLINE 0
-+ #define HAVE_I686_INLINE 0
-+ #define HAVE_MIPSFPU_INLINE 0
-+ #define HAVE_MIPS32R2_INLINE 0
-+@@ -219,6 +218,7 @@
-+ #define HAVE_BIGENDIAN 0
-+ #define HAVE_FAST_UNALIGNED 1
-+ #define HAVE_ARPA_INET_H 0
-++#define HAVE_ASM_HWPROBE_H 0
-+ #define HAVE_ASM_TYPES_H 0
-+ #define HAVE_CDIO_PARANOIA_H 0
-+ #define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+@@ -245,6 +245,7 @@
-+ #define HAVE_OPENGL_GL3_H 0
-+ #define HAVE_POLL_H 1
-+ #define HAVE_PTHREAD_NP_H 0
-++#define HAVE_SYS_HWPROBE_H 0
-+ #define HAVE_SYS_PARAM_H 1
-+ #define HAVE_SYS_RESOURCE_H 1
-+ #define HAVE_SYS_SELECT_H 1
-+@@ -418,6 +419,7 @@
-+ #define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+ #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 0
-+ #define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0
-++#define HAVE_STRUCT_MFXCONFIGINTERFACE 0
-+ #define HAVE_GZIP 1
-+ #define HAVE_LIBDRM_GETFB2 0
-+ #define HAVE_MAKEINFO 0
-+@@ -428,6 +430,7 @@
-+ #define HAVE_OPENCL_DXVA2 0
-+ #define HAVE_OPENCL_VAAPI_BEIGNET 0
-+ #define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-++#define HAVE_OPENCL_VIDEOTOOLBOX 0
-+ #define HAVE_PERL 1
-+ #define HAVE_POD2MAN 1
-+ #define HAVE_TEXI2HTML 0
-+@@ -467,6 +470,8 @@
-+ #define CONFIG_FREI0R 0
-+ #define CONFIG_LIBCDIO 0
-+ #define CONFIG_LIBDAVS2 0
-++#define CONFIG_LIBDVDNAV 0
-++#define CONFIG_LIBDVDREAD 0
-+ #define CONFIG_LIBRUBBERBAND 0
-+ #define CONFIG_LIBVIDSTAB 0
-+ #define CONFIG_LIBX264 0
-+@@ -516,6 +521,7 @@
-+ #define CONFIG_LIBJXL 0
-+ #define CONFIG_LIBKLVANC 0
-+ #define CONFIG_LIBKVAZAAR 0
-++#define CONFIG_LIBLC3 0
-+ #define CONFIG_LIBMODPLUG 0
-+ #define CONFIG_LIBMP3LAME 0
-+ #define CONFIG_LIBMYSOFA 0
-+@@ -546,6 +552,7 @@
-+ #define CONFIG_LIBTENSORFLOW 0
-+ #define CONFIG_LIBTESSERACT 0
-+ #define CONFIG_LIBTHEORA 0
-++#define CONFIG_LIBTORCH 0
-+ #define CONFIG_LIBTWOLAME 0
-+ #define CONFIG_LIBUAVS3D 0
-+ #define CONFIG_LIBV4L2 0
-+@@ -595,7 +602,6 @@
-+ #define CONFIG_OPENCL 0
-+ #define CONFIG_AMF 0
-+ #define CONFIG_AUDIOTOOLBOX 0
-+-#define CONFIG_CRYSTALHD 0
-+ #define CONFIG_CUDA 0
-+ #define CONFIG_CUDA_LLVM 0
-+ #define CONFIG_CUVID 0
-+@@ -639,6 +645,7 @@
-+ #define CONFIG_ERROR_RESILIENCE 0
-+ #define CONFIG_FAAN 0
-+ #define CONFIG_FAST_UNALIGNED 1
-++#define CONFIG_IAMF 0
-+ #define CONFIG_LSP 0
-+ #define CONFIG_PIXELUTILS 0
-+ #define CONFIG_NETWORK 0
-+@@ -687,7 +694,8 @@
-+ #define CONFIG_DEFLATE_WRAPPER 0
-+ #define CONFIG_DIRAC_PARSE 1
-+ #define CONFIG_DNN 0
-+-#define CONFIG_DOVI_RPU 0
-++#define CONFIG_DOVI_RPUDEC 0
-++#define CONFIG_DOVI_RPUENC 0
-+ #define CONFIG_DVPROFILE 0
-+ #define CONFIG_EVCPARSE 0
-+ #define CONFIG_EXIF 0
-+@@ -719,10 +727,12 @@
-+ #define CONFIG_INFLATE_WRAPPER 0
-+ #define CONFIG_INTRAX8 0
-+ #define CONFIG_ISO_MEDIA 1
-++#define CONFIG_ISO_WRITER 0
-+ #define CONFIG_IVIDSP 0
-+ #define CONFIG_JPEGTABLES 0
-+ #define CONFIG_LGPLV3 0
-+ #define CONFIG_LIBX262 0
-++#define CONFIG_LIBX264_HDR10 0
-+ #define CONFIG_LLAUDDSP 0
-+ #define CONFIG_LLVIDDSP 0
-+ #define CONFIG_LLVIDENCDSP 0
-+diff --git a/chromium/config/Chromium/ios/x64/config_components.h b/chromium/config/Chromium/ios/x64/config_components.h
-+index 7d2f7ea320..9b4b898861 100644
-+--- a/chromium/config/Chromium/ios/x64/config_components.h
-++++ b/chromium/config/Chromium/ios/x64/config_components.h
-+@@ -11,6 +11,7 @@
-+ #define CONFIG_DTS2PTS_BSF 0
-+ #define CONFIG_DV_ERROR_MARKER_BSF 0
-+ #define CONFIG_EAC3_CORE_BSF 0
-++#define CONFIG_EVC_FRAME_MERGE_BSF 0
-+ #define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+ #define CONFIG_FILTER_UNITS_BSF 0
-+ #define CONFIG_H264_METADATA_BSF 0
-+@@ -23,7 +24,6 @@
-+ #define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
-+ #define CONFIG_MJPEG2JPEG_BSF 0
-+ #define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+-#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
-+ #define CONFIG_MPEG2_METADATA_BSF 0
-+ #define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
-+ #define CONFIG_MOV2TEXTSUB_BSF 0
-+@@ -45,7 +45,6 @@
-+ #define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
-+ #define CONFIG_VVC_METADATA_BSF 0
-+ #define CONFIG_VVC_MP4TOANNEXB_BSF 0
-+-#define CONFIG_EVC_FRAME_MERGE_BSF 0
-+ #define CONFIG_AASC_DECODER 0
-+ #define CONFIG_AIC_DECODER 0
-+ #define CONFIG_ALIAS_PIX_DECODER 0
-+@@ -64,7 +63,6 @@
-+ #define CONFIG_AVRN_DECODER 0
-+ #define CONFIG_AVS_DECODER 0
-+ #define CONFIG_AVUI_DECODER 0
-+-#define CONFIG_AYUV_DECODER 0
-+ #define CONFIG_BETHSOFTVID_DECODER 0
-+ #define CONFIG_BFI_DECODER 0
-+ #define CONFIG_BINK_DECODER 0
-+@@ -131,7 +129,6 @@
-+ #define CONFIG_H263P_DECODER 0
-+ #define CONFIG_H263_V4L2M2M_DECODER 0
-+ #define CONFIG_H264_DECODER 0
-+-#define CONFIG_H264_CRYSTALHD_DECODER 0
-+ #define CONFIG_H264_V4L2M2M_DECODER 0
-+ #define CONFIG_H264_MEDIACODEC_DECODER 0
-+ #define CONFIG_H264_MMAL_DECODER 0
-+@@ -179,13 +176,11 @@
-+ #define CONFIG_MPEG1VIDEO_DECODER 0
-+ #define CONFIG_MPEG2VIDEO_DECODER 0
-+ #define CONFIG_MPEG4_DECODER 0
-+-#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
-+ #define CONFIG_MPEG4_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG4_MMAL_DECODER 0
-+ #define CONFIG_MPEGVIDEO_DECODER 0
-+ #define CONFIG_MPEG1_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG2_MMAL_DECODER 0
-+-#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
-+ #define CONFIG_MPEG2_V4L2M2M_DECODER 0
-+ #define CONFIG_MPEG2_QSV_DECODER 0
-+ #define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-+@@ -194,7 +189,6 @@
-+ #define CONFIG_MSMPEG4V1_DECODER 0
-+ #define CONFIG_MSMPEG4V2_DECODER 0
-+ #define CONFIG_MSMPEG4V3_DECODER 0
-+-#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
-+ #define CONFIG_MSP2_DECODER 0
-+ #define CONFIG_MSRLE_DECODER 0
-+ #define CONFIG_MSS1_DECODER 0
-+@@ -293,7 +287,6 @@
-+ #define CONFIG_VBN_DECODER 0
-+ #define CONFIG_VBLE_DECODER 0
-+ #define CONFIG_VC1_DECODER 0
-+-#define CONFIG_VC1_CRYSTALHD_DECODER 0
-+ #define CONFIG_VC1IMAGE_DECODER 0
-+ #define CONFIG_VC1_MMAL_DECODER 0
-+ #define CONFIG_VC1_QSV_DECODER 0
-+@@ -325,7 +318,6 @@
-+ #define CONFIG_WMV1_DECODER 0
-+ #define CONFIG_WMV2_DECODER 0
-+ #define CONFIG_WMV3_DECODER 0
-+-#define CONFIG_WMV3_CRYSTALHD_DECODER 0
-+ #define CONFIG_WMV3IMAGE_DECODER 0
-+ #define CONFIG_WNV1_DECODER 0
-+ #define CONFIG_XAN_WC3_DECODER 0
-+@@ -592,6 +584,7 @@
-+ #define CONFIG_LIBGSM_MS_DECODER 0
-+ #define CONFIG_LIBILBC_DECODER 0
-+ #define CONFIG_LIBJXL_DECODER 0
-++#define CONFIG_LIBLC3_DECODER 0
-+ #define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
-+ #define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-+ #define CONFIG_LIBOPUS_DECODER 1
-+@@ -639,7 +632,6 @@
-+ #define CONFIG_ASV2_ENCODER 0
-+ #define CONFIG_AVRP_ENCODER 0
-+ #define CONFIG_AVUI_ENCODER 0
-+-#define CONFIG_AYUV_ENCODER 0
-+ #define CONFIG_BITPACKED_ENCODER 0
-+ #define CONFIG_BMP_ENCODER 0
-+ #define CONFIG_CFHD_ENCODER 0
-+@@ -821,6 +813,7 @@
-+ #define CONFIG_LIBGSM_MS_ENCODER 0
-+ #define CONFIG_LIBILBC_ENCODER 0
-+ #define CONFIG_LIBJXL_ENCODER 0
-++#define CONFIG_LIBLC3_ENCODER 0
-+ #define CONFIG_LIBMP3LAME_ENCODER 0
-+ #define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+ #define CONFIG_LIBOPENJPEG_ENCODER 0
-+@@ -1573,6 +1566,8 @@
-+ #define CONFIG_HSTACK_QSV_FILTER 0
-+ #define CONFIG_VSTACK_QSV_FILTER 0
-+ #define CONFIG_XSTACK_QSV_FILTER 0
-++#define CONFIG_PAD_VAAPI_FILTER 0
-++#define CONFIG_DRAWBOX_VAAPI_FILTER 0
-+ #define CONFIG_ALLRGB_FILTER 0
-+ #define CONFIG_ALLYUV_FILTER 0
-+ #define CONFIG_CELLAUTO_FILTER 0
-+@@ -1706,6 +1701,7 @@
-+ #define CONFIG_DV_DEMUXER 0
-+ #define CONFIG_DVBSUB_DEMUXER 0
-+ #define CONFIG_DVBTXT_DEMUXER 0
-++#define CONFIG_DVDVIDEO_DEMUXER 0
-+ #define CONFIG_DXA_DEMUXER 0
-+ #define CONFIG_EA_DEMUXER 0
-+ #define CONFIG_EA_CDATA_DEMUXER 0
-+@@ -1767,6 +1763,7 @@
-+ #define CONFIG_KUX_DEMUXER 0
-+ #define CONFIG_KVAG_DEMUXER 0
-+ #define CONFIG_LAF_DEMUXER 0
-++#define CONFIG_LC3_DEMUXER 0
-+ #define CONFIG_LMLM4_DEMUXER 0
-+ #define CONFIG_LOAS_DEMUXER 0
-+ #define CONFIG_LUODAT_DEMUXER 0
-+@@ -1850,6 +1847,7 @@
-+ #define CONFIG_QOA_DEMUXER 0
-+ #define CONFIG_R3D_DEMUXER 0
-+ #define CONFIG_RAWVIDEO_DEMUXER 0
-++#define CONFIG_RCWT_DEMUXER 0
-+ #define CONFIG_REALTEXT_DEMUXER 0
-+ #define CONFIG_REDSPARK_DEMUXER 0
-+ #define CONFIG_RKA_DEMUXER 0
-+@@ -1987,6 +1985,7 @@
-+ #define CONFIG_AC4_MUXER 0
-+ #define CONFIG_ADTS_MUXER 0
-+ #define CONFIG_ADX_MUXER 0
-++#define CONFIG_AEA_MUXER 0
-+ #define CONFIG_AIFF_MUXER 0
-+ #define CONFIG_ALP_MUXER 0
-+ #define CONFIG_AMR_MUXER 0
-+@@ -2026,7 +2025,6 @@
-+ #define CONFIG_F4V_MUXER 0
-+ #define CONFIG_FFMETADATA_MUXER 0
-+ #define CONFIG_FIFO_MUXER 0
-+-#define CONFIG_FIFO_TEST_MUXER 0
-+ #define CONFIG_FILMSTRIP_MUXER 0
-+ #define CONFIG_FITS_MUXER 0
-+ #define CONFIG_FLAC_MUXER 0
-+@@ -2060,6 +2058,7 @@
-+ #define CONFIG_JACOSUB_MUXER 0
-+ #define CONFIG_KVAG_MUXER 0
-+ #define CONFIG_LATM_MUXER 0
-++#define CONFIG_LC3_MUXER 0
-+ #define CONFIG_LRC_MUXER 0
-+ #define CONFIG_M4V_MUXER 0
-+ #define CONFIG_MD5_MUXER 0
-+@@ -2162,6 +2161,7 @@
-+ #define CONFIG_WV_MUXER 0
-+ #define CONFIG_YUV4MPEGPIPE_MUXER 0
-+ #define CONFIG_CHROMAPRINT_MUXER 0
-++#define CONFIG_ANDROID_CONTENT_PROTOCOL 0
-+ #define CONFIG_ASYNC_PROTOCOL 0
-+ #define CONFIG_BLURAY_PROTOCOL 0
-+ #define CONFIG_CACHE_PROTOCOL 0
-+diff --git a/chromium/config/Chromium/ios/x64/libavformat/demuxer_list.c b/chromium/config/Chromium/ios/x64/libavformat/demuxer_list.c
-+index 1908ba19e7..570a6441d3 100644
-+--- a/chromium/config/Chromium/ios/x64/libavformat/demuxer_list.c
-++++ b/chromium/config/Chromium/ios/x64/libavformat/demuxer_list.c
-+@@ -1,4 +1,4 @@
-+-static const AVInputFormat * const demuxer_list[] = {
-++static const FFInputFormat * const demuxer_list[] = {
-+ &ff_flac_demuxer,
-+ &ff_matroska_demuxer,
-+ &ff_mov_demuxer,
-+diff --git a/chromium/config/Chromium/ios/x64/libavutil/ffversion.h b/chromium/config/Chromium/ios/x64/libavutil/ffversion.h
-+index e32799b284..63ce2ac5f8 100644
-+--- a/chromium/config/Chromium/ios/x64/libavutil/ffversion.h
-++++ b/chromium/config/Chromium/ios/x64/libavutil/ffversion.h
-+@@ -1,5 +1,5 @@
-+ /* Automatically generated by version.sh, do not manually edit! */
-+ #ifndef AVUTIL_FFVERSION_H
-+ #define AVUTIL_FFVERSION_H
-+-#define FFMPEG_VERSION "N-115016-g631703bfb9"
-++#define FFMPEG_VERSION "N-116569-gd0c8e13654"
-+ #endif /* AVUTIL_FFVERSION_H */
-+diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni
-+index 37155be221..646895d03a 100644
-+--- a/ffmpeg_generated.gni
-++++ b/ffmpeg_generated.gni
-+@@ -14,18 +14,12 @@ ffmpeg_asm_sources = []
-+
-+ use_linux_config = is_linux || is_chromeos || is_fuchsia
-+
-+-if (current_cpu == "arm64" || current_cpu == "x64" ||
-+- (is_android && current_cpu == "arm" && arm_use_neon) ||
-+- (is_android && current_cpu == "x86") || is_apple || is_win ||
-+- use_linux_config) {
-++if (use_linux_config && current_cpu == "riscv64") {
-+ ffmpeg_c_sources += [
-+ "libavcodec/ac3_channel_layout_tab.c",
-+ "libavcodec/ac3_parser.c",
-+ "libavcodec/adts_parser.c",
-+ "libavcodec/allcodecs.c",
-+- "libavcodec/autorename_libavcodec_flacdsp.c",
-+- "libavcodec/autorename_libavcodec_mpegaudiodsp.c",
-+- "libavcodec/autorename_libavcodec_vorbisdsp.c",
-+ "libavcodec/avcodec.c",
-+ "libavcodec/avdct.c",
-+ "libavcodec/avfft.c",
-+@@ -45,6 +39,7 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavcodec/flac_parser.c",
-+ "libavcodec/flacdata.c",
-+ "libavcodec/flacdec.c",
-++ "libavcodec/flacdsp.c",
-+ "libavcodec/get_buffer.c",
-+ "libavcodec/golomb.c",
-+ "libavcodec/imgconvert.c",
-+@@ -62,6 +57,7 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavcodec/mpegaudiodec_common.c",
-+ "libavcodec/mpegaudiodec_fixed.c",
-+ "libavcodec/mpegaudiodecheader.c",
-++ "libavcodec/mpegaudiodsp.c",
-+ "libavcodec/mpegaudiodsp_data.c",
-+ "libavcodec/mpegaudiodsp_fixed.c",
-+ "libavcodec/mpegaudiodsp_float.c",
-+@@ -80,6 +76,8 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavcodec/qsv_api.c",
-+ "libavcodec/raw.c",
-+ "libavcodec/refstruct.c",
-++ "libavcodec/riscv/flacdsp_init.c",
-++ "libavcodec/riscv/vorbisdsp_init.c",
-+ "libavcodec/threadprogress.c",
-+ "libavcodec/to_upper4.c",
-+ "libavcodec/utils.c",
-+@@ -89,6 +87,7 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavcodec/vorbis_data.c",
-+ "libavcodec/vorbis_parser.c",
-+ "libavcodec/vorbisdec.c",
-++ "libavcodec/vorbisdsp.c",
-+ "libavcodec/vp9_parser.c",
-+ "libavcodec/xiph.c",
-+ "libavformat/allformats.c",
-+@@ -143,11 +142,6 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavutil/aes.c",
-+ "libavutil/aes_ctr.c",
-+ "libavutil/ambient_viewing_environment.c",
-+- "libavutil/autorename_libavutil_cpu.c",
-+- "libavutil/autorename_libavutil_fixed_dsp.c",
-+- "libavutil/autorename_libavutil_float_dsp.c",
-+- "libavutil/autorename_libavutil_imgutils.c",
-+- "libavutil/autorename_libavutil_tx_float.c",
-+ "libavutil/autorename_libavutil_utils.c",
-+ "libavutil/autorename_libavutil_version.c",
-+ "libavutil/avstring.c",
-+@@ -156,6 +150,7 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavutil/buffer.c",
-+ "libavutil/camellia.c",
-+ "libavutil/channel_layout.c",
-++ "libavutil/cpu.c",
-+ "libavutil/crc.c",
-+ "libavutil/csp.c",
-+ "libavutil/detection_bbox.c",
-+@@ -170,12 +165,15 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavutil/fifo.c",
-+ "libavutil/file_open.c",
-+ "libavutil/film_grain_params.c",
-++ "libavutil/fixed_dsp.c",
-++ "libavutil/float_dsp.c",
-+ "libavutil/frame.c",
-+ "libavutil/hdr_dynamic_metadata.c",
-+ "libavutil/hdr_dynamic_vivid_metadata.c",
-+ "libavutil/hwcontext.c",
-+ "libavutil/hwcontext_stub.c",
-+ "libavutil/iamf.c",
-++ "libavutil/imgutils.c",
-+ "libavutil/integer.c",
-+ "libavutil/intmath.c",
-+ "libavutil/lfg.c",
-+@@ -193,6 +191,9 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavutil/random_seed.c",
-+ "libavutil/rational.c",
-+ "libavutil/reverse.c",
-++ "libavutil/riscv/autorename_libavutil_riscv_cpu.c",
-++ "libavutil/riscv/fixed_dsp_init.c",
-++ "libavutil/riscv/float_dsp_init.c",
-+ "libavutil/samplefmt.c",
-+ "libavutil/sha.c",
-+ "libavutil/slicethread.c",
-+@@ -205,19 +206,36 @@ if (current_cpu == "arm64" || current_cpu == "x64" ||
-+ "libavutil/timestamp.c",
-+ "libavutil/twofish.c",
-+ "libavutil/tx.c",
-++ "libavutil/tx_float.c",
-+ "libavutil/uuid.c",
-+ "libavutil/video_enc_params.c",
-+ "libavutil/video_hint.c",
-+ ]
-++ ffmpeg_gas_sources += [
-++ "libavcodec/riscv/flacdsp_rvv.S",
-++ "libavcodec/riscv/vorbisdsp_rvv.S",
-++ "libavutil/riscv/fixed_dsp_rvv.S",
-++ "libavutil/riscv/float_dsp_rvv.S",
-++ ]
-+ }
-+
-+-if ((is_apple && ffmpeg_branding == "Chrome") ||
-+- (is_win && ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && ffmpeg_branding == "Chrome")) {
-++if (use_linux_config && current_cpu == "riscv64" &&
-++ ffmpeg_branding == "Chrome") {
-+ ffmpeg_c_sources += [
-++ "libavcodec/aac/aacdec.c",
-++ "libavcodec/aac/aacdec_float.c",
-++ "libavcodec/aac/aacdec_tab.c",
-++ "libavcodec/aac_ac3_parser.c",
-++ "libavcodec/aac_parser.c",
-++ "libavcodec/aacps_common.c",
-++ "libavcodec/aacps_float.c",
-++ "libavcodec/aacpsdsp_float.c",
-++ "libavcodec/aacsbr.c",
-++ "libavcodec/aactab.c",
-++ "libavcodec/adts_header.c",
-+ "libavcodec/atsc_a53.c",
-+- "libavcodec/autorename_libavcodec_videodsp.c",
-+ "libavcodec/cabac.c",
-++ "libavcodec/cbrt_data.c",
-+ "libavcodec/h2645_parse.c",
-+ "libavcodec/h2645_sei.c",
-+ "libavcodec/h2645_vui.c",
-+@@ -242,253 +260,24 @@ if ((is_apple && ffmpeg_branding == "Chrome") ||
-+ "libavcodec/h264pred.c",
-+ "libavcodec/h264qpel.c",
-+ "libavcodec/h274.c",
-+- "libavcodec/startcode.c",
-+- ]
-+-}
-+-
-+-if ((is_apple && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-+- (is_win && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-+- (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+- ffmpeg_c_sources += [
-+- "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c",
-+- "libavcodec/x86/h264_intrapred_init.c",
-+- "libavcodec/x86/h264_qpel.c",
-+- "libavcodec/x86/h264chroma_init.c",
-+- "libavcodec/x86/h264dsp_init.c",
-+- ]
-+- ffmpeg_asm_sources += [
-+- "libavcodec/x86/autorename_libavcodec_x86_videodsp.asm",
-+- "libavcodec/x86/fpel.asm",
-+- "libavcodec/x86/h264_chromamc.asm",
-+- "libavcodec/x86/h264_chromamc_10bit.asm",
-+- "libavcodec/x86/h264_deblock.asm",
-+- "libavcodec/x86/h264_deblock_10bit.asm",
-+- "libavcodec/x86/h264_idct.asm",
-+- "libavcodec/x86/h264_idct_10bit.asm",
-+- "libavcodec/x86/h264_intrapred.asm",
-+- "libavcodec/x86/h264_intrapred_10bit.asm",
-+- "libavcodec/x86/h264_qpel_10bit.asm",
-+- "libavcodec/x86/h264_qpel_8bit.asm",
-+- "libavcodec/x86/h264_weight.asm",
-+- "libavcodec/x86/h264_weight_10bit.asm",
-+- "libavcodec/x86/qpel.asm",
-+- ]
-+-}
-+-
-+-if ((current_cpu == "arm64" && ffmpeg_branding == "Chrome") ||
-+- (current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-+- (is_android && current_cpu == "arm" && arm_use_neon &&
-+- ffmpeg_branding == "Chrome") ||
-+- (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-+- (is_apple && ffmpeg_branding == "Chrome") ||
-+- (is_win && ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && ffmpeg_branding == "Chrome")) {
-+- ffmpeg_c_sources += [
-+- "libavcodec/aac/aacdec.c",
-+- "libavcodec/aac/aacdec_float.c",
-+- "libavcodec/aac/aacdec_tab.c",
-+- "libavcodec/aac_ac3_parser.c",
-+- "libavcodec/aac_parser.c",
-+- "libavcodec/aacps_common.c",
-+- "libavcodec/aacps_float.c",
-+- "libavcodec/aacpsdsp_float.c",
-+- "libavcodec/aacsbr.c",
-+- "libavcodec/aactab.c",
-+- "libavcodec/adts_header.c",
-+- "libavcodec/autorename_libavcodec_sbrdsp.c",
-+- "libavcodec/cbrt_data.c",
-+ "libavcodec/kbdwin.c",
-++ "libavcodec/riscv/aacpsdsp_init.c",
-++ "libavcodec/riscv/h264_chroma_init_riscv.c",
-++ "libavcodec/riscv/h264dsp_init.c",
-++ "libavcodec/riscv/sbrdsp_init.c",
-++ "libavcodec/sbrdsp.c",
-+ "libavcodec/sinewin.c",
-++ "libavcodec/startcode.c",
-++ "libavcodec/videodsp.c",
-+ "libavformat/apetag.c",
-+ "libavformat/autorename_libavformat_aacdec.c",
-+ "libavformat/img2.c",
-+ ]
-+-}
-+-
-+-if ((is_apple && current_cpu == "arm64" && ffmpeg_branding == "Chrome") ||
-+- (is_win && current_cpu == "arm64" && ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "arm64" &&
-+- ffmpeg_branding == "Chrome")) {
-+- ffmpeg_c_sources += [
-+- "libavcodec/aarch64/h264chroma_init_aarch64.c",
-+- "libavcodec/aarch64/h264dsp_init_aarch64.c",
-+- "libavcodec/aarch64/h264pred_init.c",
-+- "libavcodec/aarch64/h264qpel_init_aarch64.c",
-+- "libavcodec/aarch64/videodsp_init.c",
-+- ]
-+ ffmpeg_gas_sources += [
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264cmc_neon.S",
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264dsp_neon.S",
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264idct_neon.S",
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264pred_neon.S",
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_h264qpel_neon.S",
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_hpeldsp_neon.S",
-+- "libavcodec/aarch64/videodsp.S",
-+- ]
-+-}
-+-
-+-if (current_cpu == "x64" || (is_win && current_cpu == "x86") ||
-+- (use_linux_config && current_cpu == "x86")) {
-+- ffmpeg_c_sources +=
-+- [ "libavutil/x86/autorename_libavutil_x86_tx_float_init.c" ]
-+- ffmpeg_asm_sources += [
-+- "libavcodec/x86/dct32.asm",
-+- "libavcodec/x86/flacdsp.asm",
-+- "libavcodec/x86/imdct36.asm",
-+- "libavcodec/x86/vorbisdsp.asm",
-+- "libavutil/x86/cpuid.asm",
-+- "libavutil/x86/fixed_dsp.asm",
-+- "libavutil/x86/float_dsp.asm",
-+- "libavutil/x86/imgutils.asm",
-+- "libavutil/x86/lls.asm",
-+- "libavutil/x86/tx_float.asm",
-+- ]
-+-}
-+-
-+-if (current_cpu == "x64" || (is_android && current_cpu == "x86") ||
-+- (is_win && current_cpu == "x86") ||
-+- (use_linux_config && current_cpu == "x86")) {
-+- ffmpeg_c_sources += [
-+- "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c",
-+- "libavcodec/x86/constants.c",
-+- "libavcodec/x86/flacdsp_init.c",
-+- "libavcodec/x86/mpegaudiodsp.c",
-+- "libavutil/x86/autorename_libavutil_x86_cpu.c",
-+- "libavutil/x86/autorename_libavutil_x86_float_dsp_init.c",
-+- "libavutil/x86/fixed_dsp_init.c",
-+- "libavutil/x86/imgutils_init.c",
-+- "libavutil/x86/lls_init.c",
-++ "libavcodec/riscv/aacpsdsp_rvv.S",
-++ "libavcodec/riscv/h264_mc_chroma.S",
-++ "libavcodec/riscv/sbrdsp_rvv.S",
-++ "libavcodec/riscv/startcode_rvb.S",
-++ "libavcodec/riscv/startcode_rvv.S",
-+ ]
-+ }
-+-
-+-if ((is_android && current_cpu == "arm" && arm_use_neon) ||
-+- (use_linux_config && current_cpu == "arm" && arm_use_neon) ||
-+- (use_linux_config && current_cpu == "arm")) {
-+- ffmpeg_c_sources += [
-+- "libavcodec/arm/flacdsp_init_arm.c",
-+- "libavcodec/arm/mpegaudiodsp_init_arm.c",
-+- "libavcodec/arm/vorbisdsp_init_arm.c",
-+- "libavutil/arm/autorename_libavutil_arm_cpu.c",
-+- "libavutil/arm/float_dsp_init_arm.c",
-+- "libavutil/arm/float_dsp_init_vfp.c",
-+- ]
-+- ffmpeg_gas_sources += [
-+- "libavcodec/arm/flacdsp_arm.S",
-+- "libavcodec/arm/mpegaudiodsp_fixed_armv6.S",
-+- "libavutil/arm/float_dsp_vfp.S",
-+- ]
-+-}
-+-
-+-if (current_cpu == "arm64") {
-+- ffmpeg_c_sources += [
-+- "libavcodec/aarch64/mpegaudiodsp_init.c",
-+- "libavcodec/aarch64/vorbisdsp_init.c",
-+- "libavutil/aarch64/cpu.c",
-+- "libavutil/aarch64/float_dsp_init.c",
-+- "libavutil/aarch64/tx_float_init.c",
-+- ]
-+- ffmpeg_gas_sources += [
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_vorbisdsp_neon.S",
-+- "libavcodec/aarch64/mpegaudiodsp_neon.S",
-+- "libavutil/aarch64/autorename_libavutil_aarch64_float_dsp_neon.S",
-+- "libavutil/aarch64/tx_float_neon.S",
-+- ]
-+-}
-+-
-+-if ((use_linux_config && current_cpu == "arm" && arm_use_neon &&
-+- ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome")) {
-+- ffmpeg_c_sources += [
-+- "libavcodec/arm/h264chroma_init_arm.c",
-+- "libavcodec/arm/h264dsp_init_arm.c",
-+- "libavcodec/arm/h264pred_init_arm.c",
-+- "libavcodec/arm/h264qpel_init_arm.c",
-+- "libavcodec/arm/videodsp_init_arm.c",
-+- "libavcodec/arm/videodsp_init_armv5te.c",
-+- ]
-+- ffmpeg_gas_sources += [
-+- "libavcodec/arm/startcode_armv6.S",
-+- "libavcodec/arm/videodsp_armv5te.S",
-+- ]
-+-}
-+-
-+-if (use_linux_config && current_cpu == "arm" && arm_use_neon &&
-+- ffmpeg_branding == "Chrome") {
-+- ffmpeg_gas_sources += [
-+- "libavcodec/arm/h264cmc_neon.S",
-+- "libavcodec/arm/h264dsp_neon.S",
-+- "libavcodec/arm/h264idct_neon.S",
-+- "libavcodec/arm/h264pred_neon.S",
-+- "libavcodec/arm/h264qpel_neon.S",
-+- "libavcodec/arm/hpeldsp_neon.S",
-+- ]
-+-}
-+-
-+-if (current_cpu == "arm64" && ffmpeg_branding == "Chrome") {
-+- ffmpeg_c_sources += [
-+- "libavcodec/aarch64/aacpsdsp_init_aarch64.c",
-+- "libavcodec/aarch64/sbrdsp_init_aarch64.c",
-+- ]
-+- ffmpeg_gas_sources += [
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_aacpsdsp_neon.S",
-+- "libavcodec/aarch64/autorename_libavcodec_aarch64_sbrdsp_neon.S",
-+- ]
-+-}
-+-
-+-if ((is_android && current_cpu == "arm" && arm_use_neon) ||
-+- (use_linux_config && current_cpu == "arm" && arm_use_neon)) {
-+- ffmpeg_c_sources += [ "libavutil/arm/float_dsp_init_neon.c" ]
-+- ffmpeg_gas_sources += [
-+- "libavcodec/arm/vorbisdsp_neon.S",
-+- "libavutil/arm/float_dsp_neon.S",
-+- ]
-+-}
-+-
-+-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-+- (is_android && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-+- (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+- ffmpeg_c_sources += [
-+- "libavcodec/x86/aacpsdsp_init.c",
-+- "libavcodec/x86/sbrdsp_init.c",
-+- ]
-+-}
-+-
-+-if ((is_android && current_cpu == "arm" && arm_use_neon &&
-+- ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "arm" && arm_use_neon &&
-+- ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome")) {
-+- ffmpeg_c_sources += [
-+- "libavcodec/arm/aacpsdsp_init_arm.c",
-+- "libavcodec/arm/sbrdsp_init_arm.c",
-+- ]
-+-}
-+-
-+-if ((current_cpu == "x64" && ffmpeg_branding == "Chrome") ||
-+- (is_win && current_cpu == "x86" && ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome")) {
-+- ffmpeg_asm_sources += [
-+- "libavcodec/x86/aacpsdsp.asm",
-+- "libavcodec/x86/sbrdsp.asm",
-+- ]
-+-}
-+-
-+-if ((is_android && current_cpu == "arm" && arm_use_neon &&
-+- ffmpeg_branding == "Chrome") ||
-+- (use_linux_config && current_cpu == "arm" && arm_use_neon &&
-+- ffmpeg_branding == "Chrome")) {
-+- ffmpeg_gas_sources += [
-+- "libavcodec/arm/aacpsdsp_neon.S",
-+- "libavcodec/arm/sbrdsp_neon.S",
-+- ]
-+-}
-+-
-+-if ((is_android && current_cpu == "arm" && arm_use_neon) ||
-+- (is_android && current_cpu == "arm64") ||
-+- (is_android && current_cpu == "x64") ||
-+- (is_android && current_cpu == "x86")) {
-+- ffmpeg_c_sources += [ "compat/strtod.c" ]
-+-}
-+diff --git a/libavformat/autorename_libavformat_aacdec.c b/libavformat/autorename_libavformat_aacdec.c
-+index 79cdef5ea6..697232b08e 100644
-+--- a/libavformat/autorename_libavformat_aacdec.c
-++++ b/libavformat/autorename_libavformat_aacdec.c
-+@@ -1,2 +1,2 @@
-+-// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-++// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+ #include "aacdec.c"
-+diff --git a/libavformat/autorename_libavformat_flacdec.c b/libavformat/autorename_libavformat_flacdec.c
-+index 50d53b1b28..3438c2ece7 100644
-+--- a/libavformat/autorename_libavformat_flacdec.c
-++++ b/libavformat/autorename_libavformat_flacdec.c
-+@@ -1,2 +1,2 @@
-+-// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-++// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+ #include "flacdec.c"
-+diff --git a/libavformat/autorename_libavformat_options.c b/libavformat/autorename_libavformat_options.c
-+index b9b279f611..9afc6293ca 100644
-+--- a/libavformat/autorename_libavformat_options.c
-++++ b/libavformat/autorename_libavformat_options.c
-+@@ -1,2 +1,2 @@
-+-// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-++// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+ #include "options.c"
-+diff --git a/libavformat/autorename_libavformat_pcm.c b/libavformat/autorename_libavformat_pcm.c
-+index 94cc7fcf24..9d981e0447 100644
-+--- a/libavformat/autorename_libavformat_pcm.c
-++++ b/libavformat/autorename_libavformat_pcm.c
-+@@ -1,2 +1,2 @@
-+-// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-++// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+ #include "pcm.c"
-+diff --git a/libavformat/autorename_libavformat_utils.c b/libavformat/autorename_libavformat_utils.c
-+index 6a9a535662..ae2799ec69 100644
-+--- a/libavformat/autorename_libavformat_utils.c
-++++ b/libavformat/autorename_libavformat_utils.c
-+@@ -1,2 +1,2 @@
-+-// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-++// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+ #include "utils.c"
-+diff --git a/libavformat/autorename_libavformat_version.c b/libavformat/autorename_libavformat_version.c
-+index 00e3fc63d9..b208fa0692 100644
-+--- a/libavformat/autorename_libavformat_version.c
-++++ b/libavformat/autorename_libavformat_version.c
-+@@ -1,2 +1,2 @@
-+-// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-++// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+ #include "version.c"
-+diff --git a/libavutil/autorename_libavutil_utils.c b/libavutil/autorename_libavutil_utils.c
-+index 6a9a535662..ae2799ec69 100644
-+--- a/libavutil/autorename_libavutil_utils.c
-++++ b/libavutil/autorename_libavutil_utils.c
-+@@ -1,2 +1,2 @@
-+-// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-++// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+ #include "utils.c"
-+diff --git a/libavutil/autorename_libavutil_version.c b/libavutil/autorename_libavutil_version.c
-+index 00e3fc63d9..b208fa0692 100644
-+--- a/libavutil/autorename_libavutil_version.c
-++++ b/libavutil/autorename_libavutil_version.c
-+@@ -1,2 +1,2 @@
-+-// Automatically generated on Tue May 21 22:27:37 2024. See crbug.com/495833.
-++// Automatically generated on Sun Aug 18 23:57:15 2024. See crbug.com/495833.
-+ #include "version.c"
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
++#include "fixed_dsp_init.c"
+diff '--color=auto' -Naur a/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_float_dsp_init.c b/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_float_dsp_init.c
+--- a/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_float_dsp_init.c 2024-10-02 03:50:25.987479000 +0100
++++ b/third_party/ffmpeg/libavutil/x86/autorename_libavutil_x86_float_dsp_init.c 2024-10-05 16:34:43.836521180 +0100
+@@ -1,2 +1,2 @@
+-// Automatically generated on Mon Jul 22 22:30:21 2024. See crbug.com/495833.
++// Automatically generated on Sun Sep 15 16:34:25 2024. See crbug.com/495833.
+ #include "float_dsp_init.c"
diff --git a/www-client/chromium/files/riscv-misc.patch b/www-client/chromium/files/riscv-misc.patch
new file mode 100644
index 0000000..81714c8
--- /dev/null
+++ b/www-client/chromium/files/riscv-misc.patch
@@ -0,0 +1,41 @@
+Index: chromium-130.0.6723.116/components/metrics/debug/metrics_internals_utils.cc
+===================================================================
+--- chromium-130.0.6723.116.orig/components/metrics/debug/metrics_internals_utils.cc
++++ chromium-130.0.6723.116/components/metrics/debug/metrics_internals_utils.cc
+@@ -69,6 +69,8 @@ std::string CpuArchitectureToString(
+ return "arm32";
+ case variations::Study::TRANSLATED_X86_64:
+ return "translated_x86_64";
++ case variations::Study::RISCV64:
++ return "riscv64";
+ }
+ NOTREACHED_IN_MIGRATION();
+ }
+Index: chromium-130.0.6723.116/components/variations/proto/study.proto
+===================================================================
+--- chromium-130.0.6723.116.orig/components/variations/proto/study.proto
++++ chromium-130.0.6723.116/components/variations/proto/study.proto
+@@ -262,6 +262,8 @@ message Study {
+ // A Mac-only value, indicating an x86-64 binary running on an arm64 host
+ // via "Rosetta 2" binary translation.
+ TRANSLATED_X86_64 = 4;
++
++ RISCV64 = 5;
+ }
+
+ // Enum to pass as optional bool.
+Index: chromium-130.0.6723.116/components/variations/service/variations_field_trial_creator_base.cc
+===================================================================
+--- chromium-130.0.6723.116.orig/components/variations/service/variations_field_trial_creator_base.cc
++++ chromium-130.0.6723.116/components/variations/service/variations_field_trial_creator_base.cc
+@@ -120,6 +120,9 @@ Study::CpuArchitecture GetCurrentCpuArch
+ }
+ return Study::X86_64;
+ }
++ if (process_arch == "RISCV_64") {
++ return Study::RISCV64;
++ }
+ NOTREACHED_IN_MIGRATION();
+ return Study::X86_64;
+ }
+
diff --git a/www-client/chromium/files/riscv-sandbox.patch b/www-client/chromium/files/riscv-sandbox.patch
index 0753bb1..dc2d902 100644
--- a/www-client/chromium/files/riscv-sandbox.patch
+++ b/www-client/chromium/files/riscv-sandbox.patch
@@ -1,15 +1,7 @@
-From 90499f55f949f95b01c84257d306cf209c04b431 Mon Sep 17 00:00:00 2001
-From: Andreas Schwab <schwab@suse.de>
-Date: Fri, 04 Mar 2022 15:27:35 +0100
-Subject: [PATCH] Add support for riscv64-linux
-
-Change-Id: Ibcdaaba1b0c92a1cd85361b9859370c686832c49
----
-
-diff --git a/sandbox/features.gni b/sandbox/features.gni
-index 8434144..8aa52983 100644
---- a/sandbox/features.gni
-+++ b/sandbox/features.gni
+Index: chromium-130.0.6723.58/sandbox/features.gni
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/features.gni
++++ chromium-130.0.6723.58/sandbox/features.gni
@@ -9,7 +9,8 @@
use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
(current_cpu == "x86" || current_cpu == "x64" ||
@@ -20,29 +12,28 @@ index 8434144..8aa52983 100644
# SSBD (Speculative Store Bypass Disable) is a mitigation of Spectre Variant 4.
# As Spectre Variant 4 can be mitigated by site isolation, opt-out SSBD on site
-diff --git a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-index 1d0590b..b722fbc9 100644
---- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-+++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
-@@ -56,6 +56,13 @@
+Index: chromium-130.0.6723.58/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
++++ chromium-130.0.6723.58/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
+@@ -56,6 +56,12 @@
#define MAX_PUBLIC_SYSCALL __NR_syscalls
#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+#elif defined(__riscv)
+
-+#include <asm/unistd.h>
+#define MIN_SYSCALL 0u
-+#define MAX_PUBLIC_SYSCALL __NR_syscalls
++#define MAX_PUBLIC_SYSCALL 1024u
+#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
+
#else
#error "Unsupported architecture"
#endif
-diff --git a/sandbox/linux/bpf_dsl/seccomp_macros.h b/sandbox/linux/bpf_dsl/seccomp_macros.h
-index 87d5825..49fc9a6 100644
---- a/sandbox/linux/bpf_dsl/seccomp_macros.h
-+++ b/sandbox/linux/bpf_dsl/seccomp_macros.h
-@@ -343,6 +343,48 @@
+Index: chromium-130.0.6723.58/sandbox/linux/bpf_dsl/seccomp_macros.h
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/bpf_dsl/seccomp_macros.h
++++ chromium-130.0.6723.58/sandbox/linux/bpf_dsl/seccomp_macros.h
+@@ -343,6 +343,48 @@ struct regs_struct {
#define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
#define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
#define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
@@ -91,68 +82,11 @@ index 87d5825..49fc9a6 100644
#else
#error Unsupported target platform
-diff --git a/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc b/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc
-index 4a2721c..8ef9f51a 100644
---- a/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc
-+++ b/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc
-@@ -17,6 +17,7 @@
- #include <sys/types.h>
- #include <sys/utsname.h>
- #include <unistd.h>
-+#include <linux/elf.h>
-
- #include <memory>
- #include <vector>
-@@ -2029,7 +2030,15 @@
- BPF_ASSERT_EQ(kTraceData, data);
-
- regs_struct regs;
-+#if defined(__riscv)
-+ iovec iov;
-+ iov.iov_base = ®s;
-+ iov.iov_len = sizeof(regs);
-+ BPF_ASSERT_NE(-1, ptrace(PTRACE_GETREGSET, pid,
-+ reinterpret_case<void*>(NT_PRSTATUS), &iov));
-+#else
- BPF_ASSERT_NE(-1, ptrace(PTRACE_GETREGS, pid, NULL, ®s));
-+#endif
- switch (SECCOMP_PT_SYSCALL(regs)) {
- case __NR_write:
- // Skip writes to stdout, make it return kExpectedReturnValue. Allow
-@@ -2037,7 +2046,14 @@
- if (SECCOMP_PT_PARM1(regs) == STDOUT_FILENO) {
- BPF_ASSERT_NE(-1, SetSyscall(pid, ®s, -1));
- SECCOMP_PT_RESULT(regs) = kExpectedReturnValue;
-+#if defined(__riscv)
-+ iov.iov_len = sizeof(regs);
-+ BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGSET, pid,
-+ reinterpret_cast<void*>(NT_PRSTATUS),
-+ &iov));
-+#else
- BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGS, pid, NULL, ®s));
-+#endif
- }
- break;
-
-@@ -2045,7 +2061,13 @@
- // Rewrite to exit(kExpectedReturnValue).
- BPF_ASSERT_NE(-1, SetSyscall(pid, ®s, __NR_exit));
- SECCOMP_PT_PARM1(regs) = kExpectedReturnValue;
-+#if defined(__riscv)
-+ iov.iov_len = sizeof(regs);
-+ BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGSET, pid,
-+ reinterpret_cast<void*>(NT_PRSTATUS), &iov));
-+#else
- BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGS, pid, NULL, ®s));
-+#endif
- break;
-
- default:
-diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-index 7bde501..b92ab39 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
-@@ -60,6 +60,9 @@
+Index: chromium-130.0.6723.58/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
++++ chromium-130.0.6723.58/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
+@@ -60,6 +60,9 @@ bool IsBaselinePolicyAllowed(int sysno)
#if defined(__mips__)
SyscallSets::IsMipsPrivate(sysno) ||
#endif
@@ -162,7 +96,7 @@ index 7bde501..b92ab39 100644
SyscallSets::IsAllowedOperationOnFd(sysno);
// clang-format on
}
-@@ -193,7 +196,7 @@
+@@ -193,7 +196,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
return RestrictFcntlCommands();
#endif
@@ -171,7 +105,7 @@ index 7bde501..b92ab39 100644
// fork() is never used as a system call (clone() is used instead), but we
// have seen it in fallback code on Android.
if (sysno == __NR_fork) {
-@@ -255,7 +258,7 @@
+@@ -255,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
}
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -180,7 +114,7 @@ index 7bde501..b92ab39 100644
if (sysno == __NR_mmap)
return RestrictMmapFlags();
#endif
-@@ -276,7 +279,7 @@
+@@ -276,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
return RestrictPrctl();
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -189,7 +123,7 @@ index 7bde501..b92ab39 100644
if (sysno == __NR_socketpair) {
// Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
static_assert(AF_UNIX == PF_UNIX,
-@@ -366,7 +369,7 @@
+@@ -366,7 +369,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
// Allow creating pipes, but don't allow weird flags to pipe2().
// O_NOTIFICATION_PIPE (== O_EXCL) can be used to create
// "notification pipes", which are rarely used.
@@ -198,41 +132,10 @@ index 7bde501..b92ab39 100644
if (sysno == __NR_pipe) {
return Allow();
}
-diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-index a0a8796..8bea4c9 100644
---- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
-@@ -270,7 +270,7 @@
- }
-
- // Not all architectures can restrict the domain for socketpair().
--#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-+#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__riscv)
- BPF_DEATH_TEST_C(BaselinePolicy,
- SocketpairWrongDomain,
- DEATH_SEGV_MESSAGE(GetErrorMessageContentForTests()),
-@@ -279,7 +279,7 @@
- std::ignore = socketpair(AF_INET, SOCK_STREAM, 0, sv);
- _exit(1);
- }
--#endif // defined(__x86_64__) || defined(__arm__) || defined(__aarch64__)
-+#endif // defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || defined(__riscv)
-
- BPF_TEST_C(BaselinePolicy, EPERM_open, BaselinePolicy) {
- errno = 0;
-@@ -343,7 +343,7 @@
- TEST_BASELINE_SIGSYS(__NR_syslog)
- TEST_BASELINE_SIGSYS(__NR_timer_create)
-
--#if !defined(__aarch64__)
-+#if !defined(__aarch64__) && !defined(__riscv)
- TEST_BASELINE_SIGSYS(__NR_inotify_init)
- TEST_BASELINE_SIGSYS(__NR_vserver)
- #endif
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-index 74112e8..b451c19 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+Index: chromium-130.0.6723.58/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
++++ chromium-130.0.6723.58/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
@@ -37,6 +37,7 @@
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
@@ -241,7 +144,7 @@ index 74112e8..b451c19 100644
!defined(PTRACE_GET_THREAD_AREA)
// Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
// the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
-@@ -463,8 +464,10 @@
+@@ -463,8 +464,10 @@ ResultExpr RestrictPtrace() {
#endif
return Switch(request)
.Cases({
@@ -253,23 +156,11 @@ index 74112e8..b451c19 100644
PTRACE_GETREGSET,
#endif
#if defined(__arm__)
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-index 10e64a2c..ddfd6a7 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc
-@@ -7,6 +7,7 @@
- #include <errno.h>
- #include <fcntl.h>
- #include <linux/elf.h>
-+#include <asm/ptrace.h>
- #include <sched.h>
- #include <sys/prctl.h>
- #include <sys/ptrace.h>
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-index 4cde283..bc680424 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
-@@ -103,7 +103,7 @@
+Index: chromium-130.0.6723.58/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
++++ chromium-130.0.6723.58/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
+@@ -103,7 +103,7 @@ bool SyscallSets::IsUmask(int sysno) {
// Both EPERM and ENOENT are valid errno unless otherwise noted in comment.
bool SyscallSets::IsFileSystem(int sysno) {
switch (sysno) {
@@ -278,7 +169,7 @@ index 4cde283..bc680424 100644
case __NR_access: // EPERM not a valid errno.
case __NR_chmod:
case __NR_chown:
-@@ -136,7 +136,7 @@
+@@ -136,7 +136,7 @@ bool SyscallSets::IsFileSystem(int sysno
case __NR_faccessat2:
case __NR_fchmodat:
case __NR_fchownat: // Should be called chownat ?
@@ -287,7 +178,7 @@ index 4cde283..bc680424 100644
case __NR_newfstatat: // fstatat(). EPERM not a valid errno.
#elif defined(__i386__) || defined(__arm__) || \
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
-@@ -241,7 +241,7 @@
+@@ -241,7 +241,7 @@ bool SyscallSets::IsAllowedFileSystemAcc
case __NR_oldfstat:
#endif
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -296,7 +187,7 @@ index 4cde283..bc680424 100644
case __NR_sync_file_range: // EPERM not a valid errno.
#elif defined(__arm__)
case __NR_arm_sync_file_range: // EPERM not a valid errno.
-@@ -260,7 +260,7 @@
+@@ -260,7 +260,7 @@ bool SyscallSets::IsDeniedFileSystemAcce
#if defined(__i386__) || defined(__arm__)
case __NR_fchown32:
#endif
@@ -305,7 +196,7 @@ index 4cde283..bc680424 100644
case __NR_getdents: // EPERM not a valid errno.
#endif
case __NR_getdents64: // EPERM not a valid errno.
-@@ -339,7 +339,7 @@
+@@ -339,7 +339,7 @@ bool SyscallSets::IsProcessPrivilegeChan
bool SyscallSets::IsProcessGroupOrSession(int sysno) {
switch (sysno) {
case __NR_setpgid:
@@ -314,7 +205,7 @@ index 4cde283..bc680424 100644
case __NR_getpgrp:
#endif
case __NR_setsid:
-@@ -373,7 +373,7 @@
+@@ -373,7 +373,7 @@ bool SyscallSets::IsAllowedSignalHandlin
case __NR_rt_sigqueueinfo:
case __NR_rt_sigsuspend:
case __NR_rt_tgsigqueueinfo:
@@ -323,7 +214,7 @@ index 4cde283..bc680424 100644
case __NR_signalfd:
#endif
case __NR_signalfd4:
-@@ -397,12 +397,12 @@
+@@ -397,12 +397,12 @@ bool SyscallSets::IsAllowedOperationOnFd
switch (sysno) {
case __NR_close:
case __NR_dup:
@@ -338,7 +229,7 @@ index 4cde283..bc680424 100644
case __NR_shutdown:
#endif
return true;
-@@ -441,7 +441,7 @@
+@@ -441,7 +441,7 @@ bool SyscallSets::IsAllowedProcessStartO
return true;
case __NR_clone: // Should be parameter-restricted.
case __NR_setns: // Privileged.
@@ -347,7 +238,7 @@ index 4cde283..bc680424 100644
case __NR_fork:
#endif
#if defined(__i386__) || defined(__x86_64__)
-@@ -452,7 +452,7 @@
+@@ -452,7 +452,7 @@ bool SyscallSets::IsAllowedProcessStartO
#endif
case __NR_set_tid_address:
case __NR_unshare:
@@ -356,7 +247,7 @@ index 4cde283..bc680424 100644
case __NR_vfork:
#endif
default:
-@@ -477,7 +477,7 @@
+@@ -477,7 +477,7 @@ bool SyscallSets::IsAllowedFutex(int sys
bool SyscallSets::IsAllowedEpoll(int sysno) {
switch (sysno) {
@@ -365,7 +256,7 @@ index 4cde283..bc680424 100644
case __NR_epoll_create:
case __NR_epoll_wait:
#endif
-@@ -499,7 +499,7 @@
+@@ -499,7 +499,7 @@ bool SyscallSets::IsAllowedEpoll(int sys
bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
switch (sysno) {
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -374,7 +265,7 @@ index 4cde283..bc680424 100644
case __NR_accept:
case __NR_accept4:
case __NR_bind:
-@@ -553,7 +553,7 @@
+@@ -554,7 +554,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
case __NR_mincore:
case __NR_mlockall:
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -383,7 +274,7 @@ index 4cde283..bc680424 100644
case __NR_mmap:
#endif
#if defined(__i386__) || defined(__arm__) || \
-@@ -586,7 +586,7 @@
+@@ -587,7 +587,7 @@ bool SyscallSets::IsAllowedGeneralIo(int
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
case __NR__llseek:
#endif
@@ -392,7 +283,7 @@ index 4cde283..bc680424 100644
case __NR_poll:
#endif
case __NR_ppoll:
-@@ -607,7 +607,7 @@
+@@ -608,7 +608,7 @@ bool SyscallSets::IsAllowedGeneralIo(int
case __NR_recv:
#endif
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -401,7 +292,7 @@ index 4cde283..bc680424 100644
case __NR_recvfrom: // Could specify source.
case __NR_recvmsg: // Could specify source.
#endif
-@@ -622,7 +622,7 @@
+@@ -623,7 +623,7 @@ bool SyscallSets::IsAllowedGeneralIo(int
case __NR_send:
#endif
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -410,7 +301,7 @@ index 4cde283..bc680424 100644
case __NR_sendmsg: // Could specify destination.
case __NR_sendto: // Could specify destination.
#endif
-@@ -671,7 +671,7 @@
+@@ -672,7 +672,7 @@ bool SyscallSets::IsSeccomp(int sysno) {
bool SyscallSets::IsAllowedBasicScheduler(int sysno) {
switch (sysno) {
case __NR_sched_yield:
@@ -419,7 +310,7 @@ index 4cde283..bc680424 100644
case __NR_pause:
#endif
case __NR_nanosleep:
-@@ -755,7 +755,7 @@
+@@ -756,7 +756,7 @@ bool SyscallSets::IsNuma(int sysno) {
case __NR_getcpu:
case __NR_mbind:
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -428,7 +319,7 @@ index 4cde283..bc680424 100644
case __NR_migrate_pages:
#endif
case __NR_move_pages:
-@@ -790,7 +790,7 @@
+@@ -791,7 +791,7 @@ bool SyscallSets::IsGlobalProcessEnviron
switch (sysno) {
case __NR_acct: // Privileged.
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -437,7 +328,7 @@ index 4cde283..bc680424 100644
case __NR_getrlimit:
#endif
#if defined(__i386__) || defined(__arm__)
-@@ -825,7 +825,7 @@
+@@ -826,7 +826,7 @@ bool SyscallSets::IsDebug(int sysno) {
bool SyscallSets::IsGlobalSystemStatus(int sysno) {
switch (sysno) {
@@ -446,7 +337,7 @@ index 4cde283..bc680424 100644
case __NR__sysctl:
case __NR_sysfs:
#endif
-@@ -843,7 +843,7 @@
+@@ -844,7 +844,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
bool SyscallSets::IsEventFd(int sysno) {
switch (sysno) {
@@ -455,7 +346,7 @@ index 4cde283..bc680424 100644
case __NR_eventfd:
#endif
case __NR_eventfd2:
-@@ -895,6 +895,7 @@
+@@ -896,6 +896,7 @@ bool SyscallSets::IsKeyManagement(int sy
}
#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
@@ -463,7 +354,7 @@ index 4cde283..bc680424 100644
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
bool SyscallSets::IsSystemVSemaphores(int sysno) {
switch (sysno) {
-@@ -914,7 +915,7 @@
+@@ -915,7 +916,7 @@ bool SyscallSets::IsSystemVSemaphores(in
#endif
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
@@ -472,7 +363,7 @@ index 4cde283..bc680424 100644
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
// These give a lot of ambient authority and bypass the setuid sandbox.
bool SyscallSets::IsSystemVSharedMemory(int sysno) {
-@@ -931,6 +932,7 @@
+@@ -932,6 +933,7 @@ bool SyscallSets::IsSystemVSharedMemory(
#endif
#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
@@ -480,7 +371,7 @@ index 4cde283..bc680424 100644
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
bool SyscallSets::IsSystemVMessageQueue(int sysno) {
switch (sysno) {
-@@ -962,6 +964,7 @@
+@@ -963,6 +965,7 @@ bool SyscallSets::IsSystemVIpc(int sysno
bool SyscallSets::IsAnySystemV(int sysno) {
#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
@@ -488,7 +379,7 @@ index 4cde283..bc680424 100644
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
IsSystemVSharedMemory(sysno);
-@@ -999,7 +1002,7 @@
+@@ -1000,7 +1003,7 @@ bool SyscallSets::IsAdvancedScheduler(in
bool SyscallSets::IsInotify(int sysno) {
switch (sysno) {
case __NR_inotify_add_watch:
@@ -497,7 +388,7 @@ index 4cde283..bc680424 100644
case __NR_inotify_init:
#endif
case __NR_inotify_init1:
-@@ -1134,7 +1137,7 @@
+@@ -1135,7 +1138,7 @@ bool SyscallSets::IsMisc(int sysno) {
#if defined(__x86_64__)
case __NR_tuxcall:
#endif
@@ -506,7 +397,7 @@ index 4cde283..bc680424 100644
case __NR_vserver:
#endif
return true;
-@@ -1193,6 +1196,18 @@
+@@ -1194,6 +1197,18 @@ bool SyscallSets::IsMipsMisc(int sysno)
}
#endif // defined(__mips__)
@@ -525,11 +416,11 @@ index 4cde283..bc680424 100644
bool SyscallSets::IsGoogle3Threading(int sysno) {
switch (sysno) {
case __NR_getitimer:
-diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-index 9be7b03..41b3605 100644
---- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-+++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
-@@ -52,7 +52,7 @@
+Index: chromium-130.0.6723.58/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
++++ chromium-130.0.6723.58/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
+@@ -52,7 +52,7 @@ class SANDBOX_EXPORT SyscallSets {
#endif
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
@@ -538,7 +429,7 @@ index 9be7b03..41b3605 100644
static bool IsNetworkSocketInformation(int sysno);
#endif
-@@ -79,18 +79,21 @@
+@@ -79,18 +79,21 @@ class SANDBOX_EXPORT SyscallSets {
static bool IsAsyncIo(int sysno);
static bool IsKeyManagement(int sysno);
#if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \
@@ -563,7 +454,7 @@ index 9be7b03..41b3605 100644
static bool IsSystemVMessageQueue(int sysno);
#endif
-@@ -117,6 +120,9 @@
+@@ -117,6 +120,9 @@ class SANDBOX_EXPORT SyscallSets {
static bool IsMipsPrivate(int sysno);
static bool IsMipsMisc(int sysno);
#endif // defined(__mips__)
@@ -573,11 +464,11 @@ index 9be7b03..41b3605 100644
static bool IsGoogle3Threading(int sysno);
};
-diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc
-index 02cbb04..9eb97f27 100644
---- a/sandbox/linux/seccomp-bpf/syscall.cc
-+++ b/sandbox/linux/seccomp-bpf/syscall.cc
-@@ -18,7 +18,7 @@
+Index: chromium-130.0.6723.58/sandbox/linux/seccomp-bpf/syscall.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/seccomp-bpf/syscall.cc
++++ chromium-130.0.6723.58/sandbox/linux/seccomp-bpf/syscall.cc
+@@ -23,7 +23,7 @@ namespace sandbox {
namespace {
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
@@ -586,7 +477,7 @@ index 02cbb04..9eb97f27 100644
// Number that's not currently used by any Linux kernel ABIs.
const int kInvalidSyscallNumber = 0x351d3;
#else
-@@ -308,6 +308,28 @@
+@@ -313,6 +313,28 @@ asm(// We need to be able to tell the ke
"2:ret\n"
".cfi_endproc\n"
".size SyscallAsm, .-SyscallAsm\n"
@@ -615,7 +506,7 @@ index 02cbb04..9eb97f27 100644
#endif
); // asm
-@@ -319,6 +341,10 @@
+@@ -324,6 +346,10 @@ intptr_t SyscallAsm(intptr_t nr, const i
extern "C" {
intptr_t SyscallAsm(intptr_t nr, const intptr_t args[8]);
}
@@ -626,7 +517,7 @@ index 02cbb04..9eb97f27 100644
#endif
} // namespace
-@@ -351,6 +377,10 @@
+@@ -356,6 +382,10 @@ intptr_t Syscall::Call(int nr,
// where that makes sense.
#if defined(__mips__)
const intptr_t args[8] = {p0, p1, p2, p3, p4, p5, p6, p7};
@@ -637,7 +528,7 @@ index 02cbb04..9eb97f27 100644
#else
DCHECK_EQ(p6, 0) << " Support for syscalls with more than six arguments not "
"added for this architecture";
-@@ -425,6 +455,8 @@
+@@ -430,6 +460,8 @@ intptr_t Syscall::Call(int nr,
ret = inout;
}
@@ -646,47 +537,24 @@ index 02cbb04..9eb97f27 100644
#else
#error "Unimplemented architecture"
#endif
-diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc
-index d466e62..a5ed98b7 100644
---- a/sandbox/linux/seccomp-bpf/trap.cc
-+++ b/sandbox/linux/seccomp-bpf/trap.cc
-@@ -216,6 +216,18 @@
- SECCOMP_PARM6(ctx),
- SECCOMP_PARM7(ctx),
- SECCOMP_PARM8(ctx));
-+#elif defined(__riscv)
-+ // RISC-V supports up to seven arguments for syscall.
-+ // However, seccomp bpf can filter only up to six arguments, so using seven
-+ // arguments has sense only when using UnsafeTrap() handler.
-+ rc = Syscall::Call(SECCOMP_SYSCALL(ctx),
-+ SECCOMP_PARM1(ctx),
-+ SECCOMP_PARM2(ctx),
-+ SECCOMP_PARM3(ctx),
-+ SECCOMP_PARM4(ctx),
-+ SECCOMP_PARM5(ctx),
-+ SECCOMP_PARM6(ctx),
-+ SECCOMP_PARM7(ctx));
- #else
- rc = Syscall::Call(SECCOMP_SYSCALL(ctx),
- SECCOMP_PARM1(ctx),
-diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc
-index a33597c..d4180ac 100644
---- a/sandbox/linux/services/credentials.cc
-+++ b/sandbox/linux/services/credentials.cc
-@@ -80,7 +80,7 @@
- pid_t pid = -1;
- alignas(16) char stack_buf[PTHREAD_STACK_MIN];
+Index: chromium-130.0.6723.58/sandbox/linux/services/credentials.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/services/credentials.cc
++++ chromium-130.0.6723.58/sandbox/linux/services/credentials.cc
+@@ -87,7 +87,7 @@ bool ChrootToSafeEmptyDir() {
+ alignas(16) char stack_buf[PTHREAD_STACK_MIN_CONST];
+
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
- defined(ARCH_CPU_MIPS_FAMILY)
+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_RISCV_FAMILY)
// The stack grows downward.
void* stack = stack_buf + sizeof(stack_buf);
#else
-diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc
-index 7650e98..bb4bd332 100644
---- a/sandbox/linux/services/syscall_wrappers.cc
-+++ b/sandbox/linux/services/syscall_wrappers.cc
-@@ -61,7 +61,7 @@
+Index: chromium-130.0.6723.58/sandbox/linux/services/syscall_wrappers.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/services/syscall_wrappers.cc
++++ chromium-130.0.6723.58/sandbox/linux/services/syscall_wrappers.cc
+@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
#if defined(ARCH_CPU_X86_64)
return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
#elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
@@ -695,11 +563,11 @@ index 7650e98..bb4bd332 100644
// CONFIG_CLONE_BACKWARDS defined.
return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
#endif
-diff --git a/sandbox/linux/syscall_broker/broker_process.cc b/sandbox/linux/syscall_broker/broker_process.cc
-index c6c1117..779065a 100644
---- a/sandbox/linux/syscall_broker/broker_process.cc
-+++ b/sandbox/linux/syscall_broker/broker_process.cc
-@@ -122,44 +122,46 @@
+Index: chromium-130.0.6723.58/sandbox/linux/syscall_broker/broker_process.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/syscall_broker/broker_process.cc
++++ chromium-130.0.6723.58/sandbox/linux/syscall_broker/broker_process.cc
+@@ -122,44 +122,46 @@ bool BrokerProcess::IsSyscallBrokerable(
// and are default disabled in Android. So, we should refuse to broker them
// to be consistent with the platform's restrictions.
switch (sysno) {
@@ -753,7 +621,7 @@ index c6c1117..779065a 100644
case __NR_stat:
case __NR_lstat:
#endif
-@@ -169,7 +171,7 @@
+@@ -169,7 +171,7 @@ bool BrokerProcess::IsSyscallBrokerable(
#if defined(__NR_fstatat64)
case __NR_fstatat64:
#endif
@@ -762,7 +630,7 @@ index c6c1117..779065a 100644
case __NR_newfstatat:
#endif
return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT);
-@@ -184,7 +186,7 @@
+@@ -184,7 +186,7 @@ bool BrokerProcess::IsSyscallBrokerable(
return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT);
#endif
@@ -771,10 +639,10 @@ index c6c1117..779065a 100644
case __NR_unlink:
return !fast_check || policy_->allowed_command_set.test(COMMAND_UNLINK);
#endif
-diff --git a/sandbox/linux/system_headers/linux_seccomp.h b/sandbox/linux/system_headers/linux_seccomp.h
-index 8690a96..dec2afc7 100644
---- a/sandbox/linux/system_headers/linux_seccomp.h
-+++ b/sandbox/linux/system_headers/linux_seccomp.h
+Index: chromium-130.0.6723.58/sandbox/linux/system_headers/linux_seccomp.h
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/system_headers/linux_seccomp.h
++++ chromium-130.0.6723.58/sandbox/linux/system_headers/linux_seccomp.h
@@ -39,6 +39,10 @@
#define EM_AARCH64 183
#endif
@@ -797,10 +665,10 @@ index 8690a96..dec2afc7 100644
// For prctl.h
#ifndef PR_SET_SECCOMP
#define PR_SET_SECCOMP 22
-diff --git a/sandbox/linux/system_headers/linux_signal.h b/sandbox/linux/system_headers/linux_signal.h
-index 69ccaf1..2ffe3097 100644
---- a/sandbox/linux/system_headers/linux_signal.h
-+++ b/sandbox/linux/system_headers/linux_signal.h
+Index: chromium-130.0.6723.58/sandbox/linux/system_headers/linux_signal.h
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/system_headers/linux_signal.h
++++ chromium-130.0.6723.58/sandbox/linux/system_headers/linux_signal.h
@@ -13,7 +13,7 @@
// (not undefined, but defined different values and in different memory
// layouts). So, fill the gap here.
@@ -810,11 +678,11 @@ index 69ccaf1..2ffe3097 100644
#define LINUX_SIGHUP 1
#define LINUX_SIGINT 2
-diff --git a/sandbox/linux/system_headers/linux_stat.h b/sandbox/linux/system_headers/linux_stat.h
-index 3aae8cb..74977adb 100644
---- a/sandbox/linux/system_headers/linux_stat.h
-+++ b/sandbox/linux/system_headers/linux_stat.h
-@@ -150,7 +150,7 @@
+Index: chromium-130.0.6723.58/sandbox/linux/system_headers/linux_stat.h
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/system_headers/linux_stat.h
++++ chromium-130.0.6723.58/sandbox/linux/system_headers/linux_stat.h
+@@ -150,7 +150,7 @@ struct kernel_stat {
int st_blocks;
int st_pad4[14];
};
@@ -823,10 +691,10 @@ index 3aae8cb..74977adb 100644
struct kernel_stat {
unsigned long st_dev;
unsigned long st_ino;
-diff --git a/sandbox/linux/system_headers/linux_syscalls.h b/sandbox/linux/system_headers/linux_syscalls.h
-index 438147b..d6de8c1 100644
---- a/sandbox/linux/system_headers/linux_syscalls.h
-+++ b/sandbox/linux/system_headers/linux_syscalls.h
+Index: chromium-130.0.6723.58/sandbox/linux/system_headers/linux_syscalls.h
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/linux/system_headers/linux_syscalls.h
++++ chromium-130.0.6723.58/sandbox/linux/system_headers/linux_syscalls.h
@@ -35,5 +35,9 @@
#include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
#endif
@@ -837,11 +705,10 @@ index 438147b..d6de8c1 100644
+
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
-diff --git a/sandbox/linux/system_headers/riscv64_linux_syscalls.h b/sandbox/linux/system_headers/riscv64_linux_syscalls.h
-new file mode 100644
-index 0000000..50e043d0
+Index: chromium-130.0.6723.58/sandbox/linux/system_headers/riscv64_linux_syscalls.h
+===================================================================
--- /dev/null
-+++ b/sandbox/linux/system_headers/riscv64_linux_syscalls.h
++++ chromium-130.0.6723.58/sandbox/linux/system_headers/riscv64_linux_syscalls.h
@@ -0,0 +1,1226 @@
+// Copyright 2014 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
@@ -2069,11 +1936,11 @@ index 0000000..50e043d0
+#endif
+
+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_RISCV64_LINUX_SYSCALLS_H_
-diff --git a/sandbox/policy/linux/bpf_cdm_policy_linux.cc b/sandbox/policy/linux/bpf_cdm_policy_linux.cc
-index 433720f..482ce1d 100644
---- a/sandbox/policy/linux/bpf_cdm_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_cdm_policy_linux.cc
-@@ -33,7 +33,7 @@
+Index: chromium-130.0.6723.58/sandbox/policy/linux/bpf_cdm_policy_linux.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/policy/linux/bpf_cdm_policy_linux.cc
++++ chromium-130.0.6723.58/sandbox/policy/linux/bpf_cdm_policy_linux.cc
+@@ -33,7 +33,7 @@ ResultExpr CdmProcessPolicy::EvaluateSys
case __NR_ftruncate:
case __NR_fallocate:
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -2082,11 +1949,11 @@ index 433720f..482ce1d 100644
case __NR_getrlimit:
#endif
#if defined(__i386__) || defined(__arm__)
-diff --git a/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc b/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
-index df2567f..41e158a 100644
---- a/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
-@@ -38,7 +38,7 @@
+Index: chromium-130.0.6723.58/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
++++ chromium-130.0.6723.58/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc
+@@ -38,7 +38,7 @@ ResultExpr CrosAmdGpuProcessPolicy::Eval
case __NR_sched_setscheduler:
case __NR_sysinfo:
case __NR_uname:
@@ -2095,11 +1962,11 @@ index df2567f..41e158a 100644
case __NR_readlink:
case __NR_stat:
#endif
-diff --git a/sandbox/policy/linux/bpf_gpu_policy_linux.cc b/sandbox/policy/linux/bpf_gpu_policy_linux.cc
-index 35ccbb7..65a0587 100644
---- a/sandbox/policy/linux/bpf_gpu_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_gpu_policy_linux.cc
-@@ -73,7 +73,7 @@
+Index: chromium-130.0.6723.58/sandbox/policy/linux/bpf_gpu_policy_linux.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/policy/linux/bpf_gpu_policy_linux.cc
++++ chromium-130.0.6723.58/sandbox/policy/linux/bpf_gpu_policy_linux.cc
+@@ -73,7 +73,7 @@ ResultExpr GpuProcessPolicy::EvaluateSys
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
case __NR_ftruncate64:
#endif
@@ -2108,11 +1975,11 @@ index 35ccbb7..65a0587 100644
case __NR_getdents:
#endif
case __NR_getdents64:
-diff --git a/sandbox/policy/linux/bpf_network_policy_linux.cc b/sandbox/policy/linux/bpf_network_policy_linux.cc
-index e5168ff0..3e6f821 100644
---- a/sandbox/policy/linux/bpf_network_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_network_policy_linux.cc
-@@ -260,7 +260,7 @@
+Index: chromium-130.0.6723.58/sandbox/policy/linux/bpf_network_policy_linux.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/policy/linux/bpf_network_policy_linux.cc
++++ chromium-130.0.6723.58/sandbox/policy/linux/bpf_network_policy_linux.cc
+@@ -260,7 +260,7 @@ ResultExpr NetworkProcessPolicy::Evaluat
case __NR_fdatasync:
case __NR_fsync:
case __NR_mremap:
@@ -2121,11 +1988,11 @@ index e5168ff0..3e6f821 100644
case __NR_getdents:
#endif
case __NR_getdents64:
-diff --git a/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc b/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc
-index bff338a..36acee52 100644
---- a/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc
-@@ -33,7 +33,7 @@
+Index: chromium-130.0.6723.58/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc
++++ chromium-130.0.6723.58/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc
+@@ -33,7 +33,7 @@ ResultExpr PrintCompositorProcessPolicy:
case __NR_fdatasync:
case __NR_fsync:
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -2134,11 +2001,11 @@ index bff338a..36acee52 100644
case __NR_getrlimit:
#endif
#if defined(__i386__) || defined(__arm__)
-diff --git a/sandbox/policy/linux/bpf_renderer_policy_linux.cc b/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-index 0555a85..8f8907f 100644
---- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc
-@@ -82,7 +82,7 @@
+Index: chromium-130.0.6723.58/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
++++ chromium-130.0.6723.58/sandbox/policy/linux/bpf_renderer_policy_linux.cc
+@@ -82,7 +82,7 @@ ResultExpr RendererProcessPolicy::Evalua
case __NR_ftruncate64:
#endif
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -2147,11 +2014,11 @@ index 0555a85..8f8907f 100644
case __NR_getrlimit:
case __NR_setrlimit:
// We allow setrlimit to dynamically adjust the address space limit as
-diff --git a/sandbox/policy/linux/bpf_service_policy_linux.cc b/sandbox/policy/linux/bpf_service_policy_linux.cc
-index 32754e6..3f42eabb 100644
---- a/sandbox/policy/linux/bpf_service_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_service_policy_linux.cc
-@@ -26,7 +26,7 @@
+Index: chromium-130.0.6723.58/sandbox/policy/linux/bpf_service_policy_linux.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/policy/linux/bpf_service_policy_linux.cc
++++ chromium-130.0.6723.58/sandbox/policy/linux/bpf_service_policy_linux.cc
+@@ -26,7 +26,7 @@ ResultExpr ServiceProcessPolicy::Evaluat
return RestrictIoctl();
// Allow the system calls below.
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
@@ -2160,11 +2027,11 @@ index 32754e6..3f42eabb 100644
case __NR_getrlimit:
#endif
#if defined(__i386__) || defined(__arm__)
-diff --git a/sandbox/policy/linux/bpf_utility_policy_linux.cc b/sandbox/policy/linux/bpf_utility_policy_linux.cc
-index e299ce99..ed110689 100644
---- a/sandbox/policy/linux/bpf_utility_policy_linux.cc
-+++ b/sandbox/policy/linux/bpf_utility_policy_linux.cc
-@@ -34,7 +34,7 @@
+Index: chromium-130.0.6723.58/sandbox/policy/linux/bpf_utility_policy_linux.cc
+===================================================================
+--- chromium-130.0.6723.58.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc
++++ chromium-130.0.6723.58/sandbox/policy/linux/bpf_utility_policy_linux.cc
+@@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat
case __NR_fdatasync:
case __NR_fsync:
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
diff --git a/www-client/chromium/files/riscv.patch b/www-client/chromium/files/riscv.patch
index f72a56c..3bd59e3 100644
--- a/www-client/chromium/files/riscv.patch
+++ b/www-client/chromium/files/riscv.patch
@@ -1,7 +1,16 @@
-diff -Naur a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
---- a/build/config/clang/BUILD.gn 2024-02-14 22:02:58.133536045 +0000
-+++ b/build/config/clang/BUILD.gn 2024-02-14 22:04:35.885744794 +0000
-@@ -136,6 +136,8 @@
+--- a/build/config/clang/BUILD.gn 2024-09-17 09:40:39.225707556 +0200
++++ b/build/config/clang/BUILD.gn 2024-09-17 09:42:35.703531635 +0200
+@@ -186,6 +186,9 @@
+ } else if (current_cpu == "arm64") {
+ _dir = "aarch64-unknown-linux-gnu"
+ _suffix = "-aarch64"
++ } else if (current_cpu == "riscv64") {
++ _dir = "riscv64-unknown-linux-gnu"
++ _suffix = "-riscv64"
+ } else {
+ assert(false) # Unhandled cpu type
+ }
+@@ -201,6 +201,8 @@
_dir = "armv7-unknown-linux-gnueabihf"
} else if (current_cpu == "arm64") {
_dir = "aarch64-unknown-linux-gnu"
@@ -10,3 +19,5 @@ diff -Naur a/build/config/clang/BUILD.gn b/build/config/clang/BUILD.gn
} else {
assert(false) # Unhandled cpu type
}
+
+
next reply other threads:[~2025-01-15 23:27 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-15 23:27 Jakov Smolić [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-07-15 20:37 [gentoo-commits] proj/riscv:master commit in: www-client/chromium/files/, www-client/chromium/ Jakov Smolić
2025-04-15 14:44 Jakov Smolić
2025-04-06 20:32 Jakov Smolić
2025-02-13 8:53 Jakov Smolić
2025-01-28 11:21 Yixun Lan
2024-06-25 23:55 Yixun Lan
2024-04-12 4:09 Yixun Lan
2024-04-12 4:09 Yixun Lan
2021-12-14 9:25 Yixun Lan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1736983637.a3497033fa3db7d2cce42faed6474c4cae0d782f.jsmolic@gentoo \
--to=jsmolic@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox