diff --git a/patches/chromium/.patches b/patches/chromium/.patches index 758edb9eb4b8d..003ceffc5a4f8 100644 --- a/patches/chromium/.patches +++ b/patches/chromium/.patches @@ -1,5 +1,4 @@ 0001-clang-add-riscv64-support-to-package-script.patch -0001-rust-toolchain-fix-float-target-abi-for-riscv64.patch 0001-extensions-common-api-runtime.json-riscv64-support.patch 0002-Add-support-for-riscv64-linux.patch 0004-installer-add-riscv64-support.patch @@ -7,6 +6,7 @@ 0006-abseil-cpp-fix-signedness-conversion.patch 0007-clang-toolchain-riscv64-support.patch 0008-sysroot-riscv64-support.patch +0001-media-ffmpeg-add-riscv64-support.patch build_gn.patch accelerator.patch blink_file_path.patch diff --git a/patches/chromium/0001-media-ffmpeg-add-riscv64-support.patch b/patches/chromium/0001-media-ffmpeg-add-riscv64-support.patch new file mode 100644 index 0000000000000..50cc83db38514 --- /dev/null +++ b/patches/chromium/0001-media-ffmpeg-add-riscv64-support.patch @@ -0,0 +1,74 @@ +From 8c1cb3b1cc25d522fbbb22a4e4f3346361bfe744 Mon Sep 17 00:00:00 2001 +From: Levi Zim +Date: Tue, 11 Jun 2024 04:14:28 +0200 +Subject: [PATCH] media/ffmpeg: add riscv64 support + +--- + media/ffmpeg/scripts/build_ffmpeg.py | 16 +++++++++++++++- + media/ffmpeg/scripts/generate_gn.py | 2 +- + media/ffmpeg/scripts/robo_lib/config.py | 2 +- + 3 files changed, 17 insertions(+), 3 deletions(-) + +diff --git a/media/ffmpeg/scripts/build_ffmpeg.py b/media/ffmpeg/scripts/build_ffmpeg.py +index 75589ce6a2181..548dd13a22be7 100755 +--- a/media/ffmpeg/scripts/build_ffmpeg.py ++++ b/media/ffmpeg/scripts/build_ffmpeg.py +@@ -43,7 +43,7 @@ BRANDINGS = [ + + 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'], + } +@@ -898,6 +898,20 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, + '--extra-cflags=--target=mips64el-linux-gnuabi64', + '--extra-ldflags=--target=mips64el-linux-gnuabi64', + ]) ++ elif target_arch == "riscv64": ++ configure_flags['Common'].extend([ ++ '--arch=riscv64', ++ '--extra-cflags=-march=rv64gc', ++ ]) ++ if target_os == 'linux': ++ configure_flags['Common'].extend([ ++ '--enable-cross-compile', ++ '--target-os=linux', ++ '--sysroot=' + os.path.join( ++ CHROMIUM_ROOT_DIR, 'build/linux/debian_sid_riscv64-sysroot'), ++ '--extra-cflags=--target=riscv64-linux-gnu', ++ '--extra-ldflags=--target=riscv64-linux-gnu', ++ ]) + else: + print('Error: Unknown target arch %r for target OS %r!' % + (target_arch, target_os), +diff --git a/media/ffmpeg/scripts/generate_gn.py b/media/ffmpeg/scripts/generate_gn.py +index e2d6b7ef211c7..41824671fed0c 100755 +--- a/media/ffmpeg/scripts/generate_gn.py ++++ b/media/ffmpeg/scripts/generate_gn.py +@@ -80,7 +80,7 @@ GN_SOURCE_END = """] + _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']) + } +diff --git a/media/ffmpeg/scripts/robo_lib/config.py b/media/ffmpeg/scripts/robo_lib/config.py +index 84a6bf5196d95..7f0c3d0a7f221 100644 +--- a/media/ffmpeg/scripts/robo_lib/config.py ++++ b/media/ffmpeg/scripts/robo_lib/config.py +@@ -204,7 +204,7 @@ class RoboConfiguration: + self._host_operating_system = "linux" + + try: +- with open("/etc/lsb-release", "r") as f: ++ with open("/etc/os-release", "r") as f: + result = f.read() + if "Ubuntu" in result or "Debian" in result: + self._os_flavor = packages.OsFlavor.Debian +-- +2.45.2 + diff --git a/patches/chromium/0001-rust-toolchain-fix-float-target-abi-for-riscv64.patch b/patches/chromium/0001-rust-toolchain-fix-float-target-abi-for-riscv64.patch deleted file mode 100644 index d7399b1aca070..0000000000000 --- a/patches/chromium/0001-rust-toolchain-fix-float-target-abi-for-riscv64.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 2ee319119d9bc6bd9231f943144fb4749907086b Mon Sep 17 00:00:00 2001 -From: kxxt -Date: Sat, 10 Feb 2024 10:31:01 +0800 -Subject: [PATCH] rust toolchain: fix float target-abi for riscv64 - ---- - tools/rust/build_rust.py | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/tools/rust/build_rust.py b/tools/rust/build_rust.py -index 0ec68bab0d58a..3440f10cabdd8 100755 ---- a/tools/rust/build_rust.py -+++ b/tools/rust/build_rust.py -@@ -664,11 +664,12 @@ def main(): - args, rest = parser.parse_known_args() - - debian_sysroot = None -- if sys.platform.startswith('linux') and not args.sync_for_gnrt: -+ # Somehow building rust with native sysroot fail -+ #if sys.platform.startswith('linux') and not args.sync_for_gnrt: - # Fetch sysroot we build rustc against. This ensures a minimum supported - # host (not Chromium target). Since the rustc linux package is for - # x86_64 only, that is the sole needed sysroot. -- debian_sysroot = DownloadDebianSysroot('amd64', args.skip_checkout) -+ # debian_sysroot = DownloadDebianSysroot('amd64', args.skip_checkout) - - # Require zlib compression. - if sys.platform == 'win32': -@@ -723,6 +724,10 @@ def main(): - - if not args.skip_checkout: - CheckoutGitRepo('Rust', RUST_GIT_URL, checkout_revision, RUST_SRC_DIR) -+ # Fix chromium linking for riscv64 -+ GitCherryPick(RUST_SRC_DIR, 'https://github.com/kxxt/rust.git', -+ '6ec00d6675546438db0f947598935621d4ff885f') -+ - path = FetchBetaPackage('cargo', checkout_revision) - if sys.platform == 'win32': - cargo_bin = os.path.join(path, 'cargo', 'bin', 'cargo.exe') --- -2.39.2 - diff --git a/patches/chromium/0002-Add-support-for-riscv64-linux.patch b/patches/chromium/0002-Add-support-for-riscv64-linux.patch index d180bbed22c7a..00703f91a7bc8 100644 --- a/patches/chromium/0002-Add-support-for-riscv64-linux.patch +++ b/patches/chromium/0002-Add-support-for-riscv64-linux.patch @@ -1,45 +1,13 @@ -From 68ee4d98e6c2ce6c60265b51694ac7a82784fcf3 Mon Sep 17 00:00:00 2001 +From 90499f55f949f95b01c84257d306cf209c04b431 Mon Sep 17 00:00:00 2001 From: Andreas Schwab -Date: Fri, 4 Mar 2022 15:27:35 +0100 -Subject: [PATCH 2/8] Add support for riscv64-linux - -Bug: 1505003 +Date: Fri, 04 Mar 2022 15:27:35 +0100 +Subject: [PATCH] Add support for riscv64-linux Change-Id: Ibcdaaba1b0c92a1cd85361b9859370c686832c49 --- - sandbox/features.gni | 3 +- - sandbox/linux/bpf_dsl/linux_syscall_ranges.h | 7 + - sandbox/linux/bpf_dsl/seccomp_macros.h | 42 + - .../bpf_dsl_seccomp_unittest.cc | 22 + - .../seccomp-bpf-helpers/baseline_policy.cc | 11 +- - .../baseline_policy_unittest.cc | 6 +- - .../syscall_parameters_restrictions.cc | 5 +- - ...scall_parameters_restrictions_unittests.cc | 1 + - .../linux/seccomp-bpf-helpers/syscall_sets.cc | 62 +- - .../linux/seccomp-bpf-helpers/syscall_sets.h | 14 +- - sandbox/linux/seccomp-bpf/syscall.cc | 34 +- - sandbox/linux/seccomp-bpf/trap.cc | 12 + - sandbox/linux/services/credentials.cc | 2 +- - sandbox/linux/services/syscall_wrappers.cc | 2 +- - .../linux/syscall_broker/broker_process.cc | 20 +- - sandbox/linux/system_headers/linux_seccomp.h | 8 + - sandbox/linux/system_headers/linux_signal.h | 2 +- - sandbox/linux/system_headers/linux_stat.h | 2 +- - sandbox/linux/system_headers/linux_syscalls.h | 4 + - .../system_headers/riscv64_linux_syscalls.h | 1222 +++++++++++++++++ - sandbox/policy/linux/bpf_cdm_policy_linux.cc | 2 +- - .../linux/bpf_cros_amd_gpu_policy_linux.cc | 2 +- - sandbox/policy/linux/bpf_gpu_policy_linux.cc | 2 +- - .../policy/linux/bpf_network_policy_linux.cc | 2 +- - .../bpf_print_compositor_policy_linux.cc | 2 +- - .../policy/linux/bpf_renderer_policy_linux.cc | 2 +- - .../policy/linux/bpf_service_policy_linux.cc | 2 +- - .../policy/linux/bpf_utility_policy_linux.cc | 2 +- - 28 files changed, 1438 insertions(+), 59 deletions(-) - create mode 100644 sandbox/linux/system_headers/riscv64_linux_syscalls.h diff --git a/sandbox/features.gni b/sandbox/features.gni -index 8434144118b49..8aa52983f78f8 100644 +index 8434144..8aa52983 100644 --- a/sandbox/features.gni +++ b/sandbox/features.gni @@ -9,7 +9,8 @@ @@ -53,7 +21,7 @@ index 8434144118b49..8aa52983f78f8 100644 # SSBD (Speculative Store Bypass Disable) is a mitigation of Spectre Variant 4. # As Spectre Variant 4 can be mitigated by site isolation, opt-out SSBD on site diff --git a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h -index 1d0590b7dd6ce..b722fbc95ee3e 100644 +index 1d0590b..b722fbc9 100644 --- a/sandbox/linux/bpf_dsl/linux_syscall_ranges.h +++ b/sandbox/linux/bpf_dsl/linux_syscall_ranges.h @@ -56,6 +56,13 @@ @@ -71,10 +39,10 @@ index 1d0590b7dd6ce..b722fbc95ee3e 100644 #error "Unsupported architecture" #endif diff --git a/sandbox/linux/bpf_dsl/seccomp_macros.h b/sandbox/linux/bpf_dsl/seccomp_macros.h -index 87d5825aa3ddb..49fc9a67011a2 100644 +index 87d5825..49fc9a6 100644 --- a/sandbox/linux/bpf_dsl/seccomp_macros.h +++ b/sandbox/linux/bpf_dsl/seccomp_macros.h -@@ -343,6 +343,48 @@ struct regs_struct { +@@ -343,6 +343,48 @@ #define SECCOMP_PT_PARM4(_regs) (_regs).regs[3] #define SECCOMP_PT_PARM5(_regs) (_regs).regs[4] #define SECCOMP_PT_PARM6(_regs) (_regs).regs[5] @@ -124,7 +92,7 @@ index 87d5825aa3ddb..49fc9a67011a2 100644 #error Unsupported target platform diff --git a/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc b/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc -index 4a2721c7ce197..c3155723d8fed 100644 +index 4a2721c..8ef9f51a 100644 --- a/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc +++ b/sandbox/linux/integration_tests/bpf_dsl_seccomp_unittest.cc @@ -17,6 +17,7 @@ @@ -135,7 +103,7 @@ index 4a2721c7ce197..c3155723d8fed 100644 #include #include -@@ -2029,7 +2030,15 @@ SANDBOX_TEST(SandboxBPF, DISABLE_ON_TSAN(SeccompRetTrace)) { +@@ -2029,7 +2030,15 @@ BPF_ASSERT_EQ(kTraceData, data); regs_struct regs; @@ -151,14 +119,14 @@ index 4a2721c7ce197..c3155723d8fed 100644 switch (SECCOMP_PT_SYSCALL(regs)) { case __NR_write: // Skip writes to stdout, make it return kExpectedReturnValue. Allow -@@ -2037,7 +2046,14 @@ SANDBOX_TEST(SandboxBPF, DISABLE_ON_TSAN(SeccompRetTrace)) { +@@ -2037,7 +2046,14 @@ if (SECCOMP_PT_PARM1(regs) == STDOUT_FILENO) { BPF_ASSERT_NE(-1, SetSyscall(pid, ®s, -1)); SECCOMP_PT_RESULT(regs) = kExpectedReturnValue; +#if defined(__riscv) -+ iov.iov_len = sizeof(regs); -+ BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGSET, pid, -+ reinterpret_cast(NT_PRSTATUS), ++ iov.iov_len = sizeof(regs); ++ BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGSET, pid, ++ reinterpret_cast(NT_PRSTATUS), + &iov)); +#else BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGS, pid, NULL, ®s)); @@ -166,13 +134,13 @@ index 4a2721c7ce197..c3155723d8fed 100644 } break; -@@ -2045,7 +2061,13 @@ SANDBOX_TEST(SandboxBPF, DISABLE_ON_TSAN(SeccompRetTrace)) { +@@ -2045,7 +2061,13 @@ // Rewrite to exit(kExpectedReturnValue). BPF_ASSERT_NE(-1, SetSyscall(pid, ®s, __NR_exit)); SECCOMP_PT_PARM1(regs) = kExpectedReturnValue; +#if defined(__riscv) + iov.iov_len = sizeof(regs); -+ BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGSET, pid, ++ BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGSET, pid, + reinterpret_cast(NT_PRSTATUS), &iov)); +#else BPF_ASSERT_NE(-1, ptrace(PTRACE_SETREGS, pid, NULL, ®s)); @@ -181,20 +149,20 @@ index 4a2721c7ce197..c3155723d8fed 100644 default: diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -index 7bde501115bdf..b92ab3901acd8 100644 +index 7bde501..b92ab39 100644 --- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc -@@ -59,6 +59,9 @@ bool IsBaselinePolicyAllowed(int sysno) { - #endif +@@ -60,6 +60,9 @@ #if defined(__mips__) SyscallSets::IsMipsPrivate(sysno) || -+#endif + #endif +#if defined(__riscv) + SyscallSets::IsRiscvPrivate(sysno) || - #endif ++#endif SyscallSets::IsAllowedOperationOnFd(sysno); // clang-format on -@@ -193,7 +196,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, + } +@@ -193,7 +196,7 @@ return RestrictFcntlCommands(); #endif @@ -203,7 +171,7 @@ index 7bde501115bdf..b92ab3901acd8 100644 // fork() is never used as a system call (clone() is used instead), but we // have seen it in fallback code on Android. if (sysno == __NR_fork) { -@@ -255,7 +258,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, +@@ -255,7 +258,7 @@ } #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -212,7 +180,7 @@ index 7bde501115bdf..b92ab3901acd8 100644 if (sysno == __NR_mmap) return RestrictMmapFlags(); #endif -@@ -276,7 +279,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, +@@ -276,7 +279,7 @@ return RestrictPrctl(); #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -221,7 +189,7 @@ index 7bde501115bdf..b92ab3901acd8 100644 if (sysno == __NR_socketpair) { // Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen. static_assert(AF_UNIX == PF_UNIX, -@@ -366,7 +369,7 @@ ResultExpr EvaluateSyscallImpl(int fs_denied_errno, +@@ -366,7 +369,7 @@ // Allow creating pipes, but don't allow weird flags to pipe2(). // O_NOTIFICATION_PIPE (== O_EXCL) can be used to create // "notification pipes", which are rarely used. @@ -231,10 +199,10 @@ index 7bde501115bdf..b92ab3901acd8 100644 return Allow(); } diff --git a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -index dbbf1fb510b4e..f9915f9d15727 100644 +index a0a8796..8bea4c9 100644 --- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc +++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc -@@ -256,7 +256,7 @@ BPF_TEST_C(BaselinePolicy, GetRandom, BaselinePolicy) { +@@ -270,7 +270,7 @@ } // Not all architectures can restrict the domain for socketpair(). @@ -243,7 +211,7 @@ index dbbf1fb510b4e..f9915f9d15727 100644 BPF_DEATH_TEST_C(BaselinePolicy, SocketpairWrongDomain, DEATH_SEGV_MESSAGE(GetErrorMessageContentForTests()), -@@ -265,7 +265,7 @@ BPF_DEATH_TEST_C(BaselinePolicy, +@@ -279,7 +279,7 @@ std::ignore = socketpair(AF_INET, SOCK_STREAM, 0, sv); _exit(1); } @@ -252,7 +220,7 @@ index dbbf1fb510b4e..f9915f9d15727 100644 BPF_TEST_C(BaselinePolicy, EPERM_open, BaselinePolicy) { errno = 0; -@@ -329,7 +329,7 @@ TEST_BASELINE_SIGSYS(__NR_sysinfo) +@@ -343,7 +343,7 @@ TEST_BASELINE_SIGSYS(__NR_syslog) TEST_BASELINE_SIGSYS(__NR_timer_create) @@ -262,7 +230,7 @@ index dbbf1fb510b4e..f9915f9d15727 100644 TEST_BASELINE_SIGSYS(__NR_vserver) #endif diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -index ba995ace6d436..34092b463bb24 100644 +index 74112e8..b451c19 100644 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc @@ -37,6 +37,7 @@ @@ -273,7 +241,7 @@ index ba995ace6d436..34092b463bb24 100644 !defined(PTRACE_GET_THREAD_AREA) // Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance // the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA. -@@ -459,8 +460,10 @@ ResultExpr RestrictPtrace() { +@@ -463,8 +464,10 @@ #endif return Switch(request) .Cases({ @@ -286,7 +254,7 @@ index ba995ace6d436..34092b463bb24 100644 #endif #if defined(__arm__) diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc -index cc6a1f86c29e6..ba38ebc06313f 100644 +index 10e64a2c..ddfd6a7 100644 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc +++ b/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions_unittests.cc @@ -7,6 +7,7 @@ @@ -298,10 +266,10 @@ index cc6a1f86c29e6..ba38ebc06313f 100644 #include #include diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -index 27ea264070dcd..d0d85ab1c8416 100644 +index 4cde283..bc680424 100644 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -@@ -103,7 +103,7 @@ bool SyscallSets::IsUmask(int sysno) { +@@ -103,7 +103,7 @@ // Both EPERM and ENOENT are valid errno unless otherwise noted in comment. bool SyscallSets::IsFileSystem(int sysno) { switch (sysno) { @@ -310,7 +278,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_access: // EPERM not a valid errno. case __NR_chmod: case __NR_chown: -@@ -136,7 +136,7 @@ bool SyscallSets::IsFileSystem(int sysno) { +@@ -136,7 +136,7 @@ case __NR_faccessat2: case __NR_fchmodat: case __NR_fchownat: // Should be called chownat ? @@ -319,7 +287,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_newfstatat: // fstatat(). EPERM not a valid errno. #elif defined(__i386__) || defined(__arm__) || \ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) -@@ -241,7 +241,7 @@ bool SyscallSets::IsAllowedFileSystemAccessViaFd(int sysno) { +@@ -241,7 +241,7 @@ case __NR_oldfstat: #endif #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -328,7 +296,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_sync_file_range: // EPERM not a valid errno. #elif defined(__arm__) case __NR_arm_sync_file_range: // EPERM not a valid errno. -@@ -260,7 +260,7 @@ bool SyscallSets::IsDeniedFileSystemAccessViaFd(int sysno) { +@@ -260,7 +260,7 @@ #if defined(__i386__) || defined(__arm__) case __NR_fchown32: #endif @@ -337,7 +305,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_getdents: // EPERM not a valid errno. #endif case __NR_getdents64: // EPERM not a valid errno. -@@ -339,7 +339,7 @@ bool SyscallSets::IsProcessPrivilegeChange(int sysno) { +@@ -339,7 +339,7 @@ bool SyscallSets::IsProcessGroupOrSession(int sysno) { switch (sysno) { case __NR_setpgid: @@ -346,7 +314,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_getpgrp: #endif case __NR_setsid: -@@ -373,7 +373,7 @@ bool SyscallSets::IsAllowedSignalHandling(int sysno) { +@@ -373,7 +373,7 @@ case __NR_rt_sigqueueinfo: case __NR_rt_sigsuspend: case __NR_rt_tgsigqueueinfo: @@ -355,7 +323,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_signalfd: #endif case __NR_signalfd4: -@@ -397,12 +397,12 @@ bool SyscallSets::IsAllowedOperationOnFd(int sysno) { +@@ -397,12 +397,12 @@ switch (sysno) { case __NR_close: case __NR_dup: @@ -370,7 +338,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_shutdown: #endif return true; -@@ -441,7 +441,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -441,7 +441,7 @@ return true; case __NR_clone: // Should be parameter-restricted. case __NR_setns: // Privileged. @@ -379,7 +347,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_fork: #endif #if defined(__i386__) || defined(__x86_64__) -@@ -452,7 +452,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { +@@ -452,7 +452,7 @@ #endif case __NR_set_tid_address: case __NR_unshare: @@ -388,7 +356,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_vfork: #endif default: -@@ -477,7 +477,7 @@ bool SyscallSets::IsAllowedFutex(int sysno) { +@@ -477,7 +477,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { switch (sysno) { @@ -397,7 +365,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_epoll_create: case __NR_epoll_wait: #endif -@@ -499,7 +499,7 @@ bool SyscallSets::IsAllowedEpoll(int sysno) { +@@ -499,7 +499,7 @@ bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) { switch (sysno) { #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -406,7 +374,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_accept: case __NR_accept4: case __NR_bind: -@@ -553,7 +553,7 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { +@@ -553,7 +553,7 @@ case __NR_mincore: case __NR_mlockall: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -415,7 +383,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_mmap: #endif #if defined(__i386__) || defined(__arm__) || \ -@@ -586,7 +586,7 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { +@@ -586,7 +586,7 @@ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) case __NR__llseek: #endif @@ -424,7 +392,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_poll: #endif case __NR_ppoll: -@@ -607,7 +607,7 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { +@@ -607,7 +607,7 @@ case __NR_recv: #endif #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -433,7 +401,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_recvfrom: // Could specify source. case __NR_recvmsg: // Could specify source. #endif -@@ -622,7 +622,7 @@ bool SyscallSets::IsAllowedGeneralIo(int sysno) { +@@ -622,7 +622,7 @@ case __NR_send: #endif #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -442,7 +410,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_sendmsg: // Could specify destination. case __NR_sendto: // Could specify destination. #endif -@@ -671,7 +671,7 @@ bool SyscallSets::IsSeccomp(int sysno) { +@@ -671,7 +671,7 @@ bool SyscallSets::IsAllowedBasicScheduler(int sysno) { switch (sysno) { case __NR_sched_yield: @@ -451,7 +419,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_pause: #endif case __NR_nanosleep: -@@ -755,7 +755,7 @@ bool SyscallSets::IsNuma(int sysno) { +@@ -755,7 +755,7 @@ case __NR_getcpu: case __NR_mbind: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -460,7 +428,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_migrate_pages: #endif case __NR_move_pages: -@@ -790,7 +790,7 @@ bool SyscallSets::IsGlobalProcessEnvironment(int sysno) { +@@ -790,7 +790,7 @@ switch (sysno) { case __NR_acct: // Privileged. #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -469,7 +437,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_getrlimit: #endif #if defined(__i386__) || defined(__arm__) -@@ -825,7 +825,7 @@ bool SyscallSets::IsDebug(int sysno) { +@@ -825,7 +825,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) { switch (sysno) { @@ -478,7 +446,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR__sysctl: case __NR_sysfs: #endif -@@ -843,7 +843,7 @@ bool SyscallSets::IsGlobalSystemStatus(int sysno) { +@@ -843,7 +843,7 @@ bool SyscallSets::IsEventFd(int sysno) { switch (sysno) { @@ -487,7 +455,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_eventfd: #endif case __NR_eventfd2: -@@ -895,6 +895,7 @@ bool SyscallSets::IsKeyManagement(int sysno) { +@@ -895,6 +895,7 @@ } #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \ @@ -495,7 +463,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) bool SyscallSets::IsSystemVSemaphores(int sysno) { switch (sysno) { -@@ -914,7 +915,7 @@ bool SyscallSets::IsSystemVSemaphores(int sysno) { +@@ -914,7 +915,7 @@ #endif #if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \ @@ -504,7 +472,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) // These give a lot of ambient authority and bypass the setuid sandbox. bool SyscallSets::IsSystemVSharedMemory(int sysno) { -@@ -931,6 +932,7 @@ bool SyscallSets::IsSystemVSharedMemory(int sysno) { +@@ -931,6 +932,7 @@ #endif #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \ @@ -512,7 +480,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) bool SyscallSets::IsSystemVMessageQueue(int sysno) { switch (sysno) { -@@ -962,6 +964,7 @@ bool SyscallSets::IsSystemVIpc(int sysno) { +@@ -962,6 +964,7 @@ bool SyscallSets::IsAnySystemV(int sysno) { #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \ @@ -520,7 +488,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) || IsSystemVSharedMemory(sysno); -@@ -999,7 +1002,7 @@ bool SyscallSets::IsAdvancedScheduler(int sysno) { +@@ -999,7 +1002,7 @@ bool SyscallSets::IsInotify(int sysno) { switch (sysno) { case __NR_inotify_add_watch: @@ -529,7 +497,7 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_inotify_init: #endif case __NR_inotify_init1: -@@ -1137,7 +1140,7 @@ bool SyscallSets::IsMisc(int sysno) { +@@ -1134,7 +1137,7 @@ #if defined(__x86_64__) case __NR_tuxcall: #endif @@ -538,13 +506,14 @@ index 27ea264070dcd..d0d85ab1c8416 100644 case __NR_vserver: #endif return true; -@@ -1196,6 +1199,17 @@ bool SyscallSets::IsMipsMisc(int sysno) { +@@ -1193,6 +1196,18 @@ } #endif // defined(__mips__) +#if defined(__riscv) +bool SyscallSets::IsRiscvPrivate(int sysno) { + switch (sysno) { ++ case __NR_riscv_hwprobe: + case __NR_riscv_flush_icache: + return true; + default: @@ -557,10 +526,10 @@ index 27ea264070dcd..d0d85ab1c8416 100644 switch (sysno) { case __NR_getitimer: diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h -index 9be7b03ec4377..41b3605dce15d 100644 +index 9be7b03..41b3605 100644 --- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h +++ b/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h -@@ -52,7 +52,7 @@ class SANDBOX_EXPORT SyscallSets { +@@ -52,7 +52,7 @@ #endif #if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \ @@ -569,7 +538,7 @@ index 9be7b03ec4377..41b3605dce15d 100644 static bool IsNetworkSocketInformation(int sysno); #endif -@@ -79,18 +79,21 @@ class SANDBOX_EXPORT SyscallSets { +@@ -79,18 +79,21 @@ static bool IsAsyncIo(int sysno); static bool IsKeyManagement(int sysno); #if defined(__x86_64__) || defined(__arm__) || defined(__aarch64__) || \ @@ -594,7 +563,7 @@ index 9be7b03ec4377..41b3605dce15d 100644 static bool IsSystemVMessageQueue(int sysno); #endif -@@ -117,6 +120,9 @@ class SANDBOX_EXPORT SyscallSets { +@@ -117,6 +120,9 @@ static bool IsMipsPrivate(int sysno); static bool IsMipsMisc(int sysno); #endif // defined(__mips__) @@ -605,10 +574,10 @@ index 9be7b03ec4377..41b3605dce15d 100644 }; diff --git a/sandbox/linux/seccomp-bpf/syscall.cc b/sandbox/linux/seccomp-bpf/syscall.cc -index 02cbb047c1558..9eb97f27ce00d 100644 +index 02cbb04..9eb97f27 100644 --- a/sandbox/linux/seccomp-bpf/syscall.cc +++ b/sandbox/linux/seccomp-bpf/syscall.cc -@@ -18,7 +18,7 @@ namespace sandbox { +@@ -18,7 +18,7 @@ namespace { #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \ @@ -617,7 +586,7 @@ index 02cbb047c1558..9eb97f27ce00d 100644 // Number that's not currently used by any Linux kernel ABIs. const int kInvalidSyscallNumber = 0x351d3; #else -@@ -308,6 +308,28 @@ asm(// We need to be able to tell the kernel exactly where we made a +@@ -308,6 +308,28 @@ "2:ret\n" ".cfi_endproc\n" ".size SyscallAsm, .-SyscallAsm\n" @@ -646,7 +615,7 @@ index 02cbb047c1558..9eb97f27ce00d 100644 #endif ); // asm -@@ -319,6 +341,10 @@ intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]); +@@ -319,6 +341,10 @@ extern "C" { intptr_t SyscallAsm(intptr_t nr, const intptr_t args[8]); } @@ -657,7 +626,7 @@ index 02cbb047c1558..9eb97f27ce00d 100644 #endif } // namespace -@@ -351,6 +377,10 @@ intptr_t Syscall::Call(int nr, +@@ -351,6 +377,10 @@ // where that makes sense. #if defined(__mips__) const intptr_t args[8] = {p0, p1, p2, p3, p4, p5, p6, p7}; @@ -668,7 +637,7 @@ index 02cbb047c1558..9eb97f27ce00d 100644 #else DCHECK_EQ(p6, 0) << " Support for syscalls with more than six arguments not " "added for this architecture"; -@@ -425,6 +455,8 @@ intptr_t Syscall::Call(int nr, +@@ -425,6 +455,8 @@ ret = inout; } @@ -678,10 +647,10 @@ index 02cbb047c1558..9eb97f27ce00d 100644 #error "Unimplemented architecture" #endif diff --git a/sandbox/linux/seccomp-bpf/trap.cc b/sandbox/linux/seccomp-bpf/trap.cc -index 7f262aaff65c7..db974e488e529 100644 +index d466e62..a5ed98b7 100644 --- a/sandbox/linux/seccomp-bpf/trap.cc +++ b/sandbox/linux/seccomp-bpf/trap.cc -@@ -217,6 +217,18 @@ void Trap::SigSys(int nr, LinuxSigInfo* info, ucontext_t* ctx) { +@@ -216,6 +216,18 @@ SECCOMP_PARM6(ctx), SECCOMP_PARM7(ctx), SECCOMP_PARM8(ctx)); @@ -701,10 +670,10 @@ index 7f262aaff65c7..db974e488e529 100644 rc = Syscall::Call(SECCOMP_SYSCALL(ctx), SECCOMP_PARM1(ctx), diff --git a/sandbox/linux/services/credentials.cc b/sandbox/linux/services/credentials.cc -index e284c59d239ae..5b5346a2778bc 100644 +index a33597c..d4180ac 100644 --- a/sandbox/linux/services/credentials.cc +++ b/sandbox/linux/services/credentials.cc -@@ -80,7 +80,7 @@ bool ChrootToSafeEmptyDir() { +@@ -80,7 +80,7 @@ pid_t pid = -1; alignas(16) char stack_buf[PTHREAD_STACK_MIN]; #if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \ @@ -714,10 +683,10 @@ index e284c59d239ae..5b5346a2778bc 100644 void* stack = stack_buf + sizeof(stack_buf); #else diff --git a/sandbox/linux/services/syscall_wrappers.cc b/sandbox/linux/services/syscall_wrappers.cc -index 7650e983b3802..bb4bd33236381 100644 +index 7650e98..bb4bd332 100644 --- a/sandbox/linux/services/syscall_wrappers.cc +++ b/sandbox/linux/services/syscall_wrappers.cc -@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags, +@@ -61,7 +61,7 @@ #if defined(ARCH_CPU_X86_64) return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls); #elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \ @@ -727,10 +696,10 @@ index 7650e983b3802..bb4bd33236381 100644 return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid); #endif diff --git a/sandbox/linux/syscall_broker/broker_process.cc b/sandbox/linux/syscall_broker/broker_process.cc -index c6c1117c2337e..779065a0cbd78 100644 +index c6c1117..779065a 100644 --- a/sandbox/linux/syscall_broker/broker_process.cc +++ b/sandbox/linux/syscall_broker/broker_process.cc -@@ -122,44 +122,46 @@ bool BrokerProcess::IsSyscallBrokerable(int sysno, bool fast_check) const { +@@ -122,44 +122,46 @@ // and are default disabled in Android. So, we should refuse to broker them // to be consistent with the platform's restrictions. switch (sysno) { @@ -784,7 +753,7 @@ index c6c1117c2337e..779065a0cbd78 100644 case __NR_stat: case __NR_lstat: #endif -@@ -169,7 +171,7 @@ bool BrokerProcess::IsSyscallBrokerable(int sysno, bool fast_check) const { +@@ -169,7 +171,7 @@ #if defined(__NR_fstatat64) case __NR_fstatat64: #endif @@ -793,7 +762,7 @@ index c6c1117c2337e..779065a0cbd78 100644 case __NR_newfstatat: #endif return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT); -@@ -184,7 +186,7 @@ bool BrokerProcess::IsSyscallBrokerable(int sysno, bool fast_check) const { +@@ -184,7 +186,7 @@ return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT); #endif @@ -803,7 +772,7 @@ index c6c1117c2337e..779065a0cbd78 100644 return !fast_check || policy_->allowed_command_set.test(COMMAND_UNLINK); #endif diff --git a/sandbox/linux/system_headers/linux_seccomp.h b/sandbox/linux/system_headers/linux_seccomp.h -index 8690a96eb01b1..dec2afc744985 100644 +index 8690a96..dec2afc7 100644 --- a/sandbox/linux/system_headers/linux_seccomp.h +++ b/sandbox/linux/system_headers/linux_seccomp.h @@ -39,6 +39,10 @@ @@ -829,7 +798,7 @@ index 8690a96eb01b1..dec2afc744985 100644 #ifndef PR_SET_SECCOMP #define PR_SET_SECCOMP 22 diff --git a/sandbox/linux/system_headers/linux_signal.h b/sandbox/linux/system_headers/linux_signal.h -index 69ccaf1081578..2ffe30973cd32 100644 +index 69ccaf1..2ffe3097 100644 --- a/sandbox/linux/system_headers/linux_signal.h +++ b/sandbox/linux/system_headers/linux_signal.h @@ -13,7 +13,7 @@ @@ -842,10 +811,10 @@ index 69ccaf1081578..2ffe30973cd32 100644 #define LINUX_SIGHUP 1 #define LINUX_SIGINT 2 diff --git a/sandbox/linux/system_headers/linux_stat.h b/sandbox/linux/system_headers/linux_stat.h -index 3aae8cbced775..74977adb53caf 100644 +index 3aae8cb..74977adb 100644 --- a/sandbox/linux/system_headers/linux_stat.h +++ b/sandbox/linux/system_headers/linux_stat.h -@@ -150,7 +150,7 @@ struct kernel_stat { +@@ -150,7 +150,7 @@ int st_blocks; int st_pad4[14]; }; @@ -855,7 +824,7 @@ index 3aae8cbced775..74977adb53caf 100644 unsigned long st_dev; unsigned long st_ino; diff --git a/sandbox/linux/system_headers/linux_syscalls.h b/sandbox/linux/system_headers/linux_syscalls.h -index 438147b4018b6..d6de8c1cb2340 100644 +index 438147b..d6de8c1 100644 --- a/sandbox/linux/system_headers/linux_syscalls.h +++ b/sandbox/linux/system_headers/linux_syscalls.h @@ -35,5 +35,9 @@ @@ -870,10 +839,10 @@ index 438147b4018b6..d6de8c1cb2340 100644 diff --git a/sandbox/linux/system_headers/riscv64_linux_syscalls.h b/sandbox/linux/system_headers/riscv64_linux_syscalls.h new file mode 100644 -index 0000000000000..822f660dc5086 +index 0000000..50e043d0 --- /dev/null +++ b/sandbox/linux/system_headers/riscv64_linux_syscalls.h -@@ -0,0 +1,1222 @@ +@@ -0,0 +1,1226 @@ +// Copyright 2014 The Chromium Authors +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -1859,6 +1828,10 @@ index 0000000000000..822f660dc5086 +#define __NR_recvmmsg 243 +#endif + ++#if !defined(__NR_riscv_hwprobe) ++#define __NR_riscv_hwprobe 258 ++#endif ++ +#if !defined(__NR_riscv_flush_icache) +#define __NR_riscv_flush_icache 259 +#endif @@ -2097,10 +2070,10 @@ index 0000000000000..822f660dc5086 + +#endif // SANDBOX_LINUX_SYSTEM_HEADERS_RISCV64_LINUX_SYSCALLS_H_ diff --git a/sandbox/policy/linux/bpf_cdm_policy_linux.cc b/sandbox/policy/linux/bpf_cdm_policy_linux.cc -index 433720fa9dd0f..482ce1d8149ce 100644 +index 433720f..482ce1d 100644 --- a/sandbox/policy/linux/bpf_cdm_policy_linux.cc +++ b/sandbox/policy/linux/bpf_cdm_policy_linux.cc -@@ -33,7 +33,7 @@ ResultExpr CdmProcessPolicy::EvaluateSyscall(int sysno) const { +@@ -33,7 +33,7 @@ case __NR_ftruncate: case __NR_fallocate: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -2110,10 +2083,10 @@ index 433720fa9dd0f..482ce1d8149ce 100644 #endif #if defined(__i386__) || defined(__arm__) diff --git a/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc b/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc -index df2567f74981f..41e158a292369 100644 +index df2567f..41e158a 100644 --- a/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc +++ b/sandbox/policy/linux/bpf_cros_amd_gpu_policy_linux.cc -@@ -38,7 +38,7 @@ ResultExpr CrosAmdGpuProcessPolicy::EvaluateSyscall(int sysno) const { +@@ -38,7 +38,7 @@ case __NR_sched_setscheduler: case __NR_sysinfo: case __NR_uname: @@ -2123,10 +2096,10 @@ index df2567f74981f..41e158a292369 100644 case __NR_stat: #endif diff --git a/sandbox/policy/linux/bpf_gpu_policy_linux.cc b/sandbox/policy/linux/bpf_gpu_policy_linux.cc -index 35ccbb7a7f82b..65a0587e25af5 100644 +index 35ccbb7..65a0587 100644 --- a/sandbox/policy/linux/bpf_gpu_policy_linux.cc +++ b/sandbox/policy/linux/bpf_gpu_policy_linux.cc -@@ -73,7 +73,7 @@ ResultExpr GpuProcessPolicy::EvaluateSyscall(int sysno) const { +@@ -73,7 +73,7 @@ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) case __NR_ftruncate64: #endif @@ -2136,10 +2109,10 @@ index 35ccbb7a7f82b..65a0587e25af5 100644 #endif case __NR_getdents64: diff --git a/sandbox/policy/linux/bpf_network_policy_linux.cc b/sandbox/policy/linux/bpf_network_policy_linux.cc -index ed1582d790570..4f49297e13a69 100644 +index e5168ff0..3e6f821 100644 --- a/sandbox/policy/linux/bpf_network_policy_linux.cc +++ b/sandbox/policy/linux/bpf_network_policy_linux.cc -@@ -255,7 +255,7 @@ ResultExpr NetworkProcessPolicy::EvaluateSyscall(int sysno) const { +@@ -260,7 +260,7 @@ case __NR_fdatasync: case __NR_fsync: case __NR_mremap: @@ -2149,10 +2122,10 @@ index ed1582d790570..4f49297e13a69 100644 #endif case __NR_getdents64: diff --git a/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc b/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc -index bff338a903e58..36acee528ce6f 100644 +index bff338a..36acee52 100644 --- a/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc +++ b/sandbox/policy/linux/bpf_print_compositor_policy_linux.cc -@@ -33,7 +33,7 @@ ResultExpr PrintCompositorProcessPolicy::EvaluateSyscall(int sysno) const { +@@ -33,7 +33,7 @@ case __NR_fdatasync: case __NR_fsync: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -2162,10 +2135,10 @@ index bff338a903e58..36acee528ce6f 100644 #endif #if defined(__i386__) || defined(__arm__) diff --git a/sandbox/policy/linux/bpf_renderer_policy_linux.cc b/sandbox/policy/linux/bpf_renderer_policy_linux.cc -index 0555a85bc6a2a..8f8907f4eb18b 100644 +index 0555a85..8f8907f 100644 --- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc +++ b/sandbox/policy/linux/bpf_renderer_policy_linux.cc -@@ -82,7 +82,7 @@ ResultExpr RendererProcessPolicy::EvaluateSyscall(int sysno) const { +@@ -82,7 +82,7 @@ case __NR_ftruncate64: #endif #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -2175,10 +2148,10 @@ index 0555a85bc6a2a..8f8907f4eb18b 100644 case __NR_setrlimit: // We allow setrlimit to dynamically adjust the address space limit as diff --git a/sandbox/policy/linux/bpf_service_policy_linux.cc b/sandbox/policy/linux/bpf_service_policy_linux.cc -index 32754e67be3d6..3f42eabba94c7 100644 +index 32754e6..3f42eabb 100644 --- a/sandbox/policy/linux/bpf_service_policy_linux.cc +++ b/sandbox/policy/linux/bpf_service_policy_linux.cc -@@ -26,7 +26,7 @@ ResultExpr ServiceProcessPolicy::EvaluateSyscall(int sysno) const { +@@ -26,7 +26,7 @@ return RestrictIoctl(); // Allow the system calls below. #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -2188,10 +2161,10 @@ index 32754e67be3d6..3f42eabba94c7 100644 #endif #if defined(__i386__) || defined(__arm__) diff --git a/sandbox/policy/linux/bpf_utility_policy_linux.cc b/sandbox/policy/linux/bpf_utility_policy_linux.cc -index e299ce998b9bd..ed1106898ec33 100644 +index e299ce99..ed110689 100644 --- a/sandbox/policy/linux/bpf_utility_policy_linux.cc +++ b/sandbox/policy/linux/bpf_utility_policy_linux.cc -@@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::EvaluateSyscall(int sysno) const { +@@ -34,7 +34,7 @@ case __NR_fdatasync: case __NR_fsync: #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \ @@ -2200,6 +2173,3 @@ index e299ce998b9bd..ed1106898ec33 100644 case __NR_getrlimit: #endif #if defined(__i386__) || defined(__arm__) --- -2.43.0 - diff --git a/patches/chromium/0008-sysroot-riscv64-support.patch b/patches/chromium/0008-sysroot-riscv64-support.patch index b1033678798c6..0544494eab0e9 100644 --- a/patches/chromium/0008-sysroot-riscv64-support.patch +++ b/patches/chromium/0008-sysroot-riscv64-support.patch @@ -1,17 +1,18 @@ -From 5558b456a8249fb2c1fc1069b5c7d2e39715f8ee Mon Sep 17 00:00:00 2001 +From f9701e1cd68627f419e1f89d38e89c704bd4846c Mon Sep 17 00:00:00 2001 From: kxxt Date: Sat, 10 Feb 2024 10:10:53 +0800 Subject: [PATCH] sysroot: riscv64 support +Patch-Dir: src/electron/patches/chromium +Patch-Filename: 0008-sysroot-riscv64-support.patch --- - build/config/sysroot.gni | 4 +- - .../linux/sysroot_scripts/install-sysroot.py | 9 +- - .../linux/sysroot_scripts/sysroot_creator.py | 269 +++++++++++------- - build/linux/sysroot_scripts/sysroots.json | 7 + - 4 files changed, 189 insertions(+), 100 deletions(-) + build/config/sysroot.gni | 4 +++- + build/linux/sysroot_scripts/install-sysroot.py | 8 +++++--- + build/linux/sysroot_scripts/sysroots.json | 7 +++++++ + 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/build/config/sysroot.gni b/build/config/sysroot.gni -index 0f36edd9e5bb2..29b95c690aa74 100644 +index 47fe4cbc840dd..965890580f417 100644 --- a/build/config/sysroot.gni +++ b/build/config/sysroot.gni @@ -22,7 +22,7 @@ declare_args() { @@ -33,56 +34,54 @@ index 0f36edd9e5bb2..29b95c690aa74 100644 assert(false, "No linux sysroot for cpu: $target_cpu") } diff --git a/build/linux/sysroot_scripts/install-sysroot.py b/build/linux/sysroot_scripts/install-sysroot.py -index a2ac8305d8ca7..eadca7aeb7b76 100755 +index abd58136efc83..22b63794f1e7c 100755 --- a/build/linux/sysroot_scripts/install-sysroot.py +++ b/build/linux/sysroot_scripts/install-sysroot.py -@@ -35,7 +35,7 @@ from urllib.request import urlopen +@@ -36,7 +36,7 @@ from urllib.request import urlopen SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__)) SRC_DIR = os.path.dirname(os.path.dirname(os.path.dirname(SCRIPT_DIR))) --VALID_ARCHS = ('amd64', 'i386', 'armhf', 'arm64', 'armel', 'mipsel', 'mips64el') -+VALID_ARCHS = ('amd64', 'i386', 'armhf', 'arm64', 'armel', 'mipsel', 'mips64el', 'riscv64') +-VALID_ARCHS = ("amd64", "i386", "armhf", "arm64", "mipsel", "mips64el") ++VALID_ARCHS = ("amd64", "i386", "armhf", "arm64", "mipsel", "mips64el", "riscv64") ARCH_TRANSLATIONS = { - 'x64': 'amd64', -@@ -86,15 +86,18 @@ def main(args): + "x64": "amd64", +@@ -89,14 +89,16 @@ def main(args): + sysroots_json_path = DEFAULT_SYSROOTS_PATH - if options.print_key: - arch = options.print_key -+ target_platform = 'sid' if arch == 'riscv64' else DEFAULT_TARGET_PLATFORM - print( -- GetSysrootDict(sysroots_json_path, DEFAULT_TARGET_PLATFORM, -+ GetSysrootDict(sysroots_json_path, target_platform, - ARCH_TRANSLATIONS.get(arch, arch))['Key']) - return 0 - if options.arch: -- InstallSysroot(sysroots_json_path, DEFAULT_TARGET_PLATFORM, -+ target_platform = 'sid' if options.arch == 'riscv64' else DEFAULT_TARGET_PLATFORM -+ InstallSysroot(sysroots_json_path, target_platform, - ARCH_TRANSLATIONS.get(options.arch, options.arch)) - elif options.all: - for arch in VALID_ARCHS: -+ target_platform = 'sid' if arch == 'riscv64' else DEFAULT_TARGET_PLATFORM - InstallSysroot(sysroots_json_path, DEFAULT_TARGET_PLATFORM, arch) - else: - print('You much specify one of the options.') + if options.arch: ++ target_platform = 'sid' if options.arch == 'riscv64' else DEFAULT_TARGET_PLATFORM + InstallSysroot( + sysroots_json_path, +- DEFAULT_TARGET_PLATFORM, ++ target_platform, + ARCH_TRANSLATIONS.get(options.arch, options.arch), + ) + elif options.all: + for arch in VALID_ARCHS: +- InstallSysroot(sysroots_json_path, DEFAULT_TARGET_PLATFORM, arch) ++ target_platform = 'sid' if arch == 'riscv64' else DEFAULT_TARGET_PLATFORM ++ InstallSysroot(sysroots_json_path, target_platform, arch) + else: + print("You much specify one of the options.") + return 1 diff --git a/build/linux/sysroot_scripts/sysroots.json b/build/linux/sysroot_scripts/sysroots.json -index fa41c468953a2..742e43572f52a 100644 +index f146ea68bc72d..82d393d9f4b2f 100644 --- a/build/linux/sysroot_scripts/sysroots.json +++ b/build/linux/sysroot_scripts/sysroots.json -@@ -47,5 +47,12 @@ +@@ -34,5 +34,12 @@ "SysrootDir": "debian_bullseye_mipsel-sysroot", "Tarball": "debian_bullseye_mipsel_sysroot.tar.xz", - "URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot/toolchain" + "URL": "https://commondatastorage.googleapis.com/chrome-linux-sysroot" + }, + "sid_riscv64": { -+ "Key": "20240131T153825Z-1", ++ "Key": "20240131T153825Z-4", + "Sha1Sum": "d8849d433e2c857b2a052812135115c91f96f54f", + "SysrootDir": "debian_sid_riscv64-sysroot", + "Tarball": "debian_sid_riscv64_sysroot.tar.xz", -+ "URL": "https://github.com/riscv-forks/electron/releases/download/sysroot-20240131T153825Z-1/debian_sid_riscv64_sysroot.tar.xz" ++ "URL": "https://github.com/riscv-forks/electron/releases/download/sysroot-20240131T153825Z-4/debian_sid_riscv64_sysroot.tar.xz" } } -- -2.43.0 +2.39.2 diff --git a/patches/ffmpeg/.patches b/patches/ffmpeg/.patches index bd2782c8390bf..58d697e689509 100644 --- a/patches/ffmpeg/.patches +++ b/patches/ffmpeg/.patches @@ -1,2 +1,2 @@ -riscv-ffmpeg.patch link_with_loader_path.patch +0001-ffmpeg-generate-riscv64-changes.patch diff --git a/patches/ffmpeg/riscv-ffmpeg.patch b/patches/ffmpeg/0001-ffmpeg-generate-riscv64-changes.patch similarity index 82% rename from patches/ffmpeg/riscv-ffmpeg.patch rename to patches/ffmpeg/0001-ffmpeg-generate-riscv64-changes.patch index 513b85693cbad..16cfcd34ff12e 100644 --- a/patches/ffmpeg/riscv-ffmpeg.patch +++ b/patches/ffmpeg/0001-ffmpeg-generate-riscv64-changes.patch @@ -1,13 +1,21 @@ -From f552810ce55ba8dd04b29883f41d44918206ccb6 Mon Sep 17 00:00:00 2001 +From 5b99a1aba972d14983014e2afecb9921f6c9508b Mon Sep 17 00:00:00 2001 From: kxxt -Date: Sat, 10 Feb 2024 10:16:34 +0800 -Subject: [PATCH] ffmpeg: riscv64 support +Date: Tue, 11 Jun 2024 04:43:21 +0200 +Subject: [PATCH] ffmpeg: generate riscv64 changes -Patch-Filename: riscv-ffmpeg.patch --- CREDITS.chromium | 28 - - chromium/config/Chrome/linux/riscv64/config.h | 772 ++++++ - .../Chrome/linux/riscv64/config_components.h | 2218 +++++++++++++++++ + chromium/config/Chrome/ios/arm64/config.h | 16 +- + .../Chrome/ios/arm64/config_components.h | 16 +- + .../ios/arm64/libavformat/demuxer_list.c | 2 +- + .../Chrome/ios/arm64/libavutil/ffversion.h | 2 +- + chromium/config/Chrome/ios/x64/config.asm | 11 +- + chromium/config/Chrome/ios/x64/config.h | 16 +- + .../config/Chrome/ios/x64/config_components.h | 16 +- + .../Chrome/ios/x64/libavformat/demuxer_list.c | 2 +- + .../Chrome/ios/x64/libavutil/ffversion.h | 2 +- + chromium/config/Chrome/linux/riscv64/config.h | 774 ++++++ + .../Chrome/linux/riscv64/config_components.h | 2214 +++++++++++++++++ .../linux/riscv64/libavcodec/bsf_list.c | 2 + .../linux/riscv64/libavcodec/codec_list.c | 17 + .../linux/riscv64/libavcodec/parser_list.c | 9 + @@ -19,8 +27,8 @@ Patch-Filename: riscv-ffmpeg.patch chromium/config/Chrome/linux/x64/config.asm | 4 +- chromium/config/Chrome/linux/x64/config.h | 8 +- .../Chrome/linux/x64/libavutil/ffversion.h | 2 +- - .../config/ChromeOS/linux/riscv64/config.h | 772 ++++++ - .../linux/riscv64/config_components.h | 2218 +++++++++++++++++ + .../config/ChromeOS/linux/riscv64/config.h | 774 ++++++ + .../linux/riscv64/config_components.h | 2214 +++++++++++++++++ .../linux/riscv64/libavcodec/bsf_list.c | 2 + .../linux/riscv64/libavcodec/codec_list.c | 19 + .../linux/riscv64/libavcodec/parser_list.c | 11 + @@ -32,8 +40,17 @@ Patch-Filename: riscv-ffmpeg.patch chromium/config/ChromeOS/linux/x64/config.asm | 4 +- chromium/config/ChromeOS/linux/x64/config.h | 8 +- .../ChromeOS/linux/x64/libavutil/ffversion.h | 2 +- - .../config/Chromium/linux/riscv64/config.h | 772 ++++++ - .../linux/riscv64/config_components.h | 2218 +++++++++++++++++ + chromium/config/Chromium/ios/arm64/config.h | 16 +- + .../Chromium/ios/arm64/config_components.h | 16 +- + .../ios/arm64/libavformat/demuxer_list.c | 2 +- + .../Chromium/ios/arm64/libavutil/ffversion.h | 2 +- + chromium/config/Chromium/ios/x64/config.asm | 11 +- + chromium/config/Chromium/ios/x64/config.h | 16 +- + .../Chromium/ios/x64/config_components.h | 16 +- + .../ios/x64/libavformat/demuxer_list.c | 2 +- + .../Chromium/ios/x64/libavutil/ffversion.h | 2 +- + .../config/Chromium/linux/riscv64/config.h | 774 ++++++ + .../linux/riscv64/config_components.h | 2214 +++++++++++++++++ .../linux/riscv64/libavcodec/bsf_list.c | 2 + .../linux/riscv64/libavcodec/codec_list.c | 15 + .../linux/riscv64/libavcodec/parser_list.c | 7 + @@ -45,11 +62,7 @@ Patch-Filename: riscv-ffmpeg.patch chromium/config/Chromium/linux/x64/config.asm | 4 +- chromium/config/Chromium/linux/x64/config.h | 8 +- .../Chromium/linux/x64/libavutil/ffversion.h | 2 +- - chromium/scripts/build_ffmpeg.py | 16 +- - chromium/scripts/copy_config.sh | 2 +- - chromium/scripts/generate_gn.py | 2 +- - chromium/scripts/robo_lib/config.py | 2 +- - ffmpeg_generated.gni | 476 +--- + ffmpeg_generated.gni | 472 +--- libavcodec/autorename_libavcodec_blockdsp.c | 2 +- libavcodec/autorename_libavcodec_flacdsp.c | 2 +- libavcodec/autorename_libavcodec_hpeldsp.c | 2 +- @@ -62,8 +75,6 @@ Patch-Filename: riscv-ffmpeg.patch libavcodec/autorename_libavcodec_sbrdsp.c | 2 +- libavcodec/autorename_libavcodec_videodsp.c | 2 +- libavcodec/autorename_libavcodec_vorbisdsp.c | 2 +- - libavcodec/autorename_libavcodec_vp3dsp.c | 2 + - libavcodec/autorename_libavcodec_vp8dsp.c | 2 + libavcodec/autorename_libavcodec_xvididct.c | 2 +- .../autorename_libavcodec_x86_aacpsdsp_init.c | 2 + .../autorename_libavcodec_x86_blockdsp_init.c | 2 + @@ -85,11 +96,10 @@ Patch-Filename: riscv-ffmpeg.patch libavutil/autorename_libavutil_tx_float.c | 2 +- libavutil/autorename_libavutil_utils.c | 2 +- libavutil/autorename_libavutil_version.c | 2 +- - .../riscv/autorename_libavutil_riscv_cpu.c | 2 + libavutil/x86/autorename_libavutil_x86_cpu.c | 2 +- .../autorename_libavutil_x86_fixed_dsp_init.c | 2 + .../autorename_libavutil_x86_float_dsp_init.c | 2 +- - 84 files changed, 9339 insertions(+), 433 deletions(-) + 95 files changed, 9378 insertions(+), 522 deletions(-) create mode 100644 chromium/config/Chrome/linux/riscv64/config.h create mode 100644 chromium/config/Chrome/linux/riscv64/config_components.h create mode 100644 chromium/config/Chrome/linux/riscv64/libavcodec/bsf_list.c @@ -120,19 +130,16 @@ Patch-Filename: riscv-ffmpeg.patch create mode 100644 chromium/config/Chromium/linux/riscv64/libavformat/protocol_list.c create mode 100644 chromium/config/Chromium/linux/riscv64/libavutil/avconfig.h create mode 100644 chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h - create mode 100644 libavcodec/autorename_libavcodec_vp3dsp.c - create mode 100644 libavcodec/autorename_libavcodec_vp8dsp.c create mode 100644 libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c create mode 100644 libavcodec/x86/autorename_libavcodec_x86_blockdsp_init.c create mode 100644 libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c create mode 100644 libavcodec/x86/autorename_libavcodec_x86_idctdsp_init.c create mode 100644 libavcodec/x86/autorename_libavcodec_x86_me_cmp_init.c create mode 100644 libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c - create mode 100644 libavutil/riscv/autorename_libavutil_riscv_cpu.c create mode 100644 libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c diff --git a/CREDITS.chromium b/CREDITS.chromium -index 77c5d2a3af..1e88adc60f 100644 +index fa1665a15a..030c337e2b 100644 --- a/CREDITS.chromium +++ b/CREDITS.chromium @@ -129,34 +129,6 @@ incompatible with the GPLv2 and v3. To the best of our knowledge, they are @@ -170,23 +177,613 @@ index 77c5d2a3af..1e88adc60f 100644 ******************************************************************************** libavcodec/x86/xvididct.asm +diff --git a/chromium/config/Chrome/ios/arm64/config.h b/chromium/config/Chrome/ios/arm64/config.h +index a9b33e0a22..a8967e95e9 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/liberato/src/release_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/liberato/src/release_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/liberato/src/release_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/liberato/src/release_chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/liberato/src/release_chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/liberato/src/release_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 315c88c5fbdb2b27cebf23c87fb502f7a567d84b)" + #define OS_NAME darwin +-#define av_restrict restrict + #define EXTERN_PREFIX "_" + #define EXTERN_ASM _ + #define BUILDSUF "" +@@ -78,7 +77,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 +@@ -130,7 +128,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 +@@ -182,7 +179,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 +@@ -429,6 +425,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 +465,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 +516,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 +547,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 +597,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 +640,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 +@@ -724,6 +725,7 @@ + #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..eac3750637 100644 +--- a/chromium/config/Chrome/ios/arm64/config_components.h ++++ b/chromium/config/Chrome/ios/arm64/config_components.h +@@ -23,7 +23,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 +@@ -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 +@@ -1706,6 +1699,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 +@@ -1850,6 +1844,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 +1982,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 +2022,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 +@@ -2162,6 +2157,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..396b484e27 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-116067-gfecf1c679a" + #endif /* AVUTIL_FFVERSION_H */ +diff --git a/chromium/config/Chrome/ios/x64/config.asm b/chromium/config/Chrome/ios/x64/config.asm +index d13f207b0c..3babc51e39 100644 +--- a/chromium/config/Chrome/ios/x64/config.asm ++++ b/chromium/config/Chrome/ios/x64/config.asm +@@ -62,7 +62,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 +@@ -114,7 +113,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 +@@ -166,7 +164,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 +@@ -413,6 +410,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 +450,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 +501,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 +532,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 +582,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 +625,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 +@@ -708,6 +710,7 @@ + %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..c7223fd934 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/liberato/src/release_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/liberato/src/release_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/liberato/src/release_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/liberato/src/release_chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/liberato/src/release_chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/liberato/src/release_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 315c88c5fbdb2b27cebf23c87fb502f7a567d84b)" + #define OS_NAME darwin +-#define av_restrict restrict + #define EXTERN_PREFIX "_" + #define EXTERN_ASM _ + #define BUILDSUF "" +@@ -77,7 +76,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 +@@ -129,7 +127,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 +@@ -181,7 +178,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 +@@ -428,6 +424,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 +464,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 +515,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 +546,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 +596,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 +639,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 +@@ -723,6 +724,7 @@ + #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..eac3750637 100644 +--- a/chromium/config/Chrome/ios/x64/config_components.h ++++ b/chromium/config/Chrome/ios/x64/config_components.h +@@ -23,7 +23,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 +@@ -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 +@@ -1706,6 +1699,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 +@@ -1850,6 +1844,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 +1982,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 +2022,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 +@@ -2162,6 +2157,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..396b484e27 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-116067-gfecf1c679a" + #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/config/Chrome/linux/riscv64/config.h b/chromium/config/Chrome/linux/riscv64/config.h new file mode 100644 -index 0000000000..77202f2f88 +index 0000000000..d466b8008f --- /dev/null +++ b/chromium/config/Chrome/linux/riscv64/config.h -@@ -0,0 +1,772 @@ +@@ -0,0 +1,774 @@ +/* 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/kxxt/electron-ci/sources/electron/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=/home/kxxt/electron-ci/sources/electron/src/build/linux/debian_sid_riscv64-sysroot --extra-cflags='--target=riscv64-linux-gnu' --extra-ldflags='--target=riscv64-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/kxxt/electron-ci/sources/electron/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=/home/kxxt/electron-ci/sources/electron/src/build/linux/debian_sid_riscv64-sysroot --extra-cflags='--target=riscv64-linux-gnu' --extra-ldflags='--target=riscv64-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2024 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" -+#define CC_IDENT "clang version 18.0.0 (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 10664813fca8d5ccbfd90bae9e791b7062dabd7c)" ++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 76ea5feb1f12ab35547a3aa1bc1b84d4bca69aa7)" +#define OS_NAME linux -+#define av_restrict restrict +#define EXTERN_PREFIX "" +#define EXTERN_ASM +#define BUILDSUF "" @@ -255,7 +852,6 @@ index 0000000000..77202f2f88 +#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 @@ -307,7 +903,6 @@ index 0000000000..77202f2f88 +#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 @@ -359,7 +954,6 @@ index 0000000000..77202f2f88 +#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 @@ -606,6 +1200,7 @@ index 0000000000..77202f2f88 +#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 @@ -645,6 +1240,8 @@ index 0000000000..77202f2f88 +#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 @@ -694,6 +1291,7 @@ index 0000000000..77202f2f88 +#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 @@ -724,6 +1322,7 @@ index 0000000000..77202f2f88 +#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 @@ -773,7 +1372,6 @@ index 0000000000..77202f2f88 +#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 @@ -817,6 +1415,7 @@ index 0000000000..77202f2f88 +#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 @@ -901,6 +1500,7 @@ index 0000000000..77202f2f88 +#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 @@ -950,10 +1550,10 @@ index 0000000000..77202f2f88 +#endif /* FFMPEG_CONFIG_H */ diff --git a/chromium/config/Chrome/linux/riscv64/config_components.h b/chromium/config/Chrome/linux/riscv64/config_components.h new file mode 100644 -index 0000000000..78ba358a27 +index 0000000000..eac3750637 --- /dev/null +++ b/chromium/config/Chrome/linux/riscv64/config_components.h -@@ -0,0 +1,2218 @@ +@@ -0,0 +1,2214 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -979,7 +1579,6 @@ index 0000000000..78ba358a27 +#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 @@ -1020,7 +1619,6 @@ index 0000000000..78ba358a27 +#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 @@ -1087,7 +1685,6 @@ index 0000000000..78ba358a27 +#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 @@ -1135,13 +1732,11 @@ index 0000000000..78ba358a27 +#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 @@ -1150,7 +1745,6 @@ index 0000000000..78ba358a27 +#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 @@ -1249,7 +1843,6 @@ index 0000000000..78ba358a27 +#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 @@ -1281,7 +1874,6 @@ index 0000000000..78ba358a27 +#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 @@ -1548,6 +2140,7 @@ index 0000000000..78ba358a27 +#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 @@ -1595,7 +2188,6 @@ index 0000000000..78ba358a27 +#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 @@ -1777,6 +2369,7 @@ index 0000000000..78ba358a27 +#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 @@ -2662,6 +3255,7 @@ index 0000000000..78ba358a27 +#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 @@ -2806,6 +3400,7 @@ index 0000000000..78ba358a27 +#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 @@ -2943,6 +3538,7 @@ index 0000000000..78ba358a27 +#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 @@ -2982,7 +3578,6 @@ index 0000000000..78ba358a27 +#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 @@ -3118,6 +3713,7 @@ index 0000000000..78ba358a27 +#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 @@ -3220,11 +3816,11 @@ index 0000000000..3e4fa9c320 + NULL }; diff --git a/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c b/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c new file mode 100644 -index 0000000000..920b22bfa7 +index 0000000000..29f1f59381 --- /dev/null +++ b/chromium/config/Chrome/linux/riscv64/libavformat/demuxer_list.c @@ -0,0 +1,9 @@ -+static const AVInputFormat * const demuxer_list[] = { ++static const FFInputFormat * const demuxer_list[] = { + &ff_aac_demuxer, + &ff_flac_demuxer, + &ff_matroska_demuxer, @@ -3263,20 +3859,20 @@ index 0000000000..8558b35027 +#endif /* AVUTIL_AVCONFIG_H */ diff --git a/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.h b/chromium/config/Chrome/linux/riscv64/libavutil/ffversion.h new file mode 100644 -index 0000000000..236781a694 +index 0000000000..efb1395656 --- /dev/null +++ b/chromium/config/Chrome/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 "git-2024-03-05-52d8ef3799" ++#define FFMPEG_VERSION "git-2024-06-11-58694f4538" +#endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/config/Chrome/linux/x64/config.asm b/chromium/config/Chrome/linux/x64/config.asm -index 04fa1e9924..29c029d568 100644 +index 464038ba2d..239f5192e6 100644 --- a/chromium/config/Chrome/linux/x64/config.asm +++ b/chromium/config/Chrome/linux/x64/config.asm -@@ -364,7 +364,7 @@ +@@ -361,7 +361,7 @@ %define HAVE_INLINE_ASM_LABELS 1 %define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 %define HAVE_PRAGMA_DEPRECATED 1 @@ -3285,7 +3881,7 @@ index 04fa1e9924..29c029d568 100644 %define HAVE_SYMVER_ASM_LABEL 1 %define HAVE_SYMVER_GNU_ASM 1 %define HAVE_VFP_ARGS 0 -@@ -416,7 +416,7 @@ +@@ -414,7 +414,7 @@ %define HAVE_PERL 1 %define HAVE_POD2MAN 1 %define HAVE_TEXI2HTML 0 @@ -3295,25 +3891,25 @@ index 04fa1e9924..29c029d568 100644 %define HAVE_OPENVINO2 0 %define CONFIG_DOC 0 diff --git a/chromium/config/Chrome/linux/x64/config.h b/chromium/config/Chrome/linux/x64/config.h -index 5d25c53f4a..716e5f9394 100644 +index 375f531b39..dca1b66b2b 100644 --- a/chromium/config/Chrome/linux/x64/config.h +++ b/chromium/config/Chrome/linux/x64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H --/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ -+/* #define FFMPEG_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/kxxt/electron-ci/sources/electron/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ +-/* #define FFMPEG_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/liberato/src/release_chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/kxxt/electron-ci/sources/electron/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" --#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)" -+#define CC_IDENT "clang version 18.0.0 (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 10664813fca8d5ccbfd90bae9e791b7062dabd7c)" +-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 315c88c5fbdb2b27cebf23c87fb502f7a567d84b)" ++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 76ea5feb1f12ab35547a3aa1bc1b84d4bca69aa7)" #define OS_NAME linux - #define av_restrict restrict #define EXTERN_PREFIX "" -@@ -379,7 +379,7 @@ + #define EXTERN_ASM +@@ -375,7 +375,7 @@ #define HAVE_INLINE_ASM_LABELS 1 #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 #define HAVE_PRAGMA_DEPRECATED 1 @@ -3322,7 +3918,7 @@ index 5d25c53f4a..716e5f9394 100644 #define HAVE_SYMVER_ASM_LABEL 1 #define HAVE_SYMVER_GNU_ASM 1 #define HAVE_VFP_ARGS 0 -@@ -431,7 +431,7 @@ +@@ -428,7 +428,7 @@ #define HAVE_PERL 1 #define HAVE_POD2MAN 1 #define HAVE_TEXI2HTML 0 @@ -3332,33 +3928,32 @@ index 5d25c53f4a..716e5f9394 100644 #define HAVE_OPENVINO2 0 #define CONFIG_DOC 0 diff --git a/chromium/config/Chrome/linux/x64/libavutil/ffversion.h b/chromium/config/Chrome/linux/x64/libavutil/ffversion.h -index e32799b284..236781a694 100644 +index 396b484e27..efb1395656 100644 --- a/chromium/config/Chrome/linux/x64/libavutil/ffversion.h +++ b/chromium/config/Chrome/linux/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 "git-2024-03-05-52d8ef3799" +-#define FFMPEG_VERSION "N-116067-gfecf1c679a" ++#define FFMPEG_VERSION "git-2024-06-11-58694f4538" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/config/ChromeOS/linux/riscv64/config.h b/chromium/config/ChromeOS/linux/riscv64/config.h new file mode 100644 -index 0000000000..bfe761f4be +index 0000000000..76545f3192 --- /dev/null +++ b/chromium/config/ChromeOS/linux/riscv64/config.h -@@ -0,0 +1,772 @@ +@@ -0,0 +1,774 @@ +/* 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/kxxt/electron-ci/sources/electron/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=/home/kxxt/electron-ci/sources/electron/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' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi" -- 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-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/kxxt/electron-ci/sources/electron/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=/home/kxxt/electron-ci/sources/electron/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' --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 "clang version 18.0.0 (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 10664813fca8d5ccbfd90bae9e791b7062dabd7c)" ++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 76ea5feb1f12ab35547a3aa1bc1b84d4bca69aa7)" +#define OS_NAME linux -+#define av_restrict restrict +#define EXTERN_PREFIX "" +#define EXTERN_ASM +#define BUILDSUF "" @@ -3427,7 +4022,6 @@ index 0000000000..bfe761f4be +#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 @@ -3479,7 +4073,6 @@ index 0000000000..bfe761f4be +#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 @@ -3531,7 +4124,6 @@ index 0000000000..bfe761f4be +#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 @@ -3778,6 +4370,7 @@ index 0000000000..bfe761f4be +#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 @@ -3817,6 +4410,8 @@ index 0000000000..bfe761f4be +#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 @@ -3866,6 +4461,7 @@ index 0000000000..bfe761f4be +#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 @@ -3896,6 +4492,7 @@ index 0000000000..bfe761f4be +#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 @@ -3945,7 +4542,6 @@ index 0000000000..bfe761f4be +#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 @@ -3989,6 +4585,7 @@ index 0000000000..bfe761f4be +#define CONFIG_ERROR_RESILIENCE 1 +#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 @@ -4073,6 +4670,7 @@ index 0000000000..bfe761f4be +#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 @@ -4122,10 +4720,10 @@ index 0000000000..bfe761f4be +#endif /* FFMPEG_CONFIG_H */ diff --git a/chromium/config/ChromeOS/linux/riscv64/config_components.h b/chromium/config/ChromeOS/linux/riscv64/config_components.h new file mode 100644 -index 0000000000..4eb4321ba3 +index 0000000000..19091e639b --- /dev/null +++ b/chromium/config/ChromeOS/linux/riscv64/config_components.h -@@ -0,0 +1,2218 @@ +@@ -0,0 +1,2214 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -4151,7 +4749,6 @@ index 0000000000..4eb4321ba3 +#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 @@ -4192,7 +4789,6 @@ index 0000000000..4eb4321ba3 +#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 @@ -4259,7 +4855,6 @@ index 0000000000..4eb4321ba3 +#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 @@ -4307,13 +4902,11 @@ index 0000000000..4eb4321ba3 +#define CONFIG_MPEG1VIDEO_DECODER 0 +#define CONFIG_MPEG2VIDEO_DECODER 0 +#define CONFIG_MPEG4_DECODER 1 -+#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 @@ -4322,7 +4915,6 @@ index 0000000000..4eb4321ba3 +#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 @@ -4421,7 +5013,6 @@ index 0000000000..4eb4321ba3 +#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 @@ -4453,7 +5044,6 @@ index 0000000000..4eb4321ba3 +#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 @@ -4720,6 +5310,7 @@ index 0000000000..4eb4321ba3 +#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 @@ -4767,7 +5358,6 @@ index 0000000000..4eb4321ba3 +#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 @@ -4949,6 +5539,7 @@ index 0000000000..4eb4321ba3 +#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 @@ -5834,6 +6425,7 @@ index 0000000000..4eb4321ba3 +#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 @@ -5978,6 +6570,7 @@ index 0000000000..4eb4321ba3 +#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 @@ -6115,6 +6708,7 @@ index 0000000000..4eb4321ba3 +#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 @@ -6154,7 +6748,6 @@ index 0000000000..4eb4321ba3 +#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 @@ -6290,6 +6883,7 @@ index 0000000000..4eb4321ba3 +#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 @@ -6396,11 +6990,11 @@ index 0000000000..4cd09fce99 + NULL }; diff --git a/chromium/config/ChromeOS/linux/riscv64/libavformat/demuxer_list.c b/chromium/config/ChromeOS/linux/riscv64/libavformat/demuxer_list.c new file mode 100644 -index 0000000000..74870b99d2 +index 0000000000..ba4871827b --- /dev/null +++ b/chromium/config/ChromeOS/linux/riscv64/libavformat/demuxer_list.c @@ -0,0 +1,10 @@ -+static const AVInputFormat * const demuxer_list[] = { ++static const FFInputFormat * const demuxer_list[] = { + &ff_aac_demuxer, + &ff_avi_demuxer, + &ff_flac_demuxer, @@ -6440,20 +7034,20 @@ index 0000000000..8558b35027 +#endif /* AVUTIL_AVCONFIG_H */ diff --git a/chromium/config/ChromeOS/linux/riscv64/libavutil/ffversion.h b/chromium/config/ChromeOS/linux/riscv64/libavutil/ffversion.h new file mode 100644 -index 0000000000..236781a694 +index 0000000000..efb1395656 --- /dev/null +++ b/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 "git-2024-03-05-52d8ef3799" ++#define FFMPEG_VERSION "git-2024-06-11-58694f4538" +#endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/config/ChromeOS/linux/x64/config.asm b/chromium/config/ChromeOS/linux/x64/config.asm -index 34acbd65ea..59f3bcda7c 100644 +index 87ff79b684..24b79a57fc 100644 --- a/chromium/config/ChromeOS/linux/x64/config.asm +++ b/chromium/config/ChromeOS/linux/x64/config.asm -@@ -364,7 +364,7 @@ +@@ -361,7 +361,7 @@ %define HAVE_INLINE_ASM_LABELS 1 %define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 %define HAVE_PRAGMA_DEPRECATED 1 @@ -6462,7 +7056,7 @@ index 34acbd65ea..59f3bcda7c 100644 %define HAVE_SYMVER_ASM_LABEL 1 %define HAVE_SYMVER_GNU_ASM 1 %define HAVE_VFP_ARGS 0 -@@ -416,7 +416,7 @@ +@@ -414,7 +414,7 @@ %define HAVE_PERL 1 %define HAVE_POD2MAN 1 %define HAVE_TEXI2HTML 0 @@ -6472,25 +7066,25 @@ index 34acbd65ea..59f3bcda7c 100644 %define HAVE_OPENVINO2 0 %define CONFIG_DOC 0 diff --git a/chromium/config/ChromeOS/linux/x64/config.h b/chromium/config/ChromeOS/linux/x64/config.h -index 911ad3e5a3..9d374ab37c 100644 +index 07227d1368..121a03f819 100644 --- a/chromium/config/ChromeOS/linux/x64/config.h +++ b/chromium/config/ChromeOS/linux/x64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H --/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-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-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi" -- 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-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/kxxt/electron-ci/sources/electron/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi" -- 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-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/liberato/src/release_chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --enable-decoder=mpeg4 --enable-parser='h263,mpeg4video' --enable-demuxer=avi" -- 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-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/kxxt/electron-ci/sources/electron/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264' --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 "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)" -+#define CC_IDENT "clang version 18.0.0 (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 10664813fca8d5ccbfd90bae9e791b7062dabd7c)" +-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 315c88c5fbdb2b27cebf23c87fb502f7a567d84b)" ++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 76ea5feb1f12ab35547a3aa1bc1b84d4bca69aa7)" #define OS_NAME linux - #define av_restrict restrict #define EXTERN_PREFIX "" -@@ -379,7 +379,7 @@ + #define EXTERN_ASM +@@ -375,7 +375,7 @@ #define HAVE_INLINE_ASM_LABELS 1 #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 #define HAVE_PRAGMA_DEPRECATED 1 @@ -6499,7 +7093,7 @@ index 911ad3e5a3..9d374ab37c 100644 #define HAVE_SYMVER_ASM_LABEL 1 #define HAVE_SYMVER_GNU_ASM 1 #define HAVE_VFP_ARGS 0 -@@ -431,7 +431,7 @@ +@@ -428,7 +428,7 @@ #define HAVE_PERL 1 #define HAVE_POD2MAN 1 #define HAVE_TEXI2HTML 0 @@ -6509,33 +7103,623 @@ index 911ad3e5a3..9d374ab37c 100644 #define HAVE_OPENVINO2 0 #define CONFIG_DOC 0 diff --git a/chromium/config/ChromeOS/linux/x64/libavutil/ffversion.h b/chromium/config/ChromeOS/linux/x64/libavutil/ffversion.h -index e32799b284..236781a694 100644 +index 396b484e27..efb1395656 100644 --- a/chromium/config/ChromeOS/linux/x64/libavutil/ffversion.h +++ b/chromium/config/ChromeOS/linux/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-116067-gfecf1c679a" ++#define FFMPEG_VERSION "git-2024-06-11-58694f4538" + #endif /* AVUTIL_FFVERSION_H */ +diff --git a/chromium/config/Chromium/ios/arm64/config.h b/chromium/config/Chromium/ios/arm64/config.h +index 0428a7286b..885aaf1e7c 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/liberato/src/release_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/liberato/src/release_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/liberato/src/release_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/liberato/src/release_chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/liberato/src/release_chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/liberato/src/release_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 315c88c5fbdb2b27cebf23c87fb502f7a567d84b)" + #define OS_NAME darwin +-#define av_restrict restrict + #define EXTERN_PREFIX "_" + #define EXTERN_ASM _ + #define BUILDSUF "" +@@ -78,7 +77,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 +@@ -130,7 +128,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 +@@ -182,7 +179,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 +@@ -429,6 +425,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 +465,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 +516,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 +547,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 +597,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 +640,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 +@@ -724,6 +725,7 @@ + #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..a1620dc43b 100644 +--- a/chromium/config/Chromium/ios/arm64/config_components.h ++++ b/chromium/config/Chromium/ios/arm64/config_components.h +@@ -23,7 +23,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 +@@ -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 +@@ -1706,6 +1699,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 +@@ -1850,6 +1844,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 +1982,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 +2022,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 +@@ -2162,6 +2157,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..396b484e27 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 "git-2024-03-05-52d8ef3799" ++#define FFMPEG_VERSION "N-116067-gfecf1c679a" + #endif /* AVUTIL_FFVERSION_H */ +diff --git a/chromium/config/Chromium/ios/x64/config.asm b/chromium/config/Chromium/ios/x64/config.asm +index e6a75b6deb..42ecd666c0 100644 +--- a/chromium/config/Chromium/ios/x64/config.asm ++++ b/chromium/config/Chromium/ios/x64/config.asm +@@ -62,7 +62,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 +@@ -114,7 +113,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 +@@ -166,7 +164,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 +@@ -413,6 +410,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 +450,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 +501,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 +532,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 +582,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 +625,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 +@@ -708,6 +710,7 @@ + %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..2ccdae1fbe 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/liberato/src/release_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/liberato/src/release_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/liberato/src/release_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/liberato/src/release_chrome/src/third_party/llvm-build/Release+Asserts/lib/clang/19/include --extra-ldflags=-syslibroot --extra-ldflags=/usr/local/google/home/liberato/src/release_chrome/src/build/mac_files/xcode_binaries/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk --extra-ldflags=-L/usr/local/google/home/liberato/src/release_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 315c88c5fbdb2b27cebf23c87fb502f7a567d84b)" + #define OS_NAME darwin +-#define av_restrict restrict + #define EXTERN_PREFIX "_" + #define EXTERN_ASM _ + #define BUILDSUF "" +@@ -77,7 +76,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 +@@ -129,7 +127,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 +@@ -181,7 +178,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 +@@ -428,6 +424,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 +464,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 +515,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 +546,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 +596,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 +639,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 +@@ -723,6 +724,7 @@ + #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..a1620dc43b 100644 +--- a/chromium/config/Chromium/ios/x64/config_components.h ++++ b/chromium/config/Chromium/ios/x64/config_components.h +@@ -23,7 +23,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 +@@ -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 +@@ -1706,6 +1699,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 +@@ -1850,6 +1844,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 +1982,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 +2022,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 +@@ -2162,6 +2157,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..396b484e27 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-116067-gfecf1c679a" #endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/config/Chromium/linux/riscv64/config.h b/chromium/config/Chromium/linux/riscv64/config.h new file mode 100644 -index 0000000000..d88ecfe8b5 +index 0000000000..738b27aa16 --- /dev/null +++ b/chromium/config/Chromium/linux/riscv64/config.h -@@ -0,0 +1,772 @@ +@@ -0,0 +1,774 @@ +/* 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/kxxt/electron-ci/sources/electron/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=/home/kxxt/electron-ci/sources/electron/src/build/linux/debian_sid_riscv64-sysroot --extra-cflags='--target=riscv64-linux-gnu' --extra-ldflags='--target=riscv64-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/kxxt/electron-ci/sources/electron/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=/home/kxxt/electron-ci/sources/electron/src/build/linux/debian_sid_riscv64-sysroot --extra-cflags='--target=riscv64-linux-gnu' --extra-ldflags='--target=riscv64-linux-gnu' --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ +#define FFMPEG_LICENSE "LGPL version 2.1 or later" +#define CONFIG_THIS_YEAR 2024 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" +#define AVCONV_DATADIR "/usr/local/share/ffmpeg" -+#define CC_IDENT "clang version 18.0.0 (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 10664813fca8d5ccbfd90bae9e791b7062dabd7c)" ++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 76ea5feb1f12ab35547a3aa1bc1b84d4bca69aa7)" +#define OS_NAME linux -+#define av_restrict restrict +#define EXTERN_PREFIX "" +#define EXTERN_ASM +#define BUILDSUF "" @@ -6604,7 +7788,6 @@ index 0000000000..d88ecfe8b5 +#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 @@ -6656,7 +7839,6 @@ index 0000000000..d88ecfe8b5 +#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 @@ -6708,7 +7890,6 @@ index 0000000000..d88ecfe8b5 +#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 @@ -6955,6 +8136,7 @@ index 0000000000..d88ecfe8b5 +#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 @@ -6994,6 +8176,8 @@ index 0000000000..d88ecfe8b5 +#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 @@ -7043,6 +8227,7 @@ index 0000000000..d88ecfe8b5 +#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 @@ -7073,6 +8258,7 @@ index 0000000000..d88ecfe8b5 +#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 @@ -7122,7 +8308,6 @@ index 0000000000..d88ecfe8b5 +#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 @@ -7166,6 +8351,7 @@ index 0000000000..d88ecfe8b5 +#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 @@ -7250,6 +8436,7 @@ index 0000000000..d88ecfe8b5 +#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 @@ -7299,10 +8486,10 @@ index 0000000000..d88ecfe8b5 +#endif /* FFMPEG_CONFIG_H */ diff --git a/chromium/config/Chromium/linux/riscv64/config_components.h b/chromium/config/Chromium/linux/riscv64/config_components.h new file mode 100644 -index 0000000000..7d2f7ea320 +index 0000000000..a1620dc43b --- /dev/null +++ b/chromium/config/Chromium/linux/riscv64/config_components.h -@@ -0,0 +1,2218 @@ +@@ -0,0 +1,2214 @@ +/* Automatically generated by configure - do not modify! */ +#ifndef FFMPEG_CONFIG_COMPONENTS_H +#define FFMPEG_CONFIG_COMPONENTS_H @@ -7328,7 +8515,6 @@ index 0000000000..7d2f7ea320 +#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 @@ -7369,7 +8555,6 @@ index 0000000000..7d2f7ea320 +#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 @@ -7436,7 +8621,6 @@ index 0000000000..7d2f7ea320 +#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 @@ -7484,13 +8668,11 @@ index 0000000000..7d2f7ea320 +#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 @@ -7499,7 +8681,6 @@ index 0000000000..7d2f7ea320 +#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 @@ -7598,7 +8779,6 @@ index 0000000000..7d2f7ea320 +#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 @@ -7630,7 +8810,6 @@ index 0000000000..7d2f7ea320 +#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 @@ -7897,6 +9076,7 @@ index 0000000000..7d2f7ea320 +#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 @@ -7944,7 +9124,6 @@ index 0000000000..7d2f7ea320 +#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 @@ -8126,6 +9305,7 @@ index 0000000000..7d2f7ea320 +#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 @@ -9011,6 +10191,7 @@ index 0000000000..7d2f7ea320 +#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 @@ -9155,6 +10336,7 @@ index 0000000000..7d2f7ea320 +#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 @@ -9292,6 +10474,7 @@ index 0000000000..7d2f7ea320 +#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 @@ -9331,7 +10514,6 @@ index 0000000000..7d2f7ea320 +#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 @@ -9467,6 +10649,7 @@ index 0000000000..7d2f7ea320 +#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 @@ -9565,11 +10748,11 @@ index 0000000000..fdc533b38f + NULL }; diff --git a/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c b/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c new file mode 100644 -index 0000000000..1908ba19e7 +index 0000000000..570a6441d3 --- /dev/null +++ b/chromium/config/Chromium/linux/riscv64/libavformat/demuxer_list.c @@ -0,0 +1,8 @@ -+static const AVInputFormat * const demuxer_list[] = { ++static const FFInputFormat * const demuxer_list[] = { + &ff_flac_demuxer, + &ff_matroska_demuxer, + &ff_mov_demuxer, @@ -9607,20 +10790,20 @@ index 0000000000..8558b35027 +#endif /* AVUTIL_AVCONFIG_H */ diff --git a/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h b/chromium/config/Chromium/linux/riscv64/libavutil/ffversion.h new file mode 100644 -index 0000000000..236781a694 +index 0000000000..efb1395656 --- /dev/null +++ b/chromium/config/Chromium/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 "git-2024-03-05-52d8ef3799" ++#define FFMPEG_VERSION "git-2024-06-11-58694f4538" +#endif /* AVUTIL_FFVERSION_H */ diff --git a/chromium/config/Chromium/linux/x64/config.asm b/chromium/config/Chromium/linux/x64/config.asm -index 53c290686c..5123802d29 100644 +index 88ee8eaff3..254f23638b 100644 --- a/chromium/config/Chromium/linux/x64/config.asm +++ b/chromium/config/Chromium/linux/x64/config.asm -@@ -364,7 +364,7 @@ +@@ -361,7 +361,7 @@ %define HAVE_INLINE_ASM_LABELS 1 %define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 %define HAVE_PRAGMA_DEPRECATED 1 @@ -9629,7 +10812,7 @@ index 53c290686c..5123802d29 100644 %define HAVE_SYMVER_ASM_LABEL 1 %define HAVE_SYMVER_GNU_ASM 1 %define HAVE_VFP_ARGS 0 -@@ -416,7 +416,7 @@ +@@ -414,7 +414,7 @@ %define HAVE_PERL 1 %define HAVE_POD2MAN 1 %define HAVE_TEXI2HTML 0 @@ -9639,25 +10822,25 @@ index 53c290686c..5123802d29 100644 %define HAVE_OPENVINO2 0 %define CONFIG_DOC 0 diff --git a/chromium/config/Chromium/linux/x64/config.h b/chromium/config/Chromium/linux/x64/config.h -index ff31e4f5fd..c992d4453e 100644 +index c81c947b66..4179571756 100644 --- a/chromium/config/Chromium/linux/x64/config.h +++ b/chromium/config/Chromium/linux/x64/config.h @@ -1,12 +1,12 @@ /* Automatically generated by configure - do not modify! */ #ifndef FFMPEG_CONFIG_H #define FFMPEG_CONFIG_H --/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/ezemtsov/projects/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ -+/* #define FFMPEG_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/kxxt/electron-ci/sources/electron/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ +-/* #define FFMPEG_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/liberato/src/release_chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ ++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-iamf --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/home/kxxt/electron-ci/sources/electron/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld'" -- elide long configuration string from binary */ #define FFMPEG_LICENSE "LGPL version 2.1 or later" #define CONFIG_THIS_YEAR 2024 #define FFMPEG_DATADIR "/usr/local/share/ffmpeg" #define AVCONV_DATADIR "/usr/local/share/ffmpeg" --#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 7c4c274643cedcf9671e1db65361231a7d9bee70)" -+#define CC_IDENT "clang version 18.0.0 (https://chromium.googlesource.com/external/github.com/llvm/llvm-project 10664813fca8d5ccbfd90bae9e791b7062dabd7c)" +-#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 315c88c5fbdb2b27cebf23c87fb502f7a567d84b)" ++#define CC_IDENT "clang version 19.0.0git (https://chromium.googlesource.com/a/external/github.com/llvm/llvm-project 76ea5feb1f12ab35547a3aa1bc1b84d4bca69aa7)" #define OS_NAME linux - #define av_restrict restrict #define EXTERN_PREFIX "" -@@ -379,7 +379,7 @@ + #define EXTERN_ASM +@@ -375,7 +375,7 @@ #define HAVE_INLINE_ASM_LABELS 1 #define HAVE_INLINE_ASM_NONLOCAL_LABELS 1 #define HAVE_PRAGMA_DEPRECATED 1 @@ -9666,7 +10849,7 @@ index ff31e4f5fd..c992d4453e 100644 #define HAVE_SYMVER_ASM_LABEL 1 #define HAVE_SYMVER_GNU_ASM 1 #define HAVE_VFP_ARGS 0 -@@ -431,7 +431,7 @@ +@@ -428,7 +428,7 @@ #define HAVE_PERL 1 #define HAVE_POD2MAN 1 #define HAVE_TEXI2HTML 0 @@ -9676,94 +10859,21 @@ index ff31e4f5fd..c992d4453e 100644 #define HAVE_OPENVINO2 0 #define CONFIG_DOC 0 diff --git a/chromium/config/Chromium/linux/x64/libavutil/ffversion.h b/chromium/config/Chromium/linux/x64/libavutil/ffversion.h -index e32799b284..236781a694 100644 +index 396b484e27..efb1395656 100644 --- a/chromium/config/Chromium/linux/x64/libavutil/ffversion.h +++ b/chromium/config/Chromium/linux/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 "git-2024-03-05-52d8ef3799" +-#define FFMPEG_VERSION "N-116067-gfecf1c679a" ++#define FFMPEG_VERSION "git-2024-06-11-58694f4538" #endif /* AVUTIL_FFVERSION_H */ -diff --git a/chromium/scripts/build_ffmpeg.py b/chromium/scripts/build_ffmpeg.py -index eaf8fe9d39..1e9aced798 100755 ---- a/chromium/scripts/build_ffmpeg.py -+++ b/chromium/scripts/build_ffmpeg.py -@@ -42,7 +42,7 @@ BRANDINGS = [ - - 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'], - } -@@ -895,6 +895,20 @@ def ConfigureAndBuild(target_arch, target_os, host_os, host_arch, - '--extra-cflags=--target=mips64el-linux-gnuabi64', - '--extra-ldflags=--target=mips64el-linux-gnuabi64', - ]) -+ elif target_arch == "riscv64": -+ configure_flags['Common'].extend([ -+ '--arch=riscv64', -+ '--extra-cflags=-march=rv64gc', -+ ]) -+ if target_os == 'linux': -+ configure_flags['Common'].extend([ -+ '--enable-cross-compile', -+ '--target-os=linux', -+ '--sysroot=' + os.path.join( -+ CHROMIUM_ROOT_DIR, 'build/linux/debian_sid_riscv64-sysroot'), -+ '--extra-cflags=--target=riscv64-linux-gnu', -+ '--extra-ldflags=--target=riscv64-linux-gnu', -+ ]) - else: - print('Error: Unknown target arch %r for target OS %r!' % - (target_arch, target_os), -diff --git a/chromium/scripts/copy_config.sh b/chromium/scripts/copy_config.sh -index a18048cf04..0d080211aa 100755 ---- a/chromium/scripts/copy_config.sh -+++ b/chromium/scripts/copy_config.sh -@@ -10,7 +10,7 @@ for os in android linux linux-noasm mac win; do - # Copy config files for various architectures: - # - ia32/x64 have config.asm, config.h - # - arm/arm-neon have config.h -- for arch in arm arm-neon arm64 ia32 x64 mipsel mips64el; do -+ for arch in arm arm-neon arm64 ia32 x64 mipsel mips64el riscv64; do - # Don't waste time on non-existent configs, if no config.h then skip. - [ ! -e "build.$arch.$os/$target/config.h" ] && continue - for f in config.h config_components.h config.asm libavutil/avconfig.h libavutil/ffversion.h libavcodec/bsf_list.c libavcodec/codec_list.c libavcodec/parser_list.c libavformat/demuxer_list.c libavformat/muxer_list.c libavformat/protocol_list.c; do -diff --git a/chromium/scripts/generate_gn.py b/chromium/scripts/generate_gn.py -index fee357441d..98ebc57fe6 100755 ---- a/chromium/scripts/generate_gn.py -+++ b/chromium/scripts/generate_gn.py -@@ -80,7 +80,7 @@ GN_SOURCE_END = """] - _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']) - } -diff --git a/chromium/scripts/robo_lib/config.py b/chromium/scripts/robo_lib/config.py -index 3764ab4933..d7422c280d 100644 ---- a/chromium/scripts/robo_lib/config.py -+++ b/chromium/scripts/robo_lib/config.py -@@ -173,7 +173,7 @@ class RoboConfiguration: - self._host_operating_system = "linux" - - try: -- with open("/etc/lsb-release", "r") as f: -+ with open("/etc/os-release", "r") as f: - result = f.read() - if "Ubuntu" in result or "Debian" in result: - self._os_flavor = packages.OsFlavor.Debian diff --git a/ffmpeg_generated.gni b/ffmpeg_generated.gni -index 21a28ea4e1..26a129a15c 100644 +index 2e6a0b1f42..7d856d29a4 100644 --- a/ffmpeg_generated.gni +++ b/ffmpeg_generated.gni -@@ -14,11 +14,8 @@ ffmpeg_asm_sources = [] +@@ -14,11 +14,7 @@ ffmpeg_asm_sources = [] use_linux_config = is_linux || is_chromeos || is_fuchsia @@ -9772,23 +10882,16 @@ index 21a28ea4e1..26a129a15c 100644 - (is_android && current_cpu == "x64") || - (is_android && current_cpu == "x86") || is_apple || is_win || - use_linux_config) { -+if ((use_linux_config && current_cpu == "riscv64") || -+ (use_linux_config && current_cpu == "x64")) { ++if ((use_linux_config && current_cpu == "riscv64") || (use_linux_config && current_cpu == "x64")) { ffmpeg_c_sources += [ "libavcodec/ac3_channel_layout_tab.c", "libavcodec/ac3_parser.c", -@@ -210,7 +207,66 @@ if ((is_android && current_cpu == "arm" && arm_use_neon) || +@@ -211,7 +207,57 @@ if ((is_android && current_cpu == "arm" && arm_use_neon) || ] } -if (use_linux_config && ffmpeg_branding == "ChromeOS") { -+if ((use_linux_config && current_cpu == "riscv64" && -+ ffmpeg_branding == "Chrome") || -+ (use_linux_config && current_cpu == "riscv64" && -+ ffmpeg_branding == "ChromeOS") || -+ (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") || -+ (use_linux_config && current_cpu == "x64" && -+ ffmpeg_branding == "ChromeOS")) { ++if ((use_linux_config && current_cpu == "riscv64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "riscv64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS")) { + ffmpeg_c_sources += [ + "libavcodec/aac_ac3_parser.c", + "libavcodec/aac_parser.c", @@ -9838,14 +10941,11 @@ index 21a28ea4e1..26a129a15c 100644 + ] +} + -+if ((use_linux_config && current_cpu == "riscv64" && -+ ffmpeg_branding == "ChromeOS") || -+ (use_linux_config && current_cpu == "x64" && -+ ffmpeg_branding == "ChromeOS")) { ++if ((use_linux_config && current_cpu == "riscv64" && ffmpeg_branding == "ChromeOS") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ "libavcodec/autorename_libavcodec_blockdsp.c", "libavcodec/autorename_libavcodec_hpeldsp.c", -@@ -219,7 +275,6 @@ if (use_linux_config && ffmpeg_branding == "ChromeOS") { +@@ -220,7 +266,6 @@ if (use_linux_config && ffmpeg_branding == "ChromeOS") { "libavcodec/autorename_libavcodec_mpeg4videodsp.c", "libavcodec/autorename_libavcodec_mpegvideo.c", "libavcodec/autorename_libavcodec_qpeldsp.c", @@ -9853,7 +10953,7 @@ index 21a28ea4e1..26a129a15c 100644 "libavcodec/autorename_libavcodec_xvididct.c", "libavcodec/error_resilience.c", "libavcodec/exif.c", -@@ -240,65 +295,26 @@ if (use_linux_config && ffmpeg_branding == "ChromeOS") { +@@ -241,65 +286,24 @@ if (use_linux_config && ffmpeg_branding == "ChromeOS") { "libavcodec/mpegvideo_motion.c", "libavcodec/mpegvideodata.c", "libavcodec/rl.c", @@ -9903,12 +11003,12 @@ index 21a28ea4e1..26a129a15c 100644 - (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") || -+if ((use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") || - (use_linux_config && current_cpu == "x64" && +- (use_linux_config && current_cpu == "x64" && - ffmpeg_branding == "ChromeOS") || - (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chrome") || - (use_linux_config && current_cpu == "x86" && - ffmpeg_branding == "ChromeOS")) { +- ffmpeg_branding == "ChromeOS")) { ++if ((use_linux_config && current_cpu == "x64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS")) { ffmpeg_c_sources += [ - "libavcodec/x86/autorename_libavcodec_x86_videodsp_init.c", + "libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c", @@ -9925,7 +11025,7 @@ index 21a28ea4e1..26a129a15c 100644 "libavcodec/x86/fpel.asm", "libavcodec/x86/h264_chromamc.asm", "libavcodec/x86/h264_chromamc_10bit.asm", -@@ -313,80 +329,47 @@ if ((is_apple && current_cpu == "x64" && ffmpeg_branding == "Chrome") || +@@ -314,80 +318,47 @@ if ((is_apple && current_cpu == "x64" && ffmpeg_branding == "Chrome") || "libavcodec/x86/h264_weight.asm", "libavcodec/x86/h264_weight_10bit.asm", "libavcodec/x86/qpel.asm", @@ -10035,7 +11135,7 @@ index 21a28ea4e1..26a129a15c 100644 "libavcodec/x86/qpeldsp_init.c", "libavcodec/x86/xvididct_init.c", ] -@@ -397,269 +380,60 @@ if ((use_linux_config && current_cpu == "x64" && +@@ -398,269 +369,50 @@ if ((use_linux_config && current_cpu == "x64" && "libavcodec/x86/idctdsp.asm", "libavcodec/x86/me_cmp.asm", "libavcodec/x86/qpeldsp.asm", @@ -10095,7 +11195,8 @@ index 21a28ea4e1..26a129a15c 100644 - (is_win && current_cpu == "x86") || - (use_linux_config && current_cpu == "x64") || - (use_linux_config && current_cpu == "x86")) { -- ffmpeg_c_sources += [ ++if (use_linux_config && current_cpu == "riscv64") { + ffmpeg_c_sources += [ - "libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c", - "libavcodec/x86/constants.c", - "libavcodec/x86/flacdsp_init.c", @@ -10112,8 +11213,7 @@ index 21a28ea4e1..26a129a15c 100644 - (is_apple && current_cpu == "arm64") || - (is_win && current_cpu == "arm64") || - (use_linux_config && current_cpu == "arm64")) { -+if (use_linux_config && current_cpu == "riscv64") { - ffmpeg_c_sources += [ +- ffmpeg_c_sources += [ - "libavcodec/aarch64/mpegaudiodsp_init.c", - "libavcodec/aarch64/vorbisdsp_init.c", - "libavutil/aarch64/autorename_libavutil_aarch64_cpu.c", @@ -10140,30 +11240,36 @@ index 21a28ea4e1..26a129a15c 100644 -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 += [ ++if ((use_linux_config && current_cpu == "riscv64" && ffmpeg_branding == "Chrome") || (use_linux_config && current_cpu == "riscv64" && ffmpeg_branding == "ChromeOS")) { + ffmpeg_c_sources += [ - "libavcodec/arm/flacdsp_init_arm.c", - "libavcodec/arm/mpegaudiodsp_init_arm.c", - "libavcodec/arm/vorbisdsp_init_arm.c", - "libavutil/arm/cpu.c", - "libavutil/arm/float_dsp_init_arm.c", - "libavutil/arm/float_dsp_init_vfp.c", -- ] -- ffmpeg_gas_sources += [ ++ "libavcodec/riscv/aacpsdsp_init.c", ++ "libavcodec/riscv/h264_chroma_init_riscv.c", ++ "libavcodec/riscv/sbrdsp_init.c", + ] + ffmpeg_gas_sources += [ - "libavcodec/arm/flacdsp_arm.S", - "libavcodec/arm/mpegaudiodsp_fixed_armv6.S", - "libavutil/arm/float_dsp_vfp.S", -- ] --} -- ++ "libavcodec/riscv/aacpsdsp_rvv.S", ++ "libavcodec/riscv/h264_mc_chroma.S", ++ "libavcodec/riscv/sbrdsp_rvv.S", + ] + } + -if ((use_linux_config && current_cpu == "arm" && arm_use_neon && -+if ((use_linux_config && current_cpu == "riscv64" && - ffmpeg_branding == "Chrome") || +- ffmpeg_branding == "Chrome") || - (use_linux_config && current_cpu == "arm" && arm_use_neon && - ffmpeg_branding == "ChromeOS") || - (use_linux_config && current_cpu == "arm" && ffmpeg_branding == "Chrome") || - (use_linux_config && current_cpu == "arm" && -+ (use_linux_config && current_cpu == "riscv64" && - ffmpeg_branding == "ChromeOS")) { +- ffmpeg_branding == "ChromeOS")) { ++if (use_linux_config && current_cpu == "riscv64" && ffmpeg_branding == "ChromeOS") { ffmpeg_c_sources += [ - "libavcodec/arm/h264chroma_init_arm.c", - "libavcodec/arm/h264dsp_init_arm.c", @@ -10171,23 +11277,22 @@ index 21a28ea4e1..26a129a15c 100644 - "libavcodec/arm/h264qpel_init_arm.c", - "libavcodec/arm/videodsp_init_arm.c", - "libavcodec/arm/videodsp_init_armv5te.c", -+ "libavcodec/riscv/aacpsdsp_init.c", -+ "libavcodec/riscv/h264_chroma_init_riscv.c", -+ "libavcodec/riscv/sbrdsp_init.c", ++ "libavcodec/riscv/blockdsp_init.c", ++ "libavcodec/riscv/idctdsp_init.c", ++ "libavcodec/riscv/me_cmp_init.c", ] ffmpeg_gas_sources += [ - "libavcodec/arm/startcode_armv6.S", - "libavcodec/arm/videodsp_armv5te.S", -+ "libavcodec/riscv/aacpsdsp_rvv.S", -+ "libavcodec/riscv/h264_mc_chroma.S", -+ "libavcodec/riscv/sbrdsp_rvv.S", ++ "libavcodec/riscv/blockdsp_rvv.S", ++ "libavcodec/riscv/idctdsp_rvv.S", ++ "libavcodec/riscv/me_cmp_rvv.S", ] } -if (use_linux_config && current_cpu == "arm" && arm_use_neon && -+if (use_linux_config && current_cpu == "riscv64" && - ffmpeg_branding == "ChromeOS") { - ffmpeg_c_sources += [ +- ffmpeg_branding == "ChromeOS") { +- ffmpeg_c_sources += [ - "libavcodec/arm/blockdsp_init_neon.c", - "libavcodec/arm/hpeldsp_init_neon.c", - "libavcodec/arm/idctdsp_init_neon.c", @@ -10197,30 +11302,24 @@ index 21a28ea4e1..26a129a15c 100644 - "libavcodec/arm/autorename_libavcodec_arm_simple_idct_neon.S", - "libavcodec/arm/blockdsp_neon.S", - "libavcodec/arm/mpegvideo_neon.S", -+ "libavcodec/riscv/blockdsp_init.c", -+ "libavcodec/riscv/idctdsp_init.c", -+ "libavcodec/riscv/me_cmp_init.c", - ] +- ] -} - -if ((use_linux_config && current_cpu == "arm" && arm_use_neon && - ffmpeg_branding == "Chrome") || - (use_linux_config && current_cpu == "arm" && arm_use_neon && - ffmpeg_branding == "ChromeOS")) { - ffmpeg_gas_sources += [ +- 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", -+ "libavcodec/riscv/blockdsp_rvv.S", -+ "libavcodec/riscv/idctdsp_rvv.S", -+ "libavcodec/riscv/me_cmp_rvv.S", - ] - } - - if (use_linux_config && current_cpu == "arm64" && +- ] +-} +- +-if (use_linux_config && current_cpu == "arm64" && - ffmpeg_branding == "ChromeOS") { - ffmpeg_c_sources += [ - "libavcodec/aarch64/hpeldsp_init_aarch64.c", @@ -10315,9 +11414,8 @@ index 21a28ea4e1..26a129a15c 100644 - (is_android && current_cpu == "x64") || - (is_android && current_cpu == "x86")) { - ffmpeg_c_sources += [ "compat/strtod.c" ] -+ ffmpeg_branding == "Chromium") { - } - +-} +- -if ((use_linux_config && current_cpu == "arm" && arm_use_neon && - ffmpeg_branding == "ChromeOS") || - (use_linux_config && current_cpu == "arm64" && @@ -10331,319 +11429,294 @@ index 21a28ea4e1..26a129a15c 100644 - -if (use_linux_config && current_cpu == "x64" && ffmpeg_branding == "ChromeOS") { - ffmpeg_asm_sources += [ "libavcodec/x86/simple_idct10.asm" ] -+if (use_linux_config && current_cpu == "x86" && ffmpeg_branding == "Chromium") { - } +-} diff --git a/libavcodec/autorename_libavcodec_blockdsp.c b/libavcodec/autorename_libavcodec_blockdsp.c -index e579e6919a..7b28471c4f 100644 +index 37775cf9ad..dc1298f61e 100644 --- a/libavcodec/autorename_libavcodec_blockdsp.c +++ b/libavcodec/autorename_libavcodec_blockdsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "blockdsp.c" diff --git a/libavcodec/autorename_libavcodec_flacdsp.c b/libavcodec/autorename_libavcodec_flacdsp.c -index 048558d800..e55d54b9b2 100644 +index 4cfa65b024..fdee454723 100644 --- a/libavcodec/autorename_libavcodec_flacdsp.c +++ b/libavcodec/autorename_libavcodec_flacdsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "flacdsp.c" diff --git a/libavcodec/autorename_libavcodec_hpeldsp.c b/libavcodec/autorename_libavcodec_hpeldsp.c -index 313c933880..c1ce58ad53 100644 +index 256241cac7..5080f1896f 100644 --- a/libavcodec/autorename_libavcodec_hpeldsp.c +++ b/libavcodec/autorename_libavcodec_hpeldsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "hpeldsp.c" diff --git a/libavcodec/autorename_libavcodec_idctdsp.c b/libavcodec/autorename_libavcodec_idctdsp.c -index be85b91df7..7c0f5d6c5c 100644 +index 9541dd60f5..54cec181fb 100644 --- a/libavcodec/autorename_libavcodec_idctdsp.c +++ b/libavcodec/autorename_libavcodec_idctdsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "idctdsp.c" diff --git a/libavcodec/autorename_libavcodec_me_cmp.c b/libavcodec/autorename_libavcodec_me_cmp.c -index fb2b54f224..9a0d0db04d 100644 +index e9bbcf227c..3525739921 100644 --- a/libavcodec/autorename_libavcodec_me_cmp.c +++ b/libavcodec/autorename_libavcodec_me_cmp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "me_cmp.c" diff --git a/libavcodec/autorename_libavcodec_mpeg4videodsp.c b/libavcodec/autorename_libavcodec_mpeg4videodsp.c -index 4877ef6fbc..c73c9f906d 100644 +index 2c5dab85ae..773b478aab 100644 --- a/libavcodec/autorename_libavcodec_mpeg4videodsp.c +++ b/libavcodec/autorename_libavcodec_mpeg4videodsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "mpeg4videodsp.c" diff --git a/libavcodec/autorename_libavcodec_mpegaudiodsp.c b/libavcodec/autorename_libavcodec_mpegaudiodsp.c -index 100f2df188..a12725bb73 100644 +index 2ab3d655f2..20632ffff0 100644 --- a/libavcodec/autorename_libavcodec_mpegaudiodsp.c +++ b/libavcodec/autorename_libavcodec_mpegaudiodsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "mpegaudiodsp.c" diff --git a/libavcodec/autorename_libavcodec_mpegvideo.c b/libavcodec/autorename_libavcodec_mpegvideo.c -index 8a8275821c..8ab374905f 100644 +index ac316fc2b5..66101d6699 100644 --- a/libavcodec/autorename_libavcodec_mpegvideo.c +++ b/libavcodec/autorename_libavcodec_mpegvideo.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "mpegvideo.c" diff --git a/libavcodec/autorename_libavcodec_qpeldsp.c b/libavcodec/autorename_libavcodec_qpeldsp.c -index 998a11e0d7..65b727ee2d 100644 +index 8edf104bb9..3fb14bded7 100644 --- a/libavcodec/autorename_libavcodec_qpeldsp.c +++ b/libavcodec/autorename_libavcodec_qpeldsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "qpeldsp.c" diff --git a/libavcodec/autorename_libavcodec_sbrdsp.c b/libavcodec/autorename_libavcodec_sbrdsp.c -index 446c0da9ae..dbeae4df83 100644 +index 3133530f46..06df082d55 100644 --- a/libavcodec/autorename_libavcodec_sbrdsp.c +++ b/libavcodec/autorename_libavcodec_sbrdsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "sbrdsp.c" diff --git a/libavcodec/autorename_libavcodec_videodsp.c b/libavcodec/autorename_libavcodec_videodsp.c -index 121552a1b5..e78e6519c9 100644 +index 1acdfeaa91..db892fb4d3 100644 --- a/libavcodec/autorename_libavcodec_videodsp.c +++ b/libavcodec/autorename_libavcodec_videodsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "videodsp.c" diff --git a/libavcodec/autorename_libavcodec_vorbisdsp.c b/libavcodec/autorename_libavcodec_vorbisdsp.c -index d01a0a77e4..70419aa9c7 100644 +index a27bc974a2..0e8130a9cd 100644 --- a/libavcodec/autorename_libavcodec_vorbisdsp.c +++ b/libavcodec/autorename_libavcodec_vorbisdsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "vorbisdsp.c" -diff --git a/libavcodec/autorename_libavcodec_vp3dsp.c b/libavcodec/autorename_libavcodec_vp3dsp.c -new file mode 100644 -index 0000000000..80fa040324 ---- /dev/null -+++ b/libavcodec/autorename_libavcodec_vp3dsp.c -@@ -0,0 +1,2 @@ -+// File automatically generated. See crbug.com/495833. -+#include "vp3dsp.c" -diff --git a/libavcodec/autorename_libavcodec_vp8dsp.c b/libavcodec/autorename_libavcodec_vp8dsp.c -new file mode 100644 -index 0000000000..c1d387efc5 ---- /dev/null -+++ b/libavcodec/autorename_libavcodec_vp8dsp.c -@@ -0,0 +1,2 @@ -+// File automatically generated. See crbug.com/495833. -+#include "vp8dsp.c" diff --git a/libavcodec/autorename_libavcodec_xvididct.c b/libavcodec/autorename_libavcodec_xvididct.c -index 08c09a6aba..9b39b0261f 100644 +index 5ec9c3ecaf..26c0cd7cc4 100644 --- a/libavcodec/autorename_libavcodec_xvididct.c +++ b/libavcodec/autorename_libavcodec_xvididct.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "xvididct.c" diff --git a/libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c b/libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c new file mode 100644 -index 0000000000..5a9970813a +index 0000000000..4d77f455d1 --- /dev/null +++ b/libavcodec/x86/autorename_libavcodec_x86_aacpsdsp_init.c @@ -0,0 +1,2 @@ -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. +#include "aacpsdsp_init.c" diff --git a/libavcodec/x86/autorename_libavcodec_x86_blockdsp_init.c b/libavcodec/x86/autorename_libavcodec_x86_blockdsp_init.c new file mode 100644 -index 0000000000..938544e1da +index 0000000000..73eeaa3520 --- /dev/null +++ b/libavcodec/x86/autorename_libavcodec_x86_blockdsp_init.c @@ -0,0 +1,2 @@ -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. +#include "blockdsp_init.c" diff --git a/libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c b/libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c new file mode 100644 -index 0000000000..f04b064b8e +index 0000000000..96153f8de0 --- /dev/null +++ b/libavcodec/x86/autorename_libavcodec_x86_flacdsp_init.c @@ -0,0 +1,2 @@ -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. +#include "flacdsp_init.c" diff --git a/libavcodec/x86/autorename_libavcodec_x86_idctdsp_init.c b/libavcodec/x86/autorename_libavcodec_x86_idctdsp_init.c new file mode 100644 -index 0000000000..59b761ea53 +index 0000000000..1a5ed28040 --- /dev/null +++ b/libavcodec/x86/autorename_libavcodec_x86_idctdsp_init.c @@ -0,0 +1,2 @@ -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. +#include "idctdsp_init.c" diff --git a/libavcodec/x86/autorename_libavcodec_x86_me_cmp_init.c b/libavcodec/x86/autorename_libavcodec_x86_me_cmp_init.c new file mode 100644 -index 0000000000..935b66694b +index 0000000000..f073752c2f --- /dev/null +++ b/libavcodec/x86/autorename_libavcodec_x86_me_cmp_init.c @@ -0,0 +1,2 @@ -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. +#include "me_cmp_init.c" diff --git a/libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c b/libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c new file mode 100644 -index 0000000000..3c2a0a6777 +index 0000000000..0b7dbac0be --- /dev/null +++ b/libavcodec/x86/autorename_libavcodec_x86_sbrdsp_init.c @@ -0,0 +1,2 @@ -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. +#include "sbrdsp_init.c" diff --git a/libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c b/libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c -index 0735a35f49..9b7ba1a905 100644 +index 833761f114..c5859308cc 100644 --- a/libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c +++ b/libavcodec/x86/autorename_libavcodec_x86_vorbisdsp_init.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "vorbisdsp_init.c" diff --git a/libavformat/autorename_libavformat_aacdec.c b/libavformat/autorename_libavformat_aacdec.c -index 39e22150ed..2daf1364f7 100644 +index 0c9ad2046c..4e514a8ffa 100644 --- a/libavformat/autorename_libavformat_aacdec.c +++ b/libavformat/autorename_libavformat_aacdec.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "aacdec.c" diff --git a/libavformat/autorename_libavformat_flacdec.c b/libavformat/autorename_libavformat_flacdec.c -index 71057daff7..8722a5da49 100644 +index 3325bc78dd..e1ba91a6f0 100644 --- a/libavformat/autorename_libavformat_flacdec.c +++ b/libavformat/autorename_libavformat_flacdec.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "flacdec.c" diff --git a/libavformat/autorename_libavformat_options.c b/libavformat/autorename_libavformat_options.c -index 9fee753c87..624e949c34 100644 +index b8cd3554b1..c6b2e8e82c 100644 --- a/libavformat/autorename_libavformat_options.c +++ b/libavformat/autorename_libavformat_options.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "options.c" diff --git a/libavformat/autorename_libavformat_pcm.c b/libavformat/autorename_libavformat_pcm.c -index 31b67afc7a..223b90970a 100644 +index 331271414b..3d3682211a 100644 --- a/libavformat/autorename_libavformat_pcm.c +++ b/libavformat/autorename_libavformat_pcm.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "pcm.c" diff --git a/libavformat/autorename_libavformat_utils.c b/libavformat/autorename_libavformat_utils.c -index d3e5345ca9..92ea36420e 100644 +index 502d3eef51..e5cb601ada 100644 --- a/libavformat/autorename_libavformat_utils.c +++ b/libavformat/autorename_libavformat_utils.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "utils.c" diff --git a/libavformat/autorename_libavformat_version.c b/libavformat/autorename_libavformat_version.c -index 6155a58eae..db47fc66ae 100644 +index 478ab3dd6c..59621683e8 100644 --- a/libavformat/autorename_libavformat_version.c +++ b/libavformat/autorename_libavformat_version.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "version.c" diff --git a/libavutil/autorename_libavutil_cpu.c b/libavutil/autorename_libavutil_cpu.c -index 87ebd66a66..470f1bec23 100644 +index eed4e41119..13952770e0 100644 --- a/libavutil/autorename_libavutil_cpu.c +++ b/libavutil/autorename_libavutil_cpu.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "cpu.c" diff --git a/libavutil/autorename_libavutil_fixed_dsp.c b/libavutil/autorename_libavutil_fixed_dsp.c -index d696c4cb41..bdaa6abbe7 100644 +index 3269c76ce2..00cda42a1c 100644 --- a/libavutil/autorename_libavutil_fixed_dsp.c +++ b/libavutil/autorename_libavutil_fixed_dsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "fixed_dsp.c" diff --git a/libavutil/autorename_libavutil_float_dsp.c b/libavutil/autorename_libavutil_float_dsp.c -index 030c2c1241..fa8fe5511d 100644 +index 31647db6a2..f87c32e105 100644 --- a/libavutil/autorename_libavutil_float_dsp.c +++ b/libavutil/autorename_libavutil_float_dsp.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "float_dsp.c" diff --git a/libavutil/autorename_libavutil_imgutils.c b/libavutil/autorename_libavutil_imgutils.c -index c0b3398e81..ebf885f7c0 100644 +index 6e2b38f4f9..0b90d98c24 100644 --- a/libavutil/autorename_libavutil_imgutils.c +++ b/libavutil/autorename_libavutil_imgutils.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "imgutils.c" diff --git a/libavutil/autorename_libavutil_tx_float.c b/libavutil/autorename_libavutil_tx_float.c -index 4ef4e40971..43b0b479d3 100644 +index 2770a4209d..3c334220c9 100644 --- a/libavutil/autorename_libavutil_tx_float.c +++ b/libavutil/autorename_libavutil_tx_float.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "tx_float.c" diff --git a/libavutil/autorename_libavutil_utils.c b/libavutil/autorename_libavutil_utils.c -index d3e5345ca9..92ea36420e 100644 +index 502d3eef51..e5cb601ada 100644 --- a/libavutil/autorename_libavutil_utils.c +++ b/libavutil/autorename_libavutil_utils.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "utils.c" diff --git a/libavutil/autorename_libavutil_version.c b/libavutil/autorename_libavutil_version.c -index 6155a58eae..db47fc66ae 100644 +index 478ab3dd6c..59621683e8 100644 --- a/libavutil/autorename_libavutil_version.c +++ b/libavutil/autorename_libavutil_version.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "version.c" -diff --git a/libavutil/riscv/autorename_libavutil_riscv_cpu.c b/libavutil/riscv/autorename_libavutil_riscv_cpu.c -new file mode 100644 -index 0000000000..3adbdc6f77 ---- /dev/null -+++ b/libavutil/riscv/autorename_libavutil_riscv_cpu.c -@@ -0,0 +1,2 @@ -+// File automatically generated. See crbug.com/495833. -+#include "cpu.c" diff --git a/libavutil/x86/autorename_libavutil_x86_cpu.c b/libavutil/x86/autorename_libavutil_x86_cpu.c -index 87ebd66a66..470f1bec23 100644 +index eed4e41119..13952770e0 100644 --- a/libavutil/x86/autorename_libavutil_x86_cpu.c +++ b/libavutil/x86/autorename_libavutil_x86_cpu.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "cpu.c" diff --git a/libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c b/libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c new file mode 100644 -index 0000000000..974923274d +index 0000000000..2da5d8fbc6 --- /dev/null +++ b/libavutil/x86/autorename_libavutil_x86_fixed_dsp_init.c @@ -0,0 +1,2 @@ -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. +#include "fixed_dsp_init.c" diff --git a/libavutil/x86/autorename_libavutil_x86_float_dsp_init.c b/libavutil/x86/autorename_libavutil_x86_float_dsp_init.c -index 14819a3ec3..d0fb6b1b9f 100644 +index 8ff6957a45..f9d33fb74e 100644 --- a/libavutil/x86/autorename_libavutil_x86_float_dsp_init.c +++ b/libavutil/x86/autorename_libavutil_x86_float_dsp_init.c @@ -1,2 +1,2 @@ --// Automatically generated on Tue Feb 27 20:14:43 2024. See crbug.com/495833. -+// Automatically generated on Tue Apr 16 05:57:55 2024. See crbug.com/495833. +-// Automatically generated on Fri Apr 12 21:45:27 2024. See crbug.com/495833. ++// Automatically generated on Tue Jun 11 04:42:57 2024. See crbug.com/495833. #include "float_dsp_init.c" -- 2.39.2 diff --git a/patches/swiftshader/.patches b/patches/swiftshader/.patches index 9b2b76b9f192a..462d6fe67775e 100644 --- a/patches/swiftshader/.patches +++ b/patches/swiftshader/.patches @@ -1,3 +1 @@ 0001-Default-to-use-llvm16.patch -0002-fix-debug-build-with-llvm-16.patch -0003-split-source-files-with-the-same-case-insensentive-n.patch diff --git a/patches/swiftshader/0002-fix-debug-build-with-llvm-16.patch b/patches/swiftshader/0002-fix-debug-build-with-llvm-16.patch deleted file mode 100644 index 4f969e252d5dc..0000000000000 --- a/patches/swiftshader/0002-fix-debug-build-with-llvm-16.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 6f9db931d089ae4d6f7d3e827deea0cd74353a42 Mon Sep 17 00:00:00 2001 -From: kxxt -Date: Thu, 1 Feb 2024 16:35:04 +0800 -Subject: [PATCH 2/3] fix debug build with llvm 16 - -More source files are needed when building swiftshader_reactor_llvm_unittests -in debug mode. - -Fix https://ci.chromium.org/ui/p/chromium/builders/try/linux_chromium_compile_dbg_ng/1886655/overview -Change-Id: I40aa51880bf72b3e562575e184d98e8f12e88dd6 ---- - third_party/llvm-16.0/Android.bp | 1 + - third_party/llvm-16.0/BUILD.gn | 11 +++++++++++ - third_party/llvm-16.0/scripts/generate_build_files.py | 2 ++ - third_party/llvm-16.0/scripts/template_BUILD.gn | 10 ++++++++++ - 4 files changed, 24 insertions(+) - -diff --git a/third_party/llvm-16.0/Android.bp b/third_party/llvm-16.0/Android.bp -index b2832f8c2..02c015c48 100644 ---- a/third_party/llvm-16.0/Android.bp -+++ b/third_party/llvm-16.0/Android.bp -@@ -1533,5 +1533,6 @@ cc_library_static { - - srcs: [ - "llvm/lib/Analysis/RegionPrinter.cpp", -+ "llvm/lib/MC/MCDisassembler/MCDisassembler.cpp", - ], - } -diff --git a/third_party/llvm-16.0/BUILD.gn b/third_party/llvm-16.0/BUILD.gn -index 13f5cc365..f5bde4040 100644 ---- a/third_party/llvm-16.0/BUILD.gn -+++ b/third_party/llvm-16.0/BUILD.gn -@@ -158,6 +158,10 @@ swiftshader_llvm_source_set("swiftshader_llvm") { - - ] - -+ if (is_debug) { -+ deps += [ ":swiftshader_llvm_debug" ] -+ } -+ - if (current_cpu == "arm64") { - deps += [ ":swiftshader_llvm_aarch64" ] - } else if (current_cpu == "arm") { -@@ -1270,6 +1274,13 @@ swiftshader_llvm_source_set("swiftshader_llvm_source_set_1") { - } - - -+swiftshader_llvm_source_set("swiftshader_llvm_debug") { -+ sources = [ -+ "llvm/lib/Analysis/RegionPrinter.cpp", -+ "llvm/lib/MC/MCDisassembler/MCDisassembler.cpp", -+ ] -+} -+ - swiftshader_llvm_source_set("swiftshader_llvm_aarch64") { - sources = [ - "llvm/lib/CodeGen/MultiHazardRecognizer.cpp", -diff --git a/third_party/llvm-16.0/scripts/generate_build_files.py b/third_party/llvm-16.0/scripts/generate_build_files.py -index f6690a670..2e4dc7398 100755 ---- a/third_party/llvm-16.0/scripts/generate_build_files.py -+++ b/third_party/llvm-16.0/scripts/generate_build_files.py -@@ -361,6 +361,7 @@ files_llvm.extend(files_to_add_back_for_llvm) - - files_llvm_debug = [ - "/lib/Analysis/RegionPrinter.cpp", -+ "/lib/MC/MCDisassembler/MCDisassembler.cpp", - ] - - files_to_add_back_for_llvm_arm = [ -@@ -496,6 +497,7 @@ build_gn_template_data = { - 'files_Mips' : format_file_list_for_build_gn(files_Mips), - 'files_PowerPC' : format_file_list_for_build_gn(files_PowerPC), - 'files_RISCV' : format_file_list_for_build_gn(files_RISCV), -+ 'files_llvm_debug': format_file_list_for_build_gn(files_llvm_debug), - } - with open(BUILD_GN_TEMPLATE_PATH, 'r') as f: - build_gn_template = CustomTemplate(f.read()) -diff --git a/third_party/llvm-16.0/scripts/template_BUILD.gn b/third_party/llvm-16.0/scripts/template_BUILD.gn -index 72c21f5dd..313147085 100644 ---- a/third_party/llvm-16.0/scripts/template_BUILD.gn -+++ b/third_party/llvm-16.0/scripts/template_BUILD.gn -@@ -156,6 +156,10 @@ swiftshader_llvm_source_set("swiftshader_llvm") { - %$%llvm_deps - ] - -+ if (is_debug) { -+ deps += [ ":swiftshader_llvm_debug" ] -+ } -+ - if (current_cpu == "arm64") { - deps += [ ":swiftshader_llvm_aarch64" ] - } else if (current_cpu == "arm") { -@@ -186,6 +190,12 @@ swiftshader_llvm_source_set("swiftshader_llvm") { - # split out into their own source_set. - %$%llvm_source_sets - -+swiftshader_llvm_source_set("swiftshader_llvm_debug") { -+ sources = [ -+%$%files_llvm_debug -+ ] -+} -+ - swiftshader_llvm_source_set("swiftshader_llvm_aarch64") { - sources = [ - %$%files_AArch64 --- -2.43.0 - diff --git a/patches/swiftshader/0003-split-source-files-with-the-same-case-insensentive-n.patch b/patches/swiftshader/0003-split-source-files-with-the-same-case-insensentive-n.patch deleted file mode 100644 index 239d3988feee6..0000000000000 --- a/patches/swiftshader/0003-split-source-files-with-the-same-case-insensentive-n.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 074033033ae526b8544110ace455a28d2e76ae2c Mon Sep 17 00:00:00 2001 -From: kxxt -Date: Thu, 1 Feb 2024 17:38:17 +0800 -Subject: [PATCH 3/3] split source files with the same case-insensentive name - into different source sets - -Avoids mapping llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp and -llvm/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp to the same object file -on a case-insensitive file system. - -Might fix https://logs.chromium.org/logs/chromium/buildbucket/cr-buildbucket/8757315701829357889/+/u/compile__with_patch_/raw_io.output_text_failure_summary_ - -Change-Id: I4595c69993bd9accb7496f67044ccae6201e0343 ---- - third_party/llvm-16.0/BUILD.gn | 6 +++--- - third_party/llvm-16.0/scripts/generate_build_files.py | 3 ++- - 2 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/third_party/llvm-16.0/BUILD.gn b/third_party/llvm-16.0/BUILD.gn -index f5bde4040..c6bd34bae 100644 ---- a/third_party/llvm-16.0/BUILD.gn -+++ b/third_party/llvm-16.0/BUILD.gn -@@ -617,7 +617,6 @@ swiftshader_llvm_source_set("swiftshader_llvm_source_set_0") { - "llvm/lib/DebugInfo/DWARF/DWARFAbbreviationDeclaration.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFAddressRange.cpp", -- "llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFContext.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFDataExtractor.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFDebugAbbrev.cpp", -@@ -633,13 +632,11 @@ swiftshader_llvm_source_set("swiftshader_llvm_source_set_0") { - "llvm/lib/DebugInfo/DWARF/DWARFDebugRangeList.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFDebugRnglists.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFDie.cpp", -- "llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFFormValue.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFGdbIndex.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFListTable.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFTypePrinter.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFTypeUnit.cpp", -- "llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFUnitIndex.cpp", - "llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp", - "llvm/lib/Demangle/DLangDemangle.cpp", -@@ -1260,6 +1257,9 @@ swiftshader_llvm_source_set("swiftshader_llvm_source_set_0") { - } - swiftshader_llvm_source_set("swiftshader_llvm_source_set_1") { - sources = [ -+ "llvm/lib/DebugInfo/DWARF/DWARFCompileUnit.cpp", -+ "llvm/lib/DebugInfo/DWARF/DWARFExpression.cpp", -+ "llvm/lib/DebugInfo/DWARF/DWARFUnit.cpp", - "llvm/lib/ExecutionEngine/JITLink/COFF.cpp", - "llvm/lib/ExecutionEngine/JITLink/MachO.cpp", - "llvm/lib/IRPrinter/IRPrintingPasses.cpp", -diff --git a/third_party/llvm-16.0/scripts/generate_build_files.py b/third_party/llvm-16.0/scripts/generate_build_files.py -index 2e4dc7398..63dae3ecd 100755 ---- a/third_party/llvm-16.0/scripts/generate_build_files.py -+++ b/third_party/llvm-16.0/scripts/generate_build_files.py -@@ -447,7 +447,8 @@ def get_filename(path): - def partition_paths(filepaths): - partitions = [] - for path in filepaths: -- filename = get_filename(path) -+ # Convert to lower case to support case-insensitive filesystem -+ filename = get_filename(path).lower() - inserted = False - for partition in partitions: - if not filename in partition: --- -2.43.0 - diff --git a/patches/v8/.patches b/patches/v8/.patches index fdafa30ff9871..207920bcb6b3a 100644 --- a/patches/v8/.patches +++ b/patches/v8/.patches @@ -2,5 +2,5 @@ chore_allow_customizing_microtask_policy_per_context.patch deps_add_v8_object_setinternalfieldfornodecore.patch revert_heap_add_checks_position_info.patch revert_api_cleanup_remove_setaccessor_and_setnativedataproperty.patch -Skip-check-sv57-when-enable-pointer-compress.patch avoid-cpu-probing-in-li_ptr.patch +0001-supress-Wunused-function-in-riscv-assembler-riscv.cc.patch diff --git a/patches/v8/0001-supress-Wunused-function-in-riscv-assembler-riscv.cc.patch b/patches/v8/0001-supress-Wunused-function-in-riscv-assembler-riscv.cc.patch new file mode 100644 index 0000000000000..4ce7035c054a6 --- /dev/null +++ b/patches/v8/0001-supress-Wunused-function-in-riscv-assembler-riscv.cc.patch @@ -0,0 +1,34 @@ +From a476bff427d1fa73c3091a01b6fa1dabd68c27a5 Mon Sep 17 00:00:00 2001 +From: kxxt +Date: Tue, 11 Jun 2024 13:55:10 +0200 +Subject: [PATCH] supress -Wunused-function in riscv/assembler-riscv.cc + +Fix https://github.com/riscv-forks/electron-riscv-releases/actions/runs/9458809220/job/26054906812 +--- + src/codegen/riscv/assembler-riscv.cc | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/codegen/riscv/assembler-riscv.cc b/src/codegen/riscv/assembler-riscv.cc +index 028e01925d7..315efd14b08 100644 +--- a/src/codegen/riscv/assembler-riscv.cc ++++ b/src/codegen/riscv/assembler-riscv.cc +@@ -73,6 +73,8 @@ static unsigned CpuFeaturesImpliedByCompiler() { + return answer; + } + ++#pragma clang diagnostic push ++#pragma clang diagnostic ignored "-Wunused-function" + static unsigned SimulatorFeatures() { + unsigned answer = 0; + answer |= 1u << RISCV_SIMD; +@@ -82,6 +84,7 @@ static unsigned SimulatorFeatures() { + answer |= 1u << FPU; + return answer; + } ++#pragma clang diagnostic pop + + bool CpuFeatures::SupportsWasmSimd128() { return IsSupported(RISCV_SIMD); } + +-- +2.39.2 + diff --git a/patches/v8/Skip-check-sv57-when-enable-pointer-compress.patch b/patches/v8/Skip-check-sv57-when-enable-pointer-compress.patch deleted file mode 100644 index c7942b21636fa..0000000000000 --- a/patches/v8/Skip-check-sv57-when-enable-pointer-compress.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 6ea594ff71328c4b692b3e424a45c5caa3535f8e Mon Sep 17 00:00:00 2001 -From: Lu Yahan -Date: Sun, 07 Apr 2024 09:52:59 +0800 -Subject: [PATCH] [riscv] Skip check sv57 when enable pointer compress - -Change-Id: I4332d3849d113af105630c0e20cd2b5e3deb9392 -Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/5430889 -Commit-Queue: Ji Qiu -Reviewed-by: Ji Qiu -Cr-Commit-Position: refs/heads/main@{#93244} ---- - -diff --git a/src/codegen/riscv/assembler-riscv.cc b/src/codegen/riscv/assembler-riscv.cc -index e57f4a0..a1d5ddf 100644 ---- a/src/codegen/riscv/assembler-riscv.cc -+++ b/src/codegen/riscv/assembler-riscv.cc -@@ -83,10 +83,12 @@ - base::CPU cpu; - if (cpu.has_fpu()) supported_ |= 1u << FPU; - if (cpu.has_rvv()) supported_ |= 1u << RISCV_SIMD; -+#ifdef V8_COMPRESS_POINTERS - if (cpu.riscv_mmu() == base::CPU::RV_MMU_MODE::kRiscvSV57) { - FATAL("SV57 is not supported"); - UNIMPLEMENTED(); - } -+#endif - // Set a static value on whether SIMD is supported. - // This variable is only used for certain archs to query SupportWasmSimd128() - // at runtime in builtins using an extern ref. Other callers should use -@@ -1086,25 +1088,21 @@ - - void Assembler::li_ptr(Register rd, int64_t imm) { - base::CPU cpu; -- if (cpu.riscv_mmu() != base::CPU::RV_MMU_MODE::kRiscvSV57) { -- // Initialize rd with an address -- // Pointers are 48 bits -- // 6 fixed instructions are generated -- DCHECK_EQ((imm & 0xfff0000000000000ll), 0); -- int64_t a6 = imm & 0x3f; // bits 0:5. 6 bits -- int64_t b11 = (imm >> 6) & 0x7ff; // bits 6:11. 11 bits -- int64_t high_31 = (imm >> 17) & 0x7fffffff; // 31 bits -- int64_t high_20 = ((high_31 + 0x800) >> 12); // 19 bits -- int64_t low_12 = high_31 & 0xfff; // 12 bits -- lui(rd, (int32_t)high_20); -- addi(rd, rd, low_12); // 31 bits in rd. -- slli(rd, rd, 11); // Space for next 11 bis -- ori(rd, rd, b11); // 11 bits are put in. 42 bit in rd -- slli(rd, rd, 6); // Space for next 6 bits -- ori(rd, rd, a6); // 6 bits are put in. 48 bis in rd -- } else { -- FATAL("SV57 is not supported"); -- } -+ // Initialize rd with an address -+ // Pointers are 48 bits -+ // 6 fixed instructions are generated -+ DCHECK_EQ((imm & 0xfff0000000000000ll), 0); -+ int64_t a6 = imm & 0x3f; // bits 0:5. 6 bits -+ int64_t b11 = (imm >> 6) & 0x7ff; // bits 6:11. 11 bits -+ int64_t high_31 = (imm >> 17) & 0x7fffffff; // 31 bits -+ int64_t high_20 = ((high_31 + 0x800) >> 12); // 19 bits -+ int64_t low_12 = high_31 & 0xfff; // 12 bits -+ lui(rd, (int32_t)high_20); -+ addi(rd, rd, low_12); // 31 bits in rd. -+ slli(rd, rd, 11); // Space for next 11 bis -+ ori(rd, rd, b11); // 11 bits are put in. 42 bit in rd -+ slli(rd, rd, 6); // Space for next 6 bits -+ ori(rd, rd, a6); // 6 bits are put in. 48 bis in rd - } - - void Assembler::li_constant(Register rd, int64_t imm) {