diff options
author | Andrew Cameron <apcameron@gmail.com> | 2024-08-28 23:07:54 +0100 |
---|---|---|
committer | Florian Schmaus <flow@gentoo.org> | 2024-09-01 22:38:40 +0200 |
commit | 70b14d233c252aa1c782f69d963bf2e64e48411c (patch) | |
tree | 1bbbaa7ddc69d8fd56665d40efacf045de41b70a | |
parent | Update Chromium to 126.0.6478.126 (diff) | |
download | riscv-70b14d233c252aa1c782f69d963bf2e64e48411c.tar.gz riscv-70b14d233c252aa1c782f69d963bf2e64e48411c.tar.bz2 riscv-70b14d233c252aa1c782f69d963bf2e64e48411c.zip |
Update Chromium to 128.0.6613.84
Tested on my VisionFive 2
Signed-off-by: Andrew Cameron <apcameron@gmail.com>
Signed-off-by: Florian Schmaus <flow@gentoo.org>
18 files changed, 5491 insertions, 4013 deletions
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 05a552b..5958dbd 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -1,9 +1,12 @@ -DIST chromium-126-clang.tar.xz 50615992 BLAKE2B 293709399ddf343ba195cec452974178228ebb72921931ad58136351956b881f8dc0bc8ca740252bcd4971701c9ee8ccc0a33648aee25a5b1cece56e0af6b83f SHA512 7bb2938b1df452585d0ee93da3bcf9c3e64e88e39059a713fe21758df670190b12ca002ef2764dc99efdb4284b4c4b7cde861e2e495d99956c21120a51b8c3dc -DIST chromium-126-rust.tar.xz 150643432 BLAKE2B d9c827008a2fae07977628beccdf3cf4e5d9bf3c9728e4b2839c8bc86ee2f87844921064e30c067a1b620a3d53cbf54a74053172b1436239332fc668f772924d SHA512 431c0305a81e59da231d56f1b119226b661d7f5a93d0da92afbfc384b0e5be28f282c2911137983298a5369c93b60184d41875ec63b47048a782ee2b1301fc77 -DIST chromium-126.0.6478.114.tar.xz 4167281776 BLAKE2B 4ca720b0280dc6f0aafb5da5d31f97d8d55faec9ac187fc7f3e16e447d147a6912b2b8f26247503390755146e42b32458e4c71a80e6a132cc456f414454ecf53 SHA512 49ca506eb7ac52cdfb5b491bff10deec46d62686feeb3392803eecd61a570ce6c9e6c97d61c79907aaaee39b6d32a4da399c92b8078dbdf2df097f37c757d286 -DIST chromium-126.0.6478.126.tar.xz 4166142564 BLAKE2B 4c709c3a02a01f6bef46309b4a2f3d8cd688007e6b69152a5119a098c98aa272e10ea1ebf418c75387d08e1b9dde75ad53eabc12cf860b288e732c9b974e6066 SHA512 4a86edb82ec530299f8298b7604a18efb5ccf6a6cde37950d7821a73b005b9e83805a0b7f36f2fa5b4f71e237bf70ec628c1864e4f81caa4333a5dc904fb3aab -DIST chromium-patches-126.tar.bz2 4538 BLAKE2B c1f224015618ec908ef09d0c04a2243923371e2caeccd60d93747599fd1434b284291a5b4326008db21749cf78827d5a4b50d22fc805dcd3c1fd86303dc82729 SHA512 6692075adac0379b5f27d1023de1a051cf7f7f7138efd32dfc3af0d501b714142a16daf18022bb46d92218587f364f4dafe9f4aea24f6826e88b0e7cc2be7d0b +DIST chromium-127-clang.tar.xz 50869256 BLAKE2B a25c78c28e1a19bb251ce78831ff8aeea51f0ff0a3fcba4f57e14e676aadba38f248554a52d9f67da8c0ccf533ef9f60b4bbb26f8935914efa2b871444e61d8f SHA512 9033c2dd7dd217917caf3dbed52f72ded18fe81b431edd4ef82fe7c592f7b9fbf6d5d2c8f7ba4ebffb4994bef20579d30aea9dd1ad36db86bec5d0adb6eca062 +DIST chromium-127-rust.tar.xz 151082700 BLAKE2B 53b5e72724425ae97bbb22e128ca5e826a2db5fb49f615c5331cdf6d790c253d58061223ff9fbd7f4deecaa19668e7b905b0a661380f48ce74d7f66a9605be18 SHA512 a47fc0bdbf48da9c8c17c91d9dc1a4a3f09578e82199c0d5843dfb6188803161cdb98d065ee3f85ceaf78efd2c233397c325c4c9f2d19255f38734a81599404b +DIST chromium-127.0.6533.119.tar.xz 6621220264 BLAKE2B fdbf51920d3fee096420cb43aee34f2e6cd51f5531829a68bb61003e4607934d2d045fcd6dbe0c35bd433b000bcefc92919da404666d8e304054d9846dafd943 SHA512 9b774d1798ef76264d60ab46cf552fdec54d325ad1010573084c7c132c47319af63d8127fb9e42441412ac365efa57c25ac80963b644b558595b3d5bfad21e9c +DIST chromium-127.0.6533.99.tar.xz 6618098428 BLAKE2B 6a89e4ff8edcda31d8c04ae846c2869a96157b1b07c59614fe5f8fedba1699bc3b4d53adc9c94a0170d3288d8c9282348e275090848fc92a4c06b2e04104248b SHA512 e851e34c0f0b240fa08e60c0cb4373aead7656187bab7fd0dea5bad7cfc6b4ffe38b43f108f20528a508023cdd437b392b5c2ca09a1b1f5f21ba83d4fa88fd99 +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.84.tar.xz 6703104636 BLAKE2B b31f3ebe4cbbbc281e7b336c965ae96237b0a8653a1e8cb6a9ffe6a06e0c6b559489aa6fb0e5a3080ca3e48ea4281fbc6a075cbe398fad74482348e72f0e729b SHA512 58caeff2eb18101eabf8c411a52e723679c99c2a1c83316a7ad908ae0f4db6b433c59865b758b5d73b56dd7cf215029c492aa2e6217f1730ac5f7a99b1ecce65 +DIST chromium-patches-127-1.tar.bz2 4907 BLAKE2B 3d8599c4c75a0993f6627e4570e5059c5cc5036b2f7916685ca75742f483af8c07f22d5ac8a594a64a92bffe0262fd75c2e3417639197558a5bd3da909ac2c65 SHA512 a75a42d5c5c54fd6e53469a229f0f5382eb3108ffa6e7c503ec03fa7e5e8e470291981373e039ff8d7326ab420ad894d7d3cd8a918921438376924f7aa125924 +DIST chromium-patches-128.tar.bz2 5087 BLAKE2B b0321fb45390a282afeeeb8fb4d6014d6e6b708e6851235e0897ac77d524160b4d33476aa70532df45d0ccf233fee3b4028cd4d845667dc6a2a46ecebfeb6752 SHA512 978908d27dc6fc620209486a9ad7f73babde8710728960f44f2680445276516e59a85c08656af2663d9e197df45874f24a1f19f14a21798fbcf7c5a10bb19371 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_126.0.6478.114-1raptor0~deb12u1.debian.tar.xz 613488 BLAKE2B ecdf33e0ced01d540b7f1e599df6655055afd8f72b22a92c600205d1b02176be76140a5bfa550e62e4a0e4f03c68992eb480d9ba4a256b3f8b48b525a8ce7400 SHA512 53ea7f89dac5c42ca991f40f2a5515393cb74334a27df72b944552d5a557f6c53b0dac9c89cfb99918fd502396bc80a677a87533f48552af9f7fd440b7b8b2cc -DIST chromium_126.0.6478.56-1raptor0~deb12u2.debian.tar.xz 613448 BLAKE2B 35af65461a5132ac7a28e004f3b8a5e1afc10924726154dd47a23371ebe5508765e0bfd3c1b1d56ff5671039b522536fa21ec22dcb9f14426929a5905976e8a0 SHA512 870b864620e48e6aefa2b36026553b06dde0afc8e8de6cbaf0e4db2333d02164a95fa5f243066e026aa3dff4b3a7366853f49c02f607dec36cec77e4b4683736 +DIST chromium_127.0.6533.88-1raptor0~deb12u2.debian.tar.xz 8675684 BLAKE2B 868de8a681496c5da5aa9ebb8d27c84b35313038da85232c89d58f6ab7a4ac15866e8d0650d5283023aa38ab55da93f3b6a97280afdd1a3cf69a021517bfa8ab SHA512 3afea47fedad9c1374b238028ea642cde603f548af9992fdcff836745cf8c4243d0781f56e8710ca1bb22b0a552944c62a67a4799f8073fbe309d0f5a514c724 diff --git a/www-client/chromium/chromium-126.0.6478.126.ebuild b/www-client/chromium/chromium-127.0.6533.119.ebuild index 83df69b..3054e83 100644 --- a/www-client/chromium/chromium-126.0.6478.126.ebuild +++ b/www-client/chromium/chromium-127.0.6533.119.ebuild @@ -3,9 +3,6 @@ EAPI=8 -PYTHON_COMPAT=( python3_{11..13} ) -PYTHON_REQ_USE="xml(+)" - # PACKAGING NOTES # Google roll their bundled Clang every two weeks, and the bundled Rust @@ -13,14 +10,7 @@ PYTHON_REQ_USE="xml(+)" # 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 try and avoid forcing the use of the custom/bundled libcxx, but sometimes -# it is unavoidable. Remember to force the use of Clang when this is forced. - -# GCC is _not_ supported upstream, though patches are welcome. We do our -# best to enable builds with GCC but reserve the right to force Clang -# builds if we can't keep up with upstream's changes. Please comment -# when forcing Clang builds so we can track the need for it. +# 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. @@ -34,26 +24,11 @@ PYTHON_REQ_USE="xml(+)" # 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. -# These variables let us easily bound supported major dependency versions in one place. -GCC_MIN_VER=12 GN_MIN_VER=0.2165 -# Since Google use prerelease llvm we can let any adventurous users try to build with prerelease -# ebuilds; try to keep this up to date with the latest version in the tree. -LLVM_MAX_SLOT=19 -LLVM_MIN_SLOT=17 -RUST_MIN_VER=1.72.0 +RUST_MIN_VER=1.78.0 # chromium-tools/get-chromium-toolchain-strings.sh -GOOGLE_CLANG_VER=llvmorg-19-init-9433-g76ea5feb-1 -GOOGLE_RUST_VER=31e6e8c6c5b6ce62656c922c7384d3376018c980-2 - -# https://bugs.chromium.org/p/v8/issues/detail?id=14449 - V8 used in 120 can't build with GCC -# Resolved upstream, requires testing and some backporting I'm sure -: ${CHROMIUM_FORCE_CLANG=yes} -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 - Chromium 120: -# webrtc - no matching member function for call to 'emplace' -: ${CHROMIUM_FORCE_LIBCXX=yes} -# 121's 'gcc_link_wrapper.py' currently fails if not using lld due to the addition of rust -: ${CHROMIUM_FORCE_LLD=yes} +GOOGLE_CLANG_VER=llvmorg-19-init-10646-g084e2b53-57 +GOOGLE_RUST_VER=32dd3795bce8b347fda786529cf5e42a813e0b7d-2 : ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no} @@ -63,13 +38,20 @@ 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" -inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils +# 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="126.0.6478.114-1raptor0~deb12u1" -PATCH_V="${PV%%\.*}" +PATCHSET_PPC64="127.0.6533.88-1raptor0~deb12u2" +PATCH_V="${PV%%\.*}-1" 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 @@ -77,7 +59,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? ( @@ -88,9 +70,9 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0/stable" -KEYWORDS="~amd64 arm64 ~ppc64 ~riscv" +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 libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio" +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 )" @@ -99,7 +81,6 @@ REQUIRED_USE=" pgo? ( X !wayland ) qt6? ( qt5 ) screencast? ( wayland ) - !system-toolchain? ( libcxx ) ffmpeg-chromium? ( bindist proprietary-codecs ) " @@ -116,7 +97,7 @@ COMMON_X_DEPEND=" " COMMON_SNAPSHOT_DEPEND=" - system-icu? ( >=dev-libs/icu-71.1:= ) + system-icu? ( >=dev-libs/icu-73.0:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= @@ -140,9 +121,10 @@ COMMON_SNAPSHOT_DEPEND=" kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( + x11-base/xorg-proto:= x11-libs/libX11:= - x11-libs/libXext:= x11-libs/libxcb:= + x11-libs/libXext:= ) x11-libs/libxkbcommon:= wayland? ( @@ -204,27 +186,22 @@ 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] )" } -# When passed multiple arguments we assume that -# we want a range of versions, inclusive. +# Parse LLVM_COMPAT and generate a usedep for each version depend_clang_llvm_versions() { - local _v - if [[ $# -eq 1 ]]; then - depend_clang_llvm_version "$1" - elif [[ $# -eq 2 ]]; then - if [[ $1 -eq $2 ]]; then - depend_clang_llvm_version "$1" - fi + if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then + depend_clang_llvm_version ${#LLVM_COMPAT[0]} + else echo "|| (" - for ((i=$1; i<=$2; i++)); do + for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do echo "(" - depend_clang_llvm_version "${i}" + depend_clang_llvm_version ${LLVM_COMPAT[i]} echo ")" done echo ")" - else - die "depend_clang_llvm_versions() requires 1 or 2 arguments" fi } @@ -240,14 +217,12 @@ BDEPEND=" qt6? ( dev-qt/qtbase:6 ) ) system-toolchain? ( - libcxx? ( >=sys-devel/clang-${LLVM_MIN_SLOT} ) - lto? ( $(depend_clang_llvm_versions ${LLVM_MIN_SLOT} ${LLVM_MAX_SLOT}) ) + $(depend_clang_llvm_versions) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 - $(depend_clang_llvm_versions ${LLVM_MIN_SLOT} ${LLVM_MAX_SLOT}) ) - >=virtual/rust-${RUST_MIN_VER}[profiler(-)] + >=dev-util/bindgen-0.68.0 ) >=dev-build/gn-${GN_MIN_VER} dev-build/ninja @@ -260,17 +235,6 @@ BDEPEND=" virtual/pkgconfig " -if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then - BDEPEND+="system-toolchain? ( >=sys-devel/clang-${LLVM_MIN_SLOT} ) " -fi - -if [[ ${CHROMIUM_FORCE_LLD} == yes ]]; then - BDEPEND+="system-toolchain? ( >=sys-devel/lld-${LLVM_MIN_SLOT} ) " -else - # #918897: Hack for arm64 - BDEPEND+=" arm64? ( >=sys-devel/lld-${LLVM_MIN_SLOT} )" -fi - if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; fi @@ -308,39 +272,15 @@ python_check_deps() { python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" } -needs_clang() { - [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo -} - -needs_lld() { - # #641556: Force lld for lto and pgo builds, otherwise disable - # #918897: Temporary hack w/ use arm64 - [[ ${CHROMIUM_FORCE_LLD} == yes ]] || use lto || use pgo || use arm64 -} - -llvm_check_deps() { - if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then - einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then - einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2 -} - 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=22 + local BASE_DISK=24 local EXTRA_DISK=1 local CHECKREQS_MEMORY="4G" tc-is-cross-compiler && EXTRA_DISK=2 - if use lto || use pgo; then + if tc-is-lto || use pgo; then CHECKREQS_MEMORY="9G" tc-is-cross-compiler && EXTRA_DISK=4 use pgo && EXTRA_DISK=8 @@ -373,35 +313,139 @@ 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 +} + +# https://github.com/gentoo/gentoo/pull/28355 +chromium_tc-ld-is-mold() { + local out + + # Ensure ld output is in English. + local -x LC_ALL=C + + # First check the linker directly. + out=$($(tc-getLD "$@") --version 2>&1) + if [[ ${out} == *"mold"* ]] ; then + return 0 + fi + + # Then see if they're selecting mold via compiler flags. + # Note: We're assuming they're using LDFLAGS to hold the + # options and not CFLAGS/CXXFLAGS. + local base="${T}/test-tc-linker" + cat <<-EOF > "${base}.c" + int main(void) { return 0; } + EOF + out=$($(tc-getCC "$@") ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} -Wl,--version "${base}.c" -o "${base}" 2>&1) + rm -f "${base}"* + if [[ ${out} == *"mold"* ]] ; then + return 0 + fi + + # No mold here! + return 1 +} + 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 - local -x CPP="$(tc-getCXX) -E" - if tc-is-gcc && ! ver_test "$(gcc-version)" -ge ${GCC_MIN_VER}; then - die "At least gcc ${GCC_MIN_VER} is required" + # 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 - if use pgo && tc-is-cross-compiler; then - die "The pgo USE flag cannot be used when cross-compiling" + + # 936858 + if chromium_tc-ld-is-mold; then + eerror "Your toolchain is using the mold linker." + eerror "This is not supported by Chromium." + die "Please switch to a different linker." fi - if needs_clang && ! tc-is-clang; then - if tc-is-cross-compiler; then - CPP="${CBUILD}-clang++ -E" - else - CPP="${CHOST}-clang++ -E" - 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 - if needs_clang || tc-is-clang; then - if ver_test "$(clang-major-version)" -lt ${LLVM_MIN_SLOT}; then - die "At least Clang ${LLVM_MIN_SLOT} is required" - fi - # Ideally we never see this, but it should help prevent bugs like 927154 - if ver_test "$(clang-major-version)" -gt ${LLVM_MAX_SLOT}; then - die "Clang $(clang-major-version) is too new; ${LLVM_MAX_SLOT} is the highest supported version" - 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 @@ -412,6 +456,30 @@ pkg_setup() { 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 @@ -422,22 +490,29 @@ src_prepare() { "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-125-system-zstd.patch" "${FILESDIR}/chromium-126-oauth2-client-switches.patch" - "${FILESDIR}/chromium-cross-compile.patch" + "${FILESDIR}/chromium-127-browser-ui-deps.patch" + "${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch" + "${FILESDIR}/chromium-127-updater-systemd.patch" "${FILESDIR}/swiftshader-MCDissassembler.patch" - "${FILESDIR}/swiftshader-use-llvm16.patch" - "${FILESDIR}/fix-rust-target.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}/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" ) + # 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}" ) @@ -469,7 +544,7 @@ src_prepare() { default - mkdir -p third_party/node/linux/node-linux-x64/bin || die + 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 @@ -482,7 +557,6 @@ src_prepare() { base/third_party/nspr base/third_party/superfasthash base/third_party/symbolize - base/third_party/valgrind base/third_party/xdg_user_dirs buildtools/third_party/libc++ buildtools/third_party/libc++abi @@ -501,8 +575,8 @@ src_prepare() { third_party/anonymous_tokens third_party/apple_apsl third_party/axe-core - third_party/blink third_party/bidimapper + third_party/blink third_party/boringssl third_party/boringssl/src/third_party/fiat third_party/breakpad @@ -527,6 +601,7 @@ src_prepare() { 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 @@ -558,6 +633,7 @@ src_prepare() { 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 @@ -572,15 +648,12 @@ src_prepare() { third_party/freetype third_party/fusejs third_party/fxdiv - third_party/highway - third_party/liburlpattern - third_party/libzip - third_party/lit 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 @@ -598,6 +671,7 @@ src_prepare() { 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 @@ -606,6 +680,7 @@ src_prepare() { 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 @@ -614,13 +689,12 @@ src_prepare() { 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/maldoca - third_party/maldoca/src/third_party/tensorflow_protos - third_party/maldoca/src/third_party/zlibwrapper third_party/markupsafe third_party/material_color_utilities third_party/mesa @@ -647,11 +721,12 @@ src_prepare() { 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-join-and-compute third_party/private_membership + third_party/private-join-and-compute third_party/protobuf third_party/pthreadpool third_party/puffin @@ -661,6 +736,7 @@ src_prepare() { third_party/re2 third_party/rnnoise third_party/rust + third_party/ruy third_party/s2cellid third_party/securemessage third_party/selenium-atoms @@ -668,19 +744,22 @@ src_prepare() { 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/subzero 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 @@ -688,8 +767,6 @@ src_prepare() { 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/ruy - third_party/six third_party/ukey2 third_party/unrar third_party/utf @@ -711,12 +788,12 @@ src_prepare() { third_party/x11proto third_party/xcbproto third_party/xnnpack - third_party/zxcvbn-cpp third_party/zlib/google + third_party/zxcvbn-cpp url/third_party/mozilla v8/src/third_party/siphash - v8/src/third_party/valgrind v8/src/third_party/utf8-decoder + v8/src/third_party/valgrind v8/third_party/glibc v8/third_party/inspector_protocol v8/third_party/v8 @@ -744,10 +821,6 @@ src_prepare() { keeplibs+=( third_party/zstd ) fi - if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then - keeplibs+=( third_party/libc++ ) - fi - if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then keeplibs+=( third_party/llvm ) fi @@ -756,9 +829,9 @@ src_prepare() { 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 + 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 @@ -788,70 +861,32 @@ src_prepare() { ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die } -chromium_rust_version_check() { - [[ ${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 -} - chromium_configure() { # Calling this here supports resumption via FEATURES=keepwork python_setup local myconf_gn="" - if use system-toolchain && [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == no ]]; then - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - if needs_clang && ! tc-is-clang; then - # Force clang since gcc is either broken or build is using libcxx. - if tc-is-cross-compiler; then - CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}" - CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}" - BUILD_CC=${CBUILD}-clang - BUILD_CXX=${CBUILD}-clang++ - else - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - fi - strip-unsupported-flags + # 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 - if tc-is-clang; then - myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" - # Workaround for build failure with clang-18 and -march=native without - # avx512. Does not affect e.g. -march=skylake, only native (bug #931623). - use amd64 && is-flagq -march=native && - [[ $(clang-major-version) -eq 18 ]] && [[ $(clang-minor-version) -lt 6 ]] && - tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} && - append-flags -mevex512 - else - myconf_gn+=" is_clang=false" - fi + strip-unsupported-flags - if needs_lld ; then - # https://bugs.gentoo.org/918897#c32 - append-ldflags -Wl,--undefined-version - myconf_gn+=" use_lld=true" - else - # This doesn't prevent lld from being used, but rather prevents gn from forcing it - myconf_gn+=" use_lld=false" - fi + 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" - if use lto; then - AR=llvm-ar - NM=llvm-nm - if tc-is-cross-compiler; then - BUILD_AR=llvm-ar - BUILD_NM=llvm-nm - fi - fi + # 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\"" @@ -875,15 +910,23 @@ chromium_configure() { myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" fi - local rustc_ver - rustc_ver=$(chromium_rust_version_check) - 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 + # 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 @@ -973,20 +1016,13 @@ chromium_configure() { # Chromium builds provided by Linux distros) should disable the testing config myconf_gn+=" disable_fieldtrial_testing_config=true" - if use system-toolchain; then - myconf_gn+=" use_gold=false" - fi - # The sysroot is the oldest debian image that chromium supports, we don't need it myconf_gn+=" use_sysroot=false" - # This determines whether or not GN uses the bundled libcxx - # default: true - if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then - myconf_gn+=" use_custom_libcxx=true" - else - myconf_gn+=" use_custom_libcxx=false" - fi + # 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" @@ -1034,13 +1070,6 @@ chromium_configure() { 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 - - if tc-is-gcc; then - # https://bugs.gentoo.org/904455 - local -x CPP="$(tc-getCXX) -E" - # https://bugs.gentoo.org/912381 - filter-lto - fi fi if [[ $myarch = amd64 ]] ; then @@ -1052,18 +1081,14 @@ chromium_configure() { 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 + elif [[ $myarch = riscv ]] ; then + myconf_gn+=" target_cpu=\"riscv64\"" + ffmpeg_target_arch=riscv64 else die "Failed to determine target arch, got '$myarch'." fi - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. myconf_gn+=" treat_warnings_as_errors=false" - # Disable fatal linker warnings, bug 506268. myconf_gn+=" fatal_linker_warnings=false" @@ -1085,13 +1110,12 @@ chromium_configure() { # https://bugs.gentoo.org/654216 addpredict /dev/dri/ #nowarn - # Disable unknown warning message from clang. - if tc-is-clang; then - append-flags -Wno-unknown-warning-option - if tc-is-cross-compiler; then + # 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 fi # Explicitly disable ICU data file support for system-icu/headless builds. @@ -1152,15 +1176,25 @@ chromium_configure() { 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)" - myconf_gn+=" use_thin_lto=$(usex lto true false)" - myconf_gn+=" thin_lto_enable_optimizations=$(usex lto 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 - # Disable CFI: unsupported for GCC, requires clang+lto+lld + # 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" @@ -1176,12 +1210,6 @@ chromium_configure() { myconf_gn+=" chrome_pgo_phase=0" fi - # user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639 - if use arm64 && tc-is-gcc; then - sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \ - third_party/crc32c/src/src/crc32c_arm64.cc || die - fi - # skipping typecheck is only supported on amd64, bug #876157 if ! use amd64; then myconf_gn+=" devtools_skip_typecheck=false" diff --git a/www-client/chromium/chromium-126.0.6478.114.ebuild b/www-client/chromium/chromium-128.0.6613.84.ebuild index 6416959..9cf78ae 100644 --- a/www-client/chromium/chromium-126.0.6478.114.ebuild +++ b/www-client/chromium/chromium-128.0.6613.84.ebuild @@ -3,9 +3,6 @@ EAPI=8 -PYTHON_COMPAT=( python3_{11..13} ) -PYTHON_REQ_USE="xml(+)" - # PACKAGING NOTES # Google roll their bundled Clang every two weeks, and the bundled Rust @@ -13,14 +10,7 @@ PYTHON_REQ_USE="xml(+)" # 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 try and avoid forcing the use of the custom/bundled libcxx, but sometimes -# it is unavoidable. Remember to force the use of Clang when this is forced. - -# GCC is _not_ supported upstream, though patches are welcome. We do our -# best to enable builds with GCC but reserve the right to force Clang -# builds if we can't keep up with upstream's changes. Please comment -# when forcing Clang builds so we can track the need for it. +# 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. @@ -34,26 +24,11 @@ PYTHON_REQ_USE="xml(+)" # 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. -# These variables let us easily bound supported major dependency versions in one place. -GCC_MIN_VER=12 GN_MIN_VER=0.2165 -# Since Google use prerelease llvm we can let any adventurous users try to build with prerelease -# ebuilds; try to keep this up to date with the latest version in the tree. -LLVM_MAX_SLOT=19 -LLVM_MIN_SLOT=17 -RUST_MIN_VER=1.72.0 +RUST_MIN_VER=1.78.0 # chromium-tools/get-chromium-toolchain-strings.sh -GOOGLE_CLANG_VER=llvmorg-19-init-9433-g76ea5feb-1 -GOOGLE_RUST_VER=31e6e8c6c5b6ce62656c922c7384d3376018c980-2 - -# https://bugs.chromium.org/p/v8/issues/detail?id=14449 - V8 used in 120 can't build with GCC -# Resolved upstream, requires testing and some backporting I'm sure -: ${CHROMIUM_FORCE_CLANG=yes} -# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=101227 - Chromium 120: -# webrtc - no matching member function for call to 'emplace' -: ${CHROMIUM_FORCE_LIBCXX=yes} -# 121's 'gcc_link_wrapper.py' currently fails if not using lld due to the addition of rust -: ${CHROMIUM_FORCE_LLD=yes} +GOOGLE_CLANG_VER=llvmorg-19-init-14561-gecea8371-3000 +GOOGLE_RUST_VER=3cf924b934322fd7b514600a7dc84fc517515346-3 : ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN=no} @@ -63,12 +38,19 @@ 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" -inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils +# 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="126.0.6478.56-1raptor0~deb12u2" +PATCHSET_PPC64="127.0.6533.88-1raptor0~deb12u2" PATCH_V="${PV%%\.*}" SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz system-toolchain? ( @@ -77,7 +59,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? ( @@ -88,9 +70,9 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P} LICENSE="BSD" SLOT="0/stable" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv" +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 libcxx lto +official pax-kernel pgo +proprietary-codecs pulseaudio" +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 )" @@ -99,7 +81,6 @@ REQUIRED_USE=" pgo? ( X !wayland ) qt6? ( qt5 ) screencast? ( wayland ) - !system-toolchain? ( libcxx ) ffmpeg-chromium? ( bindist proprietary-codecs ) " @@ -116,7 +97,7 @@ COMMON_X_DEPEND=" " COMMON_SNAPSHOT_DEPEND=" - system-icu? ( >=dev-libs/icu-71.1:= ) + system-icu? ( >=dev-libs/icu-73.0:= ) >=dev-libs/libxml2-2.12.4:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= @@ -140,9 +121,10 @@ COMMON_SNAPSHOT_DEPEND=" kerberos? ( virtual/krb5 ) vaapi? ( >=media-libs/libva-2.7:=[X?,wayland?] ) X? ( + x11-base/xorg-proto:= x11-libs/libX11:= - x11-libs/libXext:= x11-libs/libxcb:= + x11-libs/libXext:= ) x11-libs/libxkbcommon:= wayland? ( @@ -204,27 +186,22 @@ 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] )" } -# When passed multiple arguments we assume that -# we want a range of versions, inclusive. +# Parse LLVM_COMPAT and generate a usedep for each version depend_clang_llvm_versions() { - local _v - if [[ $# -eq 1 ]]; then - depend_clang_llvm_version "$1" - elif [[ $# -eq 2 ]]; then - if [[ $1 -eq $2 ]]; then - depend_clang_llvm_version "$1" - fi + if [[ ${#LLVM_COMPAT[@]} -eq 0 ]]; then + depend_clang_llvm_version ${#LLVM_COMPAT[0]} + else echo "|| (" - for ((i=$1; i<=$2; i++)); do + for (( i=${#LLVM_COMPAT[@]}-1 ; i>=0 ; i-- )); do echo "(" - depend_clang_llvm_version "${i}" + depend_clang_llvm_version ${LLVM_COMPAT[i]} echo ")" done echo ")" - else - die "depend_clang_llvm_versions() requires 1 or 2 arguments" fi } @@ -240,14 +217,12 @@ BDEPEND=" qt6? ( dev-qt/qtbase:6 ) ) system-toolchain? ( - libcxx? ( >=sys-devel/clang-${LLVM_MIN_SLOT} ) - lto? ( $(depend_clang_llvm_versions ${LLVM_MIN_SLOT} ${LLVM_MAX_SLOT}) ) + $(depend_clang_llvm_versions) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 - $(depend_clang_llvm_versions ${LLVM_MIN_SLOT} ${LLVM_MAX_SLOT}) ) - >=virtual/rust-${RUST_MIN_VER}[profiler(-)] + >=dev-util/bindgen-0.68.0 ) >=dev-build/gn-${GN_MIN_VER} dev-build/ninja @@ -260,17 +235,6 @@ BDEPEND=" virtual/pkgconfig " -if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then - BDEPEND+="system-toolchain? ( >=sys-devel/clang-${LLVM_MIN_SLOT} ) " -fi - -if [[ ${CHROMIUM_FORCE_LLD} == yes ]]; then - BDEPEND+="system-toolchain? ( >=sys-devel/lld-${LLVM_MIN_SLOT} ) " -else - # #918897: Hack for arm64 - BDEPEND+=" arm64? ( >=sys-devel/lld-${LLVM_MIN_SLOT} )" -fi - if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then EBUILD_DEATH_HOOKS+=" chromium_pkg_die"; fi @@ -308,39 +272,15 @@ python_check_deps() { python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" } -needs_clang() { - [[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo -} - -needs_lld() { - # #641556: Force lld for lto and pgo builds, otherwise disable - # #918897: Temporary hack w/ use arm64 - [[ ${CHROMIUM_FORCE_LLD} == yes ]] || use lto || use pgo || use arm64 -} - -llvm_check_deps() { - if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then - einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - if ( use lto || use pgo ) && ! has_version -b "=sys-devel/lld-${LLVM_SLOT}*" ; then - einfo "=sys-devel/lld-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2 - return 1 - fi - - einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2 -} - 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=22 + local BASE_DISK=24 local EXTRA_DISK=1 local CHECKREQS_MEMORY="4G" tc-is-cross-compiler && EXTRA_DISK=2 - if use lto || use pgo; then + if tc-is-lto || use pgo; then CHECKREQS_MEMORY="9G" tc-is-cross-compiler && EXTRA_DISK=4 use pgo && EXTRA_DISK=8 @@ -373,35 +313,109 @@ 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 pre_build_checks if use system-toolchain; then - local -x CPP="$(tc-getCXX) -E" - if tc-is-gcc && ! ver_test "$(gcc-version)" -ge ${GCC_MIN_VER}; then - die "At least gcc ${GCC_MIN_VER} is required" + # 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 - if use pgo && tc-is-cross-compiler; then - die "The pgo USE flag cannot be used when cross-compiling" + + # 936858 + if tc-ld-is-mold; then + eerror "Your toolchain is using the mold linker." + eerror "This is not supported by Chromium." + die "Please switch to a different linker." fi - if needs_clang && ! tc-is-clang; then - if tc-is-cross-compiler; then - CPP="${CBUILD}-clang++ -E" - else - CPP="${CHOST}-clang++ -E" - 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 - if needs_clang || tc-is-clang; then - if ver_test "$(clang-major-version)" -lt ${LLVM_MIN_SLOT}; then - die "At least Clang ${LLVM_MIN_SLOT} is required" - fi - # Ideally we never see this, but it should help prevent bugs like 927154 - if ver_test "$(clang-major-version)" -gt ${LLVM_MAX_SLOT}; then - die "Clang $(clang-major-version) is too new; ${LLVM_MAX_SLOT} is the highest supported version" - 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 @@ -412,6 +426,30 @@ pkg_setup() { 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 @@ -422,22 +460,29 @@ src_prepare() { "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-125-system-zstd.patch" "${FILESDIR}/chromium-126-oauth2-client-switches.patch" - "${FILESDIR}/chromium-cross-compile.patch" + "${FILESDIR}/chromium-127-bindgen-custom-toolchain.patch" + "${FILESDIR}/chromium-127-updater-systemd.patch" "${FILESDIR}/swiftshader-MCDissassembler.patch" "${FILESDIR}/swiftshader-use-llvm16.patch" - "${FILESDIR}/fix-rust-target.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}" ) @@ -469,7 +514,7 @@ src_prepare() { default - mkdir -p third_party/node/linux/node-linux-x64/bin || die + 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 @@ -482,7 +527,6 @@ src_prepare() { base/third_party/nspr base/third_party/superfasthash base/third_party/symbolize - base/third_party/valgrind base/third_party/xdg_user_dirs buildtools/third_party/libc++ buildtools/third_party/libc++abi @@ -501,8 +545,8 @@ src_prepare() { third_party/anonymous_tokens third_party/apple_apsl third_party/axe-core - third_party/blink third_party/bidimapper + third_party/blink third_party/boringssl third_party/boringssl/src/third_party/fiat third_party/breakpad @@ -527,6 +571,7 @@ src_prepare() { 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 @@ -555,9 +600,11 @@ src_prepare() { 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 @@ -572,15 +619,12 @@ src_prepare() { third_party/freetype third_party/fusejs third_party/fxdiv - third_party/highway - third_party/liburlpattern - third_party/libzip - third_party/lit 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 @@ -598,6 +642,7 @@ src_prepare() { 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 @@ -606,6 +651,7 @@ src_prepare() { 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 @@ -614,13 +660,12 @@ src_prepare() { 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/maldoca - third_party/maldoca/src/third_party/tensorflow_protos - third_party/maldoca/src/third_party/zlibwrapper third_party/markupsafe third_party/material_color_utilities third_party/mesa @@ -647,11 +692,12 @@ src_prepare() { 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-join-and-compute third_party/private_membership + third_party/private-join-and-compute third_party/protobuf third_party/pthreadpool third_party/puffin @@ -661,6 +707,7 @@ src_prepare() { third_party/re2 third_party/rnnoise third_party/rust + third_party/ruy third_party/s2cellid third_party/securemessage third_party/selenium-atoms @@ -668,19 +715,22 @@ src_prepare() { 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/subzero 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 @@ -688,8 +738,7 @@ src_prepare() { 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/ruy - third_party/six + third_party/tflite/src/third_party/xla/xla/tsl/framework third_party/ukey2 third_party/unrar third_party/utf @@ -711,12 +760,12 @@ src_prepare() { third_party/x11proto third_party/xcbproto third_party/xnnpack - third_party/zxcvbn-cpp third_party/zlib/google + third_party/zxcvbn-cpp url/third_party/mozilla v8/src/third_party/siphash - v8/src/third_party/valgrind v8/src/third_party/utf8-decoder + v8/src/third_party/valgrind v8/third_party/glibc v8/third_party/inspector_protocol v8/third_party/v8 @@ -744,10 +793,6 @@ src_prepare() { keeplibs+=( third_party/zstd ) fi - if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then - keeplibs+=( third_party/libc++ ) - fi - if ! use system-toolchain || [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == yes ]]; then keeplibs+=( third_party/llvm ) fi @@ -788,70 +833,32 @@ src_prepare() { ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die } -chromium_rust_version_check() { - [[ ${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 -} - chromium_configure() { # Calling this here supports resumption via FEATURES=keepwork python_setup local myconf_gn="" - if use system-toolchain && [[ ${CHROMIUM_FORCE_GOOGLE_TOOLCHAIN} == no ]]; then - # Make sure the build system will use the right tools, bug #340795. - tc-export AR CC CXX NM - - if needs_clang && ! tc-is-clang; then - # Force clang since gcc is either broken or build is using libcxx. - if tc-is-cross-compiler; then - CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}" - CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}" - BUILD_CC=${CBUILD}-clang - BUILD_CXX=${CBUILD}-clang++ - else - CC=${CHOST}-clang - CXX=${CHOST}-clang++ - fi - strip-unsupported-flags + # 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 - if tc-is-clang; then - myconf_gn+=" is_clang=true clang_use_chrome_plugins=false" - # Workaround for build failure with clang-18 and -march=native without - # avx512. Does not affect e.g. -march=skylake, only native (bug #931623). - use amd64 && is-flagq -march=native && - [[ $(clang-major-version) -eq 18 ]] && [[ $(clang-minor-version) -lt 6 ]] && - tc-cpp-is-true "!defined(__AVX512F__)" ${CXXFLAGS} && - append-flags -mevex512 - else - myconf_gn+=" is_clang=false" - fi + strip-unsupported-flags - if needs_lld ; then - # https://bugs.gentoo.org/918897#c32 - append-ldflags -Wl,--undefined-version - myconf_gn+=" use_lld=true" - else - # This doesn't prevent lld from being used, but rather prevents gn from forcing it - myconf_gn+=" use_lld=false" - fi + 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" - if use lto; then - AR=llvm-ar - NM=llvm-nm - if tc-is-cross-compiler; then - BUILD_AR=llvm-ar - BUILD_NM=llvm-nm - fi - fi + # 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\"" @@ -875,15 +882,23 @@ chromium_configure() { myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\"" fi - local rustc_ver - rustc_ver=$(chromium_rust_version_check) - 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 + # 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 @@ -973,20 +988,13 @@ chromium_configure() { # Chromium builds provided by Linux distros) should disable the testing config myconf_gn+=" disable_fieldtrial_testing_config=true" - if use system-toolchain; then - myconf_gn+=" use_gold=false" - fi - # The sysroot is the oldest debian image that chromium supports, we don't need it myconf_gn+=" use_sysroot=false" - # This determines whether or not GN uses the bundled libcxx - # default: true - if use libcxx || [[ ${CHROMIUM_FORCE_LIBCXX} == yes ]]; then - myconf_gn+=" use_custom_libcxx=true" - else - myconf_gn+=" use_custom_libcxx=false" - fi + # 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" @@ -1034,13 +1042,6 @@ chromium_configure() { 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 - - if tc-is-gcc; then - # https://bugs.gentoo.org/904455 - local -x CPP="$(tc-getCXX) -E" - # https://bugs.gentoo.org/912381 - filter-lto - fi fi if [[ $myarch = amd64 ]] ; then @@ -1059,11 +1060,7 @@ chromium_configure() { die "Failed to determine target arch, got '$myarch'." fi - # Make sure that -Werror doesn't get added to CFLAGS by the build system. - # Depending on GCC version the warnings are different and we don't want - # the build to fail because of that. myconf_gn+=" treat_warnings_as_errors=false" - # Disable fatal linker warnings, bug 506268. myconf_gn+=" fatal_linker_warnings=false" @@ -1085,13 +1082,12 @@ chromium_configure() { # https://bugs.gentoo.org/654216 addpredict /dev/dri/ #nowarn - # Disable unknown warning message from clang. - if tc-is-clang; then - append-flags -Wno-unknown-warning-option - if tc-is-cross-compiler; then + # 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 fi # Explicitly disable ICU data file support for system-icu/headless builds. @@ -1152,15 +1148,25 @@ chromium_configure() { 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)" - myconf_gn+=" use_thin_lto=$(usex lto true false)" - myconf_gn+=" thin_lto_enable_optimizations=$(usex lto 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 - # Disable CFI: unsupported for GCC, requires clang+lto+lld + # 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" @@ -1176,12 +1182,6 @@ chromium_configure() { myconf_gn+=" chrome_pgo_phase=0" fi - # user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639 - if use arm64 && tc-is-gcc; then - sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \ - third_party/crc32c/src/src/crc32c_arm64.cc || die - fi - # skipping typecheck is only supported on amd64, bug #876157 if ! use amd64; then myconf_gn+=" devtools_skip_typecheck=false" diff --git a/www-client/chromium/files/Debian-fix-rust-linking.patch b/www-client/chromium/files/Debian-fix-rust-linking.patch index 0f6de73..8be91bf 100644 --- a/www-client/chromium/files/Debian-fix-rust-linking.patch +++ b/www-client/chromium/files/Debian-fix-rust-linking.patch @@ -32,11 +32,11 @@ Index: chromium-121.0.6167.75/build/toolchain/gcc_toolchain.gni if (defined(invoker.strip)) { strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\"" -@@ -636,7 +648,13 @@ template("single_gcc_toolchain") { - start_group_flag = "-Wl,--start-group" - end_group_flag = "-Wl,--end-group " - } -- link_command = "$ld {{ldflags}}${extra_ldflags} -o \"$unstripped_outfile\" $start_group_flag @\"$rspfile\" {{solibs}} $end_group_flag {{libs}} {{rlibs}}" +@@ -615,7 +627,13 @@ template("single_gcc_toolchain") + # 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" @@ -47,3 +47,4 @@ 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. + diff --git a/www-client/chromium/files/chromium-117-system-zstd.patch b/www-client/chromium/files/chromium-117-system-zstd.patch deleted file mode 100644 index 0fcd3ef..0000000 --- a/www-client/chromium/files/chromium-117-system-zstd.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ae3ae3711784865bdc38bf119a6182a7b8dae91c Mon Sep 17 00:00:00 2001 -From: Matt Jolly <Matt.Jolly@footclan.ninja> -Date: Sun, 17 Sep 2023 16:51:42 +1000 -Subject: [PATCH] Add system-zstd - ---- a/build/linux/unbundle/replace_gn_files.py -+++ b/build/linux/unbundle/replace_gn_files.py -@@ -74,6 +74,7 @@ REPLACEMENTS = { - # - 'woff2': 'third_party/woff2/BUILD.gn', - 'zlib': 'third_party/zlib/BUILD.gn', -+ 'zstd': 'third_party/zstd/BUILD.gn', - } - - ---- /dev/null -+++ b/build/linux/unbundle/zstd.gn -@@ -0,0 +1,25 @@ -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_zstd") { -+ packages = [ "libzstd" ] -+} -+ -+shim_headers("zstd_shim") { -+ root_path = "src/lib" -+ headers = [ -+ "zdict.h", -+ "zstd.h", -+ "zstd_errors.h", -+ ] -+} -+ -+source_set("zstd") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} -+ -+source_set("decompress") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} --- -2.42.0 - diff --git a/www-client/chromium/files/chromium-123-qt-gui-check.patch b/www-client/chromium/files/chromium-123-qt-gui-check.patch deleted file mode 100644 index 53c1ca8..0000000 --- a/www-client/chromium/files/chromium-123-qt-gui-check.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 3a812de6e7e0b285eda21ebbb670ca809c4db2b5 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <Matt.Jolly@footclan.ninja> -Date: Thu, 11 Apr 2024 12:42:17 +1000 -Subject: [PATCH] Add QtGui to the list of Qt modules - -Re: https://bugreports.qt.io/browse/QTBUG-124135 - certain versions of QT -(6.6.3, 6.7.0) produce pkg-config files that no longer emit dependencies. -This causes Chromium builds to fail as due to not seeing QtGui as a dependency -of QtWidgets: - - `gen/qt6/../../../../ui/qt/qt_shim.h:11:10: fatal error: 'QImage' file not found` - -While this has been resolved upstream, there will certainly be some users -that are still using these versions of QT. This patch adds QtGui to the list of -Qt modules that are required to build the Chromium UI. - -Bug: https://bugs.gentoo.org/928299 -Suggested-by: Chris Pritchard <chris@christopherpritchard.co.uk> -Signed-off-by: Matt Jolly <kangie@gentoo.org> ---- a/ui/qt/BUILD.gn -+++ b/ui/qt/BUILD.gn -@@ -60,6 +60,7 @@ template("qt_shim") { - pkg_config("qt" + invoker.qt_version + "_config") { - packages = [ - "Qt" + invoker.qt_version + "Core", -+ "Qt" + invoker.qt_version + "Gui", - "Qt" + invoker.qt_version + "Widgets", - ] - } --- -2.44.0 diff --git a/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch b/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch deleted file mode 100644 index fa03873..0000000 --- a/www-client/chromium/files/chromium-124-libwebp-shim-sharpyuv.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 40c466949bd8ccb61cb55655848d23684a9f8a94 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <kangie@gentoo.org> -Date: Mon, 25 Mar 2024 21:38:35 +1000 -Subject: [PATCH] libwebp shim: add libwebp_sharpyuv target - -Signed-off-by: Matt Jolly <Kangie@gentoo.org> ---- a/build/linux/unbundle/libwebp.gn -+++ b/build/linux/unbundle/libwebp.gn -@@ -22,14 +22,24 @@ shim_headers("libwebp_shim") { - "webp/mux.h", - "webp/mux_types.h", - "webp/types.h", -+ "webp/sharpyuv/sharpyuv.h", -+ "webp/sharpyuv/sharpyuv_csp.h", - ] - } - -+source_set("libwebp_sharpyuv") { -+ deps = [ ":libwebp_shim" ] -+ public_configs = [ ":system_libwebp" ] -+} -+ - source_set("libwebp_webp") { - deps = [ ":libwebp_shim" ] - public_configs = [ ":system_libwebp" ] - } - - group("libwebp") { -- deps = [ ":libwebp_webp" ] -+ deps = [ -+ ":libwebp_webp", -+ ":libwebp_sharpyuv" -+ ] - } --- -2.44.0 diff --git a/www-client/chromium/files/chromium-125-ninja-1-12.patch b/www-client/chromium/files/chromium-125-ninja-1-12.patch deleted file mode 100644 index 55d0887..0000000 --- a/www-client/chromium/files/chromium-125-ninja-1-12.patch +++ /dev/null @@ -1,17 +0,0 @@ -https://chromium-review.googlesource.com/c/chromium/src/+/5487538 -commit a976cb05b4024b7a6452d1541378d718cdfe33e6 -Author: Takuto Ikuta <tikuta@chromium.org> -Date: Thu Apr 25 07:25:32 2024 - - [devtools] fix a missing build dependency to a generated file - ---- a/chrome/browser/devtools/BUILD.gn -+++ b/chrome/browser/devtools/BUILD.gn -@@ -117,6 +117,7 @@ - "//chrome/browser/autofill:autofill", - "//components/autofill/content/browser:browser", - "//components/autofill/core/browser:browser", -+ "//components/enterprise/buildflags", - "//components/paint_preview/buildflags:buildflags", - "//components/variations/service:service", - "//components/webapps/common:common", diff --git a/www-client/chromium/files/chromium-125-oauth2-client-switches.patch b/www-client/chromium/files/chromium-125-oauth2-client-switches.patch deleted file mode 100644 index 6c7f56b..0000000 --- a/www-client/chromium/files/chromium-125-oauth2-client-switches.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6a84205d0399a94e8b526176a7dcafd6c2051a95 Mon Sep 17 00:00:00 2001 -From: Matt Jolly <Matt.Jolly@footclan.ninja> -Date: Thu, 18 Apr 2024 21:15:20 +1000 -Subject: [PATCH] www-client/chromium: work around dead oauth2 credentials - - 125 update - -125 moved the content to a new file. - -Google doesn't let us bake in OAuth2 credentials, and for some time, -Google sign-in has been broken. Arch dealt with this in March, and so -did we to some degree, but in the last few months, our sign-in -credentials have been broken. It appears that we actually did remove API -credentials in March around Chrome 89, but they got added back, perhaps -when rotating newer versions to replace older versions. Work around this -by following Arch's lead: we remove the predefined credentials, as -before, but also we patch Chromium so that people can use their own -easily, using Arch's patch for that. - -For more info, see: - -https://archlinux.org/news/chromium-losing-sync-support-in-early-march/ -https://bodhi.fedoraproject.org/updates/FEDORA-2021-48866282e5 -https://hackaday.com/2021/01/26/whats-the-deal-with-chromium-on-linux-google-at-odds-with-package-maintainers/ - -Bug: https://bugs.gentoo.org/791871 -Signed-off-by: Matt Jolly <kangie@gentoo.org> ---- a/google_apis/google_api_keys-inc.cc -+++ b/google_apis/google_api_keys-inc.cc -@@ -182,11 +182,11 @@ class APIKeyCache { - - std::string default_client_id = CalculateKeyValue( - GOOGLE_DEFAULT_CLIENT_ID, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, - std::string(), environment.get(), command_line, gaia_config); - std::string default_client_secret = CalculateKeyValue( - GOOGLE_DEFAULT_CLIENT_SECRET, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret, - std::string(), environment.get(), command_line, gaia_config); - - // We currently only allow overriding the baked-in values for the --- -2.44.0 - diff --git a/www-client/chromium/files/chromium-125-system-zstd.patch b/www-client/chromium/files/chromium-125-system-zstd.patch deleted file mode 100644 index 6211662..0000000 --- a/www-client/chromium/files/chromium-125-system-zstd.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4ac5e29c999c7bbcb8409a2008b0061e1ae365dd Mon Sep 17 00:00:00 2001 -From: Matt Jolly <Matt.Jolly@footclan.ninja> -Date: Thu, 18 Apr 2024 21:54:54 +1000 -Subject: [PATCH] Zstd now needs compress, too - -Existing patch updated for 125, added source_set("compress") - ---- a/build/linux/unbundle/replace_gn_files.py -+++ b/build/linux/unbundle/replace_gn_files.py -@@ -80,6 +80,7 @@ REPLACEMENTS = { - 'vulkan_memory_allocator' : 'third_party/vulkan_memory_allocator/BUILD.gn', - 'woff2': 'third_party/woff2/BUILD.gn', - 'zlib': 'third_party/zlib/BUILD.gn', -+ 'zstd': 'third_party/zstd/BUILD.gn', - } - - ---- /dev/null -+++ b/build/linux/unbundle/zstd.gn -@@ -0,0 +1,30 @@ -+import("//build/config/linux/pkg_config.gni") -+import("//build/shim_headers.gni") -+ -+pkg_config("system_zstd") { -+ packages = [ "libzstd" ] -+} -+ -+shim_headers("zstd_shim") { -+ root_path = "src/lib" -+ headers = [ -+ "zdict.h", -+ "zstd.h", -+ "zstd_errors.h", -+ ] -+} -+ -+source_set("zstd") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} -+ -+source_set("compress") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} -+ -+source_set("decompress") { -+ deps = [ ":zstd_shim" ] -+ public_configs = [ ":system_zstd" ] -+} --- -2.44.0 - diff --git a/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch b/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch new file mode 100644 index 0000000..e981df8 --- /dev/null +++ b/www-client/chromium/files/chromium-127-bindgen-custom-toolchain.patch @@ -0,0 +1,111 @@ +From 6df5a080f58ddb6a49a9d33e4a3619a34fffa78c Mon Sep 17 00:00:00 2001 +From: Matt Jolly <Matt.Jolly@footclan.ninja> +Date: Fri, 5 Jul 2024 20:49:01 +1000 +Subject: [PATCH] Make bindgen wrapper work with unbundled toolchain + +The `run_bindgen.py` wrapper takes a --libclang-path option +and uses it to set the appropriate environment variable. + +This is currently hardcoded to use libclang shipped alongside +bindgen (in our rust toolchain), but distributions may want to +override this and use a system path. + +Additionally enable distros to feed in appropriate library paths. +--- + build/config/rust.gni | 11 +++++++++++ + build/rust/rust_bindgen.gni | 28 ++++++++++++++++++---------- + 2 files changed, 29 insertions(+), 10 deletions(-) + +diff --git a/build/config/rust.gni b/build/config/rust.gni +index 97e788a227..78b9daa7e8 100644 +--- a/build/config/rust.gni ++++ b/build/config/rust.gni +@@ -60,6 +60,17 @@ declare_args() { + # the bindgen exectuable). + rust_bindgen_root = "//third_party/rust-toolchain" + ++ # Directory under which to find one of `libclang.{dll,so}` (a `lib[64]` or ++ # `bin` directory containing the libclang shared library). ++ # We don't need to worry about multlib, but specify the full path here ++ # in case a distribution does. ++ if (host_os == "win") { ++ bindgen_libclang_path = "//third_party/rust-toolchain/bin" ++ } else { ++ bindgen_libclang_path = "//third_party/rust-toolchain/lib" ++ } ++ ++ + # If you're using a Rust toolchain as specified by rust_sysroot_absolute, + # set this to the output of `rustc -V`. Changing this string will cause all + # Rust targets to be rebuilt, which allows you to update your toolchain and +diff --git a/build/rust/rust_bindgen.gni b/build/rust/rust_bindgen.gni +index bf110ca93c..d7eb04eb00 100644 +--- a/build/rust/rust_bindgen.gni ++++ b/build/rust/rust_bindgen.gni +@@ -16,13 +16,13 @@ if (host_os == "win") { + _bindgen_path = "${_bindgen_path}.exe" + } + +-# On Windows, the libclang.dll is beside the bindgen.exe, otherwise it is in +-# ../lib. +-_libclang_path = rust_bindgen_root +-if (host_os == "win") { +- _libclang_path += "/bin" ++if (clang_base_path != default_clang_base_path && custom_toolchain == "//build/toolchain/linux/unbundle:default") { ++ # Assume that the user has set this up properly, including handling multilib ++ _clang_libpath = clang_base_path + "/include" ++ _clang_ld_libpath = bindgen_libclang_path + } else { +- _libclang_path += "/lib" ++ _clang_libpath = clang_base_path + "/lib/clang/" + clang_version ++ _clang_ld_libpath = clang_base_path + "/lib" + } + + # Template to build Rust/C bindings with bindgen. +@@ -100,7 +100,7 @@ template("rust_bindgen") { + "--output", + rebase_path(out_gen_rs, root_build_dir), + "--libclang-path", +- rebase_path(_libclang_path, root_build_dir), ++ rebase_path(bindgen_libclang_path, root_build_dir), + ] + + if (wrap_static_fns) { +@@ -117,7 +117,7 @@ template("rust_bindgen") { + # point to. + args += [ + "--ld-library-path", +- rebase_path(clang_base_path + "/lib", root_build_dir), ++ rebase_path(_clang_ld_libpath, root_build_dir), + ] + } + +@@ -145,8 +145,7 @@ template("rust_bindgen") { + # make it behave consistently with our other command line flags and allows + # system headers to be found. + clang_resource_dir = +- rebase_path(clang_base_path + "/lib/clang/" + clang_version, +- root_build_dir) ++ rebase_path(_clang_libpath, root_build_dir) + args += [ + "-resource-dir", + clang_resource_dir, +@@ -167,6 +166,15 @@ template("rust_bindgen") { + } + } + ++ if (custom_toolchain == "//build/toolchain/linux/unbundle:default") { ++ # We need to pass the path to the libstdc++ headers to bindgen so that it ++ # can find them when parsing C++ headers. ++ args += [ ++ "-I", ++ rebase_path(clang_base_path + "/include/", root_build_dir), ++ ] ++ } ++ + if (is_win) { + # On Windows we fall back to using system headers from a sysroot from + # depot_tools. This is negotiated by python scripts and the result is +-- +2.45.2 + diff --git a/www-client/chromium/files/chromium-127-browser-ui-deps.patch b/www-client/chromium/files/chromium-127-browser-ui-deps.patch new file mode 100644 index 0000000..e262e31 --- /dev/null +++ b/www-client/chromium/files/chromium-127-browser-ui-deps.patch @@ -0,0 +1,57 @@ +https://gitlab.exherbo.org/exherbo/desktop/-/raw/master/packages/net-www/chromium-beta/files/chromium-browser-ui-missing-deps.patch +https://issues.chromium.org/u/2/issues/351157339 +Source: Tom Briden <tom@decompile.me.uk> +Upstream: No + +--- a/chrome/browser/ui/views/side_panel/BUILD.gn ++++ b/chrome/browser/ui/views/side_panel/BUILD.gn +@@ -142,18 +142,30 @@ static_library("side_panel") { + } + public_deps = [ + "//base", ++ "//chrome/browser/cart:mojo_bindings", + "//chrome/browser/companion/core/mojom:mojo_bindings", + "//chrome/browser/profiles:profile", + "//chrome/browser/ui/actions:actions_headers", + "//chrome/browser/ui/color:color_headers", ++ "//chrome/browser/ui/webui/side_panel/customize_chrome:mojo_bindings", ++ "//chrome/browser/ui/webui/side_panel/bookmarks:mojo_bindings", + "//chrome/browser/ui/webui/side_panel/performance_controls:mojo_bindings", ++ "//chrome/browser/ui/webui/side_panel/reading_list:mojo_bindings", ++ "//chrome/browser/ui:webui_name_variants", + "//chrome/common", + "//chrome/common/accessibility:mojo_bindings", ++ "//chrome/common/companion:mojo_bindings", ++ "//components/enterprise/buildflags:buildflags", ++ "//components/enterprise/common/proto:connectors_proto", + "//components/lens", + "//components/lens:buildflags", + "//components/omnibox/browser", ++ "//components/page_image_service/mojom:mojo_bindings", ++ "//components/paint_preview/buildflags:buildflags", + "//components/prefs", + "//components/search_engines", ++ "//components/segmentation_platform/public/proto:proto", ++ "//components/webapps/common:mojo_bindings", + "//content/public/browser", + "//extensions/browser", + "//extensions/common", +@@ -165,6 +177,8 @@ static_library("side_panel") { + "//ui/gfx/geometry", + "//ui/views", + "//ui/views/controls/webview", ++ "//ui/webui/resources/cr_components/commerce:mojo_bindings", ++ "//ui/webui/resources/cr_components/help_bubble:mojo_bindings", + "//url", + ] + deps = [ +--- a/chrome/browser/ui/webui/top_chrome/BUILD.gn ++++ b/chrome/browser/ui/webui/top_chrome/BUILD.gn +@@ -19,6 +19,7 @@ source_set("top_chrome") { + deps = [ + "//base", + "//chrome/browser/profiles:profile", ++ "//chrome/browser/ui:webui_name_variants", + "//components/site_engagement/content:content", + "//content/public/browser", + "//ui/webui", diff --git a/www-client/chromium/files/chromium-127-updater-systemd.patch b/www-client/chromium/files/chromium-127-updater-systemd.patch new file mode 100644 index 0000000..57e9029 --- /dev/null +++ b/www-client/chromium/files/chromium-127-updater-systemd.patch @@ -0,0 +1,73 @@ +https://github.com/chromium/chromium/commit/570332aad61afab5d9d88a8438bae53ea28a298a +From: Noah Rose Ledesma <noahrose@google.com> +Date: Wed, 31 Jul 2024 17:59:12 +0000 +Subject: [PATCH] Use libs instead of pkg_config for linux deps + +pkg_config can cause builds to fail if the requested packages are not +present, regardless of if the lib is depended upon by the target being +built. + +This issue can be avoided by setting 'libs' instead. I'm not sure why we +didn't do so in the first place. + +Bug: 355967882 +Change-Id: Ie5dc4c03b08d7c1e26458ea143f6dc812b670544 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5749680 +Reviewed-by: Sorin Jianu <sorin@chromium.org> +Commit-Queue: Noah Rose Ledesma <noahrose@google.com> +Cr-Commit-Position: refs/heads/main@{#1335558} +--- a/chrome/updater/BUILD.gn ++++ b/chrome/updater/BUILD.gn +@@ -367,9 +367,10 @@ if (is_win || is_mac || is_linux) { + "update_service_internal_impl_qualifying_linux.cc", + "update_usage_stats_task_linux.cc", + ] +- public_configs = [ +- "linux:libcurl", +- "linux:libsystemd", ++ ++ libs = [ ++ "curl", ++ "systemd", + ] + } + } +@@ -1040,7 +1041,7 @@ if (is_win || is_mac || is_linux) { + + data += [ "//chrome/test/data/updater/updater_qualification_app.crx" ] + data_deps += [ "//chrome/updater/linux:updater_test" ] +- public_configs = [ "linux:libsystemd" ] ++ libs = [ "systemd" ] + } + + if (is_posix) { +--- a/chrome/updater/linux/BUILD.gn ++++ b/chrome/updater/linux/BUILD.gn +@@ -2,7 +2,6 @@ + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. + +-import("//build/config/linux/pkg_config.gni") + import("//chrome/updater/zip.gni") + + # This target builds the updater executable and unittests. +@@ -13,18 +12,10 @@ group("linux") { + ] + } + +-pkg_config("libcurl") { +- packages = [ "libcurl" ] +-} +- +-pkg_config("libsystemd") { +- packages = [ "libsystemd" ] +-} +- + source_set("updater_executable") { + sources = [ "main.cc" ] + deps = [ "//chrome/updater:base" ] +- public_configs = [ ":libsystemd" ] ++ libs = [ "systemd" ] + } + + executable("updater") { diff --git a/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch b/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch deleted file mode 100644 index 9d9c57b..0000000 --- a/www-client/chromium/files/chromium-use-oauth2-client-switches-as-default.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -upr chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc chromium-89.0.4389.58/google_apis/google_api_keys.cc ---- chromium-89.0.4389.58.orig/google_apis/google_api_keys.cc 2021-02-24 22:37:18.494007649 +0000 -+++ chromium-89.0.4389.58/google_apis/google_api_keys.cc 2021-02-24 22:35:00.865777600 +0000 -@@ -154,11 +154,11 @@ class APIKeyCache { - - std::string default_client_id = CalculateKeyValue( - GOOGLE_DEFAULT_CLIENT_ID, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_ID), ::switches::kOAuth2ClientID, - std::string(), environment.get(), command_line, gaia_config); - std::string default_client_secret = CalculateKeyValue( - GOOGLE_DEFAULT_CLIENT_SECRET, -- STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), nullptr, -+ STRINGIZE_NO_EXPANSION(GOOGLE_DEFAULT_CLIENT_SECRET), ::switches::kOAuth2ClientSecret, - std::string(), environment.get(), command_line, gaia_config); - - // We currently only allow overriding the baked-in values for the diff --git a/www-client/chromium/files/fix-rust-target.patch b/www-client/chromium/files/fix-rust-target.patch deleted file mode 100644 index 51d7056..0000000 --- a/www-client/chromium/files/fix-rust-target.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/build/config/rust.gni b/build/config/rust.gni -index 9b0ee754ba5e2..9e6d6ba5acb0b 100644 ---- a/build/config/rust.gni -+++ b/build/config/rust.gni -@@ -214,6 +214,8 @@ if (is_linux || is_chromeos) { - } else { - rust_abi_target = "arm-unknown-linux-gnueabi" + float_suffix - } -+ } else if (current_cpu == "riscv64") { -+ rust_abi_target = "riscv64gc-unknown-linux-gnu" - } else { - # Best guess for other future platforms. - rust_abi_target = current_cpu + "-unknown-linux-gnu" diff --git a/www-client/chromium/files/riscv-ffmpeg.patch b/www-client/chromium/files/riscv-ffmpeg.patch index 9bb4826..f2fb1f2 100644 --- a/www-client/chromium/files/riscv-ffmpeg.patch +++ b/www-client/chromium/files/riscv-ffmpeg.patch @@ -1,15 +1,967 @@ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config.h -@@ -0,0 +1,775 @@ +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 +@@ -131,6 +131,62 @@ + + ******************************************************************************** + ++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 + + 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-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/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/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-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/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/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=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 +@@ -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-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/hacker/chromium/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=riscv64 --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/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_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 "Debian clang version 16.0.6 (27)" ++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)" +#define OS_NAME linux +#define EXTERN_PREFIX "" +#define EXTERN_ASM @@ -59,8 +1011,9 @@ +#define HAVE_POWER8 0 +#define HAVE_PPC4XX 0 +#define HAVE_VSX 0 -+#define HAVE_RV 0 -+#define HAVE_RVV 0 ++#define HAVE_RV 1 ++#define HAVE_RVV 1 ++#define HAVE_RV_ZVBB 0 +#define HAVE_AESNI 0 +#define HAVE_AMD3DNOW 0 +#define HAVE_AMD3DNOWEXT 0 @@ -79,7 +1032,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 @@ -113,6 +1065,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 @@ -131,7 +1084,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 @@ -165,6 +1117,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 @@ -183,7 +1136,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 @@ -221,6 +1173,7 @@ +#define HAVE_BIGENDIAN 0 +#define HAVE_FAST_UNALIGNED 0 +#define HAVE_ARPA_INET_H 0 ++#define HAVE_ASM_HWPROBE_H 1 +#define HAVE_ASM_TYPES_H 1 +#define HAVE_CDIO_PARANOIA_H 0 +#define HAVE_CDIO_PARANOIA_PARANOIA_H 0 @@ -247,6 +1200,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 @@ -381,7 +1335,7 @@ +#define HAVE_INLINE_ASM_LABELS 1 +#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 +#define HAVE_PRAGMA_DEPRECATED 1 -+#define HAVE_RSYNC_CONTIMEOUT 0 ++#define HAVE_RSYNC_CONTIMEOUT 1 +#define HAVE_SYMVER_ASM_LABEL 1 +#define HAVE_SYMVER_GNU_ASM 1 +#define HAVE_VFP_ARGS 0 @@ -420,6 +1374,7 @@ +#define HAVE_STRUCT_SOCKADDR_STORAGE 0 +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#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 @@ -521,6 +1476,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 @@ -644,6 +1600,7 @@ +#define CONFIG_ERROR_RESILIENCE 0 +#define CONFIG_FAAN 0 +#define CONFIG_FAST_UNALIGNED 0 ++#define CONFIG_IAMF 0 +#define CONFIG_LSP 0 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 @@ -692,7 +1649,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 @@ -724,6 +1682,7 @@ +#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 @@ -776,9 +1735,10 @@ +#define CONFIG_WMA_FREQS 0 +#define CONFIG_WMV2DSP 0 +#endif /* FFMPEG_CONFIG_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/config_components.h -@@ -0,0 +1,2210 @@ +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 +@@ -0,0 +1,2218 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -792,6 +1752,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 @@ -825,7 +1786,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 @@ -1365,6 +2325,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 @@ -1593,6 +2554,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 @@ -2345,6 +3307,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 @@ -2540,6 +3504,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 @@ -2623,6 +3588,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 @@ -2833,6 +3799,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 @@ -2935,6 +3902,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 @@ -2989,13 +3957,15 @@ +#define CONFIG_IPFS_GATEWAY_PROTOCOL 0 +#define CONFIG_IPNS_GATEWAY_PROTOCOL 0 +#endif /* FFMPEG_CONFIG_COMPONENTS_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/bsf_list.c +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 @@ -0,0 +1,2 @@ +static const FFBitStreamFilter * const bitstream_filters[] = { + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/codec_list.c +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 @@ -0,0 +1,17 @@ +static const FFCodec * const codec_list[] = { + &ff_h264_decoder, @@ -3014,8 +3984,9 @@ + &ff_pcm_u8_decoder, + &ff_libopus_decoder, + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavcodec/parser_list.c +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 @@ -0,0 +1,9 @@ +static const AVCodecParser * const parser_list[] = { + &ff_aac_parser, @@ -3026,8 +3997,9 @@ + &ff_vorbis_parser, + &ff_vp9_parser, + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c +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 @@ -0,0 +1,9 @@ +static const FFInputFormat * const demuxer_list[] = { + &ff_aac_demuxer, @@ -3038,18 +4010,21 @@ + &ff_ogg_demuxer, + &ff_wav_demuxer, + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/muxer_list.c +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 @@ -0,0 +1,2 @@ +static const FFOutputFormat * const muxer_list[] = { + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavformat/protocol_list.c +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 @@ -0,0 +1,2 @@ +static const URLProtocol * const url_protocols[] = { + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/avconfig.h +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 @@ -0,0 +1,6 @@ +/* Generated by ffmpeg configure */ +#ifndef AVUTIL_AVCONFIG_H @@ -3057,3098 +4032,881 @@ +#define AV_HAVE_BIGENDIAN 0 +#define AV_HAVE_FAST_UNALIGNED 0 +#endif /* AVUTIL_AVCONFIG_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.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 @@ -0,0 +1,5 @@ +/* Automatically generated by version.sh, do not manually edit! */ +#ifndef AVUTIL_FFVERSION_H +#define AVUTIL_FFVERSION_H -+#define FFMPEG_VERSION "5.1.git" ++#define FFMPEG_VERSION "git-2024-05-24-bc1ee906ce" +#endif /* AVUTIL_FFVERSION_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/config.h -@@ -0,0 +1,775 @@ -+/* 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-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/home/hacker/chromium/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=riscv64 --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi" -- 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 "Debian clang version 16.0.6 (27)" -+#define OS_NAME linux -+#define EXTERN_PREFIX "" -+#define EXTERN_ASM -+#define BUILDSUF "" -+#define SLIBSUF ".so" -+#define SWS_MAX_FILTER_SIZE 256 -+#define ARCH_AARCH64 0 -+#define ARCH_ALPHA 0 -+#define ARCH_ARM 0 -+#define ARCH_AVR32 0 -+#define ARCH_AVR32_AP 0 -+#define ARCH_AVR32_UC 0 -+#define ARCH_BFIN 0 -+#define ARCH_IA64 0 -+#define ARCH_LOONGARCH 0 -+#define ARCH_LOONGARCH32 0 -+#define ARCH_LOONGARCH64 0 -+#define ARCH_M68K 0 -+#define ARCH_MIPS 0 -+#define ARCH_MIPS64 0 -+#define ARCH_PARISC 0 -+#define ARCH_PPC 0 -+#define ARCH_PPC64 0 -+#define ARCH_RISCV 1 -+#define ARCH_S390 0 -+#define ARCH_SH4 0 -+#define ARCH_SPARC 0 -+#define ARCH_SPARC64 0 -+#define ARCH_TILEGX 0 -+#define ARCH_TILEPRO 0 -+#define ARCH_X86 0 -+#define ARCH_X86_32 0 -+#define ARCH_X86_64 0 -+#define HAVE_ARMV5TE 0 -+#define HAVE_ARMV6 0 -+#define HAVE_ARMV6T2 0 -+#define HAVE_ARMV8 0 -+#define HAVE_DOTPROD 0 -+#define HAVE_I8MM 0 -+#define HAVE_NEON 0 -+#define HAVE_VFP 0 -+#define HAVE_VFPV3 0 -+#define HAVE_SETEND 0 -+#define HAVE_ALTIVEC 0 -+#define HAVE_DCBZL 0 -+#define HAVE_LDBRX 0 -+#define HAVE_POWER8 0 -+#define HAVE_PPC4XX 0 -+#define HAVE_VSX 0 -+#define HAVE_RV 0 -+#define HAVE_RVV 0 -+#define HAVE_AESNI 0 -+#define HAVE_AMD3DNOW 0 -+#define HAVE_AMD3DNOWEXT 0 -+#define HAVE_AVX 0 -+#define HAVE_AVX2 0 -+#define HAVE_AVX512 0 -+#define HAVE_AVX512ICL 0 -+#define HAVE_FMA3 0 -+#define HAVE_FMA4 0 -+#define HAVE_MMX 0 -+#define HAVE_MMXEXT 0 -+#define HAVE_SSE 0 -+#define HAVE_SSE2 0 -+#define HAVE_SSE3 0 -+#define HAVE_SSE4 0 -+#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 -+#define HAVE_MIPS32R5 0 -+#define HAVE_MIPS64R2 0 -+#define HAVE_MIPS32R6 0 -+#define HAVE_MIPS64R6 0 -+#define HAVE_MIPSDSP 0 -+#define HAVE_MIPSDSPR2 0 -+#define HAVE_MSA 0 -+#define HAVE_LOONGSON2 0 -+#define HAVE_LOONGSON3 0 -+#define HAVE_MMI 0 -+#define HAVE_LSX 0 -+#define HAVE_LASX 0 -+#define HAVE_ARMV5TE_EXTERNAL 0 -+#define HAVE_ARMV6_EXTERNAL 0 -+#define HAVE_ARMV6T2_EXTERNAL 0 -+#define HAVE_ARMV8_EXTERNAL 0 -+#define HAVE_DOTPROD_EXTERNAL 0 -+#define HAVE_I8MM_EXTERNAL 0 -+#define HAVE_NEON_EXTERNAL 0 -+#define HAVE_VFP_EXTERNAL 0 -+#define HAVE_VFPV3_EXTERNAL 0 -+#define HAVE_SETEND_EXTERNAL 0 -+#define HAVE_ALTIVEC_EXTERNAL 0 -+#define HAVE_DCBZL_EXTERNAL 0 -+#define HAVE_LDBRX_EXTERNAL 0 -+#define HAVE_POWER8_EXTERNAL 0 -+#define HAVE_PPC4XX_EXTERNAL 0 -+#define HAVE_VSX_EXTERNAL 0 -+#define HAVE_RV_EXTERNAL 0 -+#define HAVE_RVV_EXTERNAL 0 -+#define HAVE_AESNI_EXTERNAL 0 -+#define HAVE_AMD3DNOW_EXTERNAL 0 -+#define HAVE_AMD3DNOWEXT_EXTERNAL 0 -+#define HAVE_AVX_EXTERNAL 0 -+#define HAVE_AVX2_EXTERNAL 0 -+#define HAVE_AVX512_EXTERNAL 0 -+#define HAVE_AVX512ICL_EXTERNAL 0 -+#define HAVE_FMA3_EXTERNAL 0 -+#define HAVE_FMA4_EXTERNAL 0 -+#define HAVE_MMX_EXTERNAL 0 -+#define HAVE_MMXEXT_EXTERNAL 0 -+#define HAVE_SSE_EXTERNAL 0 -+#define HAVE_SSE2_EXTERNAL 0 -+#define HAVE_SSE3_EXTERNAL 0 -+#define HAVE_SSE4_EXTERNAL 0 -+#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 -+#define HAVE_MIPS32R5_EXTERNAL 0 -+#define HAVE_MIPS64R2_EXTERNAL 0 -+#define HAVE_MIPS32R6_EXTERNAL 0 -+#define HAVE_MIPS64R6_EXTERNAL 0 -+#define HAVE_MIPSDSP_EXTERNAL 0 -+#define HAVE_MIPSDSPR2_EXTERNAL 0 -+#define HAVE_MSA_EXTERNAL 0 -+#define HAVE_LOONGSON2_EXTERNAL 0 -+#define HAVE_LOONGSON3_EXTERNAL 0 -+#define HAVE_MMI_EXTERNAL 0 -+#define HAVE_LSX_EXTERNAL 0 -+#define HAVE_LASX_EXTERNAL 0 -+#define HAVE_ARMV5TE_INLINE 0 -+#define HAVE_ARMV6_INLINE 0 -+#define HAVE_ARMV6T2_INLINE 0 -+#define HAVE_ARMV8_INLINE 0 -+#define HAVE_DOTPROD_INLINE 0 -+#define HAVE_I8MM_INLINE 0 -+#define HAVE_NEON_INLINE 0 -+#define HAVE_VFP_INLINE 0 -+#define HAVE_VFPV3_INLINE 0 -+#define HAVE_SETEND_INLINE 0 -+#define HAVE_ALTIVEC_INLINE 0 -+#define HAVE_DCBZL_INLINE 0 -+#define HAVE_LDBRX_INLINE 0 -+#define HAVE_POWER8_INLINE 0 -+#define HAVE_PPC4XX_INLINE 0 -+#define HAVE_VSX_INLINE 0 -+#define HAVE_RV_INLINE 0 -+#define HAVE_RVV_INLINE 0 -+#define HAVE_AESNI_INLINE 0 -+#define HAVE_AMD3DNOW_INLINE 0 -+#define HAVE_AMD3DNOWEXT_INLINE 0 -+#define HAVE_AVX_INLINE 0 -+#define HAVE_AVX2_INLINE 0 -+#define HAVE_AVX512_INLINE 0 -+#define HAVE_AVX512ICL_INLINE 0 -+#define HAVE_FMA3_INLINE 0 -+#define HAVE_FMA4_INLINE 0 -+#define HAVE_MMX_INLINE 0 -+#define HAVE_MMXEXT_INLINE 0 -+#define HAVE_SSE_INLINE 0 -+#define HAVE_SSE2_INLINE 0 -+#define HAVE_SSE3_INLINE 0 -+#define HAVE_SSE4_INLINE 0 -+#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 -+#define HAVE_MIPS32R5_INLINE 0 -+#define HAVE_MIPS64R2_INLINE 0 -+#define HAVE_MIPS32R6_INLINE 0 -+#define HAVE_MIPS64R6_INLINE 0 -+#define HAVE_MIPSDSP_INLINE 0 -+#define HAVE_MIPSDSPR2_INLINE 0 -+#define HAVE_MSA_INLINE 0 -+#define HAVE_LOONGSON2_INLINE 0 -+#define HAVE_LOONGSON3_INLINE 0 -+#define HAVE_MMI_INLINE 0 -+#define HAVE_LSX_INLINE 0 -+#define HAVE_LASX_INLINE 0 -+#define HAVE_ALIGNED_STACK 0 -+#define HAVE_FAST_64BIT 1 -+#define HAVE_FAST_CLZ 0 -+#define HAVE_FAST_CMOV 0 -+#define HAVE_FAST_FLOAT16 0 -+#define HAVE_LOCAL_ALIGNED 0 -+#define HAVE_SIMD_ALIGN_16 0 -+#define HAVE_SIMD_ALIGN_32 0 -+#define HAVE_SIMD_ALIGN_64 0 -+#define HAVE_ATOMIC_CAS_PTR 0 -+#define HAVE_MACHINE_RW_BARRIER 0 -+#define HAVE_MEMORYBARRIER 0 -+#define HAVE_MM_EMPTY 0 -+#define HAVE_RDTSC 0 -+#define HAVE_SEM_TIMEDWAIT 1 -+#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1 -+#define HAVE_INLINE_ASM 1 -+#define HAVE_SYMVER 0 -+#define HAVE_X86ASM 0 -+#define HAVE_BIGENDIAN 0 -+#define HAVE_FAST_UNALIGNED 0 -+#define HAVE_ARPA_INET_H 0 -+#define HAVE_ASM_TYPES_H 1 -+#define HAVE_CDIO_PARANOIA_H 0 -+#define HAVE_CDIO_PARANOIA_PARANOIA_H 0 -+#define HAVE_CUDA_H 0 -+#define HAVE_DISPATCH_DISPATCH_H 0 -+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0 -+#define HAVE_DEV_IC_BT8XX_H 0 -+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0 -+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0 -+#define HAVE_DIRECT_H 0 -+#define HAVE_DIRENT_H 1 -+#define HAVE_DXGIDEBUG_H 0 -+#define HAVE_DXVA_H 0 -+#define HAVE_ES2_GL_H 0 -+#define HAVE_GSM_H 0 -+#define HAVE_IO_H 0 -+#define HAVE_LINUX_DMA_BUF_H 0 -+#define HAVE_LINUX_PERF_EVENT_H 1 -+#define HAVE_MACHINE_IOCTL_BT848_H 0 -+#define HAVE_MACHINE_IOCTL_METEOR_H 0 -+#define HAVE_MALLOC_H 1 -+#define HAVE_OPENCV2_CORE_CORE_C_H 0 -+#define HAVE_OPENGL_GL3_H 0 -+#define HAVE_POLL_H 1 -+#define HAVE_PTHREAD_NP_H 0 -+#define HAVE_SYS_PARAM_H 1 -+#define HAVE_SYS_RESOURCE_H 1 -+#define HAVE_SYS_SELECT_H 1 -+#define HAVE_SYS_SOUNDCARD_H 1 -+#define HAVE_SYS_TIME_H 1 -+#define HAVE_SYS_UN_H 1 -+#define HAVE_SYS_VIDEOIO_H 0 -+#define HAVE_TERMIOS_H 1 -+#define HAVE_UDPLITE_H 0 -+#define HAVE_UNISTD_H 1 -+#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */ -+#define HAVE_WINDOWS_H 0 -+#define HAVE_WINSOCK2_H 0 -+#define HAVE_INTRINSICS_NEON 0 -+#define HAVE_ATANF 1 -+#define HAVE_ATAN2F 1 -+#define HAVE_CBRT 1 -+#define HAVE_CBRTF 1 -+#define HAVE_COPYSIGN 1 -+#define HAVE_COSF 1 -+#define HAVE_ERF 1 -+#define HAVE_EXP2 1 -+#define HAVE_EXP2F 1 -+#define HAVE_EXPF 1 -+#define HAVE_HYPOT 1 -+#define HAVE_ISFINITE 1 -+#define HAVE_ISINF 1 -+#define HAVE_ISNAN 1 -+#define HAVE_LDEXPF 1 -+#define HAVE_LLRINT 1 -+#define HAVE_LLRINTF 1 -+#define HAVE_LOG2 1 -+#define HAVE_LOG2F 1 -+#define HAVE_LOG10F 1 -+#define HAVE_LRINT 1 -+#define HAVE_LRINTF 1 -+#define HAVE_POWF 1 -+#define HAVE_RINT 1 -+#define HAVE_ROUND 1 -+#define HAVE_ROUNDF 1 -+#define HAVE_SINF 1 -+#define HAVE_TRUNC 1 -+#define HAVE_TRUNCF 1 -+#define HAVE_DOS_PATHS 0 -+#define HAVE_LIBC_MSVCRT 0 -+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0 -+#define HAVE_SECTION_DATA_REL_RO 1 -+#define HAVE_THREADS 1 -+#define HAVE_UWP 0 -+#define HAVE_WINRT 0 -+#define HAVE_ACCESS 1 -+#define HAVE_ALIGNED_MALLOC 0 -+#define HAVE_ARC4RANDOM_BUF 0 -+#define HAVE_CLOCK_GETTIME 1 -+#define HAVE_CLOSESOCKET 0 -+#define HAVE_COMMANDLINETOARGVW 0 -+#define HAVE_FCNTL 1 -+#define HAVE_GETADDRINFO 0 -+#define HAVE_GETAUXVAL 1 -+#define HAVE_GETENV 1 -+#define HAVE_GETHRTIME 0 -+#define HAVE_GETOPT 1 -+#define HAVE_GETMODULEHANDLE 0 -+#define HAVE_GETPROCESSAFFINITYMASK 0 -+#define HAVE_GETPROCESSMEMORYINFO 0 -+#define HAVE_GETPROCESSTIMES 0 -+#define HAVE_GETRUSAGE 1 -+#define HAVE_GETSTDHANDLE 0 -+#define HAVE_GETSYSTEMTIMEASFILETIME 0 -+#define HAVE_GETTIMEOFDAY 1 -+#define HAVE_GLOB 1 -+#define HAVE_GLXGETPROCADDRESS 0 -+#define HAVE_GMTIME_R 1 -+#define HAVE_INET_ATON 0 -+#define HAVE_ISATTY 1 -+#define HAVE_KBHIT 0 -+#define HAVE_LOCALTIME_R 1 -+#define HAVE_LSTAT 1 -+#define HAVE_LZO1X_999_COMPRESS 0 -+#define HAVE_MACH_ABSOLUTE_TIME 0 -+#define HAVE_MAPVIEWOFFILE 0 -+#define HAVE_MEMALIGN 1 -+#define HAVE_MKSTEMP 1 -+#define HAVE_MMAP 1 -+#define HAVE_MPROTECT 1 -+#define HAVE_NANOSLEEP 1 -+#define HAVE_PEEKNAMEDPIPE 0 -+#define HAVE_POSIX_MEMALIGN 1 -+#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */ -+#define HAVE_PTHREAD_CANCEL 1 -+#define HAVE_PTHREAD_SET_NAME_NP 0 -+#define HAVE_PTHREAD_SETNAME_NP 0 -+#define HAVE_SCHED_GETAFFINITY 1 -+#define HAVE_SECITEMIMPORT 0 -+#define HAVE_SETCONSOLETEXTATTRIBUTE 0 -+#define HAVE_SETCONSOLECTRLHANDLER 0 -+#define HAVE_SETDLLDIRECTORY 0 -+#define HAVE_SETMODE 0 -+#define HAVE_SETRLIMIT 1 -+#define HAVE_SLEEP 0 -+#define HAVE_STRERROR_R 1 -+#define HAVE_SYSCONF 1 -+#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 0 -- forced to 0 for Fuchsia */ -+#define HAVE_SYSCTLBYNAME 0 -+#define HAVE_USLEEP 1 -+#define HAVE_UTGETOSTYPEFROMSTRING 0 -+#define HAVE_VIRTUALALLOC 0 -+#define HAVE_WGLGETPROCADDRESS 0 -+#define HAVE_BCRYPT 0 -+#define HAVE_VAAPI_DRM 0 -+#define HAVE_VAAPI_X11 0 -+#define HAVE_VAAPI_WIN32 0 -+#define HAVE_VDPAU_X11 0 -+#define HAVE_PTHREADS 1 -+#define HAVE_OS2THREADS 0 -+#define HAVE_W32THREADS 0 -+#define HAVE_AS_ARCH_DIRECTIVE 0 -+#define HAVE_AS_ARCHEXT_DOTPROD_DIRECTIVE 0 -+#define HAVE_AS_ARCHEXT_I8MM_DIRECTIVE 0 -+#define HAVE_AS_DN_DIRECTIVE 0 -+#define HAVE_AS_FPU_DIRECTIVE 0 -+#define HAVE_AS_FUNC 0 -+#define HAVE_AS_OBJECT_ARCH 0 -+#define HAVE_ASM_MOD_Q 0 -+#define HAVE_BLOCKS_EXTENSION 0 -+#define HAVE_EBP_AVAILABLE 0 -+#define HAVE_EBX_AVAILABLE 0 -+#define HAVE_GNU_AS 0 -+#define HAVE_GNU_WINDRES 0 -+#define HAVE_IBM_ASM 0 -+#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0 -+#define HAVE_INLINE_ASM_LABELS 1 -+#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 -+#define HAVE_PRAGMA_DEPRECATED 1 -+#define HAVE_RSYNC_CONTIMEOUT 0 -+#define HAVE_SYMVER_ASM_LABEL 1 -+#define HAVE_SYMVER_GNU_ASM 1 -+#define HAVE_VFP_ARGS 0 -+#define HAVE_XFORM_ASM 0 -+#define HAVE_XMM_CLOBBERS 0 -+#define HAVE_DPI_AWARENESS_CONTEXT 0 -+#define HAVE_IDXGIOUTPUT5 0 -+#define HAVE_KCMVIDEOCODECTYPE_HEVC 0 -+#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0 -+#define HAVE_KCMVIDEOCODECTYPE_VP9 0 -+#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0 -+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0 -+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0 -+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0 -+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0 -+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0 -+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0 -+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0 -+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0 -+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0 -+#define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0 -+#define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0 -+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0 -+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0 -+#define HAVE_SOCKLEN_T 0 -+#define HAVE_STRUCT_ADDRINFO 0 -+#define HAVE_STRUCT_GROUP_SOURCE_REQ 0 -+#define HAVE_STRUCT_IP_MREQ_SOURCE 0 -+#define HAVE_STRUCT_IPV6_MREQ 0 -+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0 -+#define HAVE_STRUCT_POLLFD 0 -+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1 -+#define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0 -+#define HAVE_STRUCT_SOCKADDR_IN6 0 -+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0 -+#define HAVE_STRUCT_SOCKADDR_STORAGE 0 -+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 -+#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 0 -+#define HAVE_GZIP 1 -+#define HAVE_LIBDRM_GETFB2 0 -+#define HAVE_MAKEINFO 0 -+#define HAVE_MAKEINFO_HTML 0 -+#define HAVE_OPENCL_D3D11 0 -+#define HAVE_OPENCL_DRM_ARM 0 -+#define HAVE_OPENCL_DRM_BEIGNET 0 -+#define HAVE_OPENCL_DXVA2 0 -+#define HAVE_OPENCL_VAAPI_BEIGNET 0 -+#define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0 +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-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/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/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 -+#define HAVE_XMLLINT 0 -+#define HAVE_ZLIB_GZIP 0 -+#define HAVE_OPENVINO2 0 -+#define CONFIG_DOC 0 -+#define CONFIG_HTMLPAGES 0 -+#define CONFIG_MANPAGES 0 -+#define CONFIG_PODPAGES 0 -+#define CONFIG_TXTPAGES 0 -+#define CONFIG_AVIO_HTTP_SERVE_FILES_EXAMPLE 1 -+#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1 -+#define CONFIG_AVIO_READ_CALLBACK_EXAMPLE 1 -+#define CONFIG_DECODE_AUDIO_EXAMPLE 1 -+#define CONFIG_DECODE_FILTER_AUDIO_EXAMPLE 0 -+#define CONFIG_DECODE_FILTER_VIDEO_EXAMPLE 0 -+#define CONFIG_DECODE_VIDEO_EXAMPLE 1 -+#define CONFIG_DEMUX_DECODE_EXAMPLE 1 -+#define CONFIG_ENCODE_AUDIO_EXAMPLE 1 -+#define CONFIG_ENCODE_VIDEO_EXAMPLE 1 -+#define CONFIG_EXTRACT_MVS_EXAMPLE 1 -+#define CONFIG_FILTER_AUDIO_EXAMPLE 0 -+#define CONFIG_HW_DECODE_EXAMPLE 1 -+#define CONFIG_MUX_EXAMPLE 0 -+#define CONFIG_QSV_DECODE_EXAMPLE 0 -+#define CONFIG_REMUX_EXAMPLE 1 -+#define CONFIG_RESAMPLE_AUDIO_EXAMPLE 0 -+#define CONFIG_SCALE_VIDEO_EXAMPLE 0 -+#define CONFIG_SHOW_METADATA_EXAMPLE 1 -+#define CONFIG_TRANSCODE_AAC_EXAMPLE 0 -+#define CONFIG_TRANSCODE_EXAMPLE 0 -+#define CONFIG_VAAPI_ENCODE_EXAMPLE 0 -+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0 -+#define CONFIG_QSV_TRANSCODE_EXAMPLE 0 -+#define CONFIG_AVISYNTH 0 -+#define CONFIG_FREI0R 0 -+#define CONFIG_LIBCDIO 0 -+#define CONFIG_LIBDAVS2 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 -+#define CONFIG_LIBX265 0 -+#define CONFIG_LIBXAVS 0 -+#define CONFIG_LIBXAVS2 0 -+#define CONFIG_LIBXVID 0 -+#define CONFIG_DECKLINK 0 -+#define CONFIG_LIBFDK_AAC 0 -+#define CONFIG_LIBTLS 0 -+#define CONFIG_GMP 0 -+#define CONFIG_LIBARIBB24 0 -+#define CONFIG_LIBLENSFUN 0 -+#define CONFIG_LIBOPENCORE_AMRNB 0 -+#define CONFIG_LIBOPENCORE_AMRWB 0 -+#define CONFIG_LIBVO_AMRWBENC 0 -+#define CONFIG_MBEDTLS 0 -+#define CONFIG_RKMPP 0 -+#define CONFIG_LIBSMBCLIENT 0 -+#define CONFIG_CHROMAPRINT 0 -+#define CONFIG_GCRYPT 0 -+#define CONFIG_GNUTLS 0 -+#define CONFIG_JNI 0 -+#define CONFIG_LADSPA 0 -+#define CONFIG_LCMS2 0 -+#define CONFIG_LIBAOM 0 -+#define CONFIG_LIBARIBCAPTION 0 -+#define CONFIG_LIBASS 0 -+#define CONFIG_LIBBLURAY 0 -+#define CONFIG_LIBBS2B 0 -+#define CONFIG_LIBCACA 0 -+#define CONFIG_LIBCELT 0 -+#define CONFIG_LIBCODEC2 0 -+#define CONFIG_LIBDAV1D 0 -+#define CONFIG_LIBDC1394 0 -+#define CONFIG_LIBFLITE 0 -+#define CONFIG_LIBFONTCONFIG 0 -+#define CONFIG_LIBFREETYPE 0 -+#define CONFIG_LIBFRIBIDI 0 -+#define CONFIG_LIBHARFBUZZ 0 -+#define CONFIG_LIBGLSLANG 0 -+#define CONFIG_LIBGME 0 -+#define CONFIG_LIBGSM 0 -+#define CONFIG_LIBIEC61883 0 -+#define CONFIG_LIBILBC 0 -+#define CONFIG_LIBJACK 0 -+#define CONFIG_LIBJXL 0 -+#define CONFIG_LIBKLVANC 0 -+#define CONFIG_LIBKVAZAAR 0 -+#define CONFIG_LIBMODPLUG 0 -+#define CONFIG_LIBMP3LAME 0 -+#define CONFIG_LIBMYSOFA 0 -+#define CONFIG_LIBOPENCV 0 -+#define CONFIG_LIBOPENH264 0 -+#define CONFIG_LIBOPENJPEG 0 -+#define CONFIG_LIBOPENMPT 0 -+#define CONFIG_LIBOPENVINO 0 -+#define CONFIG_LIBOPUS 1 -+#define CONFIG_LIBPLACEBO 0 -+#define CONFIG_LIBPULSE 0 -+#define CONFIG_LIBQRENCODE 0 -+#define CONFIG_LIBQUIRC 0 -+#define CONFIG_LIBRABBITMQ 0 -+#define CONFIG_LIBRAV1E 0 -+#define CONFIG_LIBRIST 0 -+#define CONFIG_LIBRSVG 0 -+#define CONFIG_LIBRTMP 0 -+#define CONFIG_LIBSHADERC 0 -+#define CONFIG_LIBSHINE 0 -+#define CONFIG_LIBSMBCLIENT 0 -+#define CONFIG_LIBSNAPPY 0 -+#define CONFIG_LIBSOXR 0 -+#define CONFIG_LIBSPEEX 0 -+#define CONFIG_LIBSRT 0 -+#define CONFIG_LIBSSH 0 -+#define CONFIG_LIBSVTAV1 0 -+#define CONFIG_LIBTENSORFLOW 0 -+#define CONFIG_LIBTESSERACT 0 -+#define CONFIG_LIBTHEORA 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 -+#define CONFIG_LIBVMAF 0 -+#define CONFIG_LIBVORBIS 0 -+#define CONFIG_LIBVPX 0 -+#define CONFIG_LIBWEBP 0 -+#define CONFIG_LIBXEVD 0 -+#define CONFIG_LIBXEVE 0 -+#define CONFIG_LIBXML2 0 -+#define CONFIG_LIBZIMG 0 -+#define CONFIG_LIBZMQ 0 -+#define CONFIG_LIBZVBI 0 -+#define CONFIG_LV2 0 -+#define CONFIG_MEDIACODEC 0 -+#define CONFIG_OPENAL 0 -+#define CONFIG_OPENGL 0 -+#define CONFIG_OPENSSL 0 -+#define CONFIG_POCKETSPHINX 0 -+#define CONFIG_VAPOURSYNTH 0 -+#define CONFIG_ALSA 0 -+#define CONFIG_APPKIT 0 -+#define CONFIG_AVFOUNDATION 0 -+#define CONFIG_BZLIB 0 -+#define CONFIG_COREIMAGE 0 -+#define CONFIG_ICONV 0 -+#define CONFIG_LIBXCB 0 -+#define CONFIG_LIBXCB_SHM 0 -+#define CONFIG_LIBXCB_SHAPE 0 -+#define CONFIG_LIBXCB_XFIXES 0 -+#define CONFIG_LZMA 0 -+#define CONFIG_MEDIAFOUNDATION 0 -+#define CONFIG_METAL 0 -+#define CONFIG_SCHANNEL 0 -+#define CONFIG_SDL2 0 -+#define CONFIG_SECURETRANSPORT 0 -+#define CONFIG_SNDIO 0 -+#define CONFIG_XLIB 0 -+#define CONFIG_ZLIB 0 -+#define CONFIG_CUDA_NVCC 0 -+#define CONFIG_CUDA_SDK 0 -+#define CONFIG_LIBNPP 0 -+#define CONFIG_LIBMFX 0 -+#define CONFIG_LIBVPL 0 -+#define CONFIG_MMAL 0 -+#define CONFIG_OMX 0 -+#define CONFIG_OPENCL 0 -+#define CONFIG_AMF 0 -+#define CONFIG_AUDIOTOOLBOX 0 -+#define CONFIG_CUDA 0 -+#define CONFIG_CUDA_LLVM 0 -+#define CONFIG_CUVID 0 -+#define CONFIG_D3D11VA 0 -+#define CONFIG_D3D12VA 0 -+#define CONFIG_DXVA2 0 -+#define CONFIG_FFNVCODEC 0 -+#define CONFIG_LIBDRM 0 -+#define CONFIG_NVDEC 0 -+#define CONFIG_NVENC 0 -+#define CONFIG_VAAPI 0 -+#define CONFIG_VDPAU 0 -+#define CONFIG_VIDEOTOOLBOX 0 -+#define CONFIG_VULKAN 0 -+#define CONFIG_V4L2_M2M 0 -+#define CONFIG_FTRAPV 0 -+#define CONFIG_GRAY 0 -+#define CONFIG_HARDCODED_TABLES 0 -+#define CONFIG_OMX_RPI 0 -+#define CONFIG_RUNTIME_CPUDETECT 1 -+#define CONFIG_SAFE_BITSTREAM_READER 1 -+#define CONFIG_SHARED 0 -+#define CONFIG_SMALL 0 -+#define CONFIG_STATIC 1 -+#define CONFIG_SWSCALE_ALPHA 1 -+#define CONFIG_GPL 0 -+#define CONFIG_NONFREE 0 -+#define CONFIG_VERSION3 0 -+#define CONFIG_AVDEVICE 0 -+#define CONFIG_AVFILTER 0 -+#define CONFIG_SWSCALE 0 -+#define CONFIG_POSTPROC 0 -+#define CONFIG_AVFORMAT 1 -+#define CONFIG_AVCODEC 1 -+#define CONFIG_SWRESAMPLE 0 -+#define CONFIG_AVUTIL 1 -+#define CONFIG_FFPLAY 0 -+#define CONFIG_FFPROBE 0 -+#define CONFIG_FFMPEG 0 -+#define CONFIG_DWT 0 -+#define CONFIG_ERROR_RESILIENCE 1 -+#define CONFIG_FAAN 0 -+#define CONFIG_FAST_UNALIGNED 0 -+#define CONFIG_LSP 0 -+#define CONFIG_PIXELUTILS 0 -+#define CONFIG_NETWORK 0 -+#define CONFIG_AUTODETECT 0 -+#define CONFIG_FONTCONFIG 0 -+#define CONFIG_LARGE_TESTS 1 -+#define CONFIG_LINUX_PERF 0 -+#define CONFIG_MACOS_KPERF 0 -+#define CONFIG_MEMORY_POISONING 0 -+#define CONFIG_NEON_CLOBBER_TEST 0 -+#define CONFIG_OSSFUZZ 0 -+#define CONFIG_PIC 1 -+#define CONFIG_PTX_COMPRESSION 0 -+#define CONFIG_THUMB 0 -+#define CONFIG_VALGRIND_BACKTRACE 0 -+#define CONFIG_XMM_CLOBBER_TEST 0 -+#define CONFIG_BSFS 0 -+#define CONFIG_DECODERS 1 -+#define CONFIG_ENCODERS 0 -+#define CONFIG_HWACCELS 0 -+#define CONFIG_PARSERS 1 -+#define CONFIG_INDEVS 0 -+#define CONFIG_OUTDEVS 0 -+#define CONFIG_FILTERS 0 -+#define CONFIG_DEMUXERS 1 -+#define CONFIG_MUXERS 0 -+#define CONFIG_PROTOCOLS 0 -+#define CONFIG_AANDCTTABLES 0 -+#define CONFIG_AC3DSP 0 -+#define CONFIG_ADTS_HEADER 1 -+#define CONFIG_ATSC_A53 1 -+#define CONFIG_AUDIO_FRAME_QUEUE 0 -+#define CONFIG_AUDIODSP 0 -+#define CONFIG_BLOCKDSP 1 -+#define CONFIG_BSWAPDSP 0 -+#define CONFIG_CABAC 1 -+#define CONFIG_CBS 0 -+#define CONFIG_CBS_AV1 0 -+#define CONFIG_CBS_H264 0 -+#define CONFIG_CBS_H265 0 -+#define CONFIG_CBS_H266 0 -+#define CONFIG_CBS_JPEG 0 -+#define CONFIG_CBS_MPEG2 0 -+#define CONFIG_CBS_VP8 0 -+#define CONFIG_CBS_VP9 0 -+#define CONFIG_DEFLATE_WRAPPER 0 -+#define CONFIG_DIRAC_PARSE 1 -+#define CONFIG_DNN 0 -+#define CONFIG_DOVI_RPU 0 -+#define CONFIG_DVPROFILE 0 -+#define CONFIG_EVCPARSE 0 -+#define CONFIG_EXIF 1 -+#define CONFIG_FAANDCT 0 -+#define CONFIG_FAANIDCT 0 -+#define CONFIG_FDCTDSP 0 -+#define CONFIG_FMTCONVERT 0 -+#define CONFIG_FRAME_THREAD_ENCODER 0 -+#define CONFIG_G722DSP 0 -+#define CONFIG_GOLOMB 1 -+#define CONFIG_GPLV3 0 -+#define CONFIG_H263DSP 1 -+#define CONFIG_H264CHROMA 1 -+#define CONFIG_H264DSP 1 -+#define CONFIG_H264PARSE 1 -+#define CONFIG_H264PRED 1 -+#define CONFIG_H264QPEL 1 -+#define CONFIG_H264_SEI 1 -+#define CONFIG_HEVCPARSE 0 -+#define CONFIG_HEVC_SEI 0 -+#define CONFIG_HPELDSP 1 -+#define CONFIG_HUFFMAN 0 -+#define CONFIG_HUFFYUVDSP 0 -+#define CONFIG_HUFFYUVENCDSP 0 -+#define CONFIG_IAMFDEC 0 -+#define CONFIG_IAMFENC 0 -+#define CONFIG_IDCTDSP 1 -+#define CONFIG_IIRFILTER 0 -+#define CONFIG_INFLATE_WRAPPER 0 -+#define CONFIG_INTRAX8 0 -+#define CONFIG_ISO_MEDIA 1 -+#define CONFIG_IVIDSP 0 -+#define CONFIG_JPEGTABLES 0 -+#define CONFIG_LGPLV3 0 -+#define CONFIG_LIBX262 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 -+#define CONFIG_LPC 0 -+#define CONFIG_LZF 0 -+#define CONFIG_ME_CMP 1 -+#define CONFIG_MPEG_ER 1 -+#define CONFIG_MPEGAUDIO 1 -+#define CONFIG_MPEGAUDIODSP 1 -+#define CONFIG_MPEGAUDIOHEADER 1 -+#define CONFIG_MPEG4AUDIO 1 -+#define CONFIG_MPEGVIDEO 1 -+#define CONFIG_MPEGVIDEODEC 1 -+#define CONFIG_MPEGVIDEOENC 0 -+#define CONFIG_MSMPEG4DEC 0 -+#define CONFIG_MSMPEG4ENC 0 -+#define CONFIG_MSS34DSP 0 -+#define CONFIG_PIXBLOCKDSP 0 -+#define CONFIG_QPELDSP 1 -+#define CONFIG_QSV 0 -+#define CONFIG_QSVDEC 0 -+#define CONFIG_QSVENC 0 -+#define CONFIG_QSVVPP 0 -+#define CONFIG_RANGECODER 0 -+#define CONFIG_RIFFDEC 1 -+#define CONFIG_RIFFENC 0 -+#define CONFIG_RTPDEC 0 -+#define CONFIG_RTPENC_CHAIN 0 -+#define CONFIG_RV34DSP 0 -+#define CONFIG_SCENE_SAD 0 -+#define CONFIG_SINEWIN 1 -+#define CONFIG_SNAPPY 0 -+#define CONFIG_SRTP 0 -+#define CONFIG_STARTCODE 1 -+#define CONFIG_TEXTUREDSP 0 -+#define CONFIG_TEXTUREDSPENC 0 -+#define CONFIG_TPELDSP 0 -+#define CONFIG_VAAPI_1 0 -+#define CONFIG_VAAPI_ENCODE 0 -+#define CONFIG_VC1DSP 0 -+#define CONFIG_VIDEODSP 1 -+#define CONFIG_VP3DSP 0 -+#define CONFIG_VP56DSP 0 -+#define CONFIG_VP8DSP 0 -+#define CONFIG_WMA_FREQS 0 -+#define CONFIG_WMV2DSP 0 -+#endif /* FFMPEG_CONFIG_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/config_components.h -@@ -0,0 +1,2210 @@ -+/* Automatically generated by configure - do not modify! */ -+#ifndef FFMPEG_CONFIG_COMPONENTS_H -+#define FFMPEG_CONFIG_COMPONENTS_H -+#define CONFIG_AAC_ADTSTOASC_BSF 0 -+#define CONFIG_AV1_FRAME_MERGE_BSF 0 -+#define CONFIG_AV1_FRAME_SPLIT_BSF 0 -+#define CONFIG_AV1_METADATA_BSF 0 -+#define CONFIG_CHOMP_BSF 0 -+#define CONFIG_DUMP_EXTRADATA_BSF 0 -+#define CONFIG_DCA_CORE_BSF 0 -+#define CONFIG_DTS2PTS_BSF 0 -+#define CONFIG_DV_ERROR_MARKER_BSF 0 -+#define CONFIG_EAC3_CORE_BSF 0 -+#define CONFIG_EXTRACT_EXTRADATA_BSF 0 -+#define CONFIG_FILTER_UNITS_BSF 0 -+#define CONFIG_H264_METADATA_BSF 0 -+#define CONFIG_H264_MP4TOANNEXB_BSF 0 -+#define CONFIG_H264_REDUNDANT_PPS_BSF 0 -+#define CONFIG_HAPQA_EXTRACT_BSF 0 -+#define CONFIG_HEVC_METADATA_BSF 0 -+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0 -+#define CONFIG_IMX_DUMP_HEADER_BSF 0 -+#define CONFIG_MEDIA100_TO_MJPEGB_BSF 0 -+#define CONFIG_MJPEG2JPEG_BSF 0 -+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0 -+#define CONFIG_MPEG2_METADATA_BSF 0 -+#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0 -+#define CONFIG_MOV2TEXTSUB_BSF 0 -+#define CONFIG_NOISE_BSF 0 -+#define CONFIG_NULL_BSF 0 -+#define CONFIG_OPUS_METADATA_BSF 0 -+#define CONFIG_PCM_RECHUNK_BSF 0 -+#define CONFIG_PGS_FRAME_MERGE_BSF 0 -+#define CONFIG_PRORES_METADATA_BSF 0 -+#define CONFIG_REMOVE_EXTRADATA_BSF 0 -+#define CONFIG_SETTS_BSF 0 -+#define CONFIG_SHOWINFO_BSF 0 -+#define CONFIG_TEXT2MOVSUB_BSF 0 -+#define CONFIG_TRACE_HEADERS_BSF 0 -+#define CONFIG_TRUEHD_CORE_BSF 0 -+#define CONFIG_VP9_METADATA_BSF 0 -+#define CONFIG_VP9_RAW_REORDER_BSF 0 -+#define CONFIG_VP9_SUPERFRAME_BSF 0 -+#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 -+#define CONFIG_VVC_METADATA_BSF 0 -+#define CONFIG_VVC_MP4TOANNEXB_BSF 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_AASC_DECODER 0 -+#define CONFIG_AIC_DECODER 0 -+#define CONFIG_ALIAS_PIX_DECODER 0 -+#define CONFIG_AGM_DECODER 0 -+#define CONFIG_AMV_DECODER 0 -+#define CONFIG_ANM_DECODER 0 -+#define CONFIG_ANSI_DECODER 0 -+#define CONFIG_APNG_DECODER 0 -+#define CONFIG_ARBC_DECODER 0 -+#define CONFIG_ARGO_DECODER 0 -+#define CONFIG_ASV1_DECODER 0 -+#define CONFIG_ASV2_DECODER 0 -+#define CONFIG_AURA_DECODER 0 -+#define CONFIG_AURA2_DECODER 0 -+#define CONFIG_AVRP_DECODER 0 -+#define CONFIG_AVRN_DECODER 0 -+#define CONFIG_AVS_DECODER 0 -+#define CONFIG_AVUI_DECODER 0 -+#define CONFIG_BETHSOFTVID_DECODER 0 -+#define CONFIG_BFI_DECODER 0 -+#define CONFIG_BINK_DECODER 0 -+#define CONFIG_BITPACKED_DECODER 0 -+#define CONFIG_BMP_DECODER 0 -+#define CONFIG_BMV_VIDEO_DECODER 0 -+#define CONFIG_BRENDER_PIX_DECODER 0 -+#define CONFIG_C93_DECODER 0 -+#define CONFIG_CAVS_DECODER 0 -+#define CONFIG_CDGRAPHICS_DECODER 0 -+#define CONFIG_CDTOONS_DECODER 0 -+#define CONFIG_CDXL_DECODER 0 -+#define CONFIG_CFHD_DECODER 0 -+#define CONFIG_CINEPAK_DECODER 0 -+#define CONFIG_CLEARVIDEO_DECODER 0 -+#define CONFIG_CLJR_DECODER 0 -+#define CONFIG_CLLC_DECODER 0 -+#define CONFIG_COMFORTNOISE_DECODER 0 -+#define CONFIG_CPIA_DECODER 0 -+#define CONFIG_CRI_DECODER 0 -+#define CONFIG_CSCD_DECODER 0 -+#define CONFIG_CYUV_DECODER 0 -+#define CONFIG_DDS_DECODER 0 -+#define CONFIG_DFA_DECODER 0 -+#define CONFIG_DIRAC_DECODER 0 -+#define CONFIG_DNXHD_DECODER 0 -+#define CONFIG_DPX_DECODER 0 -+#define CONFIG_DSICINVIDEO_DECODER 0 -+#define CONFIG_DVAUDIO_DECODER 0 -+#define CONFIG_DVVIDEO_DECODER 0 -+#define CONFIG_DXA_DECODER 0 -+#define CONFIG_DXTORY_DECODER 0 -+#define CONFIG_DXV_DECODER 0 -+#define CONFIG_EACMV_DECODER 0 -+#define CONFIG_EAMAD_DECODER 0 -+#define CONFIG_EATGQ_DECODER 0 -+#define CONFIG_EATGV_DECODER 0 -+#define CONFIG_EATQI_DECODER 0 -+#define CONFIG_EIGHTBPS_DECODER 0 -+#define CONFIG_EIGHTSVX_EXP_DECODER 0 -+#define CONFIG_EIGHTSVX_FIB_DECODER 0 -+#define CONFIG_ESCAPE124_DECODER 0 -+#define CONFIG_ESCAPE130_DECODER 0 -+#define CONFIG_EXR_DECODER 0 -+#define CONFIG_FFV1_DECODER 0 -+#define CONFIG_FFVHUFF_DECODER 0 -+#define CONFIG_FIC_DECODER 0 -+#define CONFIG_FITS_DECODER 0 -+#define CONFIG_FLASHSV_DECODER 0 -+#define CONFIG_FLASHSV2_DECODER 0 -+#define CONFIG_FLIC_DECODER 0 -+#define CONFIG_FLV_DECODER 0 -+#define CONFIG_FMVC_DECODER 0 -+#define CONFIG_FOURXM_DECODER 0 -+#define CONFIG_FRAPS_DECODER 0 -+#define CONFIG_FRWU_DECODER 0 -+#define CONFIG_G2M_DECODER 0 -+#define CONFIG_GDV_DECODER 0 -+#define CONFIG_GEM_DECODER 0 -+#define CONFIG_GIF_DECODER 0 -+#define CONFIG_H261_DECODER 0 -+#define CONFIG_H263_DECODER 1 -+#define CONFIG_H263I_DECODER 0 -+#define CONFIG_H263P_DECODER 0 -+#define CONFIG_H263_V4L2M2M_DECODER 0 -+#define CONFIG_H264_DECODER 1 -+#define CONFIG_H264_V4L2M2M_DECODER 0 -+#define CONFIG_H264_MEDIACODEC_DECODER 0 -+#define CONFIG_H264_MMAL_DECODER 0 -+#define CONFIG_H264_QSV_DECODER 0 -+#define CONFIG_H264_RKMPP_DECODER 0 -+#define CONFIG_HAP_DECODER 0 -+#define CONFIG_HEVC_DECODER 0 -+#define CONFIG_HEVC_QSV_DECODER 0 -+#define CONFIG_HEVC_RKMPP_DECODER 0 -+#define CONFIG_HEVC_V4L2M2M_DECODER 0 -+#define CONFIG_HNM4_VIDEO_DECODER 0 -+#define CONFIG_HQ_HQA_DECODER 0 -+#define CONFIG_HQX_DECODER 0 -+#define CONFIG_HUFFYUV_DECODER 0 -+#define CONFIG_HYMT_DECODER 0 -+#define CONFIG_IDCIN_DECODER 0 -+#define CONFIG_IFF_ILBM_DECODER 0 -+#define CONFIG_IMM4_DECODER 0 -+#define CONFIG_IMM5_DECODER 0 -+#define CONFIG_INDEO2_DECODER 0 -+#define CONFIG_INDEO3_DECODER 0 -+#define CONFIG_INDEO4_DECODER 0 -+#define CONFIG_INDEO5_DECODER 0 -+#define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+#define CONFIG_IPU_DECODER 0 -+#define CONFIG_JPEG2000_DECODER 0 -+#define CONFIG_JPEGLS_DECODER 0 -+#define CONFIG_JV_DECODER 0 -+#define CONFIG_KGV1_DECODER 0 -+#define CONFIG_KMVC_DECODER 0 -+#define CONFIG_LAGARITH_DECODER 0 -+#define CONFIG_LEAD_DECODER 0 -+#define CONFIG_LOCO_DECODER 0 -+#define CONFIG_LSCR_DECODER 0 -+#define CONFIG_M101_DECODER 0 -+#define CONFIG_MAGICYUV_DECODER 0 -+#define CONFIG_MDEC_DECODER 0 -+#define CONFIG_MEDIA100_DECODER 0 -+#define CONFIG_MIMIC_DECODER 0 -+#define CONFIG_MJPEG_DECODER 0 -+#define CONFIG_MJPEGB_DECODER 0 -+#define CONFIG_MMVIDEO_DECODER 0 -+#define CONFIG_MOBICLIP_DECODER 0 -+#define CONFIG_MOTIONPIXELS_DECODER 0 -+#define CONFIG_MPEG1VIDEO_DECODER 0 -+#define CONFIG_MPEG2VIDEO_DECODER 0 -+#define CONFIG_MPEG4_DECODER 1 -+#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_V4L2M2M_DECODER 0 -+#define CONFIG_MPEG2_QSV_DECODER 0 -+#define CONFIG_MPEG2_MEDIACODEC_DECODER 0 -+#define CONFIG_MSA1_DECODER 0 -+#define CONFIG_MSCC_DECODER 0 -+#define CONFIG_MSMPEG4V1_DECODER 0 -+#define CONFIG_MSMPEG4V2_DECODER 0 -+#define CONFIG_MSMPEG4V3_DECODER 0 -+#define CONFIG_MSP2_DECODER 0 -+#define CONFIG_MSRLE_DECODER 0 -+#define CONFIG_MSS1_DECODER 0 -+#define CONFIG_MSS2_DECODER 0 -+#define CONFIG_MSVIDEO1_DECODER 0 -+#define CONFIG_MSZH_DECODER 0 -+#define CONFIG_MTS2_DECODER 0 -+#define CONFIG_MV30_DECODER 0 -+#define CONFIG_MVC1_DECODER 0 -+#define CONFIG_MVC2_DECODER 0 -+#define CONFIG_MVDV_DECODER 0 -+#define CONFIG_MVHA_DECODER 0 -+#define CONFIG_MWSC_DECODER 0 -+#define CONFIG_MXPEG_DECODER 0 -+#define CONFIG_NOTCHLC_DECODER 0 -+#define CONFIG_NUV_DECODER 0 -+#define CONFIG_PAF_VIDEO_DECODER 0 -+#define CONFIG_PAM_DECODER 0 -+#define CONFIG_PBM_DECODER 0 -+#define CONFIG_PCX_DECODER 0 -+#define CONFIG_PDV_DECODER 0 -+#define CONFIG_PFM_DECODER 0 -+#define CONFIG_PGM_DECODER 0 -+#define CONFIG_PGMYUV_DECODER 0 -+#define CONFIG_PGX_DECODER 0 -+#define CONFIG_PHM_DECODER 0 -+#define CONFIG_PHOTOCD_DECODER 0 -+#define CONFIG_PICTOR_DECODER 0 -+#define CONFIG_PIXLET_DECODER 0 -+#define CONFIG_PNG_DECODER 0 -+#define CONFIG_PPM_DECODER 0 -+#define CONFIG_PRORES_DECODER 0 -+#define CONFIG_PROSUMER_DECODER 0 -+#define CONFIG_PSD_DECODER 0 -+#define CONFIG_PTX_DECODER 0 -+#define CONFIG_QDRAW_DECODER 0 -+#define CONFIG_QOI_DECODER 0 -+#define CONFIG_QPEG_DECODER 0 -+#define CONFIG_QTRLE_DECODER 0 -+#define CONFIG_R10K_DECODER 0 -+#define CONFIG_R210_DECODER 0 -+#define CONFIG_RASC_DECODER 0 -+#define CONFIG_RAWVIDEO_DECODER 0 -+#define CONFIG_RKA_DECODER 0 -+#define CONFIG_RL2_DECODER 0 -+#define CONFIG_ROQ_DECODER 0 -+#define CONFIG_RPZA_DECODER 0 -+#define CONFIG_RSCC_DECODER 0 -+#define CONFIG_RTV1_DECODER 0 -+#define CONFIG_RV10_DECODER 0 -+#define CONFIG_RV20_DECODER 0 -+#define CONFIG_RV30_DECODER 0 -+#define CONFIG_RV40_DECODER 0 -+#define CONFIG_S302M_DECODER 0 -+#define CONFIG_SANM_DECODER 0 -+#define CONFIG_SCPR_DECODER 0 -+#define CONFIG_SCREENPRESSO_DECODER 0 -+#define CONFIG_SGA_DECODER 0 -+#define CONFIG_SGI_DECODER 0 -+#define CONFIG_SGIRLE_DECODER 0 -+#define CONFIG_SHEERVIDEO_DECODER 0 -+#define CONFIG_SIMBIOSIS_IMX_DECODER 0 -+#define CONFIG_SMACKER_DECODER 0 -+#define CONFIG_SMC_DECODER 0 -+#define CONFIG_SMVJPEG_DECODER 0 -+#define CONFIG_SNOW_DECODER 0 -+#define CONFIG_SP5X_DECODER 0 -+#define CONFIG_SPEEDHQ_DECODER 0 -+#define CONFIG_SPEEX_DECODER 0 -+#define CONFIG_SRGC_DECODER 0 -+#define CONFIG_SUNRAST_DECODER 0 -+#define CONFIG_SVQ1_DECODER 0 -+#define CONFIG_SVQ3_DECODER 0 -+#define CONFIG_TARGA_DECODER 0 -+#define CONFIG_TARGA_Y216_DECODER 0 -+#define CONFIG_TDSC_DECODER 0 -+#define CONFIG_THEORA_DECODER 0 -+#define CONFIG_THP_DECODER 0 -+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+#define CONFIG_TIFF_DECODER 0 -+#define CONFIG_TMV_DECODER 0 -+#define CONFIG_TRUEMOTION1_DECODER 0 -+#define CONFIG_TRUEMOTION2_DECODER 0 -+#define CONFIG_TRUEMOTION2RT_DECODER 0 -+#define CONFIG_TSCC_DECODER 0 -+#define CONFIG_TSCC2_DECODER 0 -+#define CONFIG_TXD_DECODER 0 -+#define CONFIG_ULTI_DECODER 0 -+#define CONFIG_UTVIDEO_DECODER 0 -+#define CONFIG_V210_DECODER 0 -+#define CONFIG_V210X_DECODER 0 -+#define CONFIG_V308_DECODER 0 -+#define CONFIG_V408_DECODER 0 -+#define CONFIG_V410_DECODER 0 -+#define CONFIG_VB_DECODER 0 -+#define CONFIG_VBN_DECODER 0 -+#define CONFIG_VBLE_DECODER 0 -+#define CONFIG_VC1_DECODER 0 -+#define CONFIG_VC1IMAGE_DECODER 0 -+#define CONFIG_VC1_MMAL_DECODER 0 -+#define CONFIG_VC1_QSV_DECODER 0 -+#define CONFIG_VC1_V4L2M2M_DECODER 0 -+#define CONFIG_VCR1_DECODER 0 -+#define CONFIG_VMDVIDEO_DECODER 0 -+#define CONFIG_VMIX_DECODER 0 -+#define CONFIG_VMNC_DECODER 0 -+#define CONFIG_VP3_DECODER 0 -+#define CONFIG_VP4_DECODER 0 -+#define CONFIG_VP5_DECODER 0 -+#define CONFIG_VP6_DECODER 0 -+#define CONFIG_VP6A_DECODER 0 -+#define CONFIG_VP6F_DECODER 0 -+#define CONFIG_VP7_DECODER 0 -+#define CONFIG_VP8_DECODER 0 -+#define CONFIG_VP8_RKMPP_DECODER 0 -+#define CONFIG_VP8_V4L2M2M_DECODER 0 -+#define CONFIG_VP9_DECODER 0 -+#define CONFIG_VP9_RKMPP_DECODER 0 -+#define CONFIG_VP9_V4L2M2M_DECODER 0 -+#define CONFIG_VQA_DECODER 0 -+#define CONFIG_VQC_DECODER 0 -+#define CONFIG_VVC_DECODER 0 -+#define CONFIG_WBMP_DECODER 0 -+#define CONFIG_WEBP_DECODER 0 -+#define CONFIG_WCMV_DECODER 0 -+#define CONFIG_WRAPPED_AVFRAME_DECODER 0 -+#define CONFIG_WMV1_DECODER 0 -+#define CONFIG_WMV2_DECODER 0 -+#define CONFIG_WMV3_DECODER 0 -+#define CONFIG_WMV3IMAGE_DECODER 0 -+#define CONFIG_WNV1_DECODER 0 -+#define CONFIG_XAN_WC3_DECODER 0 -+#define CONFIG_XAN_WC4_DECODER 0 -+#define CONFIG_XBM_DECODER 0 -+#define CONFIG_XFACE_DECODER 0 -+#define CONFIG_XL_DECODER 0 -+#define CONFIG_XPM_DECODER 0 -+#define CONFIG_XWD_DECODER 0 -+#define CONFIG_Y41P_DECODER 0 -+#define CONFIG_YLC_DECODER 0 -+#define CONFIG_YOP_DECODER 0 -+#define CONFIG_YUV4_DECODER 0 -+#define CONFIG_ZERO12V_DECODER 0 -+#define CONFIG_ZEROCODEC_DECODER 0 -+#define CONFIG_ZLIB_DECODER 0 -+#define CONFIG_ZMBV_DECODER 0 -+#define CONFIG_AAC_DECODER 1 -+#define CONFIG_AAC_FIXED_DECODER 0 -+#define CONFIG_AAC_LATM_DECODER 0 -+#define CONFIG_AC3_DECODER 0 -+#define CONFIG_AC3_FIXED_DECODER 0 -+#define CONFIG_ACELP_KELVIN_DECODER 0 -+#define CONFIG_ALAC_DECODER 0 -+#define CONFIG_ALS_DECODER 0 -+#define CONFIG_AMRNB_DECODER 0 -+#define CONFIG_AMRWB_DECODER 0 -+#define CONFIG_APAC_DECODER 0 -+#define CONFIG_APE_DECODER 0 -+#define CONFIG_APTX_DECODER 0 -+#define CONFIG_APTX_HD_DECODER 0 -+#define CONFIG_ATRAC1_DECODER 0 -+#define CONFIG_ATRAC3_DECODER 0 -+#define CONFIG_ATRAC3AL_DECODER 0 -+#define CONFIG_ATRAC3P_DECODER 0 -+#define CONFIG_ATRAC3PAL_DECODER 0 -+#define CONFIG_ATRAC9_DECODER 0 -+#define CONFIG_BINKAUDIO_DCT_DECODER 0 -+#define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+#define CONFIG_BMV_AUDIO_DECODER 0 -+#define CONFIG_BONK_DECODER 0 -+#define CONFIG_COOK_DECODER 0 -+#define CONFIG_DCA_DECODER 0 -+#define CONFIG_DFPWM_DECODER 0 -+#define CONFIG_DOLBY_E_DECODER 0 -+#define CONFIG_DSD_LSBF_DECODER 0 -+#define CONFIG_DSD_MSBF_DECODER 0 -+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0 -+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0 -+#define CONFIG_DSICINAUDIO_DECODER 0 -+#define CONFIG_DSS_SP_DECODER 0 -+#define CONFIG_DST_DECODER 0 -+#define CONFIG_EAC3_DECODER 0 -+#define CONFIG_EVRC_DECODER 0 -+#define CONFIG_FASTAUDIO_DECODER 0 -+#define CONFIG_FFWAVESYNTH_DECODER 0 -+#define CONFIG_FLAC_DECODER 1 -+#define CONFIG_FTR_DECODER 0 -+#define CONFIG_G723_1_DECODER 0 -+#define CONFIG_G729_DECODER 0 -+#define CONFIG_GSM_DECODER 0 -+#define CONFIG_GSM_MS_DECODER 0 -+#define CONFIG_HCA_DECODER 0 -+#define CONFIG_HCOM_DECODER 0 -+#define CONFIG_HDR_DECODER 0 -+#define CONFIG_IAC_DECODER 0 -+#define CONFIG_ILBC_DECODER 0 -+#define CONFIG_IMC_DECODER 0 -+#define CONFIG_INTERPLAY_ACM_DECODER 0 -+#define CONFIG_MACE3_DECODER 0 -+#define CONFIG_MACE6_DECODER 0 -+#define CONFIG_METASOUND_DECODER 0 -+#define CONFIG_MISC4_DECODER 0 -+#define CONFIG_MLP_DECODER 0 -+#define CONFIG_MP1_DECODER 0 -+#define CONFIG_MP1FLOAT_DECODER 0 -+#define CONFIG_MP2_DECODER 0 -+#define CONFIG_MP2FLOAT_DECODER 0 -+#define CONFIG_MP3FLOAT_DECODER 0 -+#define CONFIG_MP3_DECODER 1 -+#define CONFIG_MP3ADUFLOAT_DECODER 0 -+#define CONFIG_MP3ADU_DECODER 0 -+#define CONFIG_MP3ON4FLOAT_DECODER 0 -+#define CONFIG_MP3ON4_DECODER 0 -+#define CONFIG_MPC7_DECODER 0 -+#define CONFIG_MPC8_DECODER 0 -+#define CONFIG_MSNSIREN_DECODER 0 -+#define CONFIG_NELLYMOSER_DECODER 0 -+#define CONFIG_ON2AVC_DECODER 0 -+#define CONFIG_OPUS_DECODER 0 -+#define CONFIG_OSQ_DECODER 0 -+#define CONFIG_PAF_AUDIO_DECODER 0 -+#define CONFIG_QCELP_DECODER 0 -+#define CONFIG_QDM2_DECODER 0 -+#define CONFIG_QDMC_DECODER 0 -+#define CONFIG_QOA_DECODER 0 -+#define CONFIG_RA_144_DECODER 0 -+#define CONFIG_RA_288_DECODER 0 -+#define CONFIG_RALF_DECODER 0 -+#define CONFIG_SBC_DECODER 0 -+#define CONFIG_SHORTEN_DECODER 0 -+#define CONFIG_SIPR_DECODER 0 -+#define CONFIG_SIREN_DECODER 0 -+#define CONFIG_SMACKAUD_DECODER 0 -+#define CONFIG_SONIC_DECODER 0 -+#define CONFIG_TAK_DECODER 0 -+#define CONFIG_TRUEHD_DECODER 0 -+#define CONFIG_TRUESPEECH_DECODER 0 -+#define CONFIG_TTA_DECODER 0 -+#define CONFIG_TWINVQ_DECODER 0 -+#define CONFIG_VMDAUDIO_DECODER 0 -+#define CONFIG_VORBIS_DECODER 1 -+#define CONFIG_WAVARC_DECODER 0 -+#define CONFIG_WAVPACK_DECODER 0 -+#define CONFIG_WMALOSSLESS_DECODER 0 -+#define CONFIG_WMAPRO_DECODER 0 -+#define CONFIG_WMAV1_DECODER 0 -+#define CONFIG_WMAV2_DECODER 0 -+#define CONFIG_WMAVOICE_DECODER 0 -+#define CONFIG_WS_SND1_DECODER 0 -+#define CONFIG_XMA1_DECODER 0 -+#define CONFIG_XMA2_DECODER 0 -+#define CONFIG_PCM_ALAW_DECODER 1 -+#define CONFIG_PCM_BLURAY_DECODER 0 -+#define CONFIG_PCM_DVD_DECODER 0 -+#define CONFIG_PCM_F16LE_DECODER 0 -+#define CONFIG_PCM_F24LE_DECODER 0 -+#define CONFIG_PCM_F32BE_DECODER 0 -+#define CONFIG_PCM_F32LE_DECODER 1 -+#define CONFIG_PCM_F64BE_DECODER 0 -+#define CONFIG_PCM_F64LE_DECODER 0 -+#define CONFIG_PCM_LXF_DECODER 0 -+#define CONFIG_PCM_MULAW_DECODER 1 -+#define CONFIG_PCM_S8_DECODER 0 -+#define CONFIG_PCM_S8_PLANAR_DECODER 0 -+#define CONFIG_PCM_S16BE_DECODER 1 -+#define CONFIG_PCM_S16BE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S16LE_DECODER 1 -+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S24BE_DECODER 1 -+#define CONFIG_PCM_S24DAUD_DECODER 0 -+#define CONFIG_PCM_S24LE_DECODER 1 -+#define CONFIG_PCM_S24LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S32BE_DECODER 0 -+#define CONFIG_PCM_S32LE_DECODER 1 -+#define CONFIG_PCM_S32LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S64BE_DECODER 0 -+#define CONFIG_PCM_S64LE_DECODER 0 -+#define CONFIG_PCM_SGA_DECODER 0 -+#define CONFIG_PCM_U8_DECODER 1 -+#define CONFIG_PCM_U16BE_DECODER 0 -+#define CONFIG_PCM_U16LE_DECODER 0 -+#define CONFIG_PCM_U24BE_DECODER 0 -+#define CONFIG_PCM_U24LE_DECODER 0 -+#define CONFIG_PCM_U32BE_DECODER 0 -+#define CONFIG_PCM_U32LE_DECODER 0 -+#define CONFIG_PCM_VIDC_DECODER 0 -+#define CONFIG_CBD2_DPCM_DECODER 0 -+#define CONFIG_DERF_DPCM_DECODER 0 -+#define CONFIG_GREMLIN_DPCM_DECODER 0 -+#define CONFIG_INTERPLAY_DPCM_DECODER 0 -+#define CONFIG_ROQ_DPCM_DECODER 0 -+#define CONFIG_SDX2_DPCM_DECODER 0 -+#define CONFIG_SOL_DPCM_DECODER 0 -+#define CONFIG_XAN_DPCM_DECODER 0 -+#define CONFIG_WADY_DPCM_DECODER 0 -+#define CONFIG_ADPCM_4XM_DECODER 0 -+#define CONFIG_ADPCM_ADX_DECODER 0 -+#define CONFIG_ADPCM_AFC_DECODER 0 -+#define CONFIG_ADPCM_AGM_DECODER 0 -+#define CONFIG_ADPCM_AICA_DECODER 0 -+#define CONFIG_ADPCM_ARGO_DECODER 0 -+#define CONFIG_ADPCM_CT_DECODER 0 -+#define CONFIG_ADPCM_DTK_DECODER 0 -+#define CONFIG_ADPCM_EA_DECODER 0 -+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+#define CONFIG_ADPCM_EA_R1_DECODER 0 -+#define CONFIG_ADPCM_EA_R2_DECODER 0 -+#define CONFIG_ADPCM_EA_R3_DECODER 0 -+#define CONFIG_ADPCM_EA_XAS_DECODER 0 -+#define CONFIG_ADPCM_G722_DECODER 0 -+#define CONFIG_ADPCM_G726_DECODER 0 -+#define CONFIG_ADPCM_G726LE_DECODER 0 -+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0 -+#define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+#define CONFIG_ADPCM_IMA_ALP_DECODER 0 -+#define CONFIG_ADPCM_IMA_APC_DECODER 0 -+#define CONFIG_ADPCM_IMA_APM_DECODER 0 -+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 -+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 -+#define CONFIG_ADPCM_IMA_MTF_DECODER 0 -+#define CONFIG_ADPCM_IMA_OKI_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_DECODER 0 -+#define CONFIG_ADPCM_IMA_RAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_SSI_DECODER 0 -+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+#define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+#define CONFIG_ADPCM_IMA_WS_DECODER 0 -+#define CONFIG_ADPCM_MS_DECODER 0 -+#define CONFIG_ADPCM_MTAF_DECODER 0 -+#define CONFIG_ADPCM_PSX_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+#define CONFIG_ADPCM_SWF_DECODER 0 -+#define CONFIG_ADPCM_THP_DECODER 0 -+#define CONFIG_ADPCM_THP_LE_DECODER 0 -+#define CONFIG_ADPCM_VIMA_DECODER 0 -+#define CONFIG_ADPCM_XA_DECODER 0 -+#define CONFIG_ADPCM_XMD_DECODER 0 -+#define CONFIG_ADPCM_YAMAHA_DECODER 0 -+#define CONFIG_ADPCM_ZORK_DECODER 0 -+#define CONFIG_SSA_DECODER 0 -+#define CONFIG_ASS_DECODER 0 -+#define CONFIG_CCAPTION_DECODER 0 -+#define CONFIG_DVBSUB_DECODER 0 -+#define CONFIG_DVDSUB_DECODER 0 -+#define CONFIG_JACOSUB_DECODER 0 -+#define CONFIG_MICRODVD_DECODER 0 -+#define CONFIG_MOVTEXT_DECODER 0 -+#define CONFIG_MPL2_DECODER 0 -+#define CONFIG_PGSSUB_DECODER 0 -+#define CONFIG_PJS_DECODER 0 -+#define CONFIG_REALTEXT_DECODER 0 -+#define CONFIG_SAMI_DECODER 0 -+#define CONFIG_SRT_DECODER 0 -+#define CONFIG_STL_DECODER 0 -+#define CONFIG_SUBRIP_DECODER 0 -+#define CONFIG_SUBVIEWER_DECODER 0 -+#define CONFIG_SUBVIEWER1_DECODER 0 -+#define CONFIG_TEXT_DECODER 0 -+#define CONFIG_VPLAYER_DECODER 0 -+#define CONFIG_WEBVTT_DECODER 0 -+#define CONFIG_XSUB_DECODER 0 -+#define CONFIG_AAC_AT_DECODER 0 -+#define CONFIG_AC3_AT_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 -+#define CONFIG_ALAC_AT_DECODER 0 -+#define CONFIG_AMR_NB_AT_DECODER 0 -+#define CONFIG_EAC3_AT_DECODER 0 -+#define CONFIG_GSM_MS_AT_DECODER 0 -+#define CONFIG_ILBC_AT_DECODER 0 -+#define CONFIG_MP1_AT_DECODER 0 -+#define CONFIG_MP2_AT_DECODER 0 -+#define CONFIG_MP3_AT_DECODER 0 -+#define CONFIG_PCM_ALAW_AT_DECODER 0 -+#define CONFIG_PCM_MULAW_AT_DECODER 0 -+#define CONFIG_QDMC_AT_DECODER 0 -+#define CONFIG_QDM2_AT_DECODER 0 -+#define CONFIG_LIBARIBCAPTION_DECODER 0 -+#define CONFIG_LIBARIBB24_DECODER 0 -+#define CONFIG_LIBCELT_DECODER 0 -+#define CONFIG_LIBCODEC2_DECODER 0 -+#define CONFIG_LIBDAV1D_DECODER 0 -+#define CONFIG_LIBDAVS2_DECODER 0 -+#define CONFIG_LIBFDK_AAC_DECODER 0 -+#define CONFIG_LIBGSM_DECODER 0 -+#define CONFIG_LIBGSM_MS_DECODER 0 -+#define CONFIG_LIBILBC_DECODER 0 -+#define CONFIG_LIBJXL_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+#define CONFIG_LIBOPUS_DECODER 1 -+#define CONFIG_LIBRSVG_DECODER 0 -+#define CONFIG_LIBSPEEX_DECODER 0 -+#define CONFIG_LIBUAVS3D_DECODER 0 -+#define CONFIG_LIBVORBIS_DECODER 0 -+#define CONFIG_LIBVPX_VP8_DECODER 0 -+#define CONFIG_LIBVPX_VP9_DECODER 0 -+#define CONFIG_LIBXEVD_DECODER 0 -+#define CONFIG_LIBZVBI_TELETEXT_DECODER 0 -+#define CONFIG_BINTEXT_DECODER 0 -+#define CONFIG_XBIN_DECODER 0 -+#define CONFIG_IDF_DECODER 0 -+#define CONFIG_LIBAOM_AV1_DECODER 0 -+#define CONFIG_AV1_DECODER 0 -+#define CONFIG_AV1_CUVID_DECODER 0 -+#define CONFIG_AV1_MEDIACODEC_DECODER 0 -+#define CONFIG_AV1_QSV_DECODER 0 -+#define CONFIG_LIBOPENH264_DECODER 0 -+#define CONFIG_H264_CUVID_DECODER 0 -+#define CONFIG_HEVC_CUVID_DECODER 0 -+#define CONFIG_HEVC_MEDIACODEC_DECODER 0 -+#define CONFIG_MJPEG_CUVID_DECODER 0 -+#define CONFIG_MJPEG_QSV_DECODER 0 -+#define CONFIG_MPEG1_CUVID_DECODER 0 -+#define CONFIG_MPEG2_CUVID_DECODER 0 -+#define CONFIG_MPEG4_CUVID_DECODER 0 -+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0 -+#define CONFIG_VC1_CUVID_DECODER 0 -+#define CONFIG_VP8_CUVID_DECODER 0 -+#define CONFIG_VP8_MEDIACODEC_DECODER 0 -+#define CONFIG_VP8_QSV_DECODER 0 -+#define CONFIG_VP9_CUVID_DECODER 0 -+#define CONFIG_VP9_MEDIACODEC_DECODER 0 -+#define CONFIG_VP9_QSV_DECODER 0 -+#define CONFIG_VNULL_DECODER 0 -+#define CONFIG_ANULL_DECODER 0 -+#define CONFIG_A64MULTI_ENCODER 0 -+#define CONFIG_A64MULTI5_ENCODER 0 -+#define CONFIG_ALIAS_PIX_ENCODER 0 -+#define CONFIG_AMV_ENCODER 0 -+#define CONFIG_APNG_ENCODER 0 -+#define CONFIG_ASV1_ENCODER 0 -+#define CONFIG_ASV2_ENCODER 0 -+#define CONFIG_AVRP_ENCODER 0 -+#define CONFIG_AVUI_ENCODER 0 -+#define CONFIG_BITPACKED_ENCODER 0 -+#define CONFIG_BMP_ENCODER 0 -+#define CONFIG_CFHD_ENCODER 0 -+#define CONFIG_CINEPAK_ENCODER 0 -+#define CONFIG_CLJR_ENCODER 0 -+#define CONFIG_COMFORTNOISE_ENCODER 0 -+#define CONFIG_DNXHD_ENCODER 0 -+#define CONFIG_DPX_ENCODER 0 -+#define CONFIG_DVVIDEO_ENCODER 0 -+#define CONFIG_DXV_ENCODER 0 -+#define CONFIG_EXR_ENCODER 0 -+#define CONFIG_FFV1_ENCODER 0 -+#define CONFIG_FFVHUFF_ENCODER 0 -+#define CONFIG_FITS_ENCODER 0 -+#define CONFIG_FLASHSV_ENCODER 0 -+#define CONFIG_FLASHSV2_ENCODER 0 -+#define CONFIG_FLV_ENCODER 0 -+#define CONFIG_GIF_ENCODER 0 -+#define CONFIG_H261_ENCODER 0 -+#define CONFIG_H263_ENCODER 0 -+#define CONFIG_H263P_ENCODER 0 -+#define CONFIG_H264_MEDIACODEC_ENCODER 0 -+#define CONFIG_HAP_ENCODER 0 -+#define CONFIG_HUFFYUV_ENCODER 0 -+#define CONFIG_JPEG2000_ENCODER 0 -+#define CONFIG_JPEGLS_ENCODER 0 -+#define CONFIG_LJPEG_ENCODER 0 -+#define CONFIG_MAGICYUV_ENCODER 0 -+#define CONFIG_MJPEG_ENCODER 0 -+#define CONFIG_MPEG1VIDEO_ENCODER 0 -+#define CONFIG_MPEG2VIDEO_ENCODER 0 -+#define CONFIG_MPEG4_ENCODER 0 -+#define CONFIG_MSMPEG4V2_ENCODER 0 -+#define CONFIG_MSMPEG4V3_ENCODER 0 -+#define CONFIG_MSRLE_ENCODER 0 -+#define CONFIG_MSVIDEO1_ENCODER 0 -+#define CONFIG_PAM_ENCODER 0 -+#define CONFIG_PBM_ENCODER 0 -+#define CONFIG_PCX_ENCODER 0 -+#define CONFIG_PFM_ENCODER 0 -+#define CONFIG_PGM_ENCODER 0 -+#define CONFIG_PGMYUV_ENCODER 0 -+#define CONFIG_PHM_ENCODER 0 -+#define CONFIG_PNG_ENCODER 0 -+#define CONFIG_PPM_ENCODER 0 -+#define CONFIG_PRORES_ENCODER 0 -+#define CONFIG_PRORES_AW_ENCODER 0 -+#define CONFIG_PRORES_KS_ENCODER 0 -+#define CONFIG_QOI_ENCODER 0 -+#define CONFIG_QTRLE_ENCODER 0 -+#define CONFIG_R10K_ENCODER 0 -+#define CONFIG_R210_ENCODER 0 -+#define CONFIG_RAWVIDEO_ENCODER 0 -+#define CONFIG_ROQ_ENCODER 0 -+#define CONFIG_RPZA_ENCODER 0 -+#define CONFIG_RV10_ENCODER 0 -+#define CONFIG_RV20_ENCODER 0 -+#define CONFIG_S302M_ENCODER 0 -+#define CONFIG_SGI_ENCODER 0 -+#define CONFIG_SMC_ENCODER 0 -+#define CONFIG_SNOW_ENCODER 0 -+#define CONFIG_SPEEDHQ_ENCODER 0 -+#define CONFIG_SUNRAST_ENCODER 0 -+#define CONFIG_SVQ1_ENCODER 0 -+#define CONFIG_TARGA_ENCODER 0 -+#define CONFIG_TIFF_ENCODER 0 -+#define CONFIG_UTVIDEO_ENCODER 0 -+#define CONFIG_V210_ENCODER 0 -+#define CONFIG_V308_ENCODER 0 -+#define CONFIG_V408_ENCODER 0 -+#define CONFIG_V410_ENCODER 0 -+#define CONFIG_VBN_ENCODER 0 -+#define CONFIG_VC2_ENCODER 0 -+#define CONFIG_WBMP_ENCODER 0 -+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 -+#define CONFIG_WMV1_ENCODER 0 -+#define CONFIG_WMV2_ENCODER 0 -+#define CONFIG_XBM_ENCODER 0 -+#define CONFIG_XFACE_ENCODER 0 -+#define CONFIG_XWD_ENCODER 0 -+#define CONFIG_Y41P_ENCODER 0 -+#define CONFIG_YUV4_ENCODER 0 -+#define CONFIG_ZLIB_ENCODER 0 -+#define CONFIG_ZMBV_ENCODER 0 -+#define CONFIG_AAC_ENCODER 0 -+#define CONFIG_AC3_ENCODER 0 -+#define CONFIG_AC3_FIXED_ENCODER 0 -+#define CONFIG_ALAC_ENCODER 0 -+#define CONFIG_APTX_ENCODER 0 -+#define CONFIG_APTX_HD_ENCODER 0 -+#define CONFIG_DCA_ENCODER 0 -+#define CONFIG_DFPWM_ENCODER 0 -+#define CONFIG_EAC3_ENCODER 0 -+#define CONFIG_FLAC_ENCODER 0 -+#define CONFIG_G723_1_ENCODER 0 -+#define CONFIG_HDR_ENCODER 0 -+#define CONFIG_MLP_ENCODER 0 -+#define CONFIG_MP2_ENCODER 0 -+#define CONFIG_MP2FIXED_ENCODER 0 -+#define CONFIG_NELLYMOSER_ENCODER 0 -+#define CONFIG_OPUS_ENCODER 0 -+#define CONFIG_RA_144_ENCODER 0 -+#define CONFIG_SBC_ENCODER 0 -+#define CONFIG_SONIC_ENCODER 0 -+#define CONFIG_SONIC_LS_ENCODER 0 -+#define CONFIG_TRUEHD_ENCODER 0 -+#define CONFIG_TTA_ENCODER 0 -+#define CONFIG_VORBIS_ENCODER 0 -+#define CONFIG_WAVPACK_ENCODER 0 -+#define CONFIG_WMAV1_ENCODER 0 -+#define CONFIG_WMAV2_ENCODER 0 -+#define CONFIG_PCM_ALAW_ENCODER 0 -+#define CONFIG_PCM_BLURAY_ENCODER 0 -+#define CONFIG_PCM_DVD_ENCODER 0 -+#define CONFIG_PCM_F32BE_ENCODER 0 -+#define CONFIG_PCM_F32LE_ENCODER 0 -+#define CONFIG_PCM_F64BE_ENCODER 0 -+#define CONFIG_PCM_F64LE_ENCODER 0 -+#define CONFIG_PCM_MULAW_ENCODER 0 -+#define CONFIG_PCM_S8_ENCODER 0 -+#define CONFIG_PCM_S8_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S16BE_ENCODER 0 -+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S16LE_ENCODER 0 -+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S24BE_ENCODER 0 -+#define CONFIG_PCM_S24DAUD_ENCODER 0 -+#define CONFIG_PCM_S24LE_ENCODER 0 -+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S32BE_ENCODER 0 -+#define CONFIG_PCM_S32LE_ENCODER 0 -+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S64BE_ENCODER 0 -+#define CONFIG_PCM_S64LE_ENCODER 0 -+#define CONFIG_PCM_U8_ENCODER 0 -+#define CONFIG_PCM_U16BE_ENCODER 0 -+#define CONFIG_PCM_U16LE_ENCODER 0 -+#define CONFIG_PCM_U24BE_ENCODER 0 -+#define CONFIG_PCM_U24LE_ENCODER 0 -+#define CONFIG_PCM_U32BE_ENCODER 0 -+#define CONFIG_PCM_U32LE_ENCODER 0 -+#define CONFIG_PCM_VIDC_ENCODER 0 -+#define CONFIG_ROQ_DPCM_ENCODER 0 -+#define CONFIG_ADPCM_ADX_ENCODER 0 -+#define CONFIG_ADPCM_ARGO_ENCODER 0 -+#define CONFIG_ADPCM_G722_ENCODER 0 -+#define CONFIG_ADPCM_G726_ENCODER 0 -+#define CONFIG_ADPCM_G726LE_ENCODER 0 -+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0 -+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0 -+#define CONFIG_ADPCM_IMA_APM_ENCODER 0 -+#define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WS_ENCODER 0 -+#define CONFIG_ADPCM_MS_ENCODER 0 -+#define CONFIG_ADPCM_SWF_ENCODER 0 -+#define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+#define CONFIG_SSA_ENCODER 0 -+#define CONFIG_ASS_ENCODER 0 -+#define CONFIG_DVBSUB_ENCODER 0 -+#define CONFIG_DVDSUB_ENCODER 0 -+#define CONFIG_MOVTEXT_ENCODER 0 -+#define CONFIG_SRT_ENCODER 0 -+#define CONFIG_SUBRIP_ENCODER 0 -+#define CONFIG_TEXT_ENCODER 0 -+#define CONFIG_TTML_ENCODER 0 -+#define CONFIG_WEBVTT_ENCODER 0 -+#define CONFIG_XSUB_ENCODER 0 -+#define CONFIG_AAC_AT_ENCODER 0 -+#define CONFIG_ALAC_AT_ENCODER 0 -+#define CONFIG_ILBC_AT_ENCODER 0 -+#define CONFIG_PCM_ALAW_AT_ENCODER 0 -+#define CONFIG_PCM_MULAW_AT_ENCODER 0 -+#define CONFIG_LIBAOM_AV1_ENCODER 0 -+#define CONFIG_LIBCODEC2_ENCODER 0 -+#define CONFIG_LIBFDK_AAC_ENCODER 0 -+#define CONFIG_LIBGSM_ENCODER 0 -+#define CONFIG_LIBGSM_MS_ENCODER 0 -+#define CONFIG_LIBILBC_ENCODER 0 -+#define CONFIG_LIBJXL_ENCODER 0 -+#define CONFIG_LIBMP3LAME_ENCODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+#define CONFIG_LIBOPENJPEG_ENCODER 0 -+#define CONFIG_LIBOPUS_ENCODER 0 -+#define CONFIG_LIBRAV1E_ENCODER 0 -+#define CONFIG_LIBSHINE_ENCODER 0 -+#define CONFIG_LIBSPEEX_ENCODER 0 -+#define CONFIG_LIBSVTAV1_ENCODER 0 -+#define CONFIG_LIBTHEORA_ENCODER 0 -+#define CONFIG_LIBTWOLAME_ENCODER 0 -+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0 -+#define CONFIG_LIBVORBIS_ENCODER 0 -+#define CONFIG_LIBVPX_VP8_ENCODER 0 -+#define CONFIG_LIBVPX_VP9_ENCODER 0 -+#define CONFIG_LIBWEBP_ANIM_ENCODER 0 -+#define CONFIG_LIBWEBP_ENCODER 0 -+#define CONFIG_LIBX262_ENCODER 0 -+#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBX264RGB_ENCODER 0 -+#define CONFIG_LIBX265_ENCODER 0 -+#define CONFIG_LIBXEVE_ENCODER 0 -+#define CONFIG_LIBXAVS_ENCODER 0 -+#define CONFIG_LIBXAVS2_ENCODER 0 -+#define CONFIG_LIBXVID_ENCODER 0 -+#define CONFIG_AAC_MF_ENCODER 0 -+#define CONFIG_AC3_MF_ENCODER 0 -+#define CONFIG_H263_V4L2M2M_ENCODER 0 -+#define CONFIG_AV1_MEDIACODEC_ENCODER 0 -+#define CONFIG_AV1_NVENC_ENCODER 0 -+#define CONFIG_AV1_QSV_ENCODER 0 -+#define CONFIG_AV1_AMF_ENCODER 0 -+#define CONFIG_AV1_VAAPI_ENCODER 0 -+#define CONFIG_LIBOPENH264_ENCODER 0 -+#define CONFIG_H264_AMF_ENCODER 0 -+#define CONFIG_H264_MF_ENCODER 0 -+#define CONFIG_H264_NVENC_ENCODER 0 -+#define CONFIG_H264_OMX_ENCODER 0 -+#define CONFIG_H264_QSV_ENCODER 0 -+#define CONFIG_H264_V4L2M2M_ENCODER 0 -+#define CONFIG_H264_VAAPI_ENCODER 0 -+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_HEVC_AMF_ENCODER 0 -+#define CONFIG_HEVC_MEDIACODEC_ENCODER 0 -+#define CONFIG_HEVC_MF_ENCODER 0 -+#define CONFIG_HEVC_NVENC_ENCODER 0 -+#define CONFIG_HEVC_QSV_ENCODER 0 -+#define CONFIG_HEVC_V4L2M2M_ENCODER 0 -+#define CONFIG_HEVC_VAAPI_ENCODER 0 -+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_LIBKVAZAAR_ENCODER 0 -+#define CONFIG_MJPEG_QSV_ENCODER 0 -+#define CONFIG_MJPEG_VAAPI_ENCODER 0 -+#define CONFIG_MP3_MF_ENCODER 0 -+#define CONFIG_MPEG2_QSV_ENCODER 0 -+#define CONFIG_MPEG2_VAAPI_ENCODER 0 -+#define CONFIG_MPEG4_MEDIACODEC_ENCODER 0 -+#define CONFIG_MPEG4_OMX_ENCODER 0 -+#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 -+#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_VP8_MEDIACODEC_ENCODER 0 -+#define CONFIG_VP8_V4L2M2M_ENCODER 0 -+#define CONFIG_VP8_VAAPI_ENCODER 0 -+#define CONFIG_VP9_MEDIACODEC_ENCODER 0 -+#define CONFIG_VP9_VAAPI_ENCODER 0 -+#define CONFIG_VP9_QSV_ENCODER 0 -+#define CONFIG_VNULL_ENCODER 0 -+#define CONFIG_ANULL_ENCODER 0 -+#define CONFIG_AV1_D3D11VA_HWACCEL 0 -+#define CONFIG_AV1_D3D11VA2_HWACCEL 0 -+#define CONFIG_AV1_D3D12VA_HWACCEL 0 -+#define CONFIG_AV1_DXVA2_HWACCEL 0 -+#define CONFIG_AV1_NVDEC_HWACCEL 0 -+#define CONFIG_AV1_VAAPI_HWACCEL 0 -+#define CONFIG_AV1_VDPAU_HWACCEL 0 -+#define CONFIG_AV1_VULKAN_HWACCEL 0 -+#define CONFIG_H263_VAAPI_HWACCEL 0 -+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_H264_D3D11VA_HWACCEL 0 -+#define CONFIG_H264_D3D11VA2_HWACCEL 0 -+#define CONFIG_H264_D3D12VA_HWACCEL 0 -+#define CONFIG_H264_DXVA2_HWACCEL 0 -+#define CONFIG_H264_NVDEC_HWACCEL 0 -+#define CONFIG_H264_VAAPI_HWACCEL 0 -+#define CONFIG_H264_VDPAU_HWACCEL 0 -+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_H264_VULKAN_HWACCEL 0 -+#define CONFIG_HEVC_D3D11VA_HWACCEL 0 -+#define CONFIG_HEVC_D3D11VA2_HWACCEL 0 -+#define CONFIG_HEVC_D3D12VA_HWACCEL 0 -+#define CONFIG_HEVC_DXVA2_HWACCEL 0 -+#define CONFIG_HEVC_NVDEC_HWACCEL 0 -+#define CONFIG_HEVC_VAAPI_HWACCEL 0 -+#define CONFIG_HEVC_VDPAU_HWACCEL 0 -+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_HEVC_VULKAN_HWACCEL 0 -+#define CONFIG_MJPEG_NVDEC_HWACCEL 0 -+#define CONFIG_MJPEG_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG1_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG1_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 -+#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 -+#define CONFIG_MPEG2_D3D12VA_HWACCEL 0 -+#define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+#define CONFIG_MPEG2_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG2_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MPEG4_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG4_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_VC1_D3D11VA_HWACCEL 0 -+#define CONFIG_VC1_D3D11VA2_HWACCEL 0 -+#define CONFIG_VC1_D3D12VA_HWACCEL 0 -+#define CONFIG_VC1_DXVA2_HWACCEL 0 -+#define CONFIG_VC1_NVDEC_HWACCEL 0 -+#define CONFIG_VC1_VAAPI_HWACCEL 0 -+#define CONFIG_VC1_VDPAU_HWACCEL 0 -+#define CONFIG_VP8_NVDEC_HWACCEL 0 -+#define CONFIG_VP8_VAAPI_HWACCEL 0 -+#define CONFIG_VP9_D3D11VA_HWACCEL 0 -+#define CONFIG_VP9_D3D11VA2_HWACCEL 0 -+#define CONFIG_VP9_D3D12VA_HWACCEL 0 -+#define CONFIG_VP9_DXVA2_HWACCEL 0 -+#define CONFIG_VP9_NVDEC_HWACCEL 0 -+#define CONFIG_VP9_VAAPI_HWACCEL 0 -+#define CONFIG_VP9_VDPAU_HWACCEL 0 -+#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_WMV3_D3D11VA_HWACCEL 0 -+#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 -+#define CONFIG_WMV3_D3D12VA_HWACCEL 0 -+#define CONFIG_WMV3_DXVA2_HWACCEL 0 -+#define CONFIG_WMV3_NVDEC_HWACCEL 0 -+#define CONFIG_WMV3_VAAPI_HWACCEL 0 -+#define CONFIG_WMV3_VDPAU_HWACCEL 0 -+#define CONFIG_AAC_PARSER 1 -+#define CONFIG_AAC_LATM_PARSER 0 -+#define CONFIG_AC3_PARSER 0 -+#define CONFIG_ADX_PARSER 0 -+#define CONFIG_AMR_PARSER 0 -+#define CONFIG_AV1_PARSER 0 -+#define CONFIG_AVS2_PARSER 0 -+#define CONFIG_AVS3_PARSER 0 -+#define CONFIG_BMP_PARSER 0 -+#define CONFIG_CAVSVIDEO_PARSER 0 -+#define CONFIG_COOK_PARSER 0 -+#define CONFIG_CRI_PARSER 0 -+#define CONFIG_DCA_PARSER 0 -+#define CONFIG_DIRAC_PARSER 0 -+#define CONFIG_DNXHD_PARSER 0 -+#define CONFIG_DOLBY_E_PARSER 0 -+#define CONFIG_DPX_PARSER 0 -+#define CONFIG_DVAUDIO_PARSER 0 -+#define CONFIG_DVBSUB_PARSER 0 -+#define CONFIG_DVDSUB_PARSER 0 -+#define CONFIG_DVD_NAV_PARSER 0 -+#define CONFIG_EVC_PARSER 0 -+#define CONFIG_FLAC_PARSER 1 -+#define CONFIG_FTR_PARSER 0 -+#define CONFIG_G723_1_PARSER 0 -+#define CONFIG_G729_PARSER 0 -+#define CONFIG_GIF_PARSER 0 -+#define CONFIG_GSM_PARSER 0 -+#define CONFIG_H261_PARSER 0 -+#define CONFIG_H263_PARSER 1 -+#define CONFIG_H264_PARSER 1 -+#define CONFIG_HEVC_PARSER 0 -+#define CONFIG_HDR_PARSER 0 -+#define CONFIG_IPU_PARSER 0 -+#define CONFIG_JPEG2000_PARSER 0 -+#define CONFIG_JPEGXL_PARSER 0 -+#define CONFIG_MISC4_PARSER 0 -+#define CONFIG_MJPEG_PARSER 0 -+#define CONFIG_MLP_PARSER 0 -+#define CONFIG_MPEG4VIDEO_PARSER 1 -+#define CONFIG_MPEGAUDIO_PARSER 1 -+#define CONFIG_MPEGVIDEO_PARSER 0 -+#define CONFIG_OPUS_PARSER 1 -+#define CONFIG_PNG_PARSER 0 -+#define CONFIG_PNM_PARSER 0 -+#define CONFIG_QOI_PARSER 0 -+#define CONFIG_RV34_PARSER 0 -+#define CONFIG_SBC_PARSER 0 -+#define CONFIG_SIPR_PARSER 0 -+#define CONFIG_TAK_PARSER 0 -+#define CONFIG_VC1_PARSER 0 -+#define CONFIG_VORBIS_PARSER 1 -+#define CONFIG_VP3_PARSER 0 -+#define CONFIG_VP8_PARSER 0 -+#define CONFIG_VP9_PARSER 1 -+#define CONFIG_VVC_PARSER 0 -+#define CONFIG_WEBP_PARSER 0 -+#define CONFIG_XBM_PARSER 0 -+#define CONFIG_XMA_PARSER 0 -+#define CONFIG_XWD_PARSER 0 -+#define CONFIG_ALSA_INDEV 0 -+#define CONFIG_ANDROID_CAMERA_INDEV 0 -+#define CONFIG_AVFOUNDATION_INDEV 0 -+#define CONFIG_BKTR_INDEV 0 -+#define CONFIG_DECKLINK_INDEV 0 -+#define CONFIG_DSHOW_INDEV 0 -+#define CONFIG_FBDEV_INDEV 0 -+#define CONFIG_GDIGRAB_INDEV 0 -+#define CONFIG_IEC61883_INDEV 0 -+#define CONFIG_JACK_INDEV 0 -+#define CONFIG_KMSGRAB_INDEV 0 -+#define CONFIG_LAVFI_INDEV 0 -+#define CONFIG_OPENAL_INDEV 0 -+#define CONFIG_OSS_INDEV 0 -+#define CONFIG_PULSE_INDEV 0 -+#define CONFIG_SNDIO_INDEV 0 -+#define CONFIG_V4L2_INDEV 0 -+#define CONFIG_VFWCAP_INDEV 0 -+#define CONFIG_XCBGRAB_INDEV 0 -+#define CONFIG_LIBCDIO_INDEV 0 -+#define CONFIG_LIBDC1394_INDEV 0 -+#define CONFIG_ALSA_OUTDEV 0 -+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0 -+#define CONFIG_CACA_OUTDEV 0 -+#define CONFIG_DECKLINK_OUTDEV 0 -+#define CONFIG_FBDEV_OUTDEV 0 -+#define CONFIG_OPENGL_OUTDEV 0 -+#define CONFIG_OSS_OUTDEV 0 -+#define CONFIG_PULSE_OUTDEV 0 -+#define CONFIG_SDL2_OUTDEV 0 -+#define CONFIG_SNDIO_OUTDEV 0 -+#define CONFIG_V4L2_OUTDEV 0 -+#define CONFIG_XV_OUTDEV 0 -+#define CONFIG_AAP_FILTER 0 -+#define CONFIG_ABENCH_FILTER 0 -+#define CONFIG_ACOMPRESSOR_FILTER 0 -+#define CONFIG_ACONTRAST_FILTER 0 -+#define CONFIG_ACOPY_FILTER 0 -+#define CONFIG_ACUE_FILTER 0 -+#define CONFIG_ACROSSFADE_FILTER 0 -+#define CONFIG_ACROSSOVER_FILTER 0 -+#define CONFIG_ACRUSHER_FILTER 0 -+#define CONFIG_ADECLICK_FILTER 0 -+#define CONFIG_ADECLIP_FILTER 0 -+#define CONFIG_ADECORRELATE_FILTER 0 -+#define CONFIG_ADELAY_FILTER 0 -+#define CONFIG_ADENORM_FILTER 0 -+#define CONFIG_ADERIVATIVE_FILTER 0 -+#define CONFIG_ADRC_FILTER 0 -+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 -+#define CONFIG_ADYNAMICSMOOTH_FILTER 0 -+#define CONFIG_AECHO_FILTER 0 -+#define CONFIG_AEMPHASIS_FILTER 0 -+#define CONFIG_AEVAL_FILTER 0 -+#define CONFIG_AEXCITER_FILTER 0 -+#define CONFIG_AFADE_FILTER 0 -+#define CONFIG_AFFTDN_FILTER 0 -+#define CONFIG_AFFTFILT_FILTER 0 -+#define CONFIG_AFIR_FILTER 0 -+#define CONFIG_AFORMAT_FILTER 0 -+#define CONFIG_AFREQSHIFT_FILTER 0 -+#define CONFIG_AFWTDN_FILTER 0 -+#define CONFIG_AGATE_FILTER 0 -+#define CONFIG_AIIR_FILTER 0 -+#define CONFIG_AINTEGRAL_FILTER 0 -+#define CONFIG_AINTERLEAVE_FILTER 0 -+#define CONFIG_ALATENCY_FILTER 0 -+#define CONFIG_ALIMITER_FILTER 0 -+#define CONFIG_ALLPASS_FILTER 0 -+#define CONFIG_ALOOP_FILTER 0 -+#define CONFIG_AMERGE_FILTER 0 -+#define CONFIG_AMETADATA_FILTER 0 -+#define CONFIG_AMIX_FILTER 0 -+#define CONFIG_AMULTIPLY_FILTER 0 -+#define CONFIG_ANEQUALIZER_FILTER 0 -+#define CONFIG_ANLMDN_FILTER 0 -+#define CONFIG_ANLMF_FILTER 0 -+#define CONFIG_ANLMS_FILTER 0 -+#define CONFIG_ANULL_FILTER 0 -+#define CONFIG_APAD_FILTER 0 -+#define CONFIG_APERMS_FILTER 0 -+#define CONFIG_APHASER_FILTER 0 -+#define CONFIG_APHASESHIFT_FILTER 0 -+#define CONFIG_APSNR_FILTER 0 -+#define CONFIG_APSYCLIP_FILTER 0 -+#define CONFIG_APULSATOR_FILTER 0 -+#define CONFIG_AREALTIME_FILTER 0 -+#define CONFIG_ARESAMPLE_FILTER 0 -+#define CONFIG_AREVERSE_FILTER 0 -+#define CONFIG_ARLS_FILTER 0 -+#define CONFIG_ARNNDN_FILTER 0 -+#define CONFIG_ASDR_FILTER 0 -+#define CONFIG_ASEGMENT_FILTER 0 -+#define CONFIG_ASELECT_FILTER 0 -+#define CONFIG_ASENDCMD_FILTER 0 -+#define CONFIG_ASETNSAMPLES_FILTER 0 -+#define CONFIG_ASETPTS_FILTER 0 -+#define CONFIG_ASETRATE_FILTER 0 -+#define CONFIG_ASETTB_FILTER 0 -+#define CONFIG_ASHOWINFO_FILTER 0 -+#define CONFIG_ASIDEDATA_FILTER 0 -+#define CONFIG_ASISDR_FILTER 0 -+#define CONFIG_ASOFTCLIP_FILTER 0 -+#define CONFIG_ASPECTRALSTATS_FILTER 0 -+#define CONFIG_ASPLIT_FILTER 0 -+#define CONFIG_ASR_FILTER 0 -+#define CONFIG_ASTATS_FILTER 0 -+#define CONFIG_ASTREAMSELECT_FILTER 0 -+#define CONFIG_ASUBBOOST_FILTER 0 -+#define CONFIG_ASUBCUT_FILTER 0 -+#define CONFIG_ASUPERCUT_FILTER 0 -+#define CONFIG_ASUPERPASS_FILTER 0 -+#define CONFIG_ASUPERSTOP_FILTER 0 -+#define CONFIG_ATEMPO_FILTER 0 -+#define CONFIG_ATILT_FILTER 0 -+#define CONFIG_ATRIM_FILTER 0 -+#define CONFIG_AXCORRELATE_FILTER 0 -+#define CONFIG_AZMQ_FILTER 0 -+#define CONFIG_BANDPASS_FILTER 0 -+#define CONFIG_BANDREJECT_FILTER 0 -+#define CONFIG_BASS_FILTER 0 -+#define CONFIG_BIQUAD_FILTER 0 -+#define CONFIG_BS2B_FILTER 0 -+#define CONFIG_CHANNELMAP_FILTER 0 -+#define CONFIG_CHANNELSPLIT_FILTER 0 -+#define CONFIG_CHORUS_FILTER 0 -+#define CONFIG_COMPAND_FILTER 0 -+#define CONFIG_COMPENSATIONDELAY_FILTER 0 -+#define CONFIG_CROSSFEED_FILTER 0 -+#define CONFIG_CRYSTALIZER_FILTER 0 -+#define CONFIG_DCSHIFT_FILTER 0 -+#define CONFIG_DEESSER_FILTER 0 -+#define CONFIG_DIALOGUENHANCE_FILTER 0 -+#define CONFIG_DRMETER_FILTER 0 -+#define CONFIG_DYNAUDNORM_FILTER 0 -+#define CONFIG_EARWAX_FILTER 0 -+#define CONFIG_EBUR128_FILTER 0 -+#define CONFIG_EQUALIZER_FILTER 0 -+#define CONFIG_EXTRASTEREO_FILTER 0 -+#define CONFIG_FIREQUALIZER_FILTER 0 -+#define CONFIG_FLANGER_FILTER 0 -+#define CONFIG_HAAS_FILTER 0 -+#define CONFIG_HDCD_FILTER 0 -+#define CONFIG_HEADPHONE_FILTER 0 -+#define CONFIG_HIGHPASS_FILTER 0 -+#define CONFIG_HIGHSHELF_FILTER 0 -+#define CONFIG_JOIN_FILTER 0 -+#define CONFIG_LADSPA_FILTER 0 -+#define CONFIG_LOUDNORM_FILTER 0 -+#define CONFIG_LOWPASS_FILTER 0 -+#define CONFIG_LOWSHELF_FILTER 0 -+#define CONFIG_LV2_FILTER 0 -+#define CONFIG_MCOMPAND_FILTER 0 -+#define CONFIG_PAN_FILTER 0 -+#define CONFIG_REPLAYGAIN_FILTER 0 -+#define CONFIG_RUBBERBAND_FILTER 0 -+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 -+#define CONFIG_SIDECHAINGATE_FILTER 0 -+#define CONFIG_SILENCEDETECT_FILTER 0 -+#define CONFIG_SILENCEREMOVE_FILTER 0 -+#define CONFIG_SOFALIZER_FILTER 0 -+#define CONFIG_SPEECHNORM_FILTER 0 -+#define CONFIG_STEREOTOOLS_FILTER 0 -+#define CONFIG_STEREOWIDEN_FILTER 0 -+#define CONFIG_SUPEREQUALIZER_FILTER 0 -+#define CONFIG_SURROUND_FILTER 0 -+#define CONFIG_TILTSHELF_FILTER 0 -+#define CONFIG_TREBLE_FILTER 0 -+#define CONFIG_TREMOLO_FILTER 0 -+#define CONFIG_VIBRATO_FILTER 0 -+#define CONFIG_VIRTUALBASS_FILTER 0 -+#define CONFIG_VOLUME_FILTER 0 -+#define CONFIG_VOLUMEDETECT_FILTER 0 -+#define CONFIG_AEVALSRC_FILTER 0 -+#define CONFIG_AFDELAYSRC_FILTER 0 -+#define CONFIG_AFIREQSRC_FILTER 0 -+#define CONFIG_AFIRSRC_FILTER 0 -+#define CONFIG_ANOISESRC_FILTER 0 -+#define CONFIG_ANULLSRC_FILTER 0 -+#define CONFIG_FLITE_FILTER 0 -+#define CONFIG_HILBERT_FILTER 0 -+#define CONFIG_SINC_FILTER 0 -+#define CONFIG_SINE_FILTER 0 -+#define CONFIG_ANULLSINK_FILTER 0 -+#define CONFIG_ADDROI_FILTER 0 -+#define CONFIG_ALPHAEXTRACT_FILTER 0 -+#define CONFIG_ALPHAMERGE_FILTER 0 -+#define CONFIG_AMPLIFY_FILTER 0 -+#define CONFIG_ASS_FILTER 0 -+#define CONFIG_ATADENOISE_FILTER 0 -+#define CONFIG_AVGBLUR_FILTER 0 -+#define CONFIG_AVGBLUR_OPENCL_FILTER 0 -+#define CONFIG_AVGBLUR_VULKAN_FILTER 0 -+#define CONFIG_BACKGROUNDKEY_FILTER 0 -+#define CONFIG_BBOX_FILTER 0 -+#define CONFIG_BENCH_FILTER 0 -+#define CONFIG_BILATERAL_FILTER 0 -+#define CONFIG_BILATERAL_CUDA_FILTER 0 -+#define CONFIG_BITPLANENOISE_FILTER 0 -+#define CONFIG_BLACKDETECT_FILTER 0 -+#define CONFIG_BLACKFRAME_FILTER 0 -+#define CONFIG_BLEND_FILTER 0 -+#define CONFIG_BLEND_VULKAN_FILTER 0 -+#define CONFIG_BLOCKDETECT_FILTER 0 -+#define CONFIG_BLURDETECT_FILTER 0 -+#define CONFIG_BM3D_FILTER 0 -+#define CONFIG_BOXBLUR_FILTER 0 -+#define CONFIG_BOXBLUR_OPENCL_FILTER 0 -+#define CONFIG_BWDIF_FILTER 0 -+#define CONFIG_BWDIF_CUDA_FILTER 0 -+#define CONFIG_BWDIF_VULKAN_FILTER 0 -+#define CONFIG_CAS_FILTER 0 -+#define CONFIG_CCREPACK_FILTER 0 -+#define CONFIG_CHROMABER_VULKAN_FILTER 0 -+#define CONFIG_CHROMAHOLD_FILTER 0 -+#define CONFIG_CHROMAKEY_FILTER 0 -+#define CONFIG_CHROMAKEY_CUDA_FILTER 0 -+#define CONFIG_CHROMANR_FILTER 0 -+#define CONFIG_CHROMASHIFT_FILTER 0 -+#define CONFIG_CIESCOPE_FILTER 0 -+#define CONFIG_CODECVIEW_FILTER 0 -+#define CONFIG_COLORBALANCE_FILTER 0 -+#define CONFIG_COLORCHANNELMIXER_FILTER 0 -+#define CONFIG_COLORCONTRAST_FILTER 0 -+#define CONFIG_COLORCORRECT_FILTER 0 -+#define CONFIG_COLORIZE_FILTER 0 -+#define CONFIG_COLORKEY_FILTER 0 -+#define CONFIG_COLORKEY_OPENCL_FILTER 0 -+#define CONFIG_COLORHOLD_FILTER 0 -+#define CONFIG_COLORLEVELS_FILTER 0 -+#define CONFIG_COLORMAP_FILTER 0 -+#define CONFIG_COLORMATRIX_FILTER 0 -+#define CONFIG_COLORSPACE_FILTER 0 -+#define CONFIG_COLORSPACE_CUDA_FILTER 0 -+#define CONFIG_COLORTEMPERATURE_FILTER 0 -+#define CONFIG_CONVOLUTION_FILTER 0 -+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 -+#define CONFIG_CONVOLVE_FILTER 0 -+#define CONFIG_COPY_FILTER 0 -+#define CONFIG_COREIMAGE_FILTER 0 -+#define CONFIG_CORR_FILTER 0 -+#define CONFIG_COVER_RECT_FILTER 0 -+#define CONFIG_CROP_FILTER 0 -+#define CONFIG_CROPDETECT_FILTER 0 -+#define CONFIG_CUE_FILTER 0 -+#define CONFIG_CURVES_FILTER 0 -+#define CONFIG_DATASCOPE_FILTER 0 -+#define CONFIG_DBLUR_FILTER 0 -+#define CONFIG_DCTDNOIZ_FILTER 0 -+#define CONFIG_DEBAND_FILTER 0 -+#define CONFIG_DEBLOCK_FILTER 0 -+#define CONFIG_DECIMATE_FILTER 0 -+#define CONFIG_DECONVOLVE_FILTER 0 -+#define CONFIG_DEDOT_FILTER 0 -+#define CONFIG_DEFLATE_FILTER 0 -+#define CONFIG_DEFLICKER_FILTER 0 -+#define CONFIG_DEINTERLACE_QSV_FILTER 0 -+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0 -+#define CONFIG_DEJUDDER_FILTER 0 -+#define CONFIG_DELOGO_FILTER 0 -+#define CONFIG_DENOISE_VAAPI_FILTER 0 -+#define CONFIG_DERAIN_FILTER 0 -+#define CONFIG_DESHAKE_FILTER 0 -+#define CONFIG_DESHAKE_OPENCL_FILTER 0 -+#define CONFIG_DESPILL_FILTER 0 -+#define CONFIG_DETELECINE_FILTER 0 -+#define CONFIG_DILATION_FILTER 0 -+#define CONFIG_DILATION_OPENCL_FILTER 0 -+#define CONFIG_DISPLACE_FILTER 0 -+#define CONFIG_DNN_CLASSIFY_FILTER 0 -+#define CONFIG_DNN_DETECT_FILTER 0 -+#define CONFIG_DNN_PROCESSING_FILTER 0 -+#define CONFIG_DOUBLEWEAVE_FILTER 0 -+#define CONFIG_DRAWBOX_FILTER 0 -+#define CONFIG_DRAWGRAPH_FILTER 0 -+#define CONFIG_DRAWGRID_FILTER 0 -+#define CONFIG_DRAWTEXT_FILTER 0 -+#define CONFIG_EDGEDETECT_FILTER 0 -+#define CONFIG_ELBG_FILTER 0 -+#define CONFIG_ENTROPY_FILTER 0 -+#define CONFIG_EPX_FILTER 0 -+#define CONFIG_EQ_FILTER 0 -+#define CONFIG_EROSION_FILTER 0 -+#define CONFIG_EROSION_OPENCL_FILTER 0 -+#define CONFIG_ESTDIF_FILTER 0 -+#define CONFIG_EXPOSURE_FILTER 0 -+#define CONFIG_EXTRACTPLANES_FILTER 0 -+#define CONFIG_FADE_FILTER 0 -+#define CONFIG_FEEDBACK_FILTER 0 -+#define CONFIG_FFTDNOIZ_FILTER 0 -+#define CONFIG_FFTFILT_FILTER 0 -+#define CONFIG_FIELD_FILTER 0 -+#define CONFIG_FIELDHINT_FILTER 0 -+#define CONFIG_FIELDMATCH_FILTER 0 -+#define CONFIG_FIELDORDER_FILTER 0 -+#define CONFIG_FILLBORDERS_FILTER 0 -+#define CONFIG_FIND_RECT_FILTER 0 -+#define CONFIG_FLIP_VULKAN_FILTER 0 -+#define CONFIG_FLOODFILL_FILTER 0 -+#define CONFIG_FORMAT_FILTER 0 -+#define CONFIG_FPS_FILTER 0 -+#define CONFIG_FRAMEPACK_FILTER 0 -+#define CONFIG_FRAMERATE_FILTER 0 -+#define CONFIG_FRAMESTEP_FILTER 0 -+#define CONFIG_FREEZEDETECT_FILTER 0 -+#define CONFIG_FREEZEFRAMES_FILTER 0 -+#define CONFIG_FREI0R_FILTER 0 -+#define CONFIG_FSPP_FILTER 0 -+#define CONFIG_FSYNC_FILTER 0 -+#define CONFIG_GBLUR_FILTER 0 -+#define CONFIG_GBLUR_VULKAN_FILTER 0 -+#define CONFIG_GEQ_FILTER 0 -+#define CONFIG_GRADFUN_FILTER 0 -+#define CONFIG_GRAPHMONITOR_FILTER 0 -+#define CONFIG_GRAYWORLD_FILTER 0 -+#define CONFIG_GREYEDGE_FILTER 0 -+#define CONFIG_GUIDED_FILTER 0 -+#define CONFIG_HALDCLUT_FILTER 0 -+#define CONFIG_HFLIP_FILTER 0 -+#define CONFIG_HFLIP_VULKAN_FILTER 0 -+#define CONFIG_HISTEQ_FILTER 0 -+#define CONFIG_HISTOGRAM_FILTER 0 -+#define CONFIG_HQDN3D_FILTER 0 -+#define CONFIG_HQX_FILTER 0 -+#define CONFIG_HSTACK_FILTER 0 -+#define CONFIG_HSVHOLD_FILTER 0 -+#define CONFIG_HSVKEY_FILTER 0 -+#define CONFIG_HUE_FILTER 0 -+#define CONFIG_HUESATURATION_FILTER 0 -+#define CONFIG_HWDOWNLOAD_FILTER 0 -+#define CONFIG_HWMAP_FILTER 0 -+#define CONFIG_HWUPLOAD_FILTER 0 -+#define CONFIG_HWUPLOAD_CUDA_FILTER 0 -+#define CONFIG_HYSTERESIS_FILTER 0 -+#define CONFIG_ICCDETECT_FILTER 0 -+#define CONFIG_ICCGEN_FILTER 0 -+#define CONFIG_IDENTITY_FILTER 0 -+#define CONFIG_IDET_FILTER 0 -+#define CONFIG_IL_FILTER 0 -+#define CONFIG_INFLATE_FILTER 0 -+#define CONFIG_INTERLACE_FILTER 0 -+#define CONFIG_INTERLEAVE_FILTER 0 -+#define CONFIG_KERNDEINT_FILTER 0 -+#define CONFIG_KIRSCH_FILTER 0 -+#define CONFIG_LAGFUN_FILTER 0 -+#define CONFIG_LATENCY_FILTER 0 -+#define CONFIG_LENSCORRECTION_FILTER 0 -+#define CONFIG_LENSFUN_FILTER 0 -+#define CONFIG_LIBPLACEBO_FILTER 0 -+#define CONFIG_LIBVMAF_FILTER 0 -+#define CONFIG_LIBVMAF_CUDA_FILTER 0 -+#define CONFIG_LIMITDIFF_FILTER 0 -+#define CONFIG_LIMITER_FILTER 0 -+#define CONFIG_LOOP_FILTER 0 -+#define CONFIG_LUMAKEY_FILTER 0 -+#define CONFIG_LUT_FILTER 0 -+#define CONFIG_LUT1D_FILTER 0 -+#define CONFIG_LUT2_FILTER 0 -+#define CONFIG_LUT3D_FILTER 0 -+#define CONFIG_LUTRGB_FILTER 0 -+#define CONFIG_LUTYUV_FILTER 0 -+#define CONFIG_MASKEDCLAMP_FILTER 0 -+#define CONFIG_MASKEDMAX_FILTER 0 -+#define CONFIG_MASKEDMERGE_FILTER 0 -+#define CONFIG_MASKEDMIN_FILTER 0 -+#define CONFIG_MASKEDTHRESHOLD_FILTER 0 -+#define CONFIG_MASKFUN_FILTER 0 -+#define CONFIG_MCDEINT_FILTER 0 -+#define CONFIG_MEDIAN_FILTER 0 -+#define CONFIG_MERGEPLANES_FILTER 0 -+#define CONFIG_MESTIMATE_FILTER 0 -+#define CONFIG_METADATA_FILTER 0 -+#define CONFIG_MIDEQUALIZER_FILTER 0 -+#define CONFIG_MINTERPOLATE_FILTER 0 -+#define CONFIG_MIX_FILTER 0 -+#define CONFIG_MONOCHROME_FILTER 0 -+#define CONFIG_MORPHO_FILTER 0 -+#define CONFIG_MPDECIMATE_FILTER 0 -+#define CONFIG_MSAD_FILTER 0 -+#define CONFIG_MULTIPLY_FILTER 0 -+#define CONFIG_NEGATE_FILTER 0 -+#define CONFIG_NLMEANS_FILTER 0 -+#define CONFIG_NLMEANS_OPENCL_FILTER 0 -+#define CONFIG_NLMEANS_VULKAN_FILTER 0 -+#define CONFIG_NNEDI_FILTER 0 -+#define CONFIG_NOFORMAT_FILTER 0 -+#define CONFIG_NOISE_FILTER 0 -+#define CONFIG_NORMALIZE_FILTER 0 -+#define CONFIG_NULL_FILTER 0 -+#define CONFIG_OCR_FILTER 0 -+#define CONFIG_OCV_FILTER 0 -+#define CONFIG_OSCILLOSCOPE_FILTER 0 -+#define CONFIG_OVERLAY_FILTER 0 -+#define CONFIG_OVERLAY_OPENCL_FILTER 0 -+#define CONFIG_OVERLAY_QSV_FILTER 0 -+#define CONFIG_OVERLAY_VAAPI_FILTER 0 -+#define CONFIG_OVERLAY_VULKAN_FILTER 0 -+#define CONFIG_OVERLAY_CUDA_FILTER 0 -+#define CONFIG_OWDENOISE_FILTER 0 -+#define CONFIG_PAD_FILTER 0 -+#define CONFIG_PAD_OPENCL_FILTER 0 -+#define CONFIG_PALETTEGEN_FILTER 0 -+#define CONFIG_PALETTEUSE_FILTER 0 -+#define CONFIG_PERMS_FILTER 0 -+#define CONFIG_PERSPECTIVE_FILTER 0 -+#define CONFIG_PHASE_FILTER 0 -+#define CONFIG_PHOTOSENSITIVITY_FILTER 0 -+#define CONFIG_PIXDESCTEST_FILTER 0 -+#define CONFIG_PIXELIZE_FILTER 0 -+#define CONFIG_PIXSCOPE_FILTER 0 -+#define CONFIG_PP_FILTER 0 -+#define CONFIG_PP7_FILTER 0 -+#define CONFIG_PREMULTIPLY_FILTER 0 -+#define CONFIG_PREWITT_FILTER 0 -+#define CONFIG_PREWITT_OPENCL_FILTER 0 -+#define CONFIG_PROCAMP_VAAPI_FILTER 0 -+#define CONFIG_PROGRAM_OPENCL_FILTER 0 -+#define CONFIG_PSEUDOCOLOR_FILTER 0 -+#define CONFIG_PSNR_FILTER 0 -+#define CONFIG_PULLUP_FILTER 0 -+#define CONFIG_QP_FILTER 0 -+#define CONFIG_QRENCODE_FILTER 0 -+#define CONFIG_QUIRC_FILTER 0 -+#define CONFIG_RANDOM_FILTER 0 -+#define CONFIG_READEIA608_FILTER 0 -+#define CONFIG_READVITC_FILTER 0 -+#define CONFIG_REALTIME_FILTER 0 -+#define CONFIG_REMAP_FILTER 0 -+#define CONFIG_REMAP_OPENCL_FILTER 0 -+#define CONFIG_REMOVEGRAIN_FILTER 0 -+#define CONFIG_REMOVELOGO_FILTER 0 -+#define CONFIG_REPEATFIELDS_FILTER 0 -+#define CONFIG_REVERSE_FILTER 0 -+#define CONFIG_RGBASHIFT_FILTER 0 -+#define CONFIG_ROBERTS_FILTER 0 -+#define CONFIG_ROBERTS_OPENCL_FILTER 0 -+#define CONFIG_ROTATE_FILTER 0 -+#define CONFIG_SAB_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 -+#define CONFIG_SCALE_CUDA_FILTER 0 -+#define CONFIG_SCALE_NPP_FILTER 0 -+#define CONFIG_SCALE_QSV_FILTER 0 -+#define CONFIG_SCALE_VAAPI_FILTER 0 -+#define CONFIG_SCALE_VT_FILTER 0 -+#define CONFIG_SCALE_VULKAN_FILTER 0 -+#define CONFIG_SCALE2REF_FILTER 0 -+#define CONFIG_SCALE2REF_NPP_FILTER 0 -+#define CONFIG_SCDET_FILTER 0 -+#define CONFIG_SCHARR_FILTER 0 -+#define CONFIG_SCROLL_FILTER 0 -+#define CONFIG_SEGMENT_FILTER 0 -+#define CONFIG_SELECT_FILTER 0 -+#define CONFIG_SELECTIVECOLOR_FILTER 0 -+#define CONFIG_SENDCMD_FILTER 0 -+#define CONFIG_SEPARATEFIELDS_FILTER 0 -+#define CONFIG_SETDAR_FILTER 0 -+#define CONFIG_SETFIELD_FILTER 0 -+#define CONFIG_SETPARAMS_FILTER 0 -+#define CONFIG_SETPTS_FILTER 0 -+#define CONFIG_SETRANGE_FILTER 0 -+#define CONFIG_SETSAR_FILTER 0 -+#define CONFIG_SETTB_FILTER 0 -+#define CONFIG_SHARPEN_NPP_FILTER 0 -+#define CONFIG_SHARPNESS_VAAPI_FILTER 0 -+#define CONFIG_SHEAR_FILTER 0 -+#define CONFIG_SHOWINFO_FILTER 0 -+#define CONFIG_SHOWPALETTE_FILTER 0 -+#define CONFIG_SHUFFLEFRAMES_FILTER 0 -+#define CONFIG_SHUFFLEPIXELS_FILTER 0 -+#define CONFIG_SHUFFLEPLANES_FILTER 0 -+#define CONFIG_SIDEDATA_FILTER 0 -+#define CONFIG_SIGNALSTATS_FILTER 0 -+#define CONFIG_SIGNATURE_FILTER 0 -+#define CONFIG_SITI_FILTER 0 -+#define CONFIG_SMARTBLUR_FILTER 0 -+#define CONFIG_SOBEL_FILTER 0 -+#define CONFIG_SOBEL_OPENCL_FILTER 0 -+#define CONFIG_SPLIT_FILTER 0 -+#define CONFIG_SPP_FILTER 0 -+#define CONFIG_SR_FILTER 0 -+#define CONFIG_SSIM_FILTER 0 -+#define CONFIG_SSIM360_FILTER 0 -+#define CONFIG_STEREO3D_FILTER 0 -+#define CONFIG_STREAMSELECT_FILTER 0 -+#define CONFIG_SUBTITLES_FILTER 0 -+#define CONFIG_SUPER2XSAI_FILTER 0 -+#define CONFIG_SWAPRECT_FILTER 0 -+#define CONFIG_SWAPUV_FILTER 0 -+#define CONFIG_TBLEND_FILTER 0 -+#define CONFIG_TELECINE_FILTER 0 -+#define CONFIG_THISTOGRAM_FILTER 0 -+#define CONFIG_THRESHOLD_FILTER 0 -+#define CONFIG_THUMBNAIL_FILTER 0 -+#define CONFIG_THUMBNAIL_CUDA_FILTER 0 -+#define CONFIG_TILE_FILTER 0 -+#define CONFIG_TILTANDSHIFT_FILTER 0 -+#define CONFIG_TINTERLACE_FILTER 0 -+#define CONFIG_TLUT2_FILTER 0 -+#define CONFIG_TMEDIAN_FILTER 0 -+#define CONFIG_TMIDEQUALIZER_FILTER 0 -+#define CONFIG_TMIX_FILTER 0 -+#define CONFIG_TONEMAP_FILTER 0 -+#define CONFIG_TONEMAP_OPENCL_FILTER 0 -+#define CONFIG_TONEMAP_VAAPI_FILTER 0 -+#define CONFIG_TPAD_FILTER 0 -+#define CONFIG_TRANSPOSE_FILTER 0 -+#define CONFIG_TRANSPOSE_NPP_FILTER 0 -+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 -+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 -+#define CONFIG_TRANSPOSE_VT_FILTER 0 -+#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 -+#define CONFIG_TRIM_FILTER 0 -+#define CONFIG_UNPREMULTIPLY_FILTER 0 -+#define CONFIG_UNSHARP_FILTER 0 -+#define CONFIG_UNSHARP_OPENCL_FILTER 0 -+#define CONFIG_UNTILE_FILTER 0 -+#define CONFIG_USPP_FILTER 0 -+#define CONFIG_V360_FILTER 0 -+#define CONFIG_VAGUEDENOISER_FILTER 0 -+#define CONFIG_VARBLUR_FILTER 0 -+#define CONFIG_VECTORSCOPE_FILTER 0 -+#define CONFIG_VFLIP_FILTER 0 -+#define CONFIG_VFLIP_VULKAN_FILTER 0 -+#define CONFIG_VFRDET_FILTER 0 -+#define CONFIG_VIBRANCE_FILTER 0 -+#define CONFIG_VIDSTABDETECT_FILTER 0 -+#define CONFIG_VIDSTABTRANSFORM_FILTER 0 -+#define CONFIG_VIF_FILTER 0 -+#define CONFIG_VIGNETTE_FILTER 0 -+#define CONFIG_VMAFMOTION_FILTER 0 -+#define CONFIG_VPP_QSV_FILTER 0 -+#define CONFIG_VSTACK_FILTER 0 -+#define CONFIG_W3FDIF_FILTER 0 -+#define CONFIG_WAVEFORM_FILTER 0 -+#define CONFIG_WEAVE_FILTER 0 -+#define CONFIG_XBR_FILTER 0 -+#define CONFIG_XCORRELATE_FILTER 0 -+#define CONFIG_XFADE_FILTER 0 -+#define CONFIG_XFADE_OPENCL_FILTER 0 -+#define CONFIG_XFADE_VULKAN_FILTER 0 -+#define CONFIG_XMEDIAN_FILTER 0 -+#define CONFIG_XSTACK_FILTER 0 -+#define CONFIG_YADIF_FILTER 0 -+#define CONFIG_YADIF_CUDA_FILTER 0 -+#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 -+#define CONFIG_YAEPBLUR_FILTER 0 -+#define CONFIG_ZMQ_FILTER 0 -+#define CONFIG_ZOOMPAN_FILTER 0 -+#define CONFIG_ZSCALE_FILTER 0 -+#define CONFIG_HSTACK_VAAPI_FILTER 0 -+#define CONFIG_VSTACK_VAAPI_FILTER 0 -+#define CONFIG_XSTACK_VAAPI_FILTER 0 -+#define CONFIG_HSTACK_QSV_FILTER 0 -+#define CONFIG_VSTACK_QSV_FILTER 0 -+#define CONFIG_XSTACK_QSV_FILTER 0 -+#define CONFIG_ALLRGB_FILTER 0 -+#define CONFIG_ALLYUV_FILTER 0 -+#define CONFIG_CELLAUTO_FILTER 0 -+#define CONFIG_COLOR_FILTER 0 -+#define CONFIG_COLOR_VULKAN_FILTER 0 -+#define CONFIG_COLORCHART_FILTER 0 -+#define CONFIG_COLORSPECTRUM_FILTER 0 -+#define CONFIG_COREIMAGESRC_FILTER 0 -+#define CONFIG_DDAGRAB_FILTER 0 -+#define CONFIG_FREI0R_SRC_FILTER 0 -+#define CONFIG_GRADIENTS_FILTER 0 -+#define CONFIG_HALDCLUTSRC_FILTER 0 -+#define CONFIG_LIFE_FILTER 0 -+#define CONFIG_MANDELBROT_FILTER 0 -+#define CONFIG_MPTESTSRC_FILTER 0 -+#define CONFIG_NULLSRC_FILTER 0 -+#define CONFIG_OPENCLSRC_FILTER 0 -+#define CONFIG_QRENCODESRC_FILTER 0 -+#define CONFIG_PAL75BARS_FILTER 0 -+#define CONFIG_PAL100BARS_FILTER 0 -+#define CONFIG_RGBTESTSRC_FILTER 0 -+#define CONFIG_SIERPINSKI_FILTER 0 -+#define CONFIG_SMPTEBARS_FILTER 0 -+#define CONFIG_SMPTEHDBARS_FILTER 0 -+#define CONFIG_TESTSRC_FILTER 0 -+#define CONFIG_TESTSRC2_FILTER 0 -+#define CONFIG_YUVTESTSRC_FILTER 0 -+#define CONFIG_ZONEPLATE_FILTER 0 -+#define CONFIG_NULLSINK_FILTER 0 -+#define CONFIG_A3DSCOPE_FILTER 0 -+#define CONFIG_ABITSCOPE_FILTER 0 -+#define CONFIG_ADRAWGRAPH_FILTER 0 -+#define CONFIG_AGRAPHMONITOR_FILTER 0 -+#define CONFIG_AHISTOGRAM_FILTER 0 -+#define CONFIG_APHASEMETER_FILTER 0 -+#define CONFIG_AVECTORSCOPE_FILTER 0 -+#define CONFIG_CONCAT_FILTER 0 -+#define CONFIG_SHOWCQT_FILTER 0 -+#define CONFIG_SHOWCWT_FILTER 0 -+#define CONFIG_SHOWFREQS_FILTER 0 -+#define CONFIG_SHOWSPATIAL_FILTER 0 -+#define CONFIG_SHOWSPECTRUM_FILTER 0 -+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0 -+#define CONFIG_SHOWVOLUME_FILTER 0 -+#define CONFIG_SHOWWAVES_FILTER 0 -+#define CONFIG_SHOWWAVESPIC_FILTER 0 -+#define CONFIG_SPECTRUMSYNTH_FILTER 0 -+#define CONFIG_AVSYNCTEST_FILTER 0 -+#define CONFIG_AMOVIE_FILTER 0 -+#define CONFIG_MOVIE_FILTER 0 -+#define CONFIG_AA_DEMUXER 0 -+#define CONFIG_AAC_DEMUXER 1 -+#define CONFIG_AAX_DEMUXER 0 -+#define CONFIG_AC3_DEMUXER 0 -+#define CONFIG_AC4_DEMUXER 0 -+#define CONFIG_ACE_DEMUXER 0 -+#define CONFIG_ACM_DEMUXER 0 -+#define CONFIG_ACT_DEMUXER 0 -+#define CONFIG_ADF_DEMUXER 0 -+#define CONFIG_ADP_DEMUXER 0 -+#define CONFIG_ADS_DEMUXER 0 -+#define CONFIG_ADX_DEMUXER 0 -+#define CONFIG_AEA_DEMUXER 0 -+#define CONFIG_AFC_DEMUXER 0 -+#define CONFIG_AIFF_DEMUXER 0 -+#define CONFIG_AIX_DEMUXER 0 -+#define CONFIG_ALP_DEMUXER 0 -+#define CONFIG_AMR_DEMUXER 0 -+#define CONFIG_AMRNB_DEMUXER 0 -+#define CONFIG_AMRWB_DEMUXER 0 -+#define CONFIG_ANM_DEMUXER 0 -+#define CONFIG_APAC_DEMUXER 0 -+#define CONFIG_APC_DEMUXER 0 -+#define CONFIG_APE_DEMUXER 0 -+#define CONFIG_APM_DEMUXER 0 -+#define CONFIG_APNG_DEMUXER 0 -+#define CONFIG_APTX_DEMUXER 0 -+#define CONFIG_APTX_HD_DEMUXER 0 -+#define CONFIG_AQTITLE_DEMUXER 0 -+#define CONFIG_ARGO_ASF_DEMUXER 0 -+#define CONFIG_ARGO_BRP_DEMUXER 0 -+#define CONFIG_ARGO_CVG_DEMUXER 0 -+#define CONFIG_ASF_DEMUXER 0 -+#define CONFIG_ASF_O_DEMUXER 0 -+#define CONFIG_ASS_DEMUXER 0 -+#define CONFIG_AST_DEMUXER 0 -+#define CONFIG_AU_DEMUXER 0 -+#define CONFIG_AV1_DEMUXER 0 -+#define CONFIG_AVI_DEMUXER 1 -+#define CONFIG_AVISYNTH_DEMUXER 0 -+#define CONFIG_AVR_DEMUXER 0 -+#define CONFIG_AVS_DEMUXER 0 -+#define CONFIG_AVS2_DEMUXER 0 -+#define CONFIG_AVS3_DEMUXER 0 -+#define CONFIG_BETHSOFTVID_DEMUXER 0 -+#define CONFIG_BFI_DEMUXER 0 -+#define CONFIG_BINTEXT_DEMUXER 0 -+#define CONFIG_BINK_DEMUXER 0 -+#define CONFIG_BINKA_DEMUXER 0 -+#define CONFIG_BIT_DEMUXER 0 -+#define CONFIG_BITPACKED_DEMUXER 0 -+#define CONFIG_BMV_DEMUXER 0 -+#define CONFIG_BFSTM_DEMUXER 0 -+#define CONFIG_BRSTM_DEMUXER 0 -+#define CONFIG_BOA_DEMUXER 0 -+#define CONFIG_BONK_DEMUXER 0 -+#define CONFIG_C93_DEMUXER 0 -+#define CONFIG_CAF_DEMUXER 0 -+#define CONFIG_CAVSVIDEO_DEMUXER 0 -+#define CONFIG_CDG_DEMUXER 0 -+#define CONFIG_CDXL_DEMUXER 0 -+#define CONFIG_CINE_DEMUXER 0 -+#define CONFIG_CODEC2_DEMUXER 0 -+#define CONFIG_CODEC2RAW_DEMUXER 0 -+#define CONFIG_CONCAT_DEMUXER 0 -+#define CONFIG_DASH_DEMUXER 0 -+#define CONFIG_DATA_DEMUXER 0 -+#define CONFIG_DAUD_DEMUXER 0 -+#define CONFIG_DCSTR_DEMUXER 0 -+#define CONFIG_DERF_DEMUXER 0 -+#define CONFIG_DFA_DEMUXER 0 -+#define CONFIG_DFPWM_DEMUXER 0 -+#define CONFIG_DHAV_DEMUXER 0 -+#define CONFIG_DIRAC_DEMUXER 0 -+#define CONFIG_DNXHD_DEMUXER 0 -+#define CONFIG_DSF_DEMUXER 0 -+#define CONFIG_DSICIN_DEMUXER 0 -+#define CONFIG_DSS_DEMUXER 0 -+#define CONFIG_DTS_DEMUXER 0 -+#define CONFIG_DTSHD_DEMUXER 0 -+#define CONFIG_DV_DEMUXER 0 -+#define CONFIG_DVBSUB_DEMUXER 0 -+#define CONFIG_DVBTXT_DEMUXER 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 -+#define CONFIG_EAC3_DEMUXER 0 -+#define CONFIG_EPAF_DEMUXER 0 -+#define CONFIG_EVC_DEMUXER 0 -+#define CONFIG_FFMETADATA_DEMUXER 0 -+#define CONFIG_FILMSTRIP_DEMUXER 0 -+#define CONFIG_FITS_DEMUXER 0 -+#define CONFIG_FLAC_DEMUXER 1 -+#define CONFIG_FLIC_DEMUXER 0 -+#define CONFIG_FLV_DEMUXER 0 -+#define CONFIG_LIVE_FLV_DEMUXER 0 -+#define CONFIG_FOURXM_DEMUXER 0 -+#define CONFIG_FRM_DEMUXER 0 -+#define CONFIG_FSB_DEMUXER 0 -+#define CONFIG_FWSE_DEMUXER 0 -+#define CONFIG_G722_DEMUXER 0 -+#define CONFIG_G723_1_DEMUXER 0 -+#define CONFIG_G726_DEMUXER 0 -+#define CONFIG_G726LE_DEMUXER 0 -+#define CONFIG_G729_DEMUXER 0 -+#define CONFIG_GDV_DEMUXER 0 -+#define CONFIG_GENH_DEMUXER 0 -+#define CONFIG_GIF_DEMUXER 0 -+#define CONFIG_GSM_DEMUXER 0 -+#define CONFIG_GXF_DEMUXER 0 -+#define CONFIG_H261_DEMUXER 0 -+#define CONFIG_H263_DEMUXER 0 -+#define CONFIG_H264_DEMUXER 0 -+#define CONFIG_HCA_DEMUXER 0 -+#define CONFIG_HCOM_DEMUXER 0 -+#define CONFIG_HEVC_DEMUXER 0 -+#define CONFIG_HLS_DEMUXER 0 -+#define CONFIG_HNM_DEMUXER 0 -+#define CONFIG_IAMF_DEMUXER 0 -+#define CONFIG_ICO_DEMUXER 0 -+#define CONFIG_IDCIN_DEMUXER 0 -+#define CONFIG_IDF_DEMUXER 0 -+#define CONFIG_IFF_DEMUXER 0 -+#define CONFIG_IFV_DEMUXER 0 -+#define CONFIG_ILBC_DEMUXER 0 -+#define CONFIG_IMAGE2_DEMUXER 0 -+#define CONFIG_IMAGE2PIPE_DEMUXER 0 -+#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 -+#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 -+#define CONFIG_IMF_DEMUXER 0 -+#define CONFIG_INGENIENT_DEMUXER 0 -+#define CONFIG_IPMOVIE_DEMUXER 0 -+#define CONFIG_IPU_DEMUXER 0 -+#define CONFIG_IRCAM_DEMUXER 0 -+#define CONFIG_ISS_DEMUXER 0 -+#define CONFIG_IV8_DEMUXER 0 -+#define CONFIG_IVF_DEMUXER 0 -+#define CONFIG_IVR_DEMUXER 0 -+#define CONFIG_JACOSUB_DEMUXER 0 -+#define CONFIG_JV_DEMUXER 0 -+#define CONFIG_JPEGXL_ANIM_DEMUXER 0 -+#define CONFIG_KUX_DEMUXER 0 -+#define CONFIG_KVAG_DEMUXER 0 -+#define CONFIG_LAF_DEMUXER 0 -+#define CONFIG_LMLM4_DEMUXER 0 -+#define CONFIG_LOAS_DEMUXER 0 -+#define CONFIG_LUODAT_DEMUXER 0 -+#define CONFIG_LRC_DEMUXER 0 -+#define CONFIG_LVF_DEMUXER 0 -+#define CONFIG_LXF_DEMUXER 0 -+#define CONFIG_M4V_DEMUXER 0 -+#define CONFIG_MCA_DEMUXER 0 -+#define CONFIG_MCC_DEMUXER 0 -+#define CONFIG_MATROSKA_DEMUXER 1 -+#define CONFIG_MGSTS_DEMUXER 0 -+#define CONFIG_MICRODVD_DEMUXER 0 -+#define CONFIG_MJPEG_DEMUXER 0 -+#define CONFIG_MJPEG_2000_DEMUXER 0 -+#define CONFIG_MLP_DEMUXER 0 -+#define CONFIG_MLV_DEMUXER 0 -+#define CONFIG_MM_DEMUXER 0 -+#define CONFIG_MMF_DEMUXER 0 -+#define CONFIG_MODS_DEMUXER 0 -+#define CONFIG_MOFLEX_DEMUXER 0 -+#define CONFIG_MOV_DEMUXER 1 -+#define CONFIG_MP3_DEMUXER 1 -+#define CONFIG_MPC_DEMUXER 0 -+#define CONFIG_MPC8_DEMUXER 0 -+#define CONFIG_MPEGPS_DEMUXER 0 -+#define CONFIG_MPEGTS_DEMUXER 0 -+#define CONFIG_MPEGTSRAW_DEMUXER 0 -+#define CONFIG_MPEGVIDEO_DEMUXER 0 -+#define CONFIG_MPJPEG_DEMUXER 0 -+#define CONFIG_MPL2_DEMUXER 0 -+#define CONFIG_MPSUB_DEMUXER 0 -+#define CONFIG_MSF_DEMUXER 0 -+#define CONFIG_MSNWC_TCP_DEMUXER 0 -+#define CONFIG_MSP_DEMUXER 0 -+#define CONFIG_MTAF_DEMUXER 0 -+#define CONFIG_MTV_DEMUXER 0 -+#define CONFIG_MUSX_DEMUXER 0 -+#define CONFIG_MV_DEMUXER 0 -+#define CONFIG_MVI_DEMUXER 0 -+#define CONFIG_MXF_DEMUXER 0 -+#define CONFIG_MXG_DEMUXER 0 -+#define CONFIG_NC_DEMUXER 0 -+#define CONFIG_NISTSPHERE_DEMUXER 0 -+#define CONFIG_NSP_DEMUXER 0 -+#define CONFIG_NSV_DEMUXER 0 -+#define CONFIG_NUT_DEMUXER 0 -+#define CONFIG_NUV_DEMUXER 0 -+#define CONFIG_OBU_DEMUXER 0 -+#define CONFIG_OGG_DEMUXER 1 -+#define CONFIG_OMA_DEMUXER 0 -+#define CONFIG_OSQ_DEMUXER 0 -+#define CONFIG_PAF_DEMUXER 0 -+#define CONFIG_PCM_ALAW_DEMUXER 0 -+#define CONFIG_PCM_MULAW_DEMUXER 0 -+#define CONFIG_PCM_VIDC_DEMUXER 0 -+#define CONFIG_PCM_F64BE_DEMUXER 0 -+#define CONFIG_PCM_F64LE_DEMUXER 0 -+#define CONFIG_PCM_F32BE_DEMUXER 0 -+#define CONFIG_PCM_F32LE_DEMUXER 0 -+#define CONFIG_PCM_S32BE_DEMUXER 0 -+#define CONFIG_PCM_S32LE_DEMUXER 0 -+#define CONFIG_PCM_S24BE_DEMUXER 0 -+#define CONFIG_PCM_S24LE_DEMUXER 0 -+#define CONFIG_PCM_S16BE_DEMUXER 0 -+#define CONFIG_PCM_S16LE_DEMUXER 0 -+#define CONFIG_PCM_S8_DEMUXER 0 -+#define CONFIG_PCM_U32BE_DEMUXER 0 -+#define CONFIG_PCM_U32LE_DEMUXER 0 -+#define CONFIG_PCM_U24BE_DEMUXER 0 -+#define CONFIG_PCM_U24LE_DEMUXER 0 -+#define CONFIG_PCM_U16BE_DEMUXER 0 -+#define CONFIG_PCM_U16LE_DEMUXER 0 -+#define CONFIG_PCM_U8_DEMUXER 0 -+#define CONFIG_PDV_DEMUXER 0 -+#define CONFIG_PJS_DEMUXER 0 -+#define CONFIG_PMP_DEMUXER 0 -+#define CONFIG_PP_BNK_DEMUXER 0 -+#define CONFIG_PVA_DEMUXER 0 -+#define CONFIG_PVF_DEMUXER 0 -+#define CONFIG_QCP_DEMUXER 0 -+#define CONFIG_QOA_DEMUXER 0 -+#define CONFIG_R3D_DEMUXER 0 -+#define CONFIG_RAWVIDEO_DEMUXER 0 -+#define CONFIG_REALTEXT_DEMUXER 0 -+#define CONFIG_REDSPARK_DEMUXER 0 -+#define CONFIG_RKA_DEMUXER 0 -+#define CONFIG_RL2_DEMUXER 0 -+#define CONFIG_RM_DEMUXER 0 -+#define CONFIG_ROQ_DEMUXER 0 -+#define CONFIG_RPL_DEMUXER 0 -+#define CONFIG_RSD_DEMUXER 0 -+#define CONFIG_RSO_DEMUXER 0 -+#define CONFIG_RTP_DEMUXER 0 -+#define CONFIG_RTSP_DEMUXER 0 -+#define CONFIG_S337M_DEMUXER 0 -+#define CONFIG_SAMI_DEMUXER 0 -+#define CONFIG_SAP_DEMUXER 0 -+#define CONFIG_SBC_DEMUXER 0 -+#define CONFIG_SBG_DEMUXER 0 -+#define CONFIG_SCC_DEMUXER 0 -+#define CONFIG_SCD_DEMUXER 0 -+#define CONFIG_SDNS_DEMUXER 0 -+#define CONFIG_SDP_DEMUXER 0 -+#define CONFIG_SDR2_DEMUXER 0 -+#define CONFIG_SDS_DEMUXER 0 -+#define CONFIG_SDX_DEMUXER 0 -+#define CONFIG_SEGAFILM_DEMUXER 0 -+#define CONFIG_SER_DEMUXER 0 -+#define CONFIG_SGA_DEMUXER 0 -+#define CONFIG_SHORTEN_DEMUXER 0 -+#define CONFIG_SIFF_DEMUXER 0 -+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 -+#define CONFIG_SLN_DEMUXER 0 -+#define CONFIG_SMACKER_DEMUXER 0 -+#define CONFIG_SMJPEG_DEMUXER 0 -+#define CONFIG_SMUSH_DEMUXER 0 -+#define CONFIG_SOL_DEMUXER 0 -+#define CONFIG_SOX_DEMUXER 0 -+#define CONFIG_SPDIF_DEMUXER 0 -+#define CONFIG_SRT_DEMUXER 0 -+#define CONFIG_STR_DEMUXER 0 -+#define CONFIG_STL_DEMUXER 0 -+#define CONFIG_SUBVIEWER1_DEMUXER 0 -+#define CONFIG_SUBVIEWER_DEMUXER 0 -+#define CONFIG_SUP_DEMUXER 0 -+#define CONFIG_SVAG_DEMUXER 0 -+#define CONFIG_SVS_DEMUXER 0 -+#define CONFIG_SWF_DEMUXER 0 -+#define CONFIG_TAK_DEMUXER 0 -+#define CONFIG_TEDCAPTIONS_DEMUXER 0 -+#define CONFIG_THP_DEMUXER 0 -+#define CONFIG_THREEDOSTR_DEMUXER 0 -+#define CONFIG_TIERTEXSEQ_DEMUXER 0 -+#define CONFIG_TMV_DEMUXER 0 -+#define CONFIG_TRUEHD_DEMUXER 0 -+#define CONFIG_TTA_DEMUXER 0 -+#define CONFIG_TXD_DEMUXER 0 -+#define CONFIG_TTY_DEMUXER 0 -+#define CONFIG_TY_DEMUXER 0 -+#define CONFIG_USM_DEMUXER 0 -+#define CONFIG_V210_DEMUXER 0 -+#define CONFIG_V210X_DEMUXER 0 -+#define CONFIG_VAG_DEMUXER 0 -+#define CONFIG_VC1_DEMUXER 0 -+#define CONFIG_VC1T_DEMUXER 0 -+#define CONFIG_VIVIDAS_DEMUXER 0 -+#define CONFIG_VIVO_DEMUXER 0 -+#define CONFIG_VMD_DEMUXER 0 -+#define CONFIG_VOBSUB_DEMUXER 0 -+#define CONFIG_VOC_DEMUXER 0 -+#define CONFIG_VPK_DEMUXER 0 -+#define CONFIG_VPLAYER_DEMUXER 0 -+#define CONFIG_VQF_DEMUXER 0 -+#define CONFIG_VVC_DEMUXER 0 -+#define CONFIG_W64_DEMUXER 0 -+#define CONFIG_WADY_DEMUXER 0 -+#define CONFIG_WAVARC_DEMUXER 0 -+#define CONFIG_WAV_DEMUXER 1 -+#define CONFIG_WC3_DEMUXER 0 -+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 -+#define CONFIG_WEBVTT_DEMUXER 0 -+#define CONFIG_WSAUD_DEMUXER 0 -+#define CONFIG_WSD_DEMUXER 0 -+#define CONFIG_WSVQA_DEMUXER 0 -+#define CONFIG_WTV_DEMUXER 0 -+#define CONFIG_WVE_DEMUXER 0 -+#define CONFIG_WV_DEMUXER 0 -+#define CONFIG_XA_DEMUXER 0 -+#define CONFIG_XBIN_DEMUXER 0 -+#define CONFIG_XMD_DEMUXER 0 -+#define CONFIG_XMV_DEMUXER 0 -+#define CONFIG_XVAG_DEMUXER 0 -+#define CONFIG_XWMA_DEMUXER 0 -+#define CONFIG_YOP_DEMUXER 0 -+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_VBN_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 -+#define CONFIG_LIBGME_DEMUXER 0 -+#define CONFIG_LIBMODPLUG_DEMUXER 0 -+#define CONFIG_LIBOPENMPT_DEMUXER 0 -+#define CONFIG_VAPOURSYNTH_DEMUXER 0 -+#define CONFIG_A64_MUXER 0 -+#define CONFIG_AC3_MUXER 0 -+#define CONFIG_AC4_MUXER 0 -+#define CONFIG_ADTS_MUXER 0 -+#define CONFIG_ADX_MUXER 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 -+#define CONFIG_AMV_MUXER 0 -+#define CONFIG_APM_MUXER 0 -+#define CONFIG_APNG_MUXER 0 -+#define CONFIG_APTX_MUXER 0 -+#define CONFIG_APTX_HD_MUXER 0 -+#define CONFIG_ARGO_ASF_MUXER 0 -+#define CONFIG_ARGO_CVG_MUXER 0 -+#define CONFIG_ASF_MUXER 0 -+#define CONFIG_ASS_MUXER 0 -+#define CONFIG_AST_MUXER 0 -+#define CONFIG_ASF_STREAM_MUXER 0 -+#define CONFIG_AU_MUXER 0 -+#define CONFIG_AVI_MUXER 0 -+#define CONFIG_AVIF_MUXER 0 -+#define CONFIG_AVM2_MUXER 0 -+#define CONFIG_AVS2_MUXER 0 -+#define CONFIG_AVS3_MUXER 0 -+#define CONFIG_BIT_MUXER 0 -+#define CONFIG_CAF_MUXER 0 -+#define CONFIG_CAVSVIDEO_MUXER 0 -+#define CONFIG_CODEC2_MUXER 0 -+#define CONFIG_CODEC2RAW_MUXER 0 -+#define CONFIG_CRC_MUXER 0 -+#define CONFIG_DASH_MUXER 0 -+#define CONFIG_DATA_MUXER 0 -+#define CONFIG_DAUD_MUXER 0 -+#define CONFIG_DFPWM_MUXER 0 -+#define CONFIG_DIRAC_MUXER 0 -+#define CONFIG_DNXHD_MUXER 0 -+#define CONFIG_DTS_MUXER 0 -+#define CONFIG_DV_MUXER 0 -+#define CONFIG_EAC3_MUXER 0 -+#define CONFIG_EVC_MUXER 0 -+#define CONFIG_F4V_MUXER 0 -+#define CONFIG_FFMETADATA_MUXER 0 -+#define CONFIG_FIFO_MUXER 0 -+#define CONFIG_FILMSTRIP_MUXER 0 -+#define CONFIG_FITS_MUXER 0 -+#define CONFIG_FLAC_MUXER 0 -+#define CONFIG_FLV_MUXER 0 -+#define CONFIG_FRAMECRC_MUXER 0 -+#define CONFIG_FRAMEHASH_MUXER 0 -+#define CONFIG_FRAMEMD5_MUXER 0 -+#define CONFIG_G722_MUXER 0 -+#define CONFIG_G723_1_MUXER 0 -+#define CONFIG_G726_MUXER 0 -+#define CONFIG_G726LE_MUXER 0 -+#define CONFIG_GIF_MUXER 0 -+#define CONFIG_GSM_MUXER 0 -+#define CONFIG_GXF_MUXER 0 -+#define CONFIG_H261_MUXER 0 -+#define CONFIG_H263_MUXER 0 -+#define CONFIG_H264_MUXER 0 -+#define CONFIG_HASH_MUXER 0 -+#define CONFIG_HDS_MUXER 0 -+#define CONFIG_HEVC_MUXER 0 -+#define CONFIG_HLS_MUXER 0 -+#define CONFIG_IAMF_MUXER 0 -+#define CONFIG_ICO_MUXER 0 -+#define CONFIG_ILBC_MUXER 0 -+#define CONFIG_IMAGE2_MUXER 0 -+#define CONFIG_IMAGE2PIPE_MUXER 0 -+#define CONFIG_IPOD_MUXER 0 -+#define CONFIG_IRCAM_MUXER 0 -+#define CONFIG_ISMV_MUXER 0 -+#define CONFIG_IVF_MUXER 0 -+#define CONFIG_JACOSUB_MUXER 0 -+#define CONFIG_KVAG_MUXER 0 -+#define CONFIG_LATM_MUXER 0 -+#define CONFIG_LRC_MUXER 0 -+#define CONFIG_M4V_MUXER 0 -+#define CONFIG_MD5_MUXER 0 -+#define CONFIG_MATROSKA_MUXER 0 -+#define CONFIG_MATROSKA_AUDIO_MUXER 0 -+#define CONFIG_MICRODVD_MUXER 0 -+#define CONFIG_MJPEG_MUXER 0 -+#define CONFIG_MLP_MUXER 0 -+#define CONFIG_MMF_MUXER 0 -+#define CONFIG_MOV_MUXER 0 -+#define CONFIG_MP2_MUXER 0 -+#define CONFIG_MP3_MUXER 0 -+#define CONFIG_MP4_MUXER 0 -+#define CONFIG_MPEG1SYSTEM_MUXER 0 -+#define CONFIG_MPEG1VCD_MUXER 0 -+#define CONFIG_MPEG1VIDEO_MUXER 0 -+#define CONFIG_MPEG2DVD_MUXER 0 -+#define CONFIG_MPEG2SVCD_MUXER 0 -+#define CONFIG_MPEG2VIDEO_MUXER 0 -+#define CONFIG_MPEG2VOB_MUXER 0 -+#define CONFIG_MPEGTS_MUXER 0 -+#define CONFIG_MPJPEG_MUXER 0 -+#define CONFIG_MXF_MUXER 0 -+#define CONFIG_MXF_D10_MUXER 0 -+#define CONFIG_MXF_OPATOM_MUXER 0 -+#define CONFIG_NULL_MUXER 0 -+#define CONFIG_NUT_MUXER 0 -+#define CONFIG_OBU_MUXER 0 -+#define CONFIG_OGA_MUXER 0 -+#define CONFIG_OGG_MUXER 0 -+#define CONFIG_OGV_MUXER 0 -+#define CONFIG_OMA_MUXER 0 -+#define CONFIG_OPUS_MUXER 0 -+#define CONFIG_PCM_ALAW_MUXER 0 -+#define CONFIG_PCM_MULAW_MUXER 0 -+#define CONFIG_PCM_VIDC_MUXER 0 -+#define CONFIG_PCM_F64BE_MUXER 0 -+#define CONFIG_PCM_F64LE_MUXER 0 -+#define CONFIG_PCM_F32BE_MUXER 0 -+#define CONFIG_PCM_F32LE_MUXER 0 -+#define CONFIG_PCM_S32BE_MUXER 0 -+#define CONFIG_PCM_S32LE_MUXER 0 -+#define CONFIG_PCM_S24BE_MUXER 0 -+#define CONFIG_PCM_S24LE_MUXER 0 -+#define CONFIG_PCM_S16BE_MUXER 0 -+#define CONFIG_PCM_S16LE_MUXER 0 -+#define CONFIG_PCM_S8_MUXER 0 -+#define CONFIG_PCM_U32BE_MUXER 0 -+#define CONFIG_PCM_U32LE_MUXER 0 -+#define CONFIG_PCM_U24BE_MUXER 0 -+#define CONFIG_PCM_U24LE_MUXER 0 -+#define CONFIG_PCM_U16BE_MUXER 0 -+#define CONFIG_PCM_U16LE_MUXER 0 -+#define CONFIG_PCM_U8_MUXER 0 -+#define CONFIG_PSP_MUXER 0 -+#define CONFIG_RAWVIDEO_MUXER 0 -+#define CONFIG_RCWT_MUXER 0 -+#define CONFIG_RM_MUXER 0 -+#define CONFIG_ROQ_MUXER 0 -+#define CONFIG_RSO_MUXER 0 -+#define CONFIG_RTP_MUXER 0 -+#define CONFIG_RTP_MPEGTS_MUXER 0 -+#define CONFIG_RTSP_MUXER 0 -+#define CONFIG_SAP_MUXER 0 -+#define CONFIG_SBC_MUXER 0 -+#define CONFIG_SCC_MUXER 0 -+#define CONFIG_SEGAFILM_MUXER 0 -+#define CONFIG_SEGMENT_MUXER 0 -+#define CONFIG_STREAM_SEGMENT_MUXER 0 -+#define CONFIG_SMJPEG_MUXER 0 -+#define CONFIG_SMOOTHSTREAMING_MUXER 0 -+#define CONFIG_SOX_MUXER 0 -+#define CONFIG_SPX_MUXER 0 -+#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SRT_MUXER 0 -+#define CONFIG_STREAMHASH_MUXER 0 -+#define CONFIG_SUP_MUXER 0 -+#define CONFIG_SWF_MUXER 0 -+#define CONFIG_TEE_MUXER 0 -+#define CONFIG_TG2_MUXER 0 -+#define CONFIG_TGP_MUXER 0 -+#define CONFIG_MKVTIMESTAMP_V2_MUXER 0 -+#define CONFIG_TRUEHD_MUXER 0 -+#define CONFIG_TTA_MUXER 0 -+#define CONFIG_TTML_MUXER 0 -+#define CONFIG_UNCODEDFRAMECRC_MUXER 0 -+#define CONFIG_VC1_MUXER 0 -+#define CONFIG_VC1T_MUXER 0 -+#define CONFIG_VOC_MUXER 0 -+#define CONFIG_VVC_MUXER 0 -+#define CONFIG_W64_MUXER 0 -+#define CONFIG_WAV_MUXER 0 -+#define CONFIG_WEBM_MUXER 0 -+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 -+#define CONFIG_WEBM_CHUNK_MUXER 0 -+#define CONFIG_WEBP_MUXER 0 -+#define CONFIG_WEBVTT_MUXER 0 -+#define CONFIG_WSAUD_MUXER 0 -+#define CONFIG_WTV_MUXER 0 -+#define CONFIG_WV_MUXER 0 -+#define CONFIG_YUV4MPEGPIPE_MUXER 0 -+#define CONFIG_CHROMAPRINT_MUXER 0 -+#define CONFIG_ASYNC_PROTOCOL 0 -+#define CONFIG_BLURAY_PROTOCOL 0 -+#define CONFIG_CACHE_PROTOCOL 0 -+#define CONFIG_CONCAT_PROTOCOL 0 -+#define CONFIG_CONCATF_PROTOCOL 0 -+#define CONFIG_CRYPTO_PROTOCOL 0 -+#define CONFIG_DATA_PROTOCOL 0 -+#define CONFIG_FD_PROTOCOL 0 -+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 -+#define CONFIG_FFRTMPHTTP_PROTOCOL 0 -+#define CONFIG_FILE_PROTOCOL 0 -+#define CONFIG_FTP_PROTOCOL 0 -+#define CONFIG_GOPHER_PROTOCOL 0 -+#define CONFIG_GOPHERS_PROTOCOL 0 -+#define CONFIG_HLS_PROTOCOL 0 -+#define CONFIG_HTTP_PROTOCOL 0 -+#define CONFIG_HTTPPROXY_PROTOCOL 0 -+#define CONFIG_HTTPS_PROTOCOL 0 -+#define CONFIG_ICECAST_PROTOCOL 0 -+#define CONFIG_MMSH_PROTOCOL 0 -+#define CONFIG_MMST_PROTOCOL 0 -+#define CONFIG_MD5_PROTOCOL 0 -+#define CONFIG_PIPE_PROTOCOL 0 -+#define CONFIG_PROMPEG_PROTOCOL 0 -+#define CONFIG_RTMP_PROTOCOL 0 -+#define CONFIG_RTMPE_PROTOCOL 0 -+#define CONFIG_RTMPS_PROTOCOL 0 -+#define CONFIG_RTMPT_PROTOCOL 0 -+#define CONFIG_RTMPTE_PROTOCOL 0 -+#define CONFIG_RTMPTS_PROTOCOL 0 -+#define CONFIG_RTP_PROTOCOL 0 -+#define CONFIG_SCTP_PROTOCOL 0 -+#define CONFIG_SRTP_PROTOCOL 0 -+#define CONFIG_SUBFILE_PROTOCOL 0 -+#define CONFIG_TEE_PROTOCOL 0 -+#define CONFIG_TCP_PROTOCOL 0 -+#define CONFIG_TLS_PROTOCOL 0 -+#define CONFIG_UDP_PROTOCOL 0 -+#define CONFIG_UDPLITE_PROTOCOL 0 -+#define CONFIG_UNIX_PROTOCOL 0 -+#define CONFIG_LIBAMQP_PROTOCOL 0 -+#define CONFIG_LIBRIST_PROTOCOL 0 -+#define CONFIG_LIBRTMP_PROTOCOL 0 -+#define CONFIG_LIBRTMPE_PROTOCOL 0 -+#define CONFIG_LIBRTMPS_PROTOCOL 0 -+#define CONFIG_LIBRTMPT_PROTOCOL 0 -+#define CONFIG_LIBRTMPTE_PROTOCOL 0 -+#define CONFIG_LIBSRT_PROTOCOL 0 -+#define CONFIG_LIBSSH_PROTOCOL 0 -+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 -+#define CONFIG_LIBZMQ_PROTOCOL 0 -+#define CONFIG_IPFS_GATEWAY_PROTOCOL 0 -+#define CONFIG_IPNS_GATEWAY_PROTOCOL 0 -+#endif /* FFMPEG_CONFIG_COMPONENTS_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/libavcodec/bsf_list.c -@@ -0,0 +1,2 @@ -+static const FFBitStreamFilter * const bitstream_filters[] = { -+ NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/libavcodec/codec_list.c -@@ -0,0 +1,19 @@ -+static const FFCodec * const codec_list[] = { -+ &ff_h263_decoder, -+ &ff_h264_decoder, -+ &ff_mpeg4_decoder, -+ &ff_aac_decoder, -+ &ff_flac_decoder, -+ &ff_mp3_decoder, -+ &ff_vorbis_decoder, -+ &ff_pcm_alaw_decoder, -+ &ff_pcm_f32le_decoder, -+ &ff_pcm_mulaw_decoder, -+ &ff_pcm_s16be_decoder, -+ &ff_pcm_s16le_decoder, -+ &ff_pcm_s24be_decoder, -+ &ff_pcm_s24le_decoder, -+ &ff_pcm_s32le_decoder, -+ &ff_pcm_u8_decoder, -+ &ff_libopus_decoder, -+ NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/libavcodec/parser_list.c -@@ -0,0 +1,11 @@ -+static const AVCodecParser * const parser_list[] = { -+ &ff_aac_parser, -+ &ff_flac_parser, -+ &ff_h263_parser, -+ &ff_h264_parser, -+ &ff_mpeg4video_parser, -+ &ff_mpegaudio_parser, -+ &ff_opus_parser, -+ &ff_vorbis_parser, -+ &ff_vp9_parser, -+ NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/libavformat/demuxer_list.c -@@ -0,0 +1,10 @@ + #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_aac_demuxer, -+ &ff_avi_demuxer, -+ &ff_flac_demuxer, -+ &ff_matroska_demuxer, -+ &ff_mov_demuxer, -+ &ff_mp3_demuxer, -+ &ff_ogg_demuxer, -+ &ff_wav_demuxer, -+ NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/libavformat/muxer_list.c -@@ -0,0 +1,2 @@ -+static const FFOutputFormat * const muxer_list[] = { -+ NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/libavformat/protocol_list.c -@@ -0,0 +1,2 @@ -+static const URLProtocol * const url_protocols[] = { -+ NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/libavutil/avconfig.h -@@ -0,0 +1,6 @@ -+/* Generated by ffmpeg configure */ -+#ifndef AVUTIL_AVCONFIG_H -+#define AVUTIL_AVCONFIG_H -+#define AV_HAVE_BIGENDIAN 0 -+#define AV_HAVE_FAST_UNALIGNED 0 -+#endif /* AVUTIL_AVCONFIG_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/ChromeOS/linux/riscv64/libavutil/ffversion.h -@@ -0,0 +1,5 @@ -+/* Automatically generated by version.sh, do not manually edit! */ -+#ifndef AVUTIL_FFVERSION_H -+#define AVUTIL_FFVERSION_H -+#define FFMPEG_VERSION "5.1.git" -+#endif /* AVUTIL_FFVERSION_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config.h -@@ -0,0 +1,775 @@ + &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 + %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/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 @@ + /* 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-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/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/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=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 '--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 +@@ -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/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 +@@ -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-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/hacker/chromium/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --arch=riscv64 --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/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_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 "Debian clang version 16.0.6 (27)" ++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 084e2b53d22c11e013b0a495b65d39aa7f934048)" +#define OS_NAME linux +#define EXTERN_PREFIX "" +#define EXTERN_ASM @@ -6198,8 +4956,9 @@ +#define HAVE_POWER8 0 +#define HAVE_PPC4XX 0 +#define HAVE_VSX 0 -+#define HAVE_RV 0 -+#define HAVE_RVV 0 ++#define HAVE_RV 1 ++#define HAVE_RVV 1 ++#define HAVE_RV_ZVBB 0 +#define HAVE_AESNI 0 +#define HAVE_AMD3DNOW 0 +#define HAVE_AMD3DNOWEXT 0 @@ -6218,7 +4977,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 @@ -6252,6 +5010,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 @@ -6270,7 +5029,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 @@ -6304,6 +5062,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 @@ -6322,7 +5081,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 @@ -6360,6 +5118,7 @@ +#define HAVE_BIGENDIAN 0 +#define HAVE_FAST_UNALIGNED 0 +#define HAVE_ARPA_INET_H 0 ++#define HAVE_ASM_HWPROBE_H 1 +#define HAVE_ASM_TYPES_H 1 +#define HAVE_CDIO_PARANOIA_H 0 +#define HAVE_CDIO_PARANOIA_PARANOIA_H 0 @@ -6386,6 +5145,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 @@ -6520,7 +5280,7 @@ +#define HAVE_INLINE_ASM_LABELS 1 +#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 +#define HAVE_PRAGMA_DEPRECATED 1 -+#define HAVE_RSYNC_CONTIMEOUT 0 ++#define HAVE_RSYNC_CONTIMEOUT 1 +#define HAVE_SYMVER_ASM_LABEL 1 +#define HAVE_SYMVER_GNU_ASM 1 +#define HAVE_VFP_ARGS 0 @@ -6559,6 +5319,7 @@ +#define HAVE_STRUCT_SOCKADDR_STORAGE 0 +#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 +#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 @@ -6660,6 +5421,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 @@ -6783,6 +5545,7 @@ +#define CONFIG_ERROR_RESILIENCE 0 +#define CONFIG_FAAN 0 +#define CONFIG_FAST_UNALIGNED 0 ++#define CONFIG_IAMF 0 +#define CONFIG_LSP 0 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 @@ -6831,7 +5594,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 @@ -6863,6 +5627,7 @@ +#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 @@ -6915,9 +5680,10 @@ +#define CONFIG_WMA_FREQS 0 +#define CONFIG_WMV2DSP 0 +#endif /* FFMPEG_CONFIG_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/config_components.h -@@ -0,0 +1,2210 @@ +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 +@@ -0,0 +1,2218 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -6931,6 +5697,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 @@ -6964,7 +5731,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 @@ -7504,6 +6270,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 @@ -7732,6 +6499,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 @@ -8484,6 +7252,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 @@ -8679,6 +7449,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 @@ -8762,6 +7533,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 @@ -8972,6 +7744,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 @@ -9074,6 +7847,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 @@ -9128,13 +7902,15 @@ +#define CONFIG_IPFS_GATEWAY_PROTOCOL 0 +#define CONFIG_IPNS_GATEWAY_PROTOCOL 0 +#endif /* FFMPEG_CONFIG_COMPONENTS_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/bsf_list.c +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 @@ -0,0 +1,2 @@ +static const FFBitStreamFilter * const bitstream_filters[] = { + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/codec_list.c +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 @@ -0,0 +1,15 @@ +static const FFCodec * const codec_list[] = { + &ff_flac_decoder, @@ -9151,8 +7927,9 @@ + &ff_pcm_u8_decoder, + &ff_libopus_decoder, + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavcodec/parser_list.c +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 @@ -0,0 +1,7 @@ +static const AVCodecParser * const parser_list[] = { + &ff_flac_parser, @@ -9161,8 +7938,9 @@ + &ff_vorbis_parser, + &ff_vp9_parser, + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c +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 @@ -0,0 +1,8 @@ +static const FFInputFormat * const demuxer_list[] = { + &ff_flac_demuxer, @@ -9172,18 +7950,21 @@ + &ff_ogg_demuxer, + &ff_wav_demuxer, + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/muxer_list.c +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 @@ -0,0 +1,2 @@ +static const FFOutputFormat * const muxer_list[] = { + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavformat/protocol_list.c +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 @@ -0,0 +1,2 @@ +static const URLProtocol * const url_protocols[] = { + NULL }; ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/avconfig.h +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 @@ -0,0 +1,6 @@ +/* Generated by ffmpeg configure */ +#ifndef AVUTIL_AVCONFIG_H @@ -9191,158 +7972,2814 @@ +#define AV_HAVE_BIGENDIAN 0 +#define AV_HAVE_FAST_UNALIGNED 0 +#endif /* AVUTIL_AVCONFIG_H */ ---- /dev/null -+++ b/third_party/ffmpeg/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.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 @@ -0,0 +1,5 @@ +/* Automatically generated by version.sh, do not manually edit! */ +#ifndef AVUTIL_FFVERSION_H +#define AVUTIL_FFVERSION_H -+#define FFMPEG_VERSION "5.1.git" ++#define FFMPEG_VERSION "git-2024-05-24-bc1ee906ce" +#endif /* AVUTIL_FFVERSION_H */ ---- a/media/ffmpeg/scripts/build_ffmpeg.py -+++ b/media/ffmpeg/scripts/build_ffmpeg.py -@@ -43,7 +43,7 @@ +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 @@ - ARCH_MAP = { - 'android': ['ia32', 'x64', 'arm-neon', 'arm64'], -- 'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'], -+ 'linux': ['ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64', 'riscv64'], - 'mac': ['x64', 'arm64'], - 'win': ['ia32', 'x64', 'arm64'], - } -@@ -672,7 +672,7 @@ - '--disable-securetransport', - '--disable-faan', - '--disable-alsa', -- '--disable-iamf', -+ # '--disable-iamf', + use_linux_config = is_linux || is_chromeos || is_fuchsia - # Disable automatically detected external libraries. This prevents - # automatic inclusion of things like hardware decoders. Each roll should -@@ -898,6 +898,10 @@ - '--extra-cflags=--target=mips64el-linux-gnuabi64', - '--extra-ldflags=--target=mips64el-linux-gnuabi64', - ]) -+ elif target_arch == 'riscv64': -+ configure_flags['Common'].extend([ -+ '--arch=riscv64', -+ ]) - else: - print('Error: Unknown target arch %r for target OS %r!' % - (target_arch, target_os), ---- a/third_party/ffmpeg/chromium/scripts/generate_gn.py -+++ b/third_party/ffmpeg/chromium/scripts/generate_gn.py -@@ -77,7 +77,7 @@ - _Attrs = ('ARCHITECTURE', 'TARGET', 'PLATFORM') - Attr = collections.namedtuple('Attr', _Attrs)(*_Attrs) - SUPPORT_MATRIX = { -- Attr.ARCHITECTURE: set(['ia32', 'x64', 'arm', 'arm64', 'arm-neon']), -+ Attr.ARCHITECTURE: set(['ia32', 'x64', 'arm', 'arm64', 'arm-neon', 'riscv64']), - Attr.TARGET: set(['Chromium', 'Chrome', 'ChromeOS']), - Attr.PLATFORM: set(['android', 'linux', 'win', 'mac']) - } ---- a/media/ffmpeg/scripts/robo_lib/config.py -+++ b/media/ffmpeg/scripts/robo_lib/config.py -@@ -189,6 +189,8 @@ - self._host_architecture = "mips64el" - elif platform.machine().startswith("arm"): - self._host_architecture = "arm" -+ elif platform.machine() == "riscv64": -+ self._host_architecture = "riscv64" - else: - raise ValueError( - f"Unrecognized CPU architecture: {platform.machine()}") ---- a/third_party/ffmpeg/ffmpeg_generated.gni -+++ b/third_party/ffmpeg/ffmpeg_generated.gni -@@ -697,3 +697,90 @@ - if (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") { - ffmpeg_asm_sources += [ "libavcodec/x86/simple_idct10.asm" ] - } -+ +-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/riscv/aacencdsp_init.c", -+ "libavcodec/riscv/aacpsdsp_init.c", -+ "libavcodec/riscv/ac3dsp_init.c", -+ "libavcodec/riscv/alacdsp_init.c", -+ "libavcodec/riscv/audiodsp_init.c", -+ "libavcodec/riscv/blockdsp_init.c", -+ "libavcodec/riscv/bswapdsp_init.c", -+ "libavcodec/riscv/exrdsp_init.c", + 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/fmtconvert_init.c", -+ "libavcodec/riscv/g722dsp_init.c", -+ "libavcodec/riscv/h264_chroma_init_riscv.c", -+ "libavcodec/riscv/huffyuvdsp_init.c", -+ "libavcodec/riscv/idctdsp_init.c", -+ "libavcodec/riscv/jpeg2000dsp_init.c", -+ "libavcodec/riscv/llauddsp_init.c", -+ "libavcodec/riscv/llviddsp_init.c", -+ "libavcodec/riscv/llvidencdsp_init.c", -+ "libavcodec/riscv/lpc_init.c", -+ "libavcodec/riscv/me_cmp_init.c", -+ "libavcodec/riscv/opusdsp_init.c", -+ "libavcodec/riscv/pixblockdsp_init.c", -+ "libavcodec/riscv/rv34dsp_init.c", -+ "libavcodec/riscv/sbrdsp_init.c", -+ "libavcodec/riscv/svqenc_init.c", -+ "libavcodec/riscv/takdsp_init.c", -+ "libavcodec/riscv/utvideodsp_init.c", -+ "libavcodec/riscv/vc1dsp_init.c", + "libavcodec/riscv/vorbisdsp_init.c", -+ "libavcodec/riscv/vp8dsp_init.c", -+ "libavfilter/riscv/af_afir_init.c", -+ "libavutil/riscv/cpu.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", -+ "libswscale/riscv/rgb2rgb.c", -+ "libavutil/riscv/bswap.h", -+ "libavutil/riscv/cpu.h", -+ "libavutil/riscv/intmath.h", -+ "libavutil/riscv/timer.h", -+ ] + "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", + ] + ffmpeg_gas_sources += [ -+ "libavcodec/riscv/aacencdsp_rvv.S", -+ "libavcodec/riscv/aacpsdsp_rvv.S", -+ "libavcodec/riscv/ac3dsp_rvb.S", -+ "libavcodec/riscv/ac3dsp_rvv.S", -+ "libavcodec/riscv/alacdsp_rvv.S", -+ "libavcodec/riscv/audiodsp_rvf.S", -+ "libavcodec/riscv/audiodsp_rvv.S", -+ "libavcodec/riscv/blockdsp_rvv.S", -+ "libavcodec/riscv/bswapdsp_rvb.S", -+ "libavcodec/riscv/bswapdsp_rvv.S", -+ "libavcodec/riscv/exrdsp_rvv.S", + "libavcodec/riscv/flacdsp_rvv.S", -+ "libavcodec/riscv/fmtconvert_rvv.S", -+ "libavcodec/riscv/g722dsp_rvv.S", -+ "libavcodec/riscv/h264_mc_chroma.S", -+ "libavcodec/riscv/huffyuvdsp_rvv.S", -+ "libavcodec/riscv/idctdsp_rvv.S", -+ "libavcodec/riscv/jpeg2000dsp_rvv.S", -+ "libavcodec/riscv/llauddsp_rvv.S", -+ "libavcodec/riscv/llviddsp_rvv.S", -+ "libavcodec/riscv/llvidencdsp_rvv.S", -+ "libavcodec/riscv/lpc_rvv.S", -+ "libavcodec/riscv/me_cmp_rvv.S", -+ "libavcodec/riscv/opusdsp_rvv.S", -+ "libavcodec/riscv/pixblockdsp_rvi.S", -+ "libavcodec/riscv/pixblockdsp_rvv.S", -+ "libavcodec/riscv/rv34dsp_rvv.S", -+ "libavcodec/riscv/sbrdsp_rvv.S", -+ "libavcodec/riscv/svqenc_rvv.S", -+ "libavcodec/riscv/takdsp_rvv.S", -+ "libavcodec/riscv/utvideodsp_rvv.S", -+ "libavcodec/riscv/vc1dsp_rvv.S", + "libavcodec/riscv/vorbisdsp_rvv.S", -+ "libavcodec/riscv/vp8dsp_rvv.S", -+ "libavfilter/riscv/af_afir_rvv.S", -+ "libavutil/riscv/asm.S", -+ "libavutil/riscv/bswap_rvb.S", + "libavutil/riscv/fixed_dsp_rvv.S", + "libavutil/riscv/float_dsp_rvv.S", -+ "libswscale/riscv/rgb2rgb_rvb.S", -+ "libswscale/riscv/rgb2rgb_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 @@ + "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 '--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 +@@ -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 '--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 +@@ -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 '--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 +@@ -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 '--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 +@@ -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 '--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 +@@ -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 '--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 +@@ -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 '--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 +@@ -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 '--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 +@@ -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 '--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 +@@ -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-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/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/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 --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-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/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/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=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-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/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/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 --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-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/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/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=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" diff --git a/www-client/chromium/files/riscv-v8.patch b/www-client/chromium/files/riscv-v8.patch new file mode 100644 index 0000000..8cdb37e --- /dev/null +++ b/www-client/chromium/files/riscv-v8.patch @@ -0,0 +1,28 @@ +Index: chromium-128.0.6613.84/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv-inl.h +=================================================================== +--- chromium-128.0.6613.84.orig/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv-inl.h ++++ chromium-128.0.6613.84/v8/src/wasm/baseline/riscv/liftoff-assembler-riscv-inl.h +@@ -2368,6 +2368,22 @@ void LiftoffAssembler::CallFrameSetupStu + CallBuiltin(Builtin::kWasmLiftoffFrameSetup); + } + ++bool LiftoffAssembler::emit_f16x8_splat(LiftoffRegister dst, ++ LiftoffRegister src) { ++ return false; ++} ++bool LiftoffAssembler::emit_f16x8_extract_lane(LiftoffRegister dst, ++ LiftoffRegister lhs, ++ uint8_t imm_lane_idx) { ++ return false; ++} ++bool LiftoffAssembler::emit_f16x8_replace_lane(LiftoffRegister dst, ++ LiftoffRegister src1, ++ LiftoffRegister src2, ++ uint8_t imm_lane_idx) { ++ return false; ++} ++ + } // namespace v8::internal::wasm + + #endif // V8_WASM_BASELINE_RISCV_LIFTOFF_ASSEMBLER_RISCV_INL_H_ + diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml index 46230c5..66251f8 100644 --- a/www-client/chromium/metadata.xml +++ b/www-client/chromium/metadata.xml @@ -15,8 +15,6 @@ <flag name="gtk4">Build with GTK4 headers.</flag> <flag name="headless">Build Ozone only with headless backend, NOT RECOMMENDED for general use.</flag> <flag name="hangouts">Enable support for Google Hangouts features such as screen sharing</flag> - <flag name="libcxx">Use bundled libc++ instead of libstdc++ for building.</flag> - <flag name="lto">Build with Link Time Optimizations (via clang's ThinLTO)</flag> <flag name="official">Enable Official build instead of Developer build.</flag> <flag name="pax-kernel">Allow building on a PaX-enabled kernel</flag> <flag name="pgo">Build with Profile Guided Optimizations (2-stage compilation)</flag> |