diff options
| author | Robert Nagy <robert@openbsd.org> | 2022-10-05 12:43:40 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2022-10-30 11:39:57 +0000 |
| commit | e242807dc3e83adc698ccddc1666da9f691a063f (patch) | |
| tree | 5cb7c5dd47bb4d4028343d18b26a30554471a64d | |
| parent | edc257dd229fbed06f136c8845e0606ca8131e7b (diff) | |
| download | ports-e242807dc3e83adc698ccddc1666da9f691a063f.tar.gz ports-e242807dc3e83adc698ccddc1666da9f691a063f.zip | |
www/iridium: update to 2022.10.106
(cherry picked from commit 10116752aea618e3a66a1b539fbed6f882534081)
795 files changed, 12175 insertions, 14762 deletions
diff --git a/www/iridium/Makefile b/www/iridium/Makefile index 5721873952a6..d97ef304ab11 100644 --- a/www/iridium/Makefile +++ b/www/iridium/Makefile @@ -1,6 +1,5 @@ PORTNAME= iridium -PORTVERSION= 2022.04.100.0 -PORTREVISION= 6 +PORTVERSION= 2022.10.106 CATEGORIES= www wayland MASTER_SITES= https://downloads.iridiumbrowser.de/source/ PKGNAMESUFFIX= -browser @@ -15,6 +14,9 @@ LICENSE_COMB= multi ONLY_FOR_ARCHS= aarch64 amd64 i386 +PATCH_SITES= https://raw.githubusercontent.com/ungoogled-software/ungoogled-chromium/master/patches/core/ungoogled-chromium/ +PATCHFILES+= disable-privacy-sandbox.patch:-p1 + BUILD_DEPENDS= bash:shells/bash \ ${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR} \ @@ -64,8 +66,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ RUN_DEPENDS= xdg-open:devel/xdg-utils \ noto-basic>0:x11-fonts/noto-basic -USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome jpeg localbase:ldflags \ - ninja perl5 pkgconfig python:3.7+,build shebangfix tar:xz xorg +USES= bison compiler:c++17-lang cpe desktop-file-utils gl gnome iconv jpeg \ + localbase:ldflags ninja perl5 pkgconfig python:3.7+,build shebangfix \ + tar:xz xorg CPE_VENDOR= google CPE_PRODUCT= chrome @@ -89,13 +92,13 @@ BINARY_ALIAS= python3=${PYTHON_CMD} # replace_gn_files.py script, some parts just turned on/off for target host # OS "target_os == is_bsd", like libusb, libpci. GN_ARGS+= clang_use_chrome_plugins=false \ + chrome_pgo_phase=0 \ enable_hangout_services_extension=true \ enable_js_type_check=false \ enable_nacl=false \ - enable_one_click_signin=true \ enable_remoting=false \ - enable_wmax_tokens=false \ fatal_linker_warnings=false \ + icu_use_data_file=false \ is_clang=true \ optimize_webui=true \ toolkit_views=true \ @@ -110,6 +113,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \ use_system_freetype=false \ use_system_harfbuzz=true \ use_system_libjpeg=true \ + use_system_libwayland=true \ use_system_wayland_scanner=true \ use_udev=false \ extra_cxxflags="${CXXFLAGS}" \ @@ -192,7 +196,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false IGNORE= you have selected HEIMDAL_BASE but do not have Heimdal installed in base .endif -.if ${COMPILER_VERSION} < 130 +.if ${COMPILER_VERSION} != 130 LLVM_DEFAULT= 13 BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT} BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \ @@ -234,7 +238,7 @@ pre-configure: #./build/linux/unbundle/remove_bundled_libraries.py [list of preserved] cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${PYTHON_CMD} \ ./build/linux/unbundle/replace_gn_files.py --system-libraries \ - flac fontconfig freetype harfbuzz-ng libdrm libevent libpng \ + flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \ libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE} # Iridium uses an unreleased version of FFmpeg, so configure it .for brand in Chrome Chromium @@ -278,7 +282,7 @@ do-install: .for d in protoc mksnapshot ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor -.for d in icudtl.dat snapshot_blob.bin v8_context_snapshot.bin +.for d in snapshot_blob.bin v8_context_snapshot.bin ${INSTALL_DATA} ${WRKSRC}/out/${BUILDTYPE}/${d} ${STAGEDIR}${DATADIR} .endfor ${INSTALL_PROGRAM} ${WRKSRC}/out/${BUILDTYPE}/chrome \ @@ -304,10 +308,6 @@ do-install: .if ${ARCH} != aarch64 @${MKDIR} ${STAGEDIR}${DATADIR}/swiftshader ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/libvk_swiftshader.so ${STAGEDIR}${DATADIR} -.for g in libEGL.so libGLESv2.so - ${INSTALL_LIB} ${WRKSRC}/out/${BUILDTYPE}/swiftshader/${g} \ - ${STAGEDIR}${DATADIR}/swiftshader -.endfor .endif post-install-DEBUG-on: diff --git a/www/iridium/distinfo b/www/iridium/distinfo index 4d2cc8c84a2b..2d60e811af31 100644 --- a/www/iridium/distinfo +++ b/www/iridium/distinfo @@ -1,3 +1,5 @@ -TIMESTAMP = 1648800090 -SHA256 (iridium-browser-2022.04.100.0.tar.xz) = 1a111c3ac3f50e81a3120a9936941682bb66bd5a5287d92a2ccf0158a0cf2b1e -SIZE (iridium-browser-2022.04.100.0.tar.xz) = 1323781188 +TIMESTAMP = 1664950159 +SHA256 (iridium-browser-2022.10.106.tar.xz) = ec141f4dad5b16ce8f8d30400673242932f2857d684fb67c956f10effedb1cfa +SIZE (iridium-browser-2022.10.106.tar.xz) = 1333488380 +SHA256 (disable-privacy-sandbox.patch) = 71196aab024da3db1c078e42599311e39f5e7760657461f07cc212bb17e0cd52 +SIZE (disable-privacy-sandbox.patch) = 4772 diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn index b8f84eb80257..41a0ab1bfd11 100644 --- a/www/iridium/files/patch-BUILD.gn +++ b/www/iridium/files/patch-BUILD.gn @@ -1,4 +1,4 @@ ---- BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ BUILD.gn @@ -53,7 +53,7 @@ declare_args() { root_extra_deps = [] @@ -9,7 +9,15 @@ # An official (maximally optimized!) component (optimized for build times) # build doesn't make sense and usually doesn't work. assert(!is_component_build) -@@ -452,7 +452,7 @@ group("gn_all") { +@@ -83,7 +83,6 @@ group("gn_all") { + "//codelabs", + "//components:components_unittests", + "//components/gwp_asan:gwp_asan_unittests", +- "//infra/orchestrator:orchestrator_all", + "//net:net_unittests", + "//sandbox:sandbox_unittests", + "//services:services_unittests", +@@ -441,7 +440,7 @@ group("gn_all") { ] } @@ -18,8 +26,8 @@ deps += [ "//third_party/breakpad:breakpad_unittests", "//third_party/breakpad:core-2-minidump", -@@ -636,6 +636,15 @@ group("gn_all") { - } +@@ -642,6 +641,15 @@ group("gn_all") { + deps += [ "//gpu/tools/compositor_model_bench" ] } + if (is_bsd) { @@ -34,7 +42,7 @@ if (is_mac) { deps += [ "//third_party/breakpad:crash_inspector", -@@ -685,7 +694,7 @@ group("gn_all") { +@@ -690,7 +698,7 @@ group("gn_all") { host_os == "win") { deps += [ "//chrome/test/mini_installer:mini_installer_tests" ] } @@ -43,7 +51,7 @@ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ] } -@@ -1147,7 +1156,7 @@ if (!is_ios) { +@@ -1202,7 +1210,7 @@ if (!is_ios) { data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ] } @@ -52,7 +60,7 @@ data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } -@@ -1156,7 +1165,7 @@ if (!is_ios) { +@@ -1211,7 +1219,7 @@ if (!is_ios) { data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } @@ -61,12 +69,12 @@ data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ] } -@@ -1531,7 +1540,7 @@ group("chromium_builder_perf") { +@@ -1654,7 +1662,7 @@ group("chromium_builder_perf") { + data_deps += [ "//chrome/test:performance_browser_tests" ] + } - if (is_win) { - data_deps += [ "//chrome/installer/mini_installer:mini_installer" ] -- } else { -+ } else if (!is_bsd) { +- if (!is_win) { ++ if (!is_win && !is_bsd) { data_deps += [ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ] } diff --git a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc index 0105a9cf775f..244858d6b195 100644 --- a/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc +++ b/www/iridium/files/patch-apps_ui_views_app__window__frame__view.cc @@ -1,6 +1,6 @@ ---- apps/ui/views/app_window_frame_view.cc.orig 2022-03-28 18:11:04 UTC +--- apps/ui/views/app_window_frame_view.cc.orig 2022-10-05 07:34:01 UTC +++ apps/ui/views/app_window_frame_view.cc -@@ -138,7 +138,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient +@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient gfx::Rect window_bounds = client_bounds; // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn index 4d25c3a44f39..ae3b1f61ce44 100644 --- a/www/iridium/files/patch-base_BUILD.gn +++ b/www/iridium/files/patch-base_BUILD.gn @@ -1,15 +1,24 @@ ---- base/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- base/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ base/BUILD.gn -@@ -999,7 +999,7 @@ mixed_component("base") { +@@ -162,7 +162,7 @@ buildflag_header("ios_cronet_buildflags") { + flags = [ "CRONET_BUILD=$is_cronet_build" ] + } + +-enable_message_pump_epoll = is_linux || is_chromeos || is_android ++enable_message_pump_epoll = (is_linux || is_chromeos || is_android) && !is_bsd + buildflag_header("message_pump_buildflags") { + header = "message_pump_buildflags.h" + header_dir = "base/message_loop" +@@ -1031,7 +1031,7 @@ mixed_component("base") { "timer/hi_res_timer_manager_posix.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "cpu_affinity_posix.cc", - "cpu_affinity_posix.h", -@@ -1010,6 +1010,12 @@ mixed_component("base") { + "profiler/stack_copier_signal.cc", + "profiler/stack_copier_signal.h", +@@ -1040,6 +1040,12 @@ mixed_component("base") { "profiler/thread_delegate_posix.h", ] } @@ -22,12 +31,12 @@ } if (is_win) { -@@ -1478,11 +1484,23 @@ mixed_component("base") { +@@ -1541,11 +1547,23 @@ mixed_component("base") { + # Needed for <atomic> if using newer C++ library than sysroot, except if # building inside the cros_sdk environment - use host_toolchain as a # more robust check for this. - if (!use_sysroot && -- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) && -+ (is_android || ((is_linux || is_chromeos) && !is_chromecast && !is_bsd)) && +- if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) && ++ if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) && host_toolchain != "//build/toolchain/cros:host") { libs += [ "atomic" ] } @@ -47,7 +56,7 @@ if (use_allocator_shim) { sources += [ "allocator/allocator_shim.cc", -@@ -1506,7 +1524,7 @@ mixed_component("base") { +@@ -1573,7 +1591,7 @@ mixed_component("base") { ] configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ] } @@ -56,22 +65,22 @@ sources += [ "allocator/allocator_shim_override_cpp_symbols.h", "allocator/allocator_shim_override_glibc_weak_symbols.h", -@@ -1563,7 +1581,7 @@ mixed_component("base") { +@@ -1629,7 +1647,7 @@ mixed_component("base") { + # Allow more direct string conversions on platforms with native utf8 # strings - # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos -- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) { -+ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) { +- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) { ++ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -2243,6 +2261,42 @@ mixed_component("base") { +@@ -2211,6 +2229,42 @@ mixed_component("base") { } } + if (is_bsd) { + sources -= [ -+ "files/file_path_watcher_linux.cc", ++ "files/file_path_watcher_inotify.cc", + "files/file_util_linux.cc", + "files/scoped_file_linux.cc", + "process/memory_linux.cc", @@ -108,7 +117,16 @@ # iOS if (is_ios) { sources -= [ -@@ -3495,7 +3549,7 @@ test("base_unittests") { +@@ -2310,7 +2364,7 @@ mixed_component("base") { + } + + if (dep_libevent) { +- deps += [ "//third_party/libevent" ] ++ public_deps += [ "//third_party/libevent" ] + } + + if (use_libevent) { +@@ -3545,7 +3599,7 @@ test("base_unittests") { } } @@ -117,25 +135,25 @@ sources += [ "debug/proc_maps_linux_unittest.cc", "files/scoped_file_linux_unittest.cc", -@@ -3543,7 +3597,7 @@ test("base_unittests") { +@@ -3593,7 +3647,7 @@ test("base_unittests") { + "posix/file_descriptor_shuffle_unittest.cc", "posix/unix_domain_socket_unittest.cc", - "task/thread_pool/task_tracker_posix_unittest.cc", ] - if (!is_nacl && !is_apple) { + if (!is_nacl && !is_apple && !is_bsd) { sources += [ - "cpu_affinity_posix_unittest.cc", "profiler/stack_copier_signal_unittest.cc", -@@ -3555,7 +3609,7 @@ test("base_unittests") { + "profiler/thread_delegate_posix_unittest.cc", +@@ -3603,7 +3657,7 @@ test("base_unittests") { + # Allow more direct string conversions on platforms with native utf8 # strings - # TODO(crbug/1052397): Consider replacing is_ash with is_chromeos once lacros switches to target_os=chromeos -- if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia) { -+ if (is_apple || is_chromeos_ash || is_chromecast || is_fuchsia || is_bsd) { +- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) { ++ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) { defines += [ "SYSTEM_NATIVE_UTF8" ] } -@@ -3724,7 +3778,7 @@ test("base_unittests") { +@@ -3791,7 +3845,7 @@ test("base_unittests") { } } diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h index c222fc029502..bd62431db8a9 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_address__space__randomization.h @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/address_space_randomization.h @@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) { @@ -9,3 +9,12 @@ // We shouldn't allocate system pages at all for sanitizer builds. However, // we do, and if random hint addresses interfere with address ranges +@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) { + return AslrAddress(0x20000000ULL); + } + +- #elif BUILDFLAG(IS_LINUX) ++ #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + // Linux on arm64 can use 39, 42, 48, or 52-bit user space, depending on + // page size and number of levels of translation pages used. We use diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h index a9fd643b0800..92e7ce5dca0a 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h @@ -1,9 +1,9 @@ ---- base/allocator/partition_allocator/page_allocator.h.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/page_allocator.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/page_allocator.h -@@ -194,7 +194,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr - // Whether decommitted memory is guaranteed to be zeroed when it is +@@ -206,7 +206,7 @@ void DecommitAndZeroSystemPages(void* address, size_t // recommitted. Do not assume that this will not change over time. - constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZeroed() { + constexpr PA_COMPONENT_EXPORT( + PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() { -#if BUILDFLAG(IS_APPLE) +#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) return false; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h new file mode 100644 index 000000000000..6b5bc2f5fecf --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h @@ -0,0 +1,38 @@ +--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/page_allocator_constants.h +@@ -25,7 +25,7 @@ + // elimination. + #define PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR __attribute__((const)) + +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // This should work for all POSIX (if needed), but currently all other + // supported OS/architecture combinations use either hard-coded values + // (such as x86) or have means to determine these values without needing +@@ -81,7 +81,7 @@ PageAllocationGranularityShift() { + return 14; // 16kB + #elif BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS) + return static_cast<size_t>(vm_page_shift); +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // arm64 supports 4kb (shift = 12), 16kb (shift = 14), and 64kb (shift = 16) + // page sizes. Retrieve from or initialize cache. + size_t shift = page_characteristics.shift.load(std::memory_order_relaxed); +@@ -102,7 +102,7 @@ PageAllocationGranularity() { + // This is literally equivalent to |1 << PageAllocationGranularityShift()| + // below, but was separated out for IS_APPLE to avoid << on a non-constexpr. + return vm_page_size; +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // arm64 supports 4kb, 16kb, and 64kb page sizes. Retrieve from or + // initialize cache. + size_t size = page_characteristics.size.load(std::memory_order_relaxed); +@@ -141,7 +141,7 @@ SystemPageShift() { + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t + SystemPageSize() { + #if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ +- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) + // This is literally equivalent to |1 << SystemPageShift()| below, but was + // separated out for 64-bit IS_APPLE and arm64 on Linux to avoid << on a + // non-constexpr. diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h index 59f1794594a5..7e2fb6dea88e 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-04-01 07:48:30 UTC +--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/page_allocator_internals_posix.h -@@ -352,8 +352,12 @@ bool TryRecommitSystemPagesInternal( +@@ -347,8 +347,12 @@ bool TryRecommitSystemPagesInternal( void DiscardSystemPagesInternal(uintptr_t address, size_t length) { void* ptr = reinterpret_cast<void*>(address); diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc new file mode 100644 index 000000000000..7a16a6f85476 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_address_space.cc +@@ -238,7 +238,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT + setup_.configurable_pool_ = 0; + } + +-#if BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + + PageCharacteristics page_characteristics; + diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc index cafa2b6ed793..5ffea8d69797 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.cc @@ -1,15 +1,17 @@ ---- base/allocator/partition_allocator/partition_alloc.cc.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/partition_alloc.cc.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/partition_alloc.cc -@@ -56,7 +56,12 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me +@@ -63,8 +63,14 @@ void PartitionAllocGlobalInit(OomFunction on_out_of_me "maximum direct mapped allocation"); // Check that some of our zanier calculations worked out as expected. +#if defined(__i386__) && defined(OS_FREEBSD) + // alignof(std::max_align_t) is only 4 on FreeBSD/i386 -+ static_assert(kSmallestBucket >= kAlignment, "generic smallest bucket"); ++ static_assert(internal::kSmallestBucket >= internal::kAlignment, ++ "generic smallest bucket"); +#else - static_assert(kSmallestBucket == kAlignment, "generic smallest bucket"); + static_assert(internal::kSmallestBucket == internal::kAlignment, + "generic smallest bucket"); +#endif - static_assert(kMaxBucketed == 917504, "generic max bucketed"); + static_assert(internal::kMaxBucketed == 917504, "generic max bucketed"); STATIC_ASSERT_OR_PA_CHECK( - MaxSystemPagesPerRegularSlotSpan() <= 16, + internal::MaxSystemPagesPerRegularSlotSpan() <= 16, diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc new file mode 100644 index 000000000000..27caa9d573a3 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc @@ -0,0 +1,13 @@ +--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc +@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) { + if (getentropy(output, output_length) == 0) { + return; + } ++#elif BUILDFLAG(IS_BSD) ++ if (getentropy(output, output_length) == 0) { ++ return; ++ } + #endif + + // If the OS-specific mechanisms didn't work, fall through to reading from diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h new file mode 100644 index 000000000000..314a3557e860 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h +@@ -10,7 +10,7 @@ + + namespace partition_alloc::internal::base::internal { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Current thread id is cached in thread local storage for performance reasons. + // In some rare cases it's important to invalidate that cache explicitly (e.g. + // after going through clone() syscall which does not call pthread_atfork() diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc new file mode 100644 index 000000000000..44ffb0c58ade --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc @@ -0,0 +1,11 @@ +--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc +@@ -17,7 +17,7 @@ + #include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h" + #include "build/build_config.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <sys/syscall.h> + #include <atomic> + #endif diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h index 4a1da70acf5a..00bceb14ac93 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-04-01 07:48:30 UTC +--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/partition_alloc_config.h -@@ -59,7 +59,7 @@ static_assert(sizeof(void*) != 8, ""); +@@ -76,7 +76,7 @@ static_assert(sizeof(void*) != 8, ""); // POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific // features such as futex(2). @@ -9,7 +9,7 @@ #define PA_HAS_LINUX_KERNEL #endif -@@ -179,7 +179,7 @@ constexpr bool kUseLazyCommit = false; +@@ -195,7 +195,7 @@ constexpr bool kUseLazyCommit = false; // On these platforms, lock all the partitions before fork(), and unlock after. // This may be required on more platforms in the future. @@ -18,3 +18,12 @@ #define PA_HAS_ATFORK_HANDLER #endif +@@ -235,7 +235,7 @@ constexpr bool kUseLazyCommit = false; + // + // Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to + // larger slot spans. +-#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) ++#if BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) || BUILDFLAG(IS_BSD) + #define PA_PREFER_SMALLER_SLOT_SPANS + #endif // BUILDFLAG(IS_LINUX) || (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) + diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h new file mode 100644 index 000000000000..847dbd39091e --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h @@ -0,0 +1,20 @@ +--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_alloc_constants.h +@@ -91,7 +91,7 @@ PartitionPageShift() { + return 18; // 256 KiB + } + #elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \ +- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64)) + PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t + PartitionPageShift() { + return PageAllocationGranularityShift() + 2; +@@ -270,7 +270,7 @@ constexpr size_t kNumPools = 3; + // Special-case Android and iOS, which incur test failures with larger + // GigaCage. Regardless, allocating >8GiB with malloc() on these platforms is + // unrealistic as of 2022. +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_BSD) + constexpr size_t kPoolMaxSize = 8 * kGiB; + #else + constexpr size_t kPoolMaxSize = 16 * kGiB; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h index d508f6fa4eec..3b248067a37d 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/partition_page.h.orig 2022-04-01 07:48:30 UTC +--- base/allocator/partition_allocator/partition_page.h.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/partition_page.h -@@ -128,7 +128,8 @@ struct __attribute__((packed)) SlotSpanMetadata { +@@ -131,13 +131,14 @@ struct SlotSpanMetadata { PartitionBucket<thread_safe>* const bucket = nullptr; // CHECK()ed in AllocNewSlotSpan(). @@ -10,7 +10,14 @@ // System page size is not a constant on Apple OSes, but is either 4 or 16kiB // (1 << 12 or 1 << 14), as checked in PartitionRoot::Init(). And // PartitionPageSize() is 4 times the OS page size. -@@ -142,7 +143,9 @@ struct __attribute__((packed)) SlotSpanMetadata { + static constexpr size_t kMaxSlotsPerSlotSpan = + 4 * (1 << 14) / kSmallestBucket; +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is + // currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code, + // so we use the 16 kiB maximum (64 kiB will crash). +@@ -151,7 +152,9 @@ struct SlotSpanMetadata { #endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE) // The maximum number of bits needed to cover all currently supported OSes. static constexpr size_t kMaxSlotsPerSlotSpanBits = 13; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc new file mode 100644 index 000000000000..96b13ce784d5 --- /dev/null +++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc @@ -0,0 +1,38 @@ +--- base/allocator/partition_allocator/partition_root.cc.orig 2022-10-05 07:34:01 UTC ++++ base/allocator/partition_allocator/partition_root.cc +@@ -33,7 +33,7 @@ + #include "wow64apiset.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <pthread.h> + #endif + +@@ -230,7 +230,7 @@ void PartitionAllocMallocInitOnce() { + if (!g_global_init_called.compare_exchange_strong(expected, true)) + return; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // When fork() is called, only the current thread continues to execute in the + // child process. If the lock is held, but *not* by this thread when fork() is + // called, we have a deadlock. +@@ -321,7 +321,7 @@ static size_t PartitionPurgeSlotSpan( + constexpr size_t kMaxSlotCount = + (PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) / + MaxPurgeableSlotSize(); +-#elif BUILDFLAG(IS_APPLE) || (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64)) ++#elif BUILDFLAG(IS_APPLE) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) && defined(ARCH_CPU_ARM64)) + // It's better for slot_usage to be stack-allocated and fixed-size, which + // demands that its size be constexpr. On IS_APPLE and Linux on arm64, + // PartitionPageSize() is always SystemPageSize() << 2, so regardless of +@@ -709,7 +709,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions + // apple OSes. + PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) || + (internal::SystemPageSize() == (size_t{1} << 14))); +-#elif BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64) ++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64) + // Check runtime pagesize. Though the code is currently the same, it is + // not merged with the IS_APPLE case above as a 1 << 16 case needs to be + // added here in the future, to allow 64 kiB pagesize. That is only diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.h deleted file mode 100644 index 7c08bb141fe9..000000000000 --- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.h +++ /dev/null @@ -1,11 +0,0 @@ ---- base/allocator/partition_allocator/partition_root.h.orig 2022-04-01 07:48:30 UTC -+++ base/allocator/partition_allocator/partition_root.h -@@ -1071,7 +1071,7 @@ ALWAYS_INLINE void PartitionRoot<thread_safe>::FreeNoH - // essentially). - #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && \ - ((BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMECAST)) || \ -- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_64_BITS))) -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_64_BITS))) - PA_CHECK(IsManagedByPartitionAlloc(object_addr)); - #endif - diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc b/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc index f675fd1534c0..d5db4456a6fe 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc @@ -1,6 +1,6 @@ ---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/spinning_mutex.cc -@@ -17,7 +17,15 @@ +@@ -18,7 +18,15 @@ #if defined(PA_HAS_LINUX_KERNEL) #include <errno.h> @@ -16,7 +16,7 @@ #include <sys/syscall.h> #include <unistd.h> #endif // defined(PA_HAS_LINUX_KERNEL) -@@ -85,8 +93,13 @@ void SpinningMutex::FutexWait() { +@@ -107,8 +115,13 @@ void SpinningMutex::FutexWait() { // |kLockedContended| anymore. Note that even without spurious wakeups, the // value of |state_| is not guaranteed when this returns, as another thread // may get the lock before we get to run. @@ -30,7 +30,7 @@ if (err) { // These are programming error, check them. -@@ -98,8 +111,14 @@ void SpinningMutex::FutexWait() { +@@ -120,8 +133,14 @@ void SpinningMutex::FutexWait() { void SpinningMutex::FutexWake() { int saved_errno = errno; diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc b/www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc index 6868d146b140..7e8ee0d6a651 100644 --- a/www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc +++ b/www/iridium/files/patch-base_allocator_partition__allocator_starscan_stack_stack.cc @@ -1,4 +1,4 @@ ---- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-03-28 18:11:04 UTC +--- base/allocator/partition_allocator/starscan/stack/stack.cc.orig 2022-10-05 07:34:01 UTC +++ base/allocator/partition_allocator/starscan/stack/stack.cc @@ -17,6 +17,10 @@ #include <pthread.h> @@ -11,7 +11,7 @@ #if defined(LIBC_GLIBC) extern "C" void* __libc_stack_end; #endif -@@ -48,6 +52,36 @@ void* GetStackTop() { +@@ -47,6 +51,36 @@ void* GetStackTop() { void* GetStackTop() { return pthread_get_stackaddr_np(pthread_self()); diff --git a/www/iridium/files/patch-base_atomicops.h b/www/iridium/files/patch-base_atomicops.h index 5796114dc6eb..77c162f67733 100644 --- a/www/iridium/files/patch-base_atomicops.h +++ b/www/iridium/files/patch-base_atomicops.h @@ -1,6 +1,6 @@ ---- base/atomicops.h.orig 2022-03-28 18:11:04 UTC +--- base/atomicops.h.orig 2022-10-05 07:34:01 UTC +++ base/atomicops.h -@@ -57,7 +57,11 @@ typedef intptr_t Atomic64; +@@ -56,7 +56,11 @@ typedef intptr_t Atomic64; // Use AtomicWord for a machine-sized pointer. It will use the Atomic32 or // Atomic64 routines below, depending on your architecture. diff --git a/www/iridium/files/patch-base_base__paths__posix.cc b/www/iridium/files/patch-base_base__paths__posix.cc index 987a604ae0ae..afa431009616 100644 --- a/www/iridium/files/patch-base_base__paths__posix.cc +++ b/www/iridium/files/patch-base_base__paths__posix.cc @@ -1,4 +1,4 @@ ---- base/base_paths_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/base_paths_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/base_paths_posix.cc @@ -15,6 +15,7 @@ #include <ostream> @@ -84,10 +84,10 @@ + kvm_close(kd); + if (!ret) { +#endif -+ if ((cpath = getenv("IRIDIUM_EXE_PATH")) != NULL) ++ if ((cpath = getenv("CHROME_EXE_PATH")) != NULL) + *result = FilePath(cpath); + else -+ *result = FilePath("/usr/local/iridium/iridium"); ++ *result = FilePath("/usr/local/chrome/chrome"); + return true; +#if !BUILDFLAG(IS_AIX) + } diff --git a/www/iridium/files/patch-base_base__switches.cc b/www/iridium/files/patch-base_base__switches.cc index 0a4df69fd3ee..a1d655c5e642 100644 --- a/www/iridium/files/patch-base_base__switches.cc +++ b/www/iridium/files/patch-base_base__switches.cc @@ -1,4 +1,4 @@ ---- base/base_switches.cc.orig 2022-03-28 18:11:04 UTC +--- base/base_switches.cc.orig 2022-10-05 07:34:01 UTC +++ base/base_switches.cc @@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria @@ -6,6 +6,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Controls whether or not retired instruction counts are surfaced for threads - // in trace events on Linux. - // + // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when + // Crashpad is fully enabled on Linux. Indicates that Crashpad should be + // enabled. diff --git a/www/iridium/files/patch-base_base__switches.h b/www/iridium/files/patch-base_base__switches.h index 6852515855b3..044813bf69bc 100644 --- a/www/iridium/files/patch-base_base__switches.h +++ b/www/iridium/files/patch-base_base__switches.h @@ -1,4 +1,4 @@ ---- base/base_switches.h.orig 2022-03-28 18:11:04 UTC +--- base/base_switches.h.orig 2022-10-05 07:34:01 UTC +++ base/base_switches.h @@ -60,7 +60,7 @@ extern const char kEnableIdleTracing[]; extern const char kForceFieldTrialParams[]; @@ -6,6 +6,6 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - extern const char kEnableThreadInstructionCount[]; - // TODO(crbug.com/1176772): Remove kEnableCrashpad and IsCrashpadEnabled() when + // Crashpad is fully enabled on Linux. + extern const char kEnableCrashpad[]; diff --git a/www/iridium/files/patch-base_debug_debugger__posix.cc b/www/iridium/files/patch-base_debug_debugger__posix.cc index 0bbf28da9814..76478dfc3fd1 100644 --- a/www/iridium/files/patch-base_debug_debugger__posix.cc +++ b/www/iridium/files/patch-base_debug_debugger__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/debugger_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/debug/debugger_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/debug/debugger_posix.cc -@@ -36,6 +36,10 @@ +@@ -35,6 +35,10 @@ #include <sys/sysctl.h> #endif @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_FREEBSD) #include <sys/user.h> #endif -@@ -96,32 +100,51 @@ bool BeingDebugged() { +@@ -95,32 +99,51 @@ bool BeingDebugged() { // Caution: struct kinfo_proc is marked __APPLE_API_UNSTABLE. The source and // binary interfaces may change. @@ -24,7 +24,7 @@ +#endif #if BUILDFLAG(IS_OPENBSD) - if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) return -1; mib[5] = (info_size / sizeof(struct kinfo_proc)); @@ -34,11 +34,11 @@ + return being_debugged; + } + -+ int sysctl_result = sysctl(mib, base::size(mib), info, &info_size, NULL, 0); ++ int sysctl_result = sysctl(mib, std::size(mib), info, &info_size, NULL, 0); #endif +#if !BUILDFLAG(IS_OPENBSD) - int sysctl_result = sysctl(mib, base::size(mib), &info, &info_size, NULL, 0); + int sysctl_result = sysctl(mib, std::size(mib), &info, &info_size, NULL, 0); +#endif DCHECK_EQ(sysctl_result, 0); if (sysctl_result != 0) { diff --git a/www/iridium/files/patch-base_debug_elf__reader.cc b/www/iridium/files/patch-base_debug_elf__reader.cc index 7f943f061d64..5c597a968c16 100644 --- a/www/iridium/files/patch-base_debug_elf__reader.cc +++ b/www/iridium/files/patch-base_debug_elf__reader.cc @@ -1,6 +1,6 @@ ---- base/debug/elf_reader.cc.orig 2022-03-28 18:11:04 UTC +--- base/debug/elf_reader.cc.orig 2022-10-05 07:34:01 UTC +++ base/debug/elf_reader.cc -@@ -76,6 +76,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -78,6 +78,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, bool found = false; while (current_section < section_end) { current_note = reinterpret_cast<const Nhdr*>(current_section); @@ -8,11 +8,11 @@ if (current_note->n_type == NT_GNU_BUILD_ID) { StringPiece note_name(current_section + sizeof(Nhdr), current_note->n_namesz); -@@ -85,6 +86,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, +@@ -87,6 +88,7 @@ size_t ReadElfBuildId(const void* elf_mapped_base, break; } } +#endif - size_t section_size = bits::AlignUp(current_note->n_namesz, 4) + - bits::AlignUp(current_note->n_descsz, 4) + + size_t section_size = bits::AlignUp(current_note->n_namesz, 4u) + + bits::AlignUp(current_note->n_descsz, 4u) + diff --git a/www/iridium/files/patch-base_debug_stack__trace__posix.cc b/www/iridium/files/patch-base_debug_stack__trace__posix.cc index fa26b7473e45..a4b5269bca67 100644 --- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc +++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc @@ -1,6 +1,6 @@ ---- base/debug/stack_trace_posix.cc.orig 2022-04-01 07:48:30 UTC +--- base/debug/stack_trace_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/debug/stack_trace_posix.cc -@@ -38,7 +38,7 @@ +@@ -39,7 +39,7 @@ #include <AvailabilityMacros.h> #endif @@ -9,7 +9,7 @@ #include "base/debug/proc_maps_linux.h" #endif -@@ -695,6 +695,9 @@ class SandboxSymbolizeHelper { +@@ -698,6 +698,9 @@ class SandboxSymbolizeHelper { // for the modules that are loaded in the current process. // Returns true on success. bool CacheMemoryRegions() { @@ -19,7 +19,7 @@ // Reads /proc/self/maps. std::string contents; if (!ReadProcMaps(&contents)) { -@@ -712,6 +715,7 @@ class SandboxSymbolizeHelper { +@@ -715,6 +718,7 @@ class SandboxSymbolizeHelper { is_initialized_ = true; return true; @@ -27,7 +27,7 @@ } // Opens all object files and caches their file descriptors. -@@ -868,7 +872,7 @@ size_t CollectStackTrace(void** trace, size_t count) { +@@ -871,7 +875,7 @@ size_t CollectStackTrace(void** trace, size_t count) { // If we do not have unwind tables, then try tracing using frame pointers. return base::debug::TraceStackFramePointers(const_cast<const void**>(trace), count, 0); @@ -35,4 +35,4 @@ +#elif !defined(__UCLIBC__) && !defined(_AIX) && !BUILDFLAG(IS_BSD) // Though the backtrace API man page does not list any possible negative // return values, we take no chance. - return base::saturated_cast<size_t>(backtrace(trace, count)); + return base::saturated_cast<size_t>( diff --git a/www/iridium/files/patch-base_files_dir__reader__linux.h b/www/iridium/files/patch-base_files_dir__reader__linux.h new file mode 100644 index 000000000000..e119fcf240de --- /dev/null +++ b/www/iridium/files/patch-base_files_dir__reader__linux.h @@ -0,0 +1,39 @@ +--- base/files/dir_reader_linux.h.orig 2022-10-05 07:34:01 UTC ++++ base/files/dir_reader_linux.h +@@ -16,10 +16,16 @@ + #include "base/logging.h" + #include "base/posix/eintr_wrapper.h" + ++#include "build/build_config.h" ++ + // See the comments in dir_reader_posix.h about this. + + namespace base { + ++#if BUILDFLAG(IS_BSD) ++#include <dirent.h> ++typedef struct dirent linux_dirent; ++#else + struct linux_dirent { + uint64_t d_ino; + int64_t d_off; +@@ -27,6 +33,7 @@ struct linux_dirent { + unsigned char d_type; + char d_name[0]; + }; ++#endif + + class DirReaderLinux { + public: +@@ -61,7 +68,11 @@ class DirReaderLinux { + if (offset_ != size_) + return true; + ++#if BUILDFLAG(IS_BSD) ++ const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_)); ++#else + const long r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_)); ++#endif + if (r == 0) + return false; + if (r < 0) { diff --git a/www/iridium/files/patch-base_files_dir__reader__posix.h b/www/iridium/files/patch-base_files_dir__reader__posix.h new file mode 100644 index 000000000000..ade769e0df79 --- /dev/null +++ b/www/iridium/files/patch-base_files_dir__reader__posix.h @@ -0,0 +1,20 @@ +--- base/files/dir_reader_posix.h.orig 2022-10-05 07:34:01 UTC ++++ base/files/dir_reader_posix.h +@@ -17,7 +17,7 @@ + // seems worse than falling back to enumerating all file descriptors so we will + // probably never implement this on the Mac. + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "base/files/dir_reader_linux.h" + #else + #include "base/files/dir_reader_fallback.h" +@@ -25,7 +25,7 @@ + + namespace base { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + typedef DirReaderLinux DirReaderPosix; + #else + typedef DirReaderFallback DirReaderPosix; diff --git a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc index dab339e36609..ffb671dbc74b 100644 --- a/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc +++ b/www/iridium/files/patch-base_files_file__path__watcher__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_path_watcher_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/files/file_path_watcher_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/files/file_path_watcher_unittest.cc -@@ -450,7 +450,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) { +@@ -498,7 +498,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) { VLOG(1) << "Waiting for file1 creation"; ASSERT_TRUE(WaitForEvents()); @@ -9,7 +9,7 @@ // Mac implementation does not detect files modified in a directory. ASSERT_TRUE(WriteFile(file1, "content v2")); VLOG(1) << "Waiting for file1 modification"; -@@ -1038,7 +1038,7 @@ enum Permission { +@@ -1118,7 +1118,7 @@ enum Permission { Execute }; @@ -18,7 +18,7 @@ bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) { struct stat stat_buf; -@@ -1069,7 +1069,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi +@@ -1149,7 +1149,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi } #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-base_files_file__util__posix.cc b/www/iridium/files/patch-base_files_file__util__posix.cc index aeefc0cf196d..45679a464d08 100644 --- a/www/iridium/files/patch-base_files_file__util__posix.cc +++ b/www/iridium/files/patch-base_files_file__util__posix.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/files/file_util_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/files/file_util_posix.cc -@@ -694,32 +694,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p +@@ -700,32 +700,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p File::Error* error) { ScopedBlockingCall scoped_blocking_call( FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir(). @@ -21,29 +21,29 @@ } // Iterate through the parents and create the missing ones. - for (auto i = subpaths.rbegin(); i != subpaths.rend(); ++i) { -- if (DirectoryExists(*i)) + for (const FilePath& subpath : base::Reversed(subpaths)) { +- if (DirectoryExists(subpath)) - continue; -- if (mkdir(i->value().c_str(), 0700) == 0) +- if (mkdir(subpath.value().c_str(), 0700) == 0) - continue; - // Mkdir failed, but it might have failed with EEXIST, or some other error - // due to the directory appearing out of thin air. This can occur if - // two processes are trying to create the same file system tree at the same - // time. Check to see if it exists and make sure it is a directory. - int saved_errno = errno; -- if (!DirectoryExists(*i)) { +- if (!DirectoryExists(subpath)) { - if (error) - *error = File::OSErrorToFileError(saved_errno); - return false; -+ if (!PathExists(*i)) { -+ if ((mkdir(i->value().c_str(), 0700) == -1) && -+ ((full_path != *i) ? (errno != ENOENT) : (-1))) { ++ if (!PathExists(subpath)) { ++ if ((mkdir(subpath.value().c_str(), 0700) == -1) && ++ ((full_path != subpath) ? (errno != ENOENT) : (-1))) { + int saved_errno = errno; + if (error) + *error = File::OSErrorToFileError(saved_errno); + return false; + } -+ } else if (!DirectoryExists(*i)) { ++ } else if (!DirectoryExists(subpath)) { + if (error) + *error = File::OSErrorToFileError(ENOTDIR); + return false; diff --git a/www/iridium/files/patch-base_files_file__util__unittest.cc b/www/iridium/files/patch-base_files_file__util__unittest.cc index 2bd4cf512707..68bd0ae78688 100644 --- a/www/iridium/files/patch-base_files_file__util__unittest.cc +++ b/www/iridium/files/patch-base_files_file__util__unittest.cc @@ -1,6 +1,6 @@ ---- base/files/file_util_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/files/file_util_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/files/file_util_unittest.cc -@@ -3524,7 +3524,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { +@@ -3522,7 +3522,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) { } #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) { FilePath file_path("/proc/cpuinfo"); std::string data = "temp"; -@@ -4240,7 +4240,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles +@@ -4245,7 +4245,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles NULL); #else size_t bytes_written = diff --git a/www/iridium/files/patch-base_i18n_icu__util.cc b/www/iridium/files/patch-base_i18n_icu__util.cc index 536e41c3e974..e3900550db39 100644 --- a/www/iridium/files/patch-base_i18n_icu__util.cc +++ b/www/iridium/files/patch-base_i18n_icu__util.cc @@ -1,20 +1,20 @@ ---- base/i18n/icu_util.cc.orig 2022-03-28 18:11:04 UTC +--- base/i18n/icu_util.cc.orig 2022-10-05 07:34:01 UTC +++ base/i18n/icu_util.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ + #include "third_party/icu/source/common/unicode/unistr.h" #endif - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ -- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - !BUILDFLAG(IS_CHROMECAST)) +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) #include "third_party/icu/source/i18n/unicode/timezone.h" #endif -@@ -346,7 +346,7 @@ void InitializeIcuTimeZone() { +@@ -325,7 +325,7 @@ void InitializeIcuTimeZone() { FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization(); icu::TimeZone::adoptDefault( icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id))); --#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \ -+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \ - !BUILDFLAG(IS_CHROMECAST) +-#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) // To respond to the time zone change properly, the default time zone // cache in ICU has to be populated on starting up. + // See TimeZoneMonitorLinux::NotifyClientsFromImpl(). diff --git a/www/iridium/files/patch-base_linux__util.cc b/www/iridium/files/patch-base_linux__util.cc index ffc58a7c8655..a0b489c99eab 100644 --- a/www/iridium/files/patch-base_linux__util.cc +++ b/www/iridium/files/patch-base_linux__util.cc @@ -1,4 +1,4 @@ ---- base/linux_util.cc.orig 2022-03-28 18:11:04 UTC +--- base/linux_util.cc.orig 2022-10-05 07:34:01 UTC +++ base/linux_util.cc @@ -15,6 +15,7 @@ @@ -6,9 +6,9 @@ #include <memory> +#include <sstream> + #include "base/base_export.h" #include "base/files/dir_reader_posix.h" - #include "base/files/file_util.h" -@@ -134,6 +135,9 @@ void SetLinuxDistro(const std::string& distro) { +@@ -135,6 +136,9 @@ void SetLinuxDistro(const std::string& distro) { } bool GetThreadsForProcess(pid_t pid, std::vector<pid_t>* tids) { @@ -18,7 +18,7 @@ // 25 > strlen("/proc//task") + strlen(std::to_string(INT_MAX)) + 1 = 22 char buf[25]; strings::SafeSPrintf(buf, "/proc/%d/task", pid); -@@ -153,6 +157,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t +@@ -152,6 +156,7 @@ bool GetThreadsForProcess(pid_t pid, std::vector<pid_t } return true; diff --git a/www/iridium/files/patch-base_logging__unittest.cc b/www/iridium/files/patch-base_logging__unittest.cc index 85ee7bd1233a..3f34caa60e49 100644 --- a/www/iridium/files/patch-base_logging__unittest.cc +++ b/www/iridium/files/patch-base_logging__unittest.cc @@ -1,4 +1,4 @@ ---- base/logging_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/logging_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/logging_unittest.cc @@ -32,7 +32,7 @@ #include "base/posix/eintr_wrapper.h" @@ -9,7 +9,7 @@ #include <ucontext.h> #endif -@@ -552,14 +552,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo +@@ -574,14 +574,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo // need the arch-specific boilerplate below, which is inspired by breakpad. // At the same time, on OSX, ucontext.h is deprecated but si_addr works fine. uintptr_t crash_addr = 0; diff --git a/www/iridium/files/patch-base_memory_discardable__memory.cc b/www/iridium/files/patch-base_memory_discardable__memory.cc index fa94ad078f00..6a302b8004a6 100644 --- a/www/iridium/files/patch-base_memory_discardable__memory.cc +++ b/www/iridium/files/patch-base_memory_discardable__memory.cc @@ -1,6 +1,6 @@ ---- base/memory/discardable_memory.cc.orig 2022-03-28 18:11:04 UTC +--- base/memory/discardable_memory.cc.orig 2022-10-05 07:34:01 UTC +++ base/memory/discardable_memory.cc -@@ -24,7 +24,7 @@ const base::Feature kMadvFreeDiscardableMemory{ +@@ -25,7 +25,7 @@ const base::Feature kMadvFreeDiscardableMemory{ "MadvFreeDiscardableMemory", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ const base::Feature kDiscardableMemoryBackingTrial{ "DiscardableMemoryBackingTrial", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -49,7 +49,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> +@@ -50,7 +50,7 @@ const base::FeatureParam<DiscardableMemoryTrialGroup> namespace { @@ -18,7 +18,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { DiscardableMemoryTrialGroup trial_group = -@@ -68,7 +68,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { +@@ -69,7 +69,7 @@ DiscardableMemoryBacking GetBackingForFieldTrial() { } // namespace @@ -27,7 +27,7 @@ // Probe capabilities of this device to determine whether we should participate // in the discardable memory backing trial. -@@ -98,7 +98,7 @@ DiscardableMemory::DiscardableMemory() = default; +@@ -99,7 +99,7 @@ DiscardableMemory::DiscardableMemory() = default; DiscardableMemory::~DiscardableMemory() = default; DiscardableMemoryBacking GetDiscardableMemoryBacking() { diff --git a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc index 2bcb51efe8aa..efa72b318679 100644 --- a/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc +++ b/www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc @@ -1,6 +1,6 @@ ---- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/memory/madv_free_discardable_memory_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/memory/madv_free_discardable_memory_posix.cc -@@ -294,6 +294,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT +@@ -295,6 +295,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT bool MadvFreeDiscardableMemoryPosix::IsResident() const { DFAKE_SCOPED_RECURSIVE_LOCK(thread_collision_warner_); @@ -11,7 +11,7 @@ #if BUILDFLAG(IS_APPLE) std::vector<char> vec(allocated_pages_); #else -@@ -309,6 +313,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons +@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons return false; } return true; diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h index c5e43cd552c7..5cfb8d4a0d78 100644 --- a/www/iridium/files/patch-base_memory_platform__shared__memory__region.h +++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region.h @@ -1,15 +1,15 @@ ---- base/memory/platform_shared_memory_region.h.orig 2022-03-28 18:11:04 UTC +--- base/memory/platform_shared_memory_region.h.orig 2022-10-05 07:34:01 UTC +++ base/memory/platform_shared_memory_region.h -@@ -23,7 +23,7 @@ - #include "base/files/scoped_file.h" - #endif +@@ -16,7 +16,7 @@ + + #include <stdint.h> -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) namespace content { class SandboxIPCHandler; } -@@ -116,7 +116,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE }; @@ -18,7 +18,7 @@ // Structure to limit access to executable region creation. struct ExecutableRegion { private: -@@ -263,7 +263,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { +@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion { CheckPlatformHandlePermissionsCorrespondToMode); static PlatformSharedMemoryRegion Create(Mode mode, size_t size diff --git a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc index 62629e981c66..7de0fcfe7f22 100644 --- a/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc +++ b/www/iridium/files/patch-base_memory_platform__shared__memory__region__posix.cc @@ -1,15 +1,15 @@ ---- base/memory/platform_shared_memory_region_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/memory/platform_shared_memory_region_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/memory/platform_shared_memory_region_posix.cc -@@ -70,7 +70,7 @@ FDPair ScopedFDPair::get() const { - return {fd.get(), readonly_fd.get()}; - } +@@ -55,7 +55,7 @@ bool CheckFDAccessMode(int fd, int expected_mode) { + + } // namespace -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // static ScopedFD PlatformSharedMemoryRegion::ExecutableRegion::CreateFD(size_t size) { PlatformSharedMemoryRegion region = -@@ -204,7 +204,7 @@ bool PlatformSharedMemoryRegion::MapAtInternal(off_t o +@@ -171,7 +171,7 @@ bool PlatformSharedMemoryRegion::ConvertToUnsafe() { // static PlatformSharedMemoryRegion PlatformSharedMemoryRegion::Create(Mode mode, size_t size @@ -18,7 +18,7 @@ , bool executable #endif -@@ -233,7 +233,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: +@@ -200,7 +200,7 @@ PlatformSharedMemoryRegion PlatformSharedMemoryRegion: // flag. FilePath directory; if (!GetShmemTempDir( diff --git a/www/iridium/files/patch-base_message__loop_message__pump__glib.cc b/www/iridium/files/patch-base_message__loop_message__pump__glib.cc index a8efb5f100ef..d200475045cc 100644 --- a/www/iridium/files/patch-base_message__loop_message__pump__glib.cc +++ b/www/iridium/files/patch-base_message__loop_message__pump__glib.cc @@ -1,4 +1,4 @@ ---- base/message_loop/message_pump_glib.cc.orig 2022-03-28 18:11:04 UTC +--- base/message_loop/message_pump_glib.cc.orig 2022-10-05 07:34:01 UTC +++ base/message_loop/message_pump_glib.cc @@ -8,6 +8,11 @@ #include <glib.h> @@ -10,9 +10,9 @@ +#endif + #include "base/logging.h" + #include "base/memory/raw_ptr.h" #include "base/notreached.h" - #include "base/numerics/safe_conversions.h" -@@ -50,9 +55,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti +@@ -51,9 +56,13 @@ int GetTimeIntervalMilliseconds(TimeTicks next_task_ti } bool RunningOnMainThread() { diff --git a/www/iridium/files/patch-base_native__library__posix.cc b/www/iridium/files/patch-base_native__library__posix.cc index 13756477b102..2814e4b4b732 100644 --- a/www/iridium/files/patch-base_native__library__posix.cc +++ b/www/iridium/files/patch-base_native__library__posix.cc @@ -1,6 +1,6 @@ ---- base/native_library_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/native_library_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/native_library_posix.cc -@@ -32,7 +32,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP +@@ -33,7 +33,7 @@ NativeLibrary LoadNativeLibraryWithOptions(const FileP // http://crbug.com/17943, http://crbug.com/17557, http://crbug.com/36892, // and http://crbug.com/40794. int flags = RTLD_LAZY; diff --git a/www/iridium/files/patch-base_posix_unix__domain__socket.cc b/www/iridium/files/patch-base_posix_unix__domain__socket.cc index a7c600b307d9..833309243830 100644 --- a/www/iridium/files/patch-base_posix_unix__domain__socket.cc +++ b/www/iridium/files/patch-base_posix_unix__domain__socket.cc @@ -1,6 +1,6 @@ ---- base/posix/unix_domain_socket.cc.orig 2022-03-28 18:11:04 UTC +--- base/posix/unix_domain_socket.cc.orig 2022-10-05 07:34:01 UTC +++ base/posix/unix_domain_socket.cc -@@ -50,7 +50,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { +@@ -51,7 +51,7 @@ bool CreateSocketPair(ScopedFD* one, ScopedFD* two) { // static bool UnixDomainSocket::EnableReceiveProcessId(int fd) { @@ -9,7 +9,7 @@ const int enable = 1; return setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &enable, sizeof(enable)) == 0; #else -@@ -140,7 +140,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -149,7 +149,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, const size_t kControlBufferSize = CMSG_SPACE(sizeof(int) * kMaxFileDescriptors) @@ -18,7 +18,7 @@ // macOS does not support ucred. // macOS supports xucred, but this structure is insufficient. + CMSG_SPACE(sizeof(struct ucred)) -@@ -168,7 +168,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -177,7 +177,7 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, wire_fds = reinterpret_cast<int*>(CMSG_DATA(cmsg)); wire_fds_len = payload_len / sizeof(int); } @@ -27,7 +27,7 @@ // macOS does not support SCM_CREDENTIALS. if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS) { -@@ -202,6 +202,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, +@@ -211,6 +211,9 @@ ssize_t UnixDomainSocket::RecvMsgWithFlags(int fd, socklen_t pid_size = sizeof(pid); if (getsockopt(fd, SOL_LOCAL, LOCAL_PEERPID, &pid, &pid_size) != 0) pid = -1; diff --git a/www/iridium/files/patch-base_process_kill.h b/www/iridium/files/patch-base_process_kill.h index e66726c65dec..7f6d5b957acc 100644 --- a/www/iridium/files/patch-base_process_kill.h +++ b/www/iridium/files/patch-base_process_kill.h @@ -1,6 +1,6 @@ ---- base/process/kill.h.orig 2022-03-28 18:11:04 UTC +--- base/process/kill.h.orig 2022-10-05 07:34:01 UTC +++ base/process/kill.h -@@ -112,7 +112,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro +@@ -113,7 +113,7 @@ BASE_EXPORT TerminationStatus GetTerminationStatus(Pro BASE_EXPORT TerminationStatus GetKnownDeadTerminationStatus( ProcessHandle handle, int* exit_code); diff --git a/www/iridium/files/patch-base_process_kill__posix.cc b/www/iridium/files/patch-base_process_kill__posix.cc index 15228ccbd543..d0da11564e7c 100644 --- a/www/iridium/files/patch-base_process_kill__posix.cc +++ b/www/iridium/files/patch-base_process_kill__posix.cc @@ -1,6 +1,6 @@ ---- base/process/kill_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/kill_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/kill_posix.cc -@@ -159,7 +159,7 @@ void EnsureProcessTerminated(Process process) { +@@ -158,7 +158,7 @@ void EnsureProcessTerminated(Process process) { 0, new BackgroundReaper(std::move(process), Seconds(2))); } diff --git a/www/iridium/files/patch-base_process_launch.h b/www/iridium/files/patch-base_process_launch.h index 22aac90ca891..0edde543cab6 100644 --- a/www/iridium/files/patch-base_process_launch.h +++ b/www/iridium/files/patch-base_process_launch.h @@ -1,6 +1,6 @@ ---- base/process/launch.h.orig 2022-03-28 18:11:04 UTC +--- base/process/launch.h.orig 2022-10-05 07:34:01 UTC +++ base/process/launch.h -@@ -195,7 +195,7 @@ struct BASE_EXPORT LaunchOptions { +@@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions { bool clear_environment = false; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) diff --git a/www/iridium/files/patch-base_process_memory.cc b/www/iridium/files/patch-base_process_memory.cc index c7b047e640c0..db25f3dd4dc4 100644 --- a/www/iridium/files/patch-base_process_memory.cc +++ b/www/iridium/files/patch-base_process_memory.cc @@ -1,15 +1,6 @@ ---- base/process/memory.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/memory.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/memory.cc -@@ -65,14 +65,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) { - - } // namespace internal - -+#if !BUILDFLAG(IS_BSD) - void TerminateBecauseOutOfMemory(size_t size) { - internal::OnNoMemoryInternal(size); - } -+#endif - +@@ -29,7 +29,7 @@ namespace base { // Defined in memory_mac.mm for macOS + use_allocator="none". In case of // USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system // default calloc of macOS. diff --git a/www/iridium/files/patch-base_process_process__handle__freebsd.cc b/www/iridium/files/patch-base_process_process__handle__freebsd.cc index 097ee458c179..be6873bb2492 100644 --- a/www/iridium/files/patch-base_process_process__handle__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__handle__freebsd.cc @@ -1,12 +1,14 @@ ---- base/process/process_handle_freebsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_handle_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_handle_freebsd.cc -@@ -12,15 +12,19 @@ - #include <unistd.h> +@@ -3,6 +3,7 @@ + // found in the LICENSE file. - #include "base/cxx17_backports.h" -+#include "base/files/file_path.h" + #include "base/process/process_handle.h" ++#include "base/files/file_util.h" - namespace base { + #include <limits.h> + #include <stddef.h> +@@ -15,10 +16,13 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { struct kinfo_proc info; @@ -14,7 +16,7 @@ + size_t length = sizeof(struct kinfo_proc); int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process }; - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) + return -1; + + if (length < sizeof(struct kinfo_proc)) diff --git a/www/iridium/files/patch-base_process_process__handle__openbsd.cc b/www/iridium/files/patch-base_process_process__handle__openbsd.cc index ce55d295fe45..cfde3ae9716d 100644 --- a/www/iridium/files/patch-base_process_process__handle__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__handle__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_handle_openbsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_handle_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_handle_openbsd.cc @@ -3,8 +3,11 @@ // found in the LICENSE file. @@ -12,7 +12,7 @@ #include <sys/sysctl.h> #include <sys/types.h> #include <unistd.h> -@@ -14,39 +17,59 @@ +@@ -12,39 +15,59 @@ namespace base { ProcessId GetParentProcessId(ProcessHandle process) { @@ -23,16 +23,16 @@ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; - if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) return -1; + info = (struct kinfo_proc *)malloc(length); + mib[5] = (length / sizeof(struct kinfo_proc)); -- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return -1; -+ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) { + ppid = -1; + goto out; + } @@ -54,11 +54,11 @@ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process, sizeof(struct kinfo_proc), 0 }; -- if (sysctl(mib, base::size(mib), NULL, &len, NULL, 0) == -1) -+ if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) == -1) +- if (sysctl(mib, std::size(mib), NULL, &len, NULL, 0) == -1) ++ if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) == -1) return FilePath(); - mib[5] = (len / sizeof(struct kinfo_proc)); -- if (sysctl(mib, base::size(mib), &kp, &len, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), &kp, &len, NULL, 0) < 0) - return FilePath(); - if ((kp.p_flag & P_SYSTEM) != 0) - return FilePath(); @@ -70,7 +70,7 @@ + + mib[5] = (length / sizeof(struct kinfo_proc)); + -+ if (sysctl(mib, base::size(mib), info, &length, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), info, &length, NULL, 0) < 0) + goto out; + + if ((info->p_flag & P_SYSTEM) != 0) diff --git a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc index a319a4f0a1f2..204c3440c567 100644 --- a/www/iridium/files/patch-base_process_process__iterator__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__iterator__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_iterator_freebsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_iterator_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_iterator_freebsd.cc -@@ -21,7 +21,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -20,7 +20,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* : index_of_kinfo_proc_(), filter_(filter) { @@ -9,25 +9,25 @@ bool done = false; int try_num = 1; -@@ -40,7 +40,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -39,7 +39,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* num_of_kinfo_proc += 16; kinfo_procs_.resize(num_of_kinfo_proc); len = num_of_kinfo_proc * sizeof(struct kinfo_proc); -- if (sysctl(mib, base::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { -+ if (sysctl(mib, base::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { +- if (sysctl(mib, std::size(mib), &kinfo_procs_[0], &len, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), kinfo_procs_.data(), &len, NULL, 0) < 0) { // If we get a mem error, it just means we need a bigger buffer, so // loop around again. Anything else is a real error and give up. if (errno != ENOMEM) { -@@ -50,7 +50,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -49,7 +49,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right - size_t num_of_kinfo_proc = len / sizeof(struct kinfo_proc); -+ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); ++ num_of_kinfo_proc = len / sizeof(struct kinfo_proc); kinfo_procs_.resize(num_of_kinfo_proc); done = true; } -@@ -72,18 +72,13 @@ bool ProcessIterator::CheckForNextProcess() { +@@ -71,18 +71,13 @@ bool ProcessIterator::CheckForNextProcess() { for (; index_of_kinfo_proc_ < kinfo_procs_.size(); ++index_of_kinfo_proc_) { size_t length; struct kinfo_proc kinfo = kinfo_procs_[index_of_kinfo_proc_]; @@ -38,7 +38,7 @@ continue; - length = 0; -- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) { +- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) { - LOG(ERROR) << "failed to figure out the buffer size for a command line"; - continue; - } @@ -47,5 +47,5 @@ + data.resize(ARG_MAX); + length = ARG_MAX; - if (sysctl(mib, base::size(mib), &data[0], &length, NULL, 0) < 0) { + if (sysctl(mib, std::size(mib), &data[0], &length, NULL, 0) < 0) { LOG(ERROR) << "failed to fetch a commandline"; diff --git a/www/iridium/files/patch-base_process_process__iterator__openbsd.cc b/www/iridium/files/patch-base_process_process__iterator__openbsd.cc index 4749dc067a02..ad384cf7d963 100644 --- a/www/iridium/files/patch-base_process_process__iterator__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__iterator__openbsd.cc @@ -1,4 +1,4 @@ ---- base/process/process_iterator_openbsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_iterator_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_iterator_openbsd.cc @@ -6,6 +6,9 @@ @@ -9,8 +9,8 @@ +#include <sys/proc.h> #include <sys/sysctl.h> - #include "base/cxx17_backports.h" -@@ -19,12 +22,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter* + #include "base/logging.h" +@@ -18,12 +21,13 @@ ProcessIterator::ProcessIterator(const ProcessFilter* : index_of_kinfo_proc_(), filter_(filter) { @@ -25,7 +25,7 @@ do { size_t len = 0; -@@ -33,7 +37,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -32,7 +36,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* kinfo_procs_.resize(0); done = true; } else { @@ -34,7 +34,7 @@ // Leave some spare room for process table growth (more could show up // between when we check and now) num_of_kinfo_proc += 16; -@@ -49,7 +53,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* +@@ -48,7 +52,7 @@ ProcessIterator::ProcessIterator(const ProcessFilter* } } else { // Got the list, just make sure we're sized exactly right diff --git a/www/iridium/files/patch-base_process_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc index 9b6223182061..2398f6259a1d 100644 --- a/www/iridium/files/patch-base_process_process__metrics.cc +++ b/www/iridium/files/patch-base_process_process__metrics.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_metrics.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics.cc -@@ -18,7 +18,7 @@ namespace base { +@@ -17,7 +17,7 @@ namespace base { namespace { #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ int CalculateEventsPerSecond(uint64_t event_count, uint64_t* last_event_count, base::TimeTicks* last_calculated) { -@@ -55,7 +55,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -18,7 +18,7 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -74,7 +74,7 @@ Value SystemMetrics::ToValue() const { +@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const { Value res(Value::Type::DICTIONARY); res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); @@ -27,17 +27,17 @@ Value meminfo = memory_info_.ToValue(); Value vmstat = vmstat_info_.ToValue(); meminfo.MergeDictionary(&vmstat); -@@ -100,7 +100,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create #endif // !BUILDFLAG(IS_MAC) } -#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) -+#if !BUILDFLAG(IS_BSD) || !BUILDFLAG(IS_POSIX) ++#if !BUILDFLAG(IS_FREEBSD) double ProcessMetrics::GetPlatformIndependentCPUUsage() { TimeDelta cumulative_cpu = GetCumulativeCPUUsage(); TimeTicks time = TimeTicks::Now(); -@@ -126,7 +126,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( - #endif +@@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() { + #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h index e0e9cf4639d7..27bdfe62aaa4 100644 --- a/www/iridium/files/patch-base_process_process__metrics.h +++ b/www/iridium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2022-03-28 18:11:04 UTC +--- base/process/process_metrics.h.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics.h @@ -36,7 +36,7 @@ #endif @@ -27,8 +27,8 @@ // Resident Set Size is a Linux/Android specific memory concept. Do not // attempt to extend this to other platforms. BASE_EXPORT size_t GetResidentSetSize() const; -@@ -134,7 +134,7 @@ class BASE_EXPORT ProcessMetrics { - [[nodiscard]] TimeDelta GetCumulativeCPUUsage(); +@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics { + #endif // BUILDFLAG(IS_WIN) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) @@ -36,7 +36,7 @@ // Emits the cumulative CPU usage for all currently active threads since they // were started into the output parameter (replacing its current contents). // Threads that have already terminated will not be reported. Thus, the sum of -@@ -217,7 +217,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics { int GetOpenFdSoftLimit() const; #endif // BUILDFLAG(IS_POSIX) @@ -45,7 +45,7 @@ // Bytes of swap as reported by /proc/[pid]/status. uint64_t GetVmSwapBytes() const; -@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics { #endif // !BUILDFLAG(IS_MAC) #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -54,17 +54,27 @@ int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups); #endif #if BUILDFLAG(IS_APPLE) -@@ -249,7 +249,7 @@ class BASE_EXPORT ProcessMetrics { +@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - CPU::CoreType GetCoreType(int core_index); + CPU::CoreType GetCoreType(uint32_t core_index); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || // BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) -@@ -274,7 +274,7 @@ class BASE_EXPORT ProcessMetrics { - uint64_t last_cumulative_disk_usage_ = 0; +@@ -284,9 +284,7 @@ class BASE_EXPORT ProcessMetrics { + // Used to store the previous times and CPU usage counts so we can + // compute the CPU usage between calls. + TimeTicks last_cpu_time_; +-#if !BUILDFLAG(IS_FREEBSD) || !BUILDFLAG(IS_POSIX) + TimeDelta last_cumulative_cpu_; +-#endif + + #if BUILDFLAG(IS_WIN) + TimeTicks last_cpu_time_for_precise_cpu_usage_; +@@ -294,7 +292,7 @@ class BASE_EXPORT ProcessMetrics { + #endif #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_AIX) @@ -72,7 +82,7 @@ // Same thing for idle wakeups. TimeTicks last_idle_wakeups_time_; uint64_t last_absolute_idle_wakeups_; -@@ -317,7 +317,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de +@@ -337,7 +335,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \ @@ -81,7 +91,7 @@ // Data about system-wide memory consumption. Values are in KB. Available on // Windows, Mac, Linux, Android and Chrome OS. // -@@ -352,7 +352,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -372,7 +370,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -90,7 +100,7 @@ // This provides an estimate of available memory as described here: // https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773 // NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always -@@ -367,7 +367,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { +@@ -387,7 +385,7 @@ struct BASE_EXPORT SystemMemoryInfoKB { #endif #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -99,7 +109,7 @@ int buffers = 0; int cached = 0; int active_anon = 0; -@@ -404,7 +404,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK +@@ -424,7 +422,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -108,7 +118,7 @@ // Parse the data found in /proc/<pid>/stat and return the sum of the // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. -@@ -591,7 +591,7 @@ class BASE_EXPORT SystemMetrics { +@@ -611,7 +609,7 @@ class BASE_EXPORT SystemMetrics { FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics); size_t committed_memory_; diff --git a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc index 7b7633d05bd8..c0ed225bef18 100644 --- a/www/iridium/files/patch-base_process_process__metrics__freebsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__freebsd.cc @@ -1,6 +1,6 @@ ---- base/process/process_metrics_freebsd.cc.orig 2022-03-28 20:16:21 UTC +--- base/process/process_metrics_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics_freebsd.cc -@@ -3,21 +3,41 @@ +@@ -3,20 +3,39 @@ // found in the LICENSE file. #include "base/process/process_metrics.h" @@ -16,18 +16,16 @@ +#include <kvm.h> +#include <libutil.h> + - #include "base/cxx17_backports.h" #include "base/memory/ptr_util.h" #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" namespace base { +namespace { - +int GetPageShift() { + int pagesize = getpagesize(); + int pageshift = 0; -+ + + while (pagesize > 1) { + pageshift++; + pagesize >>= 1; @@ -44,7 +42,7 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( -@@ -27,17 +47,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create +@@ -26,17 +45,18 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create double ProcessMetrics::GetPlatformIndependentCPUUsage() { struct kinfo_proc info; @@ -52,9 +50,9 @@ - size_t length = sizeof(info); + size_t length = sizeof(struct kinfo_proc); -+ int mib[] = {CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; ++ int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_ }; + - if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) - return 0; + return 0.0; @@ -68,11 +66,11 @@ return TimeDelta(); } -@@ -68,4 +89,221 @@ size_t GetSystemCommitCharge() { +@@ -67,4 +87,221 @@ size_t GetSystemCommitCharge() { return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); } -+int GetNumberOfThreads(ProcessHandle process) { ++int64_t GetNumberOfThreads(ProcessHandle process) { + // Taken from FreeBSD top (usr.bin/top/machine.c) + + kvm_t* kd = kvm_open(NULL, "/dev/null", NULL, O_RDONLY, "kvm_open"); @@ -145,7 +143,7 @@ + + length = sizeof(total_count); + -+ if (sysctl(mib, base::size(mib), &total_count, &length, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), &total_count, &length, NULL, 0) < 0) { + total_count = -1; + } + diff --git a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc index f23c76752eb3..15b11af28d11 100644 --- a/www/iridium/files/patch-base_process_process__metrics__openbsd.cc +++ b/www/iridium/files/patch-base_process_process__metrics__openbsd.cc @@ -1,20 +1,7 @@ ---- base/process/process_metrics_openbsd.cc.orig 2022-04-01 07:48:30 UTC +--- base/process/process_metrics_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics_openbsd.cc -@@ -4,17 +4,36 @@ +@@ -6,14 +6,23 @@ - #include "base/process/process_metrics.h" - -+#include "base/files/file_util.h" -+#include "base/logging.h" -+#include "base/process/internal_linux.h" -+#include "base/strings/string_number_conversions.h" -+#include "base/strings/string_split.h" -+#include "base/strings/string_tokenizer.h" -+#include "base/strings/string_util.h" -+#include "base/system/sys_info.h" -+#include "base/threading/thread_restrictions.h" -+#include "base/notreached.h" -+ #include <stddef.h> #include <stdint.h> +#include <fcntl.h> @@ -24,10 +11,10 @@ +#include <kvm.h> + - #include "base/cxx17_backports.h" #include "base/memory/ptr_util.h" #include "base/process/process_metrics_iocounters.h" +#include "base/values.h" ++#include "base/notreached.h" namespace base { @@ -37,33 +24,34 @@ // static std::unique_ptr<ProcessMetrics> ProcessMetrics::CreateProcessMetrics( ProcessHandle process) { -@@ -25,49 +44,24 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun +@@ -24,49 +33,23 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_coun return false; } -static int GetProcessCPU(pid_t pid) { -+double ProcessMetrics::GetPlatformIndependentCPUUsage() { ++TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { struct kinfo_proc info; - size_t length; - int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, pid, - sizeof(struct kinfo_proc), 0 }; + size_t length = sizeof(struct kinfo_proc); ++ struct timeval tv; -- if (sysctl(mib, base::size(mib), NULL, &length, NULL, 0) < 0) +- if (sysctl(mib, std::size(mib), NULL, &length, NULL, 0) < 0) - return -1; + int mib[] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, process_, + sizeof(struct kinfo_proc), 1 }; - mib[5] = (length / sizeof(struct kinfo_proc)); -+ if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) -+ return 0.0; - -- if (sysctl(mib, base::size(mib), &info, &length, NULL, 0) < 0) -- return 0; - + if (sysctl(mib, std::size(mib), &info, &length, NULL, 0) < 0) +- return 0; ++ return TimeDelta(); + - return info.p_pctcpu; -+ return static_cast<double>((info.p_pctcpu * 100.0) / FSCALE); - } +-} ++ tv.tv_sec = info.p_rtime_sec; ++ tv.tv_usec = info.p_rtime_usec; -double ProcessMetrics::GetPlatformIndependentCPUUsage() { - TimeTicks time = TimeTicks::Now(); @@ -80,13 +68,14 @@ - double percentage = static_cast<double>((cpu * 100.0) / FSCALE); - - return percentage; --} -- - TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { - NOTREACHED(); - return TimeDelta(); ++ return Microseconds(TimeValToMicroseconds(tv)); } +-TimeDelta ProcessMetrics::GetCumulativeCPUUsage() { +- NOTREACHED(); +- return TimeDelta(); +-} +- -ProcessMetrics::ProcessMetrics(ProcessHandle process) - : process_(process), - last_cpu_(0) {} @@ -94,16 +83,7 @@ size_t GetSystemCommitCharge() { int mib[] = { CTL_VM, VM_METER }; int pagesize; -@@ -75,7 +69,7 @@ size_t GetSystemCommitCharge() { - unsigned long mem_total, mem_free, mem_inactive; - size_t len = sizeof(vmtotal); - -- if (sysctl(mib, base::size(mib), &vmtotal, &len, NULL, 0) < 0) -+ if (sysctl(mib, std::size(mib), &vmtotal, &len, NULL, 0) < 0) - return 0; - - mem_total = vmtotal.t_vm; -@@ -85,6 +79,129 @@ size_t GetSystemCommitCharge() { +@@ -84,6 +67,129 @@ size_t GetSystemCommitCharge() { pagesize = getpagesize(); return mem_total - (mem_free*pagesize) - (mem_inactive*pagesize); diff --git a/www/iridium/files/patch-base_process_process__metrics__posix.cc b/www/iridium/files/patch-base_process_process__metrics__posix.cc index d44f4b8d2368..265511141d4e 100644 --- a/www/iridium/files/patch-base_process_process__metrics__posix.cc +++ b/www/iridium/files/patch-base_process_process__metrics__posix.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_metrics_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_metrics_posix.cc @@ -20,6 +20,8 @@ @@ -9,7 +9,7 @@ #else #include <malloc.h> #endif -@@ -133,7 +135,7 @@ size_t ProcessMetrics::GetMallocUsage() { +@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() { return stats.size_in_use; #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) return GetMallocUsageMallinfo(); diff --git a/www/iridium/files/patch-base_process_process__metrics__unittest.cc b/www/iridium/files/patch-base_process_process__metrics__unittest.cc new file mode 100644 index 000000000000..570e0546750a --- /dev/null +++ b/www/iridium/files/patch-base_process_process__metrics__unittest.cc @@ -0,0 +1,20 @@ +--- base/process/process_metrics_unittest.cc.orig 2022-10-05 07:34:01 UTC ++++ base/process/process_metrics_unittest.cc +@@ -44,7 +44,7 @@ namespace debug { + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + + namespace { + +@@ -347,7 +347,7 @@ TEST_F(SystemMetricsTest, ParseVmstat) { + + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + + // Test that ProcessMetrics::GetPlatformIndependentCPUUsage() doesn't return + // negative values when the number of threads running on the process decreases diff --git a/www/iridium/files/patch-base_process_process__posix.cc b/www/iridium/files/patch-base_process_process__posix.cc index fad21c5cbcdd..6387e90f381e 100644 --- a/www/iridium/files/patch-base_process_process__posix.cc +++ b/www/iridium/files/patch-base_process_process__posix.cc @@ -1,6 +1,6 @@ ---- base/process/process_posix.cc.orig 2022-04-01 07:48:30 UTC +--- base/process/process_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_posix.cc -@@ -23,10 +23,15 @@ +@@ -25,10 +25,15 @@ #include "build/build_config.h" #include "third_party/abseil-cpp/absl/types/optional.h" @@ -35,7 +35,7 @@ // On Mac we can wait on non child processes. return WaitForSingleNonChildProcess(handle, timeout); #else -@@ -356,7 +361,55 @@ void Process::Exited(int exit_code) const {} +@@ -392,7 +397,55 @@ void Process::Exited(int exit_code) const { int Process::GetPriority() const { DCHECK(IsValid()); @@ -43,7 +43,7 @@ +#if defined(OS_BSD) + return 0; +#else - return getpriority(PRIO_PROCESS, process_); + return getpriority(PRIO_PROCESS, static_cast<id_t>(process_)); +#endif +} + @@ -58,14 +58,14 @@ + Time ct = Time(); + +#if !defined(OS_BSD) -+ if (sysctl(mib, base::size(mib), NULL, &info_size, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), NULL, &info_size, NULL, 0) < 0) + goto out; + + mib[5] = (info_size / sizeof(struct kinfo_proc)); + if ((info = reinterpret_cast<kinfo_proc*>(malloc(info_size))) == NULL) + goto out; + -+ if (sysctl(mib, base::size(mib), info, &info_size, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), info, &info_size, NULL, 0) < 0) + goto out; + + ct = Time::FromTimeT(info->p_ustart_sec); diff --git a/www/iridium/files/patch-base_process_process__unittest.cc b/www/iridium/files/patch-base_process_process__unittest.cc index 14d9b1c397ce..aaa7950d5119 100644 --- a/www/iridium/files/patch-base_process_process__unittest.cc +++ b/www/iridium/files/patch-base_process_process__unittest.cc @@ -1,6 +1,6 @@ ---- base/process/process_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/process/process_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/process/process_unittest.cc -@@ -140,7 +140,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { +@@ -193,7 +193,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) { // was spawned and a time recorded after it was spawned. However, since the // base::Time and process creation clocks don't match, tolerate some error. constexpr base::TimeDelta kTolerance = diff --git a/www/iridium/files/patch-base_profiler_module__cache.cc b/www/iridium/files/patch-base_profiler_module__cache.cc new file mode 100644 index 000000000000..10cb6f73f093 --- /dev/null +++ b/www/iridium/files/patch-base_profiler_module__cache.cc @@ -0,0 +1,11 @@ +--- base/profiler/module_cache.cc.orig 2022-10-05 07:34:01 UTC ++++ base/profiler/module_cache.cc +@@ -34,7 +34,7 @@ struct ModuleAddressCompare { + + std::string TransformModuleIDToBreakpadFormat(StringPiece module_id) { + std::string mangled_id(module_id); +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Linux ELF module IDs are 160bit integers, which we need to mangle + // down to 128bit integers to match the id that Breakpad outputs. + // Example on version '66.0.3359.170' x64: diff --git a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc index fa3b6e11c0cc..fd49d6fc321b 100644 --- a/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc +++ b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc @@ -1,6 +1,6 @@ ---- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-03-28 18:11:04 UTC +--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2022-10-05 07:34:01 UTC +++ base/profiler/stack_sampling_profiler_test_util.cc -@@ -32,7 +32,7 @@ +@@ -39,7 +39,7 @@ // Fortunately, it provides _alloca, which functions identically. #include <malloc.h> #define alloca _alloca diff --git a/www/iridium/files/patch-base_rand__util.h b/www/iridium/files/patch-base_rand__util.h index ec7e3e73a069..34547895ab20 100644 --- a/www/iridium/files/patch-base_rand__util.h +++ b/www/iridium/files/patch-base_rand__util.h @@ -1,11 +1,11 @@ ---- base/rand_util.h.orig 2022-04-01 07:48:30 UTC +--- base/rand_util.h.orig 2022-10-05 07:34:01 UTC +++ base/rand_util.h -@@ -81,7 +81,7 @@ void RandomShuffle(Itr first, Itr last) { +@@ -80,7 +80,7 @@ void RandomShuffle(Itr first, Itr last) { std::shuffle(first, last, RandomBitGenerator()); } -#if BUILDFLAG(IS_POSIX) -+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_OPENBSD) ++#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_BSD) BASE_EXPORT int GetUrandomFD(); #endif diff --git a/www/iridium/files/patch-base_rand__util__posix.cc b/www/iridium/files/patch-base_rand__util__posix.cc index 7fd63f41875e..7802c8f04468 100644 --- a/www/iridium/files/patch-base_rand__util__posix.cc +++ b/www/iridium/files/patch-base_rand__util__posix.cc @@ -1,7 +1,7 @@ ---- base/rand_util_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/rand_util_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/rand_util_posix.cc -@@ -17,7 +17,7 @@ - #include "base/posix/eintr_wrapper.h" +@@ -22,7 +22,7 @@ + #include "base/time/time.h" #include "build/build_config.h" -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) @@ -9,31 +9,36 @@ #include "third_party/lss/linux_syscall_support.h" #elif BUILDFLAG(IS_MAC) // TODO(crbug.com/995996): Waiting for this header to appear in the iOS SDK. -@@ -34,6 +34,7 @@ static constexpr int kOpenFlags = O_RDONLY; +@@ -39,6 +39,7 @@ static constexpr int kOpenFlags = O_RDONLY; static constexpr int kOpenFlags = O_RDONLY | O_CLOEXEC; #endif -+#if !BUILDFLAG(IS_OPENBSD) ++#if !BUILDFLAG(IS_BSD) // We keep the file descriptor for /dev/urandom around so we don't need to // reopen it (which is expensive), and since we may not even be able to reopen // it if we are later put in a sandbox. This class wraps the file descriptor so -@@ -51,6 +52,7 @@ class URandomFd { +@@ -56,10 +57,11 @@ class URandomFd { private: const int fd_; }; +#endif - } // namespace - -@@ -62,6 +64,7 @@ namespace base { + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID)) && \ +- !BUILDFLAG(IS_NACL) ++ !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) + // TODO(pasko): Unify reading kernel version numbers in: + // mojo/core/channel_linux.cc + // chrome/browser/android/seccomp_support_detector.cc +@@ -144,6 +146,7 @@ void ConfigureRandBytesFieldTrial() { // (https://chromium-review.googlesource.com/c/chromium/src/+/1545096) and land // it or some form of it. void RandBytes(void* output, size_t output_length) { -+#if !BUILDFLAG(IS_OPENBSD) - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL) - // We have to call `getrandom` via Linux Syscall Support, rather than through - // the libc wrapper, because we might not have an up-to-date libc (e.g. on -@@ -93,11 +96,16 @@ void RandBytes(void* output, size_t output_length) { ++#if !BUILDFLAG(IS_BSD) + #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ + BUILDFLAG(IS_ANDROID)) && \ + !BUILDFLAG(IS_NACL) +@@ -172,11 +175,16 @@ void RandBytes(void* output, size_t output_length) { const bool success = ReadFromFD(urandom_fd, static_cast<char*>(output), output_length); CHECK(success); @@ -42,7 +47,7 @@ +#endif } -+#if !BUILDFLAG(IS_OPENBSD) ++#if !BUILDFLAG(IS_BSD) int GetUrandomFD() { static NoDestructor<URandomFd> urandom_fd; return urandom_fd->fd(); diff --git a/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc index 4c9c6535d3a4..c3eb254f5229 100644 --- a/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc +++ b/www/iridium/files/patch-base_strings_safe__sprintf__unittest.cc @@ -1,6 +1,6 @@ ---- base/strings/safe_sprintf_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/strings/safe_sprintf_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/strings/safe_sprintf_unittest.cc -@@ -731,6 +731,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { +@@ -732,6 +732,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) { #endif } @@ -8,7 +8,7 @@ TEST(SafeSPrintfTest, EmitNULL) { char buf[40]; #if defined(__GNUC__) -@@ -747,6 +748,7 @@ TEST(SafeSPrintfTest, EmitNULL) { +@@ -748,6 +749,7 @@ TEST(SafeSPrintfTest, EmitNULL) { #pragma GCC diagnostic pop #endif } diff --git a/www/iridium/files/patch-base_synchronization_lock__impl.h b/www/iridium/files/patch-base_synchronization_lock__impl.h index 6e3d7c31cacd..18c7f2e03d90 100644 --- a/www/iridium/files/patch-base_synchronization_lock__impl.h +++ b/www/iridium/files/patch-base_synchronization_lock__impl.h @@ -1,4 +1,4 @@ ---- base/synchronization/lock_impl.h.orig 2022-03-28 18:11:04 UTC +--- base/synchronization/lock_impl.h.orig 2022-10-05 07:34:01 UTC +++ base/synchronization/lock_impl.h @@ -107,6 +107,10 @@ void LockImpl::Unlock() { } @@ -9,11 +9,11 @@ +#pragma GCC diagnostic ignored "-Wthread-safety-analysis" +#endif - BASE_EXPORT std::string SystemErrorCodeToString(int error_code); - -@@ -121,6 +125,9 @@ void LockImpl::Unlock() { - int rv = pthread_mutex_unlock(&native_handle_); - DCHECK_EQ(rv, 0) << ". " << strerror(rv); + #if DCHECK_IS_ON() + BASE_EXPORT void dcheck_trylock_result(int rv); +@@ -127,6 +131,9 @@ void LockImpl::Unlock() { + dcheck_unlock_result(rv); + #endif } +#if BUILDFLAG(IS_FREEBSD) +#pragma GCC diagnostic pop diff --git a/www/iridium/files/patch-base_system_sys__info.cc b/www/iridium/files/patch-base_system_sys__info.cc index f9e54ea0272d..3578f2ba09bc 100644 --- a/www/iridium/files/patch-base_system_sys__info.cc +++ b/www/iridium/files/patch-base_system_sys__info.cc @@ -1,11 +1,11 @@ ---- base/system/sys_info.cc.orig 2022-03-28 18:11:04 UTC +--- base/system/sys_info.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info.cc -@@ -100,7 +100,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void( - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) - base::ThreadPool::PostTaskAndReplyWithResult( - FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback)); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::ThreadPool::PostTaskAndReplyWithResult( - FROM_HERE, {base::MayBlock()}, base::BindOnce(&GetHardwareInfoSync), - std::move(callback)); +@@ -101,7 +101,7 @@ std::string SysInfo::HardwareModelName() { + #endif + + void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + constexpr base::TaskTraits kTraits = {base::MayBlock()}; + #else + constexpr base::TaskTraits kTraits = {}; diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h index d8fcacba9d2d..bd0fd5af06cf 100644 --- a/www/iridium/files/patch-base_system_sys__info.h +++ b/www/iridium/files/patch-base_system_sys__info.h @@ -1,6 +1,6 @@ ---- base/system/sys_info.h.orig 2022-03-28 18:11:04 UTC +--- base/system/sys_info.h.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info.h -@@ -212,6 +212,8 @@ class BASE_EXPORT SysInfo { +@@ -211,6 +211,8 @@ class BASE_EXPORT SysInfo { // On Desktop this returns true when memory <= 2GB. static bool IsLowEndDevice(); @@ -9,12 +9,12 @@ private: FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory); FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo); -@@ -222,7 +224,7 @@ class BASE_EXPORT SysInfo { +@@ -221,7 +223,7 @@ class BASE_EXPORT SysInfo { static HardwareInfo GetHardwareInfoSync(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_AIX) + BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - static int64_t AmountOfAvailablePhysicalMemory( + static uint64_t AmountOfAvailablePhysicalMemory( const SystemMemoryInfoKB& meminfo); #endif diff --git a/www/iridium/files/patch-base_system_sys__info__freebsd.cc b/www/iridium/files/patch-base_system_sys__info__freebsd.cc index 5b3e2081df7b..d77a0e55a002 100644 --- a/www/iridium/files/patch-base_system_sys__info__freebsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__freebsd.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_freebsd.cc.orig 2022-03-28 20:16:21 UTC +--- base/system/sys_info_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info_freebsd.cc @@ -9,30 +9,106 @@ #include <sys/sysctl.h> @@ -9,19 +9,20 @@ namespace base { +-int64_t SysInfo::AmountOfPhysicalMemoryImpl() { +- int pages, page_size; +int SysInfo::NumberOfProcessors() { + int mib[] = {CTL_HW, HW_NCPU}; + int ncpu; + size_t size = sizeof(ncpu); -+ if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) { ++ if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { + NOTREACHED(); + return 1; + } + return ncpu; +} + - int64_t SysInfo::AmountOfPhysicalMemoryImpl() { -- int pages, page_size; ++uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { + int pages, page_size, r = 0; size_t size = sizeof(pages); - sysctlbyname("vm.stats.vm.v_page_count", &pages, &size, NULL, 0); @@ -37,11 +38,12 @@ NOTREACHED(); return 0; } +- return static_cast<int64_t>(pages) * page_size; + - return static_cast<int64_t>(pages) * page_size; ++ return static_cast<uint64_t>(pages) * page_size; } -+int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { ++uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + int page_size, r = 0; + unsigned int pgfree, pginact, pgcache; + size_t size = sizeof(page_size); @@ -61,12 +63,12 @@ + return 0; + } + -+ return static_cast<int64_t>((pgfree + pginact + pgcache) * page_size); ++ return static_cast<uint64_t>((pgfree + pginact + pgcache) * page_size); +} + // static -+int64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { -+ int64_t res_kb = info.available != 0 ++uint64_t SysInfo::AmountOfAvailablePhysicalMemory(const SystemMemoryInfoKB& info) { ++ uint64_t res_kb = info.available != 0 + ? info.available - info.active_file + : info.free + info.reclaimable + info.inactive_file; + return res_kb * 1024; @@ -76,9 +78,9 @@ +std::string SysInfo::CPUModelName() { + int mib[] = { CTL_HW, HW_MODEL }; + char name[256]; -+ size_t size = base::size(name); ++ size_t size = std::size(name); + -+ if (sysctl(mib, base::size(mib), &name, &size, NULL, 0) == 0) { ++ if (sysctl(mib, std::size(mib), &name, &size, NULL, 0) == 0) { + return name; + } + diff --git a/www/iridium/files/patch-base_system_sys__info__openbsd.cc b/www/iridium/files/patch-base_system_sys__info__openbsd.cc index 61fad82c015d..2173b6657c69 100644 --- a/www/iridium/files/patch-base_system_sys__info__openbsd.cc +++ b/www/iridium/files/patch-base_system_sys__info__openbsd.cc @@ -1,14 +1,14 @@ ---- base/system/sys_info_openbsd.cc.orig 2022-03-28 18:11:04 UTC +--- base/system/sys_info_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info_openbsd.cc -@@ -12,6 +12,7 @@ +@@ -11,6 +11,7 @@ + #include <sys/sysctl.h> - #include "base/cxx17_backports.h" #include "base/notreached.h" +#include "base/strings/string_util.h" namespace { -@@ -29,9 +30,15 @@ int64_t AmountOfMemory(int pages_name) { +@@ -26,9 +27,15 @@ uint64_t AmountOfMemory(int pages_name) { namespace base { @@ -24,11 +24,11 @@ + int mib[] = {CTL_HW, HW_NCPUONLINE}; int ncpu; size_t size = sizeof(ncpu); - if (sysctl(mib, base::size(mib), &ncpu, &size, NULL, 0) < 0) { -@@ -43,38 +50,62 @@ int SysInfo::NumberOfProcessors() { + if (sysctl(mib, std::size(mib), &ncpu, &size, NULL, 0) < 0) { +@@ -40,10 +47,26 @@ int SysInfo::NumberOfProcessors() { // static - int64_t SysInfo::AmountOfPhysicalMemoryImpl() { + uint64_t SysInfo::AmountOfPhysicalMemoryImpl() { - return AmountOfMemory(_SC_PHYS_PAGES); + // pledge(2) + if (!aofpmem) @@ -37,23 +37,12 @@ } // static - int64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { - // We should add inactive file-backed memory also but there is no such - // information from OpenBSD unfortunately. -- return AmountOfMemory(_SC_AVPHYS_PAGES); -+ // pledge(2) -+ if (!aofapmem) -+ aofapmem = AmountOfMemory(_SC_AVPHYS_PAGES); -+ return aofapmem; - } - - // static +std::string SysInfo::CPUModelName() { + int mib[] = {CTL_HW, HW_MODEL}; -+ size_t len = base::size(cpumodel); ++ size_t len = std::size(cpumodel); + + if (cpumodel[0] == '\0') { -+ if (sysctl(mib, base::size(mib), cpumodel, &len, NULL, 0) < 0) ++ if (sysctl(mib, std::size(mib), cpumodel, &len, NULL, 0) < 0) + return std::string(); + } + @@ -61,14 +50,17 @@ +} + +// static - uint64_t SysInfo::MaxSharedMemorySize() { + uint64_t SysInfo::AmountOfAvailablePhysicalMemoryImpl() { + // We should add inactive file-backed memory also but there is no such + // information from OpenBSD unfortunately. +@@ -55,23 +78,28 @@ uint64_t SysInfo::MaxSharedMemorySize() { int mib[] = {CTL_KERN, KERN_SHMINFO, KERN_SHMINFO_SHMMAX}; size_t limit; size_t size = sizeof(limit); + // pledge(2) + if (shmmax) + goto out; - if (sysctl(mib, base::size(mib), &limit, &size, NULL, 0) < 0) { + if (sysctl(mib, std::size(mib), &limit, &size, NULL, 0) < 0) { NOTREACHED(); return 0; } @@ -82,8 +74,8 @@ -std::string SysInfo::CPUModelName() { - int mib[] = {CTL_HW, HW_MODEL}; - char name[256]; -- size_t len = base::size(name); -- if (sysctl(mib, base::size(mib), name, &len, NULL, 0) < 0) { +- size_t len = std::size(name); +- if (sysctl(mib, std::size(mib), name, &len, NULL, 0) < 0) { - NOTREACHED(); - return std::string(); - } diff --git a/www/iridium/files/patch-base_system_sys__info__posix.cc b/www/iridium/files/patch-base_system_sys__info__posix.cc index dd2fa9a623b6..71fd898b27bb 100644 --- a/www/iridium/files/patch-base_system_sys__info__posix.cc +++ b/www/iridium/files/patch-base_system_sys__info__posix.cc @@ -1,4 +1,4 @@ ---- base/system/sys_info_posix.cc.orig 2022-03-28 20:16:21 UTC +--- base/system/sys_info_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info_posix.cc @@ -37,7 +37,7 @@ @@ -16,9 +16,9 @@ -#endif // !BUILDFLAG(IS_OPENBSD) +#endif // !BUILDFLAG(IS_BSD) - int64_t AmountOfVirtualMemory() { + uint64_t AmountOfVirtualMemory() { struct rlimit limit; -@@ -143,11 +143,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path, +@@ -144,11 +144,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path, namespace base { @@ -31,8 +31,8 @@ +#endif // !BUILDFLAG(IS_BSD) // static - int64_t SysInfo::AmountOfVirtualMemory() { -@@ -239,6 +239,8 @@ std::string SysInfo::OperatingSystemArchitecture() { + uint64_t SysInfo::AmountOfVirtualMemory() { +@@ -238,6 +238,8 @@ std::string SysInfo::OperatingSystemArchitecture() { arch = "x86"; } else if (arch == "amd64") { arch = "x86_64"; diff --git a/www/iridium/files/patch-base_system_sys__info__unittest.cc b/www/iridium/files/patch-base_system_sys__info__unittest.cc index ee7a0ff79e30..04c9153a61aa 100644 --- a/www/iridium/files/patch-base_system_sys__info__unittest.cc +++ b/www/iridium/files/patch-base_system_sys__info__unittest.cc @@ -1,11 +1,12 @@ ---- base/system/sys_info_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- base/system/sys_info_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/system/sys_info_unittest.cc -@@ -234,12 +234,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) { +@@ -234,12 +234,16 @@ TEST_F(SysInfoTest, GetHardwareInfo) { EXPECT_TRUE(IsStringUTF8(hardware_info->model)); bool empty_result_expected = #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ ++ BUILDFLAG(IS_BSD) false; #else true; diff --git a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc index 910875d45076..b8f261c47475 100644 --- a/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc +++ b/www/iridium/files/patch-base_task_thread__pool_environment__config__unittest.cc @@ -1,11 +1,11 @@ ---- base/task/thread_pool/environment_config_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/task/thread_pool/environment_config_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/task/thread_pool/environment_config_unittest.cc @@ -15,7 +15,7 @@ TEST(ThreadPoolEnvironmentConfig, CanUseBackgroundPrio #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) - EXPECT_TRUE(CanUseBackgroundPriorityForWorkerThread()); + EXPECT_TRUE(CanUseBackgroundThreadTypeForWorkerThread()); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_NACL) || BUILDFLAG(IS_BSD) - EXPECT_FALSE(CanUseBackgroundPriorityForWorkerThread()); + EXPECT_FALSE(CanUseBackgroundThreadTypeForWorkerThread()); #else #error Platform doesn't match any block diff --git a/www/iridium/files/patch-base_test_launcher_test__launcher.cc b/www/iridium/files/patch-base_test_launcher_test__launcher.cc index 366b37facec0..0a84917716cb 100644 --- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc +++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc @@ -1,7 +1,7 @@ ---- base/test/launcher/test_launcher.cc.orig 2022-03-28 18:11:04 UTC +--- base/test/launcher/test_launcher.cc.orig 2022-10-05 07:34:01 UTC +++ base/test/launcher/test_launcher.cc -@@ -63,6 +63,7 @@ - #include "testing/gtest/include/gtest/gtest.h" +@@ -65,6 +65,7 @@ + #include "third_party/libxml/chromium/libxml_utils.h" #if BUILDFLAG(IS_POSIX) +#include <signal.h> diff --git a/www/iridium/files/patch-base_threading_platform__thread.h b/www/iridium/files/patch-base_threading_platform__thread.h index 4b73c3095a50..cf922ccae694 100644 --- a/www/iridium/files/patch-base_threading_platform__thread.h +++ b/www/iridium/files/patch-base_threading_platform__thread.h @@ -1,11 +1,11 @@ ---- base/threading/platform_thread.h.orig 2022-03-28 18:11:04 UTC +--- base/threading/platform_thread.h.orig 2022-10-05 07:34:01 UTC +++ base/threading/platform_thread.h -@@ -205,7 +205,7 @@ class BASE_EXPORT PlatformThread { +@@ -253,7 +253,7 @@ class BASE_EXPORT PlatformThread { // Returns a realtime period provided by `delegate`. static TimeDelta GetRealtimePeriod(Delegate* delegate); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Toggles a specific thread's priority at runtime. This can be used to + // Toggles a specific thread's type at runtime. This can be used to // change the priority of a thread in a different process and will fail // if the calling process does not have proper permissions. The diff --git a/www/iridium/files/patch-base_threading_platform__thread__linux.cc b/www/iridium/files/patch-base_threading_platform__thread__linux.cc index 73ba928f2ecd..cda41bdd934d 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__linux.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__linux.cc @@ -1,4 +1,4 @@ ---- base/threading/platform_thread_linux.cc.orig 2022-03-28 18:11:04 UTC +--- base/threading/platform_thread_linux.cc.orig 2022-10-05 07:34:01 UTC +++ base/threading/platform_thread_linux.cc @@ -29,7 +29,9 @@ @@ -10,16 +10,16 @@ #include <sys/resource.h> #include <sys/time.h> #include <sys/types.h> -@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid, +@@ -132,7 +134,7 @@ long sched_setattr(pid_t pid, #endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX) - #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + #endif // BUILDFLAG(IS_CHROMEOS) -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) const FilePath::CharType kCgroupDirectory[] = FILE_PATH_LITERAL("/sys/fs/cgroup"); -@@ -286,7 +288,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI +@@ -304,7 +306,7 @@ void SetThreadCgroupsForThreadType(PlatformThreadId th namespace internal { namespace { @@ -28,34 +28,34 @@ const struct sched_param kRealTimePrio = {8}; #endif } // namespace -@@ -299,7 +301,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN +@@ -330,7 +332,7 @@ const ThreadTypeToNiceValuePair kThreadTypeToNiceValue }; - bool CanSetThreadPriorityToRealtimeAudio() { + bool CanSetThreadTypeToRealtimeAudio() { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) // A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke - // pthread_setschedparam in SetCurrentThreadPriorityForPlatform(). + // pthread_setschedparam in SetCurrentThreadTypeForPlatform(). struct rlimit rlim; -@@ -310,7 +312,7 @@ bool CanSetThreadPriorityToRealtimeAudio() { - } +@@ -342,7 +344,7 @@ bool CanSetThreadTypeToRealtimeAudio() { - bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) { + bool SetCurrentThreadTypeForPlatform(ThreadType thread_type, + MessagePumpType pump_type_hint) { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) // For legacy schedtune interface - SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority); + SetThreadCgroupsForThreadType(PlatformThread::CurrentId(), thread_type); -@@ -328,7 +330,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit - } +@@ -361,7 +363,7 @@ bool SetCurrentThreadTypeForPlatform(ThreadType thread - absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() { + absl::optional<ThreadPriorityForTest> + GetCurrentThreadPriorityForPlatformForTest() { -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) int maybe_sched_rr = 0; struct sched_param maybe_realtime_prio = {0}; if (pthread_getschedparam(pthread_self(), &maybe_sched_rr, -@@ -347,7 +349,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit +@@ -380,7 +382,7 @@ GetCurrentThreadPriorityForPlatformForTest() { void PlatformThread::SetName(const std::string& name) { ThreadIdNameManager::GetInstance()->SetName(name); @@ -64,14 +64,14 @@ // On linux we can get the thread names to show up in the debugger by setting // the process name for the LWP. We don't want to do this for the main // thread because that would rename the process, causing tools like killall -@@ -377,8 +379,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce +@@ -410,8 +412,10 @@ void PlatformThread::SetThreadType(ProcessId process_i // priority. CHECK_NE(thread_id, process_id); +#if !BUILDFLAG(IS_BSD) // For legacy schedtune interface - SetThreadCgroupsForThreadPriority(thread_id, priority); + SetThreadCgroupsForThreadType(thread_id, thread_type); +#endif - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) + #if BUILDFLAG(IS_CHROMEOS) // For upstream uclamp interface. We try both legacy (schedtune, as done diff --git a/www/iridium/files/patch-base_threading_platform__thread__posix.cc b/www/iridium/files/patch-base_threading_platform__thread__posix.cc index a1da3065d379..26de09a430fb 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__posix.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__posix.cc @@ -1,21 +1,21 @@ ---- base/threading/platform_thread_posix.cc.orig 2022-03-28 18:11:04 UTC +--- base/threading/platform_thread_posix.cc.orig 2022-10-05 07:34:01 UTC +++ base/threading/platform_thread_posix.cc -@@ -75,7 +75,7 @@ void* ThreadFunc(void* params) { +@@ -76,7 +76,7 @@ void* ThreadFunc(void* params) { if (!thread_params->joinable) base::DisallowSingleton(); -#if !BUILDFLAG(IS_NACL) +#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD) #if BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) - internal::PCScan::NotifyThreadCreated(internal::GetStackPointer()); - #endif -@@ -362,6 +362,9 @@ bool PlatformThread::CanChangeThreadPriority(ThreadPri - // static - void PlatformThread::SetCurrentThreadPriorityImpl(ThreadPriority priority) { + partition_alloc::internal::PCScan::NotifyThreadCreated( + partition_alloc::internal::GetStackPointer()); +@@ -371,6 +371,9 @@ namespace internal { + void SetCurrentThreadTypeImpl(ThreadType thread_type, + MessagePumpType pump_type_hint) { #if BUILDFLAG(IS_NACL) + NOTIMPLEMENTED(); +// avoid pledge(2) violation +#elif BUILDFLAG(IS_BSD) NOTIMPLEMENTED(); #else - if (internal::SetCurrentThreadPriorityForPlatform(priority)) + if (internal::SetCurrentThreadTypeForPlatform(thread_type, pump_type_hint)) diff --git a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc index 63ece48accfb..ff2ce9c6629e 100644 --- a/www/iridium/files/patch-base_threading_platform__thread__unittest.cc +++ b/www/iridium/files/patch-base_threading_platform__thread__unittest.cc @@ -1,6 +1,6 @@ ---- base/threading/platform_thread_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- base/threading/platform_thread_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ base/threading/platform_thread_unittest.cc -@@ -30,7 +30,7 @@ +@@ -31,7 +31,7 @@ #include "base/time/time.h" #endif @@ -9,16 +9,16 @@ #include <pthread.h> #include <sys/syscall.h> #include <sys/types.h> -@@ -319,7 +319,7 @@ TEST(PlatformThreadTest, +@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, // and hardcodes what we know. Please inform scheduler-dev@chromium.org if this // proprerty changes for a given platform. - TEST(PlatformThreadTest, CanChangeThreadPriority) { + TEST(PlatformThreadTest, CanChangeThreadType) { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // On Ubuntu, RLIMIT_NICE and RLIMIT_RTPRIO are 0 by default, so we won't be // able to increase priority to any level. constexpr bool kCanIncreasePriority = false; -@@ -417,7 +417,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { +@@ -523,7 +523,7 @@ TEST(PlatformThreadTest, SetHugeThreadName) { TEST(PlatformThreadTest, GetDefaultThreadStackSize) { size_t stack_size = PlatformThread::GetDefaultThreadStackSize(); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || \ @@ -27,7 +27,7 @@ !defined(THREAD_SANITIZER)) || \ (BUILDFLAG(IS_ANDROID) && !defined(ADDRESS_SANITIZER)) EXPECT_EQ(0u, stack_size); -@@ -578,12 +578,16 @@ INSTANTIATE_TEST_SUITE_P( +@@ -684,12 +684,16 @@ INSTANTIATE_TEST_SUITE_P( #endif // BUILDFLAG(IS_APPLE) diff --git a/www/iridium/files/patch-base_time_time.cc b/www/iridium/files/patch-base_time_time.cc deleted file mode 100644 index 55fa87eab2ab..000000000000 --- a/www/iridium/files/patch-base_time_time.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- base/time/time.cc.orig 2022-03-28 18:11:04 UTC -+++ base/time/time.cc -@@ -6,7 +6,7 @@ - - #include "build/build_config.h" - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // time.h is a widely included header and its size impacts build time. - // Try not to raise this limit unless necessary. See - // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md diff --git a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc index f63ff384e6c7..51351ba7b885 100644 --- a/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc +++ b/www/iridium/files/patch-base_trace__event_malloc__dump__provider.cc @@ -1,6 +1,6 @@ ---- base/trace_event/malloc_dump_provider.cc.orig 2022-03-28 18:11:04 UTC +--- base/trace_event/malloc_dump_provider.cc.orig 2022-10-05 07:34:01 UTC +++ base/trace_event/malloc_dump_provider.cc -@@ -23,6 +23,8 @@ +@@ -24,6 +24,8 @@ #if BUILDFLAG(IS_APPLE) #include <malloc/malloc.h> @@ -9,7 +9,16 @@ #else #include <malloc.h> #endif -@@ -220,6 +222,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump +@@ -185,7 +187,7 @@ void ReportAppleAllocStats(size_t* total_virtual_size, + + #if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \ + (!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \ +- !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA)) ++ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)) + void ReportMallinfoStats(ProcessMemoryDump* pmd, + size_t* total_virtual_size, + size_t* resident_size, +@@ -356,6 +358,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump &allocated_objects_count); #elif BUILDFLAG(IS_FUCHSIA) // TODO(fuchsia): Port, see https://crbug.com/706592. @@ -17,5 +26,5 @@ + total_virtual_size = 0; + allocated_objects_size = 0; #else - #if defined(__GLIBC__) && defined(__GLIBC_PREREQ) - #if __GLIBC_PREREQ(2, 33) + ReportMallinfoStats(/*pmd=*/nullptr, &total_virtual_size, &resident_size, + &allocated_objects_size, &allocated_objects_count); diff --git a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc index 08e934edeaf5..9229adeb5728 100644 --- a/www/iridium/files/patch-base_trace__event_process__memory__dump.cc +++ b/www/iridium/files/patch-base_trace__event_process__memory__dump.cc @@ -1,6 +1,6 @@ ---- base/trace_event/process_memory_dump.cc.orig 2022-03-28 18:11:04 UTC +--- base/trace_event/process_memory_dump.cc.orig 2022-10-05 07:34:01 UTC +++ base/trace_event/process_memory_dump.cc -@@ -105,7 +105,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -112,7 +112,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden #if BUILDFLAG(IS_WIN) std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec( new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]); @@ -9,12 +9,12 @@ std::unique_ptr<char[]> vec(new char[max_vec_size]); #elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA) std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]); -@@ -130,7 +130,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden +@@ -134,7 +134,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden for (size_t i = 0; i < page_count; i++) resident_page_count += vec[i].VirtualAttributes.Valid; -#elif BUILDFLAG(IS_FUCHSIA) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // TODO(fuchsia): Port, see https://crbug.com/706592. - #elif BUILDFLAG(IS_APPLE) - // mincore in MAC does not fail with EAGAIN. + // TODO(crbug.com/851760): Implement counting resident bytes. + // For now, log and avoid unused variable warnings. + NOTIMPLEMENTED_LOG_ONCE(); diff --git a/www/iridium/files/patch-build_config_BUILD.gn b/www/iridium/files/patch-build_config_BUILD.gn index 64b201f66c3d..fb4eefa994cf 100644 --- a/www/iridium/files/patch-build_config_BUILD.gn +++ b/www/iridium/files/patch-build_config_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- build/config/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ build/config/BUILD.gn -@@ -218,13 +218,17 @@ config("default_libs") { +@@ -215,13 +215,17 @@ config("default_libs") { "CoreText.framework", "Foundation.framework", ] diff --git a/www/iridium/files/patch-build_config_BUILDCONFIG.gn b/www/iridium/files/patch-build_config_BUILDCONFIG.gn index c209822d3d1d..5cc6d67c416e 100644 --- a/www/iridium/files/patch-build_config_BUILDCONFIG.gn +++ b/www/iridium/files/patch-build_config_BUILDCONFIG.gn @@ -1,4 +1,4 @@ ---- build/config/BUILDCONFIG.gn.orig 2022-03-28 18:11:04 UTC +--- build/config/BUILDCONFIG.gn.orig 2022-10-05 07:34:01 UTC +++ build/config/BUILDCONFIG.gn @@ -136,7 +136,8 @@ declare_args() { is_official_build = false @@ -10,7 +10,7 @@ (current_cpu != "s390x" && current_cpu != "s390" && current_cpu != "ppc64" && current_cpu != "ppc" && current_cpu != "mips" && current_cpu != "mips64" && -@@ -218,6 +219,10 @@ if (host_toolchain == "") { +@@ -220,6 +221,10 @@ if (host_toolchain == "") { host_toolchain = "//build/toolchain/aix:$host_cpu" } else if (host_os == "zos") { host_toolchain = "//build/toolchain/zos:$host_cpu" @@ -21,7 +21,7 @@ } else { assert(false, "Unsupported host_os: $host_os") } -@@ -262,6 +267,8 @@ if (target_os == "android") { +@@ -264,6 +269,8 @@ if (target_os == "android") { _default_toolchain = "//build/toolchain/aix:$target_cpu" } else if (target_os == "zos") { _default_toolchain = "//build/toolchain/zos:$target_cpu" @@ -30,7 +30,7 @@ } else { assert(false, "Unsupported target_os: $target_os") } -@@ -296,7 +303,11 @@ is_android = current_os == "android" +@@ -298,7 +305,11 @@ is_android = current_os == "android" is_chromeos = current_os == "chromeos" is_fuchsia = current_os == "fuchsia" is_ios = current_os == "ios" diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn index b63f65a970fb..6b6d36614ebe 100644 --- a/www/iridium/files/patch-build_config_compiler_BUILD.gn +++ b/www/iridium/files/patch-build_config_compiler_BUILD.gn @@ -1,6 +1,6 @@ ---- build/config/compiler/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- build/config/compiler/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ build/config/compiler/BUILD.gn -@@ -236,13 +236,16 @@ config("default_include_dirs") { +@@ -222,13 +222,16 @@ config("default_include_dirs") { # Compiler instrumentation can introduce dependencies in DSOs to symbols in # the executable they are loaded into, so they are unresolved at link-time. config("no_unresolved_symbols") { @@ -18,7 +18,7 @@ } # compiler --------------------------------------------------------------------- -@@ -291,7 +294,9 @@ config("compiler") { +@@ -274,7 +277,9 @@ config("compiler") { configs += [ # See the definitions below. @@ -38,35 +38,35 @@ + # Linux-specific compiler flags setup. # ------------------------------------ - if ((is_posix || is_fuchsia) && !is_apple && use_lld) { -@@ -879,7 +888,7 @@ config("compiler_cpu_abi") { + if (use_gold) { +@@ -862,7 +871,7 @@ config("compiler_cpu_abi") { ] } } else if (current_cpu == "arm") { -- if (is_clang && !is_android && !is_nacl) { -+ if (is_clang && !is_android && !is_nacl && !is_bsd) { +- if (is_clang && !is_android && !is_nacl && ++ if (is_clang && !is_android && !is_nacl && !is_bsd && + !(is_chromeos_lacros && is_chromeos_device)) { cflags += [ "--target=arm-linux-gnueabihf" ] ldflags += [ "--target=arm-linux-gnueabihf" ] - } -@@ -893,7 +902,7 @@ config("compiler_cpu_abi") { - cflags += [ "-mtune=$arm_tune" ] +@@ -878,7 +887,7 @@ config("compiler_cpu_abi") { } } else if (current_cpu == "arm64") { -- if (is_clang && !is_android && !is_nacl && !is_fuchsia) { -+ if (is_clang && !is_android && !is_nacl && !is_fuchsia && !is_bsd) { + if (is_clang && !is_android && !is_nacl && !is_fuchsia && +- !(is_chromeos_lacros && is_chromeos_device)) { ++ !(is_chromeos_lacros && is_chromeos_device) && !is_bsd) { cflags += [ "--target=aarch64-linux-gnu" ] ldflags += [ "--target=aarch64-linux-gnu" ] } -@@ -1465,7 +1474,7 @@ config("default_warnings") { - "-Wno-ignored-pragma-optimize", - ] - -- if (is_chromeos || default_toolchain == "//build/toolchain/cros:target") { -+ if (is_chromeos || default_toolchain == "//build/toolchain/cros:target" || is_bsd) { - # TODO(https://crbug.com/1016945): Re-enable once ChromeOS toolchain is up to date - cflags += [ "-Wno-builtin-assume-aligned-alignment" ] +@@ -1464,7 +1473,7 @@ config("default_warnings") { + ] } -@@ -1644,7 +1653,7 @@ config("no_chromium_code") { + +- if (!is_nacl) { ++ if (!is_nacl && !is_bsd) { + cflags += [ + # TODO(crbug.com/1343975) Evaluate and possibly enable. + "-Wno-deprecated-builtins", +@@ -1623,7 +1632,7 @@ config("no_chromium_code") { # third-party libraries. "-Wno-c++11-narrowing", ] @@ -75,7 +75,7 @@ cflags += [ # Disabled for similar reasons as -Wunused-variable. "-Wno-unused-but-set-variable", -@@ -1956,8 +1965,7 @@ config("default_stack_frames") { +@@ -1935,8 +1944,7 @@ config("default_stack_frames") { } # Default "optimization on" config. @@ -85,7 +85,7 @@ if (is_win) { if (chrome_pgo_phase != 2) { # Favor size over speed, /O1 must be before the common flags. -@@ -1995,8 +2003,7 @@ config("xoptimize") { +@@ -1974,8 +1982,7 @@ config("xoptimize") { } # Turn off optimizations. @@ -95,7 +95,7 @@ if (is_win) { cflags = [ "/Od", # Disable optimization. -@@ -2036,8 +2043,7 @@ config("xno_optimize") { +@@ -2015,8 +2022,7 @@ config("xno_optimize") { # Turns up the optimization level. On Windows, this implies whole program # optimization and link-time code generation which is very expensive and should # be used sparingly. @@ -105,7 +105,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2070,8 +2076,7 @@ config("xoptimize_max") { +@@ -2049,8 +2055,7 @@ config("xoptimize_max") { # # TODO(crbug.com/621335) - rework how all of these configs are related # so that we don't need this disclaimer. @@ -115,7 +115,7 @@ if (is_nacl && is_nacl_irt) { # The NaCl IRT is a special case and always wants its own config. # Various components do: -@@ -2097,8 +2102,7 @@ config("xoptimize_speed") { +@@ -2076,8 +2081,7 @@ config("xoptimize_speed") { } } @@ -125,7 +125,7 @@ cflags = [ "-O1" ] + common_optimize_on_cflags rustflags = [ "-Copt-level=1" ] ldflags = common_optimize_on_ldflags -@@ -2163,7 +2167,7 @@ config("afdo_optimize_size") { +@@ -2142,7 +2146,7 @@ config("afdo_optimize_size") { # There are some targeted places that AFDO regresses, so we provide a separate # config to allow AFDO to be disabled per-target. config("afdo") { @@ -134,7 +134,7 @@ cflags = [] if (clang_emit_debug_info_for_profiling) { # Add the following flags to generate debug info for profiling. -@@ -2179,7 +2183,7 @@ config("afdo") { +@@ -2158,7 +2162,7 @@ config("afdo") { cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ] inputs = [ _clang_sample_profile ] } @@ -143,7 +143,7 @@ cflags = [ "-fauto-profile=${auto_profile_path}" ] inputs = [ auto_profile_path ] } -@@ -2217,8 +2221,7 @@ config("win_pdbaltpath") { +@@ -2196,8 +2200,7 @@ config("win_pdbaltpath") { } # Full symbols. @@ -153,7 +153,7 @@ if (is_win) { if (is_clang) { cflags = [ "/Z7" ] # Debug information in the .obj files. -@@ -2323,7 +2326,8 @@ config("xsymbols") { +@@ -2299,7 +2302,8 @@ config("xsymbols") { } } @@ -163,7 +163,7 @@ if (is_apple) { # TODO(https://crbug.com/1050118): Investigate missing debug info on mac. # Make sure we don't use constructor homing on mac. -@@ -2346,8 +2350,7 @@ config("xsymbols") { +@@ -2322,8 +2326,7 @@ config("xsymbols") { # Minimal symbols. # This config guarantees to hold symbol for stack trace which are shown to user # when crash happens in unittests running on buildbot. @@ -173,7 +173,7 @@ if (is_win) { # Functions, files, and line tables only. cflags = [] -@@ -2420,8 +2423,7 @@ config("xminimal_symbols") { +@@ -2395,8 +2398,7 @@ config("xminimal_symbols") { # This configuration contains function names only. That is, the compiler is # told to not generate debug information and the linker then just puts function # names in the final debug information. diff --git a/www/iridium/files/patch-build_config_compiler_pgo_pgo.gni b/www/iridium/files/patch-build_config_compiler_pgo_pgo.gni deleted file mode 100644 index 1cb2d3dcfbe9..000000000000 --- a/www/iridium/files/patch-build_config_compiler_pgo_pgo.gni +++ /dev/null @@ -1,11 +0,0 @@ ---- build/config/compiler/pgo/pgo.gni.orig 2022-03-28 18:11:04 UTC -+++ build/config/compiler/pgo/pgo.gni -@@ -16,7 +16,7 @@ declare_args() { - # TODO(crbug.com/1052397): Remove chromeos_is_browser_only once - # target_os switch for lacros-chrome is completed. - (is_win || is_mac || -- (is_linux && !chromeos_is_browser_only && !is_chromecast))) { -+ (is_linux && !chromeos_is_browser_only && !is_chromecast && !is_bsd))) { - chrome_pgo_phase = 2 - } - diff --git a/www/iridium/files/patch-build_config_linux_BUILD.gn b/www/iridium/files/patch-build_config_linux_BUILD.gn index 36d2ec257d7d..57a77d064bb5 100644 --- a/www/iridium/files/patch-build_config_linux_BUILD.gn +++ b/www/iridium/files/patch-build_config_linux_BUILD.gn @@ -1,9 +1,9 @@ ---- build/config/linux/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- build/config/linux/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ build/config/linux/BUILD.gn -@@ -42,7 +42,7 @@ config("runtime_library") { +@@ -41,7 +41,7 @@ config("runtime_library") { + } - if ((!(is_chromeos_ash || is_chromeos_lacros) || - default_toolchain != "//build/toolchain/cros:target") && + if ((!is_chromeos || default_toolchain != "//build/toolchain/cros:target") && - (!use_custom_libcxx || current_cpu == "mipsel")) { + (!use_custom_libcxx || current_cpu == "mipsel") && !is_bsd) { libs = [ "atomic" ] diff --git a/www/iridium/files/patch-build_config_ozone.gni b/www/iridium/files/patch-build_config_ozone.gni index 75e60dc7adf7..118645d394a0 100644 --- a/www/iridium/files/patch-build_config_ozone.gni +++ b/www/iridium/files/patch-build_config_ozone.gni @@ -1,6 +1,6 @@ ---- build/config/ozone.gni.orig 2022-03-31 09:38:28 UTC +--- build/config/ozone.gni.orig 2022-10-05 07:34:01 UTC +++ build/config/ozone.gni -@@ -91,7 +91,15 @@ declare_args() { +@@ -87,7 +87,15 @@ declare_args() { } else if (is_chromeos_lacros) { ozone_platform = "wayland" ozone_platform_wayland = true diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni index d4cd8961aa4f..b74a05428eb5 100644 --- a/www/iridium/files/patch-build_config_rust.gni +++ b/www/iridium/files/patch-build_config_rust.gni @@ -1,6 +1,6 @@ ---- build/config/rust.gni.orig 2022-04-01 07:48:30 UTC +--- build/config/rust.gni.orig 2022-10-05 07:34:01 UTC +++ build/config/rust.gni -@@ -116,7 +116,7 @@ if (enable_rust) { +@@ -124,7 +124,7 @@ if (enable_rust) { rust_sysroot = "//third_party/rust-toolchain" use_unverified_rust_toolchain = false } else { diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni index 16f24db9ab60..450d35ba5c66 100644 --- a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni +++ b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni @@ -1,4 +1,4 @@ ---- build/toolchain/gcc_toolchain.gni.orig 2022-04-01 07:48:30 UTC +--- build/toolchain/gcc_toolchain.gni.orig 2022-10-05 07:34:01 UTC +++ build/toolchain/gcc_toolchain.gni @@ -53,6 +53,13 @@ if (enable_resource_allowlist_generation) { "enable_resource_allowlist_generation=true does not work for target_os=$target_os") @@ -14,11 +14,20 @@ # This template defines a toolchain for something that works like gcc # (including clang). # -@@ -771,13 +778,12 @@ template("gcc_toolchain") { +@@ -786,22 +793,12 @@ template("gcc_toolchain") { # use_gold too. template("clang_toolchain") { gcc_toolchain(target_name) { -- prefix = rebase_path("$clang_base_path/bin", root_build_dir) +- _path = "$clang_base_path/bin" +- _is_path_absolute = get_path_info(_path, "abspath") == _path +- +- # Preserve absolute paths for tools like distcc. +- if (_is_path_absolute && filter_include([ _path ], [ "//*" ]) == []) { +- prefix = _path +- } else { +- prefix = rebase_path(_path, root_build_dir) +- } +- - cc = "${prefix}/clang" - cxx = "${prefix}/clang++" + cc = "cc" diff --git a/www/iridium/files/patch-chrome_app_app__management__strings.grdp b/www/iridium/files/patch-chrome_app_app__management__strings.grdp new file mode 100644 index 000000000000..c2eda39438ec --- /dev/null +++ b/www/iridium/files/patch-chrome_app_app__management__strings.grdp @@ -0,0 +1,11 @@ +--- chrome/app/app_management_strings.grdp.orig 2022-10-05 07:34:01 UTC ++++ chrome/app/app_management_strings.grdp +@@ -173,7 +173,7 @@ + You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK"><a href="#"></ph>learn how to set default apps on your device<ph name="END_LINK"></a></ph>. + </message> + </if> +- <if expr="is_fuchsia or is_linux"> ++ <if expr="is_fuchsia or is_posix"> + <message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations."> + You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK"><a href="#"></ph>learn how to set default apps on your device<ph name="END_LINK"></a></ph>. + </message> diff --git a/www/iridium/files/patch-chrome_app_chrome__command__ids.h b/www/iridium/files/patch-chrome_app_chrome__command__ids.h index e9a80bec2240..fdb4318a26d9 100644 --- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h +++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h @@ -1,6 +1,6 @@ ---- chrome/app/chrome_command_ids.h.orig 2022-03-28 18:11:04 UTC +--- chrome/app/chrome_command_ids.h.orig 2022-10-05 07:34:01 UTC +++ chrome/app/chrome_command_ids.h -@@ -66,7 +66,7 @@ +@@ -67,7 +67,7 @@ #define IDC_NAME_WINDOW 34049 // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc index a393724a942d..c08821e823b7 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/app/chrome_main.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/app/chrome_main.cc -@@ -25,7 +25,7 @@ +@@ -26,7 +26,7 @@ #include "chrome/app/notification_metrics.h" #endif @@ -9,7 +9,7 @@ #include "base/base_switches.h" #endif -@@ -146,7 +146,7 @@ int ChromeMain(int argc, const char** argv) { +@@ -152,7 +152,7 @@ int ChromeMain(int argc, const char** argv) { headless::SetUpCommandLine(command_line); } else { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc index 7f48959c413d..57b083bc2b25 100644 --- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,7 +1,7 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/app/chrome_main_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/app/chrome_main_delegate.cc -@@ -114,7 +114,7 @@ - #include "chrome/app/chrome_crash_reporter_client.h" +@@ -126,7 +126,7 @@ + #include "components/about_ui/credit_utils.h" #endif -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -158,12 +158,12 @@ +@@ -169,16 +169,16 @@ #include "v8/include/v8.h" #endif @@ -18,13 +18,18 @@ #include "base/environment.h" #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include "base/message_loop/message_pump_libevent.h" + #endif + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "chrome/browser/policy/policy_path_parser.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -311,7 +311,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty +@@ -329,7 +329,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty // and resources loaded. bool SubprocessNeedsResourceBundle(const std::string& process_type) { return @@ -33,7 +38,7 @@ // The zygote process opens the resources for the renderers. process_type == switches::kZygoteProcess || #endif -@@ -351,7 +351,7 @@ bool HandleVersionSwitches(const base::CommandLine& co +@@ -415,7 +415,7 @@ bool HandleVersionSwitches(const base::CommandLine& co // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -42,7 +47,7 @@ // Show the man page if --help or -h is on the command line. void HandleHelpSwitches(const base::CommandLine& command_line) { if (command_line.HasSwitch(switches::kHelp) || -@@ -415,7 +415,7 @@ void InitializeUserDataDir(base::CommandLine* command_ +@@ -506,7 +506,7 @@ void InitializeUserDataDir(base::CommandLine* command_ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -51,7 +56,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -499,7 +499,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat +@@ -589,7 +589,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat #endif #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ @@ -60,7 +65,7 @@ // Record the startup process creation time on supported platforms. On Android // this is recorded in ChromeMainDelegateAndroid. startup_metric_utils::RecordStartupProcessCreationTime( -@@ -680,6 +680,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization( +@@ -767,6 +767,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() { // not always enabled on Linux/ChromeOS. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled(); @@ -69,17 +74,26 @@ #else bool enable_gwp_asan = true; #endif -@@ -815,7 +817,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi - } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. +@@ -826,7 +828,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() { + base::internal::TimerBase::InitializeFeatures(); + base::InitializeCpuReductionExperiment(); + base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures(); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + base::MessagePumpLibevent::InitializeFeatures(); + #elif BUILDFLAG(IS_MAC) + base::PlatformThread::InitializeOptimizedRealtimeThreadingFeature(); +@@ -916,7 +918,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo + + // TODO(crbug.com/1052397): Revisit the macro expression once build flag + // switch of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // This will directly exit if the user asked for help. HandleHelpSwitches(command_line); #endif -@@ -846,7 +848,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi - #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) +@@ -946,7 +948,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo + #if BUILDFLAG(IS_CHROMEOS) chromeos::dbus_paths::RegisterPathProvider(); #endif -#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) @@ -87,19 +101,19 @@ nacl::RegisterPathProvider(); #endif -@@ -1161,7 +1163,7 @@ void ChromeMainDelegate::PreSandboxStartup() { - locale; +@@ -1336,7 +1338,7 @@ void ChromeMainDelegate::PreSandboxStartup() { + CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale; } -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { - #if BUILDFLAG(IS_ANDROID) -@@ -1237,7 +1239,7 @@ absl::variant<int, content::MainFunctionParams> Chrome + if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) { +@@ -1412,7 +1414,7 @@ absl::variant<int, content::MainFunctionParams> Chrome - // This entry is not needed on Linux, where the NaCl loader - // process is launched via nacl_helper instead. + // This entry is not needed on Linux, where the NaCl loader + // process is launched via nacl_helper instead. -#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(ENABLE_NACL) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) {switches::kNaClLoaderProcess, NaClMain}, diff --git a/www/iridium/files/patch-chrome_app_chromium__strings.grd b/www/iridium/files/patch-chrome_app_chromium__strings.grd index 804d6dd668d0..b090c666b5f9 100644 --- a/www/iridium/files/patch-chrome_app_chromium__strings.grd +++ b/www/iridium/files/patch-chrome_app_chromium__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/chromium_strings.grd.orig 2022-04-01 07:48:30 UTC +--- chrome/app/chromium_strings.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/chromium_strings.grd -@@ -298,7 +298,7 @@ If you update this file, be sure also to update google +@@ -296,7 +296,7 @@ If you update this file, be sure also to update google Welcome to Iridium; new browser window opened </message> </if> @@ -9,21 +9,12 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Iridium </message> -@@ -818,7 +818,7 @@ Permissions you've already given to websites and apps - </if> - - <!-- about:browser-switch strings --> -- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)"> - <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> - Your system administrator has configured the browser to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. +@@ -410,7 +410,7 @@ If you update this file, be sure also to update google + The browser may not function correctly because it is no longer supported on Windows XP or Windows Vista </message> -@@ -944,7 +944,7 @@ Permissions you've already given to websites and apps - </message> - - <!-- ProcessSingleton --> -- <if expr="is_linux or is_macosx"> -+ <if expr="is_posix or is_macosx"> - <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> - The profile appears to be in use by another browsr process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). The browser has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch the browser. + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> + The browser may not function correctly because it is no longer supported on this Linux distribution </message> diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd index d0137ece6f13..413eb5ad5528 100644 --- a/www/iridium/files/patch-chrome_app_generated__resources.grd +++ b/www/iridium/files/patch-chrome_app_generated__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/generated_resources.grd.orig 2022-04-01 07:48:30 UTC +--- chrome/app/generated_resources.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/generated_resources.grd @@ -2,7 +2,7 @@ @@ -9,16 +9,7 @@ for making strings OS specific. Other platform defines such as use_titlecase are declared in tools/grit/grit_rule.gni. --> -@@ -298,7 +298,7 @@ are declared in tools/grit/grit_rule.gni. - <part file="profiles_strings.grdp" /> - - <!-- Web app intent picker strings --> -- <if expr="is_win or is_macosx or is_linux"> -+ <if expr="is_win or is_macosx or is_posix"> - <part file="url_handler_intent_picker_strings.grdp" /> - </if> - -@@ -2833,7 +2833,7 @@ are declared in tools/grit/grit_rule.gni. +@@ -3069,7 +3069,7 @@ are declared in tools/grit/grit_rule.gni. </if> <!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog --> @@ -27,30 +18,57 @@ <message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog."> Device Credentials </message> -@@ -5686,7 +5686,7 @@ Keep your key file in a safe place. You will need it t +@@ -4802,7 +4802,7 @@ are declared in tools/grit/grit_rule.gni. + Read information about your browser, OS, device, installed software, registry values and files + </message> + </if> +- <if expr="is_macosx or is_linux"> ++ <if expr="is_macosx or is_posix"> + <message name="IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS" desc="Permission string for enterprise private reporting permission on Linux and MacOS."> + Read information about your browser, OS, device, installed software and files + </message> +@@ -5439,7 +5439,7 @@ Keep your key file in a safe place. You will need it t + Old versions of Chrome Apps won't open on Windows devices after December 2022. Contact your administrator to update to a new version or remove this app. + </message> </if> - - <!-- chrome://browser-switch strings --> -- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)"> - <message name="IDS_ABOUT_BROWSER_SWITCH_TITLE" desc="about:browser-switch page title"> - Legacy Browser Support +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_FORCE_INSTALLED_DEPRECATED_APPS_CONTENT" desc="Content of the force installed deprecated app dialog"> + Old versions of Chrome Apps won't open on Linux devices after December 2022. Contact your administrator to update to a new version or remove this app. </message> -@@ -8217,7 +8217,7 @@ Keep your key file in a safe place. You will need it t +@@ -5467,7 +5467,7 @@ Keep your key file in a safe place. You will need it t + Old versions of Chrome apps won't open on Windows devices after December 2022. You can check if there's a new version available. + </message> + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_DEPRECATED_APPS_MONITOR_RENDERER" desc="Dialog content that educates users that Chrome Apps will soon no longer launch."> + Old versions of Chrome apps won't open on Linux devices after December 2022. You can check if there's a new version available. + </message> +@@ -8964,7 +8964,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW Google Pay </message> -- <if expr="is_linux and not chromeos and not lacros"> -+ <if expr="is_posix and not chromeos and not lacros"> +- <if expr="is_linux"> ++ <if expr="is_posix"> <message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders."> Use system title bar and borders </message> -@@ -9372,7 +9372,7 @@ Please help our engineers fix this problem. Tell us wh +@@ -10148,7 +10148,7 @@ Please help our engineers fix this problem. Tell us wh Set as default </message> -- <if expr="is_linux and not chromeos and not lacros"> -+ <if expr="is_posix and not chromeos and not lacros"> +- <if expr="is_linux"> ++ <if expr="is_posix"> <message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window."> Minimize </message> +@@ -12211,7 +12211,7 @@ Please help our engineers fix this problem. Tell us wh + Open Anyway + </message> + +- <if expr="is_win or is_macosx or is_linux"> ++ <if expr="is_win or is_macosx or is_posix"> + <message name="IDS_UTILITY_PROCESS_SYSTEM_SIGNALS_NAME" desc="The name of the utility process used to collect system signals. Only spawned on Windows, Mac or Linux."> + System Signals Utilities + </message> diff --git a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd index 90ca9b7127f4..3895d1d1e29e 100644 --- a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd +++ b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd @@ -1,6 +1,6 @@ ---- chrome/app/google_chrome_strings.grd.orig 2022-04-01 07:48:30 UTC +--- chrome/app/google_chrome_strings.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/google_chrome_strings.grd -@@ -303,7 +303,7 @@ chromium_strings.grd. --> +@@ -301,7 +301,7 @@ chromium_strings.grd. --> Welcome to Chrome; new browser window opened </message> </if> @@ -9,21 +9,12 @@ <message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar"> Welcome to Google Chrome </message> -@@ -863,7 +863,7 @@ Permissions you've already given to websites and apps - </if> - - <!-- about:browser-switch strings --> -- <if expr="is_win or is_macosx or is_fuchsia or (is_linux and not chromeos)"> -+ <if expr="is_win or is_macosx or is_fuchsia or (is_posix and not chromeos)"> - <message name="IDS_ABOUT_BROWSER_SWITCH_DESCRIPTION_UNKNOWN_BROWSER" desc="Description shown while waiting for an alternative browser to open, when the browser name is not auto-detected"> - Your system administrator has configured Google Chrome to open an alternative browser to access <ph name="TARGET_URL_HOSTNAME">$1<ex>example.com</ex></ph>. +@@ -438,7 +438,7 @@ chromium_strings.grd. --> + This computer will no longer receive Google Chrome updates because Windows XP and Windows Vista are no longer supported </message> -@@ -1012,7 +1012,7 @@ Permissions you've already given to websites and apps - </message> - - <!-- ProcessSingleton --> -- <if expr="is_linux or is_macosx"> -+ <if expr="is_posix or is_macosx"> - <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host."> - The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome. + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported."> + Google Chrome may not function correctly because it is no longer supported on this Linux distribution </message> diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp index caaa01f97837..a956f79d3910 100644 --- a/www/iridium/files/patch-chrome_app_settings__strings.grdp +++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp @@ -1,20 +1,20 @@ ---- chrome/app/settings_strings.grdp.orig 2022-03-28 18:11:04 UTC +--- chrome/app/settings_strings.grdp.orig 2022-10-05 07:34:01 UTC +++ chrome/app/settings_strings.grdp -@@ -131,7 +131,7 @@ +@@ -134,7 +134,7 @@ Theme </message> </if> -- <if expr="is_linux and not chromeos and not lacros"> -+ <if expr="is_posix and not chromeos and not lacros"> +- <if expr="is_linux"> ++ <if expr="is_posix"> <message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux"> GTK+ </message> -@@ -145,7 +145,7 @@ +@@ -148,7 +148,7 @@ Use Classic </message> </if> -- <if expr="not is_linux or chromeos_ash or chromeos_lacros or is_fuchsia"> -+ <if expr="not is_posix or chromeos_ash or chromeos_lacros or is_fuchsia"> +- <if expr="not is_linux or is_chromeos or is_fuchsia"> ++ <if expr="not is_posix or is_chromeos or is_fuchsia"> <message name="IDS_SETTINGS_RESET_TO_DEFAULT_THEME" desc="Name of the control which resets the browser theme back to the default theme."> Reset to default </message> diff --git a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd index 77c8bf474b6a..ab7eb9bd7ba3 100644 --- a/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd @@ -1,4 +1,4 @@ ---- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-04-01 07:48:30 UTC +--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/theme/chrome_unscaled_resources.grd @@ -15,12 +15,12 @@ <release seq="1"> @@ -15,7 +15,7 @@ <include name="IDR_PRODUCT_LOGO_64" file="google_chrome/linux/product_logo_64.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128" file="google_chrome/linux/product_logo_128.png" type="BINDATA" /> <include name="IDR_PRODUCT_LOGO_128_BETA" file="google_chrome/linux/product_logo_128_beta.png" type="BINDATA" /> -@@ -52,12 +52,12 @@ +@@ -53,12 +53,12 @@ </if> </if> <if expr="not _google_chrome"> diff --git a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd index 1bfe0269b3f2..d19441f84c1b 100644 --- a/www/iridium/files/patch-chrome_app_theme_theme__resources.grd +++ b/www/iridium/files/patch-chrome_app_theme_theme__resources.grd @@ -1,11 +1,34 @@ ---- chrome/app/theme/theme_resources.grd.orig 2022-03-28 18:11:04 UTC +--- chrome/app/theme/theme_resources.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/app/theme/theme_resources.grd -@@ -25,7 +25,7 @@ - <!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST - BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE - SAME CONDITIONALS. --> -- <if expr="is_linux or is_win or chromeos"> -+ <if expr="is_posix or is_win or chromeos"> - <structure type="chrome_scaled_image" name="IDR_ACCESSIBILITY_CAPTIONS_PREVIEW_BACKGROUND" file="common/captions-preview-bg.png" /> +@@ -130,11 +130,11 @@ + <structure type="chrome_scaled_image" name="IDR_PRERENDER" file="common/prerender_succeed_icon.png" /> </if> - <if expr="toolkit_views and not is_macosx"> + <if expr="not _google_chrome"> +- <if expr="not is_linux"> ++ <if expr="not is_posix"> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/product_logo_32.png" /> + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" /> + </if> +@@ -142,7 +142,7 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" /> + </if> + <if expr="_google_chrome"> +- <if expr="not is_linux"> ++ <if expr="not is_posix"> + <if expr="not is_android"> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" /> +@@ -150,7 +150,7 @@ + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" /> + </if> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/linux/product_logo_16.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/linux/product_logo_32.png" /> + <structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/linux/product_logo_32_beta.png" /> diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc index ae127b2d48f8..fdf0ba9fcb20 100644 --- a/www/iridium/files/patch-chrome_browser_about__flags.cc +++ b/www/iridium/files/patch-chrome_browser_about__flags.cc @@ -1,6 +1,6 @@ ---- chrome/browser/about_flags.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/about_flags.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/about_flags.cc -@@ -206,7 +206,7 @@ +@@ -212,7 +212,7 @@ #include "ui/native_theme/native_theme_features.h" #include "ui/ui_features.h" @@ -9,8 +9,8 @@ #include "base/allocator/buildflags.h" #endif -@@ -275,7 +275,7 @@ - #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" +@@ -287,7 +287,7 @@ + #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck #endif // ENABLE_SUPERVISED_USERS -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) @@ -18,8 +18,8 @@ #include "ui/ozone/buildflags.h" #include "ui/ozone/public/ozone_switches.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) -@@ -362,7 +362,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = { - gl::kANGLEImplementationMetalName}}; +@@ -392,7 +392,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap + {"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}}; #endif -#if BUILDFLAG(IS_LINUX) @@ -27,7 +27,7 @@ const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = { {flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""}, {flag_descriptions::kOzonePlatformHintChoiceAuto, -@@ -976,7 +976,7 @@ const FeatureEntry::FeatureVariation kPageContentAnnot +@@ -1262,7 +1262,7 @@ const FeatureEntry::FeatureVariation }; #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -36,8 +36,8 @@ const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = { {"DocumentUseServerScore", "true"}, {"DocumentUseClientScore", "false"}, -@@ -3424,7 +3424,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)}, +@@ -3923,7 +3923,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)}, #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) @@ -45,16 +45,7 @@ { "enable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, -@@ -3838,7 +3838,7 @@ const FeatureEntry kFeatureEntries[] = { - {"enable-login-detection", flag_descriptions::kEnableLoginDetectionName, - flag_descriptions::kEnableLoginDetectionDescription, kOsAll, - FEATURE_VALUE_TYPE(login_detection::kLoginDetection)}, --#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - {"enable-navigation-predictor", - flag_descriptions::kEnableNavigationPredictorName, - flag_descriptions::kEnableNavigationPredictorDescription, -@@ -4031,7 +4031,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4549,7 +4549,7 @@ const FeatureEntry kFeatureEntries[] = { FEATURE_VALUE_TYPE(features::kWebShare)}, #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -63,7 +54,7 @@ {"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName, flag_descriptions::kOzonePlatformHintDescription, kOsLinux, MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)}, -@@ -4050,7 +4050,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -4568,7 +4568,7 @@ const FeatureEntry kFeatureEntries[] = { password_manager::features::kForceInitialSyncWhenDecryptionFails)}, #endif // BUILDFLAG(IS_LINUX) @@ -72,8 +63,17 @@ {"skip-undecryptable-passwords", flag_descriptions::kSkipUndecryptablePasswordsName, flag_descriptions::kSkipUndecryptablePasswordsDescription, -@@ -4760,7 +4760,7 @@ const FeatureEntry kFeatureEntries[] = { - "OmniboxBundledExperimentV1")}, +@@ -4822,7 +4822,7 @@ const FeatureEntry kFeatureEntries[] = { + "FeedCloseRefresh")}, + #endif // BUILDFLAG(IS_ANDROID) + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + {"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName, + flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop, + FEATURE_VALUE_TYPE(feed::kWebUiFeed)}, +@@ -5336,7 +5336,7 @@ const FeatureEntry kFeatureEntries[] = { + FEATURE_VALUE_TYPE(omnibox::kZeroSuggestPrefetchingOnWeb)}, #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) @@ -81,17 +81,17 @@ {"omnibox-experimental-keyword-mode", flag_descriptions::kOmniboxExperimentalKeywordModeName, flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop, -@@ -5158,7 +5158,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif // BUILDFLAG(IS_ANDROID) +@@ -5873,7 +5873,7 @@ const FeatureEntry kFeatureEntries[] = { + flag_descriptions::kPointerLockOptionsDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kPointerLockOptions)}, - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"webui-feedback", flag_descriptions::kWebuiFeedbackName, - flag_descriptions::kWebuiFeedbackDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kWebUIFeedback)}, -@@ -6198,7 +6198,7 @@ const FeatureEntry kFeatureEntries[] = { - FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)}, +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + {"enable-async-dns", flag_descriptions::kAsyncDnsName, + flag_descriptions::kAsyncDnsDescription, kOsWin | kOsLinux, + FEATURE_VALUE_TYPE(features::kAsyncDns)}, +@@ -6791,7 +6791,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif // BUILDFLAG(IS_CHROMEOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -99,25 +99,16 @@ {"global-media-controls-modern-ui", flag_descriptions::kGlobalMediaControlsModernUIName, flag_descriptions::kGlobalMediaControlsModernUIDescription, -@@ -6912,7 +6912,7 @@ const FeatureEntry kFeatureEntries[] = { - #endif - - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"incognito-clear-browsing-data-dialog-for-desktop", - flag_descriptions::kIncognitoClearBrowsingDataDialogForDesktopName, - flag_descriptions::kIncognitoClearBrowsingDataDialogForDesktopDescription, -@@ -7037,7 +7037,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -7651,7 +7651,7 @@ const FeatureEntry kFeatureEntries[] = { #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - {"commander", flag_descriptions::kCommanderName, - flag_descriptions::kCommanderDescription, kOsDesktop, - FEATURE_VALUE_TYPE(features::kCommander)}, -@@ -7291,7 +7291,7 @@ const FeatureEntry kFeatureEntries[] = { + {"quick-commands", flag_descriptions::kQuickCommandsName, + flag_descriptions::kQuickCommandsDescription, kOsDesktop, + FEATURE_VALUE_TYPE(features::kQuickCommands)}, +@@ -7950,7 +7950,7 @@ const FeatureEntry kFeatureEntries[] = { #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -126,3 +117,12 @@ { "ui-debug-tools", flag_descriptions::kUIDebugToolsName, +@@ -8530,7 +8530,7 @@ const FeatureEntry kFeatureEntries[] = { + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + {"document-picture-in-picture-api", + flag_descriptions::kDocumentPictureInPictureApiName, + flag_descriptions::kDocumentPictureInPictureApiDescription, diff --git a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc index aa489bc5dfa6..319c2721ae37 100644 --- a/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc +++ b/www/iridium/files/patch-chrome_browser_after__startup__task__utils.cc @@ -1,16 +1,7 @@ ---- chrome/browser/after_startup_task_utils.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/after_startup_task_utils.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/after_startup_task_utils.cc -@@ -25,7 +25,7 @@ - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "ui/views/linux_ui/linux_ui.h" - #endif - -@@ -111,7 +111,7 @@ void SetBrowserStartupIsComplete() { - +@@ -107,7 +107,7 @@ void SetBrowserStartupIsComplete() { + TRACE_EVENT0("startup", "SetBrowserStartupIsComplete"); g_startup_complete_flag.Get().Set(); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -18,12 +9,3 @@ // Process::Current().CreationTime() is not available on all platforms. const base::Time process_creation_time = base::Process::Current().CreationTime(); -@@ -130,7 +130,7 @@ void SetBrowserStartupIsComplete() { - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // Make sure we complete the startup notification sequence, or launchers will - // get confused by not receiving the expected message from the main process. - views::LinuxUI* linux_ui = views::LinuxUI::instance(); diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc deleted file mode 100644 index 644ba8794a0e..000000000000 --- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc +++ /dev/null @@ -1,71 +0,0 @@ ---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc -@@ -4,6 +4,15 @@ - - #include "chrome/browser/apps/platform_apps/api/music_manager_private/device_id.h" - -+#include "build/build_config.h" -+ -+#if defined(OS_BSD) -+#include <sys/types.h> -+#include <net/if_dl.h> -+#include <netinet/in.h> -+#include <sys/socket.h> -+#endif -+ - #include <ifaddrs.h> - #include <net/if.h> - #include <stddef.h> -@@ -106,11 +115,33 @@ class MacAddressProcessor { - const char* const prefixes[], - size_t prefixes_count) { - const int MAC_LENGTH = 6; -+#if defined(OS_BSD) -+ struct ifaddrs *ifap, *ifinfo; -+#else - struct ifreq ifinfo; -+#endif - - memset(&ifinfo, 0, sizeof(ifinfo)); -- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); - -+#if defined(OS_BSD) -+ int result = getifaddrs(&ifap); -+ if (result != 0) -+ return true; -+ result = 1; // no MAC found yet -+ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) { -+ struct sockaddr* sa = ifinfo->ifa_addr; -+ if (sa->sa_family == AF_LINK && -+ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name, -+ sizeof(ifinfo->ifa_name) - 1)) { -+ result = 0; -+ break; -+ } -+ } -+ -+ char mac_address[6]; -+ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address)); -+#else -+ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1); - int sd = socket(AF_INET, SOCK_DGRAM, 0); - int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo); - close(sd); -@@ -120,11 +151,17 @@ class MacAddressProcessor { - - const char* mac_address = - static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data); -+#endif - if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH)) - return true; - -+#if defined(OS_BSD) -+ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count)) -+ return true; -+#else - if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count)) - return true; -+#endif - - // Got one! - found_mac_address_ = diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc index a4f222095c55..27d9c6172e70 100644 --- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc +++ b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc @@ -1,20 +1,20 @@ ---- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/apps/platform_apps/platform_app_launch.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/apps/platform_apps/platform_app_launch.cc -@@ -18,7 +18,7 @@ - #include "extensions/common/constants.h" +@@ -20,7 +20,7 @@ #include "extensions/common/extension.h" --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_navigator.h" #include "chrome/browser/ui/browser_window.h" -@@ -121,7 +121,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con - return app_tab != nullptr; +@@ -124,7 +124,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con } --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) bool OpenDeprecatedApplicationPrompt(Profile* profile, const std::string& app_id) { if (!extensions::IsExtensionUnsupportedDeprecatedApp(profile, app_id)) diff --git a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc index a0dd415e5b85..e1f056d7142f 100644 --- a/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc +++ b/www/iridium/files/patch-chrome_browser_autocomplete_chrome__autocomplete__scheme__classifier.cc @@ -1,6 +1,6 @@ ---- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc -@@ -90,7 +90,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch +@@ -91,7 +91,7 @@ ChromeAutocompleteSchemeClassifier::GetInputTypeForSch return metrics::OmniboxInputType::QUERY; case ExternalProtocolHandler::UNKNOWN: { diff --git a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc index 590e8a3dc385..f1d83589da28 100644 --- a/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc +++ b/www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc @@ -1,15 +1,6 @@ ---- chrome/browser/background/background_mode_manager.cc.orig 2022-04-03 12:23:22 UTC +--- chrome/browser/background/background_mode_manager.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/background/background_mode_manager.cc -@@ -376,7 +376,7 @@ void BackgroundModeManager::RegisterPrefs(PrefRegistry - registry->RegisterBooleanPref(prefs::kChromeCreatedLoginItem, false); - registry->RegisterBooleanPref(prefs::kMigratedLoginItemPref, false); - #endif -- registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, false); -+ registry->RegisterBooleanPref(prefs::kBackgroundModeEnabled, true); - } - - void BackgroundModeManager::RegisterProfile(Profile* profile) { -@@ -899,7 +899,7 @@ gfx::ImageSkia GetStatusTrayIcon() { +@@ -894,7 +894,7 @@ gfx::ImageSkia GetStatusTrayIcon() { return gfx::ImageSkia(); return family->CreateExact(size).AsImageSkia(); diff --git a/www/iridium/files/patch-chrome_browser_browser__features.cc b/www/iridium/files/patch-chrome_browser_browser__features.cc index 94453af65c33..9f627c06d171 100644 --- a/www/iridium/files/patch-chrome_browser_browser__features.cc +++ b/www/iridium/files/patch-chrome_browser_browser__features.cc @@ -1,8 +1,8 @@ ---- chrome/browser/browser_features.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/browser_features.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/browser_features.cc @@ -29,7 +29,7 @@ const base::Feature kColorProviderRedirectionForThemeP // the browser exits. - const base::Feature kDestroyProfileOnBrowserClose{ + const base::Feature kDestroyProfileOnBrowserClose { "DestroyProfileOnBrowserClose", -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc index 74057c941fd9..95cee6f52e68 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.cc +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/browser_process_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/browser_process_impl.cc -@@ -208,7 +208,7 @@ +@@ -211,7 +211,7 @@ #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/error_reporting/chrome_js_error_report_processor.h" // nogncheck #endif -@@ -1157,7 +1157,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { +@@ -1167,7 +1167,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() { ApplyMetricsReportingPolicy(); @@ -18,7 +18,7 @@ ChromeJsErrorReportProcessor::Create(); #endif -@@ -1412,7 +1412,7 @@ void BrowserProcessImpl::Unpin() { +@@ -1426,7 +1426,7 @@ void BrowserProcessImpl::Unpin() { // Mac is currently not supported. // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-chrome_browser_browser__process__impl.h b/www/iridium/files/patch-chrome_browser_browser__process__impl.h index 9e5a00c89bcb..15444c6285c4 100644 --- a/www/iridium/files/patch-chrome_browser_browser__process__impl.h +++ b/www/iridium/files/patch-chrome_browser_browser__process__impl.h @@ -1,6 +1,6 @@ ---- chrome/browser/browser_process_impl.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/browser_process_impl.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/browser_process_impl.h -@@ -367,7 +367,7 @@ class BrowserProcessImpl : public BrowserProcess, +@@ -363,7 +363,7 @@ class BrowserProcessImpl : public BrowserProcess, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_browser__resources.grd b/www/iridium/files/patch-chrome_browser_browser__resources.grd new file mode 100644 index 000000000000..d8bff188f734 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_browser__resources.grd @@ -0,0 +1,11 @@ +--- chrome/browser/browser_resources.grd.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/browser_resources.grd +@@ -120,7 +120,7 @@ + <if expr="chromeos_ash"> + <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" /> + </if> +- <if expr="is_linux or chromeos_lacros"> ++ <if expr="is_posix or chromeos_lacros"> + <include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" /> + </if> + <if expr="chromeos_ash"> diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc index 2a946f8a4781..494c4e4dca4f 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_browser_interface_binders.cc -@@ -96,13 +96,13 @@ +@@ -113,13 +113,13 @@ #endif // BUILDFLAG(FULL_SAFE_BROWSING) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -16,7 +16,7 @@ #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" #include "ui/webui/resources/cr_components/app_management/app_management.mojom.h" #endif -@@ -172,7 +172,7 @@ +@@ -188,7 +188,7 @@ #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -25,8 +25,8 @@ #include "chrome/browser/ui/webui/discards/discards.mojom.h" #include "chrome/browser/ui/webui/discards/discards_ui.h" #include "chrome/browser/ui/webui/discards/site_data.mojom.h" -@@ -665,7 +665,7 @@ void PopulateChromeFrameBinders( - #endif +@@ -780,7 +780,7 @@ void PopulateChromeFrameBinders( + #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) @@ -34,16 +34,16 @@ if (!render_frame_host->GetParent()) { map->Add<chrome::mojom::DraggableRegions>( base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed)); -@@ -673,7 +673,7 @@ void PopulateChromeFrameBinders( +@@ -788,7 +788,7 @@ void PopulateChromeFrameBinders( #endif #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ - BUILDFLAG(IS_WIN) + BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) && - !render_frame_host->GetParent()) { + render_frame_host->IsInPrimaryMainFrame()) { map->Add<blink::mojom::SubAppsService>( -@@ -714,14 +714,14 @@ void PopulateChromeWebUIFrameBinders( +@@ -843,14 +843,14 @@ void PopulateChromeWebUIFrameBinders( SegmentationInternalsUI>(map); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -60,8 +60,8 @@ RegisterWebUIControllerInterfaceBinder< app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map); #endif -@@ -1040,7 +1040,7 @@ void PopulateChromeWebUIFrameBinders( - #endif +@@ -1235,7 +1235,7 @@ void PopulateChromeWebUIFrameBinders( + #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc index 8d1ec7ac986c..c08f0e351738 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main.cc @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_browser_main.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/chrome_browser_main.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_browser_main.cc -@@ -231,11 +231,11 @@ +@@ -239,11 +239,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -14,17 +14,17 @@ #include "components/crash/core/app/breakpad_linux.h" #include "components/crash/core/app/crashpad.h" #endif -@@ -270,7 +270,7 @@ - +@@ -279,7 +279,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) #include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h" #include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h" -@@ -1007,7 +1007,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - AddFirstRunNewTabs(browser_creator_.get(), master_prefs_->new_tabs); + #include "chrome/browser/profiles/profile_activity_metrics_recorder.h" +@@ -1025,7 +1025,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { + browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs); } -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -32,7 +32,7 @@ // Create directory for user-level Native Messaging manifest files. This // makes it less likely that the directory will be created by third-party // software with incorrect owner or permission. See crbug.com/725513 . -@@ -1020,7 +1020,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { +@@ -1038,7 +1038,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { } #endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH) @@ -41,12 +41,12 @@ // Set the product channel for crash reports. if (!crash_reporter::IsCrashpadEnabled()) { breakpad::SetChannelCrashKey( -@@ -1041,7 +1041,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { - +@@ -1060,7 +1060,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) metrics::DesktopSessionDurationTracker::Initialize(); ProfileActivityMetricsRecorder::Initialize(); + TouchModeStatsTracker::Initialize( diff --git a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc index 51261e2c3142..639795f4c9fb 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc @@ -1,20 +1,28 @@ ---- chrome/browser/chrome_browser_main_linux.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_browser_main_linux.cc -@@ -57,7 +57,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi +@@ -57,13 +57,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi } void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() { --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // No-op: Ash and Lacros Bluetooth DBusManager initialization depend on // FeatureList, and is done elsewhere. - #else -@@ -122,7 +122,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { + #endif // BUILDFLAG(IS_CHROMEOS) + + #if !BUILDFLAG(IS_CHROMEOS) ++#if !BUILDFLAG(IS_BSD) + bluez::BluezDBusManager::Initialize(nullptr /* system_bus */); ++#endif + + // Set up crypt config. This needs to be done before anything starts the + // network service, as the raw encryption key needs to be shared with the +@@ -123,7 +125,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() { #endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS) void ChromeBrowserMainPartsLinux::PostDestroyThreads() { --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // No-op; per PostBrowserStart() comment, this is done elsewhere. #else bluez::BluezDBusManager::Shutdown(); diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc index e95e330eed44..efd7b9f3a342 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc @@ -1,15 +1,15 @@ ---- chrome/browser/chrome_content_browser_client.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/chrome_content_browser_client.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_content_browser_client.cc -@@ -374,7 +374,7 @@ +@@ -386,7 +386,7 @@ + #include "components/user_manager/user_manager.h" #include "services/service_manager/public/mojom/interface_provider_spec.mojom.h" #include "storage/browser/file_system/external_mount_points.h" - #include "third_party/cros_system_api/switches/chrome_switches.h" -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/chrome_browser_main_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "base/android/application_status_listener.h" -@@ -444,17 +444,17 @@ +@@ -467,17 +467,17 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -30,7 +30,7 @@ #if !BUILDFLAG(IS_ANDROID) #include "base/debug/leak_annotations.h" #include "components/crash/core/app/breakpad_linux.h" -@@ -462,12 +462,12 @@ +@@ -485,12 +485,12 @@ #include "components/crash/content/browser/crash_handler_host_linux.h" #endif @@ -45,7 +45,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || // BUILDFLAG(IS_CHROMEOS_ASH) -@@ -489,11 +489,11 @@ +@@ -514,11 +514,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -59,7 +59,7 @@ #include "chrome/browser/chrome_browser_main_extra_parts_linux.h" #elif defined(USE_OZONE) #include "chrome/browser/chrome_browser_main_extra_parts_ozone.h" -@@ -880,7 +880,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo +@@ -927,7 +927,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo int GetCrashSignalFD(const base::CommandLine& command_line) { return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket(); } @@ -68,16 +68,16 @@ breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost( const std::string& process_type) { base::FilePath dumps_path; -@@ -1376,7 +1376,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1475,7 +1475,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo #elif BUILDFLAG(IS_CHROMEOS_LACROS) main_parts = std::make_unique<ChromeBrowserMainPartsLacros>( - std::move(parameters), &startup_data_); + is_integration_test, &startup_data_); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) main_parts = std::make_unique<ChromeBrowserMainPartsLinux>( - std::move(parameters), &startup_data_); + is_integration_test, &startup_data_); #elif BUILDFLAG(IS_ANDROID) -@@ -1410,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1514,7 +1514,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -86,7 +86,7 @@ main_parts->AddParts( std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>()); #else -@@ -1427,7 +1427,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts( +@@ -1535,7 +1535,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>()); #endif @@ -95,16 +95,7 @@ main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>()); #elif defined(USE_OZONE) main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>()); -@@ -2101,7 +2101,7 @@ bool ChromeContentBrowserClient::AreDirectSocketsAllow - Profile* profile = Profile::FromBrowserContext(context); - return profile && profile->GetPrefs()->GetBoolean( - policy::policy_prefs::kEnableDirectSockets); --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // There are currently no reliable way to determine managed status on Linux. - return false; - #elif BUILDFLAG(IS_MAC) -@@ -2190,6 +2190,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2304,6 +2304,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin #elif BUILDFLAG(IS_POSIX) #if BUILDFLAG(IS_ANDROID) bool enable_crash_reporter = true; @@ -113,16 +104,16 @@ #else bool enable_crash_reporter = false; if (crash_reporter::IsCrashpadEnabled()) { -@@ -2498,7 +2500,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin +@@ -2653,7 +2655,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess( command_line); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Processes may only query perf_event_open with the BPF sandbox disabled. - if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) && - command_line->HasSwitch(sandbox::policy::switches::kNoSandbox)) { -@@ -3880,7 +3882,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + // Opt into a hardened stack canary mitigation if it hasn't already been + // force-disabled. + if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) { +@@ -4096,7 +4098,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst } } @@ -131,7 +122,7 @@ void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess( const base::CommandLine& command_line, int child_process_id, -@@ -4292,14 +4294,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4540,14 +4542,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati &throttles); } @@ -148,7 +139,7 @@ MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle:: MaybeCreateThrottleFor(handle), &throttles); -@@ -4332,7 +4334,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati +@@ -4580,7 +4582,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h index 775dde2be907..645762e24515 100644 --- a/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h +++ b/www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h @@ -1,6 +1,6 @@ ---- chrome/browser/chrome_content_browser_client.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/chrome_content_browser_client.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/chrome_content_browser_client.h -@@ -417,7 +417,7 @@ class ChromeContentBrowserClient : public content::Con +@@ -436,7 +436,7 @@ class ChromeContentBrowserClient : public content::Con void OverridePageVisibilityState( content::RenderFrameHost* render_frame_host, content::PageVisibilityState* visibility_state) override; diff --git a/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc index a5772ad4a0f2..dfd8e3465e24 100644 --- a/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc +++ b/www/iridium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc @@ -1,11 +1,11 @@ ---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/crash_upload_list/crash_upload_list.cc -@@ -52,7 +52,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { +@@ -50,7 +50,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() { + // which isn't compatible with CrashUploadListCrashpad. crash_sender continues // to log uploads in CrashUploadList::kReporterLogFilename. // Linux is handled below. - #if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ -- BUILDFLAG(IS_LINUX)) -+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) +-#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) if (crash_reporter::IsCrashpadEnabled()) { return new CrashUploadListCrashpad(); } diff --git a/www/iridium/files/patch-chrome_browser_defaults.cc b/www/iridium/files/patch-chrome_browser_defaults.cc index daff6ce7a409..209dcd00c766 100644 --- a/www/iridium/files/patch-chrome_browser_defaults.cc +++ b/www/iridium/files/patch-chrome_browser_defaults.cc @@ -1,6 +1,6 @@ ---- chrome/browser/defaults.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/defaults.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/defaults.cc -@@ -48,7 +48,7 @@ const bool kSyncAutoStarts = true; +@@ -52,7 +52,7 @@ const bool kSyncAutoStarts = true; const bool kSyncAutoStarts = false; #endif diff --git a/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd index f7a7469be701..c2588411092a 100644 --- a/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd +++ b/www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd @@ -1,11 +1,11 @@ ---- chrome/browser/dev_ui_browser_resources.grd.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/dev_ui_browser_resources.grd -@@ -46,7 +46,7 @@ This file specifies browser resources for developer-fa - <include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="resources\predictors\resource_prefetch_predictor.js" type="BINDATA" /> - <include name="IDR_MEDIA_SESSION_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\services\media_session\public\mojom\media_session.mojom-webui.js" use_base_dir="false" type="BINDATA" /> +@@ -36,7 +36,7 @@ This file specifies browser resources for developer-fa + <include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" /> + <include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" /> -- <if expr="is_android or is_linux"> -+ <if expr="is_android or is_posix"> +- <if expr="is_android or is_linux or is_chromeos"> ++ <if expr="is_android or is_posix or is_chromeos"> <include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" preprocess="true" type="BINDATA" /> - <include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" preprocess="true" type="BINDATA" /> + <include name="IDR_SANDBOX_INTERNALS_JS" file="${root_gen_dir}\chrome\browser\resources\sandbox_internals\tsc\sandbox_internals.js" use_base_dir="false" type="BINDATA" /> </if> diff --git a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc index 211cb0a1028f..0c9cd7e4aac7 100644 --- a/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc @@ -1,15 +1,6 @@ ---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/chrome_download_manager_delegate.cc -@@ -1541,7 +1541,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe - target_info->is_filetype_handled_safely) - DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (item->GetOriginalMimeType() == "application/x-x509-user-cert") - DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true); - #endif -@@ -1610,7 +1610,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe +@@ -1552,7 +1552,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile( const base::FilePath& path) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,7 +9,7 @@ if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) { return !download_prefs_->ShouldOpenPdfInSystemReader(); } -@@ -1718,7 +1718,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow +@@ -1668,7 +1668,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow content::CheckDownloadAllowedCallback check_download_allowed_cb) { DCHECK_CURRENTLY_ON(BrowserThread::UI); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -27,7 +18,7 @@ // Don't download pdf if it is a file URL, as that might cause an infinite // download loop if Chrome is not the system pdf viewer. if (url.SchemeIsFile() && download_prefs_->ShouldOpenPdfInSystemReader()) { -@@ -1760,7 +1760,7 @@ std::unique_ptr<download::DownloadItemRenameHandler> +@@ -1710,7 +1710,7 @@ std::unique_ptr<download::DownloadItemRenameHandler> ChromeDownloadManagerDelegate::GetRenameHandlerForDownload( download::DownloadItem* download_item) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -36,12 +27,12 @@ return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded( download_item); #else -@@ -1776,7 +1776,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl +@@ -1726,7 +1726,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl DCHECK(download_item->IsSavePackageDownload()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (!base::FeatureList::IsEnabled( - download::features::kAllowSavePackageScanning)) { - std::move(callback).Run(true); + absl::optional<enterprise_connectors::AnalysisSettings> settings = + safe_browsing::DeepScanningRequest::ShouldUploadBinary(download_item); + diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.cc b/www/iridium/files/patch-chrome_browser_download_download__commands.cc index 3ba98e4147e4..f12179ed5955 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/download/download_commands.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_commands.cc -@@ -27,7 +27,7 @@ +@@ -26,7 +26,7 @@ #include "ui/base/clipboard/scoped_clipboard_writer.h" #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_finder.h" #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" -@@ -168,7 +168,7 @@ void DownloadCommands::ExecuteCommand(Command command) +@@ -167,7 +167,7 @@ void DownloadCommands::ExecuteCommand(Command command) } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_download_download__commands.h b/www/iridium/files/patch-chrome_browser_download_download__commands.h index 98a6891d7a22..48fb7e08c9b1 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__commands.h +++ b/www/iridium/files/patch-chrome_browser_download_download__commands.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_commands.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/download/download_commands.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_commands.h -@@ -54,7 +54,7 @@ class DownloadCommands { +@@ -55,7 +55,7 @@ class DownloadCommands { void ExecuteCommand(Command command); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc new file mode 100644 index 000000000000..9b9a3e9b3e0d --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_download_download__file__picker.cc @@ -0,0 +1,20 @@ +--- chrome/browser/download/download_file_picker.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/download/download_file_picker.cc +@@ -16,7 +16,7 @@ + #include "content/public/browser/download_manager.h" + #include "content/public/browser/web_contents.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "chrome/browser/ui/browser_list.h" + #include "chrome/browser/ui/browser_window.h" + #include "ui/aura/window.h" +@@ -84,7 +84,7 @@ DownloadFilePicker::DownloadFilePicker(download::Downl + // dialog in Linux (See SelectFileImpl() in select_file_dialog_linux_gtk.cc). + // and windows.Here we make owning_window host to browser current active + // window if it is null. https://crbug.com/1301898 +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + if (!owning_window || !owning_window->GetHost()) { + owning_window = BrowserList::GetInstance() + ->GetLastActive() diff --git a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc index 49f14ac32745..8d188458ea48 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__item__model.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__item__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_item_model.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/download/download_item_model.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_item_model.cc -@@ -640,7 +640,7 @@ bool DownloadItemModel::IsCommandChecked( +@@ -731,7 +731,7 @@ bool DownloadItemModel::IsCommandChecked( download_crx_util::IsExtensionDownload(*download_); case DownloadCommands::ALWAYS_OPEN_TYPE: #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ if (download_commands->CanOpenPdfInSystemViewer()) { DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); return prefs->ShouldOpenPdfInSystemReader(); -@@ -681,7 +681,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand +@@ -773,7 +773,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand DownloadCommands::ALWAYS_OPEN_TYPE); DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -18,3 +18,12 @@ if (download_commands->CanOpenPdfInSystemViewer()) { prefs->SetShouldOpenPdfInSystemReader(!is_checked); SetShouldPreferOpeningInBrowser(is_checked); +@@ -1087,7 +1087,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe + return; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (download_->GetOriginalMimeType() == "application/x-x509-user-cert") { + SetShouldPreferOpeningInBrowser(true); + return; diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc index fc8510595e77..154af636edab 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc @@ -1,4 +1,4 @@ ---- chrome/browser/download/download_prefs.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/download/download_prefs.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_prefs.cc @@ -13,6 +13,7 @@ #include "base/callback_helpers.h" @@ -8,7 +8,7 @@ #include "base/feature_list.h" #include "base/files/file_util.h" #include "base/no_destructor.h" -@@ -60,6 +61,10 @@ +@@ -61,6 +62,10 @@ #include "chrome/browser/ui/pdf/adobe_reader_info_win.h" #endif @@ -19,7 +19,7 @@ using content::BrowserContext; using content::BrowserThread; using content::DownloadManager; -@@ -70,7 +75,7 @@ namespace { +@@ -71,7 +76,7 @@ namespace { // Consider downloads 'dangerous' if they go to the home directory on Linux and // to the desktop on any platform. bool DownloadPathIsDangerous(const base::FilePath& download_path) { @@ -28,7 +28,7 @@ base::FilePath home_dir = base::GetHomeDir(); if (download_path == home_dir) { return true; -@@ -168,7 +173,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi +@@ -182,7 +187,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi #endif // BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -37,34 +37,16 @@ should_open_pdf_in_system_reader_ = prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader); #endif -@@ -287,7 +292,7 @@ void DownloadPrefs::RegisterProfilePrefs( - registry->RegisterFilePathPref(prefs::kSaveFileDefaultDirectory, - default_download_path); +@@ -302,7 +307,7 @@ void DownloadPrefs::RegisterProfilePrefs( + registry->RegisterTimePref(prefs::kDownloadLastCompleteTime, + /*default_value=*/base::Time()); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false); #endif #if BUILDFLAG(IS_ANDROID) -@@ -421,7 +426,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const { - - bool DownloadPrefs::IsAutoOpenByUserUsed() const { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (ShouldOpenPdfInSystemReader()) - return true; - #endif -@@ -436,7 +441,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url, - DCHECK(extension[0] == base::FilePath::kExtensionSeparator); - extension.erase(0, 1); - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - if (base::FilePath::CompareEqualIgnoreCase(extension, - FILE_PATH_LITERAL("pdf")) && - ShouldOpenPdfInSystemReader()) -@@ -491,7 +496,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens +@@ -483,7 +488,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -73,7 +55,7 @@ void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) { if (should_open_pdf_in_system_reader_ == should_open) return; -@@ -513,7 +518,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons +@@ -515,7 +520,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons void DownloadPrefs::ResetAutoOpenByUser() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -82,7 +64,16 @@ SetShouldOpenPdfInSystemReader(false); #endif auto_open_by_user_.clear(); -@@ -653,7 +658,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa +@@ -546,7 +551,7 @@ void DownloadPrefs::SaveAutoOpenState() { + bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const { + #if BUILDFLAG(IS_CHROMEOS) + return false; // There is no UI for auto-open on ChromeOS. +-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + return ShouldOpenPdfInSystemReader(); + #else + return false; +@@ -670,7 +675,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa #else // If the stored download directory is an absolute path, we presume it's // correct; there's not really much more validation we can do here. diff --git a/www/iridium/files/patch-chrome_browser_download_download__prefs.h b/www/iridium/files/patch-chrome_browser_download_download__prefs.h index 05fb541074b9..e920f9239b18 100644 --- a/www/iridium/files/patch-chrome_browser_download_download__prefs.h +++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.h @@ -1,6 +1,6 @@ ---- chrome/browser/download/download_prefs.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/download/download_prefs.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/download/download_prefs.h -@@ -122,7 +122,7 @@ class DownloadPrefs { +@@ -125,7 +125,7 @@ class DownloadPrefs { void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ // Store the user preference to disk. If |should_open| is true, also disable // the built-in PDF plugin. If |should_open| is false, enable the PDF plugin. void SetShouldOpenPdfInSystemReader(bool should_open); -@@ -181,7 +181,7 @@ class DownloadPrefs { +@@ -185,7 +185,7 @@ class DownloadPrefs { std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc new file mode 100644 index 000000000000..e6d1c49f5703 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_analysis__service__settings.cc @@ -0,0 +1,16 @@ +--- chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/enterprise/connectors/analysis/analysis_service_settings.cc +@@ -142,11 +142,11 @@ AnalysisServiceSettings::AnalysisServiceSettings( + const char* verification_key = kKeyWindowsVerification; + #elif BUILDFLAG(IS_MAC) + const char* verification_key = kKeyMacVerification; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char* verification_key = kKeyLinuxVerification; + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const base::Value::Dict& dict = settings_value.GetDict(); + const base::Value::List* signatures = + dict.FindListByDottedPath(verification_key); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc index 1a745951bc9a..f5bb819f9561 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc @@ -1,15 +1,20 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc -@@ -12,7 +12,7 @@ - #include "components/keyed_service/content/browser_context_dependency_manager.h" +@@ -11,11 +11,11 @@ + #include "chrome/browser/profiles/profile.h" #include "components/keyed_service/core/keyed_service.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "chrome/browser/browser_process.h" + #if BUILDFLAG(IS_MAC) + #include "chrome/browser/enterprise/connectors/device_trust/browser/mac_device_trust_connector_service.h" +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h" + #endif // BUILDFLAG(IS_MAC) #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -37,7 +37,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi +@@ -40,7 +40,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi bool DeviceTrustConnectorServiceFactory::ServiceIsCreatedWithBrowserContext() const { @@ -18,7 +23,7 @@ return IsDeviceTrustConnectorFeatureEnabled(); #else return false; -@@ -58,7 +58,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil +@@ -59,7 +59,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil DeviceTrustConnectorService* service = nullptr; @@ -27,3 +32,12 @@ if (IsDeviceTrustConnectorFeatureEnabled()) { auto* key_manager = g_browser_process->browser_policy_connector() ->chrome_browser_cloud_management_controller() +@@ -67,7 +67,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil + #if BUILDFLAG(IS_MAC) + service = new MacDeviceTrustConnectorService( + key_manager, profile->GetPrefs(), g_browser_process->local_state()); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + service = new BrowserDeviceTrustConnectorService(key_manager, + profile->GetPrefs()); + #endif // BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc index 6f4bd21ea237..4fc9d6baf8d2 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc @@ -1,7 +1,7 @@ ---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc -@@ -21,7 +21,7 @@ - #include "components/policy/content/policy_blocklist_service.h" +@@ -22,7 +22,7 @@ + #include "components/policy/core/common/management/management_service.h" #include "content/public/browser/browser_context.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc new file mode 100644 index 000000000000..f1f86114fc4d --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_key__management_browser_commands_key__rotation__command__factory.cc @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/key_rotation_command_factory.cc +@@ -13,7 +13,7 @@ + + #if BUILDFLAG(IS_WIN) + #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/win_key_rotation_command.h" +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/linux_key_rotation_command.h" + #elif BUILDFLAG(IS_MAC) + #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/commands/mac_key_rotation_command.h" +@@ -45,7 +45,7 @@ std::unique_ptr<KeyRotationCommand> KeyRotationCommand + scoped_refptr<network::SharedURLLoaderFactory> url_loader_factory) { + #if BUILDFLAG(IS_WIN) + return std::make_unique<WinKeyRotationCommand>(); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return std::make_unique<LinuxKeyRotationCommand>(url_loader_factory); + #elif BUILDFLAG(IS_MAC) + return std::make_unique<MacKeyRotationCommand>(url_loader_factory); diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc index bed7ce934607..60b3857d4abd 100644 --- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc @@ -1,20 +1,20 @@ ---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc -@@ -14,7 +14,7 @@ - #include "chrome/browser/enterprise/connectors/device_trust/signals/signals_service_impl.h" +@@ -15,7 +15,7 @@ #include "chrome/browser/profiles/profile.h" + #include "components/policy/core/common/management/management_service.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) #include "base/check.h" #include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" -@@ -44,7 +44,7 @@ std::unique_ptr<SignalsService> CreateSignalsService( +@@ -52,7 +52,7 @@ std::unique_ptr<SignalsService> CreateSignalsService( decorators.push_back( std::make_unique<ContentSignalsDecorator>(policy_blocklist_service)); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - policy::ChromeBrowserPolicyConnector* browser_policy_connector = - g_browser_process->browser_policy_connector(); - DCHECK(browser_policy_connector); + policy::CloudPolicyStore* store = nullptr; + + // Managed device. diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc new file mode 100644 index 000000000000..aca8bb196f9c --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc @@ -0,0 +1,19 @@ +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc +@@ -18,14 +18,14 @@ + #include "chrome/common/chrome_paths.h" + #include "components/version_info/version_info.h" + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + #include "components/crash/core/app/crashpad.h" + #include "third_party/crashpad/crashpad/client/crash_report_database.h" + #endif // !BUILDFLAG(IS_FUCHSIA) + + namespace enterprise_connectors { + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + namespace { + // key names used when building the dictionary to pass to the real-time + // reporting API diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h new file mode 100644 index 000000000000..8b0d93510578 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.h @@ -0,0 +1,20 @@ +--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h +@@ -22,7 +22,7 @@ class BrowserCrashEventRouter + BrowserCrashEventRouter& operator=(const BrowserCrashEventRouter&) = delete; + ~BrowserCrashEventRouter() override; + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + void OnCloudReportingLaunched( + enterprise_reporting::ReportScheduler* report_scheduler) override; + #endif // !BUILDFLAG(IS_FUCHSIA) +@@ -32,7 +32,7 @@ class BrowserCrashEventRouter + nullptr; + raw_ptr<policy::ChromeBrowserCloudManagementController> controller_ = nullptr; + +-#if !BUILDFLAG(IS_FUCHSIA) ++#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD) + // ReportCrashes() checks the enterprise policy settings, retrieves crash + // reports from the crashpad local database and sends reports that have not + // been sent to the reporting server. diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn index 37560db6f1c2..d390d215f8bd 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/extensions/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/BUILD.gn -@@ -1299,6 +1299,10 @@ static_library("extensions") { +@@ -1332,6 +1332,10 @@ static_library("extensions") { deps += [ "//chrome/services/printing/public/mojom" ] } diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc index 71c1a2728610..bb8fb75590cd 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc @@ -1,4 +1,4 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc @@ -24,7 +24,7 @@ #include "base/win/registry.h" @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/nix/xdg_util.h" #endif -@@ -208,7 +208,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() { bool got_path = false; #if BUILDFLAG(IS_WIN) got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path); @@ -18,7 +18,7 @@ std::unique_ptr<base::Environment> env(base::Environment::Create()); path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar, base::nix::kDotConfigDir); -@@ -219,7 +219,7 @@ base::FilePath GetEndpointVerificationDir() { +@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() { if (!got_path) return path; diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc new file mode 100644 index 000000000000..d16ed579902c --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.cc @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.cc +@@ -6,7 +6,7 @@ + + #include "build/build_config.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + #include <memory> + #include <utility> diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h new file mode 100644 index 000000000000..25d560bc078a --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_conversion__utils.h @@ -0,0 +1,11 @@ +--- chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h +@@ -7,7 +7,7 @@ + + #include "build/build_config.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + #include <vector> + diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc index 9e8b0249e655..519a666554c7 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc @@ -1,6 +1,24 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc -@@ -155,7 +155,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: +@@ -31,7 +31,7 @@ + #include "components/reporting/util/statusor.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/strings/string_util.h" + #include "chrome/browser/enterprise/signals/signals_aggregator_factory.h" + #include "chrome/browser/extensions/api/enterprise_reporting_private/conversion_utils.h" +@@ -155,7 +155,7 @@ api::enterprise_reporting_private::ContextInfo ToConte + return info; + } + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + device_signals::SignalsAggregationRequest CreateAggregationRequest( + const std::string& user_id, +@@ -215,7 +215,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction:: // getPersistentSecret @@ -9,3 +27,12 @@ EnterpriseReportingPrivateGetPersistentSecretFunction:: EnterpriseReportingPrivateGetPersistentSecretFunction() = default; +@@ -655,7 +655,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction:: + } + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + // getFileSystemInfo + diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h index a0b9e6578dba..459dd1553853 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h +++ b/www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h @@ -1,6 +1,15 @@ ---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h -@@ -45,7 +45,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : +@@ -19,7 +19,7 @@ + #include "components/reporting/proto/synced/record.pb.h" + #include "components/reporting/proto/synced/record_constants.pb.h" + #include "components/reporting/util/statusor.h" +-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/device_signals/core/browser/signals_types.h" + #endif // BUILDFLAG(IS_CHROMEOS) + +@@ -54,7 +54,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction : ~EnterpriseReportingPrivateGetDeviceIdFunction() override; }; @@ -9,3 +18,12 @@ class EnterpriseReportingPrivateGetPersistentSecretFunction : public ExtensionFunction { +@@ -264,7 +264,7 @@ class EnterpriseReportingPrivateEnqueueRecordFunction + + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + class EnterpriseReportingPrivateGetFileSystemInfoFunction + : public ExtensionFunction { diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc index 64813d2cf340..5a02959f36c8 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_image__writer__private_removable__storage__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/image_writer_private/removable_storage_provider.cc -@@ -22,6 +22,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL +@@ -21,6 +21,7 @@ static base::LazyInstance<scoped_refptr<StorageDeviceL void RemovableStorageProvider::GetAllDevices(DeviceListReadyCallback callback) { DCHECK_CURRENTLY_ON(content::BrowserThread::UI); @@ -8,7 +8,7 @@ if (g_test_device_list.Get().get() != nullptr) { base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, -@@ -35,6 +36,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis +@@ -34,6 +35,9 @@ void RemovableStorageProvider::GetAllDevices(DeviceLis base::TaskShutdownBehavior::SKIP_ON_SHUTDOWN}, base::BindOnce(&RemovableStorageProvider::PopulateDeviceList), std::move(callback)); diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc index 28742ea1988b..1875d794c31a 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/settings_private/prefs_util.cc -@@ -182,7 +182,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -187,7 +187,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ (*s_allowlist)[::prefs::kUseCustomChromeFrame] = settings_api::PrefType::PREF_TYPE_BOOLEAN; #endif -@@ -196,7 +196,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist +@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist settings_api::PrefType::PREF_TYPE_NUMBER; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc index c2d7a575d820..d75962f3a55c 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ #include "extensions/browser/process_manager.h" #include "extensions/common/error_utils.h" @@ -9,7 +9,7 @@ #include "extensions/common/permissions/permissions_data.h" #endif -@@ -39,7 +39,7 @@ namespace { +@@ -38,7 +38,7 @@ namespace { bool CanEnableAudioDebugRecordingsFromExtension( const extensions::Extension* extension) { bool enabled_by_permissions = false; diff --git a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc index c98fc0f0510a..4ff312c9f9a5 100644 --- a/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc @@ -1,6 +1,6 @@ ---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/extensions/browser_context_keyed_service_factories.cc -@@ -52,7 +52,7 @@ +@@ -53,7 +53,7 @@ #include "extensions/browser/api/networking_private/networking_private_delegate_factory.h" #include "ppapi/buildflags/buildflags.h" @@ -9,10 +9,10 @@ #include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h" #endif -@@ -124,7 +124,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() +@@ -122,7 +122,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() extensions::SettingsPrivateEventRouterFactory::GetInstance(); extensions::SettingsOverridesAPI::GetFactoryInstance(); - extensions::SignedInDevicesManager::GetFactoryInstance(); + extensions::SidePanelService::GetFactoryInstance(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) extensions::SystemIndicatorManagerFactory::GetInstance(); diff --git a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc index 3e8b30e0e335..1e2ff2cddb93 100644 --- a/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc +++ b/www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc @@ -1,6 +1,6 @@ ---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc -@@ -217,7 +217,7 @@ const struct { +@@ -254,7 +254,7 @@ const struct { {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"), kDontBlockChildren}, #endif diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h index de61b89cd961..3eb6923fa7a0 100644 --- a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h +++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal.h @@ -1,11 +1,11 @@ ---- chrome/browser/first_run/first_run_internal.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/first_run/first_run_internal.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/first_run/first_run_internal.h -@@ -58,7 +58,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel +@@ -56,7 +56,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel + bool force_first_run, + bool no_first_run); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // For testing, forces the first run dialog to either be shown or not. If not // called, the decision to show the dialog or not will be made by Chrome based // on a number of factors (such as install type, whether it's a Chrome-branded diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc index 1c3cfa8f1871..974da531f97a 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc @@ -1,24 +1,24 @@ ---- chrome/browser/flag_descriptions.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/flag_descriptions.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/flag_descriptions.cc -@@ -5508,7 +5508,7 @@ const char kDownloadShelfWebUIDescription[] = +@@ -6226,7 +6226,7 @@ const char kSideSearchDSESupportDescription[] = // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - - const char kWebuiFeedbackName[] = "WebUI Feedback"; - const char kWebuiFeedbackDescription[] = -@@ -5519,7 +5519,7 @@ const char kWebuiFeedbackDescription[] = - // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + const char kQuickCommandsName[] = "Quick Commands"; + const char kQuickCommandsDescription[] = + "Enable a text interface to browser features. Invoke with Ctrl-Space."; +@@ -6235,7 +6235,7 @@ const char kQuickCommandsDescription[] = + // BUILDFLAG(IS_FUCHSIA) - const char kCommanderName[] = "Commander"; - const char kCommanderDescription[] = -@@ -5545,7 +5545,7 @@ const char kWebShareDescription[] = + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel"; + const char kFollowingFeedSidepanelDescription[] = + "Enables the following feed in the sidepanel."; +@@ -6249,7 +6249,7 @@ const char kWebShareDescription[] = "platforms."; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) @@ -27,16 +27,16 @@ const char kOzonePlatformHintChoiceDefault[] = "Default"; const char kOzonePlatformHintChoiceAuto[] = "Auto"; const char kOzonePlatformHintChoiceX11[] = "X11"; -@@ -5557,7 +5557,7 @@ const char kOzonePlatformHintDescription[] = - "\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. "; - #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +@@ -6269,7 +6269,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti + "Bluetooth"; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const char kCleanUndecryptablePasswordsLinuxName[] = "Cleanup local undecryptable passwords during initial sync flow"; const char kCleanUndecryptablePasswordsLinuxDescription[] = -@@ -5570,7 +5570,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail +@@ -6282,7 +6282,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail "storage and requests initial sync."; #endif // BUILDFLAG(IS_LINUX) @@ -45,7 +45,16 @@ const char kSkipUndecryptablePasswordsName[] = "Skip undecryptable passwords to use the available decryptable " "passwords."; -@@ -5687,7 +5687,7 @@ const char kElasticOverscrollDescription[] = +@@ -6291,7 +6291,7 @@ const char kSkipUndecryptablePasswordsDescription[] = + "there are undecryptable ones."; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kAsyncDnsName[] = "Async DNS resolver"; + const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver."; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +@@ -6396,7 +6396,7 @@ const char kElasticOverscrollDescription[] = #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h index 852395a2e121..66ef087962bd 100644 --- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h +++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h @@ -1,33 +1,24 @@ ---- chrome/browser/flag_descriptions.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/flag_descriptions.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/flag_descriptions.h -@@ -3178,7 +3178,7 @@ extern const char kDownloadShelfWebUIDescription[]; +@@ -3574,7 +3574,7 @@ extern const char kSideSearchDSESupportDescription[]; // Random platform combinations ----------------------------------------------- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - - extern const char kWebuiFeedbackName[]; - extern const char kWebuiFeedbackDescription[]; -@@ -3187,7 +3187,7 @@ extern const char kWebuiFeedbackDescription[]; - // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + extern const char kQuickCommandsName[]; + extern const char kQuickCommandsDescription[]; - extern const char kCommanderName[]; - extern const char kCommanderDescription[]; -@@ -3206,7 +3206,7 @@ extern const char kWebShareName[]; - extern const char kWebShareDescription[]; - #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +@@ -3591,7 +3591,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa + extern const char kWebBluetoothConfirmPairingSupportDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const char kOzonePlatformHintChoiceDefault[]; extern const char kOzonePlatformHintChoiceAuto[]; extern const char kOzonePlatformHintChoiceX11[]; -@@ -3222,7 +3222,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt +@@ -3607,18 +3607,18 @@ extern const char kForcePasswordInitialSyncWhenDecrypt extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[]; #endif // BUILDFLAG(IS_LINUX) @@ -36,7 +27,20 @@ extern const char kSkipUndecryptablePasswordsName[]; extern const char kSkipUndecryptablePasswordsDescription[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -@@ -3304,7 +3304,7 @@ extern const char kElasticOverscrollDescription[]; + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + extern const char kAsyncDnsName[]; + extern const char kAsyncDnsDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + extern const char kFollowingFeedSidepanelName[]; + extern const char kFollowingFeedSidepanelDescription[]; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -3695,7 +3695,7 @@ extern const char kElasticOverscrollDescription[]; #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ @@ -44,4 +48,4 @@ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kUIDebugToolsName[]; extern const char kUIDebugToolsDescription[]; - #endif + diff --git a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc index 8c14cf584002..dbd5900ac03f 100644 --- a/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc +++ b/www/iridium/files/patch-chrome_browser_media_audio__service__util.cc @@ -1,4 +1,4 @@ ---- chrome/browser/media/audio_service_util.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media/audio_service_util.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/media/audio_service_util.cc @@ -21,7 +21,7 @@ @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) bool GetPolicyOrFeature(const char* policy_name, const base::Feature& feature) { const policy::PolicyMap& policies = -@@ -41,7 +41,7 @@ bool GetPolicyOrFeature(const char* policy_name, const +@@ -40,7 +40,7 @@ bool GetPolicyOrFeature(const char* policy_name, const bool IsAudioServiceSandboxEnabled() { // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. diff --git a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn index c90a233b8f79..6413e1c86e81 100644 --- a/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn +++ b/www/iridium/files/patch-chrome_browser_media_router_discovery_BUILD.gn @@ -1,6 +1,6 @@ ---- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/media/router/discovery/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/media/router/discovery/BUILD.gn -@@ -94,7 +94,7 @@ static_library("discovery") { +@@ -79,7 +79,7 @@ static_library("discovery") { "media_sink_discovery_metrics.h", ] diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc index 4f31027db3b6..6d6c37b1bd96 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/media/webrtc/webrtc_log_uploader.cc -@@ -363,6 +363,10 @@ void WebRtcLogUploader::SetupMultipart( +@@ -362,6 +362,10 @@ void WebRtcLogUploader::SetupMultipart( const char product[] = "Chrome_ChromeOS"; #elif BUILDFLAG(IS_FUCHSIA) const char product[] = "Chrome_Fuchsia"; diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc index 87ebb9c6931f..88e0199ad9fb 100644 --- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc +++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/media/webrtc/webrtc_logging_controller.cc -@@ -25,10 +25,10 @@ +@@ -24,10 +24,10 @@ #include "content/public/browser/browser_context.h" #include "content/public/browser/render_process_host.h" @@ -13,7 +13,7 @@ using webrtc_event_logging::WebRtcEventLogManager; -@@ -282,7 +282,7 @@ void WebRtcLoggingController::StartEventLogging( +@@ -281,7 +281,7 @@ void WebRtcLoggingController::StartEventLogging( web_app_id, callback); } @@ -22,7 +22,7 @@ void WebRtcLoggingController::GetLogsDirectory( LogsDirectoryCallback callback, LogsDirectoryErrorCallback error_callback) { -@@ -328,7 +328,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess +@@ -327,7 +327,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess FROM_HERE, base::BindOnce(std::move(callback), file_system.id(), registered_name)); } diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc index c83720399e82..dd9c42c7d272 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc @@ -1,6 +1,6 @@ ---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc -@@ -57,8 +57,10 @@ +@@ -58,8 +58,10 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -12,7 +12,7 @@ #include "base/linux_util.h" #include "base/strings/string_split.h" -@@ -223,7 +225,7 @@ void RecordStartupMetrics() { +@@ -516,7 +518,7 @@ void RecordStartupMetrics() { // Record whether Chrome is the default browser or not. // Disabled on Linux due to hanging browser tests, see crbug.com/1216328. diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc index dc9485b16cbe..86455309a176 100644 --- a/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc +++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc @@ -1,6 +1,24 @@ ---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/metrics/chrome_metrics_service_client.cc -@@ -773,7 +773,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -174,7 +174,7 @@ + #include "chrome/notification_helper/notification_helper_constants.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/metrics/motherboard_metrics_provider.h" + #endif + +@@ -721,7 +721,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic + metrics_service_->RegisterMetricsProvider( + std::make_unique<metrics::CPUMetricsProvider>()); + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + metrics_service_->RegisterMetricsProvider( + std::make_unique<metrics::MotherboardMetricsProvider>()); + #endif +@@ -798,7 +798,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +27,7 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics_service_->RegisterMetricsProvider( std::make_unique<DesktopPlatformFeaturesMetricsProvider>()); -@@ -869,7 +869,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic +@@ -890,7 +890,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic std::make_unique<PowerMetricsProvider>()); #endif @@ -18,7 +36,7 @@ metrics_service_->RegisterMetricsProvider( metrics::CreateDesktopSessionMetricsProvider()); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) -@@ -1045,7 +1045,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve +@@ -1073,7 +1073,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc new file mode 100644 index 000000000000..a2b475fb749f --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc @@ -0,0 +1,11 @@ +--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/metrics/power/process_metrics_recorder_util.cc +@@ -59,7 +59,7 @@ void RecordProcessHistograms(const char* histogram_suf + const ProcessMonitor::Metrics& metrics) { + RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage); + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + base::UmaHistogramCounts10000( + base::StrCat({"PerformanceMonitor.IdleWakeups2.", histogram_suffix}), + metrics.idle_wakeups); diff --git a/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc new file mode 100644 index 000000000000..ed6557e14480 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.cc @@ -0,0 +1,29 @@ +--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/metrics/power/process_monitor.cc +@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet + #endif + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond(); + #endif + #if BUILDFLAG(IS_MAC) +@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do + metrics->cpu_usage *= factor; + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + metrics->idle_wakeups *= factor; + #endif + +@@ -130,7 +130,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me + lhs.cpu_usage += rhs.cpu_usage; + + #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ +- BUILDFLAG(IS_AIX) ++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) + lhs.idle_wakeups += rhs.idle_wakeups; + #endif + diff --git a/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h index 90a31ee2631a..fef39301f47c 100644 --- a/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.h +++ b/www/iridium/files/patch-chrome_browser_metrics_power_process__monitor.h @@ -1,6 +1,6 @@ ---- chrome/browser/performance_monitor/process_monitor.h.orig 2022-04-01 07:48:30 UTC -+++ chrome/browser/performance_monitor/process_monitor.h -@@ -52,7 +52,7 @@ class ProcessMonitor { +--- chrome/browser/metrics/power/process_monitor.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/metrics/power/process_monitor.h +@@ -70,7 +70,7 @@ class ProcessMonitor : public content::BrowserChildPro double cpu_usage = 0.0; #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc index 89a5cd56d727..0d99aec179ed 100644 --- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc +++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc @@ -1,6 +1,6 @@ ---- chrome/browser/net/system_network_context_manager.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/net/system_network_context_manager.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/net/system_network_context_manager.cc -@@ -84,7 +84,7 @@ +@@ -91,7 +91,7 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ #include "chrome/common/chrome_paths_internal.h" #include "chrome/grit/chromium_strings.h" #include "ui/base/l10n/l10n_util.h" -@@ -144,7 +144,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut +@@ -173,7 +173,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut auth_dynamic_params->basic_over_http_enabled = local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled); @@ -18,7 +18,7 @@ auth_dynamic_params->delegate_by_kdc_policy = local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -377,7 +377,7 @@ SystemNetworkContextManager::SystemNetworkContextManag +@@ -484,7 +484,7 @@ SystemNetworkContextManager::SystemNetworkContextManag pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins, auth_pref_callback); @@ -27,10 +27,10 @@ pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy, auth_pref_callback); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -437,7 +437,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe - registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string()); - registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist, - std::string()); +@@ -556,7 +556,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe + registry->RegisterBooleanPref(prefs::kKerberosEnabled, false); + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) + -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy, diff --git a/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc new file mode 100644 index 000000000000..a89356fbdc99 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_new__tab__page_new__tab__page__util.cc @@ -0,0 +1,11 @@ +--- chrome/browser/new_tab_page/new_tab_page_util.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/new_tab_page/new_tab_page_util.cc +@@ -11,7 +11,7 @@ + + namespace { + bool IsOsSupportedForRecipe() { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return true; + #else + return false; diff --git a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc index 0874da625e53..db2fa7fcfd2d 100644 --- a/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc +++ b/www/iridium/files/patch-chrome_browser_notifications_notification__display__service__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/notifications/notification_display_service_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/notifications/notification_display_service_impl.cc @@ -32,7 +32,7 @@ #endif @@ -15,10 +15,10 @@ user_prefs::PrefRegistrySyncable* registry) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - registry->RegisterBooleanPref(prefs::kAllowNativeNotifications, true); registry->RegisterBooleanPref(prefs::kAllowSystemNotifications, true); #endif -@@ -82,7 +82,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer + } +@@ -81,7 +81,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer std::make_unique<PersistentNotificationHandler>()); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -27,7 +27,7 @@ AddNotificationHandler( NotificationHandler::Type::SEND_TAB_TO_SELF, std::make_unique<send_tab_to_self::DesktopNotificationHandler>( -@@ -90,7 +90,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer +@@ -89,7 +89,7 @@ NotificationDisplayServiceImpl::NotificationDisplaySer #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc index 1c0a6176e495..0d1c471f4e10 100644 --- a/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc +++ b/www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/password_manager/password_reuse_manager_factory.cc -@@ -94,7 +94,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic +@@ -92,7 +92,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc b/www/iridium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc deleted file mode 100644 index f963880d0ace..000000000000 --- a/www/iridium/files/patch-chrome_browser_performance__manager_policies_high__pmf__discard__policy.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/performance_manager/policies/high_pmf_discard_policy.cc -@@ -17,7 +17,7 @@ - #include "content/public/browser/browser_task_traits.h" - #include "content/public/browser/browser_thread.h" - --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - #include "base/memory/memory_pressure_monitor.h" - #endif - -@@ -122,7 +122,7 @@ void HighPMFDiscardPolicy::OnProcessMemoryMetricsAvail - - if (should_discard) { - discard_attempt_in_progress_ = true; --#if !BUILDFLAG(IS_LINUX) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) - // Record the memory pressure level before discarding a tab. - content::GetUIThreadTaskRunner({})->PostTask( - FROM_HERE, base::BindOnce([]() { diff --git a/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc b/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc deleted file mode 100644 index c9bb97b3ea66..000000000000 --- a/www/iridium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-04-01 07:48:30 UTC -+++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc -@@ -39,7 +39,7 @@ void RecordProcessHistograms(const char* histogram_suf - metrics.cpu_usage * kCPUUsageFactor, kCPUUsageHistogramMin, - kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount); - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_AIX) -+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - base::UmaHistogramCounts10000( - base::JoinString({"PerformanceMonitor.IdleWakeups.", histogram_suffix}, - ""), diff --git a/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.cc deleted file mode 100644 index 6d5d461621f2..000000000000 --- a/www/iridium/files/patch-chrome_browser_performance__monitor_process__monitor.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/performance_monitor/process_monitor.cc -@@ -82,7 +82,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me - lhs.cpu_usage += rhs.cpu_usage; - - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_AIX) -+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD) - lhs.idle_wakeups += rhs.idle_wakeups; - #endif - diff --git a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc index bb36e6f76119..8a2d6bccdc86 100644 --- a/www/iridium/files/patch-chrome_browser_platform__util__linux.cc +++ b/www/iridium/files/patch-chrome_browser_platform__util__linux.cc @@ -1,6 +1,6 @@ ---- chrome/browser/platform_util_linux.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/platform_util_linux.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/platform_util_linux.cc -@@ -298,7 +298,9 @@ void RunCommand(const std::string& command, +@@ -295,7 +295,9 @@ void RunCommand(const std::string& command, base::LaunchOptions options; options.current_directory = working_directory; diff --git a/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc deleted file mode 100644 index 871a3d42b99c..000000000000 --- a/www/iridium/files/patch-chrome_browser_plugins_plugins__resource__service.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/plugins/plugins_resource_service.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/plugins/plugins_resource_service.cc -@@ -62,7 +62,7 @@ GURL GetPluginsServerURL() { - filename = "plugins_win.json"; - #elif BUILDFLAG(IS_CHROMEOS_ASH) - filename = "plugins_chromeos.json"; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - filename = "plugins_linux.json"; - #elif BUILDFLAG(IS_MAC) - filename = "plugins_mac.json"; diff --git a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc index 966f352f40af..4548084bdef9 100644 --- a/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc +++ b/www/iridium/files/patch-chrome_browser_policy_browser__signin__policy__handler.cc @@ -1,7 +1,7 @@ ---- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/policy/browser_signin_policy_handler.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/policy/browser_signin_policy_handler.cc -@@ -43,7 +43,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c - const base::Value* value = policies.GetValue(policy_name()); +@@ -44,7 +44,7 @@ void BrowserSigninPolicyHandler::ApplyPolicySettings(c + policies.GetValue(policy_name(), base::Value::Type::INTEGER); switch (static_cast<BrowserSigninMode>(value->GetInt())) { case BrowserSigninMode::kForced: -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc b/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc index f3bba5c3ea6a..e68847803722 100644 --- a/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc +++ b/www/iridium/files/patch-chrome_browser_policy_chrome__browser__cloud__management__controller__desktop.cc @@ -1,6 +1,6 @@ ---- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/policy/chrome_browser_cloud_management_controller_desktop.cc -@@ -46,7 +46,7 @@ +@@ -47,7 +47,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_mac.h" #endif // BUILDFLAG(IS_MAC) @@ -9,7 +9,7 @@ #include "chrome/browser/policy/browser_dm_token_storage_linux.h" #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -55,7 +55,7 @@ +@@ -56,7 +56,7 @@ #include "chrome/install_static/install_util.h" #endif // BUILDFLAG(IS_WIN) @@ -18,7 +18,7 @@ #include "chrome/browser/enterprise/connectors/device_trust/device_trust_features.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/device_trust_key_manager_impl.h" #include "chrome/browser/enterprise/connectors/device_trust/key_management/browser/key_rotation_launcher.h" -@@ -88,7 +88,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: +@@ -89,7 +89,7 @@ void ChromeBrowserCloudManagementControllerDesktop:: #if BUILDFLAG(IS_MAC) storage_delegate = std::make_unique<BrowserDMTokenStorageMac>(); @@ -27,7 +27,7 @@ storage_delegate = std::make_unique<BrowserDMTokenStorageLinux>(); #elif BUILDFLAG(IS_WIN) storage_delegate = std::make_unique<BrowserDMTokenStorageWin>(); -@@ -243,7 +243,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC +@@ -244,7 +244,7 @@ ChromeBrowserCloudManagementControllerDesktop::CreateC std::unique_ptr<enterprise_connectors::DeviceTrustKeyManager> ChromeBrowserCloudManagementControllerDesktop::CreateDeviceTrustKeyManager() { diff --git a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc index a674a17985df..00174075da4d 100644 --- a/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc +++ b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc @@ -1,47 +1,129 @@ ---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/policy/configuration_policy_handler_list_factory.cc -@@ -1456,7 +1456,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = +@@ -189,12 +189,12 @@ + #include "components/spellcheck/browser/pref_names.h" + #endif // BUILDFLAG(ENABLE_SPELLCHECK) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "components/device_signals/core/browser/pref_names.h" + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h" + #endif + +@@ -725,7 +725,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kManagedDefaultGeolocationSetting, + base::Value::Type::INTEGER }, + #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \ +- || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + { key::kRequireOnlineRevocationChecksForLocalAnchors, + prefs::kCertRevocationCheckingRequiredLocalAnchors, + base::Value::Type::BOOLEAN }, +@@ -1330,7 +1330,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = base::Value::Type::BOOLEAN }, - #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS) + #endif // BUILDFLAG(IS_CHROMEOS_ASH) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kGSSAPILibraryName, + prefs::kGSSAPILibraryName, + base::Value::Type::STRING }, +@@ -1400,18 +1400,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + prefs::kTotalMemoryLimitMb, + base::Value::Type::INTEGER }, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kBackgroundModeEnabled, + prefs::kBackgroundModeEnabled, + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + { key::kUnmanagedDeviceSignalsConsentFlowEnabled, + device_signals::prefs::kUnmanagedDeviceSignalsConsentFlowEnabled, + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ +- || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + { key::kDefaultBrowserSettingEnabled, + prefs::kDefaultBrowserSettingEnabled, + base::Value::Type::BOOLEAN }, +@@ -1424,7 +1424,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + // || BUILDFLAG(IS_FUCHSIA) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) \ +- || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) ++ || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + { key::kAutoplayAllowed, + prefs::kAutoplayAllowed, + base::Value::Type::BOOLEAN }, +@@ -1609,7 +1609,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = + base::Value::Type::BOOLEAN }, + #endif // BUILDFLAG(IS_CHROMEOS) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) { key::kAuthNegotiateDelegateByKdcPolicy, prefs::kAuthNegotiateDelegateByKdcPolicy, base::Value::Type::BOOLEAN }, -@@ -1565,7 +1565,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = - base::Value::Type::BOOLEAN }, +@@ -1668,7 +1668,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] = #endif // BUILDFLAG(IS_CHROMEOS_ASH) --#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)) -+#if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #if BUILDFLAG(ENABLE_EXTENSIONS) && (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) \ +- || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) ++ || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) || BUILDFLAG(IS_BSD) { key::kChromeAppsEnabled, extensions::pref_names::kChromeAppsEnabled, base::Value::Type::BOOLEAN }, -@@ -1885,7 +1885,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - #endif // BUILDFLAG(IS_ANDROID) +@@ -2007,7 +2007,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime, + chrome_schema)); - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - handlers->AddHandler( - std::make_unique< - enterprise_connectors::EnterpriseConnectorsPolicyHandler>( -@@ -2256,7 +2256,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - SimpleSchemaValidatingPolicyHandler::MANDATORY_ALLOWED)); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>()); + handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +@@ -2036,7 +2036,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + std::vector<std::unique_ptr<ConfigurationPolicyHandler>> + signin_legacy_policies; + #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ +- BUILDFLAG(IS_LINUX) ++ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>( + key::kForceBrowserSignin, prefs::kForceBrowserSignin, + base::Value::Type::BOOLEAN)); +@@ -2369,7 +2369,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + chrome_schema)); #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - handlers->AddHandler(std::make_unique<SimpleSchemaValidatingPolicyHandler>( - key::kWebAppSettings, prefs::kWebAppSettings, chrome_schema, - SCHEMA_ALLOW_UNKNOWN, -@@ -2287,7 +2287,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH - policy::key::kSpellcheckLanguageBlocklist)); + handlers->AddHandler( + std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema)); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || +@@ -2382,7 +2382,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + #endif + + #if BUILDFLAG(ENABLE_SPELLCHECK) +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>()); + handlers->AddHandler( + std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>( +@@ -2390,7 +2390,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH + #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) #endif // BUILDFLAG(ENABLE_SPELLCHECK) -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - handlers->AddHandler(std::make_unique<SimpleDeprecatingPolicyHandler>( - std::make_unique<SimplePolicyHandler>(key::kAllowNativeNotifications, - prefs::kAllowNativeNotifications, + handlers->AddHandler(std::make_unique<SimplePolicyHandler>( + key::kAllowSystemNotifications, prefs::kAllowSystemNotifications, + base::Value::Type::BOOLEAN)); diff --git a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc index 71d0e148e2ed..1d9062af2193 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc @@ -1,13 +1,13 @@ ---- chrome/browser/prefs/browser_prefs.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/prefs/browser_prefs.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/prefs/browser_prefs.cc -@@ -418,14 +418,14 @@ +@@ -439,14 +439,14 @@ #include "components/os_crypt/os_crypt.h" #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "chrome/browser/web_applications/url_handler_prefs.h" + #include "components/device_signals/core/browser/pref_names.h" #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -17,25 +17,23 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/browser_switcher/browser_switcher_prefs.h" #endif -@@ -1139,7 +1139,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) - // TODO(crbug/1169547) Remove `BUILDFLAG(IS_CHROMEOS_LACROS)` once the - // migration is complete. - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - enterprise_connectors::RegisterLocalPrefs(registry); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) - -@@ -1171,7 +1171,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) +@@ -1214,7 +1214,7 @@ void RegisterLocalState(PrefRegistrySimple* registry) #endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) web_app::url_handler_prefs::RegisterLocalStatePrefs(registry); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -1531,13 +1531,13 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry); #endif -@@ -1469,7 +1469,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + device_signals::RegisterProfilePrefs(registry); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc index 39fffee9b1ed..61db7e1db227 100644 --- a/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc +++ b/www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc @@ -1,6 +1,6 @@ ---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/prefs/pref_service_incognito_allowlist.cc -@@ -139,7 +139,7 @@ const char* const kPersistentPrefNames[] = { +@@ -138,7 +138,7 @@ const char* const kPersistentPrefNames[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc new file mode 100644 index 000000000000..e70f88886f80 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc @@ -0,0 +1,29 @@ +--- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/printing/print_backend_service_manager.cc +@@ -481,7 +481,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R + query_clients_.insert(client_id); + break; + case ClientType::kQueryWithUi: +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + if (!query_with_ui_clients_.empty()) + return absl::nullopt; + #endif +@@ -706,7 +706,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate + break; + + case ClientType::kQueryWithUi: +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // No need to update if there were other query with UI clients. + if (query_with_ui_clients_.size() > 1) + return absl::nullopt; +@@ -763,7 +763,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate + return kNoClientsRegisteredResetOnIdleTimeout; + + case ClientType::kQueryWithUi: +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // No need to update if there were other query with UI clients. + if (!query_with_ui_clients_.empty()) + return absl::nullopt; diff --git a/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc b/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc index 9b23520a2036..d7c98e82f669 100644 --- a/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc +++ b/www/iridium/files/patch-chrome_browser_printing_print__job__worker.cc @@ -1,6 +1,6 @@ ---- chrome/browser/printing/print_job_worker.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/printing/print_job_worker.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/printing/print_job_worker.cc -@@ -225,7 +225,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value n +@@ -195,7 +195,7 @@ void PrintJobWorker::SetSettings(base::Value::Dict new crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>( print_backend->GetPrinterDriverInfo(printer_name)); diff --git a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc index 741ea318daa3..e91ae056c8f0 100644 --- a/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc +++ b/www/iridium/files/patch-chrome_browser_process__singleton__posix.cc @@ -1,6 +1,6 @@ ---- chrome/browser/process_singleton_posix.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/process_singleton_posix.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/process_singleton_posix.cc -@@ -98,12 +98,12 @@ +@@ -97,7 +97,7 @@ #include "net/base/network_interfaces.h" #include "ui/base/l10n/l10n_util.h" @@ -9,13 +9,7 @@ #include "chrome/browser/ui/process_singleton_dialog_linux.h" #endif - #if defined(TOOLKIT_VIEWS) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "ui/views/linux_ui/linux_ui.h" - #endif - -@@ -357,7 +357,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo +@@ -351,7 +351,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo if (g_disable_prompt) return g_user_opted_unlock_in_use_profile; @@ -24,12 +18,3 @@ std::u16string relaunch_button_text = l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH); return ShowProcessSingletonDialog(error, relaunch_button_text); -@@ -926,7 +926,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif - return PROCESS_NONE; - } else if (strncmp(buf, kACKToken, base::size(kACKToken) - 1) == 0) { - #if defined(TOOLKIT_VIEWS) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - // Likely NULL in unit tests. - views::LinuxUI* linux_ui = views::LinuxUI::instance(); - if (linux_ui) diff --git a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc index 6ef951573943..b2fb081d187e 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc @@ -1,6 +1,15 @@ ---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc -@@ -393,7 +393,7 @@ void ChromeBrowserMainExtraPartsProfiles:: +@@ -255,7 +255,7 @@ + #include "chrome/browser/ui/cocoa/screentime/screentime_features.h" + #endif + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/idle/idle_service_factory.h" + #endif + +@@ -435,11 +435,11 @@ void ChromeBrowserMainExtraPartsProfiles:: #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,3 +18,8 @@ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) metrics::DesktopProfileSessionDurationsServiceFactory::GetInstance(); #endif +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + enterprise_idle::IdleServiceFactory::GetInstance(); + #endif + ModelTypeStoreServiceFactory::GetInstance(); diff --git a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc index ef57e867a8ec..d9914b5b7e9b 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profile_impl.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/profiles/profile_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/profiles/profile_impl.cc -@@ -263,6 +263,10 @@ +@@ -261,6 +261,10 @@ #include "chrome/browser/spellchecker/spellcheck_service.h" #endif @@ -11,7 +11,7 @@ using bookmarks::BookmarkModel; using content::BrowserThread; using content::DownloadManagerDelegate; -@@ -848,7 +852,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) +@@ -851,7 +855,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode) } base::FilePath ProfileImpl::last_selected_directory() { diff --git a/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc index 9bfb5778baf3..fc540d87a49f 100644 --- a/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc +++ b/www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc @@ -1,6 +1,6 @@ ---- chrome/browser/profiles/profiles_state.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/profiles/profiles_state.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/profiles/profiles_state.cc -@@ -176,7 +176,7 @@ bool IsGuestModeRequested(const base::CommandLine& com +@@ -181,7 +181,7 @@ bool IsGuestModeRequested(const base::CommandLine& com PrefService* local_state, bool show_warning) { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc index a4e5f01fb39e..e7fa42eb5039 100644 --- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc +++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc @@ -1,21 +1,21 @@ ---- chrome/browser/renderer_preferences_util.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/renderer_preferences_util.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/renderer_preferences_util.cc @@ -37,7 +37,7 @@ #include "ui/views/controls/textfield/textfield.h" #endif --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) +-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) #include "chrome/browser/themes/theme_service.h" #include "chrome/browser/themes/theme_service_factory.h" - #include "ui/views/linux_ui/linux_ui.h" + #include "ui/linux/linux_ui.h" @@ -159,7 +159,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval(); #endif --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - views::LinuxUI* linux_ui = views::LinuxUI::instance(); +-#if defined(USE_AURA) && BUILDFLAG(IS_LINUX) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + ui::LinuxUi* linux_ui = ui::LinuxUi::instance(); if (linux_ui) { if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) { @@ -179,7 +179,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc diff --git a/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts b/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts new file mode 100644 index 000000000000..fdca0e8e76b0 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts @@ -0,0 +1,29 @@ +--- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts +@@ -2,7 +2,7 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + +-// <if expr="is_linux or is_chromeos"> ++// <if expr="is_posix or is_chromeos"> + import './strings.m.js'; + + import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js'; +@@ -121,7 +121,7 @@ function androidHandler() { + } + // </if> + +-// <if expr="is_linux or is_chromeos"> ++// <if expr="is_posix or is_chromeos"> + + /** + * Adds a status row that reports either Yes or No. +@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => { + // <if expr="is_android"> + androidHandler(); + // </if> +- // <if expr="is_linux or is_chromeos"> ++ // <if expr="is_posix or is_chromeos"> + linuxHandler(); + // </if> + }); diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts index 87c58b4470e0..606bb92511a8 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts @@ -1,11 +1,11 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts @@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy { useDefaultTheme(): void; -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> +- // <if expr="is_linux"> ++ // <if expr="is_bsd"> useSystemTheme(): void; // </if> @@ -13,8 +13,8 @@ chrome.send('useDefaultTheme'); } -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_bsd and not chromeos"> +- // <if expr="is_linux"> ++ // <if expr="is_bsd"> useSystemTheme() { chrome.send('useSystemTheme'); } diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html index dfceea09ee48..c1e1690188b5 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html @@ -1,11 +1,11 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.html @@ -27,7 +27,7 @@ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]" label="$i18n{themes}" sub-label="[[themeSublabel_]]" on-click="openThemeUrl_" external></cr-link-row> --<if expr="not is_linux or chromeos_ash or chromeos_lacros"> -+<if expr="not is_posix or chromeos_ash or chromeos_lacros"> +-<if expr="not is_linux"> ++<if expr="not is_posix"> <template is="dom-if" if="[[prefs.extensions.theme.id.value]]"> <div class="separator"></div> <cr-button id="useDefault" on-click="onUseDefaultTap_"> @@ -13,17 +13,17 @@ </cr-button> </template> </if> --<if expr="is_linux and not chromeos and not lacros"> -+<if expr="is_posix and not chromeos and not lacros"> +-<if expr="is_linux"> ++<if expr="is_posix"> <div class="settings-row continuation" hidden="[[!showThemesSecondary_( prefs.extensions.theme.id.value, useSystemTheme_)]]" -@@ -109,7 +109,7 @@ - pref="{{prefs.bookmark_bar.show_on_all_tabs}}" - label="$i18n{showBookmarksBar}"> - </settings-toggle-button> --<if expr="is_linux and not chromeos and not lacros"> -+<if expr="is_posix and not chromeos and not lacros"> +@@ -135,7 +135,7 @@ + </div> + </template> + +-<if expr="is_linux"> ++<if expr="is_posix"> <div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div> <settings-toggle-button hidden="[[!showCustomChromeFrame_]]" diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts index 2806916cf6fa..96805b25753f 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts +++ b/www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts @@ -1,51 +1,51 @@ ---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/resources/settings/appearance_page/appearance_page.ts -@@ -146,7 +146,7 @@ export class SettingsAppearancePageElement extends +@@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends 'prefs.autogenerated.theme.policy.color.controlledBy)', }, -- // <if expr="is_linux and not chromeos and not lacros"> -+ // <if expr="is_posix and not chromeos and not lacros"> +- // <if expr="is_linux"> ++ // <if expr="is_posix"> /** * Whether to show the "Custom Chrome Frame" setting. */ -@@ -168,7 +168,7 @@ export class SettingsAppearancePageElement extends +@@ -174,7 +174,7 @@ export class SettingsAppearancePageElement extends 'themeChanged_(' + 'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)', -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_posix and not chromeos"> +- // <if expr="is_linux"> ++ // <if expr="is_posix"> // NOTE: this pref only exists on Linux. 'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)', // </if> -@@ -187,7 +187,7 @@ export class SettingsAppearancePageElement extends +@@ -194,7 +194,7 @@ export class SettingsAppearancePageElement extends private showReaderModeOption_: boolean; private isForcedTheme_: boolean; -- // <if expr="is_linux and not chromeos and not lacros"> -+ // <if expr="is_posix and not chromeos and not lacros"> +- // <if expr="is_linux"> ++ // <if expr="is_posix"> private showCustomChromeFrame_: boolean; // </if> -@@ -265,7 +265,7 @@ export class SettingsAppearancePageElement extends +@@ -272,7 +272,7 @@ export class SettingsAppearancePageElement extends this.appearanceBrowserProxy_.useDefaultTheme(); } -- // <if expr="is_linux and not chromeos"> -+ // <if expr="is_posix and not chromeos"> +- // <if expr="is_linux"> ++ // <if expr="is_posix"> private useSystemThemePrefChanged_(useSystemTheme: boolean) { this.useSystemTheme_ = useSystemTheme; } -@@ -326,10 +326,10 @@ export class SettingsAppearancePageElement extends +@@ -333,10 +333,10 @@ export class SettingsAppearancePageElement extends } let i18nId; -- // <if expr="is_linux and not chromeos and not lacros"> -+ // <if expr="is_posix and not chromeos and not lacros"> +- // <if expr="is_linux"> ++ // <if expr="is_posix"> i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme'; // </if> -- // <if expr="not is_linux or chromeos_ash or chromeos_lacros"> -+ // <if expr="not is_posix or chromeos_ash or chromeos_lacros"> +- // <if expr="not is_linux"> ++ // <if expr="not is_posix"> i18nId = 'chooseFromWebStore'; // </if> this.themeSublabel_ = this.i18n(i18nId); diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css b/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css new file mode 100644 index 000000000000..36661037a2b8 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css @@ -0,0 +1,11 @@ +--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/resources/settings/autofill_page/passwords_shared.css +@@ -90,7 +90,7 @@ cr-input.password-input::part(input), + * necessary to prevent Chrome from using the operating system's font + * instead of the Material Design font. + * TODO(dbeam): why not font: inherit? */ +-<if expr="is_linux or is_chromeos"> ++<if expr="is_posix or is_chromeos"> + font-family: 'DejaVu Sans Mono', monospace; + </if> + <if expr="is_win"> diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html b/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html deleted file mode 100644 index ad3e5b01bcb4..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/resources/settings/autofill_page/passwords_shared_css.html -@@ -64,7 +64,7 @@ - * necessary to prevent Chrome from using the operating system's font - * instead of the Material Design font. - * TODO(dbeam): why not font: inherit? */ --<if expr="chromeos_ash or chromeos_lacros or is_linux"> -+<if expr="chromeos_ash or chromeos_lacros or is_posix"> - font-family: 'DejaVu Sans Mono', monospace; - </if> - <if expr="is_win"> diff --git a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts b/www/iridium/files/patch-chrome_browser_resources_settings_route.ts index 1be67024a4d9..0045ef03f107 100644 --- a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts +++ b/www/iridium/files/patch-chrome_browser_resources_settings_route.ts @@ -1,8 +1,8 @@ ---- chrome/browser/resources/settings/route.ts.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/resources/settings/route.ts.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/resources/settings/route.ts -@@ -185,7 +185,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes - - r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y'); +@@ -204,7 +204,7 @@ function createBrowserSettingsRoutes(): Partial<Settin + r.ACCESSIBILITY = r.ADVANCED.createSection( + '/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle')); - // <if expr="is_linux"> + // <if expr="is_posix"> diff --git a/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css b/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css new file mode 100644 index 000000000000..e9e089b0b49b --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared.css @@ -0,0 +1,11 @@ +--- chrome/browser/resources/signin/signin_shared.css.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/resources/signin/signin_shared.css +@@ -37,7 +37,7 @@ cr-button + cr-button { + margin-inline-start: 8px; + } + +-<if expr="is_macosx or is_linux or is_chromeos"> ++<if expr="is_macosx or is_posix or is_chromeos"> + .action-container { + flex-flow: row-reverse; + justify-content: flex-start; diff --git a/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared__css.html b/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared__css.html deleted file mode 100644 index 7d08486ce3aa..000000000000 --- a/www/iridium/files/patch-chrome_browser_resources_signin_signin__shared__css.html +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/resources/signin/signin_shared_css.html.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/resources/signin/signin_shared_css.html -@@ -30,7 +30,7 @@ - margin-inline-start: 8px; - } - --<if expr="is_macosx or is_linux"> -+<if expr="is_macosx or is_posix"> - .action-container { - flex-flow: row-reverse; - justify-content: flex-start; diff --git a/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html new file mode 100644 index 000000000000..a0c32f211c42 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html @@ -0,0 +1,38 @@ +--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html +@@ -326,7 +326,7 @@ + consent-confirmation autofocus> + $i18n{syncConfirmationConfirmLabel} + </cr-button> +- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros"> ++ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros"> + <cr-button id="settingsButton" on-click="onGoToSettings_" + disabled="[[anyButtonClicked_]]" consent-confirmation> + $i18n{syncConfirmationSettingsLabel} +@@ -336,7 +336,7 @@ + disabled="[[anyButtonClicked_]]"> + $i18n{syncConfirmationUndoLabel} + </cr-button> +- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)"> ++ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)"> + <cr-button id="settingsButton" on-click="onGoToSettings_" + disabled="[[anyButtonClicked_]]" consent-confirmation> + $i18n{syncConfirmationSettingsLabel} +@@ -379,7 +379,7 @@ + consent-confirmation> + $i18n{syncConfirmationConfirmLabel} + </cr-button> +- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros"> ++ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros"> + <cr-button id="settingsButton" on-click="onGoToSettings_" + disabled="[[anyButtonClicked_]]" consent-confirmation> + $i18n{syncConfirmationSettingsLabel} +@@ -389,7 +389,7 @@ + disabled="[[anyButtonClicked_]]"> + $i18n{syncConfirmationUndoLabel} + </cr-button> +- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)"> ++ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)"> + <cr-button id="settingsButton" on-click="onGoToSettings_" + disabled="[[anyButtonClicked_]]" consent-confirmation> + $i18n{syncConfirmationSettingsLabel} diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc new file mode 100644 index 000000000000..fb7bddf20fd2 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc @@ -0,0 +1,20 @@ +--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc +@@ -17,7 +17,7 @@ + #include "net/base/url_util.h" + #include "third_party/abseil-cpp/absl/types/variant.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h" + #endif + +@@ -287,7 +287,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil + Profile* profile, + const enterprise_connectors::AnalysisSettings& settings) { + // Local content analysis is supported only on desktop platforms. +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (settings.cloud_or_local_settings.is_cloud_analysis()) { + return CloudBinaryUploadServiceFactory::GetForProfile(profile); + } else { diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc index 6d2fc17c09df..d9405b1fbcda 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc @@ -1,11 +1,11 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc -@@ -21,7 +21,7 @@ +@@ -20,7 +20,7 @@ #include "content/public/browser/browser_thread.h" #include "url/gurl.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) | BUILDFLAG(IS_BSD) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h" #endif @@ -15,10 +15,10 @@ #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - } else if (base::FeatureList::IsEnabled( - safe_browsing::kClientSideDetectionDocumentScanning) && - inspection_type == DownloadFileType::OFFICE_DOCUMENT) { -@@ -286,7 +286,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( + } else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) { + StartExtractDocumentFeatures(); + #endif +@@ -325,7 +325,7 @@ void FileAnalyzer::OnDmgAnalysisFinished( } #endif // BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h b/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h index e92f75e4ab93..d3d937b63a59 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.h @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/safe_browsing/download_protection/file_analyzer.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/safe_browsing/download_protection/file_analyzer.h -@@ -16,7 +16,7 @@ +@@ -17,7 +17,7 @@ #include "components/safe_browsing/core/common/proto/csd.pb.h" #include "third_party/protobuf/src/google/protobuf/repeated_field.h" @@ -9,7 +9,7 @@ #include "chrome/services/file_util/public/cpp/sandboxed_document_analyzer.h" #endif -@@ -111,7 +111,7 @@ class FileAnalyzer { +@@ -105,7 +105,7 @@ class FileAnalyzer { const safe_browsing::ArchiveAnalyzerResults& archive_results); #endif @@ -18,7 +18,7 @@ void StartExtractDocumentFeatures(); void OnDocumentAnalysisFinished( const DocumentAnalyzerResults& document_results); -@@ -131,7 +131,7 @@ class FileAnalyzer { +@@ -128,7 +128,7 @@ class FileAnalyzer { scoped_refptr<SandboxedDMGAnalyzer> dmg_analyzer_; #endif diff --git a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc index b38fd981c163..3992fe6883c9 100644 --- a/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc +++ b/www/iridium/files/patch-chrome_browser_safe__browsing_incident__reporting_incident__reporting__service.cc @@ -1,6 +1,6 @@ ---- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc -@@ -712,7 +712,7 @@ void IncidentReportingService::OnEnvironmentDataCollec +@@ -710,7 +710,7 @@ void IncidentReportingService::OnEnvironmentDataCollec // Process::Current().CreationTime() is missing on some platforms. #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc index 9a51e2605915..8793f65b16d9 100644 --- a/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc +++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__device__registration.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/sharing/sharing_device_registration.cc -@@ -327,7 +327,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( +@@ -326,7 +326,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported( bool SharingDeviceRegistration::IsRemoteCopySupported() const { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc index 6e0661ae957b..7e50967d1e62 100644 --- a/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc +++ b/www/iridium/files/patch-chrome_browser_sharing_sharing__handler__registry__impl.cc @@ -1,4 +1,4 @@ ---- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/sharing/sharing_handler_registry_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/sharing/sharing_handler_registry_impl.cc @@ -24,7 +24,7 @@ #endif // BUILDFLAG(IS_ANDROID) @@ -9,7 +9,7 @@ #include "chrome/browser/sharing/shared_clipboard/remote_copy_message_handler.h" #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || // BUILDFLAG(IS_CHROMEOS_LACROS)) BUILDFLAG(IS_CHROMEOS) -@@ -77,7 +77,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl +@@ -78,7 +78,7 @@ SharingHandlerRegistryImpl::SharingHandlerRegistryImpl } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc b/www/iridium/files/patch-chrome_browser_signin_signin__util.cc deleted file mode 100644 index 8584a6ab20b4..000000000000 --- a/www/iridium/files/patch-chrome_browser_signin_signin__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/signin/signin_util.cc.orig 2022-04-01 07:48:30 UTC -+++ chrome/browser/signin/signin_util.cc -@@ -39,7 +39,7 @@ - #include "ui/base/l10n/l10n_util.h" - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/browser_finder.h" - #include "chrome/browser/ui/browser_list.h" - #include "chrome/browser/ui/browser_list_observer.h" diff --git a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc index 40ddda2d47fa..1f9df1b810a2 100644 --- a/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc +++ b/www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc @@ -1,11 +1,11 @@ ---- chrome/browser/sync/chrome_sync_client.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/sync/chrome_sync_client.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/sync/chrome_sync_client.cc -@@ -412,7 +412,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy +@@ -437,7 +437,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy // Chrome prefers OS provided spell checkers where they exist. So only sync the // custom dictionary on platforms that typically don't provide one. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) - // Dictionary sync is enabled by default. - if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { - controllers.push_back( + // Dictionary sync is enabled by default. + if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) { + controllers.push_back( diff --git a/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc index 8986a9551869..d2fbf8f50db5 100644 --- a/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc +++ b/www/iridium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/sync/device_info_sync_client_impl.cc -@@ -38,7 +38,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD +@@ -42,7 +42,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD // in lacros-chrome once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc index 92bd58088b70..ab5a95910d2f 100644 --- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc +++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc @@ -1,6 +1,6 @@ ---- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/task_manager/sampling/task_manager_impl.cc -@@ -217,7 +217,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, +@@ -216,7 +216,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id, } int TaskManagerImpl::GetOpenFdCount(TaskId task_id) const { diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc b/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc index 46cddabddceb..290276423f6f 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__helper.cc @@ -1,11 +1,20 @@ ---- chrome/browser/themes/theme_helper.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/themes/theme_helper.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/themes/theme_helper.cc -@@ -297,7 +297,7 @@ bool ThemeHelper::ShouldUseIncreasedContrastThemeSuppl - ui::NativeTheme* native_theme) const { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - // On Linux the GTK system theme provides the high contrast colors, - // so don't use the IncreasedContrastThemeSupplier. - return false; +@@ -18,7 +18,7 @@ + #include "ui/gfx/image/image.h" + #include "ui/native_theme/native_theme.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -172,7 +172,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS + + ui::NativeTheme const* native_theme = + ui::NativeTheme::GetInstanceForNativeUi(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (const auto* linux_ui = ui::LinuxUi::instance()) { + // We rely on the fact that the system theme is in use iff `theme_supplier` + // is non-null, but this is cheating. In the future this might not hold diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc new file mode 100644 index 000000000000..caf205212c29 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc @@ -0,0 +1,29 @@ +--- chrome/browser/themes/theme_service.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/themes/theme_service.cc +@@ -72,7 +72,7 @@ + #include "extensions/browser/extension_registry_observer.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #include "ui/ozone/public/ozone_platform.h" + #endif +@@ -314,7 +314,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier() + } + + bool ThemeService::ShouldUseSystemTheme() const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return profile_->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme); + #else + return false; +@@ -322,7 +322,7 @@ bool ThemeService::ShouldUseSystemTheme() const { + } + + bool ThemeService::ShouldUseCustomFrame() const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!ui::OzonePlatform::GetInstance() + ->GetPlatformRuntimeProperties() + .supports_server_side_window_decorations) { diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc new file mode 100644 index 000000000000..5c098eda2482 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__aura__linux.cc @@ -0,0 +1,37 @@ +--- chrome/browser/themes/theme_service_aura_linux.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/themes/theme_service_aura_linux.cc +@@ -13,7 +13,7 @@ + #include "ui/gfx/image/image.h" + #include "ui/native_theme/native_theme_aura.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -53,14 +53,14 @@ void SystemThemeLinux::StartUsingTheme() { + void SystemThemeLinux::StopUsingTheme() { + pref_service_->SetBoolean(prefs::kUsesSystemTheme, false); + // Have the former theme notify its observers of change. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (auto* linux_ui = ui::LinuxUi::instance()) + linux_ui->GetNativeTheme(nullptr)->NotifyOnNativeThemeUpdated(); + #endif + } + + bool SystemThemeLinux::GetColor(int id, SkColor* color) const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (auto* linux_ui = ui::LinuxUi::instance()) { + return linux_ui->GetColor( + id, color, pref_service_->GetBoolean(prefs::kUseCustomChromeFrame)); +@@ -70,7 +70,7 @@ bool SystemThemeLinux::GetColor(int id, SkColor* color + } + + bool SystemThemeLinux::GetDisplayProperty(int id, int* result) const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (auto* linux_ui = ui::LinuxUi::instance()) + return linux_ui->GetDisplayProperty(id, result); + #endif diff --git a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc index 25d043976429..fe5729c29ed7 100644 --- a/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc +++ b/www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc @@ -1,15 +1,20 @@ ---- chrome/browser/themes/theme_service_factory.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/themes/theme_service_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/themes/theme_service_factory.cc -@@ -25,7 +25,7 @@ +@@ -25,11 +25,11 @@ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) #include "chrome/browser/themes/theme_service_aura_linux.h" - #include "ui/views/linux_ui/linux_ui.h" #endif -@@ -82,7 +82,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -85,7 +85,7 @@ KeyedService* ThemeServiceFactory::BuildServiceInstanc content::BrowserContext* profile) const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,12 +23,15 @@ using ThemeService = ThemeServiceAuraLinux; #endif -@@ -96,7 +96,7 @@ void ThemeServiceFactory::RegisterProfilePrefs( +@@ -99,9 +99,9 @@ void ThemeServiceFactory::RegisterProfilePrefs( user_prefs::PrefRegistrySyncable* registry) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) bool default_uses_system_theme = false; - - const views::LinuxUI* linux_ui = views::LinuxUI::instance(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const ui::LinuxUi* linux_ui = ui::LinuxUi::instance(); + if (linux_ui) + default_uses_system_theme = linux_ui->GetDefaultUsesSystemTheme(); diff --git a/www/iridium/files/patch-chrome_browser_ui_browser.h b/www/iridium/files/patch-chrome_browser_ui_browser.h new file mode 100644 index 000000000000..8479ed6930c5 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_browser.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/browser.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/ui/browser.h +@@ -282,7 +282,7 @@ class Browser : public TabStripModelObserver, + int32_t restore_id = kDefaultRestoreId; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // When the browser window is shown, the desktop environment is notified + // using this ID. In response, the desktop will stop playing the "waiting + // for startup" animation (if any). diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc index 75faa8bd930f..d65c1eabfae9 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc @@ -1,24 +1,24 @@ ---- chrome/browser/ui/browser_command_controller.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/browser_command_controller.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/browser_command_controller.cc -@@ -88,7 +88,7 @@ +@@ -96,7 +96,7 @@ + #include "components/user_manager/user_manager.h" + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" #endif -@@ -277,7 +277,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( +@@ -285,7 +285,7 @@ bool BrowserCommandController::IsReservedCommandOrKey( + #endif + } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // If this key was registered by the user as a content editing hotkey, then // it is not reserved. - ui::TextEditKeyBindingsDelegateAuraLinux* delegate = -@@ -513,7 +513,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo + auto* linux_ui = ui::LinuxUi::instance(); +@@ -530,7 +530,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -27,7 +27,7 @@ case IDC_MINIMIZE_WINDOW: browser_->window()->Minimize(); break; -@@ -1040,7 +1040,7 @@ void BrowserCommandController::InitCommandState() { +@@ -1093,7 +1093,7 @@ void BrowserCommandController::InitCommandState() { #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h b/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h index 4d3c2e0ced64..34283cd459cd 100644 --- a/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h +++ b/www/iridium/files/patch-chrome_browser_ui_browser__dialogs.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/browser_dialogs.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/browser_dialogs.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/browser_dialogs.h -@@ -26,7 +26,7 @@ +@@ -25,7 +25,7 @@ #include "ui/base/models/dialog_model.h" #include "ui/gfx/native_widget_types.h" @@ -9,21 +9,3 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) #include "chrome/browser/web_applications/web_app_id.h" #endif -@@ -80,7 +80,7 @@ class WebDialogDelegate; - struct SelectedFileInfo; - } // namespace ui - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - namespace web_app { - struct UrlHandlerLaunchParams; -@@ -207,7 +207,7 @@ void ShowWebAppFileLaunchDialog(const std::vector<base - WebAppLaunchAcceptanceCallback close_callback); - #endif // !BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - // Callback that runs when the Web App URL Handler Intent Picker dialog is - // closed. `accepted` is true when the dialog is accepted, false otherwise. diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc index b2635c303024..596812459b36 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc @@ -1,6 +1,15 @@ ---- chrome/browser/ui/chrome_pages.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/chrome_pages.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/chrome_pages.cc -@@ -550,7 +550,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, +@@ -69,7 +69,7 @@ + #endif + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include "chrome/browser/web_applications/web_app_utils.h" + #endif + +@@ -613,7 +613,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h index 8a60314adda2..21d06651815a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h +++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h @@ -1,15 +1,15 @@ ---- chrome/browser/ui/chrome_pages.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/chrome_pages.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/chrome_pages.h -@@ -26,7 +26,7 @@ - #endif +@@ -30,7 +30,7 @@ enum class ConsentLevel; + } // namespace signin #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - #include "chrome/browser/web_applications/web_app_utils.h" - #endif - -@@ -201,7 +201,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, + namespace web_app { + enum class AppSettingsPageEntryPoint; + } // namespace web_app +@@ -213,7 +213,7 @@ void ShowBrowserSigninOrSettings(Browser* browser, #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc b/www/iridium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc index ce776ea8d881..285685e4d941 100644 --- a/www/iridium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc +++ b/www/iridium/files/patch-chrome_browser_ui_color_native__chrome__color__mixer.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/color/native_chrome_color_mixer.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/color/native_chrome_color_mixer.cc -@@ -6,7 +6,7 @@ - +@@ -7,7 +7,7 @@ #include "build/build_config.h" --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) + #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && \ +- !BUILDFLAG(IS_WIN) ++ !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) void AddNativeChromeColorMixer(ui::ColorProvider* provider, const ui::ColorProviderManager::Key& key) {} #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc index c06f02c075b0..b8bff13204d7 100644 --- a/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc +++ b/www/iridium/files/patch-chrome_browser_ui_sad__tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/sad_tab.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/sad_tab.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/sad_tab.cc -@@ -188,7 +188,7 @@ std::vector<int> SadTab::GetSubMessages() { +@@ -175,7 +175,7 @@ std::vector<int> SadTab::GetSubMessages() { // Only show Incognito suggestion if not already in Incognito mode. if (!web_contents_->GetBrowserContext()->IsOffTheRecord()) message_ids.insert(message_ids.begin(), IDS_SAD_TAB_RELOAD_INCOGNITO); diff --git a/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h b/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h new file mode 100644 index 000000000000..5a2d030fdf07 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_sharing__hub_sharing__hub__bubble__controller.h @@ -0,0 +1,11 @@ +--- chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/ui/sharing_hub/sharing_hub_bubble_controller.h +@@ -37,7 +37,7 @@ class SharingHubBubbleController { + virtual bool ShouldOfferOmniboxIcon() = 0; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + // These two methods return the sets of first- and third-party actions; + // first-party actions are internal to Chrome and third-party actions are + // other websites or apps. diff --git a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc index 0511c57ff723..ff8645dd5c5f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc @@ -1,8 +1,8 @@ ---- chrome/browser/ui/signin_view_controller.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/signin_view_controller.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/signin_view_controller.cc -@@ -259,7 +259,7 @@ void SigninViewController::ShowModalEnterpriseConfirma +@@ -271,7 +271,7 @@ void SigninViewController::ShowModalEnterpriseConfirma SkColor profile_color, - base::OnceCallback<void(bool)> callback) { + signin::SigninChoiceCallback callback) { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) + BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h index 067dec208f5d..1a22fd408429 100644 --- a/www/iridium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h +++ b/www/iridium/files/patch-chrome_browser_ui_signin__view__controller__delegate.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/signin_view_controller_delegate.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/signin_view_controller_delegate.h -@@ -74,7 +74,7 @@ class SigninViewControllerDelegate { - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) +@@ -81,7 +81,7 @@ class SigninViewControllerDelegate { + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc index b6767be61693..ae791150ee03 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/startup/bad_flags_prompt.cc -@@ -90,7 +90,7 @@ static const char* kBadFlags[] = { +@@ -91,7 +91,7 @@ static const char* kBadFlags[] = { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc index b8276f73efc2..5fd0717d36ba 100644 --- a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc @@ -1,30 +1,15 @@ ---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/startup/startup_browser_creator.cc -@@ -126,12 +126,12 @@ - #endif // BUILDFLAG(ENABLE_PRINT_PREVIEW) +@@ -128,7 +128,7 @@ + #include "chrome/credential_provider/common/gcp_strings.h" #endif // BUILDFLAG(IS_WIN) --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - #include "chrome/browser/ui/startup/web_app_url_handling_startup_utils.h" - #endif - -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) #include "chrome/browser/ui/startup/web_app_info_recorder_utils.h" #endif -@@ -518,7 +518,7 @@ bool MaybeLaunchAppShortcutWindow(const base::CommandL - return false; - } - --#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - bool MaybeLaunchUrlHandlerWebAppFromCmd( - const base::CommandLine& command_line, - const base::FilePath& cur_dir, -@@ -989,7 +989,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1017,7 +1017,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( silent_launch = true; } @@ -33,7 +18,7 @@ // Writes open and installed web apps to the specified file without // launching a new browser window or tab. if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) && -@@ -1181,7 +1181,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( +@@ -1207,7 +1207,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( CHECK_EQ(profile_info.mode, StartupProfileMode::kBrowserWindow) << "Failed launch with app: couldn't pick a profile"; std::string app_id = command_line.GetSwitchValueASCII(switches::kAppId); @@ -42,12 +27,3 @@ // If Chrome Apps are deprecated and |app_id| is a Chrome App, display the // deprecation UI instead of launching the app. if (apps::OpenDeprecatedApplicationPrompt(privacy_safe_profile, app_id)) -@@ -1220,7 +1220,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl( - web_app::startup::MaybeHandleWebAppLaunch( - command_line, cur_dir, privacy_safe_profile, is_first_run); - --#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - handled_as_app = handled_as_app || - // Give web apps a chance to handle a URL. - MaybeLaunchUrlHandlerWebAppFromCmd( diff --git a/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc new file mode 100644 index 000000000000..6cba314d60e7 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/ui/startup/startup_browser_creator_impl.cc +@@ -241,7 +241,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser( + // at the state of the MessageLoop. + Browser::CreateParams params = Browser::CreateParams(profile_, false); + params.creation_source = Browser::CreationSource::kStartupCreator; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + params.startup_id = command_line_.GetSwitchValueASCII("desktop-startup-id"); + #endif + browser = Browser::Create(params); diff --git a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc index c49383be0e38..8969d605baac 100644 --- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc +++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc @@ -1,15 +1,15 @@ ---- chrome/browser/ui/tab_helpers.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/tab_helpers.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/tab_helpers.cc -@@ -179,7 +179,7 @@ +@@ -200,7 +200,7 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + #include "chrome/browser/autofill_assistant/common_dependencies_chrome.h" + #include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h" #include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h" - #include "chrome/browser/ui/browser_finder.h" - #include "chrome/browser/ui/hats/hats_helper.h" -@@ -500,13 +500,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -532,13 +532,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -25,12 +25,12 @@ if (base::FeatureList::IsEnabled( features::kHappinessTrackingSurveysForDesktopDemo) || base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) || -@@ -517,7 +517,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con +@@ -553,7 +553,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - SharedHighlightingPromo::CreateForWebContents(web_contents); - #endif - + if (base::FeatureList::IsEnabled( + autofill_assistant::features::kAutofillAssistantDesktop)) { + autofill_assistant::CreateForWebContents( diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc index ec9989e78a41..1cb41d5422cc 100644 --- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc +++ b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__columns.cc @@ -1,11 +1,11 @@ ---- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/task_manager/task_manager_columns.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/task_manager/task_manager_columns.cc -@@ -94,7 +94,7 @@ const TableColumnData kColumns[] = { - base::size("100000") * kCharWidth, -1, true, false, false}, +@@ -93,7 +93,7 @@ const TableColumnData kColumns[] = { + std::size("100000") * kCharWidth, -1, true, false, false}, #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) {IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN, ui::TableColumn::RIGHT, -1, 0, - base::size("999") * kCharWidth, -1, true, false, false}, + std::size("999") * kCharWidth, -1, true, false, false}, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc index c76dded42561..3c2ff9538d12 100644 --- a/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc +++ b/www/iridium/files/patch-chrome_browser_ui_task__manager_task__manager__table__model.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/task_manager/task_manager_table_model.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/task_manager/task_manager_table_model.cc -@@ -451,7 +451,7 @@ std::u16string TaskManagerTableModel::GetText(int row, +@@ -454,7 +454,7 @@ std::u16string TaskManagerTableModel::GetText(size_t r ? stringifier_->backgrounded_string() : stringifier_->foregrounded_string(); @@ -9,7 +9,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row]); return fd_count >= 0 ? base::FormatNumber(fd_count) -@@ -618,7 +618,7 @@ int TaskManagerTableModel::CompareValues(int row1, +@@ -621,7 +621,7 @@ int TaskManagerTableModel::CompareValues(size_t row1, return BooleanCompare(is_proc1_bg, is_proc2_bg); } @@ -18,7 +18,7 @@ case IDS_TASK_MANAGER_OPEN_FD_COUNT_COLUMN: { const int proc1_fd_count = observed_task_manager()->GetOpenFdCount(tasks_[row1]); -@@ -792,7 +792,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col +@@ -795,7 +795,7 @@ void TaskManagerTableModel::UpdateRefreshTypes(int col type = REFRESH_TYPE_KEEPALIVE_COUNT; break; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc index 6087e1b71661..32fc2384a2d0 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc @@ -1,24 +1,29 @@ ---- chrome/browser/ui/views/accelerator_table.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/accelerator_table.cc -@@ -62,7 +62,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = { + {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE}, + {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB}, - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, {ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB}, + #endif // BUILDFLAG(IS_LINUX) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) {ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT}, -@@ -94,7 +94,7 @@ const AcceleratorMapping kAcceleratorMap[] = { + {ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, + IDC_MOVE_TAB_PREVIOUS}, +@@ -93,7 +93,7 @@ const AcceleratorMapping kAcceleratorMap[] = { + {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6}, + {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, {ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7}, - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) {ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0}, {ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1}, -@@ -139,7 +139,7 @@ const AcceleratorMapping kAcceleratorMap[] = { +@@ -138,7 +138,7 @@ const AcceleratorMapping kAcceleratorMap[] = { IDC_SHOW_AVATAR_MENU}, // Platform-specific key maps. @@ -27,3 +32,12 @@ {ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK}, {ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD}, {ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME}, +@@ -236,7 +236,7 @@ const AcceleratorMapping kAcceleratorMap[] = { + {ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS}, + #endif // !BUILDFLAG(IS_CHROMEOS) + #endif // !BUILDFLAG(IS_MAC) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, + IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS}, + #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc index 2adbf061a131..1c2b20c75952 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc @@ -19,7 +19,7 @@ #include "ui/gfx/image/image_skia.h" @@ -9,7 +9,7 @@ #include "chrome/browser/shell_integration_linux.h" #endif -@@ -56,7 +56,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni +@@ -55,7 +55,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni const AppWindow::CreateParams& create_params, views::Widget::InitParams* init_params, views::Widget* widget) { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h index dc360a32937a..50bd95354152 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h @@ -1,11 +1,16 @@ ---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/chrome_views_delegate.h -@@ -51,7 +51,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat +@@ -51,11 +51,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat base::OnceClosure callback) override; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - gfx::ImageSkia* GetDefaultWindowIcon() const override; bool WindowManagerProvidesTitleBar(bool maximized) override; #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + gfx::ImageSkia* GetDefaultWindowIcon() const override; + #endif + diff --git a/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc new file mode 100644 index 000000000000..26ac219dd754 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc @@ -0,0 +1,20 @@ +--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/ui/views/chrome_views_delegate_linux.cc +@@ -23,7 +23,7 @@ bool IsDesktopEnvironmentUnity() { + return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + int GetWindowIconResourceId() { + #if BUILDFLAG(GOOGLE_CHROME_BRANDING) + switch (chrome::GetChannel()) { +@@ -67,7 +67,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative + delegate); + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const { + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); + return rb.GetImageSkiaNamed(GetWindowIconResourceId()); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc index 3372fe9a9aca..ab9cf6e370cc 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_download_download__item__view.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/download/download_item_view.cc -@@ -195,7 +195,7 @@ bool UseNewWarnings() { +@@ -188,7 +188,7 @@ bool UseNewWarnings() { } int GetFilenameStyle(const views::Label& label) { -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) if (UseNewWarnings()) - return STYLE_EMPHASIZED; + return views::style::STYLE_EMPHASIZED; #endif -@@ -203,7 +203,7 @@ int GetFilenameStyle(const views::Label& label) { +@@ -196,7 +196,7 @@ int GetFilenameStyle(const views::Label& label) { } int GetFilenameStyle(const views::StyledLabel& label) { -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) if (UseNewWarnings()) - return STYLE_EMPHASIZED; + return views::style::STYLE_EMPHASIZED; #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc index d2e33357cbda..6c6ad04977d7 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view.cc -@@ -155,7 +155,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos +@@ -157,7 +157,7 @@ EyeDropperView::EyeDropperView(content::RenderFrameHos // EyeDropper/WidgetDelegate. set_owned_by_client(); SetPreferredSize(GetSize()); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc b/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc index 72b1812d3452..292eabf7a85e 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_eye__dropper_eye__dropper__view__aura.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/eye_dropper/eye_dropper_view_aura.cc -@@ -81,7 +81,7 @@ void EyeDropperView::MoveViewToFront() { +@@ -86,7 +86,7 @@ void EyeDropperView::MoveViewToFront() { } void EyeDropperView::CaptureInputIfNeeded() { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc index 60fa26b68a78..9979b28b8b50 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_first__run__dialog.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/first_run_dialog.cc -@@ -38,7 +38,7 @@ +@@ -34,7 +34,7 @@ namespace { @@ -15,6 +15,6 @@ ChangeMetricsReportingState(report_crashes_->GetChecked()); -#else +#elif !BUILDFLAG(IS_BSD) - #if BUILDFLAG(IS_CHROMEOS_ASH) - metrics::structured::NeutrinoDevicesLog( - metrics::structured::NeutrinoDevicesLocation::kFirstRunDialog); + ChangeMetricsReportingStateWithReply( + report_crashes_->GetChecked(), + base::BindOnce(&InitCrashReporterIfEnabled)); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc deleted file mode 100644 index 69bd1c2678f3..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-04-01 07:48:30 UTC -+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc -@@ -150,7 +150,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient - } - - void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() { --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* view = static_cast<BrowserFrameViewLinux*>( - native_frame_->browser_frame()->GetFrameView()); - auto* layout = view->layout(); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h deleted file mode 100644 index ed62459879d8..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2022-03-28 18:11:04 UTC -+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h -@@ -95,7 +95,7 @@ class BrowserDesktopWindowTreeHostLinux - // browser_desktop_window_tree_host_lacros.cc. - #if BUILDFLAG(IS_CHROMEOS_LACROS) - using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameLacros; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameAuraLinux; - #else - #error Unknown platform diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc index 79eee5045d53..25049f1c9aeb 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc @@ -1,4 +1,4 @@ ---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/frame/browser_frame.cc @@ -49,11 +49,11 @@ @@ -11,7 +11,7 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/views/linux_ui/linux_ui.h" + #include "ui/linux/linux_ui.h" #endif @@ -62,7 +62,7 @@ namespace { @@ -23,7 +23,7 @@ return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme(); #else return false; -@@ -268,7 +268,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { +@@ -279,7 +279,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() { IsVisibleOnAllWorkspaces()); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -32,16 +32,16 @@ // If the window was sent to a different workspace, prioritize it if // it was sent to the current workspace and deprioritize it // otherwise. This is done by MoveBrowsersInWorkspaceToFront() -@@ -381,7 +381,7 @@ void BrowserFrame::SelectNativeTheme() { +@@ -402,7 +402,7 @@ void BrowserFrame::SelectNativeTheme() { return; } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - const views::LinuxUI* linux_ui = views::LinuxUI::instance(); + const ui::LinuxUi* linux_ui = ui::LinuxUi::instance(); // Ignore GTK+ for web apps with window-controls-overlay as the // display_override so the web contents can blend with the overlay by using -@@ -400,7 +400,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( +@@ -421,7 +421,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange( bool need_regenerate = false; // TODO(crbug.com/1052397): Revisit the macro expression once build flag // switch of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc index 69e5da7a38be..1be2e9136b95 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h" #endif @@ -9,12 +9,21 @@ #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux.h" #include "chrome/browser/ui/views/frame/browser_frame_view_layout_linux_native.h" #include "chrome/browser/ui/views/frame/browser_frame_view_linux.h" -@@ -33,7 +33,7 @@ namespace { +@@ -34,7 +34,7 @@ namespace { std::unique_ptr<OpaqueBrowserFrameView> CreateOpaqueBrowserFrameView( BrowserFrame* frame, BrowserView* browser_view) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - auto* linux_ui = views::LinuxUI::instance(); + auto* linux_ui = ui::LinuxUi::instance(); auto* profile = browser_view->browser()->profile(); auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile); +@@ -74,7 +74,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows + BrowserFrame* frame, + BrowserView* browser_view) { + // TODO(https://crbug.com/1346734): Enable it on all platforms. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (browser_view->browser()->is_type_picture_in_picture()) { + return std::make_unique<PictureInPictureBrowserFrameView>(frame, + browser_view); diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc index 76319fb5f76f..b93235be1fd7 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/frame/browser_view.cc -@@ -1825,7 +1825,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra +@@ -2012,7 +2012,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra // CrOS cleanup is done. // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc index dcc83f06cae8..010cd249bb55 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc -@@ -53,7 +53,7 @@ +@@ -55,7 +55,7 @@ #include "ui/views/window/vector_icons/vector_icons.h" #include "ui/views/window/window_shape.h" @@ -9,7 +9,7 @@ #include "ui/views/controls/menu/menu_runner.h" #endif -@@ -541,7 +541,7 @@ OpaqueBrowserFrameView::FrameButtonStyle +@@ -557,7 +557,7 @@ OpaqueBrowserFrameView::FrameButtonStyle OpaqueBrowserFrameView::GetFrameButtonStyle() const { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,7 @@ return FrameButtonStyle::kMdButton; #else return FrameButtonStyle::kImageButton; -@@ -751,7 +751,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons +@@ -767,7 +767,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons } void OpaqueBrowserFrameView::WindowIconPressed() { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h index da1b1f2f9f96..1056d7e50edd 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.h @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/frame/opaque_browser_frame_view.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/frame/opaque_browser_frame_view.h -@@ -224,7 +224,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient +@@ -226,7 +226,7 @@ class OpaqueBrowserFrameView : public BrowserNonClient // Background painter for the window frame. std::unique_ptr<views::FrameBackground> frame_background_; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc index 79df98dfb26f..398b3f88b9a0 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/frame/system_menu_model_builder.cc -@@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -76,7 +76,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser ui::SimpleMenuModel* model) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU); model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU); -@@ -93,7 +93,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser +@@ -92,7 +92,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -17,13 +17,13 @@ +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS) model->AddSeparator(ui::NORMAL_SEPARATOR); bool supports_server_side_decorations = true; - #if defined(USE_OZONE) && \ -@@ -148,7 +148,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo + #if defined(USE_OZONE) && !BUILDFLAG(IS_CHROMEOS) +@@ -144,7 +144,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo + model->AddSeparator(ui::NORMAL_SEPARATOR); + model->AddItemWithStringId(IDC_TASK_MANAGER, IDS_TASK_MANAGER); } - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) model->AddSeparator(ui::NORMAL_SEPARATOR); model->AddItemWithStringId(IDC_CLOSE_WINDOW, IDS_CLOSE); #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc index e2db313705a6..def300fa7f28 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/hung_renderer_view.cc -@@ -403,7 +403,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() +@@ -401,7 +401,7 @@ void HungRendererDialogView::ForceCrashHungRenderer() content::RenderProcessHost* rph = hung_pages_table_model_->GetRenderWidgetHost()->GetProcess(); if (rph) { diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc index 76bd3a9005ba..3e4a252979e0 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc -@@ -611,7 +611,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( +@@ -570,7 +570,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo( // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc index ee4b2984ea82..eb6d99a9ca5f 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc -@@ -137,7 +137,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) +@@ -160,7 +160,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) @@ -9,8 +9,8 @@ // static std::unique_ptr<views::WebView> SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView( -@@ -413,7 +413,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) +@@ -445,7 +445,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h index 835f0e6b8957..6d0df3d5a9af 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h +++ b/www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.h @@ -1,7 +1,7 @@ ---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.h -@@ -71,7 +71,7 @@ class SigninViewControllerDelegateViews - #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) +@@ -76,7 +76,7 @@ class SigninViewControllerDelegateViews + #endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc index 64864eb4755b..d4182711b91d 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/views/tabs/tab.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/tabs/tab.cc -@@ -580,7 +580,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& +@@ -582,7 +582,7 @@ void Tab::MaybeUpdateHoverStatus(const ui::MouseEvent& if (mouse_hovered_ || !GetWidget()->IsMouseEventsEnabled()) return; diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc index 42f1ce07feec..3a64e2405882 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/tabs/tab_drag_controller.cc -@@ -480,7 +480,7 @@ void TabDragController::Init(TabDragContext* source_co +@@ -476,7 +476,7 @@ void TabDragController::Init(TabDragContext* source_co // synchronous on desktop Linux, so use that. // - Chrome OS // Releasing capture on Ash cancels gestures so avoid it. @@ -9,7 +9,7 @@ can_release_capture_ = false; #endif start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y()); -@@ -1021,7 +1021,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon +@@ -1029,7 +1029,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,7 +18,16 @@ // EndMoveLoop is going to snap the window back to its original location. // Hide it so users don't see this. Hiding a window in Linux aura causes // it to lose capture so skip it. -@@ -2350,7 +2350,7 @@ TabDragController::Liveness TabDragController::GetLoca +@@ -1944,7 +1944,7 @@ void TabDragController::CompleteDrag() { + } + + // If source window was maximized - maximize the new window as well. +-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) ++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) + // Keeping maximized state breaks snap to Grid on Windows when dragging + // tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this + // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in +@@ -2334,7 +2334,7 @@ TabDragController::Liveness TabDragController::GetLoca } // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc index 6235eedae8ce..fc790eeedd1a 100644 --- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc +++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__controller.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/views/tabs/tab_hover_card_controller.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/views/tabs/tab_hover_card_controller.cc -@@ -36,7 +36,7 @@ namespace { +@@ -72,7 +72,7 @@ GetMemoryPressureOverride() { // Fetches the Omnibox drop-down widget, or returns null if the drop-down is // not visible. void FixWidgetStackOrder(views::Widget* widget, const Browser* browser) { diff --git a/www/iridium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc b/www/iridium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc new file mode 100644 index 000000000000..64a885446c02 --- /dev/null +++ b/www/iridium/files/patch-chrome_browser_ui_web__applications_app__browser__controller.cc @@ -0,0 +1,11 @@ +--- chrome/browser/ui/web_applications/app_browser_controller.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/browser/ui/web_applications/app_browser_controller.cc +@@ -428,7 +428,7 @@ CustomThemeSupplier* AppBrowserController::GetThemeSup + } + + bool AppBrowserController::ShouldUseSystemTheme() const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return browser_->profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme); + #else + return false; diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc index 26f2eb159159..1eb62ca33e54 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/about_ui.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/webui/about_ui.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/webui/about_ui.cc -@@ -603,7 +603,7 @@ std::string ChromeURLs() { +@@ -622,7 +622,7 @@ std::string ChromeURLs() { return html; } @@ -9,7 +9,7 @@ std::string AboutLinuxProxyConfig() { std::string data; AppendHeader(&data, -@@ -661,7 +661,7 @@ void AboutUIHTMLSource::StartDataRequest( +@@ -680,7 +680,7 @@ void AboutUIHTMLSource::StartDataRequest( response = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr); } diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc index a90e1754aeb7..2e3ee87615b0 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc -@@ -296,7 +296,7 @@ +@@ -309,7 +309,7 @@ #include "chrome/browser/ui/webui/app_launcher_page_ui.h" #endif @@ -9,7 +9,7 @@ #include "chrome/browser/ui/webui/webui_js_error/webui_js_error_ui.h" #endif -@@ -320,22 +320,22 @@ +@@ -335,17 +335,17 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -30,13 +30,7 @@ #include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h" #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - #include "chrome/browser/ui/webui/app_settings/web_app_settings_ui.h" - #endif - -@@ -661,7 +661,7 @@ bool IsAboutUI(const GURL& url) { +@@ -698,7 +698,7 @@ bool IsAboutUI(const GURL& url) { #if !BUILDFLAG(IS_ANDROID) || url.host_piece() == chrome::kChromeUITermsHost #endif @@ -45,8 +39,8 @@ || url.host_piece() == chrome::kChromeUILinuxProxyConfigHost #endif #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -1073,7 +1073,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we - return &NewWebUI<ash::SampleSystemWebAppUI>; +@@ -1132,7 +1132,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we + #endif // !defined(USE_REAL_DBUS_CLIENTS) #endif // !defined(OFFICIAL_BUILD) #endif // BUILDFLAG(IS_CHROMEOS_ASH) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) @@ -54,7 +48,7 @@ if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost) return &NewWebUI<WebUIJsErrorUI>; #endif -@@ -1131,7 +1131,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1193,7 +1193,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we if (url.host_piece() == chrome::kChromeUINaClHost) return &NewWebUI<NaClUI>; #endif @@ -63,7 +57,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost) -@@ -1187,27 +1187,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we +@@ -1253,27 +1253,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we } #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -93,6 +87,6 @@ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled(features::kDesktopPWAsWebAppSettingsPage) && - url.host_piece() == chrome::kChromeUIWebAppSettingsHost) { + if (url.host_piece() == chrome::kChromeUIWebAppSettingsHost) return &NewWebUI<WebAppSettingsUI>; + #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc index 3ec01bdaf461..49fda2c04c05 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc @@ -1,7 +1,7 @@ ---- chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc -@@ -9,7 +9,7 @@ - #include "base/strings/string_util.h" +@@ -6,7 +6,7 @@ + #include "build/build_config.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) @@ -9,17 +9,17 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/policy/chrome_browser_policy_connector.h" #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h" -@@ -66,7 +66,7 @@ void TrySetSignal(base::flat_map<std::string, std::str - std::vector<base::StringPiece>(values.begin(), values.end()), ", "); - } +@@ -22,7 +22,7 @@ namespace utils { + + namespace { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) connectors_internals::mojom::KeyTrustLevel ParseTrustLevel( BPKUR::KeyTrustLevel trust_level) { -@@ -171,7 +171,7 @@ base::flat_map<std::string, std::string> SignalsToMap( - } +@@ -53,7 +53,7 @@ connectors_internals::mojom::KeyType AlgorithmToType( + } // namespace connectors_internals::mojom::KeyInfoPtr GetKeyInfo() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc index e2ae319defd1..6303f2e52a11 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc @@ -1,24 +1,15 @@ ---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc -@@ -313,7 +313,7 @@ void AppLauncherHandler::CreateExtensionInfo(const Ext - base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode)); - +@@ -325,7 +325,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI bool is_deprecated_app = false; --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - is_deprecated_app = extensions::IsExtensionUnsupportedDeprecatedApp( - extension_service_->GetBrowserContext(), extension->id()); + auto* context = extension_service_->GetBrowserContext(); + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + is_deprecated_app = + extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id()); #endif -@@ -756,7 +756,7 @@ void AppLauncherHandler::HandleLaunchApp(const base::L - - Profile* profile = extension_service_->profile(); - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (extensions::IsExtensionUnsupportedDeprecatedApp(profile, extension_id)) { - // TODO(crbug.com/1225779): Show the deprecated apps dialog. - return; -@@ -1348,7 +1348,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: +@@ -1427,7 +1427,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app: options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] = web_app->CanUserUninstallWebApp(); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc index 6b86ca723065..410729c961c8 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc @@ -1,20 +1,20 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.cc -@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() { +@@ -29,7 +29,7 @@ void AppearanceHandler::RegisterMessages() { + "useDefaultTheme", + base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme, base::Unretained(this))); - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) -+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) web_ui()->RegisterMessageCallback( "useSystemTheme", base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme, -@@ -45,7 +45,7 @@ void AppearanceHandler::HandleUseDefaultTheme(base::Va +@@ -43,7 +43,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) - void AppearanceHandler::HandleUseSystemTheme(base::Value::ConstListView args) { + void AppearanceHandler::HandleUseSystemTheme(const base::Value::List& args) { if (profile_->IsChild()) NOTREACHED(); diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h index c1c22ddf69e9..17762fb9dd83 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.h @@ -1,4 +1,4 @@ ---- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/webui/settings/appearance_handler.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/webui/settings/appearance_handler.h @@ -40,7 +40,7 @@ class AppearanceHandler : public SettingsPageUIHandler @@ -7,5 +7,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) // Changes the UI theme of the browser to the system (GTK+) theme. - void HandleUseSystemTheme(base::Value::ConstListView args); + void HandleUseSystemTheme(const base::Value::List& args); #endif diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc index 08b99046ea3a..afb901713611 100644 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc +++ b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc -@@ -118,7 +118,7 @@ +@@ -116,7 +116,7 @@ #include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h" #endif @@ -9,7 +9,7 @@ #include "ui/display/screen.h" #endif -@@ -138,7 +138,7 @@ +@@ -137,7 +137,7 @@ #include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h" #endif @@ -18,8 +18,8 @@ #include "ui/ozone/public/ozone_platform.h" #endif -@@ -371,7 +371,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht - {"huge", IDS_SETTINGS_HUGE_FONT_SIZE}, +@@ -360,7 +360,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht + {"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT}, // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS) @@ -27,7 +27,7 @@ {"systemTheme", IDS_SETTINGS_SYSTEM_THEME}, {"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME}, {"classicTheme", IDS_SETTINGS_CLASSIC_THEME}, -@@ -379,7 +379,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -368,7 +368,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht #else {"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME}, #endif @@ -36,7 +36,7 @@ {"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS}, #endif #if BUILDFLAG(IS_MAC) -@@ -400,7 +400,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht +@@ -392,7 +392,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc b/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc deleted file mode 100644 index 5faf5bbc5788..000000000000 --- a/www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__ui.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/browser/ui/webui/settings/settings_ui.cc.orig 2022-04-01 07:48:30 UTC -+++ chrome/browser/ui/webui/settings/settings_ui.cc -@@ -140,7 +140,7 @@ - #include "chrome/browser/ui/webui/settings/native_certificates_handler.h" - #endif // BUILDFLAG(USE_NSS_CERTS) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - #include "chrome/browser/ui/webui/settings/url_handlers_handler.h" - #include "chrome/browser/web_applications/web_app_provider.h" -@@ -243,7 +243,7 @@ SettingsUI::SettingsUI(content::WebUI* web_ui) - AddSettingsPageUIHandler(std::make_unique<ChromeCleanupHandler>(profile)); - #endif // BUILDFLAG(IS_WIN) - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \ -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \ - (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) - if (web_app::WebAppProvider::GetForWebApps(profile) != nullptr) { - AddSettingsPageUIHandler(std::make_unique<UrlHandlersHandler>( diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h b/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h index e4c924a858cd..41464555af5f 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h @@ -1,11 +1,11 @@ ---- chrome/browser/web_applications/extension_status_utils.h.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/web_applications/extension_status_utils.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/web_applications/extension_status_utils.h -@@ -42,7 +42,7 @@ bool IsExtensionDefaultInstalled(content::BrowserConte - bool IsExternalExtensionUninstalled(content::BrowserContext* context, +@@ -43,7 +43,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo const std::string& extension_id); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // Returns whether |extension_id| is a Chrome App and should be blocked by the // Chrome Apps Deprecation. Policy installed Chrome Apps are still allowed, and // all apps are allowed if the deprecation feature flag is not enabled. diff --git a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc index bda903e60f1e..51b1421be509 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc @@ -1,11 +1,20 @@ ---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/web_applications/extensions/extension_status_utils.cc -@@ -87,7 +87,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo - return prefs && prefs->IsExternalExtensionUninstalled(extension_id); +@@ -26,7 +26,7 @@ namespace { + const char* g_preinstalled_app_for_testing = nullptr; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + base::Feature kChromeAppsDeprecationExcludeForceInstalls( + "ChromeAppsDeprecationExcludeForceInstalls", + base::FEATURE_DISABLED_BY_DEFAULT); +@@ -100,7 +100,7 @@ bool IsExternalExtensionUninstalled(content::BrowserCo } --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context, const std::string& extension_id) { if (!base::FeatureList::IsEnabled(features::kChromeAppsDeprecation)) diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc index 5cf7436ed43a..67e93b304adc 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc -@@ -43,7 +43,7 @@ namespace { +@@ -45,7 +45,7 @@ namespace { #if BUILDFLAG(IS_MAC) const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512}; @@ -9,16 +9,25 @@ // Linux supports icons of any size. FreeDesktop Icon Theme Specification states // that "Minimally you should install a 48x48 icon in the hicolor theme." const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512}; -@@ -133,7 +133,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr +@@ -130,7 +130,7 @@ std::string GetAllFilesInDir(const base::FilePath& fil + } // namespace + + ScopedShortcutOverrideForTesting::ScopedShortcutOverrideForTesting() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto callback = base::BindRepeating( + [](ScopedShortcutOverrideForTesting* scoped_override, + base::FilePath filename, std::string xdg_command, +@@ -163,7 +163,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr } } } -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - directories = {&desktop}; - #endif - for (base::ScopedTempDir* dir : directories) { -@@ -177,7 +177,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over + // Reset the file handling callback. + SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting( + UpdateMimeInfoDatabaseOnLinuxCallback()); +@@ -210,7 +210,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over scoped_override->chrome_apps_folder.CreateUniqueTempDirUnderPath( base_path); DCHECK(success); @@ -27,7 +36,7 @@ bool success = scoped_override->desktop.CreateUniqueTempDirUnderPath(base_path); DCHECK(success); -@@ -195,7 +195,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over +@@ -230,7 +230,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over #elif BUILDFLAG(IS_MAC) bool success = scoped_override->chrome_apps_folder.CreateUniqueTempDir(); DCHECK(success); @@ -35,4 +44,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) bool success = scoped_override->desktop.CreateUniqueTempDir(); DCHECK(success); - #endif + success = scoped_override->startup.CreateUniqueTempDir(); diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h index 73ba8666420b..de98371470dd 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h @@ -1,4 +1,4 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut.h @@ -19,7 +19,7 @@ #include "ui/gfx/image/image_family.h" @@ -9,16 +9,25 @@ #include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h" #endif // BUILDFLAG(IS_LINUX) -@@ -47,7 +47,7 @@ struct ScopedShortcutOverrideForTesting { - base::ScopedTempDir startup; +@@ -33,7 +33,7 @@ class ImageSkia; + + namespace web_app { + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + struct LinuxFileRegistration { + std::string xdg_command; + std::string file_contents; +@@ -61,7 +61,7 @@ struct ScopedShortcutOverrideForTesting { #elif BUILDFLAG(IS_MAC) base::ScopedTempDir chrome_apps_folder; + std::map<base::FilePath, bool> startup_enabled; -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::ScopedTempDir desktop; - #endif - }; -@@ -89,7 +89,7 @@ struct ShortcutInfo { + base::ScopedTempDir startup; + std::vector<LinuxFileRegistration> linux_file_registration; +@@ -107,7 +107,7 @@ struct ShortcutInfo { std::set<std::string> file_handler_extensions; std::set<std::string> file_handler_mime_types; std::set<std::string> protocol_handlers; diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc index 1b6f9fc08584..7b1ffe8f408e 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc @@ -1,15 +1,6 @@ ---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc -@@ -35,7 +35,7 @@ namespace web_app { - - namespace { - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Aligns with other platform implementations that only support 10 items. - constexpr int kMaxApplicationDockMenuItems = 10; - #endif // BUILDFLAG(IS_LINUX) -@@ -382,7 +382,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B +@@ -379,7 +379,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B } } @@ -17,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) const std::vector<WebAppShortcutsMenuItemInfo>& shortcuts_menu_item_infos = app->shortcuts_menu_item_infos(); - int num_entries = std::min(static_cast<int>(shortcuts_menu_item_infos.size()), + DCHECK_LE(shortcuts_menu_item_infos.size(), kMaxApplicationDockMenuItems); diff --git a/www/iridium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/iridium/files/patch-chrome_browser_web__applications_web__app__provider.cc index fc624a22b045..4acb99c0ca5c 100644 --- a/www/iridium/files/patch-chrome_browser_web__applications_web__app__provider.cc +++ b/www/iridium/files/patch-chrome_browser_web__applications_web__app__provider.cc @@ -1,6 +1,6 @@ ---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/web_applications/web_app_provider.cc -@@ -289,7 +289,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile +@@ -271,7 +271,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile protocol_handler_manager.get()); std::unique_ptr<UrlHandlerManager> url_handler_manager; diff --git a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc index 34121ade65e4..7c5b8880e09a 100644 --- a/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc +++ b/www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc @@ -1,11 +1,11 @@ ---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc -@@ -749,7 +749,7 @@ bool ChromeAuthenticatorRequestDelegate::ShouldPermitC - // TODO(crbug.com/1052397): Revisit the macro expression once build flag - // switch of lacros-chrome is complete. If updating this, also update - // kWebAuthCableServerLink. --#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) +@@ -668,7 +668,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl + } + } - // caBLEv1 is disabled on these platforms. It never launched on them because - // it causes problems in bluez. Rather than disabling caBLE completely, which +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // No caBLEv1 on Linux. It tends to crash bluez. + if (std::any_of(pairings_from_extension.begin(), + pairings_from_extension.end(), diff --git a/www/iridium/files/patch-chrome_common_channel__info.h b/www/iridium/files/patch-chrome_common_channel__info.h index ce36359d0c34..c00d1ea16649 100644 --- a/www/iridium/files/patch-chrome_common_channel__info.h +++ b/www/iridium/files/patch-chrome_common_channel__info.h @@ -1,6 +1,6 @@ ---- chrome/common/channel_info.h.orig 2022-03-28 18:11:04 UTC +--- chrome/common/channel_info.h.orig 2022-10-05 07:34:01 UTC +++ chrome/common/channel_info.h -@@ -107,7 +107,7 @@ std::string GetChannelSuffixForDataDir(); +@@ -106,7 +106,7 @@ std::string GetChannelSuffixForDataDir(); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_common_chrome__features.cc b/www/iridium/files/patch-chrome_common_chrome__features.cc index 5107107f84e5..eee498d6a39f 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.cc +++ b/www/iridium/files/patch-chrome_common_chrome__features.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/common/chrome_features.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/common/chrome_features.cc -@@ -105,7 +105,7 @@ const base::Feature kAsyncDns { +@@ -90,7 +90,7 @@ const base::Feature kAsyncDns { }; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ // Enables or disables the Autofill survey triggered by opening a prompt to // save address info. const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey", -@@ -120,7 +120,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP +@@ -105,7 +105,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP base::FEATURE_DISABLED_BY_DEFAULT}; #endif @@ -18,16 +18,7 @@ // Enables the Restart background mode optimization. When all Chrome UI is // closed and it goes in the background, allows to restart the browser to // discard memory. -@@ -142,7 +142,7 @@ const base::Feature kBorealis{"Borealis", base::FEATUR - const base::Feature kChangePictureVideoMode{"ChangePictureVideoMode", - base::FEATURE_ENABLED_BY_DEFAULT}; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. - // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome - // Apps will not launch and will be marked in the UI as deprecated. -@@ -298,7 +298,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit +@@ -268,7 +268,7 @@ const base::Feature kDesktopPWAsEnforceWebAppSettingsP // Enables or disables Desktop PWAs to be auto-started on OS login. const base::Feature kDesktopPWAsRunOnOsLogin { "DesktopPWAsRunOnOsLogin", @@ -36,16 +27,16 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -320,7 +320,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA +@@ -284,7 +284,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA base::FEATURE_DISABLED_BY_DEFAULT}; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // Serves web app settings at chrome://app-settings/<app-id>. - const base::Feature kDesktopPWAsWebAppSettingsPage{ - "DesktopPWAsWebAppSettingsPage", base::FEATURE_ENABLED_BY_DEFAULT}; -@@ -330,7 +330,7 @@ const base::Feature kDesktopPWAsWebAppSettingsPage{ + // Controls whether Chrome Apps are supported. See https://crbug.com/1221251. + // If the feature is disabled, Chrome Apps continue to work. If enabled, Chrome + // Apps will not launch and will be marked in the UI as deprecated. +@@ -306,7 +306,7 @@ const base::Feature kDisruptiveNotificationPermissionR const base::Feature kDnsOverHttps { "DnsOverHttps", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -54,7 +45,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -352,7 +352,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa +@@ -322,7 +322,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa const base::FeatureParam<bool> kDnsOverHttpsShowUiParam { &kDnsOverHttps, "ShowUi", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ @@ -63,25 +54,16 @@ true #else false -@@ -624,7 +624,7 @@ const base::Feature kIncognitoNtpRevamp{"IncognitoNtpR - base::FEATURE_DISABLED_BY_DEFAULT}; - - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - // When enabled, removes any theme or background customization done by the user - // on the Incognito UI. - const base::Feature kIncognitoBrandConsistencyForDesktop{ -@@ -658,7 +658,7 @@ const base::Feature kLinkCapturingUiUpdate{"LinkCaptur - base::FEATURE_DISABLED_BY_DEFAULT}; - #endif +@@ -608,7 +608,7 @@ const base::Feature kKioskEnableAppService("KioskEnabl + const base::Feature kUpdateHistoryEntryPointsInIncognito{ + "UpdateHistoryEntryPointsInIncognito", base::FEATURE_ENABLED_BY_DEFAULT}; -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor", base::FEATURE_DISABLED_BY_DEFAULT}; -@@ -671,7 +671,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit +@@ -621,7 +621,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit &kLinuxLowMemoryMonitor, "critical_level", 255}; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__features.h b/www/iridium/files/patch-chrome_common_chrome__features.h index d5c366e223e1..3f2e395e082a 100644 --- a/www/iridium/files/patch-chrome_common_chrome__features.h +++ b/www/iridium/files/patch-chrome_common_chrome__features.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_features.h.orig 2022-04-01 07:48:30 UTC +--- chrome/common/chrome_features.h.orig 2022-10-05 07:34:01 UTC +++ chrome/common/chrome_features.h -@@ -90,7 +90,7 @@ extern const base::Feature kArcPiGhostWindow; +@@ -81,7 +81,7 @@ extern const base::Feature kAppShimNewCloseBehavior; COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillAddressSurvey; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -99,7 +99,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -90,7 +90,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAutofillPasswordSurvey; #endif @@ -18,43 +18,25 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kBackgroundModeAllowRestart; #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -121,7 +121,7 @@ extern const base::Feature kBrowserAppInstanceTracking - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kChangePictureVideoMode; - --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kChromeAppsDeprecation; - #endif -@@ -219,7 +219,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -204,7 +204,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kDesktopPWAsWebBundles; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kDesktopPWAsWebAppSettingsPage; - #endif -@@ -425,7 +425,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kIncognitoNtpRevamp; - - #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + extern const base::Feature kChromeAppsDeprecation; COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kIncognitoBrandConsistencyForDesktop; - -@@ -452,7 +452,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) - extern const base::Feature kLinkCapturingUiUpdate; - #endif +@@ -429,7 +429,7 @@ extern const base::Feature kKioskEnableAppService; + COMPONENT_EXPORT(CHROME_FEATURES) + extern const base::Feature kUpdateHistoryEntryPointsInIncognito; -#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS) COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kLinuxLowMemoryMonitor; COMPONENT_EXPORT(CHROME_FEATURES) -@@ -461,7 +461,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) +@@ -438,7 +438,7 @@ COMPONENT_EXPORT(CHROME_FEATURES) extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel; #endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.cc b/www/iridium/files/patch-chrome_common_chrome__paths.cc index f5b1b04108da..bc6742422830 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths.cc +++ b/www/iridium/files/patch-chrome_common_chrome__paths.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_paths.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/common/chrome_paths.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/common/chrome_paths.cc -@@ -44,14 +44,14 @@ +@@ -49,14 +49,14 @@ namespace { @@ -27,7 +27,7 @@ if (!GetUserDownloadsDirectorySafe(&cur)) return false; break; -@@ -407,12 +407,14 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -421,12 +421,14 @@ bool PathProvider(int key, base::FilePath* result) { if (!base::PathExists(cur)) // We don't want to create this return false; break; @@ -44,7 +44,7 @@ #endif break; } -@@ -422,7 +424,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -436,7 +438,7 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ BUILDFLAG(CHROMIUM_BRANDING)) || \ @@ -53,7 +53,7 @@ case chrome::DIR_USER_EXTERNAL_EXTENSIONS: { if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur)) return false; -@@ -430,7 +432,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -444,7 +446,7 @@ bool PathProvider(int key, base::FilePath* result) { break; } #endif @@ -62,7 +62,7 @@ case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: { cur = base::FilePath(kFilepathSinglePrefExtensions); break; -@@ -475,7 +477,7 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -488,7 +490,7 @@ bool PathProvider(int key, base::FilePath* result) { break; #endif @@ -71,7 +71,7 @@ case chrome::DIR_NATIVE_MESSAGING: #if BUILDFLAG(IS_MAC) #if BUILDFLAG(GOOGLE_CHROME_BRANDING) -@@ -489,6 +491,9 @@ bool PathProvider(int key, base::FilePath* result) { +@@ -502,6 +504,9 @@ bool PathProvider(int key, base::FilePath* result) { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) cur = base::FilePath(FILE_PATH_LITERAL( "/etc/opt/chrome/native-messaging-hosts")); diff --git a/www/iridium/files/patch-chrome_common_chrome__paths.h b/www/iridium/files/patch-chrome_common_chrome__paths.h index 3d25ba171387..fcac7910296a 100644 --- a/www/iridium/files/patch-chrome_common_chrome__paths.h +++ b/www/iridium/files/patch-chrome_common_chrome__paths.h @@ -1,4 +1,4 @@ ---- chrome/common/chrome_paths.h.orig 2022-03-28 18:11:04 UTC +--- chrome/common/chrome_paths.h.orig 2022-10-05 07:34:01 UTC +++ chrome/common/chrome_paths.h @@ -56,7 +56,7 @@ enum { #if BUILDFLAG(IS_CHROMEOS_ASH) || \ @@ -18,7 +18,7 @@ DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension' // definition manifest files that // describe extensions which are to be -@@ -105,7 +105,7 @@ enum { +@@ -117,7 +117,7 @@ enum { DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers // reside. #endif diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc index 36e181b10d75..2ead537c0089 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.cc +++ b/www/iridium/files/patch-chrome_common_chrome__switches.cc @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/common/chrome_switches.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/common/chrome_switches.cc -@@ -794,14 +794,14 @@ const char kAllowNaClSocketAPI[] = "allow-n +@@ -814,14 +814,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket- #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.h b/www/iridium/files/patch-chrome_common_chrome__switches.h index a2a4597704f7..d26403ec0c96 100644 --- a/www/iridium/files/patch-chrome_common_chrome__switches.h +++ b/www/iridium/files/patch-chrome_common_chrome__switches.h @@ -1,6 +1,6 @@ ---- chrome/common/chrome_switches.h.orig 2022-04-01 07:48:30 UTC +--- chrome/common/chrome_switches.h.orig 2022-10-05 07:34:01 UTC +++ chrome/common/chrome_switches.h -@@ -248,12 +248,12 @@ extern const char kAllowNaClSocketAPI[]; +@@ -257,12 +257,12 @@ extern const char kAllowNaClSocketAPI[]; #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-chrome_common_extensions_command.cc b/www/iridium/files/patch-chrome_common_extensions_command.cc deleted file mode 100644 index 338e14cae9ab..000000000000 --- a/www/iridium/files/patch-chrome_common_extensions_command.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/common/extensions/command.cc.orig 2022-04-01 07:48:30 UTC -+++ chrome/common/extensions/command.cc -@@ -295,7 +295,7 @@ std::string Command::CommandPlatform() { - return values::kKeybindingPlatformMac; - #elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) - return values::kKeybindingPlatformChromeOs; --#elif BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return values::kKeybindingPlatformLinux; - #else - return ""; diff --git a/www/iridium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc b/www/iridium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc new file mode 100644 index 000000000000..4fd6e1acc98e --- /dev/null +++ b/www/iridium/files/patch-chrome_common_extensions_permissions_chrome__permission__message__rules.cc @@ -0,0 +1,11 @@ +--- chrome/common/extensions/permissions/chrome_permission_message_rules.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/common/extensions/permissions/chrome_permission_message_rules.cc +@@ -284,7 +284,7 @@ int GetEnterpriseReportingPrivatePermissionMessageId() + } + #if BUILDFLAG(IS_WIN) + return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_WIN; +-#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC) ++#elif BUILDFLAG(IS_LINUX) or BUILDFLAG(IS_MAC) or BUILDFLAG(IS_BSD) + return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE_ENABLED_LINUX_AND_MACOS; + #else + return IDS_EXTENSION_PROMPT_WARNING_ENTERPRISE_REPORTING_PRIVATE; diff --git a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc index 1d4285b9fd9e..9fceab96b5e1 100644 --- a/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc +++ b/www/iridium/files/patch-chrome_common_media_cdm__host__file__path.cc @@ -1,6 +1,6 @@ ---- chrome/common/media/cdm_host_file_path.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/common/media/cdm_host_file_path.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/common/media/cdm_host_file_path.cc -@@ -95,7 +95,7 @@ void AddCdmHostFilePaths( +@@ -94,7 +94,7 @@ void AddCdmHostFilePaths( cdm_host_file_paths->emplace_back(chrome_framework_path, chrome_framework_sig_path); diff --git a/www/iridium/files/patch-chrome_common_pref__names.cc b/www/iridium/files/patch-chrome_common_pref__names.cc index 73d95c06068b..81b03381cb41 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.cc +++ b/www/iridium/files/patch-chrome_common_pref__names.cc @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/common/pref_names.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/common/pref_names.cc -@@ -1188,7 +1188,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox +@@ -1249,7 +1249,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Linux specific preference on whether we should match the system theme. const char kUsesSystemTheme[] = "extensions.theme.use_system"; #endif -@@ -1291,7 +1291,7 @@ const char kShowUpdatePromotionInfoBar[] = +@@ -1348,7 +1348,7 @@ const char kShowUpdatePromotionInfoBar[] = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,8 +18,8 @@ // Boolean that is false if we should show window manager decorations. If // true, we draw a custom chrome frame (thicker title bar and blue border). const char kUseCustomChromeFrame[] = "browser.custom_chrome_frame"; -@@ -1780,7 +1780,7 @@ const char kDownloadDefaultDirectory[] = "download.def - const char kDownloadDirUpgraded[] = "download.directory_upgrade"; +@@ -1854,7 +1854,7 @@ const char kDownloadDirUpgraded[] = "download.director + const char kDownloadLastCompleteTime[] = "download.last_complete_time"; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) @@ -27,7 +27,7 @@ const char kOpenPdfDownloadInSystemReader[] = "download.open_pdf_in_system_reader"; #endif -@@ -2069,7 +2069,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i +@@ -2151,7 +2151,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i // its isolation requirements. const char kWebAppsIsolationState[] = "web_apps.isolation_state"; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) // Dictionary that maps origins to web apps that can act as URL handlers. const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info"; -@@ -2199,7 +2199,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled +@@ -2251,7 +2251,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled // requests. const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled"; @@ -45,12 +45,12 @@ // Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected // along with kAuthNegotiateDelegateAllowlist. const char kAuthNegotiateDelegateByKdcPolicy[] = -@@ -3129,7 +3129,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto +@@ -3275,7 +3275,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto const char kSandboxExternalProtocolBlocked[] = "profile.sandbox_external_protocol_blocked"; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Boolean that indicates if native notifications are allowed to be used in - // place of Chrome notifications. Will be replaced by kAllowSystemNotifications. - const char kAllowNativeNotifications[] = "native_notifications.allowed"; + // Boolean that indicates if system notifications are allowed to be used in + // place of Chrome notifications. + const char kAllowSystemNotifications[] = "system_notifications.allowed"; diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h index b7b0c410074b..c75508191962 100644 --- a/www/iridium/files/patch-chrome_common_pref__names.h +++ b/www/iridium/files/patch-chrome_common_pref__names.h @@ -1,6 +1,6 @@ ---- chrome/common/pref_names.h.orig 2022-04-01 07:48:30 UTC +--- chrome/common/pref_names.h.orig 2022-10-05 07:34:01 UTC +++ chrome/common/pref_names.h -@@ -372,7 +372,7 @@ extern const char kUseAshProxy[]; +@@ -389,7 +389,7 @@ extern const char kUseAshProxy[]; #endif // BUILDFLAG(IS_CHROMEOS_LACROS) // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ extern const char kUsesSystemTheme[]; #endif extern const char kCurrentThemePackFilename[]; -@@ -401,7 +401,7 @@ extern const char kShowUpdatePromotionInfoBar[]; +@@ -414,7 +414,7 @@ extern const char kShowUpdatePromotionInfoBar[]; #endif // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -18,16 +18,16 @@ extern const char kUseCustomChromeFrame[]; #endif #if BUILDFLAG(ENABLE_PLUGINS) -@@ -584,7 +584,7 @@ extern const char kDownloadExtensionsToOpenByPolicy[]; - extern const char kDownloadAllowedURLsForOpenByPolicy[]; +@@ -604,7 +604,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[ extern const char kDownloadDirUpgraded[]; + extern const char kDownloadLastCompleteTime[]; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_MAC) + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) extern const char kOpenPdfDownloadInSystemReader[]; #endif #if BUILDFLAG(IS_ANDROID) -@@ -691,7 +691,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps +@@ -714,7 +714,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps extern const char kWebAppsPreferences[]; extern const char kWebAppsIsolationState[]; @@ -36,7 +36,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) extern const char kWebAppsUrlHandlerInfo[]; #endif -@@ -830,7 +830,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] +@@ -846,7 +846,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[] extern const char kAmbientAuthenticationInPrivateModesEnabled[]; extern const char kBasicAuthOverHttpEnabled[]; @@ -45,12 +45,12 @@ extern const char kAuthNegotiateDelegateByKdcPolicy[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS) -@@ -1068,7 +1068,7 @@ extern const char kBlockAutoplayEnabled[]; +@@ -1115,7 +1115,7 @@ extern const char kBlockAutoplayEnabled[]; #endif extern const char kSandboxExternalProtocolBlocked[]; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - extern const char kAllowNativeNotifications[]; extern const char kAllowSystemNotifications[]; #endif + diff --git a/www/iridium/files/patch-chrome_common_url__constants.cc b/www/iridium/files/patch-chrome_common_url__constants.cc new file mode 100644 index 000000000000..9be415891553 --- /dev/null +++ b/www/iridium/files/patch-chrome_common_url__constants.cc @@ -0,0 +1,11 @@ +--- chrome/common/url_constants.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/common/url_constants.cc +@@ -489,7 +489,7 @@ const char kPhoneHubPermissionLearnMoreURL[] = + "https://support.google.com/chromebook/?p=multidevice"; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + const char kChromeAppsDeprecationLearnMoreURL[] = + "https://support.google.com/chrome/?p=chrome_app_deprecation"; + #endif diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h new file mode 100644 index 000000000000..a92741c15ada --- /dev/null +++ b/www/iridium/files/patch-chrome_common_url__constants.h @@ -0,0 +1,11 @@ +--- chrome/common/url_constants.h.orig 2022-10-05 07:34:01 UTC ++++ chrome/common/url_constants.h +@@ -462,7 +462,7 @@ extern const char kOutdatedPluginLearnMoreURL[]; + extern const char kPhoneHubPermissionLearnMoreURL[]; + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + + // "Learn more" URL for the chrome apps deprecation dialog. + extern const char kChromeAppsDeprecationLearnMoreURL[]; diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.cc b/www/iridium/files/patch-chrome_common_webui__url__constants.cc index 9771a96f366f..926ee0bd9699 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.cc +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.cc @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/common/webui_url_constants.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/common/webui_url_constants.cc -@@ -434,18 +434,18 @@ const char kOsUIFlagsURL[] = "os://flags"; +@@ -478,18 +478,18 @@ const char kOsUIScanningAppURL[] = "os://scanning"; const char kOsUIVersionURL[] = "os://version"; #endif @@ -11,8 +11,8 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) const char kChromeUIConnectorsInternalsHost[] = "connectors-internals"; #endif @@ -22,7 +22,7 @@ const char kChromeUIDiscardsHost[] = "discards"; const char kChromeUIDiscardsURL[] = "chrome://discards/"; #endif -@@ -460,14 +460,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr +@@ -504,14 +504,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -39,7 +39,7 @@ const char kChromeUIBrowserSwitchHost[] = "browser-switch"; const char kChromeUIBrowserSwitchURL[] = "chrome://browser-switch/"; const char kChromeUIEnterpriseProfileWelcomeHost[] = -@@ -482,7 +482,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro +@@ -527,7 +527,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro const char kChromeUIProfilePickerStartupQuery[] = "startup"; #endif @@ -48,7 +48,7 @@ defined(TOOLKIT_VIEWS)) || \ defined(USE_AURA) const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog"; -@@ -554,7 +554,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan +@@ -602,7 +602,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -57,33 +57,7 @@ const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/"; const char kChromeUIWebAppSettingsHost[] = "app-settings"; #endif -@@ -678,21 +678,21 @@ const char* const kChromeHostURLs[] = { - kChromeUIAssistantOptInHost, - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIConnectorsInternalsHost, - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - kChromeUIDiscardsHost, - #endif --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - kChromeUIWebAppSettingsHost, - #endif - #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_ANDROID) - kChromeUILinuxProxyConfigHost, - #endif - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_ANDROID) -+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - kChromeUISandboxHost, - #endif - #if BUILDFLAG(IS_WIN) -@@ -749,7 +749,7 @@ const char* const kChromeDebugURLs[] = { +@@ -810,7 +810,7 @@ const char* const kChromeDebugURLs[] = { blink::kChromeUIGpuJavaCrashURL, kChromeUIJavaCrashURL, #endif diff --git a/www/iridium/files/patch-chrome_common_webui__url__constants.h b/www/iridium/files/patch-chrome_common_webui__url__constants.h index 5444bc983325..cdb6418f2a75 100644 --- a/www/iridium/files/patch-chrome_common_webui__url__constants.h +++ b/www/iridium/files/patch-chrome_common_webui__url__constants.h @@ -1,6 +1,6 @@ ---- chrome/common/webui_url_constants.h.orig 2022-04-01 07:48:30 UTC +--- chrome/common/webui_url_constants.h.orig 2022-10-05 07:34:01 UTC +++ chrome/common/webui_url_constants.h -@@ -371,24 +371,24 @@ extern const char kOsUIFlagsURL[]; +@@ -407,24 +407,24 @@ extern const char kOsUIScanningAppURL[]; extern const char kOsUIVersionURL[]; #endif @@ -11,8 +11,8 @@ #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +- BUILDFLAG(IS_CHROMEOS_ASH) ++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) extern const char kChromeUIConnectorsInternalsHost[]; #endif @@ -29,7 +29,7 @@ extern const char kChromeUIWebAppSettingsURL[]; extern const char kChromeUIWebAppSettingsHost[]; #endif -@@ -403,14 +403,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; +@@ -439,14 +439,14 @@ extern const char kChromeUILinuxProxyConfigHost[]; #endif #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -42,11 +42,11 @@ // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_FUCHSIA) || \ - (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD) ++ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) extern const char kChromeUIBrowserSwitchHost[]; extern const char kChromeUIBrowserSwitchURL[]; extern const char kChromeUIEnterpriseProfileWelcomeHost[]; -@@ -422,7 +422,7 @@ extern const char kChromeUIProfilePickerUrl[]; +@@ -459,7 +459,7 @@ extern const char kChromeUIProfilePickerUrl[]; extern const char kChromeUIProfilePickerStartupQuery[]; #endif diff --git a/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc index 5879f3df57c4..7dbc3f1b095a 100644 --- a/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc +++ b/www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc @@ -1,6 +1,6 @@ ---- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/renderer/chrome_render_frame_observer.cc -@@ -280,7 +280,7 @@ void ChromeRenderFrameObserver::OnDestruct() { +@@ -340,7 +340,7 @@ void ChromeRenderFrameObserver::OnDestruct() { void ChromeRenderFrameObserver::DraggableRegionsChanged() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc b/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc deleted file mode 100644 index 77709cb90876..000000000000 --- a/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/renderer/pepper/pepper_flash_font_file_host.cc -@@ -16,7 +16,7 @@ - #include "ppapi/proxy/ppapi_messages.h" - #include "ppapi/proxy/serialized_structs.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "components/services/font/public/cpp/font_loader.h" - #include "pdf/font_table_linux.h" - #elif BUILDFLAG(IS_WIN) -@@ -30,7 +30,7 @@ PepperFlashFontFileHost::PepperFlashFontFileHost( - const ppapi::proxy::SerializedFontDescription& description, - PP_PrivateFontCharset charset) - : ResourceHost(host->GetPpapiHost(), instance, resource) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The global SkFontConfigInterface is configured and initialized with a - // SkFontconfigInterface compatible font_service::FontLoader in - // RendererBlinkPlatformImpl (called from RenderThreadImpl::Init) at startup -@@ -75,7 +75,7 @@ bool PepperFlashFontFileHost::GetFontData(uint32_t tab - void* buffer, - size_t* length) { - bool result = false; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (font_file_.IsValid()) { - result = - pdf::GetFontTable(font_file_.GetPlatformFile(), table, /*offset=*/0, diff --git a/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h b/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h deleted file mode 100644 index 2e82a39f3eb3..000000000000 --- a/www/iridium/files/patch-chrome_renderer_pepper_pepper__flash__font__file__host.h +++ /dev/null @@ -1,20 +0,0 @@ ---- chrome/renderer/pepper/pepper_flash_font_file_host.h.orig 2022-03-28 18:11:04 UTC -+++ chrome/renderer/pepper/pepper_flash_font_file_host.h -@@ -12,7 +12,7 @@ - #include "ppapi/c/private/pp_private_font_charset.h" - #include "ppapi/host/resource_host.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OPENBSD) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/files/file.h" - #elif BUILDFLAG(IS_WIN) - #include "third_party/skia/include/core/SkRefCnt.h" -@@ -52,7 +52,7 @@ class PepperFlashFontFileHost : public ppapi::host::Re - uint32_t table); - bool GetFontData(uint32_t table, void* buffer, size_t* length); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - base::File font_file_; - #elif BUILDFLAG(IS_WIN) - sk_sp<SkTypeface> typeface_; diff --git a/www/iridium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h b/www/iridium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h index 88ced337895e..a80daedf08c8 100644 --- a/www/iridium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h +++ b/www/iridium/files/patch-chrome_services_file__util_public_mojom_safe__document__analyzer__mojom__traits.h @@ -1,6 +1,6 @@ ---- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2022-03-28 18:11:04 UTC +--- chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h.orig 2022-10-05 07:34:01 UTC +++ chrome/services/file_util/public/mojom/safe_document_analyzer_mojom_traits.h -@@ -15,7 +15,7 @@ +@@ -16,7 +16,7 @@ #include "mojo/public/cpp/bindings/struct_traits.h" #if !BUILDFLAG(FULL_SAFE_BROWSING) || \ diff --git a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc index b1209960bc75..de027118f1f5 100644 --- a/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc +++ b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc @@ -1,11 +1,11 @@ ---- chrome/services/printing/print_backend_service_impl.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/services/printing/print_backend_service_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/services/printing/print_backend_service_impl.cc -@@ -510,7 +510,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( +@@ -604,7 +604,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings( crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>( - print_backend_->GetPrinterDriverInfo(printer_name)); + print_backend_->GetPrinterDriverInfo(*printer_name)); -#if BUILDFLAG(IS_LINUX) && defined(USE_CUPS) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS) // Try to fill in advanced settings based upon basic info options. PrinterBasicInfo basic_info; - if (print_backend_->GetPrinterBasicInfo(printer_name, &basic_info) == + if (print_backend_->GetPrinterBasicInfo(*printer_name, &basic_info) == diff --git a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc index 27a73610e829..9c2190105ba5 100644 --- a/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc +++ b/www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc @@ -1,6 +1,6 @@ ---- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/services/speech/audio_source_fetcher_impl.cc -@@ -68,7 +68,7 @@ void AudioSourceFetcherImpl::Start( +@@ -69,7 +69,7 @@ void AudioSourceFetcherImpl::Start( // TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and // Windows. diff --git a/www/iridium/files/patch-chrome_test_BUILD.gn b/www/iridium/files/patch-chrome_test_BUILD.gn index c2f99cffe5e2..4af67e7d6edb 100644 --- a/www/iridium/files/patch-chrome_test_BUILD.gn +++ b/www/iridium/files/patch-chrome_test_BUILD.gn @@ -1,8 +1,8 @@ ---- chrome/test/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- chrome/test/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ chrome/test/BUILD.gn -@@ -9110,7 +9110,7 @@ test("chrome_app_unittests") { +@@ -9861,7 +9861,7 @@ test("chrome_app_unittests") { + "//components/heap_profiling/in_process", "//components/safe_browsing:buildflags", - "//pdf:pdf_ppapi", ] - if (!is_fuchsia) { + if (!is_fuchsia && !is_bsd) { diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc index 1ca8f641156b..bc6367e9e9fb 100644 --- a/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc +++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome_chrome__finder.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/test/chromedriver/chrome/chrome_finder.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/test/chromedriver/chrome/chrome_finder.cc -@@ -54,7 +54,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l +@@ -53,7 +53,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* l installation_locations[i].Append(L"Chromium\\Application")); } } @@ -9,7 +9,7 @@ void GetApplicationDirs(std::vector<base::FilePath>* locations) { // TODO: Respect users' PATH variables. // Until then, we use an approximation of the most common defaults. -@@ -139,7 +139,7 @@ bool FindChrome(base::FilePath* browser_exe) { +@@ -138,7 +138,7 @@ bool FindChrome(base::FilePath* browser_exe) { base::FilePath browser_exes_array[] = { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) base::FilePath(chrome::kBrowserProcessExecutablePath), diff --git a/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc b/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc index e4a49cf12969..72b4c38395ca 100644 --- a/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc +++ b/www/iridium/files/patch-chrome_test_chromedriver_keycode__text__conversion__unittest.cc @@ -1,6 +1,6 @@ ---- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/test/chromedriver/keycode_text_conversion_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/test/chromedriver/keycode_text_conversion_unittest.cc -@@ -64,7 +64,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo +@@ -67,7 +67,7 @@ std::string ConvertKeyCodeToTextNoError(ui::KeyboardCo // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Fails on bots: crbug.com/174962 #define MAYBE_KeyCodeToText DISABLED_KeyCodeToText #else -@@ -101,7 +101,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) { +@@ -104,7 +104,7 @@ TEST(KeycodeTextConversionTest, MAYBE_KeyCodeToText) { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-chrome_test_interaction_webui__interaction__test__util.cc b/www/iridium/files/patch-chrome_test_interaction_webui__interaction__test__util.cc new file mode 100644 index 000000000000..b34cf6b1b54b --- /dev/null +++ b/www/iridium/files/patch-chrome_test_interaction_webui__interaction__test__util.cc @@ -0,0 +1,11 @@ +--- chrome/test/interaction/webui_interaction_test_util.cc.orig 2022-10-05 07:34:01 UTC ++++ chrome/test/interaction/webui_interaction_test_util.cc +@@ -54,7 +54,7 @@ class RenderFrameHost; + + namespace { + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #define SUPPORTS_PIXEL_TESTS 1 + #else + #define SUPPORTS_PIXEL_TESTS 0 diff --git a/www/iridium/files/patch-chrome_updater_app_app__install.cc b/www/iridium/files/patch-chrome_updater_app_app__install.cc index a3427e8079ef..7c2cc90a9bb3 100644 --- a/www/iridium/files/patch-chrome_updater_app_app__install.cc +++ b/www/iridium/files/patch-chrome_updater_app_app__install.cc @@ -1,6 +1,6 @@ ---- chrome/updater/app/app_install.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/updater/app/app_install.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/updater/app/app_install.cc -@@ -166,7 +166,7 @@ void AppInstall::WakeCandidate() { +@@ -215,7 +215,7 @@ void AppInstall::WakeCandidate() { update_service_internal, base::WrapRefCounted(this))); } diff --git a/www/iridium/files/patch-chrome_updater_configurator.cc b/www/iridium/files/patch-chrome_updater_configurator.cc index b91ebff0c9c1..3033d51e65fc 100644 --- a/www/iridium/files/patch-chrome_updater_configurator.cc +++ b/www/iridium/files/patch-chrome_updater_configurator.cc @@ -1,6 +1,6 @@ ---- chrome/updater/configurator.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/updater/configurator.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/updater/configurator.cc -@@ -39,7 +39,7 @@ +@@ -41,7 +41,7 @@ #include "chrome/updater/win/net/network.h" #elif BUILDFLAG(IS_MAC) #include "chrome/updater/mac/net/network.h" diff --git a/www/iridium/files/patch-chrome_updater_device__management_cloud__policy__util.cc b/www/iridium/files/patch-chrome_updater_device__management_cloud__policy__util.cc deleted file mode 100644 index 3d2008f7da19..000000000000 --- a/www/iridium/files/patch-chrome_updater_device__management_cloud__policy__util.cc +++ /dev/null @@ -1,47 +0,0 @@ ---- chrome/updater/device_management/cloud_policy_util.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/updater/device_management/cloud_policy_util.cc -@@ -22,7 +22,7 @@ - #include <wincred.h> - #endif - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - #include <pwd.h> - #include <sys/types.h> - #include <unistd.h> -@@ -36,7 +36,7 @@ - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include <limits.h> // For HOST_NAME_MAX - #endif - -@@ -63,7 +63,7 @@ - - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "base/system/sys_info.h" - #endif - -@@ -111,7 +111,7 @@ std::string GetPolicyVerificationKey() { - std::string GetMachineName() { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - char hostname[HOST_NAME_MAX]; - if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. - return hostname; -@@ -161,7 +161,7 @@ std::string GetMachineName() { - } - - std::string GetOSVersion() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - return base::SysInfo::OperatingSystemVersion(); - #elif BUILDFLAG(IS_WIN) - base::win::OSInfo::VersionNumber version_number = diff --git a/www/iridium/files/patch-chrome_updater_device__management_dm__storage.cc b/www/iridium/files/patch-chrome_updater_device__management_dm__storage.cc index 217994afc52a..24f3b5a6b605 100644 --- a/www/iridium/files/patch-chrome_updater_device__management_dm__storage.cc +++ b/www/iridium/files/patch-chrome_updater_device__management_dm__storage.cc @@ -1,4 +1,4 @@ ---- chrome/updater/device_management/dm_storage.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/updater/device_management/dm_storage.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/updater/device_management/dm_storage.cc @@ -70,7 +70,7 @@ bool DeleteObsoletePolicies(const base::FilePath& cach @@ -6,6 +6,15 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // crbug.com/1276162 - implement. + // TODO(crbug.com/1276162) - implement. DMStorage::DMStorage(const base::FilePath& policy_cache_root) - : policy_cache_root_(policy_cache_root) { + : policy_cache_root_(policy_cache_root), +@@ -215,7 +215,7 @@ DMStorage::GetOmahaPolicySettings() const { + return omaha_settings; + } + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1276162) - implement. + scoped_refptr<DMStorage> GetDefaultDMStorage() { + NOTIMPLEMENTED(); diff --git a/www/iridium/files/patch-chrome_updater_installer.cc b/www/iridium/files/patch-chrome_updater_installer.cc index e6344bdc6666..734a14bba90f 100644 --- a/www/iridium/files/patch-chrome_updater_installer.cc +++ b/www/iridium/files/patch-chrome_updater_installer.cc @@ -1,11 +1,11 @@ ---- chrome/updater/installer.cc.orig 2022-03-28 18:11:04 UTC +--- chrome/updater/installer.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/updater/installer.cc -@@ -225,7 +225,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn +@@ -243,7 +243,7 @@ absl::optional<base::FilePath> Installer::GetCurrentIn return path->AppendASCII(pv_.GetString()); } -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - Installer::Result Installer::RunApplicationInstaller( - const base::FilePath& /*app_installer*/, - const std::string& /*arguments*/, + + AppInstallerResult RunApplicationInstaller( + const AppInfo& /*app_info*/, diff --git a/www/iridium/files/patch-chrome_updater_lib__util.cc b/www/iridium/files/patch-chrome_updater_lib__util.cc deleted file mode 100644 index 18ed07103b28..000000000000 --- a/www/iridium/files/patch-chrome_updater_lib__util.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chrome/updater/lib_util.cc.orig 2022-03-28 18:11:04 UTC -+++ chrome/updater/lib_util.cc -@@ -11,7 +11,7 @@ - - namespace updater { - --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - - std::string UnescapeURLComponent(base::StringPiece escaped_text) { - return base::UnescapeURLComponent( diff --git a/www/iridium/files/patch-chrome_updater_updater.cc b/www/iridium/files/patch-chrome_updater_updater.cc index 5c5f148d39d7..94a765b7f0f6 100644 --- a/www/iridium/files/patch-chrome_updater_updater.cc +++ b/www/iridium/files/patch-chrome_updater_updater.cc @@ -1,6 +1,6 @@ ---- chrome/updater/updater.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/updater/updater.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/updater/updater.cc -@@ -41,7 +41,7 @@ +@@ -44,7 +44,7 @@ #include "chrome/updater/win/win_util.h" #elif BUILDFLAG(IS_MAC) #include "chrome/updater/app/server/mac/server.h" diff --git a/www/iridium/files/patch-chrome_updater_util.cc b/www/iridium/files/patch-chrome_updater_util.cc index cd83b2de661e..ebb1c69040b5 100644 --- a/www/iridium/files/patch-chrome_updater_util.cc +++ b/www/iridium/files/patch-chrome_updater_util.cc @@ -1,6 +1,6 @@ ---- chrome/updater/util.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/updater/util.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/updater/util.cc -@@ -253,7 +253,7 @@ GURL AppendQueryParameter(const GURL& url, +@@ -263,7 +263,7 @@ GURL AppendQueryParameter(const GURL& url, return url.ReplaceComponents(replacements); } @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // TODO(crbug.com/1276188) - implement the functions below. - absl::optional<base::FilePath> GetUpdaterFolderPath(UpdaterScope scope) { + absl::optional<base::FilePath> GetBaseInstallDirectory(UpdaterScope scope) { diff --git a/www/iridium/files/patch-chrome_utility_services.cc b/www/iridium/files/patch-chrome_utility_services.cc index 7f0c4054190d..7c043db502e6 100644 --- a/www/iridium/files/patch-chrome_utility_services.cc +++ b/www/iridium/files/patch-chrome_utility_services.cc @@ -1,6 +1,15 @@ ---- chrome/utility/services.cc.orig 2022-04-01 07:48:30 UTC +--- chrome/utility/services.cc.orig 2022-10-05 07:34:01 UTC +++ chrome/utility/services.cc -@@ -63,7 +63,7 @@ +@@ -56,7 +56,7 @@ + #include "chrome/services/system_signals/mac/mac_system_signals_service.h" + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "chrome/services/system_signals/linux/linux_system_signals_service.h" + #endif // BUILDFLAG(IS_LINUX) + +@@ -84,7 +84,7 @@ #include "chrome/services/file_util/file_util_service.h" // nogncheck #endif @@ -9,7 +18,16 @@ #include "chrome/services/file_util/document_analysis_service.h" // nogncheck #endif -@@ -216,7 +216,7 @@ auto RunCupsIppParser( +@@ -218,7 +218,7 @@ auto RunMacNotificationService( + } + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto RunSystemSignalsService( + mojo::PendingReceiver<device_signals::mojom::SystemSignalsService> + receiver) { +@@ -287,7 +287,7 @@ auto RunCupsIppParser( } #endif @@ -18,7 +36,16 @@ auto RunDocumentAnalysis( mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) { return std::make_unique<DocumentAnalysisService>(std::move(receiver)); -@@ -382,7 +382,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& +@@ -471,7 +471,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& + services.Add(RunWindowsIconReader); + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + services.Add(RunSystemSignalsService); + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) + +@@ -487,7 +487,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& services.Add(RunFileUtil); #endif diff --git a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc index 1f3bcf5402bf..cd0b2c04d87b 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-04-01 07:48:30 UTC +--- chromecast/browser/cast_browser_main_parts.cc.orig 2022-10-05 07:34:01 UTC +++ chromecast/browser/cast_browser_main_parts.cc -@@ -93,7 +93,7 @@ +@@ -90,7 +90,7 @@ #include "ui/base/ui_base_switches.h" #include "ui/gl/gl_switches.h" @@ -9,16 +9,7 @@ #include <fontconfig/fontconfig.h> #include <signal.h> #include <sys/prctl.h> -@@ -148,7 +148,7 @@ - #include "extensions/browser/extension_prefs.h" // nogncheck - #endif - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - #include "chromecast/browser/exo/wayland_server_controller.h" - #endif - -@@ -284,7 +284,7 @@ class CastViewsDelegate : public views::ViewsDelegate +@@ -265,7 +265,7 @@ class CastViewsDelegate : public views::ViewsDelegate #endif // defined(USE_AURA) @@ -27,7 +18,7 @@ base::FilePath GetApplicationFontsDir() { std::unique_ptr<base::Environment> env(base::Environment::Create()); -@@ -330,7 +330,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { +@@ -311,7 +311,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = { {cc::switches::kDisableThreadedAnimation, ""}, #endif // BUILDFLAG(IS_ANDROID) #endif // BUILDFLAG(IS_CAST_AUDIO_ONLY) @@ -36,30 +27,12 @@ #if defined(ARCH_CPU_X86_FAMILY) // This is needed for now to enable the x11 Ozone platform to work with // current Linux/NVidia OpenGL drivers. -@@ -522,7 +522,7 @@ void CastBrowserMainParts::ToolkitInitialized() { +@@ -482,7 +482,7 @@ void CastBrowserMainParts::ToolkitInitialized() { views_delegate_ = std::make_unique<CastViewsDelegate>(); #endif // defined(USE_AURA) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) base::FilePath dir_font = GetApplicationFontsDir(); - const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data()); - if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) { -@@ -753,7 +753,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() { - cast_browser_process_->browser_context()); - #endif - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - wayland_server_controller_ = - std::make_unique<WaylandServerController>(window_manager_.get()); - #endif -@@ -828,7 +828,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() { - - cast_browser_process_->cast_service()->Stop(); - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - wayland_server_controller_.reset(); - #endif - #if BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS) + const FcChar8* dir_font_char8 = + reinterpret_cast<const FcChar8*>(dir_font.value().data()); diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc index d0470fd5de3c..0a38333e219f 100644 --- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc +++ b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc @@ -1,15 +1,6 @@ ---- chromecast/browser/cast_content_browser_client.cc.orig 2022-04-01 07:48:30 UTC +--- chromecast/browser/cast_content_browser_client.cc.orig 2022-10-05 07:34:01 UTC +++ chromecast/browser/cast_content_browser_client.cc -@@ -135,7 +135,7 @@ - #include "extensions/common/constants.h" // nogncheck - #endif - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - #include "chromecast/browser/webview/webview_controller.h" - #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) - -@@ -476,7 +476,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS +@@ -434,7 +434,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS switches::kAudioOutputChannels)); } } else if (process_type == switches::kGpuProcess) { @@ -18,12 +9,3 @@ // Necessary for accelerated 2d canvas. By default on Linux, Chromium // assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU // canvas apps. -@@ -872,7 +872,7 @@ CastContentBrowserClient::CreateThrottlesForNavigation - handle, general_audience_browsing_service_.get())); - } - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - auto webview_throttle = WebviewController::MaybeGetNavigationThrottle(handle); - if (webview_throttle) { - throttles.push_back(std::move(webview_throttle)); diff --git a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc b/www/iridium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc deleted file mode 100644 index 815e3e503f01..000000000000 --- a/www/iridium/files/patch-chromecast_browser_cast__content__browser__client__receiver__bindings.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- chromecast/browser/cast_content_browser_client_receiver_bindings.cc.orig 2022-04-01 07:48:30 UTC -+++ chromecast/browser/cast_content_browser_client_receiver_bindings.cc -@@ -35,7 +35,7 @@ - #include "media/mojo/services/media_service.h" // nogncheck - #endif // BUILDFLAG(ENABLE_CAST_RENDERER) - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - #include "chromecast/browser/webview/js_channel_service.h" - #include "chromecast/common/mojom/js_channel.mojom.h" - #endif -@@ -234,7 +234,7 @@ void CastContentBrowserClient::RunServiceInstance( - void CastContentBrowserClient::BindHostReceiverForRenderer( - content::RenderProcessHost* render_process_host, - mojo::GenericPendingReceiver receiver) { --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - if (auto r = receiver.As<::chromecast::mojom::JsChannelBindingProvider>()) { - JsChannelService::Create(render_process_host, std::move(r), - base::ThreadTaskRunnerHandle::Get()); diff --git a/www/iridium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/iridium/files/patch-chromecast_renderer_cast__content__renderer__client.cc deleted file mode 100644 index a41c24c24a31..000000000000 --- a/www/iridium/files/patch-chromecast_renderer_cast__content__renderer__client.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-04-01 07:48:30 UTC -+++ chromecast/renderer/cast_content_renderer_client.cc -@@ -194,7 +194,7 @@ void CastContentRendererClient::RenderFrameCreated( - dispatcher->OnRenderFrameCreated(render_frame); - #endif - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) - // JsChannelBindings destroys itself when the RenderFrame is destroyed. - JsChannelBindings::Create(render_frame); - #endif diff --git a/www/iridium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc b/www/iridium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc new file mode 100644 index 000000000000..f3c2b9abe89d --- /dev/null +++ b/www/iridium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc @@ -0,0 +1,11 @@ +--- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-10-05 07:34:01 UTC ++++ components/autofill_assistant/browser/autofill_assistant_impl.cc +@@ -150,7 +150,7 @@ void AutofillAssistantImpl::GetCapabilitiesByHashPrefi + client_context.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID); + #endif + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + client_context.set_platform_type(ClientContextProto::PLATFORM_TYPE_DESKTOP); + #endif + diff --git a/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc b/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc new file mode 100644 index 000000000000..228356b560d4 --- /dev/null +++ b/www/iridium/files/patch-components_autofill__assistant_browser_client__context.cc @@ -0,0 +1,11 @@ +--- components/autofill_assistant/browser/client_context.cc.orig 2022-10-05 07:34:01 UTC ++++ components/autofill_assistant/browser/client_context.cc +@@ -23,7 +23,7 @@ ClientContextImpl::ClientContextImpl(const Client* cli + proto_.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID); + #endif + #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ +- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + proto_.set_platform_type(ClientContextProto::PLATFORM_TYPE_DESKTOP); + #endif + diff --git a/www/iridium/files/patch-components_autofill__payments__strings.grdp b/www/iridium/files/patch-components_autofill__payments__strings.grdp index 87b3acfcba46..bc5255485878 100644 --- a/www/iridium/files/patch-components_autofill__payments__strings.grdp +++ b/www/iridium/files/patch-components_autofill__payments__strings.grdp @@ -1,11 +1,11 @@ ---- components/autofill_payments_strings.grdp.orig 2022-03-28 18:11:04 UTC +--- components/autofill_payments_strings.grdp.orig 2022-10-05 07:34:01 UTC +++ components/autofill_payments_strings.grdp -@@ -118,7 +118,7 @@ +@@ -127,7 +127,7 @@ <message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java"> Save card </message> -- <if expr="is_linux and not chromeos"> -+ <if expr="is_posix and not chromeos"> +- <if expr="is_linux"> ++ <if expr="is_posix"> <then> <message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar."> Do you want to save this card to your Google Account? diff --git a/www/iridium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc b/www/iridium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc deleted file mode 100644 index ca538b7ce7f9..000000000000 --- a/www/iridium/files/patch-components_autofill_core_browser_autofill__external__delegate.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/autofill/core/browser/autofill_external_delegate.cc.orig 2022-03-28 18:11:04 UTC -+++ components/autofill/core/browser/autofill_external_delegate.cc -@@ -130,7 +130,7 @@ void AutofillExternalDelegate::OnSuggestionsReturned( - // Append the "Hide Suggestions" menu item for only Autofill Address and - // Autocomplete popups. - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - features::kAutofillEnableHideSuggestionsUI)) { - // If the user has selected a suggestion, it indicates the suggestions are diff --git a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc index d8747d4fb33f..8f9c1f73c05c 100644 --- a/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc +++ b/www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/browser/personal_data_manager.cc.orig 2022-04-01 07:48:30 UTC +--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-10-05 07:34:01 UTC +++ components/autofill/core/browser/personal_data_manager.cc -@@ -1986,7 +1986,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp +@@ -2057,7 +2057,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc index b71fcef301cf..8dba799b902d 100644 --- a/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc +++ b/www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc @@ -1,6 +1,6 @@ ---- components/autofill/core/common/autofill_payments_features.cc.orig 2022-04-01 07:48:30 UTC +--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-10-05 07:34:01 UTC +++ components/autofill/core/common/autofill_payments_features.cc -@@ -192,7 +192,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma +@@ -237,7 +237,7 @@ const base::FeatureParam<int> bool ShouldShowImprovedUserConsentForCreditCardSave() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_cast__channel_cast__message__util.cc b/www/iridium/files/patch-components_cast__channel_cast__message__util.cc index 05cd655cb638..4eb194626c45 100644 --- a/www/iridium/files/patch-components_cast__channel_cast__message__util.cc +++ b/www/iridium/files/patch-components_cast__channel_cast__message__util.cc @@ -1,6 +1,6 @@ ---- components/cast_channel/cast_message_util.cc.orig 2022-03-28 18:11:04 UTC +--- components/cast_channel/cast_message_util.cc.orig 2022-10-05 07:34:01 UTC +++ components/cast_channel/cast_message_util.cc -@@ -168,7 +168,7 @@ int GetVirtualConnectPlatformValue() { +@@ -169,7 +169,7 @@ int GetVirtualConnectPlatformValue() { return 4; #elif BUILDFLAG(IS_CHROMEOS_ASH) return 5; diff --git a/www/iridium/files/patch-components_components__chromium__strings.grd b/www/iridium/files/patch-components_components__chromium__strings.grd new file mode 100644 index 000000000000..2e86a665c966 --- /dev/null +++ b/www/iridium/files/patch-components_components__chromium__strings.grd @@ -0,0 +1,11 @@ +--- components/components_chromium_strings.grd.orig 2022-10-05 07:34:01 UTC ++++ components/components_chromium_strings.grd +@@ -223,7 +223,7 @@ + </message> + </if> + <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> + Go to + the browser menu > diff --git a/www/iridium/files/patch-components_components__google__chrome__strings.grd b/www/iridium/files/patch-components_components__google__chrome__strings.grd new file mode 100644 index 000000000000..39422a4de4d4 --- /dev/null +++ b/www/iridium/files/patch-components_components__google__chrome__strings.grd @@ -0,0 +1,11 @@ +--- components/components_google_chrome_strings.grd.orig 2022-10-05 07:34:01 UTC ++++ components/components_google_chrome_strings.grd +@@ -230,7 +230,7 @@ + </message> + </if> + <!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. --> +- <if expr="is_linux"> ++ <if expr="is_posix"> + <message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server."> + Go to + the Chrome menu > diff --git a/www/iridium/files/patch-components_crash_core_app_BUILD.gn b/www/iridium/files/patch-components_crash_core_app_BUILD.gn index 964d3afd8ea6..30b2d2e796cc 100644 --- a/www/iridium/files/patch-components_crash_core_app_BUILD.gn +++ b/www/iridium/files/patch-components_crash_core_app_BUILD.gn @@ -1,4 +1,4 @@ ---- components/crash/core/app/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- components/crash/core/app/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ components/crash/core/app/BUILD.gn @@ -52,7 +52,7 @@ static_library("app") { "crashpad.h", @@ -9,7 +9,7 @@ sources += [ "breakpad_linux.cc", "breakpad_linux.h", -@@ -61,6 +61,10 @@ static_library("app") { +@@ -62,6 +62,10 @@ static_library("app") { ] } @@ -20,7 +20,7 @@ defines = [ "CRASH_IMPLEMENTATION" ] public_deps = [ ":lib" ] -@@ -88,7 +92,7 @@ static_library("app") { +@@ -93,7 +97,7 @@ static_library("app") { libs = [ "log" ] } @@ -29,7 +29,7 @@ deps += [ "//base:base_static", "//components/crash/core/common", -@@ -96,7 +100,7 @@ static_library("app") { +@@ -101,7 +105,7 @@ static_library("app") { ] } @@ -38,7 +38,7 @@ deps += [ "//third_party/breakpad:client" ] } -@@ -216,11 +220,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { +@@ -221,11 +225,6 @@ if (is_mac || is_android || is_linux || is_chromeos) { # define custom UserStreamDataSources. executable("chrome_crashpad_handler") { sources = [ "chrome_crashpad_handler.cc" ] diff --git a/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc b/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc new file mode 100644 index 000000000000..fb734422cea5 --- /dev/null +++ b/www/iridium/files/patch-components_device__signals_core_common_signals__features.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/common/signals_features.cc.orig 2022-10-05 07:34:01 UTC ++++ components/device_signals/core/common/signals_features.cc +@@ -18,7 +18,7 @@ const base::FeatureParam<bool> kDisableAntiVirus{&kNew + const base::FeatureParam<bool> kDisableHotfix{&kNewEvSignalsEnabled, + "DisableHotfix", false}; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + // Enables the consent promo for sharing device signal when a managed user + // signs in on an unmanaged device. This occurs after the sign-in intercept + // and before the sync promo (if enabled) diff --git a/www/iridium/files/patch-components_device__signals_core_common_signals__features.h b/www/iridium/files/patch-components_device__signals_core_common_signals__features.h new file mode 100644 index 000000000000..d90d0f10c358 --- /dev/null +++ b/www/iridium/files/patch-components_device__signals_core_common_signals__features.h @@ -0,0 +1,11 @@ +--- components/device_signals/core/common/signals_features.h.orig 2022-10-05 07:34:01 UTC ++++ components/device_signals/core/common/signals_features.h +@@ -20,7 +20,7 @@ extern const base::FeatureParam<bool> kDisableSettings + extern const base::FeatureParam<bool> kDisableAntiVirus; + extern const base::FeatureParam<bool> kDisableHotfix; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + extern const base::Feature kDeviceSignalsPromoAfterSigninIntercept; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) + diff --git a/www/iridium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc b/www/iridium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc new file mode 100644 index 000000000000..b6bfb2378735 --- /dev/null +++ b/www/iridium/files/patch-components_device__signals_core_system__signals_platform__delegate.cc @@ -0,0 +1,11 @@ +--- components/device_signals/core/system_signals/platform_delegate.cc.orig 2022-10-05 07:34:01 UTC ++++ components/device_signals/core/system_signals/platform_delegate.cc +@@ -11,7 +11,7 @@ namespace device_signals { + + bool CustomFilePathComparator::operator()(const base::FilePath& a, + const base::FilePath& b) const { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux, the file system is case sensitive. + return a < b; + #else diff --git a/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc b/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc index 84dd02969ca1..5dade4c94611 100644 --- a/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc +++ b/www/iridium/files/patch-components_discardable__memory_service_discardable__shared__memory__manager.cc @@ -1,11 +1,11 @@ ---- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2022-03-28 18:11:04 UTC +--- components/discardable_memory/service/discardable_shared_memory_manager.cc.orig 2022-10-05 07:34:01 UTC +++ components/discardable_memory/service/discardable_shared_memory_manager.cc -@@ -171,7 +171,7 @@ int64_t GetDefaultMemoryLimit() { +@@ -171,7 +171,7 @@ uint64_t GetDefaultMemoryLimit() { // Limits the number of FDs used to 32, assuming a 4MB allocation size. - int64_t max_default_memory_limit = 128 * kMegabyte; + uint64_t max_default_memory_limit = 128 * kMegabyte; #else -- int64_t max_default_memory_limit = 512 * kMegabyte; -+ int64_t max_default_memory_limit = 128 * kMegabyte; +- uint64_t max_default_memory_limit = 512 * kMegabyte; ++ uint64_t max_default_memory_limit = 128 * kMegabyte; #endif // Use 1/8th of discardable memory on low-end devices. diff --git a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc index f4df7fab910a..ef5cc3c727bf 100644 --- a/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc +++ b/www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc @@ -1,15 +1,15 @@ ---- components/embedder_support/user_agent_utils_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- components/embedder_support/user_agent_utils_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ components/embedder_support/user_agent_utils_unittest.cc -@@ -54,7 +54,7 @@ namespace { - static constexpr char kChromeProductVersionRegex[] = - "Chrome/([0-9]+).([0-9]+).([0-9]+).([0-9]+)"; +@@ -80,7 +80,7 @@ const char kDesktop[] = + "Safari/537.36"; + #endif // BUILDFLAG(IS_ANDROID) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) std::string GetMachine() { struct utsname unixinfo; uname(&unixinfo); -@@ -162,7 +162,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) +@@ -188,7 +188,7 @@ void CheckUserAgentStringOrdering(bool mobile_device) int value; ASSERT_TRUE(base::StringToInt(pieces[i], &value)); } diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc index 669e0cc99769..c256a8ebdc6c 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc @@ -1,4 +1,4 @@ ---- components/feature_engagement/public/feature_configurations.cc.orig 2022-04-01 07:48:30 UTC +--- components/feature_engagement/public/feature_configurations.cc.orig 2022-10-05 07:34:01 UTC +++ components/feature_engagement/public/feature_configurations.cc @@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe absl::optional<FeatureConfig> GetClientSideFeatureConfig( @@ -9,7 +9,7 @@ if (kIPHPasswordsAccountStorageFeature.name == feature->name) { absl::optional<FeatureConfig> config = FeatureConfig(); config->valid = true; -@@ -834,7 +834,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf +@@ -904,7 +904,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf #endif // BUILDFLAG(IS_ANDROID) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc index 1b2d566be184..29c1f43637c0 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_constants.cc.orig 2022-04-01 07:48:30 UTC +--- components/feature_engagement/public/feature_constants.cc.orig 2022-10-05 07:34:01 UTC +++ components/feature_engagement/public/feature_constants.cc -@@ -22,7 +22,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", +@@ -24,7 +24,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT}; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,8 +9,8 @@ const base::Feature kIPHDesktopSharedHighlightingFeature{ "IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT}; const base::Feature kIPHDesktopTabGroupsNewGroupFeature{ -@@ -286,7 +286,7 @@ const base::Feature kIPHDefaultSiteViewFeature{ - "IPH_DefaultSiteView", base::FEATURE_DISABLED_BY_DEFAULT}; +@@ -294,7 +294,7 @@ const base::Feature kIPHOverflowMenuTipFeature{ + "IPH_OverflowMenuTip", base::FEATURE_DISABLED_BY_DEFAULT}; #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h index 8b85980fac3c..1928d3de7f8c 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__constants.h @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/feature_constants.h.orig 2022-04-01 07:48:30 UTC +--- components/feature_engagement/public/feature_constants.h.orig 2022-10-05 07:34:01 UTC +++ components/feature_engagement/public/feature_constants.h -@@ -30,7 +30,7 @@ extern const base::Feature kUseClientConfigIPH; - extern const base::Feature kIPHDummyFeature; +@@ -32,7 +32,7 @@ extern const base::Feature kIPHDummyFeature; + extern const base::Feature kEnableIPH; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,12 +9,12 @@ extern const base::Feature kIPHDesktopSharedHighlightingFeature; extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature; extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature; -@@ -174,7 +174,7 @@ extern const base::Feature kIPHDiscoverFeedHeaderFeatu - extern const base::Feature kIPHDefaultSiteViewFeature; +@@ -178,7 +178,7 @@ extern const base::Feature kIPHFollowWhileBrowsingFeat + extern const base::Feature kIPHOverflowMenuTipFeature; #endif // BUILDFLAG(IS_IOS) -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) extern const base::Feature kIPHAutofillVirtualCardSuggestionFeature; - extern const base::Feature kIPHUpdatedConnectionSecurityIndicatorsFeature; + #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc index e43237594fbe..34cabc1f410e 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.cc @@ -1,7 +1,7 @@ ---- components/feature_engagement/public/feature_list.cc.orig 2022-04-01 07:48:30 UTC +--- components/feature_engagement/public/feature_list.cc.orig 2022-10-05 07:34:01 UTC +++ components/feature_engagement/public/feature_list.cc -@@ -121,7 +121,7 @@ const base::Feature* const kAllFeatures[] = { - &kIPHDefaultSiteViewFeature, +@@ -118,7 +118,7 @@ const base::Feature* const kAllFeatures[] = { + &kIPHOverflowMenuTipFeature, #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ &kIPHDesktopTabGroupsNewGroupFeature, &kIPHFocusHelpBubbleScreenReaderPromoFeature, &kIPHGMCCastStartStopFeature, -@@ -143,7 +143,8 @@ const base::Feature* const kAllFeatures[] = { +@@ -142,7 +142,8 @@ const base::Feature* const kAllFeatures[] = { // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h index 8de030239098..bd4f89fbf3bb 100644 --- a/www/iridium/files/patch-components_feature__engagement_public_feature__list.h +++ b/www/iridium/files/patch-components_feature__engagement_public_feature__list.h @@ -1,6 +1,6 @@ ---- components/feature_engagement/public/feature_list.h.orig 2022-04-01 07:48:30 UTC +--- components/feature_engagement/public/feature_list.h.orig 2022-10-05 07:34:01 UTC +++ components/feature_engagement/public/feature_list.h -@@ -224,7 +224,7 @@ DEFINE_VARIATION_PARAM(kIPHDefaultSiteViewFeature, "IP +@@ -216,7 +216,7 @@ DEFINE_VARIATION_PARAM(kIPHOverflowMenuTipFeature, "IP #endif // BUILDFLAG(IS_IOS) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -9,7 +9,7 @@ DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature, "IPH_DesktopTabGroupsNewGroup"); DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode"); -@@ -254,7 +254,8 @@ DEFINE_VARIATION_PARAM(kIPHDesktopSharedHighlightingFe +@@ -249,7 +249,8 @@ DEFINE_VARIATION_PARAM(kIPHWebUiHelpBubbleTestFeature, // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ @@ -19,16 +19,16 @@ DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature, "IPH_AutofillVirtualCardSuggestion"); #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || -@@ -359,7 +360,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation - VARIATION_ENTRY(kIPHDiscoverFeedHeaderFeature), - VARIATION_ENTRY(kIPHDefaultSiteViewFeature), +@@ -351,7 +352,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation + VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature), + VARIATION_ENTRY(kIPHOverflowMenuTipFeature), #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) + BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature), VARIATION_ENTRY(kIPHFocusModeFeature), VARIATION_ENTRY(kIPHGlobalMediaControls), -@@ -382,7 +383,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation +@@ -376,7 +377,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc b/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc index de7b24c81239..20585427c1fd 100644 --- a/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc +++ b/www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ components/feed/core/v2/feed_network_impl_unittest.cc -@@ -678,8 +678,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn +@@ -807,8 +807,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, client_info.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, client_info.app_version().build_type()); diff --git a/www/iridium/files/patch-components_feed_core_v2_proto__util.cc b/www/iridium/files/patch-components_feed_core_v2_proto__util.cc index 2b563d4ddfd9..aa6e35c5dc4d 100644 --- a/www/iridium/files/patch-components_feed_core_v2_proto__util.cc +++ b/www/iridium/files/patch-components_feed_core_v2_proto__util.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util.cc.orig 2022-03-28 18:11:04 UTC +--- components/feed/core/v2/proto_util.cc.orig 2022-10-05 07:34:01 UTC +++ components/feed/core/v2/proto_util.cc -@@ -88,8 +88,8 @@ feedwire::Version GetPlatformVersionMessage() { +@@ -90,8 +90,8 @@ feedwire::Version GetPlatformVersionMessage() { int32_t major, minor, revision; base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &revision); @@ -11,7 +11,7 @@ result.set_revision(revision); #if BUILDFLAG(IS_ANDROID) result.set_api_version(base::android::BuildInfo::GetInstance()->sdk_int()); -@@ -104,8 +104,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf +@@ -106,8 +106,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf // Chrome's version is in the format: MAJOR,MINOR,BUILD,PATCH. const std::vector<uint32_t>& numbers = chrome_info.version.components(); if (numbers.size() > 3) { diff --git a/www/iridium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/iridium/files/patch-components_feed_core_v2_proto__util__unittest.cc index cc3773b4ede9..b5a8f7ed1b30 100644 --- a/www/iridium/files/patch-components_feed_core_v2_proto__util__unittest.cc +++ b/www/iridium/files/patch-components_feed_core_v2_proto__util__unittest.cc @@ -1,6 +1,6 @@ ---- components/feed/core/v2/proto_util_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- components/feed/core/v2/proto_util_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ components/feed/core/v2/proto_util_unittest.cc -@@ -39,8 +39,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { +@@ -42,8 +42,8 @@ TEST(ProtoUtilTest, CreateClientInfo) { feedwire::ClientInfo result = CreateClientInfo(request_metadata); EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type()); EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type()); diff --git a/www/iridium/files/patch-components_flags__ui_flags__state.cc b/www/iridium/files/patch-components_flags__ui_flags__state.cc index b16c0594bbc1..362f70f67e57 100644 --- a/www/iridium/files/patch-components_flags__ui_flags__state.cc +++ b/www/iridium/files/patch-components_flags__ui_flags__state.cc @@ -1,11 +1,11 @@ ---- components/flags_ui/flags_state.cc.orig 2022-04-01 07:48:30 UTC +--- components/flags_ui/flags_state.cc.orig 2022-10-05 07:34:01 UTC +++ components/flags_ui/flags_state.cc -@@ -622,7 +622,7 @@ unsigned short FlagsState::GetCurrentPlatform() { - #elif BUILDFLAG(IS_CHROMEOS_ASH) +@@ -672,7 +672,7 @@ unsigned short FlagsState::GetCurrentPlatform() { return kOsCrOS; - #elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ -- BUILDFLAG(IS_OPENBSD) -+ BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + return kOsLacros; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return kOsLinux; #elif BUILDFLAG(IS_ANDROID) return kOsAndroid; diff --git a/www/iridium/files/patch-components_live__caption_caption__util.cc b/www/iridium/files/patch-components_live__caption_caption__util.cc new file mode 100644 index 000000000000..239e09016ad1 --- /dev/null +++ b/www/iridium/files/patch-components_live__caption_caption__util.cc @@ -0,0 +1,11 @@ +--- components/live_caption/caption_util.cc.orig 2022-10-05 07:34:01 UTC ++++ components/live_caption/caption_util.cc +@@ -140,7 +140,7 @@ bool IsLiveCaptionFeatureSupported() { + return false; + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Check if the CPU has the required instruction set to run the Speech + // On-Device API (SODA) library. + static bool has_sse41 = base::CPU().has_sse41(); diff --git a/www/iridium/files/patch-components_metrics_motherboard.cc b/www/iridium/files/patch-components_metrics_motherboard.cc new file mode 100644 index 000000000000..313abeb56a83 --- /dev/null +++ b/www/iridium/files/patch-components_metrics_motherboard.cc @@ -0,0 +1,10 @@ +--- components/metrics/motherboard.cc.orig 2022-10-05 07:34:01 UTC ++++ components/metrics/motherboard.cc +@@ -1,6 +1,7 @@ + // Copyright 2022 The Chromium Authors. All rights reserved. + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. ++// CHECK + + #include "components/metrics/motherboard.h" + diff --git a/www/iridium/files/patch-components_neterror_resources_neterror.js b/www/iridium/files/patch-components_neterror_resources_neterror.js index 4f1ec226af4a..9bd7a1f3d07a 100644 --- a/www/iridium/files/patch-components_neterror_resources_neterror.js +++ b/www/iridium/files/patch-components_neterror_resources_neterror.js @@ -1,11 +1,11 @@ ---- components/neterror/resources/neterror.js.orig 2022-03-28 18:11:04 UTC +--- components/neterror/resources/neterror.js.orig 2022-10-05 07:34:01 UTC +++ components/neterror/resources/neterror.js -@@ -129,7 +129,7 @@ function detailsButtonClick() { - } +@@ -130,7 +130,7 @@ function detailsButtonClick() { let primaryControlOnLeft = true; --// <if expr="is_macosx or is_ios or is_linux or is_android"> -+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd"> + // clang-format off +-// <if expr="is_macosx or is_ios or is_linux or is_chromeos or is_android"> ++// <if expr="is_macosx or is_ios or is_posix or is_chromeos or is_android"> + // clang-format on primaryControlOnLeft = false; // </if> - diff --git a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc index 728bb4f99288..6742d582c158 100644 --- a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc +++ b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-03-28 18:11:04 UTC +--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-10-05 07:34:01 UTC +++ components/network_session_configurator/browser/network_session_configurator.cc -@@ -784,7 +784,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C +@@ -824,7 +824,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C } #endif // #if !BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc index c1ec2c61fe24..13cea6a25720 100644 --- a/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc +++ b/www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc @@ -1,6 +1,6 @@ ---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ components/network_session_configurator/browser/network_session_configurator_unittest.cc -@@ -776,7 +776,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { +@@ -833,7 +833,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) { } TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) { diff --git a/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp b/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp index d47881144b3e..2c61e408293e 100644 --- a/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp +++ b/www/iridium/files/patch-components_new__or__sad__tab__strings.grdp @@ -1,20 +1,11 @@ ---- components/new_or_sad_tab_strings.grdp.orig 2022-03-28 18:11:04 UTC +--- components/new_or_sad_tab_strings.grdp.orig 2022-10-05 07:34:01 UTC +++ components/new_or_sad_tab_strings.grdp -@@ -51,7 +51,7 @@ - Open page in a new Incognito window (⇧⌘N) - </message> - </if> -- <if expr="is_win or is_linux or is_fuchsia or chromeos"> -+ <if expr="is_win or is_posix or is_fuchsia or chromeos"> - <message name="IDS_SAD_TAB_RELOAD_INCOGNITO" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to open the web page in Chrome's Incognito mode."> - Open page in a new Incognito window (Ctrl-Shift-N) - </message> @@ -66,7 +66,7 @@ Close other tabs or apps </message> </if> -- <if expr="is_linux and not chromeos"> -+ <if expr="is_posix and not chromeos"> +- <if expr="is_linux"> ++ <if expr="is_posix"> <message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer."> Close other tabs or programs </message> @@ -22,26 +13,8 @@ Close other apps </message> </if> -- <if expr="is_linux and not chromeos"> -+ <if expr="is_posix and not chromeos"> +- <if expr="is_linux"> ++ <if expr="is_posix"> <message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux)."> Close other programs </message> -@@ -91,7 +91,7 @@ - Restart Chromium - </message> - </if> -- <if expr="is_win or is_linux or is_macosx or is_fuchsia or chromeos"> -+ <if expr="is_win or is_posix or is_macosx or is_fuchsia or chromeos"> - <message name="IDS_SAD_TAB_RELOAD_RESTART_DEVICE" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to restart their computer."> - Restart your computer - </message> -@@ -106,7 +106,7 @@ - Learn more - </message> - </if> -- <if expr="is_win or is_linux or is_macosx or is_fuchsia or chromeos"> -+ <if expr="is_win or is_posix or is_macosx or is_fuchsia or chromeos"> - <message name="IDS_SAD_TAB_ERROR_CODE" desc="The message displayed on the crashed web page indicating the type of the crash."> - Error code: <ph name="ERROR_CODE">$1<ex>STATUS_ACCESS_VIOLATION</ex></ph> - </message> diff --git a/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc new file mode 100644 index 000000000000..2a679efdfbb4 --- /dev/null +++ b/www/iridium/files/patch-components_optimization__guide_core_optimization__guide__util.cc @@ -0,0 +1,11 @@ +--- components/optimization_guide/core/optimization_guide_util.cc.orig 2022-10-05 07:34:01 UTC ++++ components/optimization_guide/core/optimization_guide_util.cc +@@ -25,7 +25,7 @@ optimization_guide::proto::Platform GetPlatform() { + return optimization_guide::proto::PLATFORM_CHROMEOS; + #elif BUILDFLAG(IS_ANDROID) + return optimization_guide::proto::PLATFORM_ANDROID; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return optimization_guide::proto::PLATFORM_LINUX; + #else + return optimization_guide::proto::PLATFORM_UNKNOWN; diff --git a/www/iridium/files/patch-components_os__crypt_keyring__util__linux.cc b/www/iridium/files/patch-components_os__crypt_keyring__util__linux.cc index 11cc5c89db67..e3d91a6af64d 100644 --- a/www/iridium/files/patch-components_os__crypt_keyring__util__linux.cc +++ b/www/iridium/files/patch-components_os__crypt_keyring__util__linux.cc @@ -1,6 +1,6 @@ ---- components/os_crypt/keyring_util_linux.cc.orig 2022-03-28 18:11:04 UTC +--- components/os_crypt/keyring_util_linux.cc.orig 2022-10-05 07:34:01 UTC +++ components/os_crypt/keyring_util_linux.cc -@@ -69,12 +69,12 @@ bool GnomeKeyringLoader::LoadGnomeKeyring() { +@@ -68,12 +68,12 @@ bool GnomeKeyringLoader::LoadGnomeKeyring() { if (keyring_loaded) return true; diff --git a/www/iridium/files/patch-components_os__crypt_libsecret__util__linux.cc b/www/iridium/files/patch-components_os__crypt_libsecret__util__linux.cc index 2a41fc5ab6cf..7ca468863670 100644 --- a/www/iridium/files/patch-components_os__crypt_libsecret__util__linux.cc +++ b/www/iridium/files/patch-components_os__crypt_libsecret__util__linux.cc @@ -1,6 +1,6 @@ ---- components/os_crypt/libsecret_util_linux.cc.orig 2022-03-28 18:11:04 UTC +--- components/os_crypt/libsecret_util_linux.cc.orig 2022-10-05 07:34:01 UTC +++ components/os_crypt/libsecret_util_linux.cc -@@ -101,13 +101,13 @@ bool LibsecretLoader::LoadLibsecret() { +@@ -102,13 +102,13 @@ bool LibsecretLoader::LoadLibsecret() { if (libsecret_loaded_) return true; diff --git a/www/iridium/files/patch-components_os__crypt_os__crypt.h b/www/iridium/files/patch-components_os__crypt_os__crypt.h index 59e7f92240b1..1135351db196 100644 --- a/www/iridium/files/patch-components_os__crypt_os__crypt.h +++ b/www/iridium/files/patch-components_os__crypt_os__crypt.h @@ -1,6 +1,6 @@ ---- components/os_crypt/os_crypt.h.orig 2022-03-28 18:11:04 UTC +--- components/os_crypt/os_crypt.h.orig 2022-10-05 07:34:01 UTC +++ components/os_crypt/os_crypt.h -@@ -14,7 +14,7 @@ +@@ -15,7 +15,7 @@ #include "build/build_config.h" #include "build/chromecast_buildflags.h" @@ -9,21 +9,64 @@ class KeyStorageLinux; #endif // BUILDFLAG(IS_LINUX) -@@ -37,7 +37,7 @@ class OSCrypt { - OSCrypt(const OSCrypt&) = delete; - OSCrypt& operator=(const OSCrypt&) = delete; +@@ -24,7 +24,7 @@ class PrefRegistrySimple; + class PrefService; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + namespace crypto { + class SymmetricKey; + } +@@ -37,7 +37,7 @@ struct Config; + // Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions + // of what each function does. + namespace OSCrypt { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(OS_CRYPT) + void SetConfig(std::unique_ptr<os_crypt::Config> config); + #endif // BUILDFLAG(IS_LINUX) +@@ -82,7 +82,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b + COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy); + COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); + #endif // BUILDFLAG(IS_WIN) +-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) + COMPONENT_EXPORT(OS_CRYPT) + void UseMockKeyStorageForTesting( + base::OnceCallback<std::unique_ptr<KeyStorageLinux>()> +@@ -109,7 +109,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { + // Returns singleton instance of OSCryptImpl. + static OSCryptImpl* GetInstance(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Set the configuration of OSCrypt. + // Set the configuration of OSCryptImpl. // This method, or SetRawEncryptionKey(), must be called before using // EncryptString() and DecryptString(). -@@ -149,7 +149,7 @@ class OSCrypt { - static COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting(); +@@ -201,7 +201,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { + void ResetStateForTesting(); #endif --#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST)) +-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) // For unit testing purposes, inject methods to be used. - // |get_key_storage_mock| provides the desired |KeyStorage| implementation. - // If the provider returns |nullptr|, a hardcoded password will be used. + // |storage_provider_factory| provides the desired |KeyStorage| + // implementation. If the provider returns |nullptr|, a hardcoded password +@@ -226,13 +226,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl { + crypto::SymmetricKey* GetEncryptionKey(); + #endif // BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + // This lock is used to make the GetEncryptionKey and + // GetRawEncryptionKey methods thread-safe. + static base::Lock& GetLock(); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Create the KeyStorage. Will be null if no service is found. A Config must + // be set before every call to this method. + std::unique_ptr<KeyStorageLinux> CreateKeyStorage(); diff --git a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc index f491b508c817..266ac9af3829 100644 --- a/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc +++ b/www/iridium/files/patch-components_paint__preview_browser_paint__preview__client.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/browser/paint_preview_client.cc.orig 2022-03-28 18:11:04 UTC +--- components/paint_preview/browser/paint_preview_client.cc.orig 2022-10-05 07:34:01 UTC +++ components/paint_preview/browser/paint_preview_client.cc -@@ -313,8 +313,8 @@ void PaintPreviewClient::CapturePaintPreview( +@@ -309,8 +309,8 @@ void PaintPreviewClient::CapturePaintPreview( metadata->set_url(url.spec()); metadata->set_version(kPaintPreviewVersion); auto* chromeVersion = metadata->mutable_chrome_version(); diff --git a/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc b/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc index 3cf2a6b2e2e2..5d35cf88a3a0 100644 --- a/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc +++ b/www/iridium/files/patch-components_paint__preview_player_player__compositor__delegate.cc @@ -1,6 +1,6 @@ ---- components/paint_preview/player/player_compositor_delegate.cc.orig 2022-03-28 18:11:04 UTC +--- components/paint_preview/player/player_compositor_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ components/paint_preview/player/player_compositor_delegate.cc -@@ -445,8 +445,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT +@@ -444,8 +444,8 @@ void PlayerCompositorDelegate::ValidateProtoAndLoadAXT // use the AXTreeUpdate. auto chrome_version = capture_result_->proto.metadata().chrome_version(); if (capture_result_->proto.metadata().has_chrome_version() && diff --git a/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc b/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc index a4d478a4102e..cf9a22c3ed5e 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_login__database.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/login_database.cc.orig 2022-04-01 07:48:30 UTC +--- components/password_manager/core/browser/login_database.cc.orig 2022-10-05 07:34:01 UTC +++ components/password_manager/core/browser/login_database.cc -@@ -664,7 +664,7 @@ std::string GeneratePlaceholders(size_t count) { +@@ -731,7 +731,7 @@ std::string GeneratePlaceholders(size_t count) { return result; } @@ -9,7 +9,7 @@ // Fills |form| with necessary data required to be removed from the database // and returns it. PasswordForm GetFormForRemoval(sql::Statement& statement) { -@@ -681,7 +681,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme +@@ -748,7 +748,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme // Whether we should try to return the decryptable passwords while the // encryption service fails for some passwords. bool ShouldReturnPartialPasswords() { @@ -18,7 +18,7 @@ return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords); #else return false; -@@ -1488,7 +1488,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { +@@ -1577,7 +1577,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() { } DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() { diff --git a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc index bede0883a0b0..1520263f3d3c 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc @@ -1,24 +1,24 @@ ---- components/password_manager/core/browser/login_database_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- components/password_manager/core/browser/login_database_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ components/password_manager/core/browser/login_database_unittest.cc -@@ -2090,7 +2090,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2092,7 +2092,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd base::HistogramTester histogram_tester; ASSERT_TRUE(db.Init()); --#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) // Make sure that we can't get any logins when database is corrupted. // Disabling the checks in chromecast because encryption is unavailable. std::vector<std::unique_ptr<PasswordForm>> result; -@@ -2116,7 +2116,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd +@@ -2118,7 +2118,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd #endif // Check histograms. --#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) -+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) ++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD) histogram_tester.ExpectUniqueSample("PasswordManager.CleanedUpPasswords", 2, 1); histogram_tester.ExpectUniqueSample( -@@ -2168,7 +2168,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL +@@ -2170,7 +2170,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL } #endif // BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc index b0614c892b7f..28de5d623df7 100644 --- a/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc +++ b/www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-04-01 07:48:30 UTC +--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-10-05 07:34:01 UTC +++ components/password_manager/core/browser/sync/password_sync_bridge.cc -@@ -185,7 +185,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -177,7 +177,7 @@ bool ShouldRecoverPasswordsDuringMerge() { // Delete the local undecryptable copy when this is MacOS only. #if BUILDFLAG(IS_MAC) return true; @@ -9,7 +9,7 @@ return base::FeatureList::IsEnabled( features::kSyncUndecryptablePasswordsLinux); #else -@@ -194,7 +194,7 @@ bool ShouldRecoverPasswordsDuringMerge() { +@@ -186,7 +186,7 @@ bool ShouldRecoverPasswordsDuringMerge() { } bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() { diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc index 73ebe9b159da..e9f775b82b25 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc @@ -1,6 +1,6 @@ ---- components/password_manager/core/common/password_manager_features.cc.orig 2022-04-01 07:48:30 UTC +--- components/password_manager/core/common/password_manager_features.cc.orig 2022-10-05 07:34:01 UTC +++ components/password_manager/core/common/password_manager_features.cc -@@ -63,7 +63,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{ +@@ -83,7 +83,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{ const base::Feature kFillOnAccountSelect = {"fill-on-account-select", base::FEATURE_DISABLED_BY_DEFAULT}; @@ -9,18 +9,17 @@ // When enabled, initial sync will be forced during startup if the password // store has encryption service failures. const base::Feature kForceInitialSyncWhenDecryptionFails = { -@@ -145,7 +145,7 @@ const base::Feature kReparseServerPredictionsFollowing - const base::Feature kSecondaryServerFieldPredictions = { - "SecondaryServerFieldPredictions", base::FEATURE_ENABLED_BY_DEFAULT}; +@@ -189,14 +189,14 @@ const base::Feature kRecoverFromNeverSaveAndroid = { + const base::Feature kPasswordStrengthIndicator = { + "PasswordStrengthIndicator", base::FEATURE_DISABLED_BY_DEFAULT}; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Displays at least the decryptable and never saved logins in the password // manager const base::Feature kSkipUndecryptablePasswords = { -@@ -157,7 +157,7 @@ const base::Feature kSkipUndecryptablePasswords = { - const base::Feature kSupportForAddPasswordsInSettings = { - "SupportForAddPasswordsInSettings", base::FEATURE_DISABLED_BY_DEFAULT}; + "SkipUndecryptablePasswords", base::FEATURE_DISABLED_BY_DEFAULT}; + #endif -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h index d9f04dca25d7..81565414fc7a 100644 --- a/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h +++ b/www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h @@ -1,7 +1,7 @@ ---- components/password_manager/core/common/password_manager_features.h.orig 2022-04-01 07:48:30 UTC +--- components/password_manager/core/common/password_manager_features.h.orig 2022-10-05 07:34:01 UTC +++ components/password_manager/core/common/password_manager_features.h -@@ -27,7 +27,7 @@ extern const base::Feature kEnablePasswordsAccountStor - extern const base::Feature KEnablePasswordGenerationForClearTextFields; +@@ -37,7 +37,7 @@ extern const base::Feature KEnablePasswordGenerationFo + extern const base::Feature kEnablePasswordManagerWithinFencedFrame; extern const base::Feature kFillingAcrossAffiliatedWebsites; extern const base::Feature kFillOnAccountSelect; -#if BUILDFLAG(IS_LINUX) @@ -9,15 +9,14 @@ extern const base::Feature kForceInitialSyncWhenDecryptionFails; #endif extern const base::Feature kInferConfirmationPasswordField; -@@ -46,11 +46,11 @@ extern const base::Feature kPasswordScriptsFetching; +@@ -63,10 +63,10 @@ extern const base::Feature kPasswordReuseDetectionEnab + extern const base::Feature kPasswordScriptsFetching; + extern const base::Feature kPasswordStrengthIndicator; extern const base::Feature kRecoverFromNeverSaveAndroid; - extern const base::Feature kReparseServerPredictionsFollowingFormChange; - extern const base::Feature kSecondaryServerFieldPredictions; -#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const base::Feature kSkipUndecryptablePasswords; #endif - extern const base::Feature kSupportForAddPasswordsInSettings; -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) extern const base::Feature kSyncUndecryptablePasswordsLinux; diff --git a/www/iridium/files/patch-components_performance__manager_features.cc b/www/iridium/files/patch-components_performance__manager_features.cc deleted file mode 100644 index e7cab87cbb1b..000000000000 --- a/www/iridium/files/patch-components_performance__manager_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/performance_manager/features.cc.orig 2022-04-01 07:48:30 UTC -+++ components/performance_manager/features.cc -@@ -21,7 +21,7 @@ const base::Feature kUrgentDiscardingFromPerformanceMa - "UrgentDiscardingFromPerformanceManager", - // Ash Chrome uses memory pressure evaluator instead of performance manager to - // discard tabs. --#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - base::FEATURE_DISABLED_BY_DEFAULT - #else - base::FEATURE_ENABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-components_performance__manager_public_features.h b/www/iridium/files/patch-components_performance__manager_public_features.h new file mode 100644 index 000000000000..5fc14cb6261c --- /dev/null +++ b/www/iridium/files/patch-components_performance__manager_public_features.h @@ -0,0 +1,11 @@ +--- components/performance_manager/public/features.h.orig 2022-10-05 07:34:01 UTC ++++ components/performance_manager/public/features.h +@@ -20,7 +20,7 @@ extern const base::Feature kRunOnMainThread; + + #if !BUILDFLAG(IS_ANDROID) + +-#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() false + #else + #define URGENT_DISCARDING_FROM_PERFORMANCE_MANAGER() true diff --git a/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc b/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc index b831d417cc3b..5f20d40486b1 100644 --- a/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc +++ b/www/iridium/files/patch-components_permissions_prediction__service_prediction__common.cc @@ -1,6 +1,6 @@ ---- components/permissions/prediction_service/prediction_common.cc.orig 2022-03-28 18:11:04 UTC +--- components/permissions/prediction_service/prediction_common.cc.orig 2022-10-05 07:34:01 UTC +++ components/permissions/prediction_service/prediction_common.cc -@@ -36,7 +36,7 @@ int BucketizeValue(int count) { +@@ -33,7 +33,7 @@ int BucketizeValue(int count) { ClientFeatures_Platform GetCurrentPlatformProto() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ @@ -9,7 +9,7 @@ return permissions::ClientFeatures_Platform_PLATFORM_DESKTOP; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) return permissions::ClientFeatures_Platform_PLATFORM_MOBILE; -@@ -47,7 +47,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() { +@@ -44,7 +44,7 @@ ClientFeatures_Platform GetCurrentPlatformProto() { ClientFeatures_PlatformEnum GetCurrentPlatformEnumProto() { #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc b/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc index 0fda10f0c9ba..91a844077388 100644 --- a/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc +++ b/www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc @@ -1,6 +1,6 @@ ---- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-04-01 07:48:30 UTC +--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2022-10-05 07:34:01 UTC +++ components/policy/core/browser/policy_pref_mapping_test.cc -@@ -342,7 +342,7 @@ class PolicyTestCase { +@@ -338,7 +338,7 @@ class PolicyTestCase { const std::string os("chromeos_lacros"); #elif BUILDFLAG(IS_IOS) const std::string os("ios"); diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc index eff92a1e79b2..065abd98a0fe 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc +++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-04-01 07:48:30 UTC +--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-10-05 07:34:01 UTC +++ components/policy/core/common/cloud/cloud_policy_client.cc -@@ -417,7 +417,7 @@ void CloudPolicyClient::FetchPolicy() { +@@ -447,7 +447,7 @@ void CloudPolicyClient::FetchPolicy() { fetch_request->set_invalidation_payload(invalidation_payload_); } } @@ -8,4 +8,4 @@ +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Only set browser device identifier for CBCM Chrome cloud policy on // desktop. - if (base::FeatureList::IsEnabled( + if (type_to_fetch.first == diff --git a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc index 397d8e5346c8..099d130dc7cc 100644 --- a/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc +++ b/www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc @@ -1,6 +1,6 @@ ---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-03-28 18:11:04 UTC +--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-10-05 07:34:01 UTC +++ components/policy/core/common/cloud/cloud_policy_util.cc -@@ -19,7 +19,7 @@ +@@ -20,7 +20,7 @@ #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -9,7 +9,7 @@ #include <pwd.h> #include <sys/types.h> #include <unistd.h> -@@ -34,10 +34,14 @@ +@@ -35,10 +35,15 @@ #import <SystemConfiguration/SCDynamicStoreCopySpecific.h> #endif @@ -19,13 +19,14 @@ #endif +#if BUILDFLAG(IS_FREEBSD) ++#include <sys/param.h> +#define HOST_NAME_MAX MAXHOSTNAMELEN +#endif + #include <utility> #include "base/check.h" -@@ -77,7 +81,7 @@ namespace em = enterprise_management; +@@ -82,7 +87,7 @@ namespace em = enterprise_management; std::string GetMachineName() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -34,7 +35,7 @@ char hostname[HOST_NAME_MAX]; if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success. return hostname; -@@ -135,7 +139,7 @@ std::string GetMachineName() { +@@ -140,7 +145,7 @@ std::string GetMachineName() { std::string GetOSVersion() { #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \ @@ -43,12 +44,12 @@ return base::SysInfo::OperatingSystemVersion(); #elif BUILDFLAG(IS_WIN) base::win::OSInfo::VersionNumber version_number = -@@ -158,7 +162,7 @@ std::string GetOSArchitecture() { +@@ -163,7 +168,7 @@ std::string GetOSArchitecture() { } std::string GetOSUsername() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_APPLE) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) struct passwd* creds = getpwuid(getuid()); if (!creds || !creds->pw_name) return std::string(); diff --git a/www/iridium/files/patch-components_policy_resources_policy__templates.json b/www/iridium/files/patch-components_policy_resources_policy__templates.json index ac15d8a4c426..36d0e182e432 100644 --- a/www/iridium/files/patch-components_policy_resources_policy__templates.json +++ b/www/iridium/files/patch-components_policy_resources_policy__templates.json @@ -1,15 +1,15 @@ ---- components/policy/resources/policy_templates.json.orig 2022-04-01 07:48:30 UTC +--- components/policy/resources/policy_templates.json.orig 2022-10-05 07:34:01 UTC +++ components/policy/resources/policy_templates.json -@@ -1430,7 +1430,7 @@ +@@ -1446,7 +1446,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-'], + 'supported_on': ['chrome.win7:11-', 'chrome.mac:11-', 'chrome.linux:11-', 'chrome.openbsd:11-', 'chrome.freebsd:11-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': False, -@@ -2534,7 +2534,7 @@ +@@ -2596,7 +2596,7 @@ 'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -18,16 +18,16 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -4300,7 +4300,7 @@ +@@ -4386,7 +4386,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-'], + 'supported_on': ['chrome.win:57-', 'chrome.mac:88-', 'chrome.linux:88-', 'chrome.openbsd:88-', 'chrome.freebsd:88-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': False, - 'per_profile': False, -@@ -4329,7 +4329,7 @@ +@@ -4416,7 +4416,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -36,7 +36,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5262,7 +5262,7 @@ +@@ -5400,7 +5400,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -45,7 +45,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -5323,7 +5323,7 @@ +@@ -5462,7 +5462,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'string', 'schema': { 'type': 'string' }, @@ -54,7 +54,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -5389,7 +5389,7 @@ +@@ -5529,7 +5529,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -63,16 +63,16 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -10460,7 +10460,7 @@ +@@ -11143,7 +11143,7 @@ 'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-'], + 'supported_on': ['chrome_os:30-', 'chrome.linux:30-', 'chrome.win:30-', 'chrome.openbsd:30-', 'chrome.freebsd:30-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': False, -@@ -10554,7 +10554,7 @@ +@@ -11268,7 +11268,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -81,7 +81,7 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -12551,7 +12551,7 @@ +@@ -13532,7 +13532,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -90,16 +90,25 @@ 'features': { 'can_be_recommended': True, 'dynamic_refresh': True, -@@ -13409,7 +13409,7 @@ +@@ -14402,7 +14402,7 @@ 'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-'], + 'supported_on': ['chrome.win:31-', 'chrome.linux:31-', 'chrome_os:31-', 'chrome.openbsd:31-', 'chrome.freebsd:31-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': True, -@@ -20284,7 +20284,7 @@ +@@ -17239,7 +17239,7 @@ + 'deprecated': True, + 'schema': { 'type': 'boolean' }, + 'supported_on': ['chrome.win:64-', 'chrome.mac:66-', 'android:65-'], +- 'future_on': ['chrome.linux'], ++ 'future_on': ['chrome.linux','chrome.openbsd','chrome.freebsd'], + 'features': { + 'dynamic_refresh': False, + 'per_profile': False, +@@ -21470,7 +21470,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -108,16 +117,16 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -20315,7 +20315,7 @@ +@@ -21501,7 +21501,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. -- 'supported_on': ['chrome.win:75-', 'chrome.linux:75-', 'chrome_os:75-'], -+ 'supported_on': ['chrome.win:75-', 'chrome.linux:75-', 'chrome_os:75-', 'chrome.openbsd:75-', 'chrome.freebsd:75-'], +- 'supported_on': ['chrome.win:75-100', 'chrome.linux:75-100', 'chrome_os:75-100'], ++ 'supported_on': ['chrome.win:75-100', 'chrome.linux:75-100', 'chrome_os:75-100', 'chrome.openbsd:75-100', 'chrome.freebsd:75-100'], 'deprecated': True, 'features': { 'can_be_recommended': False, -@@ -20349,7 +20349,7 @@ +@@ -21535,7 +21535,7 @@ 'items': { 'type': 'string' } }, # Spell checking is provided by macOS, so can't be controlled on Mac. @@ -126,16 +135,16 @@ 'features': { 'can_be_recommended': False, 'dynamic_refresh': True, -@@ -21087,7 +21087,7 @@ +@@ -22319,7 +22319,7 @@ 'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, - 'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-'], + 'supported_on': ['chrome.win:66-', 'chrome.linux:66-', 'chrome.mac:66-', 'chrome_os:66-', 'chrome.openbsd:66-', 'chrome.freebsd:66-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': True, -@@ -25361,7 +25361,7 @@ +@@ -27015,7 +27015,7 @@ 'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -144,16 +153,16 @@ 'features': { 'dynamic_refresh': False, 'per_profile': False, -@@ -26703,7 +26703,7 @@ If this policy is left unset, privacy screen is disabl +@@ -28415,7 +28415,7 @@ If this policy is left unset, privacy screen is disabl 'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, -- 'supported_on': ['chrome.linux:83-'], -+ 'supported_on': ['chrome.linux:83-','chrome.openbsd:83-','chrome.freebsd:83-'], +- 'supported_on': ['chrome.linux:83-100'], ++ 'supported_on': ['chrome.linux:83-100','chrome.openbsd:83-100','chrome.freebsd:83-100'], 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -26727,7 +26727,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google +@@ -28439,7 +28439,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google 'owners': ['file://chrome/browser/notifications/OWNERS'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -162,7 +171,7 @@ 'features': { 'dynamic_refresh': True, 'per_profile': True, -@@ -27796,7 +27796,7 @@ If you disable this policy, web page scrolling to spec +@@ -29549,7 +29549,7 @@ If you disable this policy, web page scrolling to spec 'owners': ['asumaneev@google.com'], 'type': 'main', 'schema': { 'type': 'boolean' }, @@ -171,21 +180,21 @@ 'features': { 'dynamic_refresh': True, 'per_profile': False, -@@ -29032,7 +29032,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 +@@ -30851,7 +30851,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR }, ], 'default': True, - 'supported_on': ['chrome.win:93-', 'chrome.linux:93-', 'chrome.mac:93-'], + 'supported_on': ['chrome.win:93-', 'chrome.linux:93-', 'chrome.mac:93-', 'chrome.openbsd:93-', 'chrome.freebsd:93-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': True, -@@ -29165,7 +29165,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2 +@@ -30985,7 +30985,7 @@ This is the same behavior as <ph name="POLICY_VALUE_PR 'owners': ['mattm@chromium.org'], 'type': 'main', 'schema': { 'type': 'boolean' }, -- 'future_on': ['chrome.win', 'chrome.mac', 'chrome.linux'], -+ 'future_on': ['chrome.win', 'chrome.mac', 'chrome.linux', 'chrome.openbsd', 'chrome.freebsd'], +- 'supported_on': ['chrome.win:104-', 'chrome.mac:104-', 'chrome.linux:104-'], ++ 'supported_on': ['chrome.win:104-', 'chrome.mac:104-', 'chrome.linux:104-', 'chrome.openbsd:104-', 'chrome.freebsd:104-'], + 'future_on': ['fuchsia'], 'features': { 'dynamic_refresh': True, - 'per_profile': True, diff --git a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py index 27e339b8120e..8a4400d000c3 100644 --- a/www/iridium/files/patch-components_policy_tools_generate__policy__source.py +++ b/www/iridium/files/patch-components_policy_tools_generate__policy__source.py @@ -1,14 +1,14 @@ ---- components/policy/tools/generate_policy_source.py.orig 2022-04-01 07:48:30 UTC +--- components/policy/tools/generate_policy_source.py.orig 2022-10-05 07:34:01 UTC +++ components/policy/tools/generate_policy_source.py -@@ -49,8 +49,10 @@ PLATFORM_STRINGS = { - 'ios': ['ios'], +@@ -50,8 +50,10 @@ PLATFORM_STRINGS = { + 'fuchsia': ['fuchsia'], 'chrome.win': ['win'], 'chrome.linux': ['linux'], + 'chrome.openbsd': ['openbsd'], + 'chrome.freebsd': ['freebsd'], 'chrome.mac': ['mac'], -- 'chrome.*': ['win', 'mac', 'linux', 'fuchsia'], -+ 'chrome.*': ['win', 'mac', 'linux', 'fuchsia', 'openbsd', 'freebsd'], +- 'chrome.*': ['win', 'mac', 'linux'], ++ 'chrome.*': ['win', 'mac', 'linux', 'openbsd', 'freebsd'], 'chrome.win7': ['win'], } diff --git a/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc b/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc index 610216161894..7d96b47a08f2 100644 --- a/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc +++ b/www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc @@ -1,6 +1,6 @@ ---- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2022-03-28 18:11:04 UTC +--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2022-10-05 07:34:01 UTC +++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc -@@ -115,7 +115,7 @@ std::ostream& operator<<(std::ostream& os, const ListI +@@ -116,7 +116,7 @@ std::ostream& operator<<(std::ostream& os, const ListI PlatformType GetCurrentPlatformType() { #if BUILDFLAG(IS_WIN) return WINDOWS_PLATFORM; diff --git a/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc new file mode 100644 index 000000000000..244a867720d9 --- /dev/null +++ b/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc @@ -0,0 +1,18 @@ +--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2022-10-05 07:34:01 UTC ++++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc +@@ -36,6 +36,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi + } + screen_ai::StoreComponentBinaryPath(library_path); + ++#if !BUILDFLAG(IS_BSD) + auto* instance = sandbox::policy::SandboxLinux::GetInstance(); + + std::vector<BrokerFilePermission> permissions{ +@@ -59,6 +60,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi + sandbox::syscall_broker::COMMAND_OPEN}), + permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options); + instance->EngageNamespaceSandboxIfPossible(); ++#endif + + return true; + } diff --git a/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h b/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h new file mode 100644 index 000000000000..b234a261a73e --- /dev/null +++ b/www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h.orig 2022-10-05 07:34:01 UTC ++++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h +@@ -5,7 +5,13 @@ + #ifndef COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ + #define COMPONENTS_SERVICES_SCREEN_AI_SANDBOX_SCREEN_AI_SANDBOX_HOOK_LINUX_H_ + ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/openbsd/sandbox_openbsd.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace screen_ai { + diff --git a/www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc b/www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc index 471504815537..444618370886 100644 --- a/www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc +++ b/www/iridium/files/patch-components_startup__metric__utils_browser_startup__metric__utils.cc @@ -1,20 +1,11 @@ ---- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-03-28 18:11:04 UTC +--- components/startup_metric_utils/browser/startup_metric_utils.cc.orig 2022-10-05 07:34:01 UTC +++ components/startup_metric_utils/browser/startup_metric_utils.cc -@@ -347,7 +347,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time - +@@ -311,7 +311,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time // Enabling this logic on OS X causes a significant performance regression. - // https://crbug.com/601270 + // TODO(crbug.com/601270): Remove IS_APPLE ifdef once priority changes are + // ignored on Mac main thread. -#if !BUILDFLAG(IS_APPLE) +#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) static bool statics_initialized = false; - - base::ThreadPriority previous_priority = base::ThreadPriority::NORMAL; -@@ -361,7 +361,7 @@ base::TimeTicks StartupTimeToTimeTicks(base::Time time - static const base::Time time_base = base::Time::Now(); - static const base::TimeTicks trace_ticks_base = base::TimeTicks::Now(); - --#if !BUILDFLAG(IS_APPLE) -+#if !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_BSD) if (!statics_initialized) { - base::PlatformThread::SetCurrentThreadPriority(previous_priority); - } + statics_initialized = true; diff --git a/www/iridium/files/patch-components_storage__monitor_BUILD.gn b/www/iridium/files/patch-components_storage__monitor_BUILD.gn index 60516c32f1d5..bc6c6e788017 100644 --- a/www/iridium/files/patch-components_storage__monitor_BUILD.gn +++ b/www/iridium/files/patch-components_storage__monitor_BUILD.gn @@ -1,11 +1,11 @@ ---- components/storage_monitor/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- components/storage_monitor/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ components/storage_monitor/BUILD.gn -@@ -174,7 +174,7 @@ source_set("unit_tests") { - "mtp_manager_client_chromeos_unittest.cc", +@@ -175,7 +175,7 @@ source_set("unit_tests") { "storage_monitor_chromeos_unittest.cc", ] -- } else if (is_linux || is_chromeos_lacros) { -+ } else if ((is_linux || is_chromeos_lacros) && !is_bsd) { + } +- } else if (is_linux || is_chromeos_lacros) { ++ } else if ((is_linux || is_chromeos_lacros) && !is_bsd) { + if (use_udev) { sources += [ "storage_monitor_linux_unittest.cc" ] } - } diff --git a/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc b/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc index 0bcacff004b9..2ccb463f2d76 100644 --- a/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc +++ b/www/iridium/files/patch-components_sync__device__info_local__device__info__util.cc @@ -1,11 +1,11 @@ ---- components/sync_device_info/local_device_info_util.cc.orig 2022-03-28 18:11:04 UTC +--- components/sync_device_info/local_device_info_util.cc.orig 2022-10-05 07:34:01 UTC +++ components/sync_device_info/local_device_info_util.cc -@@ -75,7 +75,7 @@ std::string GetPersonalizableDeviceNameInternal(); +@@ -78,7 +78,7 @@ void OnMachineStatisticsLoaded(LocalDeviceNameInfo* na sync_pb::SyncEnums::DeviceType GetLocalDeviceType() { - #if BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS) return sync_pb::SyncEnums_DeviceType_TYPE_CROS; --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return sync_pb::SyncEnums_DeviceType_TYPE_LINUX; #elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) return ui::GetDeviceFormFactor() == ui::DEVICE_FORM_FACTOR_TABLET diff --git a/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc b/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc index 3893f66a9afb..b71d677782d4 100644 --- a/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc +++ b/www/iridium/files/patch-components_sync__device__info_local__device__info__util__linux.cc @@ -1,8 +1,8 @@ ---- components/sync_device_info/local_device_info_util_linux.cc.orig 2022-03-28 18:11:04 UTC +--- components/sync_device_info/local_device_info_util_linux.cc.orig 2022-10-05 07:34:01 UTC +++ components/sync_device_info/local_device_info_util_linux.cc -@@ -14,6 +14,11 @@ - #include "ash/constants/devicetype.h" - #endif +@@ -9,6 +9,11 @@ + + #include "base/linux_util.h" +#if defined(__FreeBSD__) +#include <sys/param.h> @@ -11,4 +11,4 @@ + namespace syncer { - #if BUILDFLAG(IS_CHROMEOS_ASH) + std::string GetPersonalizableDeviceNameInternal() { diff --git a/www/iridium/files/patch-components_translate_core_browser_translate__prefs.cc b/www/iridium/files/patch-components_translate_core_browser_translate__prefs.cc deleted file mode 100644 index 2b755452f037..000000000000 --- a/www/iridium/files/patch-components_translate_core_browser_translate__prefs.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/translate/core/browser/translate_prefs.cc.orig 2022-03-28 18:11:04 UTC -+++ components/translate/core/browser/translate_prefs.cc -@@ -905,7 +905,7 @@ bool TranslatePrefs::CanTranslateLanguage( - bool TranslatePrefs::IsDetailedLanguageSettingsEnabled() { - #if BUILDFLAG(IS_ANDROID) - return base::FeatureList::IsEnabled(language::kDetailedLanguageSettings); --#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - return base::FeatureList::IsEnabled( - language::kDesktopDetailedLanguageSettings); - #else diff --git a/www/iridium/files/patch-components_viz_common_features.cc b/www/iridium/files/patch-components_viz_common_features.cc deleted file mode 100644 index 27a1dc968d0c..000000000000 --- a/www/iridium/files/patch-components_viz_common_features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- components/viz/common/features.cc.orig 2022-04-01 07:48:30 UTC -+++ components/viz/common/features.cc -@@ -67,7 +67,7 @@ const base::Feature kUseSkiaRenderer { - "UseSkiaRenderer", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - base::FEATURE_ENABLED_BY_DEFAULT - #else - base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc index 5cb3992ad3a9..6b27c230ee84 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc +++ b/www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-04-01 07:48:30 UTC +--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-10-05 07:34:01 UTC +++ components/viz/service/display_embedder/skia_output_surface_impl.cc -@@ -1171,7 +1171,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor +@@ -1156,7 +1156,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor ->GetDeviceQueue() ->GetVulkanPhysicalDevice(), VK_IMAGE_TILING_OPTIMAL, ycbcr_info); diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc index bab91630b5d9..76111976c56a 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc +++ b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.cc @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-03-28 18:11:04 UTC +--- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-10-05 07:34:01 UTC +++ components/viz/service/display_embedder/software_output_surface.cc -@@ -118,7 +118,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: +@@ -93,7 +93,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base:: now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ if (needs_swap_size_notifications_) client_->DidSwapWithSize(pixel_size); #endif -@@ -149,7 +149,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla +@@ -120,7 +120,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h index a7717ef2015a..ac346234e199 100644 --- a/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h +++ b/www/iridium/files/patch-components_viz_service_display__embedder_software__output__surface.h @@ -1,6 +1,6 @@ ---- components/viz/service/display_embedder/software_output_surface.h.orig 2022-03-28 18:11:04 UTC +--- components/viz/service/display_embedder/software_output_surface.h.orig 2022-10-05 07:34:01 UTC +++ components/viz/service/display_embedder/software_output_surface.h -@@ -56,7 +56,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi gfx::OverlayTransform GetDisplayTransform() override; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ void SetNeedsSwapSizeNotifications( bool needs_swap_size_notifications) override; #endif -@@ -78,7 +78,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi +@@ -69,7 +69,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc new file mode 100644 index 000000000000..0c8744c6f836 --- /dev/null +++ b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc @@ -0,0 +1,11 @@ +--- components/viz/service/display/skia_renderer.cc.orig 2022-10-05 07:34:01 UTC ++++ components/viz/service/display/skia_renderer.cc +@@ -1026,7 +1026,7 @@ void SkiaRenderer::ClearFramebuffer() { + if (current_frame()->current_render_pass->has_transparent_background) { + ClearCanvas(SkColors::kTransparent); + } else { +-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) ++#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // On DEBUG builds, opaque render passes are cleared to blue + // to easily see regions that were not drawn on the screen. + // ClearCavas() call causes slight pixel difference, so linux-ref and diff --git a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc index dab72645e2d9..72e4e756e592 100644 --- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc +++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc @@ -1,4 +1,4 @@ ---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-04-01 07:48:30 UTC +--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-10-05 07:34:01 UTC +++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc @@ -97,7 +97,7 @@ RootCompositorFrameSinkImpl::Create( @@ -9,7 +9,7 @@ // For X11, we need notify client about swap completion after resizing, so the // client can use it for synchronize with X11 WM. output_surface->SetNeedsSwapSizeNotifications(true); -@@ -569,7 +569,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw +@@ -576,7 +576,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw display_client_->DidCompleteSwapWithSize(pixel_size); // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_app_content__main.cc b/www/iridium/files/patch-content_app_content__main.cc index 80af4f13bb3e..6c881b1a4e13 100644 --- a/www/iridium/files/patch-content_app_content__main.cc +++ b/www/iridium/files/patch-content_app_content__main.cc @@ -1,7 +1,7 @@ ---- content/app/content_main.cc.orig 2022-04-01 07:48:30 UTC +--- content/app/content_main.cc.orig 2022-10-05 07:34:01 UTC +++ content/app/content_main.cc -@@ -254,7 +254,7 @@ RunContentProcess(ContentMainParams params, - base::allocator::InstallDanglingRawPtrChecks(); +@@ -284,7 +284,7 @@ RunContentProcess(ContentMainParams params, + #endif base::EnableTerminationOnOutOfMemory(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-content_app_content__main__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc index 6186c3136919..a29ea2a5625f 100644 --- a/www/iridium/files/patch-content_app_content__main__runner__impl.cc +++ b/www/iridium/files/patch-content_app_content__main__runner__impl.cc @@ -1,4 +1,4 @@ ---- content/app/content_main_runner_impl.cc.orig 2022-04-01 07:48:30 UTC +--- content/app/content_main_runner_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/app/content_main_runner_impl.cc @@ -130,13 +130,13 @@ #include "base/posix/global_descriptors.h" @@ -16,7 +16,7 @@ #include "base/native_library.h" #include "base/rand_util.h" #include "content/public/common/zygote/sandbox_support_linux.h" -@@ -170,6 +170,10 @@ +@@ -175,6 +175,10 @@ #include "media/base/media_switches.h" #endif @@ -26,17 +26,17 @@ + #if BUILDFLAG(IS_ANDROID) #include "base/system/sys_info.h" - #include "components/power_scheduler/power_scheduler.h" -@@ -340,7 +344,7 @@ void InitializeZygoteSandboxForBrowserProcess( + #include "content/browser/android/battery_metrics.h" +@@ -360,7 +364,7 @@ void InitializeZygoteSandboxForBrowserProcess( } #endif // BUILDFLAG(USE_ZYGOTE_HANDLE) -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #if BUILDFLAG(ENABLE_PLUGINS) + #if BUILDFLAG(ENABLE_PPAPI) // Loads the (native) libraries but does not initialize them (i.e., does not -@@ -376,7 +380,7 @@ void PreloadLibraryCdms() { +@@ -396,7 +400,7 @@ void PreloadLibraryCdms() { } #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS) @@ -45,7 +45,7 @@ void PreSandboxInit() { // Pre-acquire resources needed by BoringSSL. See // https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md -@@ -392,6 +396,11 @@ void PreSandboxInit() { +@@ -412,6 +416,11 @@ void PreSandboxInit() { #endif InitializeWebRtcModule(); @@ -57,7 +57,7 @@ // Set the android SkFontMgr for blink. We need to ensure this is done // before the sandbox is initialized to allow the font manager to access // font configuration files on disk. -@@ -561,7 +570,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* +@@ -594,7 +603,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate* delegate->ZygoteStarting(&zygote_fork_delegates); media::InitializeMediaLibrary(); @@ -66,7 +66,7 @@ PreSandboxInit(); #endif -@@ -747,11 +756,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -785,11 +794,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor); #endif // !BUILDFLAG(IS_ANDROID) @@ -80,7 +80,7 @@ #endif // !BUILDFLAG(IS_WIN) -@@ -949,6 +957,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam +@@ -972,6 +980,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam } #endif @@ -97,7 +97,7 @@ delegate_->SandboxInitialized(process_type); #if BUILDFLAG(USE_ZYGOTE_HANDLE) -@@ -1004,7 +1022,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1031,7 +1049,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { mojo::core::InitFeatures(); } @@ -106,7 +106,7 @@ // If dynamic Mojo Core is being used, ensure that it's loaded very early in // the child/zygote process, before any sandbox is initialized. The library // is not fully initialized with IPC support until a ChildProcess is later -@@ -1037,6 +1055,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { +@@ -1064,6 +1082,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() { content_main_params_.reset(); RegisterMainThreadFactories(); diff --git a/www/iridium/files/patch-content_browser_BUILD.gn b/www/iridium/files/patch-content_browser_BUILD.gn index b375fef09750..00b53c4c0339 100644 --- a/www/iridium/files/patch-content_browser_BUILD.gn +++ b/www/iridium/files/patch-content_browser_BUILD.gn @@ -1,6 +1,6 @@ ---- content/browser/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- content/browser/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ content/browser/BUILD.gn -@@ -2331,6 +2331,13 @@ source_set("browser") { +@@ -2471,6 +2471,13 @@ source_set("browser") { ] } diff --git a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc index b96a9c4d7fb6..598383584dd8 100644 --- a/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc +++ b/www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_child_process_host_impl.cc.orig 2022-04-01 07:48:30 UTC +--- content/browser/browser_child_process_host_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/browser_child_process_host_impl.cc -@@ -292,6 +292,8 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo +@@ -307,6 +307,8 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo switches::kDisableBestEffortTasks, switches::kDisableLogging, switches::kEnableLogging, diff --git a/www/iridium/files/patch-content_browser_browser__main__loop.cc b/www/iridium/files/patch-content_browser_browser__main__loop.cc index 8ee3c56c945d..52ba8af73eab 100644 --- a/www/iridium/files/patch-content_browser_browser__main__loop.cc +++ b/www/iridium/files/patch-content_browser_browser__main__loop.cc @@ -1,4 +1,4 @@ ---- content/browser/browser_main_loop.cc.orig 2022-04-01 07:48:30 UTC +--- content/browser/browser_main_loop.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/browser_main_loop.cc @@ -240,6 +240,12 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" @@ -13,7 +13,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -547,6 +553,12 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -523,6 +529,12 @@ int BrowserMainLoop::EarlyInitialization() { // by now since a thread to start the ServiceManager has been created // before the browser main loop starts. DCHECK(SandboxHostLinux::GetInstance()->IsInitialized()); @@ -26,17 +26,8 @@ #endif // GLib's spawning of new processes is buggy, so it's important that at this -@@ -574,7 +586,7 @@ int BrowserMainLoop::EarlyInitialization() { - - // Up the priority of the UI thread unless it was already high (since Mac - // and recent versions of Android (O+) do this automatically). --#if !BUILDFLAG(IS_MAC) -+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - features::kBrowserUseDisplayThreadPriority) && - base::PlatformThread::GetCurrentThreadPriority() < -@@ -585,7 +597,7 @@ int BrowserMainLoop::EarlyInitialization() { - #endif // !BUILDFLAG(IS_MAC) +@@ -554,7 +566,7 @@ int BrowserMainLoop::EarlyInitialization() { + base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing); #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ - BUILDFLAG(IS_ANDROID) diff --git a/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc b/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc index c46cabee3a6c..50c2143f42ca 100644 --- a/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc +++ b/www/iridium/files/patch-content_browser_browser__url__handler__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_url_handler_impl.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/browser_url_handler_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/browser_url_handler_impl.cc -@@ -13,6 +13,7 @@ +@@ -12,6 +12,7 @@ #include "content/browser/webui/web_ui_impl.h" #include "content/public/browser/content_browser_client.h" #include "content/public/common/content_client.h" @@ -8,7 +8,7 @@ #include "content/public/common/url_constants.h" #include "content/public/common/url_utils.h" #include "third_party/blink/public/common/chrome_debug_urls.h" -@@ -287,6 +288,10 @@ static void gfxlog_request2(const std::string &caller, +@@ -286,6 +287,10 @@ static void gfxlog_request2(const std::string &caller, void gfxlog_request(const char *caller, const GURL &url) { diff --git a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc index 3915f48a1685..590ac969daef 100644 --- a/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc +++ b/www/iridium/files/patch-content_browser_child__process__launcher__helper__linux.cc @@ -1,6 +1,6 @@ ---- content/browser/child_process_launcher_helper_linux.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/child_process_launcher_helper_linux.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/child_process_launcher_helper_linux.cc -@@ -19,7 +19,9 @@ +@@ -20,7 +20,9 @@ #include "content/public/common/result_codes.h" #include "content/public/common/sandboxed_process_launcher_delegate.h" #include "content/public/common/zygote/sandbox_support_linux.h" @@ -10,15 +10,15 @@ #include "sandbox/policy/linux/sandbox_linux.h" namespace content { -@@ -68,6 +70,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -74,6 +76,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr int* launch_result) { *is_synchronous_launch = true; - + Process process; +#if !BUILDFLAG(IS_BSD) ZygoteHandle zygote_handle = base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote) ? nullptr -@@ -81,7 +84,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -87,7 +90,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr GetProcessType()); *launch_result = LAUNCH_RESULT_SUCCESS; @@ -26,22 +26,26 @@ if (handle) { // It could be a renderer process or an utility process. int oom_score = content::kMiscOomScore; -@@ -90,13 +92,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr +@@ -96,15 +98,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr oom_score = content::kLowestRendererOomScore; ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score); } -#endif - Process process; process.process = base::Process(handle); process.zygote = zygote_handle; - return process; + } else { ++#endif + process.process = base::LaunchProcess(*command_line(), options); + *launch_result = process.process.IsValid() ? LAUNCH_RESULT_SUCCESS + : LAUNCH_RESULT_FAILURE; ++#if !BUILDFLAG(IS_BSD) } +#endif - Process process; - process.process = base::LaunchProcess(*command_line(), options); -@@ -114,10 +116,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper + #if BUILDFLAG(IS_CHROMEOS) + if (GetProcessType() == switches::kRendererProcess) { +@@ -124,10 +128,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper const ChildProcessLauncherHelper::Process& process, bool known_dead) { ChildProcessTerminationInfo info; @@ -56,7 +60,7 @@ info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(), &info.exit_code); } else { -@@ -141,13 +147,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer +@@ -151,13 +159,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer DCHECK(CurrentlyOnProcessLauncherTaskRunner()); process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false); // On POSIX, we must additionally reap the child. diff --git a/www/iridium/files/patch-content_browser_compute__pressure_cpu__probe.cc b/www/iridium/files/patch-content_browser_compute__pressure_cpu__probe.cc deleted file mode 100644 index d78b05174e86..000000000000 --- a/www/iridium/files/patch-content_browser_compute__pressure_cpu__probe.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- content/browser/compute_pressure/cpu_probe.cc.orig 2022-04-01 07:48:30 UTC -+++ content/browser/compute_pressure/cpu_probe.cc -@@ -53,6 +53,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { - #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) - return CpuProbeLinux::Create(); - #else -+ NOTIMPLEMENTED(); - return std::make_unique<NullCpuProbe>(); - #endif // BUILDFLAG(IS_ANDROID) - } diff --git a/www/iridium/files/patch-content_browser_download_download__manager__impl.cc b/www/iridium/files/patch-content_browser_download_download__manager__impl.cc index 28bf3386b1da..9456018380f7 100644 --- a/www/iridium/files/patch-content_browser_download_download__manager__impl.cc +++ b/www/iridium/files/patch-content_browser_download_download__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/download/download_manager_impl.cc.orig 2022-04-01 07:48:30 UTC +--- content/browser/download/download_manager_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/download/download_manager_impl.cc -@@ -89,7 +89,7 @@ +@@ -91,7 +91,7 @@ #include "third_party/blink/public/common/storage_key/storage_key.h" #include "url/origin.h" @@ -9,7 +9,7 @@ #include "base/nix/xdg_util.h" #endif -@@ -217,7 +217,7 @@ class DownloadItemFactoryImpl : public download::Downl +@@ -218,7 +218,7 @@ class DownloadItemFactoryImpl : public download::Downl } }; @@ -18,7 +18,7 @@ base::FilePath GetTemporaryDownloadDirectory() { std::unique_ptr<base::Environment> env(base::Environment::Create()); return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share"); -@@ -653,7 +653,7 @@ bool DownloadManagerImpl::InterceptDownload( +@@ -654,7 +654,7 @@ bool DownloadManagerImpl::InterceptDownload( base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() { base::FilePath default_download_directory; diff --git a/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc b/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc index bcff0127a457..5970c3258ea2 100644 --- a/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc +++ b/www/iridium/files/patch-content_browser_font__access_font__enumeration__data__source.cc @@ -1,4 +1,4 @@ ---- content/browser/font_access/font_enumeration_data_source.cc.orig 2022-04-01 07:48:30 UTC +--- content/browser/font_access/font_enumeration_data_source.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/font_access/font_enumeration_data_source.cc @@ -16,7 +16,7 @@ #include "content/browser/font_access/font_enumeration_data_source_win.h" @@ -18,7 +18,7 @@ return std::make_unique<FontEnumerationDataSourceLinux>(); #else return std::make_unique<FontEnumerationDataSourceNull>(); -@@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupportedForTestin +@@ -76,7 +76,7 @@ bool FontEnumerationDataSource::IsOsSupported() { return true; #elif BUILDFLAG(IS_MAC) return true; diff --git a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc index 3cd73cacb7ea..0f125cc35a6b 100644 --- a/www/iridium/files/patch-content_browser_gpu_compositor__util.cc +++ b/www/iridium/files/patch-content_browser_gpu_compositor__util.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/compositor_util.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/gpu/compositor_util.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/gpu/compositor_util.cc -@@ -145,7 +145,7 @@ const GpuFeatureData GetGpuFeatureData( +@@ -148,7 +148,7 @@ const GpuFeatureData GetGpuFeatureData( {"video_decode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_DECODE), @@ -9,7 +9,7 @@ !base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux), #else command_line.HasSwitch(switches::kDisableAcceleratedVideoDecode), -@@ -157,7 +157,7 @@ const GpuFeatureData GetGpuFeatureData( +@@ -160,7 +160,7 @@ const GpuFeatureData GetGpuFeatureData( {"video_encode", SafeGetFeatureStatus(gpu_feature_info, gpu::GPU_FEATURE_TYPE_ACCELERATED_VIDEO_ENCODE), diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc index 083acc20c3b4..6dcc9aa1e9e3 100644 --- a/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc +++ b/www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc @@ -1,6 +1,6 @@ ---- content/browser/gpu/gpu_process_host.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/gpu/gpu_process_host.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/gpu/gpu_process_host.cc -@@ -100,7 +100,7 @@ +@@ -101,7 +101,7 @@ #include "ui/ozone/public/ozone_switches.h" #endif @@ -9,15 +9,15 @@ #include "ui/gfx/switches.h" #endif -@@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = { +@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = { switches::kEnableBackgroundThreadPool, switches::kEnableGpuRasterization, switches::kEnableLogging, + switches::kDisableUnveil, switches::kEnableDeJelly, switches::kDeJellyScreenWidth, - switches::kDocumentTransitionSlowdownFactor, -@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = { + switches::kDoubleBufferCompositing, +@@ -286,7 +287,7 @@ static const char* const kSwitchNames[] = { switches::kOzoneDumpFile, switches::kDisableBufferBWCompression, #endif diff --git a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.cc b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.cc new file mode 100644 index 000000000000..88e94c570aa3 --- /dev/null +++ b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.cc @@ -0,0 +1,20 @@ +--- content/browser/media/frameless_media_interface_proxy.cc.orig 2022-10-05 07:34:01 UTC ++++ content/browser/media/frameless_media_interface_proxy.cc +@@ -16,7 +16,7 @@ + #include "media/mojo/mojom/renderer_extensions.mojom.h" + #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/public/browser/stable_video_decoder_factory.h" + #include "media/base/media_switches.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -67,7 +67,7 @@ void FramelessMediaInterfaceProxy::CreateVideoDecoder( + + mojo::PendingRemote<media::stable::mojom::StableVideoDecoder> + oop_video_decoder; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) { + if (!render_process_host_) { + if (!stable_vd_factory_remote_.is_bound()) { diff --git a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h new file mode 100644 index 000000000000..24c7c1b73499 --- /dev/null +++ b/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.h @@ -0,0 +1,20 @@ +--- content/browser/media/frameless_media_interface_proxy.h.orig 2022-10-05 07:34:01 UTC ++++ content/browser/media/frameless_media_interface_proxy.h +@@ -19,7 +19,7 @@ + #include "mojo/public/cpp/bindings/receiver_set.h" + #include "mojo/public/cpp/bindings/remote.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +@@ -99,7 +99,7 @@ class FramelessMediaInterfaceProxy final + // Connections to the renderer. + mojo::ReceiverSet<media::mojom::InterfaceFactory> receivers_; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Connection to the StableVideoDecoderFactory that lives in a utility + // process. This is only used for out-of-process video decoding and only when + // the FramelessMediaInterfaceProxy is created without a RenderProcessHost diff --git a/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc b/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc new file mode 100644 index 000000000000..f985454c8f20 --- /dev/null +++ b/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc @@ -0,0 +1,20 @@ +--- content/browser/media/media_interface_proxy.cc.orig 2022-10-05 07:34:01 UTC ++++ content/browser/media/media_interface_proxy.cc +@@ -76,7 +76,7 @@ + #include "media/mojo/services/mojo_renderer_service.h" // nogncheck + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "content/public/browser/stable_video_decoder_factory.h" + #include "media/base/media_switches.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -327,7 +327,7 @@ void MediaInterfaceProxy::CreateVideoDecoder( + + mojo::PendingRemote<media::stable::mojom::StableVideoDecoder> + oop_video_decoder; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (base::FeatureList::IsEnabled(media::kUseOutOfProcessVideoDecoding)) { + render_frame_host().GetProcess()->CreateStableVideoDecoder( + oop_video_decoder.InitWithNewPipeAndPassReceiver()); diff --git a/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc b/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc index 1bfee54eb448..aabddc295aba 100644 --- a/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc +++ b/www/iridium/files/patch-content_browser_media_media__keys__listener__manager__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-04-01 07:48:30 UTC +--- content/browser/media/media_keys_listener_manager_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/media/media_keys_listener_manager_impl.cc -@@ -232,7 +232,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe +@@ -233,7 +233,7 @@ void MediaKeysListenerManagerImpl::StartListeningForMe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \ diff --git a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc index 8bccc20e0af4..ca340df2e243 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/renderer_host/delegated_frame_host.cc -@@ -288,7 +288,7 @@ void DelegatedFrameHost::EmbedSurface( +@@ -289,7 +289,7 @@ void DelegatedFrameHost::EmbedSurface( if (!primary_surface_id || primary_surface_id->local_surface_id() != local_surface_id_) { diff --git a/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc b/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc index 38a5c6c78a93..ac1343d8e809 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_pepper_pepper__file__io__host.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/renderer_host/pepper/pepper_file_io_host.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/renderer_host/pepper/pepper_file_io_host.cc -@@ -456,7 +456,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -455,7 +455,7 @@ void PepperFileIOHost::OnLocalFileOpened( ppapi::host::ReplyMessageContext reply_context, const base::FilePath& path, base::File::Error error_code) { @@ -9,7 +9,7 @@ // Quarantining a file before its contents are available is only supported on // Windows and Linux. if (!FileOpenForWrite(open_flags_) || error_code != base::File::FILE_OK) { -@@ -490,7 +490,7 @@ void PepperFileIOHost::OnLocalFileOpened( +@@ -489,7 +489,7 @@ void PepperFileIOHost::OnLocalFileOpened( #endif } diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc index 31d4b57f0bd7..96df4aa1da41 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_message_filter.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/renderer_host/render_message_filter.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/renderer_host/render_message_filter.cc -@@ -67,7 +67,7 @@ +@@ -66,7 +66,7 @@ #if BUILDFLAG(IS_MAC) #include "ui/accelerated_widget_mac/window_resize_helper_mac.h" #endif @@ -9,21 +9,21 @@ #include "base/linux_util.h" #include "base/threading/platform_thread.h" #endif -@@ -129,7 +129,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( +@@ -128,7 +128,7 @@ void RenderMessageFilter::GenerateFrameRoutingID( std::move(callback).Run(routing_id, frame_token, devtools_frame_token); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadPriorityOnFileThread( + void RenderMessageFilter::SetThreadTypeOnWorkerThread( base::PlatformThreadId ns_tid, - base::ThreadPriority priority) { -@@ -150,7 +150,7 @@ void RenderMessageFilter::SetThreadPriorityOnFileThrea + base::ThreadType thread_type) { +@@ -149,7 +149,7 @@ void RenderMessageFilter::SetThreadTypeOnWorkerThread( } #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void RenderMessageFilter::SetThreadPriority(int32_t ns_tid, - base::ThreadPriority priority) { + void RenderMessageFilter::SetThreadType(int32_t ns_tid, + base::ThreadType thread_type) { constexpr base::TaskTraits kTraits = { diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h index d68e7d2231ec..cf0067ce67a9 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__message__filter.h @@ -1,19 +1,18 @@ ---- content/browser/renderer_host/render_message_filter.h.orig 2022-03-28 18:11:04 UTC +--- content/browser/renderer_host/render_message_filter.h.orig 2022-10-05 07:34:01 UTC +++ content/browser/renderer_host/render_message_filter.h -@@ -78,14 +78,14 @@ class RenderMessageFilter +@@ -78,13 +78,13 @@ class RenderMessageFilter void GenerateRoutingID(GenerateRoutingIDCallback routing_id) override; void GenerateFrameRoutingID(GenerateFrameRoutingIDCallback callback) override; void HasGpuProcess(HasGpuProcessCallback callback) override; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadPriority(int32_t ns_tid, - base::ThreadPriority priority) override; + void SetThreadType(int32_t ns_tid, base::ThreadType thread_type) override; #endif void OnResolveProxy(const GURL& url, IPC::Message* reply_msg); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadPriorityOnFileThread(base::PlatformThreadId ns_tid, - base::ThreadPriority priority); + void SetThreadTypeOnWorkerThread(base::PlatformThreadId ns_tid, + base::ThreadType thread_type); #endif diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc index b06a6bb70c9f..af21858c6ada 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-04-01 07:48:30 UTC +--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/renderer_host/render_process_host_impl.cc -@@ -208,7 +208,7 @@ +@@ -211,7 +211,7 @@ #include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h" #endif @@ -9,7 +9,7 @@ #include <sys/resource.h> #include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck -@@ -1228,7 +1228,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = +@@ -1135,7 +1135,7 @@ static constexpr size_t kUnknownPlatformProcessLimit = // to indicate failure and std::numeric_limits<size_t>::max() to indicate // unlimited. size_t GetPlatformProcessLimit() { @@ -18,7 +18,7 @@ struct rlimit limit; if (getrlimit(RLIMIT_NPROC, &limit) != 0) return kUnknownPlatformProcessLimit; -@@ -1315,7 +1315,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public +@@ -1222,7 +1222,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public return; } @@ -27,7 +27,16 @@ if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) { ConnectToFontService(std::move(font_receiver)); return; -@@ -3332,6 +3332,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin +@@ -2114,7 +2114,7 @@ void RenderProcessHostImpl::CreateWebSocketConnector( + std::move(receiver)); + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void RenderProcessHostImpl::CreateStableVideoDecoder( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) { + if (!stable_video_decoder_factory_remote_.is_bound()) { +@@ -3243,6 +3243,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin switches::kDisableSpeechAPI, switches::kDisableThreadedCompositing, switches::kDisableTouchDragDrop, @@ -36,3 +45,12 @@ switches::kDisableV8IdleTasks, switches::kDisableVideoCaptureUseGpuMemoryBuffer, switches::kDisableWebGLImageChromium, +@@ -4716,7 +4718,7 @@ void RenderProcessHostImpl::ResetIPC() { + coordinator_connector_receiver_.reset(); + tracing_registration_.reset(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + stable_video_decoder_factory_remote_.reset(); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h index 893e26159377..2eb3f22cc08a 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h @@ -1,6 +1,15 @@ ---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-04-01 07:48:30 UTC +--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-10-05 07:34:01 UTC +++ content/browser/renderer_host/render_process_host_impl.h -@@ -465,7 +465,7 @@ class CONTENT_EXPORT RenderProcessHostImpl +@@ -83,7 +83,7 @@ + #include "content/public/browser/android/child_process_importance.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/mojo/mojom/stable/stable_video_decoder.mojom.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +@@ -472,7 +472,7 @@ class CONTENT_EXPORT RenderProcessHostImpl // Sets this RenderProcessHost to be guest only. For Testing only. void SetForGuestsOnlyForTesting(); @@ -9,3 +18,21 @@ // Launch the zygote early in the browser startup. static void EarlyZygoteLaunch(); #endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC) +@@ -671,7 +671,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) + override; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void CreateStableVideoDecoder( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) + override; +@@ -1121,7 +1121,7 @@ class CONTENT_EXPORT RenderProcessHostImpl + // RenderProcessHost. This is destroyed early in ResetIPC() method. + std::unique_ptr<PermissionServiceContext> permission_service_context_; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Connection to the StableVideoDecoderFactory that lives in a utility + // process. This is only used for out-of-process video decoding. + mojo::Remote<media::stable::mojom::StableVideoDecoderFactory> diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc index 470221ac447c..4f404eb29cff 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc @@ -1,15 +1,15 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-04-01 07:48:30 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.cc -@@ -115,7 +115,7 @@ +@@ -116,7 +116,7 @@ #include "ui/gfx/gdi_util.h" #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "content/browser/accessibility/browser_accessibility_auralinux.h" #include "ui/base/ime/linux/text_edit_command_auralinux.h" - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" -@@ -453,7 +453,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge + #include "ui/linux/linux_ui.h" +@@ -441,7 +441,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge if (manager) return ToBrowserAccessibilityWin(manager->GetRoot())->GetCOM(); @@ -18,7 +18,7 @@ BrowserAccessibilityManager* manager = host()->GetOrCreateRootBrowserAccessibilityManager(); if (manager && manager->GetRoot()) -@@ -1576,7 +1576,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { +@@ -1579,7 +1579,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() { return GetTextInputManager() && GetTextInputManager()->should_do_learning(); } @@ -27,7 +27,7 @@ bool RenderWidgetHostViewAura::SetCompositionFromExistingText( const gfx::Range& range, const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) { -@@ -2412,7 +2412,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { +@@ -2400,7 +2400,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() { } bool RenderWidgetHostViewAura::NeedsMouseCapture() { @@ -36,12 +36,12 @@ return NeedsInputGrab(); #else return false; -@@ -2604,7 +2604,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit +@@ -2577,7 +2577,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit if (!target_host) return; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - ui::TextEditKeyBindingsDelegateAuraLinux* keybinding_delegate = - ui::GetTextEditKeyBindingsDelegate(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; + if (!event.skip_in_browser && linux_ui && event.os_event && diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h index 6e2eae4efd79..256ac1f7a369 100644 --- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h +++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h @@ -1,6 +1,6 @@ ---- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-04-01 07:48:30 UTC +--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2022-10-05 07:34:01 UTC +++ content/browser/renderer_host/render_widget_host_view_aura.h -@@ -243,7 +243,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura +@@ -245,7 +245,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc index 61c79445063a..4cf63f2dc47d 100644 --- a/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc +++ b/www/iridium/files/patch-content_browser_scheduler_responsiveness_jank__monitor__impl.cc @@ -1,6 +1,6 @@ ---- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/scheduler/responsiveness/jank_monitor_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/scheduler/responsiveness/jank_monitor_impl.cc -@@ -333,7 +333,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask +@@ -334,7 +334,7 @@ void JankMonitorImpl::ThreadExecutionState::DidRunTask // in context menus, among others). Simply ignore the mismatches for now. // See https://crbug.com/929813 for the details of why the mismatch // happens. diff --git a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc index 1057416c343d..e143251c7269 100644 --- a/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc +++ b/www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc @@ -1,6 +1,6 @@ ---- content/browser/utility_sandbox_delegate.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/utility_sandbox_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/utility_sandbox_delegate.cc -@@ -62,7 +62,7 @@ UtilitySandboxedProcessLauncherDelegate:: +@@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate:: #if BUILDFLAG(ENABLE_PLUGINS) sandbox_type_ == sandbox::mojom::Sandbox::kPpapi || #endif @@ -8,4 +8,17 @@ +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) sandbox_type_ == sandbox::mojom::Sandbox::kVideoCapture || #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -109,7 +109,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate:: + // unsandboxed zygote and then apply their actual sandboxes in the forked + // process upon startup. + if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork || +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding || + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) #if BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc index cdfb2fa58db8..d45e445a570e 100644 --- a/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc +++ b/www/iridium/files/patch-content_browser_web__contents_web__contents__view__aura.cc @@ -1,6 +1,6 @@ ---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-04-01 07:48:30 UTC +--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/web_contents/web_contents_view_aura.cc -@@ -159,7 +159,7 @@ class WebDragSourceAura : public content::WebContentsO +@@ -176,7 +176,7 @@ class WebDragSourceAura : public content::WebContentsO raw_ptr<aura::Window> window_; }; @@ -9,7 +9,7 @@ // Fill out the OSExchangeData with a file contents, synthesizing a name if // necessary. void PrepareDragForFileContents(const DropData& drop_data, -@@ -242,7 +242,7 @@ void PrepareDragData(const DropData& drop_data, +@@ -259,7 +259,7 @@ void PrepareDragData(const DropData& drop_data, if (!drop_data.download_metadata.empty()) PrepareDragForDownload(drop_data, provider, web_contents); #endif @@ -18,7 +18,7 @@ // We set the file contents before the URL because the URL also sets file // contents (to a .URL shortcut). We want to prefer file content data over // a shortcut so we add it first. -@@ -1324,7 +1324,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* +@@ -1360,7 +1360,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent* // Linux window managers like to handle raise-on-click themselves. If we // raise-on-click manually, this may override user settings that prevent // focus-stealing. diff --git a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc index 99d6e39039a5..185ef6bf8c36 100644 --- a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc +++ b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc @@ -1,8 +1,8 @@ ---- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-03-28 18:11:04 UTC +--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-10-05 07:34:01 UTC +++ content/browser/webui/web_ui_main_frame_observer.cc -@@ -12,7 +12,7 @@ - #include "content/browser/webui/web_ui_impl.h" +@@ -13,7 +13,7 @@ #include "content/public/browser/navigation_handle.h" + #include "content/public/browser/web_ui_controller.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) @@ -18,16 +18,16 @@ // Remove the pieces of the URL we don't want to send back with the error // reports. In particular, do not send query or fragments as those can have // privacy-sensitive information in them. -@@ -67,7 +67,7 @@ void WebUIMainFrameObserver::DidFinishNavigation( - web_ui_->DisallowJavascriptOnAllHandlers(); - } +@@ -55,7 +55,7 @@ WebUIMainFrameObserver::WebUIMainFrameObserver(WebUIIm + + WebUIMainFrameObserver::~WebUIMainFrameObserver() = default; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) void WebUIMainFrameObserver::OnDidAddMessageToConsole( RenderFrameHost* source_frame, blink::mojom::ConsoleMessageLevel log_level, -@@ -175,7 +175,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( +@@ -163,7 +163,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation( // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. diff --git a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h index 227fe7ea33be..7d6f6695ec2f 100644 --- a/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h +++ b/www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.h @@ -1,6 +1,6 @@ ---- content/browser/webui/web_ui_main_frame_observer.h.orig 2022-03-28 18:11:04 UTC +--- content/browser/webui/web_ui_main_frame_observer.h.orig 2022-10-05 07:34:01 UTC +++ content/browser/webui/web_ui_main_frame_observer.h -@@ -45,7 +45,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W +@@ -44,7 +44,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W // TODO(crbug.com/1129544) This is currently disabled due to Windows DLL // thunking issues. Fix & re-enable. @@ -9,7 +9,7 @@ // On official Google builds, capture and report JavaScript error messages on // WebUI surfaces back to Google. This allows us to fix JavaScript errors and // exceptions. -@@ -61,7 +61,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W +@@ -60,7 +60,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override; private: diff --git a/www/iridium/files/patch-content_child_child__process.cc b/www/iridium/files/patch-content_child_child__process.cc index bcd211e3e3e7..4703d9250736 100644 --- a/www/iridium/files/patch-content_child_child__process.cc +++ b/www/iridium/files/patch-content_child_child__process.cc @@ -1,6 +1,6 @@ ---- content/child/child_process.cc.orig 2022-04-01 07:48:30 UTC +--- content/child/child_process.cc.orig 2022-10-05 07:34:01 UTC +++ content/child/child_process.cc -@@ -71,7 +71,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr +@@ -68,7 +68,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_ DCHECK(!g_lazy_child_process_tls.Pointer()->Get()); g_lazy_child_process_tls.Pointer()->Set(this); diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn index 8c5465bf490c..48d5b35b558b 100644 --- a/www/iridium/files/patch-content_common_BUILD.gn +++ b/www/iridium/files/patch-content_common_BUILD.gn @@ -1,6 +1,6 @@ ---- content/common/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- content/common/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ content/common/BUILD.gn -@@ -406,6 +406,9 @@ if (is_linux || is_chromeos) { +@@ -428,6 +428,9 @@ if (is_linux || is_chromeos) { public = [ "set_process_title_linux.h" ] sources = [ "set_process_title_linux.cc" ] deps = [ "//base" ] diff --git a/www/iridium/files/patch-content_common_font__list__unittest.cc b/www/iridium/files/patch-content_common_font__list__unittest.cc index 520b35d145fd..18c18542fdd0 100644 --- a/www/iridium/files/patch-content_common_font__list__unittest.cc +++ b/www/iridium/files/patch-content_common_font__list__unittest.cc @@ -1,11 +1,11 @@ ---- content/common/font_list_unittest.cc.orig 2022-03-28 18:11:04 UTC +--- content/common/font_list_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ content/common/font_list_unittest.cc -@@ -51,7 +51,7 @@ TEST(FontList, GetFontList) { - EXPECT_TRUE(HasFontWithName(*fonts, "MS Gothic", "MS Gothic")); - EXPECT_TRUE(HasFontWithName(*fonts, "Segoe UI", "Segoe UI")); - EXPECT_TRUE(HasFontWithName(*fonts, "Verdana", "Verdana")); +@@ -48,7 +48,7 @@ TEST(FontList, GetFontList) { + EXPECT_TRUE(HasFontWithName(fonts, "MS Gothic", "MS Gothic")); + EXPECT_TRUE(HasFontWithName(fonts, "Segoe UI", "Segoe UI")); + EXPECT_TRUE(HasFontWithName(fonts, "Verdana", "Verdana")); -#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - EXPECT_TRUE(HasFontWithName(*fonts, "Arimo", "Arimo")); + EXPECT_TRUE(HasFontWithName(fonts, "Arimo", "Arimo")); #else - EXPECT_TRUE(HasFontWithName(*fonts, "Arial", "Arial")); + EXPECT_TRUE(HasFontWithName(fonts, "Arial", "Arial")); diff --git a/www/iridium/files/patch-content_common_user__agent.cc b/www/iridium/files/patch-content_common_user__agent.cc index 911f32dc06c4..c6282bbd1688 100644 --- a/www/iridium/files/patch-content_common_user__agent.cc +++ b/www/iridium/files/patch-content_common_user__agent.cc @@ -1,6 +1,24 @@ ---- content/common/user_agent.cc.orig 2022-04-01 07:48:30 UTC +--- content/common/user_agent.cc.orig 2022-10-05 07:34:01 UTC +++ content/common/user_agent.cc -@@ -245,6 +245,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons +@@ -41,7 +41,7 @@ std::string GetUserAgentPlatform() { + return ""; + #elif BUILDFLAG(IS_MAC) + return "Macintosh; "; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return "X11; "; // strange, but that's what Firefox uses + #elif BUILDFLAG(IS_ANDROID) + return "Linux; "; +@@ -63,7 +63,7 @@ std::string GetUnifiedPlatform() { + return "Windows NT 10.0; Win64; x64"; + #elif BUILDFLAG(IS_FUCHSIA) + return "Fuchsia"; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return "X11; Linux x86_64"; + #else + #error Unsupported platform +@@ -275,6 +275,16 @@ std::string BuildOSCpuInfoFromOSVersionAndCpuType(cons "Android %s", os_version.c_str() #elif BUILDFLAG(IS_FUCHSIA) "Fuchsia" diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc index 913aa98a20f0..b9292f510dff 100644 --- a/www/iridium/files/patch-content_gpu_gpu__main.cc +++ b/www/iridium/files/patch-content_gpu_gpu__main.cc @@ -1,4 +1,4 @@ ---- content/gpu/gpu_main.cc.orig 2022-04-01 07:48:30 UTC +--- content/gpu/gpu_main.cc.orig 2022-10-05 07:34:01 UTC +++ content/gpu/gpu_main.cc @@ -86,7 +86,7 @@ #include "sandbox/win/src/sandbox.h" @@ -36,7 +36,7 @@ #error "Unsupported Linux platform." #elif BUILDFLAG(IS_MAC) // Cross-process CoreAnimation requires a CFRunLoop to function at all, and -@@ -409,17 +409,19 @@ int GpuMain(MainFunctionParams parameters) { +@@ -401,7 +401,7 @@ int GpuMain(MainFunctionParams parameters) { namespace { @@ -45,29 +45,3 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdog_thread, const gpu::GPUInfo* gpu_info, const gpu::GpuPreferences& gpu_prefs) { - TRACE_EVENT0("gpu,startup", "Initialize sandbox"); - -+#if !BUILDFLAG(IS_BSD) - if (watchdog_thread) { - // SandboxLinux needs to be able to ensure that the thread - // has really been stopped. - sandbox::policy::SandboxLinux::GetInstance()->StopThread(watchdog_thread); - } -+#endif - - // SandboxLinux::InitializeSandbox() must always be called - // with only one thread. -@@ -454,11 +456,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo - *base::CommandLine::ForCurrentProcess()), - base::BindOnce(GpuProcessPreSandboxHook), sandbox_options); - -+#if !BUILDFLAG(IS_BSD) - if (watchdog_thread) { - base::Thread::Options thread_options; - thread_options.timer_slack = base::TIMER_SLACK_MAXIMUM; - watchdog_thread->StartWithOptions(std::move(thread_options)); - } -+#endif - - return res; - } diff --git a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc index a518d8e01a29..6aac6f475933 100644 --- a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc +++ b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc @@ -1,14 +1,14 @@ ---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-04-01 07:48:30 UTC +--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-10-05 07:34:01 UTC +++ content/gpu/gpu_sandbox_hook_linux.cc -@@ -104,6 +104,7 @@ static const char kLibV4lEncPluginPath[] = - - constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE; +@@ -118,6 +118,7 @@ void AddStandardChromeOsPermissions( + permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath)); + } +#if !defined(OS_BSD) void AddV4L2GpuPermissions( std::vector<BrokerFilePermission>* permissions, const sandbox::policy::SandboxSeccompBPF::Options& options) { -@@ -420,8 +421,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp +@@ -434,8 +435,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp AddStandardGpuPermissions(&permissions); return permissions; } @@ -19,7 +19,7 @@ // Preload the Mali library. if (UseChromecastSandboxAllowlist()) { for (const char* path : kAllowedChromecastPaths) { -@@ -463,6 +466,7 @@ void LoadArmGpuLibraries() { +@@ -477,6 +480,7 @@ void LoadArmGpuLibraries() { dlopen(driver_paths[i], dlopen_flag); } } @@ -27,7 +27,7 @@ } bool LoadAmdGpuLibraries() { -@@ -526,12 +530,14 @@ void LoadV4L2Libraries( +@@ -542,12 +546,14 @@ void LoadV4L2Libraries( } void LoadChromecastV4L2Libraries() { @@ -42,7 +42,7 @@ } bool LoadLibrariesForGpu( -@@ -558,6 +564,7 @@ bool LoadLibrariesForGpu( +@@ -575,6 +581,7 @@ bool LoadLibrariesForGpu( return true; } @@ -50,7 +50,7 @@ sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU( const sandbox::policy::SandboxLinux::Options& options) { sandbox::syscall_broker::BrokerCommandSet command_set; -@@ -580,13 +587,17 @@ bool BrokerProcessPreSandboxHook( +@@ -597,13 +604,17 @@ bool BrokerProcessPreSandboxHook( SetProcessTitleFromCommandLine(nullptr); return true; } diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h index 52b9fd407321..dd72577c720e 100644 --- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h +++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h @@ -1,4 +1,4 @@ ---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-03-28 18:11:04 UTC +--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-10-05 07:34:01 UTC +++ content/ppapi_plugin/ppapi_blink_platform_impl.h @@ -12,7 +12,7 @@ #include "build/build_config.h" @@ -9,8 +9,8 @@ #include "components/services/font/public/cpp/font_loader.h" #include "third_party/skia/include/core/SkRefCnt.h" #endif -@@ -39,11 +39,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp - blink::WebThemeEngine* ThemeEngine() override; +@@ -38,11 +38,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp + blink::WebString DefaultLocale() override; private: -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-content_public_browser_render__process__host.h b/www/iridium/files/patch-content_public_browser_render__process__host.h new file mode 100644 index 000000000000..2729b8bf362f --- /dev/null +++ b/www/iridium/files/patch-content_public_browser_render__process__host.h @@ -0,0 +1,20 @@ +--- content/public/browser/render_process_host.h.orig 2022-10-05 07:34:01 UTC ++++ content/public/browser/render_process_host.h +@@ -53,7 +53,7 @@ + #include "content/public/browser/android/child_process_importance.h" + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "media/mojo/mojom/stable/stable_video_decoder.mojom-forward.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +@@ -626,7 +626,7 @@ class CONTENT_EXPORT RenderProcessHost : public IPC::S + const blink::StorageKey& storage_key, + mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) = 0; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + virtual void CreateStableVideoDecoder( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> + receiver) = 0; diff --git a/www/iridium/files/patch-content_public_common_content__features.cc b/www/iridium/files/patch-content_public_common_content__features.cc index 73d7c8fe6b87..f9a34454add2 100644 --- a/www/iridium/files/patch-content_public_common_content__features.cc +++ b/www/iridium/files/patch-content_public_common_content__features.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_features.cc.orig 2022-04-01 07:48:30 UTC +--- content/public/common/content_features.cc.orig 2022-10-05 07:34:01 UTC +++ content/public/common/content_features.cc -@@ -50,7 +50,7 @@ const base::Feature kAudioServiceOutOfProcess { +@@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess { "AudioServiceOutOfProcess", // TODO(crbug.com/1052397): Remove !IS_CHROMEOS_LACROS once lacros starts being // built with OS_CHROMEOS instead of OS_LINUX. @@ -9,7 +9,7 @@ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) base::FEATURE_ENABLED_BY_DEFAULT #else -@@ -62,7 +62,7 @@ const base::Feature kAudioServiceOutOfProcess { +@@ -55,7 +55,7 @@ const base::Feature kAudioServiceOutOfProcess { // kAudioServiceOutOfProcess feature is enabled. const base::Feature kAudioServiceSandbox { "AudioServiceSandbox", @@ -18,7 +18,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -1030,7 +1030,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB +@@ -1086,7 +1086,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB const base::Feature kWebAssemblyCodeProtection{ "WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -27,7 +27,7 @@ // Use memory protection keys in userspace (PKU) (if available) to protect code // JITed for WebAssembly. Fall back to traditional memory protection if // WebAssemblyCodeProtection is also enabled. -@@ -1060,7 +1060,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi +@@ -1122,7 +1122,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi const base::Feature kWebAssemblyTrapHandler { "WebAssemblyTrapHandler", #if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \ @@ -36,7 +36,7 @@ defined(ARCH_CPU_X86_64)) || \ (BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64)) base::FEATURE_ENABLED_BY_DEFAULT -@@ -1146,7 +1146,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ +@@ -1192,7 +1192,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{ // Controls whether the WebUSB API is enabled: // https://wicg.github.io/webusb diff --git a/www/iridium/files/patch-content_public_common_content__features.h b/www/iridium/files/patch-content_public_common_content__features.h index e0889eb80d5f..c10663a8f4b5 100644 --- a/www/iridium/files/patch-content_public_common_content__features.h +++ b/www/iridium/files/patch-content_public_common_content__features.h @@ -1,6 +1,6 @@ ---- content/public/common/content_features.h.orig 2022-04-01 07:48:30 UTC +--- content/public/common/content_features.h.orig 2022-10-05 07:34:01 UTC +++ content/public/common/content_features.h -@@ -258,7 +258,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture; +@@ -282,7 +282,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture; CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay; CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline; CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection; diff --git a/www/iridium/files/patch-content_public_common_content__switches.cc b/www/iridium/files/patch-content_public_common_content__switches.cc index 523600f90cc5..d821874b32c7 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.cc +++ b/www/iridium/files/patch-content_public_common_content__switches.cc @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.cc.orig 2022-04-01 07:48:30 UTC +--- content/public/common/content_switches.cc.orig 2022-10-05 07:34:01 UTC +++ content/public/common/content_switches.cc -@@ -383,6 +383,10 @@ const char kEnableGpuMemoryBufferVideoFrames[] = +@@ -370,6 +370,10 @@ const char kEnableGpuMemoryBufferVideoFrames[] = // builds. const char kEnableLogging[] = "enable-logging"; @@ -11,7 +11,7 @@ // Enables the type, downlinkMax attributes of the NetInfo API. Also, enables // triggering of change attribute of the NetInfo API when there is a change in // the connection type. -@@ -981,7 +985,7 @@ const char kEnableAutomation[] = "enable-automation"; +@@ -984,7 +988,7 @@ const char kEnableAutomation[] = "enable-automation"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_public_common_content__switches.h b/www/iridium/files/patch-content_public_common_content__switches.h index 944342a820ed..9c7a2f6b4571 100644 --- a/www/iridium/files/patch-content_public_common_content__switches.h +++ b/www/iridium/files/patch-content_public_common_content__switches.h @@ -1,6 +1,6 @@ ---- content/public/common/content_switches.h.orig 2022-04-01 07:48:30 UTC +--- content/public/common/content_switches.h.orig 2022-10-05 07:34:01 UTC +++ content/public/common/content_switches.h -@@ -120,6 +120,8 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu +@@ -118,6 +118,8 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[]; CONTENT_EXPORT extern const char kEnableLCDText[]; CONTENT_EXPORT extern const char kEnableLogging[]; @@ -8,8 +8,8 @@ +CONTENT_EXPORT extern const char kTrk[]; CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[]; CONTENT_EXPORT extern const char kEnableCanvas2DLayers[]; - CONTENT_EXPORT extern const char kEnableNewCanvas2DAPI[]; -@@ -267,7 +269,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD + CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[]; +@@ -265,7 +267,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc b/www/iridium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc deleted file mode 100644 index 5255ee4e163e..000000000000 --- a/www/iridium/files/patch-content_public_common_use__zoom__for__dsf__policy.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- content/public/common/use_zoom_for_dsf_policy.cc.orig 2022-03-28 18:11:04 UTC -+++ content/public/common/use_zoom_for_dsf_policy.cc -@@ -26,7 +26,7 @@ const base::Feature kUseZoomForDsfEnabledByDefault{ - - bool IsUseZoomForDSFEnabledByDefault() { - #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || \ -- BUILDFLAG(IS_MAC) -+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - return true; - #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) - return base::FeatureList::IsEnabled(kUseZoomForDsfEnabledByDefault); diff --git a/www/iridium/files/patch-content_public_test_mock__render__process__host.h b/www/iridium/files/patch-content_public_test_mock__render__process__host.h new file mode 100644 index 000000000000..582f200c8e76 --- /dev/null +++ b/www/iridium/files/patch-content_public_test_mock__render__process__host.h @@ -0,0 +1,11 @@ +--- content/public/test/mock_render_process_host.h.orig 2022-10-05 07:34:01 UTC ++++ content/public/test/mock_render_process_host.h +@@ -261,7 +261,7 @@ class MockRenderProcessHost : public RenderProcessHost + const blink::StorageKey& storage_key, + mojo::PendingReceiver<blink::mojom::WebSocketConnector> receiver) + override {} +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void CreateStableVideoDecoder( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoder> receiver) + override {} diff --git a/www/iridium/files/patch-content_public_test_mock__render__thread.cc b/www/iridium/files/patch-content_public_test_mock__render__thread.cc index 249546b0e564..9e0c96d7bfc1 100644 --- a/www/iridium/files/patch-content_public_test_mock__render__thread.cc +++ b/www/iridium/files/patch-content_public_test_mock__render__thread.cc @@ -1,11 +1,11 @@ ---- content/public/test/mock_render_thread.cc.orig 2022-03-28 18:11:04 UTC +--- content/public/test/mock_render_thread.cc.orig 2022-10-05 07:34:01 UTC +++ content/public/test/mock_render_thread.cc -@@ -64,7 +64,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend +@@ -62,7 +62,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend std::move(callback).Run(false); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - void SetThreadPriority(int32_t platform_thread_id, - base::ThreadPriority thread_priority) override {} + void SetThreadType(int32_t platform_thread_id, + base::ThreadType thread_type) override {} #endif diff --git a/www/iridium/files/patch-content_renderer_media_render__media__client.cc b/www/iridium/files/patch-content_renderer_media_render__media__client.cc new file mode 100644 index 000000000000..b83b3fedb3d8 --- /dev/null +++ b/www/iridium/files/patch-content_renderer_media_render__media__client.cc @@ -0,0 +1,11 @@ +--- content/renderer/media/render_media_client.cc.orig 2022-10-05 07:34:01 UTC ++++ content/renderer/media/render_media_client.cc +@@ -21,7 +21,7 @@ namespace { + // it asynchronously ahead of time, but can fallback to a blocking call + // when it's needed synchronously. + #if BUILDFLAG(ENABLE_PLATFORM_HEVC) && \ +- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)) ++ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) + #define NEEDS_PROFILE_UPDATER 1 + #else + #define NEEDS_PROFILE_UPDATER 0 diff --git a/www/iridium/files/patch-content_renderer_render__process__impl.cc b/www/iridium/files/patch-content_renderer_render__process__impl.cc index 8832c452f08a..08b44699a1d6 100644 --- a/www/iridium/files/patch-content_renderer_render__process__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__process__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_process_impl.cc.orig 2022-03-28 18:11:04 UTC +--- content/renderer/render_process_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/renderer/render_process_impl.cc -@@ -47,7 +47,7 @@ +@@ -46,7 +46,7 @@ #if BUILDFLAG(IS_WIN) #include "base/win/win_util.h" #endif @@ -9,7 +9,7 @@ #include "v8/include/v8-wasm-trap-handler-posix.h" #endif -@@ -146,7 +146,7 @@ RenderProcessImpl::RenderProcessImpl() +@@ -138,7 +138,7 @@ RenderProcessImpl::RenderProcessImpl() SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection, "--no-wasm-write-protect-code-memory"); @@ -18,9 +18,9 @@ SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku, "--wasm-memory-protection-keys"); SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku, -@@ -227,7 +227,7 @@ RenderProcessImpl::RenderProcessImpl() - SetV8FlagIfFeature(features::kWebAssemblyDynamicTiering, - "--wasm-dynamic-tiering"); +@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl() + + v8::V8::SetFlagsFromString("--freeze-flags-after-init"); -#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64) diff --git a/www/iridium/files/patch-content_renderer_render__thread__impl.cc b/www/iridium/files/patch-content_renderer_render__thread__impl.cc index 4368a5539401..34292a718826 100644 --- a/www/iridium/files/patch-content_renderer_render__thread__impl.cc +++ b/www/iridium/files/patch-content_renderer_render__thread__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/render_thread_impl.cc.orig 2022-04-01 07:48:30 UTC +--- content/renderer/render_thread_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/renderer/render_thread_impl.cc -@@ -189,7 +189,7 @@ +@@ -190,7 +190,7 @@ #if BUILDFLAG(IS_MAC) #include <malloc/malloc.h> @@ -9,25 +9,16 @@ #include <malloc.h> #endif -@@ -718,7 +718,7 @@ void RenderThreadImpl::Init() { - DCHECK(parsed_num_raster_threads) << string_value; - DCHECK_GT(num_raster_threads, 0); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - categorized_worker_pool_->SetBackgroundingCallback( - main_thread_scheduler_->DefaultTaskRunner(), - base::BindOnce( -@@ -741,7 +741,7 @@ void RenderThreadImpl::Init() { +@@ -671,7 +671,7 @@ void RenderThreadImpl::Init() { base::DiscardableMemoryAllocator::SetInstance( discardable_memory_allocator_.get()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (base::FeatureList::IsEnabled( - blink::features::kBlinkCompositorUseDisplayThreadPriority)) { - render_message_filter()->SetThreadPriority( -@@ -1093,7 +1093,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: + render_message_filter()->SetThreadType( + ChildProcess::current()->io_thread_id(), base::ThreadType::kCompositing); + #endif +@@ -1041,7 +1041,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_decode_accelerator = @@ -36,7 +27,7 @@ base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) && #else !cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) && -@@ -1104,7 +1104,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: +@@ -1052,7 +1052,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl: const bool enable_video_encode_accelerator = diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc index 5eab543380d8..01b2b4d8a80f 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc @@ -1,6 +1,6 @@ ---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-04-01 07:48:30 UTC +--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-10-05 07:34:01 UTC +++ content/renderer/renderer_blink_platform_impl.cc -@@ -109,7 +109,7 @@ +@@ -108,7 +108,7 @@ #if BUILDFLAG(IS_MAC) #include "content/child/child_process_sandbox_support_impl_mac.h" @@ -9,7 +9,7 @@ #include "content/child/child_process_sandbox_support_impl_linux.h" #endif -@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -177,7 +177,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( main_thread_scheduler_(main_thread_scheduler) { // RenderThread may not exist in some tests. if (RenderThreadImpl::current()) { @@ -18,7 +18,7 @@ mojo::PendingRemote<font_service::mojom::FontService> font_service; RenderThreadImpl::current()->BindHostReceiver( font_service.InitWithNewPipeAndPassReceiver()); -@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( +@@ -187,7 +187,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl( #endif } @@ -27,18 +27,17 @@ if (sandboxEnabled()) { #if BUILDFLAG(IS_MAC) sandbox_support_ = std::make_unique<WebSandboxSupportMac>(); -@@ -283,7 +283,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory( +@@ -254,7 +254,7 @@ RendererBlinkPlatformImpl::WrapURLLoaderFactory( /*terminate_sync_load_event=*/nullptr); } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+// pledge -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_BSD) - void RendererBlinkPlatformImpl::SetDisplayThreadPriority( - base::PlatformThreadId thread_id) { ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void RendererBlinkPlatformImpl::SetThreadType(base::PlatformThreadId thread_id, + base::ThreadType thread_type) { if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) { -@@ -298,7 +299,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop - } +@@ -265,7 +265,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl + #endif blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() { -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) diff --git a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h index 6d3efe2ed5ea..b460bccb9ee5 100644 --- a/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h +++ b/www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h @@ -1,15 +1,24 @@ ---- content/renderer/renderer_blink_platform_impl.h.orig 2022-04-01 07:48:30 UTC +--- content/renderer/renderer_blink_platform_impl.h.orig 2022-10-05 07:34:01 UTC +++ content/renderer/renderer_blink_platform_impl.h -@@ -30,7 +30,7 @@ +@@ -29,7 +29,7 @@ + #include "third_party/blink/public/common/user_agent/user_agent_metadata.h" #include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h" - #include "third_party/blink/public/mojom/loader/code_cache.mojom.h" -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "components/services/font/public/cpp/font_loader.h" // nogncheck #include "third_party/skia/include/core/SkRefCnt.h" // nogncheck #endif -@@ -276,7 +276,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -169,7 +169,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi + const blink::WebURL& top_document_web_url) override; + gpu::GpuMemoryBufferManager* GetGpuMemoryBufferManager() override; + blink::WebString ConvertIDNToUnicode(const blink::WebString& host) override; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + void SetThreadType(base::PlatformThreadId thread_id, + base::ThreadType) override; + #endif +@@ -235,7 +235,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info, const gpu::GPUInfo& gpu_info) const; @@ -18,7 +27,7 @@ std::unique_ptr<blink::WebSandboxSupport> sandbox_support_; #endif -@@ -304,7 +304,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi +@@ -255,7 +255,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi mutable base::WaitableEvent io_thread_id_ready_event_; base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId; diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn index f12d3b9d4176..6a82bb1be27e 100644 --- a/www/iridium/files/patch-content_shell_BUILD.gn +++ b/www/iridium/files/patch-content_shell_BUILD.gn @@ -1,6 +1,6 @@ ---- content/shell/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- content/shell/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ content/shell/BUILD.gn -@@ -882,7 +882,7 @@ group("content_shell_crash_test") { +@@ -893,7 +893,7 @@ group("content_shell_crash_test") { if (is_win) { data_deps += [ "//build/win:copy_cdb_to_output" ] } diff --git a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc index f2ac905ce0ab..f875b92e2d0e 100644 --- a/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/iridium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,6 +1,6 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2022-03-28 18:11:04 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -211,7 +211,7 @@ void ShellMainDelegate::PreSandboxStartup() { +@@ -208,7 +208,7 @@ void ShellMainDelegate::PreSandboxStartup() { // Reporting for sub-processes will be initialized in ZygoteForked. if (process_type != switches::kZygoteProcess) { crash_reporter::InitializeCrashpad(process_type.empty(), process_type); diff --git a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc index 7f116b028d8c..37446ba5882f 100644 --- a/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc +++ b/www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-03-28 18:11:04 UTC +--- content/shell/browser/shell_browser_main_parts.cc.orig 2022-10-05 07:34:01 UTC +++ content/shell/browser/shell_browser_main_parts.cc -@@ -49,7 +49,7 @@ +@@ -50,7 +50,7 @@ #include "net/base/network_change_notifier.h" #endif @@ -9,6 +9,15 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif +@@ -65,7 +65,7 @@ + #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" // nogncheck + #include "ui/linux/linux_ui_factory.h" // nogncheck + #endif @@ -129,7 +129,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( } @@ -18,3 +27,21 @@ ui::InitializeInputMethodForTesting(); #endif #if BUILDFLAG(IS_ANDROID) +@@ -153,7 +153,7 @@ void ShellBrowserMainParts::ToolkitInitialized() { + if (switches::IsRunWebTestsSwitchPresent()) + return; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ui::LinuxUi::SetInstance(ui::CreateLinuxUi()); + #endif + } +@@ -196,7 +196,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() { + ShellDevToolsManagerDelegate::StopHttpHandler(); + browser_context_.reset(); + off_the_record_browser_context_.reset(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ui::LinuxUi::SetInstance(nullptr); + #endif + performance_manager_lifetime_.reset(); diff --git a/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc b/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc index d1c1607f0b8b..9eeff1afd57d 100644 --- a/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc +++ b/www/iridium/files/patch-content_shell_utility_shell__content__utility__client.cc @@ -1,4 +1,4 @@ ---- content/shell/utility/shell_content_utility_client.cc.orig 2022-03-28 18:11:04 UTC +--- content/shell/utility/shell_content_utility_client.cc.orig 2022-10-05 07:34:01 UTC +++ content/shell/utility/shell_content_utility_client.cc @@ -32,7 +32,7 @@ #include "sandbox/policy/sandbox.h" @@ -9,7 +9,7 @@ #include "content/test/sandbox_status_service.h" #endif -@@ -142,7 +142,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow +@@ -143,7 +143,7 @@ void ShellContentUtilityClient::ExposeInterfacesToBrow binders->Add<mojom::PowerMonitorTest>( base::BindRepeating(&PowerMonitorTestImpl::MakeSelfOwnedReceiver), base::ThreadTaskRunnerHandle::Get()); diff --git a/www/iridium/files/patch-content_test_BUILD.gn b/www/iridium/files/patch-content_test_BUILD.gn index 6a5f8b0ab1d4..5639435a3e28 100644 --- a/www/iridium/files/patch-content_test_BUILD.gn +++ b/www/iridium/files/patch-content_test_BUILD.gn @@ -1,6 +1,6 @@ ---- content/test/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- content/test/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ content/test/BUILD.gn -@@ -1914,7 +1914,7 @@ static_library("run_all_unittests") { +@@ -2055,7 +2055,7 @@ static_library("run_all_unittests") { ":test_support", "//base/test:test_support", ] @@ -9,7 +9,7 @@ deps += [ "//content/common:set_process_title_linux" ] } } -@@ -2850,7 +2850,7 @@ test("content_unittests") { +@@ -3025,7 +3025,7 @@ test("content_unittests") { deps += [ "//third_party/boringssl" ] } diff --git a/www/iridium/files/patch-content_utility_services.cc b/www/iridium/files/patch-content_utility_services.cc index 0bbb81b30a69..2495a7f79de6 100644 --- a/www/iridium/files/patch-content_utility_services.cc +++ b/www/iridium/files/patch-content_utility_services.cc @@ -1,6 +1,6 @@ ---- content/utility/services.cc.orig 2022-03-28 18:11:04 UTC +--- content/utility/services.cc.orig 2022-10-05 07:34:01 UTC +++ content/utility/services.cc -@@ -67,7 +67,7 @@ +@@ -63,7 +63,7 @@ extern sandbox::TargetServices* g_utility_target_services; #endif // BUILDFLAG(IS_WIN) @@ -9,7 +9,16 @@ #include "sandbox/linux/services/libc_interceptor.h" #include "sandbox/policy/mojom/sandbox.mojom.h" #include "sandbox/policy/sandbox_type.h" -@@ -205,7 +205,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi +@@ -85,7 +85,7 @@ extern sandbox::TargetServices* g_utility_target_servi + #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || + // BUILDFLAG(USE_V4L2_CODEC)) + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ + (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + #include "media/mojo/services/stable_video_decoder_factory_service.h" // nogncheck + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && +@@ -198,7 +198,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi << "task_policy_set TASK_QOS_POLICY"; #endif @@ -18,3 +27,21 @@ auto* command_line = base::CommandLine::ForCurrentProcess(); if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) == sandbox::mojom::Sandbox::kNoSandbox) { +@@ -288,7 +288,7 @@ auto RunOOPArcVideoAcceleratorFactoryService( + #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || + // BUILDFLAG(USE_V4L2_CODEC)) + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ + (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + auto RunStableVideoDecoderFactoryService( + mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory> +@@ -342,7 +342,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory& + #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) || + // BUILDFLAG(USE_V4L2_CODEC)) + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \ + (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC)) + services.Add(RunStableVideoDecoderFactoryService); + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && diff --git a/www/iridium/files/patch-content_utility_utility__main.cc b/www/iridium/files/patch-content_utility_utility__main.cc index 44fb1b0bf52a..4b8ed261f006 100644 --- a/www/iridium/files/patch-content_utility_utility__main.cc +++ b/www/iridium/files/patch-content_utility_utility__main.cc @@ -1,6 +1,6 @@ ---- content/utility/utility_main.cc.orig 2022-03-28 18:11:04 UTC +--- content/utility/utility_main.cc.orig 2022-10-05 07:34:01 UTC +++ content/utility/utility_main.cc -@@ -32,16 +32,22 @@ +@@ -31,17 +31,19 @@ #include "third_party/icu/source/common/unicode/unistr.h" #include "third_party/icu/source/i18n/unicode/timezone.h" @@ -17,14 +17,23 @@ #include "services/network/network_sandbox_hook_linux.h" #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + #include "gpu/config/gpu_info_collector.h" + #include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h" + +@@ -50,6 +52,10 @@ + #include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + +#if BUILDFLAG(IS_BSD) +#include "sandbox/policy/openbsd/sandbox_openbsd.h" +#endif + #if BUILDFLAG(IS_CHROMEOS_ASH) #include "ash/services/ime/ime_sandbox_hook.h" - #include "chromeos/assistant/buildflags.h" -@@ -135,7 +141,7 @@ int UtilityMain(MainFunctionParams parameters) { + #include "chromeos/ash/components/assistant/buildflags.h" +@@ -129,7 +135,7 @@ int UtilityMain(MainFunctionParams parameters) { } } @@ -33,15 +42,29 @@ // Initializes the sandbox before any threads are created. // TODO(jorgelo): move this after GTK initialization when we enable a strict // Seccomp-BPF policy. -@@ -179,6 +185,7 @@ int UtilityMain(MainFunctionParams parameters) { +@@ -157,7 +163,7 @@ int UtilityMain(MainFunctionParams parameters) { + pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook); + break; + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + case sandbox::mojom::Sandbox::kHardwareVideoDecoding: + pre_sandbox_hook = + base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook); +@@ -180,10 +186,11 @@ int UtilityMain(MainFunctionParams parameters) { default: break; } +#if !BUILDFLAG(IS_BSD) - if (parameters.zygote_child || !pre_sandbox_hook.is_null()) { + if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) && + (parameters.zygote_child || !pre_sandbox_hook.is_null())) { sandbox::policy::SandboxLinux::Options sandbox_options; - #if BUILDFLAG(IS_CHROMEOS_ASH) -@@ -194,6 +201,11 @@ int UtilityMain(MainFunctionParams parameters) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + if (sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding) { + // The kHardwareVideoDecoding sandbox needs to know the GPU type in order + // to select the right policy. +@@ -196,6 +203,11 @@ int UtilityMain(MainFunctionParams parameters) { sandbox::policy::Sandbox::Initialize( sandbox_type, std::move(pre_sandbox_hook), sandbox_options); } diff --git a/www/iridium/files/patch-content_zygote_zygote__linux.cc b/www/iridium/files/patch-content_zygote_zygote__linux.cc index 4750ebfc3878..93d9347c0fbb 100644 --- a/www/iridium/files/patch-content_zygote_zygote__linux.cc +++ b/www/iridium/files/patch-content_zygote_zygote__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_linux.cc.orig 2022-03-28 18:11:04 UTC +--- content/zygote/zygote_linux.cc.orig 2022-10-05 07:34:01 UTC +++ content/zygote/zygote_linux.cc @@ -1,6 +1,7 @@ // Copyright (c) 2012 The Chromium Authors. All rights reserved. @@ -8,7 +8,7 @@ #include "content/zygote/zygote_linux.h" -@@ -650,3 +651,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick +@@ -653,3 +654,4 @@ bool Zygote::HandleGetSandboxStatus(int fd, base::Pick } } // namespace content diff --git a/www/iridium/files/patch-content_zygote_zygote__main__linux.cc b/www/iridium/files/patch-content_zygote_zygote__main__linux.cc index 4a1370f7a055..7f446d07dba5 100644 --- a/www/iridium/files/patch-content_zygote_zygote__main__linux.cc +++ b/www/iridium/files/patch-content_zygote_zygote__main__linux.cc @@ -1,4 +1,4 @@ ---- content/zygote/zygote_main_linux.cc.orig 2022-03-28 18:11:04 UTC +--- content/zygote/zygote_main_linux.cc.orig 2022-10-05 07:34:01 UTC +++ content/zygote/zygote_main_linux.cc @@ -11,7 +11,9 @@ #include <stddef.h> @@ -10,7 +10,7 @@ #include <sys/socket.h> #include <sys/types.h> #include <unistd.h> -@@ -40,7 +42,9 @@ +@@ -41,7 +43,9 @@ #include "sandbox/linux/services/thread_helpers.h" #include "sandbox/linux/suid/client/setuid_sandbox_client.h" #include "sandbox/policy/linux/sandbox_debug_handling_linux.h" @@ -20,7 +20,7 @@ #include "sandbox/policy/sandbox.h" #include "sandbox/policy/switches.h" #include "third_party/icu/source/i18n/unicode/timezone.h" -@@ -49,6 +53,7 @@ namespace content { +@@ -50,6 +54,7 @@ namespace content { namespace { @@ -28,7 +28,7 @@ void CloseFds(const std::vector<int>& fds) { for (const auto& it : fds) { PCHECK(0 == IGNORE_EINTR(close(it))); -@@ -66,9 +71,11 @@ base::OnceClosure ClosureFromTwoClosures(base::OnceClo +@@ -67,9 +72,11 @@ base::OnceClosure ClosureFromTwoClosures(base::OnceClo }, std::move(one), std::move(two)); } @@ -40,7 +40,7 @@ // This function triggers the static and lazy construction of objects that need // to be created before imposing the sandbox. static void ZygotePreSandboxInit() { -@@ -173,9 +180,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand +@@ -174,9 +181,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand CHECK(!using_layer1_sandbox); } } @@ -52,7 +52,7 @@ sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD()); auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance(); -@@ -240,6 +249,9 @@ bool ZygoteMain( +@@ -241,6 +250,9 @@ bool ZygoteMain( // This function call can return multiple times, once per fork(). return zygote.ProcessRequests(); diff --git a/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc b/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc new file mode 100644 index 000000000000..28ff033ab846 --- /dev/null +++ b/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc @@ -0,0 +1,11 @@ +--- device/bluetooth/bluetooth_adapter.cc.orig 2022-10-05 07:34:01 UTC ++++ device/bluetooth/bluetooth_adapter.cc +@@ -32,7 +32,7 @@ BluetoothAdapter::ServiceOptions::ServiceOptions() = d + BluetoothAdapter::ServiceOptions::~ServiceOptions() = default; + + #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_MAC) && \ +- !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) ++ !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // static + scoped_refptr<BluetoothAdapter> BluetoothAdapter::CreateAdapter() { + return nullptr; diff --git a/www/iridium/files/patch-device_bluetooth_cast__bluetooth.gni b/www/iridium/files/patch-device_bluetooth_cast__bluetooth.gni index 6b130080b723..6ac86368d4a7 100644 --- a/www/iridium/files/patch-device_bluetooth_cast__bluetooth.gni +++ b/www/iridium/files/patch-device_bluetooth_cast__bluetooth.gni @@ -1,9 +1,9 @@ ---- device/bluetooth/cast_bluetooth.gni.orig 2022-03-28 18:11:04 UTC +--- device/bluetooth/cast_bluetooth.gni.orig 2022-10-05 07:34:01 UTC +++ device/bluetooth/cast_bluetooth.gni @@ -2,5 +2,5 @@ import("//build/config/features.gni") declare_args() { force_cast_bluetooth = false -- use_bluez = use_dbus +- use_bluez = (is_linux && !is_castos && use_dbus) || is_chromeos + use_bluez = use_dbus && !is_bsd } diff --git a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc index 002139b12936..eb2c873da0f7 100644 --- a/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc +++ b/www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc @@ -1,4 +1,4 @@ ---- extensions/browser/api/messaging/message_service.cc.orig 2022-04-01 07:48:30 UTC +--- extensions/browser/api/messaging/message_service.cc.orig 2022-10-05 07:34:01 UTC +++ extensions/browser/api/messaging/message_service.cc @@ -74,7 +74,7 @@ namespace { const char kReceivingEndDoesntExistError[] = @@ -9,7 +9,7 @@ const char kMissingPermissionError[] = "Access to native messaging requires nativeMessaging permission."; const char kProhibitedByPoliciesError[] = -@@ -447,7 +447,7 @@ void MessageService::OpenChannelToNativeApp( +@@ -437,7 +437,7 @@ void MessageService::OpenChannelToNativeApp( return; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc index 7988d5f9462a..8c154ed8b11f 100644 --- a/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc +++ b/www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc @@ -1,20 +1,20 @@ ---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2022-03-28 18:11:04 UTC +--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2022-10-05 07:34:01 UTC +++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc -@@ -12,7 +12,7 @@ - - #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -14,7 +14,7 @@ #include "extensions/browser/api/networking_private/networking_private_chromeos.h" --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + #include "extensions/browser/api/networking_private/networking_private_lacros.h" +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "extensions/browser/api/networking_private/networking_private_linux.h" #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) #include "components/wifi/wifi_service.h" -@@ -62,7 +62,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS - NetworkingPrivateDelegate* delegate; - #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS delegate = new NetworkingPrivateChromeOS(browser_context); --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + delegate = new NetworkingPrivateLacros(browser_context); +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) delegate = new NetworkingPrivateLinux(); #elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create()); diff --git a/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc index e30a9f6683d8..141f92bd1351 100644 --- a/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc +++ b/www/iridium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc @@ -1,4 +1,4 @@ ---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-04-01 07:48:30 UTC +--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-10-05 07:34:01 UTC +++ extensions/browser/browser_context_keyed_service_factories.cc @@ -89,7 +89,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt() IdleManagerFactory::GetInstance(); @@ -8,4 +8,4 @@ + BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) NetworkingPrivateEventRouterFactory::GetInstance(); #endif - PowerAPI::GetFactoryInstance(); + OffscreenDocumentManager::GetFactory(); diff --git a/www/iridium/files/patch-extensions_browser_extension__prefs.cc b/www/iridium/files/patch-extensions_browser_extension__prefs.cc index 18fab18cc8c0..172200e7c3e0 100644 --- a/www/iridium/files/patch-extensions_browser_extension__prefs.cc +++ b/www/iridium/files/patch-extensions_browser_extension__prefs.cc @@ -1,11 +1,11 @@ ---- extensions/browser/extension_prefs.cc.orig 2022-04-01 07:48:30 UTC +--- extensions/browser/extension_prefs.cc.orig 2022-10-05 07:34:01 UTC +++ extensions/browser/extension_prefs.cc -@@ -2269,7 +2269,7 @@ void ExtensionPrefs::RegisterProfilePrefs( - registry->RegisterStringPref(pref_names::kLastChromeVersion, std::string()); +@@ -2274,7 +2274,7 @@ void ExtensionPrefs::RegisterProfilePrefs( registry->RegisterDictionaryPref(kInstallSignature); registry->RegisterListPref(kExternalUninstalls); --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) registry->RegisterBooleanPref(pref_names::kChromeAppsEnabled, false); #endif registry->RegisterBooleanPref(pref_names::kU2fSecurityKeyApiEnabled, false); diff --git a/www/iridium/files/patch-extensions_browser_pref__names.cc b/www/iridium/files/patch-extensions_browser_pref__names.cc index 60493d21c4ad..d6d038cf5765 100644 --- a/www/iridium/files/patch-extensions_browser_pref__names.cc +++ b/www/iridium/files/patch-extensions_browser_pref__names.cc @@ -1,11 +1,11 @@ ---- extensions/browser/pref_names.cc.orig 2022-03-28 18:11:04 UTC +--- extensions/browser/pref_names.cc.orig 2022-10-05 07:34:01 UTC +++ extensions/browser/pref_names.cc @@ -48,7 +48,7 @@ const char kStorageGarbageCollect[] = "extensions.stor - const char kToolbar[] = "extensions.toolbar"; const char kDeletedComponentExtensions[] = "extensions.deleted_component_extensions"; --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) extern const char kChromeAppsEnabled[] = "extensions.chrome_apps_enabled"; #endif const char kU2fSecurityKeyApiEnabled[] = diff --git a/www/iridium/files/patch-extensions_browser_pref__names.h b/www/iridium/files/patch-extensions_browser_pref__names.h index 525bd15358c1..e28caa249a1d 100644 --- a/www/iridium/files/patch-extensions_browser_pref__names.h +++ b/www/iridium/files/patch-extensions_browser_pref__names.h @@ -1,11 +1,11 @@ ---- extensions/browser/pref_names.h.orig 2022-03-28 18:11:04 UTC +--- extensions/browser/pref_names.h.orig 2022-10-05 07:34:01 UTC +++ extensions/browser/pref_names.h -@@ -101,7 +101,7 @@ extern const char kToolbar[]; - // uninstalled/removed and should not be reloaded. +@@ -98,7 +98,7 @@ extern const char kStorageGarbageCollect[]; extern const char kDeletedComponentExtensions[]; --#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_FUCHSIA) ++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // A preference for whether Chrome Apps should be allowed. The default depends // on the ChromeAppsDeprecation feature flag, and this pref can extend support // for Chrome Apps by enterprise policy. diff --git a/www/iridium/files/patch-extensions_common_api___permission__features.json b/www/iridium/files/patch-extensions_common_api___permission__features.json index 0124e4c15afd..073bc64f001e 100644 --- a/www/iridium/files/patch-extensions_common_api___permission__features.json +++ b/www/iridium/files/patch-extensions_common_api___permission__features.json @@ -1,29 +1,29 @@ ---- extensions/common/api/_permission_features.json.orig 2022-03-28 18:11:04 UTC +--- extensions/common/api/_permission_features.json.orig 2022-10-05 07:34:01 UTC +++ extensions/common/api/_permission_features.json @@ -134,7 +134,7 @@ { "channel": "stable", "extension_types": ["platform_app"], - "platforms": ["chromeos", "win", "mac", "linux"], -+ "platforms": ["chromeos", "win", "mac", "linux", "openbsd"], ++ "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd"], "allowlist": [ "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169 "A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169 -@@ -447,7 +447,7 @@ +@@ -433,7 +433,7 @@ }, { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], - "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"], -+ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd"], ++ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"], "allowlist": [ "0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651 "1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683 -@@ -485,7 +485,7 @@ +@@ -475,7 +475,7 @@ "networkingPrivate": { "channel": "stable", "extension_types": ["extension", "legacy_packaged_app", "platform_app"], -- "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"], -+ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd"], +- "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia"], ++ "platforms": ["chromeos", "lacros", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"], "allowlist": [ // DO NOT ADD ANY MORE ENTRIES HERE. // networkingPrivate is being migrated to networking.onc. diff --git a/www/iridium/files/patch-extensions_common_api_runtime.json b/www/iridium/files/patch-extensions_common_api_runtime.json new file mode 100644 index 000000000000..b67c7d48f3f2 --- /dev/null +++ b/www/iridium/files/patch-extensions_common_api_runtime.json @@ -0,0 +1,12 @@ +--- extensions/common/api/runtime.json.orig 2022-10-05 07:34:01 UTC ++++ extensions/common/api/runtime.json +@@ -86,7 +86,8 @@ + "cros", + "linux", + "openbsd", +- "fuchsia" ++ "fuchsia", ++ "freebsd" + ] + }, + { diff --git a/www/iridium/files/patch-extensions_common_command.cc b/www/iridium/files/patch-extensions_common_command.cc new file mode 100644 index 000000000000..753901efdde9 --- /dev/null +++ b/www/iridium/files/patch-extensions_common_command.cc @@ -0,0 +1,11 @@ +--- extensions/common/command.cc.orig 2022-10-05 07:34:01 UTC ++++ extensions/common/command.cc +@@ -288,7 +288,7 @@ std::string Command::CommandPlatform() { + return values::kKeybindingPlatformMac; + #elif BUILDFLAG(IS_CHROMEOS) + return values::kKeybindingPlatformChromeOs; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return values::kKeybindingPlatformLinux; + #elif BUILDFLAG(IS_FUCHSIA) + // TODO(crbug.com/1312215): Change this once we decide what string should be diff --git a/www/iridium/files/patch-extensions_renderer_bindings_argument__spec.cc b/www/iridium/files/patch-extensions_renderer_bindings_argument__spec.cc new file mode 100644 index 000000000000..771ab11f8a23 --- /dev/null +++ b/www/iridium/files/patch-extensions_renderer_bindings_argument__spec.cc @@ -0,0 +1,11 @@ +--- extensions/renderer/bindings/argument_spec.cc.orig 2022-10-05 07:34:01 UTC ++++ extensions/renderer/bindings/argument_spec.cc +@@ -16,6 +16,8 @@ + #include "gin/data_object_builder.h" + #include "gin/dictionary.h" + ++#include <cmath> ++ + namespace extensions { + + namespace { diff --git a/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc b/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc index f189edcd56a5..2b2e84625ff5 100644 --- a/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc +++ b/www/iridium/files/patch-extensions_shell_browser_shell__browser__main__parts.cc @@ -1,6 +1,6 @@ ---- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-03-28 18:11:04 UTC +--- extensions/shell/browser/shell_browser_main_parts.cc.orig 2022-10-05 07:34:01 UTC +++ extensions/shell/browser/shell_browser_main_parts.cc -@@ -142,7 +142,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( +@@ -150,7 +150,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop( switches::kAppShellAllowRoaming)) { network_controller_->SetCellularAllowRoaming(true); } diff --git a/www/iridium/files/patch-gpu_command__buffer_service_external__semaphore.cc b/www/iridium/files/patch-gpu_command__buffer_service_external__semaphore.cc deleted file mode 100644 index 2fc069d3499b..000000000000 --- a/www/iridium/files/patch-gpu_command__buffer_service_external__semaphore.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- gpu/command_buffer/service/external_semaphore.cc.orig 2022-03-28 18:11:04 UTC -+++ gpu/command_buffer/service/external_semaphore.cc -@@ -27,7 +27,7 @@ GLuint ImportSemaphoreHandleToGLSemaphore(SemaphoreHan - if (!handle.is_valid()) - return 0; - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - if (handle.vk_handle_type() != - VK_EXTERNAL_SEMAPHORE_HANDLE_TYPE_OPAQUE_FD_BIT) { - DLOG(ERROR) << "Importing semaphore handle of unexpected type:" diff --git a/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc deleted file mode 100644 index 7485fd439f70..000000000000 --- a/www/iridium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-03-28 18:11:04 UTC -+++ gpu/command_buffer/service/external_vk_image_backing.cc -@@ -31,7 +31,7 @@ - #include "ui/gl/gl_version_info.h" - #include "ui/gl/scoped_binders.h" - --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - #include "gpu/command_buffer/service/external_vk_image_dawn_representation.h" - #endif - -@@ -559,7 +559,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager - MemoryTypeTracker* tracker, - WGPUDevice wgpuDevice, - WGPUBackendType backend_type) { --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) - auto wgpu_format = viz::ToWGPUFormat(format()); - - if (wgpu_format == WGPUTextureFormat_Undefined) { -@@ -592,7 +592,7 @@ GLuint ExternalVkImageBacking::ProduceGLTextureInterna - gl::GLApi* api = gl::g_current_gl_context; - absl::optional<ScopedDedicatedMemoryObject> memory_object; - if (!use_separate_gl_texture()) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - auto memory_fd = image_->GetMemoryFd(); - if (!memory_fd.is_valid()) - return 0; diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image__factory.cc deleted file mode 100644 index 654e56816426..000000000000 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image__factory.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-04-01 07:48:30 UTC -+++ gpu/command_buffer/service/shared_image_factory.cc -@@ -38,12 +38,12 @@ - #include "gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.h" - #endif - --#if BUILDFLAG(IS_LINUX) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE) && BUILDFLAG(ENABLE_VULKAN) - #include "ui/ozone/public/ozone_platform.h" - #endif - - #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ -- BUILDFLAG(ENABLE_VULKAN) -+ BUILDFLAG(ENABLE_VULKAN) || BUILDFLAG(IS_BSD) - #include "gpu/command_buffer/service/external_vk_image_factory.h" - #elif BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_VULKAN) - #include "gpu/command_buffer/service/external_vk_image_factory.h" -@@ -78,7 +78,7 @@ - - namespace gpu { - --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ - !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) && \ - BUILDFLAG(ENABLE_VULKAN) - -@@ -240,7 +240,7 @@ SharedImageFactory::SharedImageFactory( - factories_.push_back(std::move(external_vk_image_factory)); - } - #elif defined(USE_OZONE) --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ - !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) - // Desktop Linux, not ChromeOS. - if (gr_context_type_ == GrContextType::kVulkan && diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc index b0d6aad983d5..b94484657fad 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-04-01 07:48:30 UTC -+++ gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc -@@ -574,7 +574,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle +--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc +@@ -640,7 +640,7 @@ bool AngleVulkanImageBackingFactory::CanUseAngleVulkan // TODO(penghuang): verify the scanout is the right usage for video playback. // crbug.com/1280798 constexpr auto kSupportedUsages = diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc new file mode 100644 index 000000000000..23b34c5e2a27 --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc @@ -0,0 +1,20 @@ +--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2022-10-05 07:34:01 UTC ++++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc +@@ -31,7 +31,7 @@ + #include "ui/gl/gl_version_info.h" + #include "ui/gl/scoped_binders.h" + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + #include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h" + #endif + +@@ -576,7 +576,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma + MemoryTypeTracker* tracker, + WGPUDevice wgpuDevice, + WGPUBackendType backend_type) { +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && BUILDFLAG(USE_DAWN) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && BUILDFLAG(USE_DAWN) + auto wgpu_format = viz::ToWGPUFormat(format()); + + if (wgpu_format == WGPUTextureFormat_Undefined) { diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc new file mode 100644 index 000000000000..e0b83540b5cc --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc.orig 2022-10-05 07:34:01 UTC ++++ gpu/command_buffer/service/shared_image/gl_texture_image_backing.cc +@@ -254,7 +254,7 @@ void GLTextureImageBacking::InitializeGLTexture( + } + + void GLTextureImageBacking::CreateEGLImage() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) + SharedContextState* shared_context_state = factory()->GetSharedContextState(); + ui::ScopedMakeCurrent smc(shared_context_state->context(), + shared_context_state->surface()); diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc new file mode 100644 index 000000000000..726da5cb9552 --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_gl__texture__image__backing__factory.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ gpu/command_buffer/service/shared_image/gl_texture_image_backing_factory.cc +@@ -152,7 +152,7 @@ bool GLTextureImageBackingFactory::IsSupported( + // Linux and ChromeOS support WebGPU/Compat on GL. All other platforms + // do not support WebGPU on GL. + if (usage & SHARED_IMAGE_USAGE_WEBGPU) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) + if (use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { + return false; + } diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc new file mode 100644 index 000000000000..cacec8b0c5c4 --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__factory.cc @@ -0,0 +1,29 @@ +--- gpu/command_buffer/service/shared_image/shared_image_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ gpu/command_buffer/service/shared_image/shared_image_factory.cc +@@ -52,7 +52,7 @@ + #include "ui/ozone/public/surface_factory_ozone.h" + #endif + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \ ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \ + BUILDFLAG(ENABLE_VULKAN) + #include "gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.h" + #include "gpu/command_buffer/service/shared_image/ozone_image_backing_factory.h" +@@ -88,7 +88,7 @@ namespace gpu { + + namespace { + +-#if defined(USE_OZONE) && BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS) ++#if defined(USE_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) + + bool ShouldUseExternalVulkanImageFactory() { + #if BUILDFLAG(ENABLE_VULKAN) +@@ -398,7 +398,7 @@ SharedImageFactory::SharedImageFactory( + factories_.push_back(std::move(external_vk_image_factory)); + } + #elif defined(USE_OZONE) +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) + // Desktop Linux, not ChromeOS. + if (ShouldUseOzoneImageBackingFactory()) { + auto ozone_factory = diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc new file mode 100644 index 000000000000..12af80d5eccd --- /dev/null +++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing__factory.cc @@ -0,0 +1,11 @@ +--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing_factory.cc +@@ -257,7 +257,7 @@ class WrappedSkImage : public ClearTrackingSharedImage + DCHECK_NE(format(), viz::ResourceFormat::ETC1); + auto mipmap = usage() & SHARED_IMAGE_USAGE_MIPMAP ? GrMipMapped::kYes + : GrMipMapped::kNo; +-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) ++#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) + // Initializing to bright green makes it obvious if the pixels are not + // properly set before they are displayed (e.g. https://crbug.com/956555). + // We don't do this on release builds because there is a slight overhead. diff --git a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc index 019e3a0f2529..68ec9a88fb7d 100644 --- a/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc +++ b/www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc @@ -1,11 +1,11 @@ ---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-04-01 07:48:30 UTC +--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-10-05 07:34:01 UTC +++ gpu/command_buffer/service/webgpu_decoder_impl.cc -@@ -1498,7 +1498,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter( - } +@@ -1071,7 +1071,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl( - if (gr_context_type_ != GrContextType::kVulkan) { + if (gr_context_type_ != GrContextType::kVulkan && + use_webgpu_adapter_ != WebGPUAdapterName::kCompat) { -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - SendAdapterProperties(request_adapter_serial, -1, nullptr, - "WebGPU on Linux requires command-line flag " - "--enable-features=Vulkan,UseSkiaRenderer"); + callback(WGPURequestAdapterStatus_Unavailable, nullptr, + "WebGPU on Linux requires command-line flag " + "--enable-features=Vulkan", diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc index c574011f8b50..eb591a9e73fc 100644 --- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc +++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc -@@ -29,7 +29,7 @@ +@@ -28,7 +28,7 @@ #include "ui/gl/gl_image.h" #include "ui/gl/test/gl_image_test_support.h" @@ -9,7 +9,7 @@ #include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h" #include "ui/gfx/linux/client_native_pixmap_factory_dmabuf.h" #endif -@@ -72,7 +72,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa +@@ -71,7 +71,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa GLManager gl_; }; @@ -18,12 +18,3 @@ class GpuMemoryBufferTestEGL : public testing::Test, public gpu::GpuCommandBufferTestEGL { public: -@@ -364,7 +364,7 @@ TEST_P(GpuMemoryBufferTest, Lifecycle) { - glDeleteTextures(1, &texture_id); - } - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // Test glCreateImageCHROMIUM with gfx::NATIVE_PIXMAP. Basically the test - // reproduces the situation where some dmabuf fds are available outside the - // gpu process and the user wants to import them using glCreateImageCHROMIUM. diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc index 6eb113690d04..b74e1ea77372 100644 --- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc +++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc @@ -1,4 +1,4 @@ ---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2022-04-01 07:48:30 UTC +--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2022-10-05 07:34:01 UTC +++ gpu/command_buffer/tests/gl_test_utils.cc @@ -24,7 +24,7 @@ #include "ui/gl/gl_version_info.h" @@ -9,7 +9,7 @@ #include "ui/gl/gl_image_native_pixmap.h" #endif -@@ -453,7 +453,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { +@@ -458,7 +458,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() { window_system_binding_info_ = gl::GLWindowSystemBindingInfo(); } diff --git a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h index 7b581f639f84..8097d392963f 100644 --- a/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h +++ b/www/iridium/files/patch-gpu_command__buffer_tests_gl__test__utils.h @@ -1,6 +1,6 @@ ---- gpu/command_buffer/tests/gl_test_utils.h.orig 2022-04-01 07:48:30 UTC +--- gpu/command_buffer/tests/gl_test_utils.h.orig 2022-10-05 07:34:01 UTC +++ gpu/command_buffer/tests/gl_test_utils.h -@@ -120,7 +120,7 @@ class GpuCommandBufferTestEGL { +@@ -122,7 +122,7 @@ class GpuCommandBufferTestEGL { return gfx::HasExtension(gl_extensions_, extension); } diff --git a/www/iridium/files/patch-gpu_config_gpu__control__list.cc b/www/iridium/files/patch-gpu_config_gpu__control__list.cc index 8acc73310c4a..38ff3c3f9ccf 100644 --- a/www/iridium/files/patch-gpu_config_gpu__control__list.cc +++ b/www/iridium/files/patch-gpu_config_gpu__control__list.cc @@ -1,6 +1,6 @@ ---- gpu/config/gpu_control_list.cc.orig 2022-03-28 18:11:04 UTC +--- gpu/config/gpu_control_list.cc.orig 2022-10-05 07:34:01 UTC +++ gpu/config/gpu_control_list.cc -@@ -276,7 +276,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( +@@ -302,7 +302,7 @@ bool GpuControlList::More::GLVersionInfoMismatch( GpuControlList::GLType GpuControlList::More::GetDefaultGLType() { #if BUILDFLAG(IS_CHROMEOS) return kGLTypeGL; @@ -9,7 +9,7 @@ return kGLTypeGL; #elif BUILDFLAG(IS_MAC) return kGLTypeGL; -@@ -781,7 +781,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { +@@ -844,7 +844,7 @@ GpuControlList::OsType GpuControlList::GetOsType() { return kOsAndroid; #elif BUILDFLAG(IS_FUCHSIA) return kOsFuchsia; diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h index bbe898dde74d..2aa2694a5f9b 100644 --- a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h +++ b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h @@ -1,6 +1,6 @@ ---- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2022-03-28 18:11:04 UTC +--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2022-10-05 07:34:01 UTC +++ gpu/ipc/common/gpu_memory_buffer_support.h -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ #include "ui/gfx/geometry/size.h" #include "ui/gfx/gpu_memory_buffer.h" diff --git a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc index 989ebf0497df..eb05a01c12c3 100644 --- a/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc +++ b/www/iridium/files/patch-gpu_ipc_service_gpu__init.cc @@ -1,6 +1,6 @@ ---- gpu/ipc/service/gpu_init.cc.orig 2022-04-01 07:48:30 UTC +--- gpu/ipc/service/gpu_init.cc.orig 2022-10-05 07:34:01 UTC +++ gpu/ipc/service/gpu_init.cc -@@ -278,7 +278,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -350,7 +350,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL enable_watchdog = false; #endif @@ -9,7 +9,7 @@ bool gpu_sandbox_start_early = gpu_preferences_.gpu_sandbox_start_early; #else // !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) // For some reasons MacOSX's VideoToolbox might crash when called after -@@ -328,7 +328,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -400,7 +400,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } bool attempted_startsandbox = false; @@ -18,7 +18,7 @@ // On Chrome OS ARM Mali, GPU driver userspace creates threads when // initializing a GL context, so start the sandbox early. // TODO(zmo): Need to collect OS version before this. -@@ -377,7 +377,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -449,7 +449,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL if (gl_initialized && gl_use_swiftshader_ && !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) { @@ -27,7 +27,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -410,7 +410,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -485,7 +485,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL } } @@ -36,7 +36,7 @@ // The ContentSandboxHelper is currently the only one implementation of // GpuSandboxHelper and it has no dependency. Except on Linux where // VaapiWrapper checks the GL implementation to determine which display -@@ -469,7 +469,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -545,7 +545,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL command_line, gpu_feature_info_, gpu_preferences_.disable_software_rasterizer, false); if (gl_use_swiftshader_) { @@ -45,7 +45,7 @@ VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly " << "on Linux"; return false; -@@ -591,7 +591,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL +@@ -673,7 +673,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); @@ -54,7 +54,7 @@ // Driver may create a compatibility profile context when collect graphics // information on Linux platform. Try to collect graphics information // based on core profile context after disabling platform extensions. -@@ -822,7 +822,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c +@@ -909,7 +909,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_); diff --git a/www/iridium/files/patch-gpu_vulkan_generate__bindings.py b/www/iridium/files/patch-gpu_vulkan_generate__bindings.py index 9b69e8345255..b461d5ab3641 100644 --- a/www/iridium/files/patch-gpu_vulkan_generate__bindings.py +++ b/www/iridium/files/patch-gpu_vulkan_generate__bindings.py @@ -1,24 +1,6 @@ ---- gpu/vulkan/generate_bindings.py.orig 2022-03-28 18:11:04 UTC +--- gpu/vulkan/generate_bindings.py.orig 2022-10-05 07:34:01 UTC +++ gpu/vulkan/generate_bindings.py -@@ -185,7 +185,7 @@ VULKAN_DEVICE_FUNCTIONS = [ - }, - { - 'ifdef': -- 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)', -+ 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)', - 'extension': 'VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME', - 'functions': [ - 'vkGetSemaphoreFdKHR', -@@ -202,7 +202,7 @@ VULKAN_DEVICE_FUNCTIONS = [ - }, - { - 'ifdef': -- 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)', -+ 'BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)', - 'extension': 'VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME', - 'functions': [ - 'vkGetMemoryFdKHR', -@@ -253,7 +253,7 @@ VULKAN_DEVICE_FUNCTIONS = [ +@@ -259,7 +259,7 @@ VULKAN_DEVICE_FUNCTIONS = [ ] }, { diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc index eb5a6605555c..35bcd0e5eb5b 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.cc.orig 2022-04-01 07:48:30 UTC +--- gpu/vulkan/vulkan_device_queue.cc.orig 2022-10-05 07:34:01 UTC +++ gpu/vulkan/vulkan_device_queue.cc -@@ -85,7 +85,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -88,7 +88,7 @@ bool VulkanDeviceQueue::Initialize( // In dual-CPU cases, we cannot detect the active GPU correctly on Linux, // so don't select GPU device based on the |gpu_info|. @@ -9,7 +9,7 @@ // If gpu_info is provided, the device should match it. if (gpu_info && (device_properties.vendorID != gpu_info->gpu.vendor_id || device_properties.deviceID != gpu_info->gpu.device_id)) { -@@ -229,7 +229,7 @@ bool VulkanDeviceQueue::Initialize( +@@ -232,7 +232,7 @@ bool VulkanDeviceQueue::Initialize( enabled_device_features_2_ = {VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_FEATURES_2}; // Android, Fuchsia, and Linux(VaapiVideoDecoder) need YCbCr sampler support. diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h index 0730be967187..c8a55d604cd4 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h @@ -1,6 +1,6 @@ ---- gpu/vulkan/vulkan_device_queue.h.orig 2022-03-28 18:11:04 UTC +--- gpu/vulkan/vulkan_device_queue.h.orig 2022-10-05 07:34:01 UTC +++ gpu/vulkan/vulkan_device_queue.h -@@ -155,7 +155,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { +@@ -158,7 +158,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue { bool allow_protected_memory_ = false; diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc index 55e17444dcd4..6c1142483cad 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc @@ -1,24 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-04-01 07:48:30 UTC +--- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-10-05 07:34:01 UTC +++ gpu/vulkan/vulkan_function_pointers.cc -@@ -926,7 +926,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer - } - #endif // BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - if (gfx::HasExtension(enabled_extensions, - VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME)) { - vkGetSemaphoreFdKHR = reinterpret_cast<PFN_vkGetSemaphoreFdKHR>( -@@ -971,7 +971,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer - } - #endif // BUILDFLAG(IS_WIN) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - if (gfx::HasExtension(enabled_extensions, - VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME)) { - vkGetMemoryFdKHR = reinterpret_cast<PFN_vkGetMemoryFdKHR>( -@@ -1141,7 +1141,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer +@@ -1151,7 +1151,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer } } diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h index 35827dfdb6dc..f9574e12adc7 100644 --- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h @@ -1,24 +1,6 @@ ---- gpu/vulkan/vulkan_function_pointers.h.orig 2022-04-01 07:48:30 UTC +--- gpu/vulkan/vulkan_function_pointers.h.orig 2022-10-05 07:34:01 UTC +++ gpu/vulkan/vulkan_function_pointers.h -@@ -250,7 +250,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers - vkGetAndroidHardwareBufferPropertiesANDROID; - #endif // BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - VulkanFunction<PFN_vkGetSemaphoreFdKHR> vkGetSemaphoreFdKHR; - VulkanFunction<PFN_vkImportSemaphoreFdKHR> vkImportSemaphoreFdKHR; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || -@@ -262,7 +262,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers - vkImportSemaphoreWin32HandleKHR; - #endif // BUILDFLAG(IS_WIN) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - VulkanFunction<PFN_vkGetMemoryFdKHR> vkGetMemoryFdKHR; - VulkanFunction<PFN_vkGetMemoryFdPropertiesKHR> vkGetMemoryFdPropertiesKHR; - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || -@@ -303,7 +303,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers +@@ -305,7 +305,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR; VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR; @@ -27,25 +9,7 @@ VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT> vkGetImageDrmFormatModifierPropertiesEXT; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -1033,7 +1033,7 @@ ALWAYS_INLINE VkResult vkGetAndroidHardwareBufferPrope - } - #endif // BUILDFLAG(IS_ANDROID) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - ALWAYS_INLINE VkResult - vkGetSemaphoreFdKHR(VkDevice device, - const VkSemaphoreGetFdInfoKHR* pGetFdInfo, -@@ -1067,7 +1067,7 @@ vkImportSemaphoreWin32HandleKHR(VkDevice device, - } - #endif // BUILDFLAG(IS_WIN) - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) - ALWAYS_INLINE VkResult vkGetMemoryFdKHR(VkDevice device, - const VkMemoryGetFdInfoKHR* pGetFdInfo, - int* pFd) { -@@ -1203,7 +1203,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue +@@ -1212,7 +1212,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue pPresentInfo); } @@ -54,7 +18,7 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT( VkDevice device, VkImage image, -@@ -1213,4 +1213,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp +@@ -1222,4 +1222,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp } #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc b/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc new file mode 100644 index 000000000000..d640e1274d4b --- /dev/null +++ b/www/iridium/files/patch-gpu_vulkan_vulkan__util.cc @@ -0,0 +1,11 @@ +--- gpu/vulkan/vulkan_util.cc.orig 2022-10-05 07:34:01 UTC ++++ gpu/vulkan/vulkan_util.cc +@@ -199,7 +199,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan + } + } + +-#if BUILDFLAG(IS_LINUX) && !defined(OZONE_PLATFORM_IS_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !defined(OZONE_PLATFORM_IS_X11) + // Vulkan is only supported with X11 on Linux for now. + return false; + #else diff --git a/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts.h index c12b8dfe34a2..84f6b73d827d 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts.h +++ b/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts.h @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_browser_main_parts.h.orig 2022-03-28 18:11:04 UTC +--- headless/lib/browser/headless_browser_main_parts.h.orig 2022-10-05 07:34:01 UTC +++ headless/lib/browser/headless_browser_main_parts.h -@@ -50,7 +50,7 @@ class HEADLESS_EXPORT HeadlessBrowserMainParts +@@ -48,7 +48,7 @@ class HEADLESS_EXPORT HeadlessBrowserMainParts #if BUILDFLAG(IS_MAC) void PreCreateMainMessageLoop() override; #endif diff --git a/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc b/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc index 3393e3a54c8d..634b75c25cb3 100644 --- a/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc +++ b/www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-04-01 07:48:30 UTC +--- headless/lib/browser/headless_web_contents_impl.cc.orig 2022-10-05 07:34:01 UTC +++ headless/lib/browser/headless_web_contents_impl.cc -@@ -56,7 +56,7 @@ namespace headless { +@@ -59,7 +59,7 @@ namespace headless { namespace { void UpdatePrefsFromSystemSettings(blink::RendererPreferences* prefs) { diff --git a/www/iridium/files/patch-headless_lib_browser_policy_headless__browser__policy__connector.cc b/www/iridium/files/patch-headless_lib_browser_policy_headless__browser__policy__connector.cc index c5fc41c914f1..7767b84c25bb 100644 --- a/www/iridium/files/patch-headless_lib_browser_policy_headless__browser__policy__connector.cc +++ b/www/iridium/files/patch-headless_lib_browser_policy_headless__browser__policy__connector.cc @@ -1,6 +1,6 @@ ---- headless/lib/browser/policy/headless_browser_policy_connector.cc.orig 2022-04-03 12:23:22 UTC +--- headless/lib/browser/policy/headless_browser_policy_connector.cc.orig 2022-10-05 07:34:01 UTC +++ headless/lib/browser/policy/headless_browser_policy_connector.cc -@@ -148,8 +148,10 @@ HeadlessBrowserPolicyConnector::CreatePlatformProvider +@@ -150,8 +150,10 @@ HeadlessBrowserPolicyConnector::CreatePlatformProvider // chrome/common/chrome_paths.cc #if BUILDFLAG(GOOGLE_CHROME_BRANDING) base::FilePath config_dir_path(FILE_PATH_LITERAL("/etc/opt/chrome/policies")); diff --git a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc index 0963910c4314..b8c168df0fdc 100644 --- a/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc +++ b/www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc @@ -1,6 +1,6 @@ ---- headless/lib/headless_content_main_delegate.cc.orig 2022-04-01 07:48:30 UTC +--- headless/lib/headless_content_main_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ headless/lib/headless_content_main_delegate.cc -@@ -336,7 +336,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( +@@ -337,7 +337,7 @@ void HeadlessContentMainDelegate::InitCrashReporter( if (process_type != switches::kZygoteProcess) { g_headless_crash_client.Pointer()->set_crash_dumps_dir( options()->crash_dumps_dir); diff --git a/www/iridium/files/patch-headless_public_headless__browser.cc b/www/iridium/files/patch-headless_public_headless__browser.cc deleted file mode 100644 index 4f7214b27831..000000000000 --- a/www/iridium/files/patch-headless_public_headless__browser.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- headless/public/headless_browser.cc.orig 2022-04-01 07:48:30 UTC -+++ headless/public/headless_browser.cc -@@ -42,7 +42,7 @@ Options::Options(int argc, const char** argv) - user_agent(content::BuildUserAgentFromProduct(product_name_and_version)), - window_size(kDefaultWindowSize), - font_render_hinting(kDefaultFontRenderHinting) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) - gl_implementation = gl::kGLImplementationANGLEName; - angle_implementation = gl::kANGLEImplementationSwiftShaderForWebGLName; - #endif diff --git a/www/iridium/files/patch-ipc_ipc__channel.h b/www/iridium/files/patch-ipc_ipc__channel.h index 6f296864981f..f1ae067a56dc 100644 --- a/www/iridium/files/patch-ipc_ipc__channel.h +++ b/www/iridium/files/patch-ipc_ipc__channel.h @@ -1,6 +1,6 @@ ---- ipc/ipc_channel.h.orig 2022-03-28 18:11:04 UTC +--- ipc/ipc_channel.h.orig 2022-10-05 07:34:01 UTC +++ ipc/ipc_channel.h -@@ -235,7 +235,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { +@@ -234,7 +234,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender { static std::string GenerateUniqueRandomChannelID(); #endif diff --git a/www/iridium/files/patch-ipc_ipc__channel__common.cc b/www/iridium/files/patch-ipc_ipc__channel__common.cc index bed7c6e79a6c..cb5863b98198 100644 --- a/www/iridium/files/patch-ipc_ipc__channel__common.cc +++ b/www/iridium/files/patch-ipc_ipc__channel__common.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_channel_common.cc.orig 2022-03-28 18:11:04 UTC +--- ipc/ipc_channel_common.cc.orig 2022-10-05 07:34:01 UTC +++ ipc/ipc_channel_common.cc -@@ -10,7 +10,7 @@ +@@ -11,7 +11,7 @@ namespace IPC { diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.cc b/www/iridium/files/patch-ipc_ipc__message__utils.cc index f956cbc8385e..6bf264f19ffe 100644 --- a/www/iridium/files/patch-ipc_ipc__message__utils.cc +++ b/www/iridium/files/patch-ipc_ipc__message__utils.cc @@ -1,6 +1,6 @@ ---- ipc/ipc_message_utils.cc.orig 2022-04-01 07:48:30 UTC +--- ipc/ipc_message_utils.cc.orig 2022-10-05 07:34:01 UTC +++ ipc/ipc_message_utils.cc -@@ -350,7 +350,7 @@ void ParamTraits<unsigned int>::Log(const param_type& +@@ -359,7 +359,7 @@ void ParamTraits<unsigned int>::Log(const param_type& } #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ diff --git a/www/iridium/files/patch-media_BUILD.gn b/www/iridium/files/patch-media_BUILD.gn index 4260fea78c49..f6b7d8f5686e 100644 --- a/www/iridium/files/patch-media_BUILD.gn +++ b/www/iridium/files/patch-media_BUILD.gn @@ -1,6 +1,6 @@ ---- media/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- media/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ media/BUILD.gn -@@ -76,6 +76,9 @@ config("media_config") { +@@ -84,6 +84,9 @@ config("media_config") { defines += [ "DLOPEN_PULSEAUDIO" ] } } diff --git a/www/iridium/files/patch-media_audio_BUILD.gn b/www/iridium/files/patch-media_audio_BUILD.gn index ce75574ee328..3aa4bb813f4c 100644 --- a/www/iridium/files/patch-media_audio_BUILD.gn +++ b/www/iridium/files/patch-media_audio_BUILD.gn @@ -1,6 +1,6 @@ ---- media/audio/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- media/audio/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ media/audio/BUILD.gn -@@ -245,9 +245,20 @@ source_set("audio") { +@@ -248,9 +248,20 @@ source_set("audio") { ] } diff --git a/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc b/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc index 178b34071bbc..df3e5d912865 100644 --- a/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc +++ b/www/iridium/files/patch-media_audio_alsa_audio__manager__alsa.cc @@ -1,6 +1,6 @@ ---- media/audio/alsa/audio_manager_alsa.cc.orig 2022-04-01 07:48:30 UTC +--- media/audio/alsa/audio_manager_alsa.cc.orig 2022-10-05 07:34:01 UTC +++ media/audio/alsa/audio_manager_alsa.cc -@@ -89,7 +89,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -88,7 +88,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType int card = -1; // Loop through the sound cards to get ALSA device hints. @@ -10,7 +10,7 @@ void** hints = NULL; int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { -@@ -101,7 +103,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType +@@ -100,7 +102,9 @@ void AudioManagerAlsa::GetAlsaAudioDevices(StreamType DLOG(WARNING) << "GetAlsaAudioDevices: unable to get device hints: " << wrapper_->StrError(error); } @@ -20,7 +20,7 @@ } void AudioManagerAlsa::GetAlsaDevicesInfo(AudioManagerAlsa::StreamType type, -@@ -184,7 +188,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( +@@ -183,7 +187,11 @@ bool AudioManagerAlsa::IsAlsaDeviceAvailable( // goes through software conversion if needed (e.g. incompatible // sample rate). // TODO(joi): Should we prefer "hw" instead? @@ -30,9 +30,9 @@ static const char kDeviceTypeDesired[] = "plughw"; +#endif return strncmp(kDeviceTypeDesired, device_name, - base::size(kDeviceTypeDesired) - 1) == 0; + std::size(kDeviceTypeDesired) - 1) == 0; } -@@ -206,7 +214,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -205,7 +213,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( // Loop through the sound cards. // Don't use snd_device_name_hint(-1,..) since there is an access violation // inside this ALSA API with libasound.so.2.0.0. @@ -42,7 +42,7 @@ int error = wrapper_->DeviceNameHint(card, kPcmInterfaceName, &hints); if (!error) { for (void** hint_iter = hints; *hint_iter != NULL; hint_iter++) { -@@ -230,7 +240,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( +@@ -229,7 +239,9 @@ bool AudioManagerAlsa::HasAnyAlsaAudioDevice( DLOG(WARNING) << "HasAnyAudioDevice: unable to get device hints: " << wrapper_->StrError(error); } diff --git a/www/iridium/files/patch-media_audio_audio__features.cc b/www/iridium/files/patch-media_audio_audio__features.cc index 2dbb9868e410..2e39352ed327 100644 --- a/www/iridium/files/patch-media_audio_audio__features.cc +++ b/www/iridium/files/patch-media_audio_audio__features.cc @@ -1,6 +1,6 @@ ---- media/audio/audio_features.cc.orig 2022-03-28 18:11:04 UTC +--- media/audio/audio_features.cc.orig 2022-10-05 07:34:01 UTC +++ media/audio/audio_features.cc -@@ -19,7 +19,7 @@ const base::Feature kPlatformAudioEncoder{"PlatformAud +@@ -14,7 +14,7 @@ namespace features { const base::Feature kAudioServiceOutOfProcessKillAtHang{ "AudioServiceOutOfProcessKillAtHang", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ diff --git a/www/iridium/files/patch-media_base_audio__latency.cc b/www/iridium/files/patch-media_base_audio__latency.cc index 7db6d01a318d..50ab41332f7b 100644 --- a/www/iridium/files/patch-media_base_audio__latency.cc +++ b/www/iridium/files/patch-media_base_audio__latency.cc @@ -1,6 +1,6 @@ ---- media/base/audio_latency.cc.orig 2022-03-28 18:11:04 UTC +--- media/base/audio_latency.cc.orig 2022-10-05 07:34:01 UTC +++ media/base/audio_latency.cc -@@ -135,7 +135,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in +@@ -137,7 +137,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in } #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc index 500f060597a5..47d457e6874f 100644 --- a/www/iridium/files/patch-media_base_media__switches.cc +++ b/www/iridium/files/patch-media_base_media__switches.cc @@ -1,24 +1,24 @@ ---- media/base/media_switches.cc.orig 2022-04-01 07:48:30 UTC +--- media/base/media_switches.cc.orig 2022-10-05 07:34:01 UTC +++ media/base/media_switches.cc -@@ -9,7 +9,7 @@ - #include "build/chromeos_buildflags.h" +@@ -10,7 +10,7 @@ #include "components/system_media_controls/linux/buildflags/buildflags.h" + #include "media/media_buildflags.h" -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "base/cpu.h" #endif -@@ -402,7 +402,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode +@@ -452,7 +452,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode + // Show toolbar button that opens dialog for controlling media sessions. const base::Feature kGlobalMediaControls { "GlobalMediaControls", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -434,7 +434,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP +@@ -490,7 +490,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP const base::Feature kGlobalMediaControlsPictureInPicture { "GlobalMediaControlsPictureInPicture", #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ @@ -27,7 +27,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -475,7 +475,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", +@@ -527,7 +527,7 @@ const base::Feature kUseR16Texture{"use-r16-texture", const base::Feature kUnifiedAutoplay{"UnifiedAutoplay", base::FEATURE_ENABLED_BY_DEFAULT}; @@ -36,12 +36,12 @@ // Enable vaapi video decoding on linux. This is already enabled by default on // chromeos, but needs an experiment on linux. const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder", -@@ -946,7 +946,7 @@ bool IsLiveCaptionFeatureEnabled() { - return false; - #endif +@@ -942,7 +942,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod + "DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT}; + #endif // BUILDFLAG(IS_CHROMEOS) --#if BUILDFLAG(IS_LINUX) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - // Check if the CPU has the required instruction set to run the Speech - // On-Device API (SODA) library. - static bool has_sse41 = base::CPU().has_sse41(); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Spawn utility processes to perform hardware decode acceleration instead of + // using the GPU process. + const base::Feature MEDIA_EXPORT kUseOutOfProcessVideoDecoding{ diff --git a/www/iridium/files/patch-media_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h index e3758483f668..cb3a9acdb8eb 100644 --- a/www/iridium/files/patch-media_base_media__switches.h +++ b/www/iridium/files/patch-media_base_media__switches.h @@ -1,6 +1,6 @@ ---- media/base/media_switches.h.orig 2022-03-28 18:11:04 UTC +--- media/base/media_switches.h.orig 2022-10-05 07:34:01 UTC +++ media/base/media_switches.h -@@ -186,7 +186,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr +@@ -203,7 +203,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream; MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore; MEDIA_EXPORT extern const base::Feature kUseR16Texture; @@ -8,4 +8,13 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux; MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux; - #endif // BUILDFLAG(IS_LINUX) + MEDIA_EXPORT extern const base::Feature kVaapiIgnoreDriverChecks; +@@ -310,7 +310,7 @@ MEDIA_EXPORT extern const base::FeatureParam< + MEDIA_EXPORT extern const base::Feature kDeprecateLowUsageCodecs; + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + MEDIA_EXPORT extern const base::Feature kUseOutOfProcessVideoDecoding; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + diff --git a/www/iridium/files/patch-media_base_supported__types.cc b/www/iridium/files/patch-media_base_supported__types.cc new file mode 100644 index 000000000000..15d38598a127 --- /dev/null +++ b/www/iridium/files/patch-media_base_supported__types.cc @@ -0,0 +1,11 @@ +--- media/base/supported_types.cc.orig 2022-10-05 07:34:01 UTC ++++ media/base/supported_types.cc +@@ -205,7 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) { + return false; + + #if BUILDFLAG(ENABLE_PLATFORM_HEVC) +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #if BUILDFLAG(IS_CHROMEOS_LACROS) + // TODO(b/171813538): For Lacros, the supplemental profile cache will be + // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the diff --git a/www/iridium/files/patch-media_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc index fc0729f79bc0..bb5b7988765e 100644 --- a/www/iridium/files/patch-media_base_video__frame.cc +++ b/www/iridium/files/patch-media_base_video__frame.cc @@ -1,6 +1,6 @@ ---- media/base/video_frame.cc.orig 2022-03-28 18:11:04 UTC +--- media/base/video_frame.cc.orig 2022-10-05 07:34:01 UTC +++ media/base/video_frame.cc -@@ -73,7 +73,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -72,7 +72,7 @@ std::string VideoFrame::StorageTypeToString( return "OWNED_MEMORY"; case VideoFrame::STORAGE_SHMEM: return "SHMEM"; @@ -9,7 +9,7 @@ case VideoFrame::STORAGE_DMABUFS: return "DMABUFS"; #endif -@@ -90,7 +90,7 @@ std::string VideoFrame::StorageTypeToString( +@@ -89,7 +89,7 @@ std::string VideoFrame::StorageTypeToString( // static bool VideoFrame::IsStorageTypeMappable(VideoFrame::StorageType storage_type) { return @@ -18,7 +18,7 @@ // This is not strictly needed but makes explicit that, at VideoFrame // level, DmaBufs are not mappable from userspace. storage_type != VideoFrame::STORAGE_DMABUFS && -@@ -278,7 +278,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo +@@ -285,7 +285,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo return VideoFrameLayout::CreateWithPlanes(format, coded_size, planes); } @@ -27,7 +27,7 @@ // This class allows us to embed a vector<ScopedFD> into a scoped_refptr, and // thus to have several VideoFrames share the same set of DMABUF FDs. class VideoFrame::DmabufHolder -@@ -617,7 +617,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -624,7 +624,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM for (size_t i = 0; i < num_planes; ++i) planes[i].stride = gpu_memory_buffer->stride(i); uint64_t modifier = gfx::NativePixmapHandle::kNoModifier; @@ -36,7 +36,7 @@ if (gpu_memory_buffer->GetType() == gfx::NATIVE_PIXMAP) { const auto gmb_handle = gpu_memory_buffer->CloneHandle(); if (gmb_handle.is_null() || -@@ -663,7 +663,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM +@@ -670,7 +670,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM return frame; } @@ -45,7 +45,7 @@ // static scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs( const VideoFrameLayout& layout, -@@ -887,7 +887,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( +@@ -894,7 +894,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( } } @@ -54,7 +54,7 @@ DCHECK(frame->dmabuf_fds_); // If there are any |dmabuf_fds_| plugged in, we should refer them too. wrapping_frame->dmabuf_fds_ = frame->dmabuf_fds_; -@@ -1253,7 +1253,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( +@@ -1265,7 +1265,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder( : mailbox_holders_[texture_index]; } @@ -63,7 +63,7 @@ const std::vector<base::ScopedFD>& VideoFrame::DmabufFds() const { DCHECK_EQ(storage_type_, STORAGE_DMABUFS); -@@ -1365,7 +1365,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, +@@ -1377,7 +1377,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout, storage_type_(storage_type), visible_rect_(Intersection(visible_rect, gfx::Rect(layout.coded_size()))), natural_size_(natural_size), diff --git a/www/iridium/files/patch-media_base_video__frame.h b/www/iridium/files/patch-media_base_video__frame.h index 53e19a6a4e09..859afac63ea3 100644 --- a/www/iridium/files/patch-media_base_video__frame.h +++ b/www/iridium/files/patch-media_base_video__frame.h @@ -1,6 +1,6 @@ ---- media/base/video_frame.h.orig 2022-03-28 18:11:04 UTC +--- media/base/video_frame.h.orig 2022-10-05 07:34:01 UTC +++ media/base/video_frame.h -@@ -40,7 +40,7 @@ +@@ -41,7 +41,7 @@ #include "base/mac/scoped_cftyperef.h" #endif // BUILDFLAG(IS_MAC) @@ -36,7 +36,7 @@ // Returns a vector containing the backing DmaBufs for this frame. The number // of returned DmaBufs will be equal or less than the number of planes of // the frame. If there are less, this means that the last FD contains the -@@ -746,7 +746,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte +@@ -743,7 +743,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte // GPU memory buffer, if this frame is STORAGE_GPU_MEMORY_BUFFER. std::unique_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer_; diff --git a/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc index 58591eadfb1c..f2e17f5e8d4e 100644 --- a/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc +++ b/www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc @@ -1,6 +1,6 @@ ---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-03-28 18:11:04 UTC +--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-10-05 07:34:01 UTC +++ media/capture/video/linux/fake_v4l2_impl.cc -@@ -424,7 +424,7 @@ int FakeV4L2Impl::close(int fd) { +@@ -427,7 +427,7 @@ int FakeV4L2Impl::close(int fd) { return kSuccessReturnValue; } diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc index 6baf545fa210..eb3c161f1ba0 100644 --- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc +++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc @@ -1,4 +1,4 @@ ---- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2022-03-28 18:11:04 UTC +--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ media/capture/video/linux/v4l2_capture_delegate.cc @@ -4,8 +4,10 @@ @@ -11,7 +11,7 @@ #include <poll.h> #include <sys/fcntl.h> #include <sys/ioctl.h> -@@ -25,10 +27,10 @@ +@@ -27,10 +29,10 @@ using media::mojom::MeteringMode; @@ -24,7 +24,7 @@ // TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the // format is introduced to kernel. -@@ -660,7 +662,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate +@@ -666,7 +668,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate V4L2CaptureDelegate::~V4L2CaptureDelegate() = default; @@ -33,7 +33,7 @@ int num_retries = 0; for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries; ++num_retries) { -@@ -670,7 +672,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* +@@ -676,7 +678,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void* return num_retries != kMaxIOCtrlRetries; } diff --git a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h index dce23fe63d7e..95540f7ac9c2 100644 --- a/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h +++ b/www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h @@ -1,6 +1,6 @@ ---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2022-03-28 18:11:04 UTC +--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2022-10-05 07:34:01 UTC +++ media/capture/video/linux/v4l2_capture_delegate.h -@@ -84,10 +84,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { +@@ -86,10 +86,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final { // device file descriptor or (re)starting streaming, can fail but works after // retrying (https://crbug.com/670262). Returns false if the |request| ioctl // fails too many times. diff --git a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc index 076c20719371..4668a23e1907 100644 --- a/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc +++ b/www/iridium/files/patch-media_capture_video_video__capture__device__client.cc @@ -1,6 +1,6 @@ ---- media/capture/video/video_capture_device_client.cc.orig 2022-03-28 18:11:04 UTC +--- media/capture/video/video_capture_device_client.cc.orig 2022-10-05 07:34:01 UTC +++ media/capture/video/video_capture_device_client.cc -@@ -320,7 +320,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( +@@ -317,7 +317,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData( // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html. // Windows RGB24 defines blue at lowest byte, // see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253 diff --git a/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc b/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc index 665fdba80226..fd05db23b70b 100644 --- a/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc +++ b/www/iridium/files/patch-media_cdm_cdm__paths__unittest.cc @@ -1,4 +1,4 @@ ---- media/cdm/cdm_paths_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- media/cdm/cdm_paths_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ media/cdm/cdm_paths_unittest.cc @@ -27,7 +27,7 @@ const char kComponentPlatform[] = "win"; @@ -8,4 +8,4 @@ +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) "linux"; #else - "unsupported_platform"; + #error unsupported platform diff --git a/www/iridium/files/patch-media_gpu_buffer__validation.cc b/www/iridium/files/patch-media_gpu_buffer__validation.cc index 49ddb16aa10b..6fb16d0add9d 100644 --- a/www/iridium/files/patch-media_gpu_buffer__validation.cc +++ b/www/iridium/files/patch-media_gpu_buffer__validation.cc @@ -1,4 +1,4 @@ ---- media/gpu/buffer_validation.cc.orig 2022-03-28 18:11:04 UTC +--- media/gpu/buffer_validation.cc.orig 2022-10-05 07:34:01 UTC +++ media/gpu/buffer_validation.cc @@ -15,7 +15,7 @@ #include "ui/gfx/geometry/size.h" @@ -16,10 +16,10 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) if (fd < 0) { - VLOGF(1) << "Invalid file descriptor"; + VLOG(1) << "Invalid file descriptor"; return false; -@@ -66,7 +66,7 @@ bool VerifyGpuMemoryBufferHandle( - << coded_size.ToString(); +@@ -73,7 +73,7 @@ bool VerifyGpuMemoryBufferHandle( + VLOG(1) << "Unsupported: " << pixel_format; return false; } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc index 64db2cb8c50a..367a875c17af 100644 --- a/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc +++ b/www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc @@ -1,6 +1,6 @@ ---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-04-01 07:48:30 UTC +--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-10-05 07:34:01 UTC +++ media/gpu/chromeos/video_decoder_pipeline.cc -@@ -646,7 +646,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -747,7 +747,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( } } @@ -9,12 +9,12 @@ // Linux should always use a custom allocator (to allocate buffers using // libva) and a PlatformVideoFramePool. CHECK(allocator.has_value()); -@@ -668,7 +668,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( +@@ -769,7 +769,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat( #error "Unsupported platform" #endif --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // viable_candidate should always be set unless using L1 protected content, - // which isn't an option on linux or lacros. + // which isn't an option on linux. CHECK(viable_candidate); diff --git a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc index e688708cbd95..937a549e4ad3 100644 --- a/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc +++ b/www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc @@ -1,6 +1,6 @@ ---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-03-28 18:11:04 UTC +--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-10-05 07:34:01 UTC +++ media/gpu/gpu_video_encode_accelerator_factory.cc -@@ -92,7 +92,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions +@@ -111,7 +111,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions return vea_factory_functions; #if BUILDFLAG(USE_VAAPI) diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc new file mode 100644 index 000000000000..3cd29d56773d --- /dev/null +++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc @@ -0,0 +1,26 @@ +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2022-10-05 07:34:01 UTC ++++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc +@@ -14,12 +14,15 @@ + #include "media/gpu/vaapi/vaapi_wrapper.h" + #endif + ++#if !BUILDFLAG(IS_BSD) + using sandbox::syscall_broker::BrokerFilePermission; ++#endif + + namespace media { + + bool HardwareVideoDecodingPreSandboxHook( + sandbox::policy::SandboxLinux::Options options) { ++#if !BUILDFLAG(IS_BSD) + sandbox::syscall_broker::BrokerCommandSet command_set; + std::vector<BrokerFilePermission> permissions; + +@@ -121,6 +124,7 @@ bool HardwareVideoDecodingPreSandboxHook( + dlopen("/usr/lib/libv4l2.so", RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE); + #endif // defined(__aarch64__) + #endif // BUILDFLAG(USE_VAAPI) ++#endif + + return true; + } diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h new file mode 100644 index 000000000000..1ad46033c602 --- /dev/null +++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h @@ -0,0 +1,16 @@ +--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h.orig 2022-10-05 07:34:01 UTC ++++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h +@@ -5,7 +5,13 @@ + #ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_DECODING_SANDBOX_HOOK_LINUX_H_ + #define MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_DECODING_SANDBOX_HOOK_LINUX_H_ + ++#include "build/build_config.h" ++ ++#if BUILDFLAG(IS_BSD) ++#include "sandbox/policy/openbsd/sandbox_openbsd.h" ++#else + #include "sandbox/policy/linux/sandbox_linux.h" ++#endif + + namespace media { + diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc index 254b43db4bfe..8c350ff6beb2 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-03-28 18:11:04 UTC +--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-10-05 07:34:01 UTC +++ media/gpu/vaapi/vaapi_video_decoder.cc -@@ -772,7 +772,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree +@@ -767,7 +767,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree const gfx::Size decoder_natural_size = aspect_ratio_.GetNaturalSize(decoder_visible_rect); diff --git a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc index f04f87297671..37cc6135e1fd 100644 --- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc +++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc @@ -1,6 +1,6 @@ ---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-04-01 07:48:30 UTC +--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-10-05 07:34:01 UTC +++ media/gpu/vaapi/vaapi_wrapper.cc -@@ -587,7 +587,7 @@ VADisplayState::VADisplayState() +@@ -742,7 +742,7 @@ VADisplayState::VADisplayState() bool VADisplayState::Initialize() { base::AutoLock auto_lock(va_lock_); diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni index 0baf078e13bf..e58e626e6841 100644 --- a/www/iridium/files/patch-media_media__options.gni +++ b/www/iridium/files/patch-media_media__options.gni @@ -1,21 +1,24 @@ ---- media/media_options.gni.orig 2022-03-28 18:11:04 UTC +--- media/media_options.gni.orig 2022-10-05 07:34:01 UTC +++ media/media_options.gni -@@ -125,9 +125,12 @@ declare_args() { +@@ -165,12 +165,15 @@ declare_args() { # Enables runtime selection of ALSA library for audio. use_alsa = false + # Enable runtime selection of sndio(7) + use_sndio = false + - # Alsa should be used on non-Android, non-Mac POSIX systems. - # Alsa should be used on desktop Chromecast and audio-only Chromecast builds. + # Alsa should be used on all non-Android, non-Mac POSIX systems - with the + # exception of CastOS desktop builds. + # + # TODO(crbug.com/1336055): Remove legacy target_cpu hack used for targeting + # desktop Chromecast builds. - if (is_posix && !is_android && !is_mac && + if (is_posix && !is_android && !is_mac && !is_bsd && - (!is_chromecast || is_cast_desktop_build || is_cast_audio_only)) { + (!is_castos || (target_cpu == "x86" || target_cpu == "x64") || + is_cast_audio_only)) { use_alsa = true - -@@ -142,6 +145,10 @@ declare_args() { - if (!use_cras && !is_chromecast && !is_asan && !is_tsan) { +@@ -186,6 +189,10 @@ declare_args() { + if (!use_cras && !is_castos && !is_asan && !is_tsan) { use_pulseaudio = true } + } diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc new file mode 100644 index 000000000000..571c5f76ebe1 --- /dev/null +++ b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc @@ -0,0 +1,29 @@ +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC ++++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc +@@ -42,7 +42,7 @@ media::stable::mojom::VideoFrameDataPtr MakeVideoFrame + gfx::GpuMemoryBufferHandle gpu_memory_buffer_handle = + input->GetGpuMemoryBuffer()->CloneHandle(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + CHECK_EQ(gpu_memory_buffer_handle.type, gfx::NATIVE_PIXMAP); + CHECK(!gpu_memory_buffer_handle.native_pixmap_handle.planes.empty()); + #else +@@ -749,7 +749,7 @@ const gfx::GpuMemoryBufferId& StructTraits< + return input.id; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // static + gfx::NativePixmapHandle StructTraits< + media::stable::mojom::NativeGpuMemoryBufferHandleDataView, +@@ -770,7 +770,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor + + output->type = gfx::NATIVE_PIXMAP; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + if (!data.ReadPlatformHandle(&output->native_pixmap_handle)) + return false; + return true; diff --git a/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h new file mode 100644 index 000000000000..50418d82938a --- /dev/null +++ b/www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h @@ -0,0 +1,11 @@ +--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2022-10-05 07:34:01 UTC ++++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h +@@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem + static const gfx::GpuMemoryBufferId& id( + const gfx::GpuMemoryBufferHandle& input); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + static gfx::NativePixmapHandle platform_handle( + gfx::GpuMemoryBufferHandle& input); + #else diff --git a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc index 53f690b6b51a..18b0d0a60f42 100644 --- a/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc +++ b/www/iridium/files/patch-media_mojo_mojom_video__frame__mojom__traits.cc @@ -1,6 +1,6 @@ ---- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-03-28 18:11:04 UTC +--- media/mojo/mojom/video_frame_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC +++ media/mojo/mojom/video_frame_mojom_traits.cc -@@ -21,7 +21,7 @@ +@@ -23,7 +23,7 @@ #include "ui/gfx/mojom/color_space_mojom_traits.h" #include "ui/gfx/mojom/hdr_metadata_mojom_traits.h" diff --git a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc index 637777ac75cc..960da767169d 100644 --- a/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc +++ b/www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc @@ -1,6 +1,6 @@ ---- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-03-28 18:11:04 UTC +--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2022-10-05 07:34:01 UTC +++ media/video/gpu_memory_buffer_video_frame_pool.cc -@@ -720,7 +720,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa +@@ -797,7 +797,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa } bool is_software_backed_video_frame = !video_frame->HasTextures(); @@ -9,3 +9,21 @@ is_software_backed_video_frame &= !video_frame->HasDmaBufs(); #endif +@@ -1223,7 +1223,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + frame_resources->plane_resources[gpu_memory_buffer_plane] + .gpu_memory_buffer.get(); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + is_webgpu_compatible &= (gpu_memory_buffer != nullptr); + if (is_webgpu_compatible) { + is_webgpu_compatible &= +@@ -1243,7 +1243,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo + gpu::SHARED_IMAGE_USAGE_GLES2 | gpu::SHARED_IMAGE_USAGE_RASTER | + gpu::SHARED_IMAGE_USAGE_DISPLAY | gpu::SHARED_IMAGE_USAGE_SCANOUT; + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // TODO(crbug.com/1241537): Always add the flag once the + // OzoneImageBacking is by default turned on. + if (base::CommandLine::ForCurrentProcess()->HasSwitch( diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc index 8aa132873608..7af616e37fcc 100644 --- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc +++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter.cc.orig 2022-04-01 07:48:30 UTC +--- media/video/video_encode_accelerator_adapter.cc.orig 2022-10-05 07:34:01 UTC +++ media/video/video_encode_accelerator_adapter.cc -@@ -96,7 +96,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( +@@ -129,7 +129,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig( if (is_rgb) config.input_format = PIXEL_FORMAT_I420; @@ -9,9 +9,9 @@ if (storage_type == VideoFrame::STORAGE_DMABUFS || storage_type == VideoFrame::STORAGE_GPU_MEMORY_BUFFER) { if (is_rgb) -@@ -235,7 +235,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal - auto vea_config = - SetUpVeaConfig(profile_, options_, format, first_frame->storage_type()); +@@ -298,7 +298,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal + SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(), + supported_rc_modes_); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc index 2c065f367cf8..c521f984f5a3 100644 --- a/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc +++ b/www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc @@ -1,6 +1,6 @@ ---- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-04-01 07:48:30 UTC +--- media/video/video_encode_accelerator_adapter_test.cc.orig 2022-10-05 07:34:01 UTC +++ media/video/video_encode_accelerator_adapter_test.cc -@@ -350,7 +350,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes +@@ -395,7 +395,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes vea()->SetEncodingCallback(base::BindLambdaForTesting( [&](BitstreamBuffer&, bool keyframe, scoped_refptr<VideoFrame> frame) { diff --git a/www/iridium/files/patch-media_webrtc_audio__processor.cc b/www/iridium/files/patch-media_webrtc_audio__processor.cc index bbbdc56e1edf..78dc81a24c59 100644 --- a/www/iridium/files/patch-media_webrtc_audio__processor.cc +++ b/www/iridium/files/patch-media_webrtc_audio__processor.cc @@ -1,6 +1,6 @@ ---- media/webrtc/audio_processor.cc.orig 2022-04-01 07:48:30 UTC +--- media/webrtc/audio_processor.cc.orig 2022-10-05 07:34:01 UTC +++ media/webrtc/audio_processor.cc -@@ -428,7 +428,7 @@ absl::optional<double> AudioProcessor::ProcessData( +@@ -473,7 +473,7 @@ absl::optional<double> AudioProcessor::ProcessData( #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) DCHECK_LE(volume, 1.0); #elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc index 2839ed74b0a2..837371ded334 100644 --- a/www/iridium/files/patch-media_webrtc_helpers__unittests.cc +++ b/www/iridium/files/patch-media_webrtc_helpers__unittests.cc @@ -1,4 +1,4 @@ ---- media/webrtc/helpers_unittests.cc.orig 2022-04-01 07:48:30 UTC +--- media/webrtc/helpers_unittests.cc.orig 2022-10-05 07:34:01 UTC +++ media/webrtc/helpers_unittests.cc @@ -36,7 +36,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau EXPECT_FALSE(config.pre_amplifier.enabled); @@ -9,7 +9,7 @@ EXPECT_TRUE(config.gain_controller2.enabled); #else EXPECT_FALSE(config.gain_controller2.enabled); -@@ -94,7 +94,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau +@@ -98,7 +98,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau // Check that either AGC1 digital or AGC2 digital is used based on the // platforms where the Hybrid AGC is enabled by default. diff --git a/www/iridium/files/patch-media_webrtc_webrtc__features.cc b/www/iridium/files/patch-media_webrtc_webrtc__features.cc index ac86ad4a76c7..eed6f395002c 100644 --- a/www/iridium/files/patch-media_webrtc_webrtc__features.cc +++ b/www/iridium/files/patch-media_webrtc_webrtc__features.cc @@ -1,4 +1,4 @@ ---- media/webrtc/webrtc_features.cc.orig 2022-03-28 18:11:04 UTC +--- media/webrtc/webrtc_features.cc.orig 2022-10-05 07:34:01 UTC +++ media/webrtc/webrtc_features.cc @@ -9,7 +9,7 @@ @@ -9,3 +9,12 @@ constexpr base::FeatureState kWebRtcHybridAgcState = base::FEATURE_ENABLED_BY_DEFAULT; #else +@@ -19,7 +19,7 @@ constexpr base::FeatureState kWebRtcHybridAgcState = + } // namespace + + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ +- BUILDFLAG(IS_CHROMEOS) ++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + constexpr base::FeatureState kWebRtcAnalogAgcClippingControlState = + base::FEATURE_ENABLED_BY_DEFAULT; + #else diff --git a/www/iridium/files/patch-mojo_core_BUILD.gn b/www/iridium/files/patch-mojo_core_BUILD.gn index b0912b2f7d3f..8a54c5732c81 100644 --- a/www/iridium/files/patch-mojo_core_BUILD.gn +++ b/www/iridium/files/patch-mojo_core_BUILD.gn @@ -1,6 +1,6 @@ ---- mojo/core/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- mojo/core/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ mojo/core/BUILD.gn -@@ -128,7 +128,7 @@ template("core_impl_source_set") { +@@ -146,7 +146,7 @@ template("core_impl_source_set") { ] } diff --git a/www/iridium/files/patch-mojo_core_channel.cc b/www/iridium/files/patch-mojo_core_channel.cc index 0d3f265edb89..634c29a70a74 100644 --- a/www/iridium/files/patch-mojo_core_channel.cc +++ b/www/iridium/files/patch-mojo_core_channel.cc @@ -1,6 +1,6 @@ ---- mojo/core/channel.cc.orig 2022-03-28 18:11:04 UTC +--- mojo/core/channel.cc.orig 2022-10-05 07:34:01 UTC +++ mojo/core/channel.cc -@@ -62,7 +62,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; +@@ -71,7 +71,11 @@ const size_t kMaxUnusedReadBufferCapacity = 4096; // Fuchsia: The zx_channel_write() API supports up to 64 handles. const size_t kMaxAttachedHandles = 64; diff --git a/www/iridium/files/patch-mojo_public_c_system_thunks.cc b/www/iridium/files/patch-mojo_public_c_system_thunks.cc index 694b0d51b20c..134c8a1a8d8f 100644 --- a/www/iridium/files/patch-mojo_public_c_system_thunks.cc +++ b/www/iridium/files/patch-mojo_public_c_system_thunks.cc @@ -1,7 +1,7 @@ ---- mojo/public/c/system/thunks.cc.orig 2022-04-01 07:48:30 UTC +--- mojo/public/c/system/thunks.cc.orig 2022-10-05 07:34:01 UTC +++ mojo/public/c/system/thunks.cc -@@ -20,7 +20,7 @@ - #include "mojo/public/c/system/macros.h" +@@ -24,7 +24,7 @@ + #include "mojo/public/c/system/message_pipe.h" #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ - BUILDFLAG(IS_FUCHSIA) @@ -9,7 +9,7 @@ #include "base/environment.h" #include "base/files/file_path.h" #include "base/scoped_native_library.h" -@@ -69,7 +69,7 @@ class CoreLibraryInitializer { +@@ -73,7 +73,7 @@ class CoreLibraryInitializer { MojoResult LoadLibrary(base::FilePath library_path) { #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ @@ -18,7 +18,7 @@ if (library_ && library_->is_valid()) return MOJO_RESULT_OK; -@@ -83,7 +83,7 @@ class CoreLibraryInitializer { +@@ -87,7 +87,7 @@ class CoreLibraryInitializer { if (library_path.empty()) { // Default to looking for the library in the current working directory. @@ -27,7 +27,7 @@ const base::FilePath::CharType kDefaultLibraryPathValue[] = FILE_PATH_LITERAL("./libmojo_core.so"); #elif BUILDFLAG(IS_FUCHSIA) -@@ -139,7 +139,7 @@ class CoreLibraryInitializer { +@@ -143,7 +143,7 @@ class CoreLibraryInitializer { private: #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \ diff --git a/www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd b/www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd deleted file mode 100644 index 08944c61988b..000000000000 --- a/www/iridium/files/patch-mojo_public_js_mojo__bindings__resources.grd +++ /dev/null @@ -1,11 +0,0 @@ ---- mojo/public/js/mojo_bindings_resources.grd.orig 2022-04-01 07:48:30 UTC -+++ mojo/public/js/mojo_bindings_resources.grd -@@ -126,7 +126,7 @@ - use_base_dir="false" - resource_path="mojo/mojo/public/mojom/base/unguessable_token.mojom-webui.js" - type="BINDATA" /> -- <if expr="is_win or is_macosx or is_linux or is_android"> -+ <if expr="is_win or is_macosx or is_posix or is_android"> - <include name="IDR_MOJO_PROCESS_ID_MOJOM_WEBUI_JS" - file="${root_gen_dir}/mojom-webui/mojo/public/mojom/base/process_id.mojom-webui.js" - use_base_dir="false" diff --git a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni index f55e2d42a6bd..b37c6b7cccc8 100644 --- a/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni +++ b/www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni @@ -1,6 +1,6 @@ ---- mojo/public/tools/bindings/mojom.gni.orig 2022-03-28 18:11:04 UTC +--- mojo/public/tools/bindings/mojom.gni.orig 2022-10-05 07:34:01 UTC +++ mojo/public/tools/bindings/mojom.gni -@@ -690,6 +690,16 @@ template("mojom") { +@@ -694,6 +694,16 @@ template("mojom") { enabled_features += [ "is_win" ] } diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn index 2b43437ad4fb..29a3c7f6633d 100644 --- a/www/iridium/files/patch-net_BUILD.gn +++ b/www/iridium/files/patch-net_BUILD.gn @@ -1,6 +1,6 @@ ---- net/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- net/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ net/BUILD.gn -@@ -101,7 +101,7 @@ net_configs = [ +@@ -104,7 +104,7 @@ net_configs = [ "//build/config/compiler:wexit_time_destructors", ] @@ -9,15 +9,7 @@ net_configs += [ "//build/config/linux:libresolv" ] } -@@ -1096,6 +1096,7 @@ component("net") { - "//net/dns:mdns_client", - "//net/dns/public", - "//net/third_party/quiche", -+ "//sandbox/policy", - ] - - allow_circular_includes_from = [ -@@ -1224,6 +1225,15 @@ component("net") { +@@ -1198,6 +1198,15 @@ component("net") { ] } @@ -33,16 +25,16 @@ if (is_mac) { sources += [ "base/network_notification_thread_mac.cc", -@@ -1356,7 +1366,7 @@ component("net") { +@@ -1330,7 +1339,7 @@ component("net") { } } -- if (is_android || is_chromeos_ash) { -+ if (is_android || is_chromeos_ash || is_bsd) { +- if (is_android || is_chromeos) { ++ if (is_android || is_chromeos || is_bsd) { sources += [ "base/network_change_notifier_posix.cc", "base/network_change_notifier_posix.h", -@@ -1389,7 +1399,7 @@ component("net") { +@@ -1363,7 +1372,7 @@ component("net") { } # Use getifaddrs() on POSIX platforms, except Linux. @@ -51,16 +43,7 @@ sources += [ "base/network_interfaces_getifaddrs.cc", "base/network_interfaces_getifaddrs.h", -@@ -2465,7 +2475,7 @@ if (is_linux || is_chromeos || is_mac) { - } - } - --if (is_linux || is_chromeos) { -+if ((is_linux || is_chromeos) && !is_bsd) { - static_library("epoll_server") { - sources = [ - "tools/epoll_server/platform/impl/epoll_bug_impl.h", -@@ -4459,7 +4469,7 @@ test("net_unittests") { +@@ -4368,7 +4377,7 @@ test("net_unittests") { ] } @@ -69,7 +52,7 @@ sources += [ "base/address_tracker_linux_unittest.cc", "base/network_interfaces_linux_unittest.cc", -@@ -4533,6 +4543,10 @@ test("net_unittests") { +@@ -4443,6 +4452,10 @@ test("net_unittests") { "//url:buildflags", ] @@ -77,19 +60,19 @@ + deps += [ "//sandbox/policy" ] + } + - allow_circular_includes_from = [ "//net/third_party/quiche:quiche_tests" ] - if (enable_websockets) { -@@ -4580,7 +4594,7 @@ test("net_unittests") { + deps += [ "//net/server:tests" ] + } +@@ -4510,7 +4523,7 @@ test("net_unittests") { ] } - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "quic/platform/impl/quic_epoll_clock_test.cc", - "quic/platform/impl/quic_flags_test.cc", -@@ -4728,7 +4742,7 @@ test("net_unittests") { + sources += [ "tools/quic/quic_simple_server_test.cc" ] + } + +@@ -4651,7 +4664,7 @@ test("net_unittests") { } # Use getifaddrs() on POSIX platforms, except Linux. diff --git a/www/iridium/files/patch-net_base_network__change__notifier.cc b/www/iridium/files/patch-net_base_network__change__notifier.cc index 3139ec36868a..d0811bfc6771 100644 --- a/www/iridium/files/patch-net_base_network__change__notifier.cc +++ b/www/iridium/files/patch-net_base_network__change__notifier.cc @@ -1,15 +1,15 @@ ---- net/base/network_change_notifier.cc.orig 2022-04-01 07:48:30 UTC +--- net/base/network_change_notifier.cc.orig 2022-10-05 07:34:01 UTC +++ net/base/network_change_notifier.cc -@@ -39,7 +39,7 @@ +@@ -37,7 +37,7 @@ #include "net/base/network_change_notifier_linux.h" #elif BUILDFLAG(IS_APPLE) #include "net/base/network_change_notifier_mac.h" --#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID) -+#elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) #include "net/base/network_change_notifier_posix.h" #elif BUILDFLAG(IS_FUCHSIA) #include "net/base/network_change_notifier_fuchsia.h" -@@ -321,6 +321,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo +@@ -326,6 +326,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo #elif BUILDFLAG(IS_FUCHSIA) return std::make_unique<NetworkChangeNotifierFuchsia>( /*require_wlan=*/false); @@ -18,4 +18,4 @@ + /*dns_config_notifier*/nullptr); #else NOTIMPLEMENTED(); - return NULL; + return nullptr; diff --git a/www/iridium/files/patch-net_base_network__change__notifier__posix.cc b/www/iridium/files/patch-net_base_network__change__notifier__posix.cc index 0148ab222229..dbc5944ffe9e 100644 --- a/www/iridium/files/patch-net_base_network__change__notifier__posix.cc +++ b/www/iridium/files/patch-net_base_network__change__notifier__posix.cc @@ -1,11 +1,11 @@ ---- net/base/network_change_notifier_posix.cc.orig 2022-03-28 18:11:04 UTC +--- net/base/network_change_notifier_posix.cc.orig 2022-10-05 07:34:01 UTC +++ net/base/network_change_notifier_posix.cc -@@ -93,7 +93,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt +@@ -92,7 +92,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt NetworkChangeNotifier::NetworkChangeCalculatorParams NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() { NetworkChangeCalculatorParams params; --#if BUILDFLAG(IS_CHROMEOS_ASH) -+#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_BSD) +-#if BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Delay values arrived at by simple experimentation and adjusted so as to // produce a single signal when switching between network connections. params.ip_address_offline_delay_ = base::Milliseconds(4000); diff --git a/www/iridium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/iridium/files/patch-net_base_sockaddr__util__posix.cc index e712e6267c3a..d99a7d3c9369 100644 --- a/www/iridium/files/patch-net_socket_unix__domain__client__socket__posix.cc +++ b/www/iridium/files/patch-net_base_sockaddr__util__posix.cc @@ -1,11 +1,12 @@ ---- net/socket/unix_domain_client_socket_posix.cc.orig 2022-03-28 18:11:04 UTC -+++ net/socket/unix_domain_client_socket_posix.cc -@@ -60,7 +60,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st +--- net/base/sockaddr_util_posix.cc.orig 2022-10-05 07:34:01 UTC ++++ net/base/sockaddr_util_posix.cc +@@ -41,7 +41,8 @@ bool FillUnixAddress(const std::string& socket_path, return true; } -#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ++ // XXX ? // Convert the path given into abstract socket name. It must start with // the '\0' character, so we are adding it. |addr_len| must specify the // length of the structure exactly, as potentially the socket name may diff --git a/www/iridium/files/patch-net_base_sockaddr__util__posix__unittest.cc b/www/iridium/files/patch-net_base_sockaddr__util__posix__unittest.cc new file mode 100644 index 000000000000..95408ee10da0 --- /dev/null +++ b/www/iridium/files/patch-net_base_sockaddr__util__posix__unittest.cc @@ -0,0 +1,12 @@ +--- net/base/sockaddr_util_posix_unittest.cc.orig 2022-10-05 07:34:01 UTC ++++ net/base/sockaddr_util_posix_unittest.cc +@@ -83,7 +83,8 @@ TEST(FillUnixAddressTest, AbstractLinuxAddress) { + size_t path_max = MaxPathLength(&storage); + std::string path(path_max, '0'); + +-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) ++ // XXX? + EXPECT_TRUE(FillUnixAddress(path, /*use_abstract_namespace=*/true, &storage)); + + EXPECT_EQ(path.size() + 1U + offsetof(struct sockaddr_un, sun_path), diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc.cc b/www/iridium/files/patch-net_cert_cert__verify__proc.cc index 74a329aae991..fcf08c7f4308 100644 --- a/www/iridium/files/patch-net_cert_cert__verify__proc.cc +++ b/www/iridium/files/patch-net_cert_cert__verify__proc.cc @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.cc.orig 2022-04-01 07:48:30 UTC +--- net/cert/cert_verify_proc.cc.orig 2022-10-05 07:34:01 UTC +++ net/cert/cert_verify_proc.cc -@@ -552,7 +552,7 @@ base::Value CertVerifyParams(X509Certificate* cert, +@@ -510,7 +510,7 @@ base::Value CertVerifyParams(X509Certificate* cert, } // namespace diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc.h b/www/iridium/files/patch-net_cert_cert__verify__proc.h index 71af1c82dd47..f76b15670227 100644 --- a/www/iridium/files/patch-net_cert_cert__verify__proc.h +++ b/www/iridium/files/patch-net_cert_cert__verify__proc.h @@ -1,6 +1,6 @@ ---- net/cert/cert_verify_proc.h.orig 2022-04-01 07:48:30 UTC +--- net/cert/cert_verify_proc.h.orig 2022-10-05 07:34:01 UTC +++ net/cert/cert_verify_proc.h -@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc +@@ -80,7 +80,7 @@ class NET_EXPORT CertVerifyProc kMaxValue = kOther }; diff --git a/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc index 256c90bd3f7d..6ca6af8f3342 100644 --- a/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc +++ b/www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc @@ -1,9 +1,9 @@ ---- net/cert/cert_verify_proc_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- net/cert/cert_verify_proc_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ net/cert/cert_verify_proc_unittest.cc -@@ -225,7 +225,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier - CERT_VERIFY_PROC_MAC, CERT_VERIFY_PROC_BUILTIN - #elif BUILDFLAG(IS_WIN) - CERT_VERIFY_PROC_WIN +@@ -239,7 +239,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier + #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) + CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS + #endif -#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) CERT_VERIFY_PROC_BUILTIN diff --git a/www/iridium/files/patch-net_disk__cache_blockfile_disk__format.h b/www/iridium/files/patch-net_disk__cache_blockfile_disk__format.h index 312af99c6085..31ae5e830abc 100644 --- a/www/iridium/files/patch-net_disk__cache_blockfile_disk__format.h +++ b/www/iridium/files/patch-net_disk__cache_blockfile_disk__format.h @@ -1,6 +1,6 @@ ---- net/disk_cache/blockfile/disk_format.h.orig 2022-03-28 18:11:04 UTC +--- net/disk_cache/blockfile/disk_format.h.orig 2022-10-05 07:34:01 UTC +++ net/disk_cache/blockfile/disk_format.h -@@ -149,7 +149,9 @@ struct RankingsNode { +@@ -153,7 +153,9 @@ struct RankingsNode { }; #pragma pack(pop) diff --git a/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc index 8118a0d025b2..095daf71a518 100644 --- a/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc +++ b/www/iridium/files/patch-net_disk__cache_simple_simple__file__tracker.cc @@ -1,6 +1,6 @@ ---- net/disk_cache/simple/simple_file_tracker.cc.orig 2022-03-28 18:11:04 UTC +--- net/disk_cache/simple/simple_file_tracker.cc.orig 2022-10-05 07:34:01 UTC +++ net/disk_cache/simple/simple_file_tracker.cc -@@ -28,7 +28,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit +@@ -29,7 +29,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit } // namespace SimpleFileTracker::SimpleFileTracker(int file_limit) diff --git a/www/iridium/files/patch-net_dns_BUILD.gn b/www/iridium/files/patch-net_dns_BUILD.gn index a4ab22c14805..1936485b29e2 100644 --- a/www/iridium/files/patch-net_dns_BUILD.gn +++ b/www/iridium/files/patch-net_dns_BUILD.gn @@ -1,6 +1,6 @@ ---- net/dns/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- net/dns/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ net/dns/BUILD.gn -@@ -114,7 +114,7 @@ source_set("dns") { +@@ -113,7 +113,7 @@ source_set("dns") { "dns_config_service_android.cc", "dns_config_service_android.h", ] @@ -9,7 +9,7 @@ sources += [ "dns_config_service_linux.cc", "dns_config_service_linux.h", -@@ -155,6 +155,7 @@ source_set("dns") { +@@ -154,6 +154,7 @@ source_set("dns") { ":host_resolver_manager", ":mdns_client", "//net:net_public_deps", diff --git a/www/iridium/files/patch-net_dns_dns__config__service__posix.cc b/www/iridium/files/patch-net_dns_dns__config__service__posix.cc index a8913674016c..7a9438d61c6b 100644 --- a/www/iridium/files/patch-net_dns_dns__config__service__posix.cc +++ b/www/iridium/files/patch-net_dns_dns__config__service__posix.cc @@ -1,6 +1,6 @@ ---- net/dns/dns_config_service_posix.cc.orig 2022-03-28 18:11:04 UTC +--- net/dns/dns_config_service_posix.cc.orig 2022-10-05 07:34:01 UTC +++ net/dns/dns_config_service_posix.cc -@@ -33,6 +33,11 @@ +@@ -34,6 +34,11 @@ #include "net/dns/dns_config_watcher_mac.h" #endif @@ -12,7 +12,7 @@ namespace net { namespace internal { -@@ -129,6 +134,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi +@@ -130,6 +135,11 @@ class DnsConfigServicePosix::Watcher : public DnsConfi bool Watch() override { CheckOnCorrectSequence(); diff --git a/www/iridium/files/patch-net_dns_dns__util.cc b/www/iridium/files/patch-net_dns_dns__util.cc index feb79e73543f..56947885516c 100644 --- a/www/iridium/files/patch-net_dns_dns__util.cc +++ b/www/iridium/files/patch-net_dns_dns__util.cc @@ -1,6 +1,6 @@ ---- net/dns/dns_util.cc.orig 2022-04-01 07:48:30 UTC +--- net/dns/dns_util.cc.orig 2022-10-05 07:34:01 UTC +++ net/dns/dns_util.cc -@@ -27,6 +27,8 @@ +@@ -28,6 +28,8 @@ #include "net/third_party/uri_template/uri_template.h" #include "third_party/abseil-cpp/absl/types/optional.h" diff --git a/www/iridium/files/patch-net_dns_host__resolver__manager.cc b/www/iridium/files/patch-net_dns_host__resolver__manager.cc index 5d1248fb4b48..8af897fd99b9 100644 --- a/www/iridium/files/patch-net_dns_host__resolver__manager.cc +++ b/www/iridium/files/patch-net_dns_host__resolver__manager.cc @@ -1,7 +1,7 @@ ---- net/dns/host_resolver_manager.cc.orig 2022-04-01 07:48:30 UTC +--- net/dns/host_resolver_manager.cc.orig 2022-10-05 07:34:01 UTC +++ net/dns/host_resolver_manager.cc -@@ -2979,7 +2979,7 @@ HostResolverManager::HostResolverManager( - NetworkChangeNotifier::AddConnectionTypeObserver(this); +@@ -3126,7 +3126,7 @@ HostResolverManager::HostResolverManager( + } if (system_dns_config_notifier_) system_dns_config_notifier_->AddObserver(this); -#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_OPENBSD) && \ diff --git a/www/iridium/files/patch-net_dns_host__resolver__proc.cc b/www/iridium/files/patch-net_dns_host__resolver__proc.cc index 2b5bc1827407..883e777a496c 100644 --- a/www/iridium/files/patch-net_dns_host__resolver__proc.cc +++ b/www/iridium/files/patch-net_dns_host__resolver__proc.cc @@ -1,4 +1,4 @@ ---- net/dns/host_resolver_proc.cc.orig 2022-04-01 07:48:30 UTC +--- net/dns/host_resolver_proc.cc.orig 2022-10-05 07:34:01 UTC +++ net/dns/host_resolver_proc.cc @@ -19,10 +19,6 @@ #include "net/dns/dns_util.h" @@ -11,7 +11,7 @@ namespace net { HostResolverProc* HostResolverProc::default_proc_ = nullptr; -@@ -192,7 +188,7 @@ int SystemHostResolverCall(const std::string& host, +@@ -193,7 +189,7 @@ int SystemHostResolverCall(const std::string& host, base::BlockingType::WILL_BLOCK); #if BUILDFLAG(IS_POSIX) && \ diff --git a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc index e9b27ebe5824..04a9ea1d2dfd 100644 --- a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc +++ b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc @@ -1,6 +1,6 @@ ---- net/http/http_auth_gssapi_posix.cc.orig 2022-03-28 18:11:04 UTC +--- net/http/http_auth_gssapi_posix.cc.orig 2022-10-05 07:34:01 UTC +++ net/http/http_auth_gssapi_posix.cc -@@ -370,8 +370,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib +@@ -368,8 +368,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib static const char* const kDefaultLibraryNames[] = { #if BUILDFLAG(IS_APPLE) "/System/Library/Frameworks/GSS.framework/GSS" diff --git a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h index e2145b257bd5..ce5cf36e6b11 100644 --- a/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h +++ b/www/iridium/files/patch-net_http_http__auth__gssapi__posix.h @@ -1,6 +1,6 @@ ---- net/http/http_auth_gssapi_posix.h.orig 2022-03-28 18:11:04 UTC +--- net/http/http_auth_gssapi_posix.h.orig 2022-10-05 07:34:01 UTC +++ net/http/http_auth_gssapi_posix.h -@@ -20,6 +20,9 @@ +@@ -21,6 +21,9 @@ #if BUILDFLAG(IS_APPLE) #include <GSS/gssapi.h> #elif BUILDFLAG(IS_FREEBSD) diff --git a/www/iridium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc index 4d7335452022..5dff3f544fbf 100644 --- a/www/iridium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc +++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service.cc @@ -1,29 +1,35 @@ ---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-03-28 18:11:04 UTC -+++ net/proxy_resolution/configured_proxy_resolution_service.cc -@@ -52,7 +52,7 @@ +--- net/proxy_resolution/proxy_config_service.cc.orig 2022-10-05 07:34:01 UTC ++++ net/proxy_resolution/proxy_config_service.cc +@@ -18,20 +18,20 @@ + #include "net/proxy_resolution/proxy_config_service_ios.h" #elif BUILDFLAG(IS_MAC) #include "net/proxy_resolution/proxy_config_service_mac.h" - #include "net/proxy_resolution/proxy_resolver_mac.h" -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "net/proxy_resolution/proxy_config_service_linux.h" #elif BUILDFLAG(IS_ANDROID) #include "net/proxy_resolution/proxy_config_service_android.h" -@@ -64,7 +64,7 @@ namespace net { + #endif - namespace { +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "net/traffic_annotation/network_traffic_annotation.h" + #endif + namespace net { + + namespace { -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation = net::DefineNetworkTrafficAnnotation("proxy_config_system", R"( semantics { -@@ -1422,7 +1422,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon +@@ -108,7 +108,7 @@ ProxyConfigService::CreateSystemProxyConfigService( << "profile_io_data.cc::CreateProxyConfigService and this should " << "be used only for examples."; return std::make_unique<UnsetProxyConfigService>(); -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) std::unique_ptr<ProxyConfigServiceLinux> linux_config_service( - new ProxyConfigServiceLinux()); + std::make_unique<ProxyConfigServiceLinux>()); diff --git a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc index 9c84005b941b..b5737b89e637 100644 --- a/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc +++ b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc @@ -1,4 +1,4 @@ ---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-03-28 18:11:04 UTC +--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-10-05 07:34:01 UTC +++ net/proxy_resolution/proxy_config_service_linux.cc @@ -6,7 +6,9 @@ @@ -10,7 +10,7 @@ #include <unistd.h> #include <map> -@@ -506,6 +508,7 @@ bool SettingGetterImplGSettings::CheckVersion( +@@ -502,6 +504,7 @@ bool SettingGetterImplGSettings::CheckVersion( } #endif // defined(USE_GIO) @@ -18,7 +18,7 @@ // Converts |value| from a decimal string to an int. If there was a failure // parsing, returns |default_value|. int StringToIntOrDefault(base::StringPiece value, int default_value) { -@@ -1007,6 +1010,7 @@ class SettingGetterImplKDE : public ProxyConfigService +@@ -1030,6 +1033,7 @@ class SettingGetterImplKDE : public ProxyConfigService // events on. scoped_refptr<base::SequencedTaskRunner> file_task_runner_; }; @@ -26,7 +26,7 @@ } // namespace -@@ -1222,9 +1226,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( +@@ -1246,9 +1250,11 @@ ProxyConfigServiceLinux::Delegate::Delegate( case base::nix::DESKTOP_ENVIRONMENT_KDE3: case base::nix::DESKTOP_ENVIRONMENT_KDE4: case base::nix::DESKTOP_ENVIRONMENT_KDE5: diff --git a/www/iridium/files/patch-net_socket_socket__posix.cc b/www/iridium/files/patch-net_socket_socket__posix.cc index c1fd5cb21255..2add7d650a33 100644 --- a/www/iridium/files/patch-net_socket_socket__posix.cc +++ b/www/iridium/files/patch-net_socket_socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/socket_posix.cc.orig 2022-03-28 18:11:04 UTC +--- net/socket/socket_posix.cc.orig 2022-10-05 07:34:01 UTC +++ net/socket/socket_posix.cc -@@ -519,7 +519,7 @@ void SocketPosix::ReadCompleted() { +@@ -516,7 +516,7 @@ void SocketPosix::ReadCompleted() { } int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) { diff --git a/www/iridium/files/patch-net_socket_socks5__client__socket.cc b/www/iridium/files/patch-net_socket_socks5__client__socket.cc index 3629dc6b0ce6..0623397939f6 100644 --- a/www/iridium/files/patch-net_socket_socks5__client__socket.cc +++ b/www/iridium/files/patch-net_socket_socks5__client__socket.cc @@ -1,6 +1,6 @@ ---- net/socket/socks5_client_socket.cc.orig 2022-03-28 18:11:04 UTC +--- net/socket/socks5_client_socket.cc.orig 2022-10-05 07:34:01 UTC +++ net/socket/socks5_client_socket.cc -@@ -20,6 +20,9 @@ +@@ -19,6 +19,9 @@ #include "net/log/net_log_event_type.h" #include "net/traffic_annotation/network_traffic_annotation.h" diff --git a/www/iridium/files/patch-net_socket_tcp__socket__posix.cc b/www/iridium/files/patch-net_socket_tcp__socket__posix.cc index 93e174166504..be82a656d103 100644 --- a/www/iridium/files/patch-net_socket_tcp__socket__posix.cc +++ b/www/iridium/files/patch-net_socket_tcp__socket__posix.cc @@ -1,20 +1,20 @@ ---- net/socket/tcp_socket_posix.cc.orig 2022-04-01 07:48:30 UTC +--- net/socket/tcp_socket_posix.cc.orig 2022-10-05 07:34:01 UTC +++ net/socket/tcp_socket_posix.cc -@@ -96,6 +96,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { - PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; - return false; - } +@@ -100,6 +100,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) { + PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd; + return false; + } +#elif BUILDFLAG(IS_FREEBSD) + // Set seconds until first TCP keep alive. + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &delay, sizeof(delay))) { + PLOG(ERROR) << "Failed to set TCP_KEEPIDLE on fd: " << fd; + return false; + } -+ // Set seconds between TCP keep alives. ++ // Set seconds between TCP keep alives. + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &delay, sizeof(delay))) { + PLOG(ERROR) << "Failed to set TCP_KEEPINTVL on fd: " << fd; + return false; + } #endif - return true; - } + } + diff --git a/www/iridium/files/patch-net_socket_udp__socket__posix.cc b/www/iridium/files/patch-net_socket_udp__socket__posix.cc index e17e93b8a863..37570a469d3d 100644 --- a/www/iridium/files/patch-net_socket_udp__socket__posix.cc +++ b/www/iridium/files/patch-net_socket_udp__socket__posix.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_posix.cc.orig 2022-04-15 05:34:28 UTC +--- net/socket/udp_socket_posix.cc.orig 2022-10-05 07:34:01 UTC +++ net/socket/udp_socket_posix.cc -@@ -574,7 +574,7 @@ int UDPSocketPosix::SetDoNotFragment() { +@@ -559,7 +559,7 @@ int UDPSocketPosix::SetDoNotFragment() { } void UDPSocketPosix::SetMsgConfirm(bool confirm) { @@ -9,7 +9,7 @@ if (confirm) { sendto_flags_ |= MSG_CONFIRM; } else { -@@ -595,7 +595,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { +@@ -580,7 +580,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) { DCHECK_CALLED_ON_VALID_THREAD(thread_checker_); int value = broadcast ? 1 : 0; int rv; @@ -18,3 +18,12 @@ // SO_REUSEPORT on OSX permits multiple processes to each receive // UDP multicast or broadcast datagrams destined for the bound // port. +@@ -893,7 +893,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address) + #if BUILDFLAG(IS_CHROMEOS_ASH) + if (last_error == EINVAL) + return ERR_ADDRESS_IN_USE; +-#elif BUILDFLAG(IS_APPLE) ++#elif BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD) + if (last_error == EADDRNOTAVAIL) + return ERR_ADDRESS_IN_USE; + #endif diff --git a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc index a55eed6bc09e..863cf706af30 100644 --- a/www/iridium/files/patch-net_socket_udp__socket__unittest.cc +++ b/www/iridium/files/patch-net_socket_udp__socket__unittest.cc @@ -1,6 +1,6 @@ ---- net/socket/udp_socket_unittest.cc.orig 2022-04-01 07:48:30 UTC +--- net/socket/udp_socket_unittest.cc.orig 2022-10-05 07:34:01 UTC +++ net/socket/udp_socket_unittest.cc -@@ -324,7 +324,7 @@ TEST_F(UDPSocketTest, PartialRecv) { +@@ -328,7 +328,7 @@ TEST_F(UDPSocketTest, PartialRecv) { EXPECT_EQ(second_packet, received); } @@ -9,25 +9,25 @@ // - MacOS: requires root permissions on OSX 10.7+. // - Android: devices attached to testbots don't have default network, so // broadcasting to 255.255.255.255 returns error -109 (Address not reachable). -@@ -584,7 +584,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { +@@ -588,7 +588,7 @@ TEST_F(UDPSocketTest, ClientSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = client.SetDoNotFragment(); --#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); - #else -@@ -606,7 +606,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { + #elif BUILDFLAG(IS_MAC) +@@ -616,7 +616,7 @@ TEST_F(UDPSocketTest, ServerSetDoNotFragment) { EXPECT_THAT(rv, IsOk()); rv = server.SetDoNotFragment(); --#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_FUCHSIA) -+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_IOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) // TODO(crbug.com/945590): IP_MTU_DISCOVER is not implemented on Fuchsia. EXPECT_THAT(rv, IsError(ERR_NOT_IMPLEMENTED)); - #else -@@ -665,7 +665,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { + #elif BUILDFLAG(IS_MAC) +@@ -681,7 +681,7 @@ TEST_F(UDPSocketTest, JoinMulticastGroup) { // TODO(https://crbug.com/947115): failing on device on iOS 12.2. // TODO(https://crbug.com/1227554): flaky on Mac 11. @@ -36,7 +36,7 @@ #define MAYBE_SharedMulticastAddress DISABLED_SharedMulticastAddress #else #define MAYBE_SharedMulticastAddress SharedMulticastAddress -@@ -719,7 +719,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { +@@ -735,7 +735,7 @@ TEST_F(UDPSocketTest, MAYBE_SharedMulticastAddress) { NetLogSource()); ASSERT_THAT(client_socket.Connect(send_address), IsOk()); diff --git a/www/iridium/files/patch-net_third__party_quiche_BUILD.gn b/www/iridium/files/patch-net_third__party_quiche_BUILD.gn index ed63a83df7c3..c910ff0df3fb 100644 --- a/www/iridium/files/patch-net_third__party_quiche_BUILD.gn +++ b/www/iridium/files/patch-net_third__party_quiche_BUILD.gn @@ -1,33 +1,11 @@ ---- net/third_party/quiche/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- net/third_party/quiche/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ net/third_party/quiche/BUILD.gn -@@ -708,7 +708,7 @@ proto_library("net_quic_test_tools_proto") { - extra_configs = [ "//build/config/compiler:wexit_time_destructors" ] - } +@@ -28,7 +28,7 @@ import("//build/config/chromeos/ui_mode.gni") + import("//testing/libfuzzer/fuzzer_test.gni") + import("//third_party/protobuf/proto_library.gni") --if (is_linux || is_chromeos) { -+if ((is_linux || is_chromeos) && !is_bsd) { - source_set("epoll_server_core") { - sources = [ - "src/epoll_server/platform/api/epoll_bug.h", -@@ -1063,7 +1063,7 @@ source_set("quic_test_tools_core") { - "//third_party/quic_trace:quic_trace_proto", - ] +-build_epoll_based_tools = is_linux || is_chromeos ++build_epoll_based_tools = (is_linux && !is_bsd) || is_chromeos -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "src/epoll_server/fake_simple_epoll_server.cc", - "src/epoll_server/fake_simple_epoll_server.h", -@@ -1528,10 +1528,10 @@ source_set("quiche_tests") { - ] - public_deps = [] - -- if (is_linux || is_chromeos_lacros) { -+ if ((is_linux || is_chromeos_lacros) && !is_bsd) { - public_deps += [ "//net:epoll_quic_tools" ] - } -- if (is_linux || is_chromeos) { -+ if ((is_linux || is_chromeos) && !is_bsd) { - sources += [ - "src/epoll_server/simple_epoll_server_test.cc", - "src/quic/core/chlo_extractor_test.cc", + config("quiche_internal_config") { + cflags = [] diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc index 94aad383e098..be1c6e637332 100644 --- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc +++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2022-03-28 18:11:04 UTC +--- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2022-10-05 07:34:01 UTC +++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc @@ -35,7 +35,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -51,7 +51,7 @@ void SetUpOnNetworkThread( +@@ -55,7 +55,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -123,7 +123,7 @@ class CertVerifyImpl { +@@ -127,7 +127,7 @@ class CertVerifyImpl { std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName( base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { diff --git a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc index 147df9c33450..4d68690bf657 100644 --- a/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc +++ b/www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc @@ -1,4 +1,4 @@ ---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2022-03-28 18:11:04 UTC +--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2022-10-05 07:34:01 UTC +++ net/tools/cert_verify_tool/cert_verify_tool.cc @@ -30,7 +30,7 @@ #include "net/url_request/url_request_context_builder.h" @@ -9,7 +9,7 @@ #include "net/proxy_resolution/proxy_config.h" #include "net/proxy_resolution/proxy_config_service_fixed.h" #endif -@@ -56,7 +56,7 @@ void SetUpOnNetworkThread( +@@ -60,7 +60,7 @@ void SetUpOnNetworkThread( base::WaitableEvent* initialization_complete_event) { net::URLRequestContextBuilder url_request_context_builder; url_request_context_builder.set_user_agent(GetUserAgent()); @@ -18,7 +18,7 @@ // On Linux, use a fixed ProxyConfigService, since the default one // depends on glib. // -@@ -206,7 +206,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr +@@ -217,7 +217,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr base::StringPiece impl_name, scoped_refptr<net::CertNetFetcher> cert_net_fetcher, RootStoreType root_store_type) { @@ -27,7 +27,7 @@ if (impl_name == "platform") { if (root_store_type != RootStoreType::kSystem) { std::cerr << "WARNING: platform verifier not supported with " -@@ -463,7 +463,7 @@ int main(int argc, char** argv) { +@@ -474,7 +474,7 @@ int main(int argc, char** argv) { std::string impls_str = command_line.GetSwitchValueASCII("impls"); if (impls_str.empty()) { // Default value. diff --git a/www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc b/www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc deleted file mode 100644 index 8a859c74b431..000000000000 --- a/www/iridium/files/patch-net_tools_quic_quic__http__proxy__backend.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/tools/quic/quic_http_proxy_backend.cc.orig 2022-03-28 18:11:04 UTC -+++ net/tools/quic/quic_http_proxy_backend.cc -@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext - // Enable HTTP2, but disable QUIC on the backend - context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */); - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On Linux, use a fixed ProxyConfigService, since the default one - // depends on glib. - context_builder.set_proxy_config_service( diff --git a/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h index 3fde16493e75..483b08b6b468 100644 --- a/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h +++ b/www/iridium/files/patch-net_traffic__annotation_network__traffic__annotation.h @@ -1,6 +1,6 @@ ---- net/traffic_annotation/network_traffic_annotation.h.orig 2022-03-28 18:11:04 UTC +--- net/traffic_annotation/network_traffic_annotation.h.orig 2022-10-05 07:34:01 UTC +++ net/traffic_annotation/network_traffic_annotation.h -@@ -371,7 +371,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -373,7 +373,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { } // namespace net // Placeholder for unannotated usages. @@ -9,7 +9,7 @@ #define TRAFFIC_ANNOTATION_WITHOUT_PROTO(ANNOTATION_ID) \ net::DefineNetworkTrafficAnnotation(ANNOTATION_ID, "No proto yet.") #endif -@@ -385,7 +385,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { +@@ -387,7 +387,7 @@ struct MutablePartialNetworkTrafficAnnotationTag { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/iridium/files/patch-net_url__request_url__fetcher.cc b/www/iridium/files/patch-net_url__request_url__fetcher.cc deleted file mode 100644 index e9d30e83048c..000000000000 --- a/www/iridium/files/patch-net_url__request_url__fetcher.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- net/url_request/url_fetcher.cc.orig 2022-03-28 18:11:04 UTC -+++ net/url_request/url_fetcher.cc -@@ -26,7 +26,7 @@ void URLFetcher::SetIgnoreCertificateRequests(bool ign - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if !BUILDFLAG(IS_WIN) && \ -- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - // static - std::unique_ptr<URLFetcher> URLFetcher::Create( - const GURL& url, diff --git a/www/iridium/files/patch-net_url__request_url__fetcher.h b/www/iridium/files/patch-net_url__request_url__fetcher.h deleted file mode 100644 index 2405a75fbc1e..000000000000 --- a/www/iridium/files/patch-net_url__request_url__fetcher.h +++ /dev/null @@ -1,11 +0,0 @@ ---- net/url_request/url_fetcher.h.orig 2022-04-01 07:48:30 UTC -+++ net/url_request/url_fetcher.h -@@ -344,7 +344,7 @@ class NET_EXPORT URLFetcher { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if (!BUILDFLAG(IS_WIN) && \ -- !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))) || \ -+ !(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))) || \ - BUILDFLAG(IS_CHROMEOS) - // |url| is the URL to send the request to. It must be valid. - // |request_type| is the type of request to make. diff --git a/www/iridium/files/patch-net_url__request_url__request.cc b/www/iridium/files/patch-net_url__request_url__request.cc index a16bb4ad725d..bdb5688d5e19 100644 --- a/www/iridium/files/patch-net_url__request_url__request.cc +++ b/www/iridium/files/patch-net_url__request_url__request.cc @@ -1,13 +1,14 @@ ---- net/url_request/url_request.cc.orig 2022-04-01 07:48:30 UTC +--- net/url_request/url_request.cc.orig 2022-10-05 07:34:01 UTC +++ net/url_request/url_request.cc -@@ -14,12 +14,14 @@ +@@ -13,6 +13,7 @@ + #include "base/bind.h" #include "base/callback.h" #include "base/callback_helpers.h" - #include "base/compiler_specific.h" +#include "base/command_line.h" + #include "base/compiler_specific.h" #include "base/metrics/histogram_macros.h" #include "base/rand_util.h" - #include "base/strings/utf_string_conversions.h" +@@ -20,6 +21,7 @@ #include "base/synchronization/lock.h" #include "base/threading/thread_task_runner_handle.h" #include "base/values.h" diff --git a/www/iridium/files/patch-net_url__request_url__request__context.cc b/www/iridium/files/patch-net_url__request_url__request__context.cc index 0ea56278dc5e..5b53ded07314 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context.cc +++ b/www/iridium/files/patch-net_url__request_url__request__context.cc @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.cc.orig 2022-04-01 07:48:30 UTC +--- net/url_request/url_request_context.cc.orig 2022-10-05 07:34:01 UTC +++ net/url_request/url_request_context.cc -@@ -90,7 +90,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge +@@ -64,7 +64,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/iridium/files/patch-net_url__request_url__request__context.h b/www/iridium/files/patch-net_url__request_url__request__context.h index fba3dc7399ed..d89c0e68dfc1 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context.h +++ b/www/iridium/files/patch-net_url__request_url__request__context.h @@ -1,6 +1,6 @@ ---- net/url_request/url_request_context.h.orig 2022-04-01 07:48:30 UTC +--- net/url_request/url_request_context.h.orig 2022-10-05 07:34:01 UTC +++ net/url_request/url_request_context.h -@@ -83,7 +83,7 @@ class NET_EXPORT URLRequestContext { +@@ -89,7 +89,7 @@ class NET_EXPORT URLRequestContext { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if !BUILDFLAG(IS_WIN) && \ diff --git a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc index 85481e9db7b1..bc1103ff0db5 100644 --- a/www/iridium/files/patch-net_url__request_url__request__context__builder.cc +++ b/www/iridium/files/patch-net_url__request_url__request__context__builder.cc @@ -1,11 +1,11 @@ ---- net/url_request/url_request_context_builder.cc.orig 2022-04-01 07:48:30 UTC +--- net/url_request/url_request_context_builder.cc.orig 2022-10-05 07:34:01 UTC +++ net/url_request/url_request_context_builder.cc -@@ -492,7 +492,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu +@@ -503,7 +503,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu } if (!proxy_resolution_service_) { -#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) +#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_BSD) // TODO(willchan): Switch to using this code when - // ConfiguredProxyResolutionService::CreateSystemProxyConfigService()'s + // ProxyConfigService::CreateSystemProxyConfigService()'s // signature doesn't suck. diff --git a/www/iridium/files/patch-pdf_out__of__process__instance.cc b/www/iridium/files/patch-pdf_out__of__process__instance.cc deleted file mode 100644 index 39d113a13bfa..000000000000 --- a/www/iridium/files/patch-pdf_out__of__process__instance.cc +++ /dev/null @@ -1,20 +0,0 @@ ---- pdf/out_of_process_instance.cc.orig 2022-03-28 18:11:04 UTC -+++ pdf/out_of_process_instance.cc -@@ -74,7 +74,7 @@ - #include "ui/gfx/geometry/size.h" - #include "url/gurl.h" - --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "pdf/ppapi_migration/pdfium_font_linux.h" - #endif - -@@ -734,7 +734,7 @@ void OutOfProcessInstance::RotateCounterclockwise() { - } - - void OutOfProcessInstance::SetLastPluginInstance() { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - SetLastPepperInstance(this); - #endif - } diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc index 01128c889a55..2c531f0291fc 100644 --- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc +++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc @@ -1,6 +1,6 @@ ---- pdf/pdfium/pdfium_engine.cc.orig 2022-03-28 18:11:04 UTC +--- pdf/pdfium/pdfium_engine.cc.orig 2022-10-05 07:34:01 UTC +++ pdf/pdfium/pdfium_engine.cc -@@ -84,7 +84,7 @@ +@@ -81,7 +81,7 @@ #include "gin/public/cppgc.h" #endif @@ -9,7 +9,7 @@ #include "pdf/pdfium/pdfium_font_linux.h" #endif -@@ -519,7 +519,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon +@@ -516,7 +516,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon FPDF_InitLibraryWithConfig(&config); diff --git a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc index 5e8cb1ded79a..7c6f8688d886 100644 --- a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc +++ b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.cc @@ -1,6 +1,6 @@ ---- printing/mojom/printing_context_mojom_traits.cc.orig 2022-03-28 18:11:04 UTC +--- printing/mojom/printing_context_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC +++ printing/mojom/printing_context_mojom_traits.cc -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ #include "ui/gfx/geometry/mojom/geometry_mojom_traits.h" #include "ui/gfx/geometry/size.h" @@ -9,7 +9,7 @@ #include "mojo/public/mojom/base/values.mojom.h" #endif -@@ -162,7 +162,7 @@ bool StructTraits< +@@ -147,7 +147,7 @@ bool StructTraits< } out->set_pages_per_sheet(data.pages_per_sheet()); diff --git a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.h b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.h index 941538de9e07..96e6fbae13f7 100644 --- a/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.h +++ b/www/iridium/files/patch-printing_mojom_printing__context__mojom__traits.h @@ -1,6 +1,6 @@ ---- printing/mojom/printing_context_mojom_traits.h.orig 2022-03-28 18:11:04 UTC +--- printing/mojom/printing_context_mojom_traits.h.orig 2022-10-05 07:34:01 UTC +++ printing/mojom/printing_context_mojom_traits.h -@@ -168,7 +168,7 @@ struct StructTraits<printing::mojom::PrintSettingsData +@@ -158,7 +158,7 @@ struct StructTraits<printing::mojom::PrintSettingsData return s.pages_per_sheet(); } diff --git a/www/iridium/files/patch-printing_print__settings.cc b/www/iridium/files/patch-printing_print__settings.cc index a2c683ab687c..8405573295fd 100644 --- a/www/iridium/files/patch-printing_print__settings.cc +++ b/www/iridium/files/patch-printing_print__settings.cc @@ -1,6 +1,6 @@ ---- printing/print_settings.cc.orig 2022-03-28 18:11:04 UTC +--- printing/print_settings.cc.orig 2022-10-05 07:34:01 UTC +++ printing/print_settings.cc -@@ -265,7 +265,7 @@ PrintSettings::PrintSettings(const PrintSettings& sett +@@ -272,7 +272,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet #endif is_modifiable_ = settings.is_modifiable_; pages_per_sheet_ = settings.pages_per_sheet_; @@ -9,16 +9,7 @@ for (const auto& item : settings.advanced_settings_) advanced_settings_.emplace(item.first, item.second.Clone()); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -305,7 +305,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet - #endif - is_modifiable_ = settings.is_modifiable_; - pages_per_sheet_ = settings.pages_per_sheet_; --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - for (const auto& item : settings.advanced_settings_) - advanced_settings_.emplace(item.first, item.second.Clone()); - #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -@@ -345,7 +345,7 @@ void PrintSettings::Clear() { +@@ -312,7 +312,7 @@ void PrintSettings::Clear() { #endif is_modifiable_ = true; pages_per_sheet_ = 1; diff --git a/www/iridium/files/patch-printing_print__settings__conversion.cc b/www/iridium/files/patch-printing_print__settings__conversion.cc index e1dcfcefe7bc..dfc2f28d1359 100644 --- a/www/iridium/files/patch-printing_print__settings__conversion.cc +++ b/www/iridium/files/patch-printing_print__settings__conversion.cc @@ -1,11 +1,11 @@ ---- printing/print_settings_conversion.cc.orig 2022-04-01 07:48:30 UTC +--- printing/print_settings_conversion.cc.orig 2022-10-05 07:34:01 UTC +++ printing/print_settings_conversion.cc -@@ -217,7 +217,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet +@@ -256,7 +256,7 @@ std::unique_ptr<PrintSettings> PrintSettingsFromJobSet settings->set_is_modifiable(is_modifiable.value()); } -#if BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && defined(USE_CUPS)) -+#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && defined(USE_CUPS)) - const base::Value* advanced_settings = - job_settings.FindDictKey(kSettingAdvancedSettings); ++#if BUILDFLAG(IS_CHROMEOS) || ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(USE_CUPS)) + const base::Value::Dict* advanced_settings = + job_settings.FindDict(kSettingAdvancedSettings); if (advanced_settings) { diff --git a/www/iridium/files/patch-printing_printing__context__linux.cc b/www/iridium/files/patch-printing_printing__context__linux.cc new file mode 100644 index 000000000000..f05adb8c2fee --- /dev/null +++ b/www/iridium/files/patch-printing_printing__context__linux.cc @@ -0,0 +1,38 @@ +--- printing/printing_context_linux.cc.orig 2022-10-05 07:34:01 UTC ++++ printing/printing_context_linux.cc +@@ -19,7 +19,7 @@ + #include "printing/units.h" + + // Avoid using LinuxUi on Fuchsia. +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -68,7 +68,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett + + ResetSettings(); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!ui::LinuxUi::instance()) + return mojom::ResultCode::kSuccess; + +@@ -81,7 +81,7 @@ mojom::ResultCode PrintingContextLinux::UseDefaultSett + } + + gfx::Size PrintingContextLinux::GetPdfPaperSizeDeviceUnits() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (ui::LinuxUi::instance()) + return ui::LinuxUi::instance()->GetPdfPaperSize(this); + #endif +@@ -94,7 +94,7 @@ mojom::ResultCode PrintingContextLinux::UpdatePrinterS + DCHECK(!printer_settings.show_system_dialog); + DCHECK(!in_print_job_); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (!ui::LinuxUi::instance()) + return mojom::ResultCode::kSuccess; + diff --git a/www/iridium/files/patch-printing_printing__features.cc b/www/iridium/files/patch-printing_printing__features.cc deleted file mode 100644 index 876e32f6d255..000000000000 --- a/www/iridium/files/patch-printing_printing__features.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- printing/printing_features.cc.orig 2022-03-28 18:11:04 UTC -+++ printing/printing_features.cc -@@ -8,7 +8,7 @@ - #include "printing/buildflags/buildflags.h" - - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ -- BUILDFLAG(IS_CHROMEOS) -+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - #include "base/metrics/field_trial_params.h" - #endif - diff --git a/www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc index b8c9a682d6e2..4c59206204a3 100644 --- a/www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc +++ b/www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc @@ -1,6 +1,6 @@ ---- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/codec/webrtc_video_encoder_vpx.cc -@@ -85,7 +85,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config +@@ -89,7 +89,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config const webrtc::DesktopSize& size) { SetCommonCodecParameters(config, size); @@ -8,4 +8,4 @@ +#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && !BUILDFLAG(IS_CHROMEOS_LACROS) // On Linux, using too many threads for VP8 encoding has been linked to high // CPU usage on machines that are under stress. See http://crbug.com/1151148. - config->g_threads = std::min(config->g_threads, 2U); + // 5/3/2022 update: Perf testing has shown that doubling the number of threads diff --git a/www/iridium/files/patch-remoting_host_base_switches.cc b/www/iridium/files/patch-remoting_host_base_switches.cc index aa524f0be99e..39aac3aa0ef1 100644 --- a/www/iridium/files/patch-remoting_host_base_switches.cc +++ b/www/iridium/files/patch-remoting_host_base_switches.cc @@ -1,6 +1,6 @@ ---- remoting/host/base/switches.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/base/switches.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/host/base/switches.cc -@@ -23,7 +23,7 @@ const char kProcessTypeEvaluateCapability[] = "evaluat +@@ -23,13 +23,13 @@ const char kProcessTypeEvaluateCapability[] = "evaluat const char kProcessTypeFileChooser[] = "file_chooser"; const char kProcessTypeUrlForwarderConfigurator[] = "url_forwarder_configurator"; @@ -9,3 +9,10 @@ const char kProcessTypeXSessionChooser[] = "xsession_chooser"; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + const char kEvaluateCapabilitySwitchName[] = "evaluate-type"; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const char kEnableUtempter[] = "enable-utempter"; + #endif + diff --git a/www/iridium/files/patch-remoting_host_base_switches.h b/www/iridium/files/patch-remoting_host_base_switches.h index 66c259bf4ba7..b2abc0b8f72b 100644 --- a/www/iridium/files/patch-remoting_host_base_switches.h +++ b/www/iridium/files/patch-remoting_host_base_switches.h @@ -1,6 +1,6 @@ ---- remoting/host/base/switches.h.orig 2022-03-28 18:11:04 UTC +--- remoting/host/base/switches.h.orig 2022-10-05 07:34:01 UTC +++ remoting/host/base/switches.h -@@ -35,7 +35,7 @@ extern const char kProcessTypeRdpDesktopSession[]; +@@ -35,13 +35,13 @@ extern const char kProcessTypeRdpDesktopSession[]; extern const char kProcessTypeEvaluateCapability[]; extern const char kProcessTypeFileChooser[]; extern const char kProcessTypeUrlForwarderConfigurator[]; @@ -9,3 +9,10 @@ extern const char kProcessTypeXSessionChooser[]; #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + extern const char kEvaluateCapabilitySwitchName[]; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Used to record client sessions to utmp/wtmp. + extern const char kEnableUtempter[]; + #endif diff --git a/www/iridium/files/patch-remoting_host_host__attributes.cc b/www/iridium/files/patch-remoting_host_host__attributes.cc index 9e813e9511b0..08a85daadd6e 100644 --- a/www/iridium/files/patch-remoting_host_host__attributes.cc +++ b/www/iridium/files/patch-remoting_host_host__attributes.cc @@ -1,6 +1,6 @@ ---- remoting/host/host_attributes.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/host_attributes.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/host/host_attributes.cc -@@ -122,7 +122,7 @@ std::string GetHostAttributes() { +@@ -121,7 +121,7 @@ std::string GetHostAttributes() { media::InitializeMediaFoundation()) { result.push_back("HWEncoder"); } diff --git a/www/iridium/files/patch-remoting_host_host__main.cc b/www/iridium/files/patch-remoting_host_host__main.cc index 4c5da7721228..ba70bb6cd120 100644 --- a/www/iridium/files/patch-remoting_host_host__main.cc +++ b/www/iridium/files/patch-remoting_host_host__main.cc @@ -1,4 +1,4 @@ ---- remoting/host/host_main.cc.orig 2022-04-01 07:48:30 UTC +--- remoting/host/host_main.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/host/host_main.cc @@ -50,7 +50,7 @@ int FileChooserMain(); int RdpDesktopSessionMain(); @@ -18,7 +18,7 @@ " --audio-pipe-name=<pipe> - Sets the pipe name to capture audio on " "Linux.\n" #endif // BUILDFLAG(IS_LINUX) -@@ -154,7 +154,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro +@@ -155,7 +155,7 @@ MainRoutineFn SelectMainRoutine(const std::string& pro } else if (process_type == kProcessTypeUrlForwarderConfigurator) { main_routine = &UrlForwarderConfiguratorMain; #endif // BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc index 7da4380afeac..56d6413e4346 100644 --- a/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc +++ b/www/iridium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc @@ -1,47 +1,47 @@ ---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/host/it2me/it2me_native_messaging_host_main.cc @@ -30,7 +30,7 @@ #include "remoting/host/resources.h" #include "remoting/host/usage_stats_consent.h" --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) #include <gtk/gtk.h> #include "base/linux_util.h" -@@ -76,7 +76,7 @@ bool CurrentProcessHasUiAccess() { +@@ -77,7 +77,7 @@ bool CurrentProcessHasUiAccess() { // Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and // runs the task executor until It2MeNativeMessagingHost signals shutdown. int It2MeNativeMessagingHostMain(int argc, char** argv) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) x11::InitXlib(); -@@ -121,7 +121,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -123,7 +123,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv remoting::LoadResources(""); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) // Required for any calls into GTK functions, such as the Disconnect and // Continue windows. Calling with nullptr arguments because we don't have // any command line arguments for gtk to consume. -@@ -254,7 +254,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -257,7 +257,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(), context->management_service()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = -@@ -276,7 +276,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv +@@ -280,7 +280,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv // Run the loop until channel is alive. run_loop.Run(); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); diff --git a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc index 8ea1ccef32ea..d35504d6da6d 100644 --- a/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc +++ b/www/iridium/files/patch-remoting_host_me2me__desktop__environment.cc @@ -1,6 +1,6 @@ ---- remoting/host/me2me_desktop_environment.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/me2me_desktop_environment.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/host/me2me_desktop_environment.cc -@@ -143,7 +143,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( +@@ -148,7 +148,7 @@ bool Me2MeDesktopEnvironment::InitializeSecurity( // Otherwise, if the session is shared with the local user start monitoring // the local input and create the in-session UI. diff --git a/www/iridium/files/patch-remoting_host_policy__watcher.cc b/www/iridium/files/patch-remoting_host_policy__watcher.cc new file mode 100644 index 000000000000..2455dbfc76ea --- /dev/null +++ b/www/iridium/files/patch-remoting_host_policy__watcher.cc @@ -0,0 +1,11 @@ +--- remoting/host/policy_watcher.cc.orig 2022-10-05 07:34:01 UTC ++++ remoting/host/policy_watcher.cc +@@ -184,7 +184,7 @@ std::unique_ptr<base::DictionaryValue> PolicyWatcher:: + result->SetStringKey(key::kRemoteAccessHostUdpPortRange, ""); + result->SetIntKey(key::kRemoteAccessHostClipboardSizeBytes, -1); + result->SetBoolKey(key::kRemoteAccessHostAllowRemoteSupportConnections, true); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + result->SetBoolKey(key::kRemoteAccessHostMatchUsername, false); + #endif + #if !BUILDFLAG(IS_CHROMEOS) diff --git a/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc b/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc index c87070bbfe4d..1294776e9954 100644 --- a/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc +++ b/www/iridium/files/patch-remoting_host_remote__open__url_remote__open__url__client.cc @@ -1,6 +1,6 @@ ---- remoting/host/remote_open_url/remote_open_url_client.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/remote_open_url/remote_open_url_client.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/host/remote_open_url/remote_open_url_client.cc -@@ -15,7 +15,7 @@ +@@ -18,7 +18,7 @@ #include "remoting/host/mojom/chromoting_host_services.mojom.h" #include "remoting/host/mojom/remote_url_opener.mojom.h" @@ -9,7 +9,7 @@ #include "remoting/host/remote_open_url/remote_open_url_client_delegate_linux.h" #elif BUILDFLAG(IS_WIN) #include "remoting/host/remote_open_url/remote_open_url_client_delegate_win.h" -@@ -28,7 +28,7 @@ namespace { +@@ -31,7 +31,7 @@ namespace { constexpr base::TimeDelta kRequestTimeout = base::Seconds(5); std::unique_ptr<RemoteOpenUrlClient::Delegate> CreateDelegate() { diff --git a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc index a25fbe668e1b..eb8a4aa6de5c 100644 --- a/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc +++ b/www/iridium/files/patch-remoting_host_remoting__me2me__host.cc @@ -1,15 +1,31 @@ ---- remoting/host/remoting_me2me_host.cc.orig 2022-04-01 07:48:30 UTC +--- remoting/host/remoting_me2me_host.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/host/remoting_me2me_host.cc -@@ -124,7 +124,7 @@ +@@ -125,7 +125,7 @@ #include "remoting/host/mac/permission_utils.h" #endif // BUILDFLAG(IS_APPLE) --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) #include <gtk/gtk.h> + #include "ui/events/platform/x11/x11_event_source.h" +@@ -133,13 +133,13 @@ + #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && + // defined(REMOTING_USE_X11) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "base/linux_util.h" -@@ -168,7 +168,7 @@ const char kApplicationName[] = "chromoting"; + #include "remoting/host/audio_capturer_linux.h" + #include "remoting/host/linux/certificate_watcher.h" + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "remoting/host/host_utmp_logger.h" + #endif + +@@ -177,7 +177,7 @@ const char kApplicationName[] = "chromoting"; const char kStdinConfigPath[] = "-"; #endif // !defined(REMOTING_MULTI_PROCESS) @@ -18,7 +34,7 @@ // The command line switch used to pass name of the pipe to capture audio on // linux. const char kAudioPipeSwitchName[] = "audio-pipe-name"; -@@ -373,7 +373,7 @@ class HostProcess : public ConfigWatcher::Delegate, +@@ -385,7 +385,7 @@ class HostProcess : public ConfigWatcher::Delegate, std::unique_ptr<ChromotingHostContext> context_; @@ -26,8 +42,17 @@ +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) // Watch for certificate changes and kill the host when changes occur std::unique_ptr<CertificateWatcher> cert_watcher_; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +@@ -451,7 +451,7 @@ class HostProcess : public ConfigWatcher::Delegate, + + std::unique_ptr<HostStatusLogger> host_status_logger_; + std::unique_ptr<HostEventLogger> host_event_logger_; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<HostUTMPLogger> host_utmp_logger_; #endif -@@ -747,7 +747,7 @@ void HostProcess::StartOnNetworkThread() { + std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_; +@@ -759,7 +759,7 @@ void HostProcess::StartOnNetworkThread() { void HostProcess::ShutdownOnNetworkThread() { DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); config_watcher_.reset(); @@ -36,7 +61,7 @@ cert_watcher_.reset(); #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) } -@@ -806,7 +806,7 @@ void HostProcess::CreateAuthenticatorFactory() { +@@ -818,7 +818,7 @@ void HostProcess::CreateAuthenticatorFactory() { DCHECK(third_party_auth_config_.token_url.is_valid()); DCHECK(third_party_auth_config_.token_validation_url.is_valid()); @@ -45,7 +70,7 @@ if (!cert_watcher_) { cert_watcher_ = std::make_unique<CertificateWatcher>( base::BindRepeating(&HostProcess::ShutdownHost, -@@ -916,7 +916,7 @@ void HostProcess::StartOnUiThread() { +@@ -937,7 +937,7 @@ void HostProcess::StartOnUiThread() { base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)), base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this))); @@ -54,7 +79,7 @@ // If an audio pipe is specific on the command-line then initialize // AudioCapturerLinux to capture from it. base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()-> -@@ -987,7 +987,7 @@ void HostProcess::ShutdownOnUiThread() { +@@ -1008,7 +1008,7 @@ void HostProcess::ShutdownOnUiThread() { // It is now safe for the HostProcess to be deleted. self_ = nullptr; @@ -63,30 +88,57 @@ // Cause the global AudioPipeReader to be freed, otherwise the audio // thread will remain in-use and prevent the process from exiting. // TODO(wez): DesktopEnvironmentFactory should own the pipe reader. -@@ -1697,7 +1697,7 @@ void HostProcess::StartHost() { +@@ -1016,7 +1016,7 @@ void HostProcess::ShutdownOnUiThread() { + AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath()); + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) + context_->input_task_runner()->PostTask( + FROM_HERE, + base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); })); +@@ -1343,7 +1343,7 @@ bool HostProcess::OnUsernamePolicyUpdate(base::Diction + // Returns false: never restart the host after this policy update. + DCHECK(context_->network_task_runner()->BelongsToCurrentThread()); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + absl::optional<bool> host_username_match_required = + policies->FindBoolKey(policy::key::kRemoteAccessHostMatchUsername); + if (!host_username_match_required.has_value()) +@@ -1727,7 +1727,7 @@ void HostProcess::StartHost() { // The feature is enabled for all Googlers using a supported platform. desktop_environment_options_.set_enable_remote_open_url(is_googler_); --#if BUILDFLAG(IS_LINUX) || !defined(NDEBUG) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || !defined(NDEBUG) - // Experimental feature. Enabled on Linux for easier testing. - if (is_googler_) { - desktop_environment_options_.set_enable_remote_webauthn(true); -@@ -1897,7 +1897,7 @@ int HostProcessMain() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + desktop_environment_options_.set_enable_remote_webauthn(is_googler_); + #endif + +@@ -1760,7 +1760,7 @@ void HostProcess::StartHost() { + host_status_logger_ = std::make_unique<HostStatusLogger>( + host_->status_monitor(), log_to_server_.get()); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); + if (cmd_line->HasSwitch(kEnableUtempter)) + host_utmp_logger_ = +@@ -1929,7 +1929,7 @@ int HostProcessMain() { HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION); const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #if defined(REMOTING_USE_X11) // Initialize Xlib for multi-threaded use, allowing non-Chromium code to // use X11 safely (such as the WebRTC capturer, GTK ...) - x11::InitXlib(); -@@ -1941,7 +1941,7 @@ int HostProcessMain() { +@@ -1975,7 +1975,7 @@ int HostProcessMain() { std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier( net::NetworkChangeNotifier::CreateIfNeeded()); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) +-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11) // Create an X11EventSource on all UI threads, so the global X11 connection // (x11::Connection::Get()) can dispatch X events. auto event_source = diff --git a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc index 7fbac8c5ac3d..1141fe6b5b41 100644 --- a/www/iridium/files/patch-remoting_host_setup_start__host__main.cc +++ b/www/iridium/files/patch-remoting_host_setup_start__host__main.cc @@ -1,6 +1,6 @@ ---- remoting/host/setup/start_host_main.cc.orig 2022-03-28 18:11:04 UTC +--- remoting/host/setup/start_host_main.cc.orig 2022-10-05 07:34:01 UTC +++ remoting/host/setup/start_host_main.cc -@@ -32,7 +32,7 @@ +@@ -31,7 +31,7 @@ #include <unistd.h> #endif // BUILDFLAG(IS_POSIX) @@ -9,7 +9,7 @@ #include "remoting/host/setup/daemon_controller_delegate_linux.h" #include "remoting/host/setup/start_host_as_root.h" #endif // BUILDFLAG(IS_LINUX) -@@ -126,7 +126,7 @@ void OnDone(HostStarter::Result result) { +@@ -125,7 +125,7 @@ void OnDone(HostStarter::Result result) { } // namespace int StartHostMain(int argc, char** argv) { @@ -18,7 +18,7 @@ // Minimize the amount of code that runs as root on Posix systems. if (getuid() == 0) { return remoting::StartHostAsRoot(argc, argv); -@@ -163,7 +163,7 @@ int StartHostMain(int argc, char** argv) { +@@ -162,7 +162,7 @@ int StartHostMain(int argc, char** argv) { // for the account which generated |code|. std::string host_owner = command_line->GetSwitchValueASCII("host-owner"); diff --git a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc new file mode 100644 index 000000000000..be166a373549 --- /dev/null +++ b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc @@ -0,0 +1,29 @@ +--- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2022-10-05 07:34:01 UTC ++++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc +@@ -9,7 +9,7 @@ + #include "base/strings/utf_string_conversions.h" + #include "build/build_config.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD) + #include "base/containers/fixed_flat_set.h" + #include "base/files/file_path.h" + #include "base/process/process_handle.h" +@@ -37,7 +37,7 @@ namespace { + + // No static variables needed for debug builds. + +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + + constexpr auto kAllowedCallerPrograms = + base::MakeFixedFlatSet<base::FilePath::StringPieceType>({ +@@ -76,7 +76,7 @@ bool IsLaunchedByTrustedProcess() { + #if !defined(NDEBUG) + // Just return true on debug builds for the convenience of development. + return true; +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::ProcessId parent_pid = + base::GetParentProcessId(base::GetCurrentProcessHandle()); + // Note that on Linux the process image may no longer exist in its original diff --git a/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc new file mode 100644 index 000000000000..650242d6b215 --- /dev/null +++ b/www/iridium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc @@ -0,0 +1,28 @@ +--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2022-10-05 07:34:01 UTC ++++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc +@@ -23,7 +23,7 @@ + #include "base/threading/sequenced_task_runner_handle.h" + #include "build/build_config.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "base/environment.h" + #include "base/nix/xdg_util.h" + #include "base/strings/string_util.h" +@@ -68,14 +68,14 @@ static constexpr char kExtensionWakeupFileContent[] = + // Caller should check if the directory exists before writing files to it. A + // directory only exists if the corresponding Chrome version is installed. + std::vector<base::FilePath> GetRemoteStateChangeDirPaths() { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) + constexpr base::FilePath::CharType kStateChangeDirName[] = + FILE_PATH_LITERAL("WebAuthenticationProxyRemoteSessionStateChange"); + #endif + + std::vector<base::FilePath> dirs; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // See: chrome/common/chrome_paths_linux.cc + auto env = base::Environment::Create(); + base::FilePath base_path; diff --git a/www/iridium/files/patch-remoting_resources_remoting__strings.grd b/www/iridium/files/patch-remoting_resources_remoting__strings.grd index 0a6551c24fca..096d925f8274 100644 --- a/www/iridium/files/patch-remoting_resources_remoting__strings.grd +++ b/www/iridium/files/patch-remoting_resources_remoting__strings.grd @@ -1,6 +1,6 @@ ---- remoting/resources/remoting_strings.grd.orig 2022-03-28 18:11:04 UTC +--- remoting/resources/remoting_strings.grd.orig 2022-10-05 07:34:01 UTC +++ remoting/resources/remoting_strings.grd -@@ -936,7 +936,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. +@@ -955,7 +955,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. <message name="IDS_URL_FORWARDER_INCORRECTLY_CONFIGURED" desc="Message shown when the Chrome Remote Desktop URL forwarder is incorrectly configured."> <ph name="URL_FORWARDER_NAME">%s<ex>Chrome Remote Desktop URL Forwarder</ex></ph> is not configured correctly. Please choose a different default web browser and then enable URL forwarding again. </message> @@ -9,7 +9,7 @@ <message name="IDS_SESSION_DIALOG_MESSAGE" desc="The message to show at the top of the session-selection dialog."> Select a session to launch within your Chrome Remote Desktop environment. (Note that some session types may not support running within Chrome Remote Desktop and on the local console simultaneously.) </message> -@@ -952,7 +952,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. +@@ -971,7 +971,7 @@ If '<ph name="SERVICE_SCRIPT_NAME">$3<ex>org.chromium. <message name="IDS_SESSION_DIALOG_DEFAULT_SESSION_COMMENT" desc="The comment for the entry to launch the default session."> Launch the default XSession </message> diff --git a/www/iridium/files/patch-sandbox_BUILD.gn b/www/iridium/files/patch-sandbox_BUILD.gn index ac6dfe163bf8..f886ae7b3745 100644 --- a/www/iridium/files/patch-sandbox_BUILD.gn +++ b/www/iridium/files/patch-sandbox_BUILD.gn @@ -1,6 +1,6 @@ ---- sandbox/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- sandbox/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ sandbox/BUILD.gn -@@ -27,7 +27,7 @@ group("sandbox") { +@@ -49,7 +49,7 @@ group("sandbox") { "//sandbox/mac:system_services", "//sandbox/mac/mojom", ] diff --git a/www/iridium/files/patch-sandbox_policy_BUILD.gn b/www/iridium/files/patch-sandbox_policy_BUILD.gn index bbb00666a56a..07da53d91662 100644 --- a/www/iridium/files/patch-sandbox_policy_BUILD.gn +++ b/www/iridium/files/patch-sandbox_policy_BUILD.gn @@ -1,15 +1,15 @@ ---- sandbox/policy/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- sandbox/policy/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ sandbox/policy/BUILD.gn -@@ -35,7 +35,7 @@ component("policy") { +@@ -36,7 +36,7 @@ component("policy") { "//sandbox/policy/mojom", ] - public_deps = [] + public_deps = [ "//sandbox:common" ] - if (is_linux || is_chromeos) { + if ((is_linux || is_chromeos) && !is_bsd) { sources += [ "linux/bpf_audio_policy_linux.cc", "linux/bpf_audio_policy_linux.h", -@@ -88,6 +88,27 @@ component("policy") { +@@ -95,6 +95,27 @@ component("policy") { "//sandbox/linux:sandbox_services", "//sandbox/linux:seccomp_bpf", "//sandbox/linux:suid_sandbox_client", diff --git a/www/iridium/files/patch-sandbox_policy_features.cc b/www/iridium/files/patch-sandbox_policy_features.cc index 5fa4be837913..87f3ff7eb452 100644 --- a/www/iridium/files/patch-sandbox_policy_features.cc +++ b/www/iridium/files/patch-sandbox_policy_features.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/features.cc.orig 2022-03-28 18:11:04 UTC +--- sandbox/policy/features.cc.orig 2022-10-05 07:34:01 UTC +++ sandbox/policy/features.cc -@@ -16,7 +16,11 @@ namespace features { +@@ -14,7 +14,11 @@ namespace sandbox::policy::features { // Enables network service sandbox. // (Only causes an effect when feature kNetworkService is enabled.) const base::Feature kNetworkServiceSandbox{"NetworkServiceSandbox", diff --git a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc index 61c39df7211e..b0b85e079d73 100644 --- a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc +++ b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2022-03-28 18:11:04 UTC +--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ sandbox/policy/freebsd/sandbox_freebsd.cc -@@ -0,0 +1,247 @@ +@@ -0,0 +1,253 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -35,6 +35,7 @@ +#include "base/posix/eintr_wrapper.h" +#include "base/strings/string_number_conversions.h" +#include "base/system/sys_info.h" ++#include "base/threading/thread.h" +#include "base/time/time.h" +#include "build/build_config.h" +#include "sandbox/constants.h" @@ -97,6 +98,11 @@ + return instance; +} + ++void SandboxLinux::StopThread(base::Thread* thread) { ++ DCHECK(thread); ++ thread->Stop(); ++} ++ +void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) { + CHECK(!pre_initialized_); +#if BUILDFLAG(USING_SANITIZER) @@ -125,7 +131,7 @@ + auto* display = connection->GetXlibDisplay().display(); + + char buf[1]; -+ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, base::size(buf)); ++ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, std::size(buf)); + } + + if (process_type.empty()) { diff --git a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom index 2e3391593673..be313e92a12f 100644 --- a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom +++ b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom @@ -1,6 +1,6 @@ ---- sandbox/policy/mojom/sandbox.mojom.orig 2022-03-28 18:11:04 UTC +--- sandbox/policy/mojom/sandbox.mojom.orig 2022-10-05 07:34:01 UTC +++ sandbox/policy/mojom/sandbox.mojom -@@ -68,6 +68,12 @@ enum Sandbox { +@@ -72,6 +72,12 @@ enum Sandbox { [EnableIf=is_fuchsia] kVideoCapture, diff --git a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc index 007eefd5cb24..089b476617e8 100644 --- a/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc +++ b/www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc @@ -1,6 +1,6 @@ ---- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-03-28 18:11:04 UTC +--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2022-10-05 07:34:01 UTC +++ sandbox/policy/openbsd/sandbox_openbsd.cc -@@ -0,0 +1,407 @@ +@@ -0,0 +1,413 @@ +// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -36,6 +36,7 @@ +#include "base/posix/eintr_wrapper.h" +#include "base/strings/string_number_conversions.h" +#include "base/system/sys_info.h" ++#include "base/threading/thread.h" +#include "base/time/time.h" +#include "build/build_config.h" +#include "sandbox/constants.h" @@ -101,6 +102,11 @@ + return instance; +} + ++void SandboxLinux::StopThread(base::Thread* thread) { ++ DCHECK(thread); ++ thread->Stop(); ++} ++ +void SandboxLinux::PreinitializeSandbox(sandbox::mojom::Sandbox sandbox_type) { + CHECK(!pre_initialized_); +#if BUILDFLAG(USING_SANITIZER) @@ -133,7 +139,7 @@ + auto* display = connection->GetXlibDisplay().display(); + + char buf[1]; -+ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, base::size(buf)); ++ XGetErrorDatabaseText(display, "XProtoError", "0", "", buf, std::size(buf)); + } + + if (process_type.empty()) { diff --git a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc index f7b0eb212ef9..dcd8ba9be830 100644 --- a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc +++ b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc @@ -1,4 +1,4 @@ ---- sandbox/policy/sandbox_type.cc.orig 2022-03-28 18:11:04 UTC +--- sandbox/policy/sandbox_type.cc.orig 2022-10-05 07:34:01 UTC +++ sandbox/policy/sandbox_type.cc @@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { #endif @@ -9,7 +9,16 @@ case Sandbox::kVideoCapture: return false; #endif -@@ -122,7 +122,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi +@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) { + case Sandbox::kMirroring: + case Sandbox::kNaClLoader: + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoDecoding: + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi #endif case Sandbox::kPrintCompositor: case Sandbox::kAudio: @@ -18,7 +27,16 @@ case Sandbox::kVideoCapture: #endif #if BUILDFLAG(IS_WIN) -@@ -247,7 +247,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb +@@ -138,7 +138,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi + case Sandbox::kMediaFoundationCdm: + case Sandbox::kWindowsSystemProxyResolver: + #endif // BUILDFLAG(IS_WIN) +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoDecoding: + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + #if BUILDFLAG(IS_CHROMEOS_ASH) +@@ -257,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb return switches::kUtilitySandbox; case Sandbox::kAudio: return switches::kAudioSandbox; @@ -27,12 +45,26 @@ case Sandbox::kVideoCapture: return switches::kVideoCaptureSandbox; #endif -@@ -355,7 +355,7 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( - return Sandbox::kAudio; - if (sandbox_string == switches::kSpeechRecognitionSandbox) - return Sandbox::kSpeechRecognition; +@@ -287,7 +287,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb + case Sandbox::kMirroring: + return switches::kMirroringSandbox; + #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + case Sandbox::kHardwareVideoDecoding: + return switches::kHardwareVideoDecodingSandbox; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) +@@ -375,11 +375,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString( + if (sandbox_string == switches::kScreenAISandbox) + return Sandbox::kScreenAI; + #endif -#if BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) if (sandbox_string == switches::kVideoCaptureSandbox) return Sandbox::kVideoCapture; #endif +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + if (sandbox_string == switches::kHardwareVideoDecodingSandbox) + return Sandbox::kHardwareVideoDecoding; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) diff --git a/www/iridium/files/patch-sandbox_policy_switches.cc b/www/iridium/files/patch-sandbox_policy_switches.cc index 3df244b702f1..980397d2e4d1 100644 --- a/www/iridium/files/patch-sandbox_policy_switches.cc +++ b/www/iridium/files/patch-sandbox_policy_switches.cc @@ -1,6 +1,15 @@ ---- sandbox/policy/switches.cc.orig 2022-03-28 18:11:04 UTC +--- sandbox/policy/switches.cc.orig 2022-10-05 07:34:01 UTC +++ sandbox/policy/switches.cc -@@ -95,7 +95,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f +@@ -54,7 +54,7 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro + const char kMirroringSandbox[] = "mirroring"; + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + const char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding"; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + +@@ -101,7 +101,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f // Meant to be used as a browser-level switch for testing purposes only. const char kNoSandbox[] = "no-sandbox"; diff --git a/www/iridium/files/patch-sandbox_policy_switches.h b/www/iridium/files/patch-sandbox_policy_switches.h index b1c31829d3fc..b36f19c01e01 100644 --- a/www/iridium/files/patch-sandbox_policy_switches.h +++ b/www/iridium/files/patch-sandbox_policy_switches.h @@ -1,6 +1,15 @@ ---- sandbox/policy/switches.h.orig 2022-03-28 18:11:04 UTC +--- sandbox/policy/switches.h.orig 2022-10-05 07:34:01 UTC +++ sandbox/policy/switches.h -@@ -71,7 +71,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid +@@ -56,7 +56,7 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem + SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[]; + #endif // BUILDFLAG(IS_MAC) + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD) + SANDBOX_POLICY_EXPORT extern const char kHardwareVideoDecodingSandbox[]; + #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) + +@@ -78,7 +78,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[]; SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[]; SANDBOX_POLICY_EXPORT extern const char kNoSandbox[]; diff --git a/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc index 0332cb93a1db..00242505f4bb 100644 --- a/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc +++ b/www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc @@ -1,30 +1,28 @@ ---- services/cert_verifier/cert_verifier_creation.cc.orig 2022-03-28 18:11:04 UTC +--- services/cert_verifier/cert_verifier_creation.cc.orig 2022-10-05 07:34:01 UTC +++ services/cert_verifier/cert_verifier_creation.cc -@@ -86,7 +86,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro - scoped_refptr<net::CertVerifyProc> CreateOldDefaultWithoutCaching( - scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { - scoped_refptr<net::CertVerifyProc> verify_proc; --#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - verify_proc = - net::CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher)); +@@ -12,7 +12,7 @@ + #include "net/cert_net/cert_net_fetcher_url_request.h" + #include "net/net_buildflags.h" + +-#if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \ ++#if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || BUILDFLAG(IS_BSD) || \ + BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) + #include "net/cert/cert_verify_proc_builtin.h" + #include "net/cert/internal/system_trust_store.h" +@@ -119,7 +119,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce + user_slot_restriction_ ? crypto::ScopedPK11Slot(PK11_ReferenceSlot( + user_slot_restriction_.get())) + : nullptr)); +-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + verify_proc = net::CreateCertVerifyProcBuiltin( + std::move(cert_net_fetcher), net::CreateSslSystemTrustStore()); #else -@@ -104,7 +104,7 @@ scoped_refptr<net::CertVerifyProc> CreateNewDefaultWit - scoped_refptr<net::CertNetFetcher> cert_net_fetcher) { - scoped_refptr<net::CertVerifyProc> verify_proc; - #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) - verify_proc = net::CreateCertVerifyProcBuiltin( - std::move(cert_net_fetcher), net::CreateSslSystemTrustStoreChromeRoot()); - #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) -@@ -122,7 +122,8 @@ bool IsUsingCertNetFetcher() { +@@ -294,6 +294,7 @@ bool IsUsingChromeRootStore( + bool IsUsingCertNetFetcher() { #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \ ++ BUILDFLAG(IS_BSD) || \ BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \ -- BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) -+ BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \ -+ BUILDFLAG(IS_BSD) - return true; - #else - return false; + BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \ + BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) diff --git a/www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc b/www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc new file mode 100644 index 000000000000..f61493ec4929 --- /dev/null +++ b/www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc @@ -0,0 +1,10 @@ +--- services/device/compute_pressure/cpu_probe.cc.orig 2022-10-05 07:34:01 UTC ++++ services/device/compute_pressure/cpu_probe.cc +@@ -63,6 +63,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() { + #elif BUILDFLAG(IS_MAC) + return CpuProbeMac::Create(); + #else ++ NOTIMPLEMENTED(); + return std::make_unique<NullCpuProbe>(); + #endif // BUILDFLAG(IS_ANDROID) + } diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc index 58707abb3e41..cf540ae9bf1a 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc +++ b/www/iridium/files/patch-services_device_hid_hid__connection__fido.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_connection_fido.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/hid/hid_connection_fido.cc.orig 2022-10-05 07:34:01 UTC +++ services/device/hid/hid_connection_fido.cc -@@ -0,0 +1,198 @@ +@@ -0,0 +1,197 @@ +// Copyright (c) 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -12,7 +12,6 @@ +#include "base/location.h" +#include "base/numerics/safe_math.h" +#include "base/posix/eintr_wrapper.h" -+#include "base/task/post_task.h" +#include "base/task/single_thread_task_runner.h" +#include "base/threading/scoped_blocking_call.h" +#include "base/threading/thread_restrictions.h" diff --git a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc index 8801006fe07d..be16331619fa 100644 --- a/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc +++ b/www/iridium/files/patch-services_device_hid_hid__connection__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_connection_freebsd.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/hid/hid_connection_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ services/device/hid/hid_connection_freebsd.cc -@@ -0,0 +1,243 @@ +@@ -0,0 +1,242 @@ +// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -16,7 +16,6 @@ +#include "base/numerics/safe_math.h" +#include "base/posix/eintr_wrapper.h" +#include "base/strings/stringprintf.h" -+#include "base/task/post_task.h" +#include "base/task/single_thread_task_runner.h" +#include "base/threading/scoped_blocking_call.h" +#include "base/threading/thread_restrictions.h" diff --git a/www/iridium/files/patch-services_device_hid_hid__service.cc b/www/iridium/files/patch-services_device_hid_hid__service.cc index 5764d14b5adc..2ebbeeed6fc1 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service.cc +++ b/www/iridium/files/patch-services_device_hid_hid__service.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/hid/hid_service.cc.orig 2022-10-05 07:34:01 UTC +++ services/device/hid/hid_service.cc -@@ -18,6 +18,10 @@ +@@ -19,6 +19,10 @@ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) #include "services/device/hid/hid_service_linux.h" @@ -11,7 +11,7 @@ #elif BUILDFLAG(IS_MAC) #include "services/device/hid/hid_service_mac.h" #elif BUILDFLAG(IS_WIN) -@@ -61,6 +65,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr +@@ -62,6 +66,10 @@ constexpr base::TaskTraits HidService::kBlockingTaskTr std::unique_ptr<HidService> HidService::Create() { #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_UDEV) return base::WrapUnique(new HidServiceLinux()); diff --git a/www/iridium/files/patch-services_device_hid_hid__service__fido.cc b/www/iridium/files/patch-services_device_hid_hid__service__fido.cc index c2bc53d40a8b..b283d736f9f7 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service__fido.cc +++ b/www/iridium/files/patch-services_device_hid_hid__service__fido.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_fido.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/hid/hid_service_fido.cc.orig 2022-10-05 07:34:01 UTC +++ services/device/hid/hid_service_fido.cc -@@ -0,0 +1,328 @@ +@@ -0,0 +1,327 @@ +// Copyright 2020 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -38,7 +38,6 @@ +#include "base/strings/string_util.h" +#include "base/strings/stringprintf.h" +#include "base/strings/sys_string_conversions.h" -+#include "base/task/post_task.h" +#include "base/threading/scoped_blocking_call.h" +#include "base/threading/thread_task_runner_handle.h" +#include "components/device_event_log/device_event_log.h" diff --git a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc index 622a7530317b..01a91421f240 100644 --- a/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc +++ b/www/iridium/files/patch-services_device_hid_hid__service__freebsd.cc @@ -1,6 +1,6 @@ ---- services/device/hid/hid_service_freebsd.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/hid/hid_service_freebsd.cc.orig 2022-10-05 07:34:01 UTC +++ services/device/hid/hid_service_freebsd.cc -@@ -0,0 +1,398 @@ +@@ -0,0 +1,397 @@ +// Copyright 2014 The Chromium Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. @@ -30,7 +30,6 @@ +#include "base/strings/sys_string_conversions.h" +#include "base/strings/string_util.h" +#include "base/strings/string_split.h" -+#include "base/task/post_task.h" +#include "base/task/single_thread_task_runner.h" +#include "base/task/thread_pool.h" +#include "base/threading/scoped_blocking_call.h" diff --git a/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc b/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc index 7e213ec3ac39..e5549e4e190d 100644 --- a/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc +++ b/www/iridium/files/patch-services_device_serial_serial__device__enumerator.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_device_enumerator.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/serial/serial_device_enumerator.cc.orig 2022-10-05 07:34:01 UTC +++ services/device/serial/serial_device_enumerator.cc -@@ -10,7 +10,7 @@ +@@ -11,7 +11,7 @@ #include "build/build_config.h" #include "components/device_event_log/device_event_log.h" @@ -9,7 +9,7 @@ #include "services/device/serial/serial_device_enumerator_linux.h" #elif BUILDFLAG(IS_MAC) #include "services/device/serial/serial_device_enumerator_mac.h" -@@ -23,7 +23,7 @@ namespace device { +@@ -24,7 +24,7 @@ namespace device { // static std::unique_ptr<SerialDeviceEnumerator> SerialDeviceEnumerator::Create( scoped_refptr<base::SingleThreadTaskRunner> ui_task_runner) { diff --git a/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc index 136bd7c22aac..b25f549c0a5a 100644 --- a/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc +++ b/www/iridium/files/patch-services_device_serial_serial__io__handler__posix.cc @@ -1,6 +1,6 @@ ---- services/device/serial/serial_io_handler_posix.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/serial/serial_io_handler_posix.cc.orig 2022-10-05 07:34:01 UTC +++ services/device/serial/serial_io_handler_posix.cc -@@ -68,7 +68,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee +@@ -67,7 +67,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee BITRATE_TO_SPEED_CASE(9600) BITRATE_TO_SPEED_CASE(19200) BITRATE_TO_SPEED_CASE(38400) diff --git a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc index bf5faf4dca15..8b8754800964 100644 --- a/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc +++ b/www/iridium/files/patch-services_device_time__zone__monitor_time__zone__monitor__linux.cc @@ -1,4 +1,4 @@ ---- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2022-03-28 18:11:04 UTC +--- services/device/time_zone_monitor/time_zone_monitor_linux.cc.orig 2022-10-05 07:34:01 UTC +++ services/device/time_zone_monitor/time_zone_monitor_linux.cc @@ -137,7 +137,11 @@ class TimeZoneMonitorLinuxImpl // false positives are harmless, assuming the false positive rate is @@ -10,5 +10,5 @@ "/etc/localtime", "/etc/timezone", "/etc/TZ", +#endif }; - for (size_t index = 0; index < base::size(kFilesToWatch); ++index) { + for (size_t index = 0; index < std::size(kFilesToWatch); ++index) { file_path_watchers_.push_back(std::make_unique<base::FilePathWatcher>()); diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn index 4d9222bebbbc..da51f3b6ce15 100644 --- a/www/iridium/files/patch-services_network_BUILD.gn +++ b/www/iridium/files/patch-services_network_BUILD.gn @@ -1,6 +1,6 @@ ---- services/network/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- services/network/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ services/network/BUILD.gn -@@ -323,7 +323,6 @@ if (is_linux || is_chromeos) { +@@ -322,7 +322,6 @@ if (is_linux || is_chromeos) { ] deps = [ "//base:base", diff --git a/www/iridium/files/patch-services_network_network__service.cc b/www/iridium/files/patch-services_network_network__service.cc index a75979cdb728..fe688ced04ff 100644 --- a/www/iridium/files/patch-services_network_network__service.cc +++ b/www/iridium/files/patch-services_network_network__service.cc @@ -1,11 +1,11 @@ ---- services/network/network_service.cc.orig 2022-04-01 07:48:30 UTC +--- services/network/network_service.cc.orig 2022-10-05 07:34:01 UTC +++ services/network/network_service.cc -@@ -82,7 +82,7 @@ +@@ -83,7 +83,7 @@ #include "third_party/boringssl/src/include/openssl/cpu.h" #endif --#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ - !BUILDFLAG(IS_CHROMECAST) +-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ ++#if ((BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)) || \ + BUILDFLAG(IS_CHROMEOS_LACROS) + #include "components/os_crypt/key_storage_config_linux.h" - #endif diff --git a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc index 4773b6813edb..03b05ec02ba0 100644 --- a/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc +++ b/www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc @@ -1,4 +1,4 @@ ---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-03-28 18:11:04 UTC +--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-10-05 07:34:01 UTC +++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc @@ -52,7 +52,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO uint32_t shared_resident_kb) { @@ -9,7 +9,7 @@ uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes; uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes; return (rss_anon_bytes + vm_swap_bytes) / 1024; -@@ -91,7 +91,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl +@@ -80,7 +80,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable; os_dump->private_footprint_kb = CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb); @@ -18,7 +18,7 @@ os_dump->private_footprint_swap_kb = internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024; #endif -@@ -270,7 +270,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -259,7 +259,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // On most platforms each process can dump data about their own process // so ask each process to do so Linux is special see below. @@ -27,7 +27,7 @@ request->pending_responses.insert({client_info.pid, ResponseType::kOSDump}); client->RequestOSMemoryDump(request->memory_map_option(), {base::kNullProcessId}, -@@ -285,7 +285,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( +@@ -274,7 +274,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch( // In some cases, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -36,7 +36,7 @@ std::vector<base::ProcessId> pids; mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = base::kNullProcessId; -@@ -331,7 +331,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion +@@ -320,7 +320,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion const OsCallback& os_callback) { // On Linux, OS stats can only be dumped from a privileged process to // get around to sandboxing/selinux restrictions (see crbug.com/461788). @@ -45,7 +45,7 @@ mojom::ClientProcess* browser_client = nullptr; base::ProcessId browser_client_pid = 0; for (const auto& client_info : clients) { -@@ -382,7 +382,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( +@@ -371,7 +371,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest( // each client process provides 1 OS dump, % the case where the client is // disconnected mid dump. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; @@ -54,7 +54,7 @@ for (auto& kv : extra_os_dumps) { auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first; DCHECK(results.find(pid) == results.end()); -@@ -444,7 +444,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* +@@ -433,7 +433,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest* // crash). In the latter case (OS_LINUX) we expect the full map to come // from the browser process response. OSMemDumpMap& extra_os_dumps = response.second.os_dumps; diff --git a/www/iridium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc b/www/iridium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc deleted file mode 100644 index 831e91c6b218..000000000000 --- a/www/iridium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2022-03-28 18:11:04 UTC -+++ services/tracing/public/cpp/perfetto/perfetto_config.cc -@@ -124,7 +124,7 @@ void AddDataSourceConfigs( - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_CHROMEOS_ASH) || \ -- (BUILDFLAG(IS_CHROMECAST) && BUILDFLAG(IS_LINUX)) -+ (BUILDFLAG(IS_CHROMECAST) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))) - if (source_names.empty() || - source_names.count(tracing::mojom::kSystemTraceDataSourceName) == 1) { - AddDataSourceConfig( diff --git a/www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc index 96499a9588f1..6fd8dd62b516 100644 --- a/www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc +++ b/www/iridium/files/patch-services_video__capture_broadcasting__receiver.cc @@ -1,20 +1,11 @@ ---- services/video_capture/broadcasting_receiver.cc.orig 2022-03-28 18:11:04 UTC +--- services/video_capture/broadcasting_receiver.cc.orig 2022-10-05 07:34:01 UTC +++ services/video_capture/broadcasting_receiver.cc -@@ -28,7 +28,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB - void CloneSharedBufferToRawFileDescriptorHandle( - const mojo::ScopedSharedBufferHandle& source, - media::mojom::VideoBufferHandlePtr* target) { --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file - // descriptor can be extracted which is then mojo-wrapped. - base::subtle::PlatformSharedMemoryRegion platform_region = -@@ -240,7 +240,7 @@ void BroadcastingReceiver::BufferContext:: - ConvertRawFileDescriptorToSharedBuffer() { +@@ -234,7 +234,7 @@ void BroadcastingReceiver::BufferContext:: + ConvertRawFileDescriptorToUnsafeShmemRegion() { DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor()); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // The conversion unwraps the descriptor from its mojo handle to the raw file - // descriptor (ie, an int). This is used to create a - // PlatformSharedMemoryRegion which is then wrapped as a + const size_t handle_size = + buffer_handle_->get_shared_memory_via_raw_file_descriptor() + ->shared_memory_size_in_bytes; diff --git a/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom b/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom index ef0319c19676..deb5266d7c7d 100644 --- a/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom +++ b/www/iridium/files/patch-services_video__capture_public_mojom_video__capture__service.mojom @@ -1,6 +1,6 @@ ---- services/video_capture/public/mojom/video_capture_service.mojom.orig 2022-03-28 18:11:04 UTC +--- services/video_capture/public/mojom/video_capture_service.mojom.orig 2022-10-05 07:34:01 UTC +++ services/video_capture/public/mojom/video_capture_service.mojom -@@ -21,10 +21,10 @@ interface AcceleratorFactory { +@@ -24,10 +24,10 @@ interface AcceleratorFactory { pending_receiver<chromeos_camera.mojom.MjpegDecodeAccelerator> jda); }; diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h index f697f35dab3e..9f25a897d00b 100644 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h @@ -1,24 +1,6 @@ ---- third_party/abseil-cpp/absl/base/config.h.orig 2022-03-28 18:11:04 UTC +--- third_party/abseil-cpp/absl/base/config.h.orig 2022-10-05 07:34:01 UTC +++ third_party/abseil-cpp/absl/base/config.h -@@ -414,7 +414,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != - defined(_AIX) || defined(__ros__) || defined(__native_client__) || \ - defined(__asmjs__) || defined(__wasm__) || defined(__Fuchsia__) || \ - defined(__sun) || defined(__ASYLO__) || defined(__myriad2__) || \ -- defined(__HAIKU__) -+ defined(__HAIKU__) || defined(__OpenBSD__) - #define ABSL_HAVE_MMAP 1 - #endif - -@@ -425,7 +425,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != - #ifdef ABSL_HAVE_PTHREAD_GETSCHEDPARAM - #error ABSL_HAVE_PTHREAD_GETSCHEDPARAM cannot be directly set - #elif defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ -- defined(_AIX) || defined(__ros__) -+ defined(_AIX) || defined(__ros__) || defined(__OpenBSD__) - #define ABSL_HAVE_PTHREAD_GETSCHEDPARAM 1 - #endif - -@@ -444,7 +444,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -458,7 +458,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // POSIX.1-2001. #ifdef ABSL_HAVE_SCHED_YIELD #error ABSL_HAVE_SCHED_YIELD cannot be directly set @@ -28,13 +10,12 @@ #define ABSL_HAVE_SCHED_YIELD 1 #endif -@@ -459,7 +460,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != +@@ -473,7 +474,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] != // platforms. #ifdef ABSL_HAVE_SEMAPHORE_H #error ABSL_HAVE_SEMAPHORE_H cannot be directly set -#elif defined(__linux__) || defined(__ros__) -+#elif defined(__linux__) || defined(__ros__) || defined(__OpenBSD__) || \ -+ defined(__FreeBSD__) ++#elif defined(__linux__) || defined(__ros__) || defined(__OpenBSD__) || defined(__FreeBSD__) #define ABSL_HAVE_SEMAPHORE_H 1 #endif diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_endian.h b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_endian.h deleted file mode 100644 index 26238022497f..000000000000 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_endian.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/abseil-cpp/absl/base/internal/endian.h.orig 2022-03-28 18:11:04 UTC -+++ third_party/abseil-cpp/absl/base/internal/endian.h -@@ -19,7 +19,7 @@ - // The following guarantees declaration of the byte swap functions - #ifdef _MSC_VER - #include <stdlib.h> // NOLINT(build/include) --#elif defined(__FreeBSD__) -+#elif defined(__FreeBSD__) || defined(__OpenBSD__) - #include <sys/endian.h> - #elif defined(__GLIBC__) - #include <byteswap.h> // IWYU pragma: export diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc index 41461ef663ec..b802a81f59f5 100644 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc @@ -1,4 +1,4 @@ ---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc @@ -30,7 +30,7 @@ #include <sys/syscall.h> @@ -9,7 +9,7 @@ #include <sys/sysctl.h> #endif -@@ -308,9 +308,11 @@ static double GetNominalCPUFrequency() { +@@ -307,9 +307,11 @@ static double GetNominalCPUFrequency() { // a new mode (turbo mode). Essentially, those frequencies cannot // always be relied upon. The same reasons apply to /proc/cpuinfo as // well. diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h b/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h index a73ecdf1c9ac..74e13c3682fa 100644 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_debugging_internal_elf__mem__image.h @@ -1,11 +1,11 @@ ---- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-03-28 18:11:04 UTC +--- third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h.orig 2022-10-05 07:34:01 UTC +++ third_party/abseil-cpp/absl/debugging/internal/elf_mem_image.h -@@ -32,7 +32,7 @@ - #endif +@@ -33,7 +33,7 @@ - #if defined(__ELF__) && !defined(__native_client__) && !defined(__asmjs__) && \ -- !defined(__wasm__) -+ !defined(__wasm__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) + #if defined(__ELF__) && !defined(__OpenBSD__) && !defined(__QNX__) && \ + !defined(__native_client__) && !defined(__asmjs__) && \ +- !defined(__wasm__) && !defined(__HAIKU__) ++ !defined(__wasm__) && !defined(__HAIKU__) && !defined(__FreeBSD__) #define ABSL_HAVE_ELF_MEM_IMAGE 1 #endif diff --git a/www/iridium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc b/www/iridium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc index dc32e6ddbd6c..1ebeeac6e72f 100644 --- a/www/iridium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc +++ b/www/iridium/files/patch-third__party_abseil-cpp_absl_time_internal_cctz_src_time__zone__format.cc @@ -1,10 +1,10 @@ ---- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/abseil-cpp/absl/time/internal/cctz/src/time_zone_format.cc @@ -19,7 +19,7 @@ #endif #if defined(HAS_STRPTIME) && HAS_STRPTIME --#if !defined(_XOPEN_SOURCE) +-#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) +#if !defined(_XOPEN_SOURCE) && !defined(__OpenBSD__) && !defined(__FreeBSD__) #define _XOPEN_SOURCE // Definedness suffices for strptime. #endif diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn index 3cff0b867f47..24631c03c21a 100644 --- a/www/iridium/files/patch-third__party_angle_BUILD.gn +++ b/www/iridium/files/patch-third__party_angle_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/angle/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/angle/BUILD.gn -@@ -206,7 +206,6 @@ config("extra_warnings") { +@@ -261,7 +261,6 @@ config("extra_warnings") { "-Wtautological-type-limit-compare", "-Wundefined-reinterpret-cast", "-Wunneeded-internal-declaration", @@ -8,7 +8,7 @@ "-Wsuggest-destructor-override", "-Wsuggest-override", -@@ -384,7 +383,7 @@ angle_static_library("angle_common") { +@@ -439,7 +438,7 @@ angle_static_library("angle_common") { all_dependent_configs = [ ":angle_disable_pool_alloc" ] } @@ -17,7 +17,7 @@ libs = [ "dl" ] } -@@ -498,6 +497,9 @@ angle_static_library("angle_gpu_info_util") { +@@ -569,6 +568,9 @@ angle_static_library("angle_gpu_info_util") { "Xi", "Xext", ] @@ -25,5 +25,23 @@ + libs += [ "GL" ] + } } + + if (angle_use_wayland && angle_has_build) { +@@ -1089,12 +1091,12 @@ if (angle_use_wayland) { + "wayland-client", + "wayland-egl", + ] ++ } else { ++ include_dirs = [ ++ "$wayland_dir/egl", ++ "$wayland_dir/src", ++ ] + } +- +- include_dirs = [ +- "$wayland_dir/egl", +- "$wayland_dir/src", +- ] } + group("angle_wayland") { diff --git a/www/iridium/files/patch-third__party_angle_src_common_system__utils__posix.cpp b/www/iridium/files/patch-third__party_angle_src_common_system__utils__posix.cpp deleted file mode 100644 index 380773601785..000000000000 --- a/www/iridium/files/patch-third__party_angle_src_common_system__utils__posix.cpp +++ /dev/null @@ -1,12 +0,0 @@ ---- third_party/angle/src/common/system_utils_posix.cpp.orig 2022-04-01 07:48:30 UTC -+++ third_party/angle/src/common/system_utils_posix.cpp -@@ -197,7 +197,9 @@ void *OpenSystemLibraryWithExtensionAndGetError(const - int extraFlags = 0; - if (searchType == SearchType::AlreadyLoaded) - { -+#if !defined(__OpenBSD__) - extraFlags = RTLD_NOLOAD; -+#endif - } - - std::string fullPath = directory + libraryName; diff --git a/www/iridium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn b/www/iridium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn new file mode 100644 index 000000000000..00ffd4d96e58 --- /dev/null +++ b/www/iridium/files/patch-third__party_angle_src_common_vulkan_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/angle/src/common/vulkan/BUILD.gn.orig 2022-10-05 07:34:01 UTC ++++ third_party/angle/src/common/vulkan/BUILD.gn +@@ -33,7 +33,7 @@ if (angle_enable_vulkan || angle_build_vulkan_system_i + if (angle_shared_libvulkan) { + defines = [ "ANGLE_SHARED_LIBVULKAN=1" ] + } +- if (angle_use_wayland) { ++ if (angle_use_wayland && !use_system_libwayland) { + include_dirs = [ "$wayland_dir/src" ] + } + configs = [ "$angle_root:angle_vulkan_wayland_config" ] diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp index cdafceaaea17..2330f6c2bc8c 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-04-01 07:48:30 UTC +--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-10-05 07:34:01 UTC +++ third_party/angle/src/libANGLE/Display.cpp -@@ -55,7 +55,7 @@ +@@ -54,7 +54,7 @@ # include "libANGLE/renderer/gl/wgl/DisplayWGL.h" # elif defined(ANGLE_PLATFORM_MACOS) || defined(ANGLE_PLATFORM_IOS) # include "libANGLE/renderer/gl/apple/DisplayApple_api.h" @@ -9,7 +9,7 @@ # include "libANGLE/renderer/gl/egl/DisplayEGL.h" # if defined(ANGLE_USE_GBM) # include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h" -@@ -320,7 +320,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -331,7 +331,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateDisplayCGLOrEAGL(state); break; @@ -18,7 +18,7 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0) { -@@ -365,7 +365,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -374,7 +374,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di #if defined(ANGLE_ENABLE_OPENGL) # if defined(ANGLE_PLATFORM_WINDOWS) impl = new rx::DisplayWGL(state); @@ -27,16 +27,16 @@ # if defined(ANGLE_USE_GBM) if (platformType == 0 || platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE) -@@ -416,7 +416,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di +@@ -425,7 +425,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di impl = rx::CreateVulkanWin32Display(state); } break; -# elif defined(ANGLE_PLATFORM_LINUX) +# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD) - # if defined(ANGLE_USE_X11) - if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable()) + # if defined(ANGLE_USE_GBM) + if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable()) { -@@ -1915,7 +1915,7 @@ static ClientExtensions GenerateClientExtensions() +@@ -1986,7 +1986,7 @@ static ClientExtensions GenerateClientExtensions() extensions.x11Visual = true; #endif diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp index d0fffe74830e..eaca9c9d3a9a 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-04-01 07:48:30 UTC +--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-10-05 07:34:01 UTC +++ third_party/angle/src/libANGLE/formatutils.cpp -@@ -1388,7 +1388,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa +@@ -1399,7 +1399,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported); diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h index 7d2e6df49caa..5d98a0925a53 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h @@ -1,6 +1,6 @@ ---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-03-28 18:11:04 UTC +--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-10-05 07:34:01 UTC +++ third_party/angle/src/libANGLE/renderer/driver_utils.h -@@ -179,7 +179,7 @@ inline bool IsWindows() +@@ -183,7 +183,7 @@ inline bool IsWindows() inline bool IsLinux() { diff --git a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h index e8dd11425a97..ea7ce14a82c6 100644 --- a/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h +++ b/www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h @@ -1,4 +1,4 @@ ---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2022-03-28 18:11:04 UTC +--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2022-10-05 07:34:01 UTC +++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h @@ -23,7 +23,7 @@ bool IsVulkanWin32DisplayAvailable(); DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state); @@ -6,6 +6,6 @@ -#if defined(ANGLE_PLATFORM_LINUX) +#if defined(ANGLE_PLATFORM_POSIX) - bool IsVulkanXcbDisplayAvailable(); - DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state); + bool IsVulkanWaylandDisplayAvailable(); + DisplayImpl *CreateVulkanWaylandDisplay(const egl::DisplayState &state); diff --git a/www/iridium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn b/www/iridium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn new file mode 100644 index 000000000000..3e4f7543bb0f --- /dev/null +++ b/www/iridium/files/patch-third__party_angle_src_third__party_volk_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/angle/src/third_party/volk/BUILD.gn.orig 2022-10-05 07:34:01 UTC ++++ third_party/angle/src/third_party/volk/BUILD.gn +@@ -20,7 +20,7 @@ source_set("volk") { + public_configs = [ ":volk_config" ] + configs += [ "$angle_root:angle_no_cfi_icall" ] + public_deps = [ "$angle_vulkan_headers_dir:vulkan_headers" ] +- if (angle_use_wayland) { ++ if (angle_use_wayland && !use_system_libwayland) { + include_dirs = [ "$wayland_dir/src" ] + } + } diff --git a/www/iridium/files/patch-third__party_angle_util_BUILD.gn b/www/iridium/files/patch-third__party_angle_util_BUILD.gn index de38c35b40a9..5a906eab2704 100644 --- a/www/iridium/files/patch-third__party_angle_util_BUILD.gn +++ b/www/iridium/files/patch-third__party_angle_util_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/angle/util/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/angle/util/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/angle/util/BUILD.gn -@@ -200,7 +200,7 @@ foreach(is_shared_library, +@@ -246,7 +246,7 @@ foreach(is_shared_library, ] libs = [] diff --git a/www/iridium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc b/www/iridium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc new file mode 100644 index 000000000000..398d3bd8b616 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc @@ -0,0 +1,11 @@ +--- third_party/blink/common/privacy_budget/active_sampling.cc.orig 2022-10-05 07:34:01 UTC ++++ third_party/blink/common/privacy_budget/active_sampling.cc +@@ -24,7 +24,7 @@ namespace blink { + bool IdentifiabilityActiveSampler::IsFontFamilyAvailable(const char* family, + SkFontMgr* fm) { + base::ScopedAllowBaseSyncPrimitives allow; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return !!fm->legacyMakeTypeface(family, SkFontStyle()); + #else + sk_sp<SkFontStyleSet> set(fm->matchFamily(family)); diff --git a/www/iridium/files/patch-third__party_blink_public_platform_platform.h b/www/iridium/files/patch-third__party_blink_public_platform_platform.h new file mode 100644 index 000000000000..fc34dbc8b039 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_public_platform_platform.h @@ -0,0 +1,11 @@ +--- third_party/blink/public/platform/platform.h.orig 2022-10-05 07:34:01 UTC ++++ third_party/blink/public/platform/platform.h +@@ -340,7 +340,7 @@ class BLINK_PLATFORM_EXPORT Platform { + return nullptr; + } + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // This is called after the thread is created, so the embedder + // can initiate an IPC to change its thread type (on Linux we can't + // increase the nice value, so we need to ask the browser process). This diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc index 70c80a467693..5148eecc150b 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/controller/blink_initializer.cc -@@ -71,12 +71,12 @@ +@@ -74,12 +74,12 @@ #include "third_party/blink/renderer/controller/oom_intervention_impl.h" #endif @@ -15,7 +15,7 @@ #include "third_party/blink/renderer/controller/highest_pmf_reporter.h" #include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h" #endif -@@ -156,7 +156,7 @@ void InitializeCommon(Platform* platform, mojo::Binder +@@ -172,7 +172,7 @@ void InitializeCommon(Platform* platform, mojo::Binder #endif #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \ @@ -24,12 +24,12 @@ // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring. if (UserLevelMemoryPressureSignalGenerator::Enabled()) UserLevelMemoryPressureSignalGenerator::Instance(); -@@ -227,7 +227,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder - main_thread->GetTaskRunner()); +@@ -253,7 +253,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder + main_thread_task_runner); #endif -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - binders.Add(ConvertToBaseRepeatingCallback( - CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), - main_thread->GetTaskRunner()); + binders.Add<mojom::blink::MemoryUsageMonitorLinux>( + ConvertToBaseRepeatingCallback( + CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)), diff --git a/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc index 1b0c7836d180..83cb4c122a4d 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc -@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { +@@ -129,15 +129,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() { void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file, base::File status_file) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc b/www/iridium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc new file mode 100644 index 000000000000..e2820378085f --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_core_execution__context_navigator__base.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/core/execution_context/navigator_base.cc.orig 2022-10-05 07:34:01 UTC ++++ third_party/blink/renderer/core/execution_context/navigator_base.cc +@@ -31,7 +31,7 @@ String GetReducedNavigatorPlatform() { + return "Win32"; + #elif BUILDFLAG(IS_FUCHSIA) + return ""; +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + return "Linux x86_64"; + #else + #error Unsupported platform diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc index ad2be0b5279e..61e1594b109f 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/core/exported/web_view_impl.cc @@ -404,7 +404,7 @@ SkFontHinting RendererPreferencesToSkiaHinting( const blink::RendererPreferences& prefs) { @@ -9,7 +9,7 @@ if (!prefs.should_antialias_text) { // When anti-aliasing is off, GTK maps all non-zero hinting settings to // 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight' -@@ -3159,7 +3159,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs +@@ -3254,7 +3254,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs renderer_preferences_.use_subpixel_positioning); // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc index 4865c5ae55d1..80f63a67937d 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc @@ -1,17 +1,17 @@ ---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/core/frame/web_frame_test.cc -@@ -6310,7 +6310,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { - EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000)); - } - +@@ -6357,7 +6357,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) { + MoveCaretStaysHorizontallyAlignedWhenMoved + #endif + // TODO(crbug.com/1317375): Build these tests on all platforms. -#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) +#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) - TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) { + TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) { RegisterMockedHttpURLLoad("move_caret.html"); -@@ -6689,7 +6689,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGBasic) { - TEST_F(CompositedSelectionBoundsTest, SVGTextWithFragments) { - RunTest("composited_selection_bounds_svg_text_with_fragments.html"); +@@ -6753,7 +6753,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc + TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) { + RunTest("composited_selection_bounds_large_selection_noscroll.html"); } -#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc index 503cc9808a6b..adc57ed52c51 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_html_canvas_canvas__async__blob__creator.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/core/html/canvas/canvas_async_blob_creator.cc -@@ -44,7 +44,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin +@@ -45,7 +45,7 @@ constexpr base::TimeDelta kEncodeRowSlackBeforeDeadlin /* The value is based on user statistics on Nov 2017. */ #if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc b/www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc deleted file mode 100644 index b562d897586c..000000000000 --- a/www/iridium/files/patch-third__party_blink_renderer_core_html_forms_internal__popup__menu.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/blink/renderer/core/html/forms/internal_popup_menu.cc.orig 2022-04-01 07:48:30 UTC -+++ third_party/blink/renderer/core/html/forms/internal_popup_menu.cc -@@ -179,7 +179,7 @@ class InternalPopupMenu::ItemIterationContext { - is_in_group_(false), - buffer_(buffer) { - DCHECK(buffer_); --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - // On other platforms, the <option> background color is the same as the - // <select> background color. On Linux, that makes the <option> - // background color very dark, so by default, try to use a lighter diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc index 59ea3ea79803..d04752a49d52 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc -@@ -186,7 +186,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t +@@ -190,7 +190,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t Vector<String> InspectorMemoryAgent::Symbolize( const WebVector<void*>& addresses) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc index d40a56fdefe3..cb0a28b50b8b 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/core/layout/layout_view.cc -@@ -64,7 +64,7 @@ +@@ -65,7 +65,7 @@ #include "ui/display/screen_info.h" #include "ui/gfx/geometry/quad_f.h" diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc index d95a45f8a254..405d899a3c4d 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/core/paint/paint_layer.cc -@@ -108,7 +108,7 @@ namespace blink { +@@ -110,7 +110,7 @@ namespace blink { namespace { diff --git a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc index ec80059ce4b5..184c89d7013c 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc @@ -151,7 +151,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const // is true for at least GTK and QT apps). @@ -9,7 +9,7 @@ return false; #else return true; -@@ -326,7 +326,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr +@@ -325,7 +325,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr const WebMouseEvent& event) { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc index 5e03c7c91cf6..b2308be6bd93 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__device__factory.cc @@ -1,7 +1,7 @@ ---- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/modules/media/audio/audio_device_factory.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/modules/media/audio/audio_device_factory.cc -@@ -34,7 +34,7 @@ AudioDeviceFactory* AudioDeviceFactory::factory_ = nul - namespace { +@@ -34,7 +34,7 @@ namespace { + AudioDeviceFactory* g_factory_override = nullptr; #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \ - BUILDFLAG(IS_CHROMEOS_LACROS) diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc index 8aa6f920a8dc..b75d646ffc34 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc -@@ -293,7 +293,7 @@ TEST_F(MAYBE_WebRtcAudioRendererTest, DISABLED_VerifyS +@@ -284,7 +284,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar SetupRenderer(kDefaultOutputDeviceId); renderer_proxy_->Start(); #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc index fa9d9af2b746..36f3ea652a81 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc @@ -379,7 +379,7 @@ class AudioWorkletThreadPriorityTest @@ -6,6 +6,6 @@ // on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting. -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) - if (expected_priority == base::ThreadPriority::REALTIME_AUDIO || - expected_priority == base::ThreadPriority::DISPLAY) { - EXPECT_EQ(actual_priority, base::ThreadPriority::NORMAL); + if (expected_priority == base::ThreadPriorityForTest::kRealtimeAudio || + expected_priority == base::ThreadPriorityForTest::kDisplay) { + EXPECT_EQ(actual_priority, base::ThreadPriorityForTest::kNormal); diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc index 2ca4fb0aa74a..f5a1b1e5f80f 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc -@@ -6102,7 +6102,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid +@@ -6152,7 +6152,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid constexpr bool kAllowZeroCopyImages = true; #endif diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc index 93d4dd500648..f5867eb2ba68 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc -@@ -99,7 +99,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin +@@ -101,7 +101,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn index 4b9666f8125d..0caa81deaa4d 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/platform/BUILD.gn -@@ -1904,7 +1904,7 @@ static_library("test_support") { +@@ -1895,7 +1895,7 @@ static_library("test_support") { ] # fuzzed_data_provider may not work with a custom toolchain. diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc index 666f26cbe167..e00eaf9465e6 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.cc -@@ -87,7 +87,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo +@@ -75,7 +75,7 @@ extern const char kNotoColorEmojiCompat[] = "Noto Colo SkFontMgr* FontCache::static_font_manager_ = nullptr; @@ -9,7 +9,7 @@ float FontCache::device_scale_factor_ = 1.0; #endif -@@ -120,7 +120,7 @@ FontCache::FontCache() : font_manager_(sk_ref_sp(stati +@@ -142,7 +142,7 @@ FontCache::~FontCache() { FontPlatformData* FontCache::SystemFontPlatformData( const FontDescription& font_description) { const AtomicString& family = FontCache::SystemFontFamily(); diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h index 702a281e9474..91692700fb68 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/platform/fonts/font_cache.h -@@ -59,7 +59,7 @@ +@@ -58,7 +58,7 @@ #include "third_party/skia/include/core/SkFontMgr.h" #include "third_party/skia/include/core/SkRefCnt.h" @@ -27,7 +27,7 @@ static bool GetFontForCharacter(UChar32, const char* preferred_locale, gfx::FallbackFontData*); -@@ -388,7 +388,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -347,7 +347,7 @@ class PLATFORM_EXPORT FontCache final { const FontFaceCreationParams&, std::string& name); @@ -36,7 +36,7 @@ static AtomicString GetFamilyNameForCharacter(SkFontMgr*, UChar32, const FontDescription&, -@@ -430,7 +430,7 @@ class PLATFORM_EXPORT FontCache final { +@@ -389,7 +389,7 @@ class PLATFORM_EXPORT FontCache final { std::unique_ptr<FallbackFamilyStyleCache> fallback_params_cache_; #endif // BUILDFLAG(IS_WIN) diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc index 9ed06192d3a4..99e08cd235ba 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__description.cc @@ -1,4 +1,4 @@ ---- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/fonts/font_description.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/platform/fonts/font_description.cc @@ -39,7 +39,7 @@ #include "third_party/blink/renderer/platform/wtf/text/string_hash.h" @@ -9,7 +9,7 @@ #include "third_party/blink/renderer/platform/fonts/font_cache.h" #endif -@@ -262,7 +262,7 @@ FontCacheKey FontDescription::CacheKey( +@@ -270,7 +270,7 @@ FontCacheKey FontDescription::CacheKey( static_cast<unsigned>(fields_.orientation_) << 1 | // bit 2-3 static_cast<unsigned>(fields_.subpixel_text_position_); // bit 1 diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc new file mode 100644 index 000000000000..3f89da3dbb64 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc @@ -0,0 +1,20 @@ +--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2022-10-05 07:34:01 UTC ++++ third_party/blink/renderer/platform/fonts/font_platform_data.cc +@@ -48,7 +48,7 @@ + namespace blink { + namespace { + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + // Getting the system font render style takes a significant amount of time on + // Linux because looking up fonts using fontconfig can be very slow. We fetch + // the render style for each font family and text size, while it's very +@@ -122,7 +122,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t + style_ = WebFontRenderStyle::GetDefault(); + #if !BUILDFLAG(IS_WIN) + WebFontRenderStyle system_style; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + bool override_font_name_and_size = + base::FeatureList::IsEnabled(kOptimizeLinuxFonts); + #else diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc index 71760735539b..3c4bf2ef1927 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc @@ -1,13 +1,14 @@ ---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc -@@ -74,7 +74,11 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe +@@ -76,8 +76,12 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe - // Once we are using RAF, this thread is driving Display updates. Update - // priority accordingly. + // Once we are using RAF, this thread is driving user interactive display + // updates. Update priority accordingly. + // pledge(2) + // stop this baloney +#if !defined(OS_OPENBSD) - base::PlatformThread::SetCurrentThreadPriority(base::ThreadPriority::DISPLAY); + base::PlatformThread::SetCurrentThreadType( + base::ThreadType::kDisplayCritical); +#endif mojo::Remote<mojom::blink::EmbeddedFrameSinkProvider> provider; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc index 93c070ab86c0..c2e2e41727c4 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc -@@ -328,7 +328,7 @@ void VideoFrameSubmitter::OnBeginFrame( +@@ -332,7 +332,7 @@ void VideoFrameSubmitter::OnBeginFrame( continue; auto& feedback = timing_details.find(frame_token)->value.presentation_feedback; diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 new file mode 100644 index 000000000000..f0f76706d4f9 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 @@ -0,0 +1,62 @@ +--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-10-05 07:34:01 UTC ++++ third_party/blink/renderer/platform/runtime_enabled_features.json5 +@@ -33,7 +33,7 @@ + // shipped stable can have its runtime flag removed soon after. + status: { + valid_values: ["stable", "experimental", "test"], +- valid_keys: ["Android", "Win", "ChromeOS_Ash", "ChromeOS_Lacros", "Mac", "Linux"] ++ valid_keys: ["Android", "Win", "ChromeOS_Ash", "ChromeOS_Lacros", "Mac", "Linux", "OpenBSD", "FreeBSD"] + }, + + // "implied_by" or "depends_on" specifies relationship to other features: +@@ -1014,7 +1014,7 @@ + depends_on: ["FileSystemAccess"], + status: {"Android": "test", "default": "experimental"}, + origin_trial_feature_name: "FileHandling", +- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], + }, + { + name: "FileHandlingIcons", +@@ -2320,7 +2320,7 @@ + { + name: "U2FSecurityKeyAPI", + origin_trial_feature_name: "U2FSecurityKeyAPI", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + origin_trial_type: "deprecation", + }, + { +@@ -2335,7 +2335,7 @@ + { + name: "UnrestrictedSharedArrayBuffer", + origin_trial_feature_name: "UnrestrictedSharedArrayBuffer", +- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"], + }, + { + name: "URLPatternCompareComponent", +@@ -2353,7 +2353,7 @@ + origin_trial_feature_name: "UserAgentReduction", + origin_trial_allows_third_party: true, + // iOS not included as it should not send a reduced User-Agent string. +- origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win"], ++ origin_trial_os: ["android", "chromeos", "fuchsia", "linux", "mac", "win", "openbsd", "freebsd"], + }, + { + name: "V8IdleTasks", +@@ -2468,12 +2468,12 @@ + name: "WebAppUrlHandling", + status: "experimental", + origin_trial_feature_name: "WebAppUrlHandling", +- origin_trial_os: ["win", "mac", "linux"], ++ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"], + }, + { + name: "WebAppWindowControlsOverlay", + origin_trial_feature_name: "WebAppWindowControlsOverlay", +- origin_trial_os: ["win", "mac", "linux", "chromeos"], ++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"], + status: "stable", + }, + { diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc index c3921d83fe2e..db6710fe9ce0 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc @@ -1,12 +1,11 @@ ---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/platform/scheduler/common/thread.cc -@@ -99,7 +99,8 @@ void Thread::CreateAndSetCompositorThread() { +@@ -86,7 +86,7 @@ void Thread::CreateAndSetCompositorThread() { std::make_unique<scheduler::CompositorThread>(params); compositor_thread->Init(); -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) -+// pledge(2) +#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_OPENBSD) - if (base::FeatureList::IsEnabled( - features::kBlinkCompositorUseDisplayThreadPriority)) { - compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult( + compositor_thread->GetTaskRunner()->PostTaskAndReplyWithResult( + FROM_HERE, base::BindOnce(&base::PlatformThread::CurrentId), + base::BindOnce([](base::PlatformThreadId compositor_thread_id) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc new file mode 100644 index 000000000000..94b25038cde3 --- /dev/null +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc @@ -0,0 +1,11 @@ +--- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2022-10-05 07:34:01 UTC ++++ third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc +@@ -256,7 +256,7 @@ void CategorizedWorkerPool::Start(int num_normal_threa + "CompositorTileWorkerBackground", thread_options, this, + background_thread_prio_categories, + &has_task_for_background_priority_thread_cv_); +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + thread->SetBackgroundingCallback( + Thread::MainThread()->GetDeprecatedTaskRunner(), + base::BindOnce([](base::PlatformThreadId thread_id) { diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h index ff9acd90f423..decacfbf365a 100644 --- a/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h +++ b/www/iridium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h @@ -1,6 +1,6 @@ ---- third_party/blink/renderer/platform/wtf/math_extras.h.orig 2022-03-28 18:11:04 UTC +--- third_party/blink/renderer/platform/wtf/math_extras.h.orig 2022-10-05 07:34:01 UTC +++ third_party/blink/renderer/platform/wtf/math_extras.h -@@ -127,6 +127,10 @@ constexpr float Grad2turn(float g) { +@@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) { return g * (1.0f / 400.0f); } @@ -11,7 +11,7 @@ constexpr double RoundHalfTowardsPositiveInfinity(double value) { return std::floor(value + 0.5); } -@@ -134,6 +138,9 @@ constexpr double RoundHalfTowardsPositiveInfinity(doub +@@ -135,6 +139,9 @@ constexpr double RoundHalfTowardsPositiveInfinity(doub constexpr float RoundHalfTowardsPositiveInfinity(float value) { return std::floor(value + 0.5f); } diff --git a/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni index 59cef69c2c32..1c18a31ccf0a 100644 --- a/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni +++ b/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni @@ -1,6 +1,6 @@ ---- third_party/boringssl/BUILD.generated.gni.orig 2022-03-28 18:11:04 UTC +--- third_party/boringssl/BUILD.generated.gni.orig 2022-10-05 07:34:01 UTC +++ third_party/boringssl/BUILD.generated.gni -@@ -81,6 +81,7 @@ crypto_sources = [ +@@ -78,6 +78,7 @@ crypto_sources = [ "src/crypto/cpu_aarch64_apple.c", "src/crypto/cpu_aarch64_fuchsia.c", "src/crypto/cpu_aarch64_linux.c", diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h index 9d3bcd4a912d..b355ca1afe28 100644 --- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-04-01 07:48:30 UTC +--- third_party/boringssl/src/crypto/fipsmodule/rand/internal.h.orig 2022-10-05 07:34:01 UTC +++ third_party/boringssl/src/crypto/fipsmodule/rand/internal.h -@@ -26,7 +26,8 @@ extern "C" { +@@ -27,7 +27,8 @@ extern "C" { #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \ diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c b/www/iridium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c index e0195652540c..9fa688598264 100644 --- a/www/iridium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c +++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c @@ -1,8 +1,8 @@ ---- third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-03-28 18:11:04 UTC +--- third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-10-05 07:34:01 UTC +++ third_party/boringssl/src/crypto/refcount_c11.c -@@ -24,6 +24,9 @@ - - #include <openssl/type_check.h> +@@ -22,6 +22,9 @@ + #include <stdatomic.h> + #include <stdlib.h> +#if !defined(__cplusplus) && !defined(static_assert) +#define static_assert _Static_assert diff --git a/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h b/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h index 8d787ee303ba..7c234bab3c61 100644 --- a/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h +++ b/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h @@ -1,6 +1,6 @@ ---- third_party/boringssl/src/include/openssl/base.h.orig 2022-03-28 18:11:04 UTC +--- third_party/boringssl/src/include/openssl/base.h.orig 2022-10-05 07:34:01 UTC +++ third_party/boringssl/src/include/openssl/base.h -@@ -153,6 +153,11 @@ extern "C" { +@@ -156,6 +156,11 @@ extern "C" { #define OPENSSL_FUCHSIA #endif diff --git a/www/iridium/files/patch-third__party_boringssl_src_include_openssl_thread.h b/www/iridium/files/patch-third__party_boringssl_src_include_openssl_thread.h new file mode 100644 index 000000000000..04cc267c0401 --- /dev/null +++ b/www/iridium/files/patch-third__party_boringssl_src_include_openssl_thread.h @@ -0,0 +1,10 @@ +--- third_party/boringssl/src/include/openssl/thread.h.orig 2022-10-05 07:34:01 UTC ++++ third_party/boringssl/src/include/openssl/thread.h +@@ -78,6 +78,7 @@ typedef union crypto_mutex_st { + void *handle; + } CRYPTO_MUTEX; + #elif !defined(__GLIBC__) ++#include <pthread.h> + typedef pthread_rwlock_t CRYPTO_MUTEX; + #else + // On glibc, |pthread_rwlock_t| is hidden under feature flags, and we can't diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc index f872ef476f14..a19b15c4cb55 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc -@@ -119,6 +119,10 @@ std::string MinidumpMiscInfoDebugBuildString() { +@@ -159,6 +159,10 @@ std::string MinidumpMiscInfoDebugBuildString() { static constexpr char kOS[] = "win"; #elif BUILDFLAG(IS_FUCHSIA) static constexpr char kOS[] = "fuchsia"; diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc index 8cadfc497ff5..859af7a54e22 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_signals.cc @@ -1,4 +1,4 @@ ---- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/crashpad/crashpad/util/posix/signals.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/crashpad/crashpad/util/posix/signals.cc @@ -51,7 +51,7 @@ constexpr int kCrashSignals[] = { #if defined(SIGEMT) @@ -18,7 +18,7 @@ SIGIO, #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) }; -@@ -233,8 +233,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi +@@ -251,8 +251,12 @@ bool Signals::WillSignalReraiseAutonomously(const sigi // remains. See 10.12.3 xnu-3789.41.3/bsd/kern/kern_sig.c // psignal_internal(). (code > 0 && diff --git a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc index 73961b73efb0..42bc4177ccd1 100644 --- a/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc +++ b/www/iridium/files/patch-third__party_crashpad_crashpad_util_posix_symbolic__constants__posix.cc @@ -1,6 +1,6 @@ ---- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/crashpad/crashpad/util/posix/symbolic_constants_posix.cc -@@ -66,7 +66,7 @@ constexpr const char* kSignalNames[] = { +@@ -67,7 +67,7 @@ constexpr const char* kSignalNames[] = { "INFO", "USR1", "USR2", @@ -9,12 +9,12 @@ #if defined(ARCH_CPU_MIPS_FAMILY) "HUP", "INT", -@@ -137,7 +137,7 @@ constexpr const char* kSignalNames[] = { +@@ -138,7 +138,7 @@ constexpr const char* kSignalNames[] = { #endif // defined(ARCH_CPU_MIPS_FAMILY) #endif }; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) // NSIG is 64 to account for real-time signals. - static_assert(base::size(kSignalNames) == 32, "kSignalNames length"); + static_assert(std::size(kSignalNames) == 32, "kSignalNames length"); #else diff --git a/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h index bb5389a06ba4..0cfaaf236566 100644 --- a/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h +++ b/www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h @@ -1,11 +1,11 @@ ---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-04-01 07:48:30 UTC +--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-10-05 07:34:01 UTC +++ third_party/dawn/include/dawn/native/VulkanBackend.h -@@ -69,7 +69,7 @@ namespace dawn::native::vulkan { - }; +@@ -70,7 +70,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport + }; - // Can't use DAWN_PLATFORM_LINUX since header included in both Dawn and Chrome + // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome -#ifdef __linux__ +#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) - // Common properties of external images represented by FDs. On successful import the file - // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be + // Common properties of external images represented by FDs. On successful import the file + // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be diff --git a/www/iridium/files/patch-third__party_dawn_src_dawn_common_Platform.h b/www/iridium/files/patch-third__party_dawn_src_dawn_common_Platform.h index ad1361f09d45..bd40cdf71701 100644 --- a/www/iridium/files/patch-third__party_dawn_src_dawn_common_Platform.h +++ b/www/iridium/files/patch-third__party_dawn_src_dawn_common_Platform.h @@ -1,14 +1,14 @@ ---- third_party/dawn/src/dawn/common/Platform.h.orig 2022-04-01 07:48:30 UTC +--- third_party/dawn/src/dawn/common/Platform.h.orig 2022-10-05 07:34:01 UTC +++ third_party/dawn/src/dawn/common/Platform.h -@@ -26,6 +26,11 @@ - # error "Unsupported Windows platform." - # endif +@@ -45,6 +45,11 @@ + #error "Unsupported Windows platform." + #endif +#elif defined(__OpenBSD__) || defined(__FreeBSD__) -+# define DAWN_PLATFORM_BSD 1 -+# define DAWN_PLATFORM_LINUX 1 -+# define DAWN_PLATFORM_POSIX 1 ++#define DAWN_PLATFORM_IS_LINUX 1 ++#define DAWN_PLATFORM_IS_BSD 1 ++#define DAWN_PLATFORM_IS_POSIX 1 + #elif defined(__linux__) - # define DAWN_PLATFORM_LINUX 1 - # define DAWN_PLATFORM_POSIX 1 + #define DAWN_PLATFORM_IS_LINUX 1 + #define DAWN_PLATFORM_IS_POSIX 1 diff --git a/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp index 3addcaab4def..93b2e6e36360 100644 --- a/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp +++ b/www/iridium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp @@ -1,11 +1,11 @@ ---- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-04-01 07:48:30 UTC +--- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-10-05 07:34:01 UTC +++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp -@@ -37,7 +37,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha +@@ -42,7 +42,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha #endif - #if defined(DAWN_PLATFORM_LINUX) --# if defined(DAWN_PLATFORM_ANDROID) -+# if defined(DAWN_PLATFORM_ANDROID) || defined(DAWN_PLATFORM_BSD) + #if DAWN_PLATFORM_IS(LINUX) +-#if DAWN_PLATFORM_IS(ANDROID) ++#if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(BSD) constexpr char kVulkanLibName[] = "libvulkan.so"; - # else + #else constexpr char kVulkanLibName[] = "libvulkan.so.1"; diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h index 5a97c642673b..57205309c744 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h @@ -1,10 +1,10 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-04-01 07:48:30 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2022-10-05 07:34:01 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h -@@ -0,0 +1,2787 @@ +@@ -0,0 +1,737 @@ +/* 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-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --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' --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --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-fft --enable-rdft --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/d/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=aarch64 --enable-armv8 --extra-cflags='-march=armv8-a' --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 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -66,6 +66,7 @@ +#define HAVE_AVX 0 +#define HAVE_AVX2 0 +#define HAVE_AVX512 0 ++#define HAVE_AVX512ICL 0 +#define HAVE_FMA3 0 +#define HAVE_FMA4 0 +#define HAVE_MMX 0 @@ -113,6 +114,7 @@ +#define HAVE_AVX_EXTERNAL 0 +#define HAVE_AVX2_EXTERNAL 0 +#define HAVE_AVX512_EXTERNAL 0 ++#define HAVE_AVX512ICL_EXTERNAL 0 +#define HAVE_FMA3_EXTERNAL 0 +#define HAVE_FMA4_EXTERNAL 0 +#define HAVE_MMX_EXTERNAL 0 @@ -160,6 +162,7 @@ +#define HAVE_AVX_INLINE 0 +#define HAVE_AVX2_INLINE 0 +#define HAVE_AVX512_INLINE 0 ++#define HAVE_AVX512ICL_INLINE 0 +#define HAVE_FMA3_INLINE 0 +#define HAVE_FMA4_INLINE 0 +#define HAVE_MMX_INLINE 0 @@ -245,7 +248,7 @@ +#define HAVE_TERMIOS_H 1 +#define HAVE_UDPLITE_H 0 +#define HAVE_UNISTD_H 1 -+#define HAVE_VALGRIND_VALGRIND_H 0 ++#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 1 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_WINDOWS_H 0 +#define HAVE_WINSOCK2_H 0 +#define HAVE_INTRINSICS_NEON 1 @@ -293,6 +296,7 @@ +#define HAVE_COMMANDLINETOARGVW 0 +#define HAVE_FCNTL 1 +#define HAVE_GETADDRINFO 0 ++#define HAVE_GETAUXVAL 0 +#define HAVE_GETHRTIME 0 +#define HAVE_GETOPT 1 +#define HAVE_GETMODULEHANDLE 0 @@ -332,7 +336,7 @@ +#define HAVE_SLEEP 0 +#define HAVE_STRERROR_R 1 +#define HAVE_SYSCONF 1 -+#define HAVE_SYSCTL 1 ++#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 1 -- forced to 0 for Fuchsia */ +#define HAVE_USLEEP 1 +#define HAVE_UTGETOSTYPEFROMSTRING 0 +#define HAVE_VIRTUALALLOC 0 @@ -578,7 +582,6 @@ +#define CONFIG_VIDEOTOOLBOX 0 +#define CONFIG_VULKAN 0 +#define CONFIG_V4L2_M2M 0 -+#define CONFIG_XVMC 0 +#define CONFIG_FTRAPV 0 +#define CONFIG_GRAY 0 +#define CONFIG_HARDCODED_TABLES 0 @@ -610,7 +613,6 @@ +#define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_FFT 1 +#define CONFIG_LSP 0 -+#define CONFIG_LZO 0 +#define CONFIG_MDCT 1 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 @@ -655,6 +657,7 @@ +#define CONFIG_CBS_JPEG 0 +#define CONFIG_CBS_MPEG2 0 +#define CONFIG_CBS_VP9 0 ++#define CONFIG_DEFLATE_WRAPPER 0 +#define CONFIG_DIRAC_PARSE 1 +#define CONFIG_DNN 0 +#define CONFIG_DOVI_RPU 0 @@ -683,6 +686,7 @@ +#define CONFIG_IDCTDSP 0 +#define CONFIG_IIRFILTER 0 +#define CONFIG_MDCT15 1 ++#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INTRAX8 0 +#define CONFIG_ISO_MEDIA 1 +#define CONFIG_IVIDSP 0 @@ -733,2058 +737,4 @@ +#define CONFIG_VP8DSP 1 +#define CONFIG_WMA_FREQS 0 +#define CONFIG_WMV2DSP 0 -+#define CONFIG_AAC_ADTSTOASC_BSF 0 -+#define CONFIG_AV1_FRAME_MERGE_BSF 0 -+#define CONFIG_AV1_FRAME_SPLIT_BSF 0 -+#define CONFIG_AV1_METADATA_BSF 0 -+#define CONFIG_CHOMP_BSF 0 -+#define CONFIG_DUMP_EXTRADATA_BSF 0 -+#define CONFIG_DCA_CORE_BSF 0 -+#define CONFIG_EAC3_CORE_BSF 0 -+#define CONFIG_EXTRACT_EXTRADATA_BSF 0 -+#define CONFIG_FILTER_UNITS_BSF 0 -+#define CONFIG_H264_METADATA_BSF 0 -+#define CONFIG_H264_MP4TOANNEXB_BSF 0 -+#define CONFIG_H264_REDUNDANT_PPS_BSF 0 -+#define CONFIG_HAPQA_EXTRACT_BSF 0 -+#define CONFIG_HEVC_METADATA_BSF 0 -+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0 -+#define CONFIG_IMX_DUMP_HEADER_BSF 0 -+#define CONFIG_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 -+#define CONFIG_NOISE_BSF 0 -+#define CONFIG_NULL_BSF 0 -+#define CONFIG_OPUS_METADATA_BSF 0 -+#define CONFIG_PCM_RECHUNK_BSF 0 -+#define CONFIG_PRORES_METADATA_BSF 0 -+#define CONFIG_REMOVE_EXTRADATA_BSF 0 -+#define CONFIG_SETTS_BSF 0 -+#define CONFIG_TEXT2MOVSUB_BSF 0 -+#define CONFIG_TRACE_HEADERS_BSF 0 -+#define CONFIG_TRUEHD_CORE_BSF 0 -+#define CONFIG_VP9_METADATA_BSF 0 -+#define CONFIG_VP9_RAW_REORDER_BSF 0 -+#define CONFIG_VP9_SUPERFRAME_BSF 0 -+#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 -+#define CONFIG_AASC_DECODER 0 -+#define CONFIG_AIC_DECODER 0 -+#define CONFIG_ALIAS_PIX_DECODER 0 -+#define CONFIG_AGM_DECODER 0 -+#define CONFIG_AMV_DECODER 0 -+#define CONFIG_ANM_DECODER 0 -+#define CONFIG_ANSI_DECODER 0 -+#define CONFIG_APNG_DECODER 0 -+#define CONFIG_ARBC_DECODER 0 -+#define CONFIG_ARGO_DECODER 0 -+#define CONFIG_ASV1_DECODER 0 -+#define CONFIG_ASV2_DECODER 0 -+#define CONFIG_AURA_DECODER 0 -+#define CONFIG_AURA2_DECODER 0 -+#define CONFIG_AVRP_DECODER 0 -+#define CONFIG_AVRN_DECODER 0 -+#define CONFIG_AVS_DECODER 0 -+#define CONFIG_AVUI_DECODER 0 -+#define CONFIG_AYUV_DECODER 0 -+#define CONFIG_BETHSOFTVID_DECODER 0 -+#define CONFIG_BFI_DECODER 0 -+#define CONFIG_BINK_DECODER 0 -+#define CONFIG_BITPACKED_DECODER 0 -+#define CONFIG_BMP_DECODER 0 -+#define CONFIG_BMV_VIDEO_DECODER 0 -+#define CONFIG_BRENDER_PIX_DECODER 0 -+#define CONFIG_C93_DECODER 0 -+#define CONFIG_CAVS_DECODER 0 -+#define CONFIG_CDGRAPHICS_DECODER 0 -+#define CONFIG_CDTOONS_DECODER 0 -+#define CONFIG_CDXL_DECODER 0 -+#define CONFIG_CFHD_DECODER 0 -+#define CONFIG_CINEPAK_DECODER 0 -+#define CONFIG_CLEARVIDEO_DECODER 0 -+#define CONFIG_CLJR_DECODER 0 -+#define CONFIG_CLLC_DECODER 0 -+#define CONFIG_COMFORTNOISE_DECODER 0 -+#define CONFIG_CPIA_DECODER 0 -+#define CONFIG_CRI_DECODER 0 -+#define CONFIG_CSCD_DECODER 0 -+#define CONFIG_CYUV_DECODER 0 -+#define CONFIG_DDS_DECODER 0 -+#define CONFIG_DFA_DECODER 0 -+#define CONFIG_DIRAC_DECODER 0 -+#define CONFIG_DNXHD_DECODER 0 -+#define CONFIG_DPX_DECODER 0 -+#define CONFIG_DSICINVIDEO_DECODER 0 -+#define CONFIG_DVAUDIO_DECODER 0 -+#define CONFIG_DVVIDEO_DECODER 0 -+#define CONFIG_DXA_DECODER 0 -+#define CONFIG_DXTORY_DECODER 0 -+#define CONFIG_DXV_DECODER 0 -+#define CONFIG_EACMV_DECODER 0 -+#define CONFIG_EAMAD_DECODER 0 -+#define CONFIG_EATGQ_DECODER 0 -+#define CONFIG_EATGV_DECODER 0 -+#define CONFIG_EATQI_DECODER 0 -+#define CONFIG_EIGHTBPS_DECODER 0 -+#define CONFIG_EIGHTSVX_EXP_DECODER 0 -+#define CONFIG_EIGHTSVX_FIB_DECODER 0 -+#define CONFIG_ESCAPE124_DECODER 0 -+#define CONFIG_ESCAPE130_DECODER 0 -+#define CONFIG_EXR_DECODER 0 -+#define CONFIG_FFV1_DECODER 0 -+#define CONFIG_FFVHUFF_DECODER 0 -+#define CONFIG_FIC_DECODER 0 -+#define CONFIG_FITS_DECODER 0 -+#define CONFIG_FLASHSV_DECODER 0 -+#define CONFIG_FLASHSV2_DECODER 0 -+#define CONFIG_FLIC_DECODER 0 -+#define CONFIG_FLV_DECODER 0 -+#define CONFIG_FMVC_DECODER 0 -+#define CONFIG_FOURXM_DECODER 0 -+#define CONFIG_FRAPS_DECODER 0 -+#define CONFIG_FRWU_DECODER 0 -+#define CONFIG_G2M_DECODER 0 -+#define CONFIG_GDV_DECODER 0 -+#define CONFIG_GEM_DECODER 0 -+#define CONFIG_GIF_DECODER 0 -+#define CONFIG_H261_DECODER 0 -+#define CONFIG_H263_DECODER 0 -+#define CONFIG_H263I_DECODER 0 -+#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 -+#define CONFIG_H264_QSV_DECODER 0 -+#define CONFIG_H264_RKMPP_DECODER 0 -+#define CONFIG_HAP_DECODER 0 -+#define CONFIG_HEVC_DECODER 0 -+#define CONFIG_HEVC_QSV_DECODER 0 -+#define CONFIG_HEVC_RKMPP_DECODER 0 -+#define CONFIG_HEVC_V4L2M2M_DECODER 0 -+#define CONFIG_HNM4_VIDEO_DECODER 0 -+#define CONFIG_HQ_HQA_DECODER 0 -+#define CONFIG_HQX_DECODER 0 -+#define CONFIG_HUFFYUV_DECODER 0 -+#define CONFIG_HYMT_DECODER 0 -+#define CONFIG_IDCIN_DECODER 0 -+#define CONFIG_IFF_ILBM_DECODER 0 -+#define CONFIG_IMM4_DECODER 0 -+#define CONFIG_IMM5_DECODER 0 -+#define CONFIG_INDEO2_DECODER 0 -+#define CONFIG_INDEO3_DECODER 0 -+#define CONFIG_INDEO4_DECODER 0 -+#define CONFIG_INDEO5_DECODER 0 -+#define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+#define CONFIG_IPU_DECODER 0 -+#define CONFIG_JPEG2000_DECODER 0 -+#define CONFIG_JPEGLS_DECODER 0 -+#define CONFIG_JV_DECODER 0 -+#define CONFIG_KGV1_DECODER 0 -+#define CONFIG_KMVC_DECODER 0 -+#define CONFIG_LAGARITH_DECODER 0 -+#define CONFIG_LOCO_DECODER 0 -+#define CONFIG_LSCR_DECODER 0 -+#define CONFIG_M101_DECODER 0 -+#define CONFIG_MAGICYUV_DECODER 0 -+#define CONFIG_MDEC_DECODER 0 -+#define CONFIG_MIMIC_DECODER 0 -+#define CONFIG_MJPEG_DECODER 0 -+#define CONFIG_MJPEGB_DECODER 0 -+#define CONFIG_MMVIDEO_DECODER 0 -+#define CONFIG_MOBICLIP_DECODER 0 -+#define CONFIG_MOTIONPIXELS_DECODER 0 -+#define CONFIG_MPEG1VIDEO_DECODER 0 -+#define CONFIG_MPEG2VIDEO_DECODER 0 -+#define CONFIG_MPEG4_DECODER 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 -+#define CONFIG_MSA1_DECODER 0 -+#define CONFIG_MSCC_DECODER 0 -+#define CONFIG_MSMPEG4V1_DECODER 0 -+#define CONFIG_MSMPEG4V2_DECODER 0 -+#define CONFIG_MSMPEG4V3_DECODER 0 -+#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 -+#define CONFIG_MSP2_DECODER 0 -+#define CONFIG_MSRLE_DECODER 0 -+#define CONFIG_MSS1_DECODER 0 -+#define CONFIG_MSS2_DECODER 0 -+#define CONFIG_MSVIDEO1_DECODER 0 -+#define CONFIG_MSZH_DECODER 0 -+#define CONFIG_MTS2_DECODER 0 -+#define CONFIG_MV30_DECODER 0 -+#define CONFIG_MVC1_DECODER 0 -+#define CONFIG_MVC2_DECODER 0 -+#define CONFIG_MVDV_DECODER 0 -+#define CONFIG_MVHA_DECODER 0 -+#define CONFIG_MWSC_DECODER 0 -+#define CONFIG_MXPEG_DECODER 0 -+#define CONFIG_NOTCHLC_DECODER 0 -+#define CONFIG_NUV_DECODER 0 -+#define CONFIG_PAF_VIDEO_DECODER 0 -+#define CONFIG_PAM_DECODER 0 -+#define CONFIG_PBM_DECODER 0 -+#define CONFIG_PCX_DECODER 0 -+#define CONFIG_PFM_DECODER 0 -+#define CONFIG_PGM_DECODER 0 -+#define CONFIG_PGMYUV_DECODER 0 -+#define CONFIG_PGX_DECODER 0 -+#define CONFIG_PHOTOCD_DECODER 0 -+#define CONFIG_PICTOR_DECODER 0 -+#define CONFIG_PIXLET_DECODER 0 -+#define CONFIG_PNG_DECODER 0 -+#define CONFIG_PPM_DECODER 0 -+#define CONFIG_PRORES_DECODER 0 -+#define CONFIG_PROSUMER_DECODER 0 -+#define CONFIG_PSD_DECODER 0 -+#define CONFIG_PTX_DECODER 0 -+#define CONFIG_QDRAW_DECODER 0 -+#define CONFIG_QPEG_DECODER 0 -+#define CONFIG_QTRLE_DECODER 0 -+#define CONFIG_R10K_DECODER 0 -+#define CONFIG_R210_DECODER 0 -+#define CONFIG_RASC_DECODER 0 -+#define CONFIG_RAWVIDEO_DECODER 0 -+#define CONFIG_RL2_DECODER 0 -+#define CONFIG_ROQ_DECODER 0 -+#define CONFIG_RPZA_DECODER 0 -+#define CONFIG_RSCC_DECODER 0 -+#define CONFIG_RV10_DECODER 0 -+#define CONFIG_RV20_DECODER 0 -+#define CONFIG_RV30_DECODER 0 -+#define CONFIG_RV40_DECODER 0 -+#define CONFIG_S302M_DECODER 0 -+#define CONFIG_SANM_DECODER 0 -+#define CONFIG_SCPR_DECODER 0 -+#define CONFIG_SCREENPRESSO_DECODER 0 -+#define CONFIG_SGA_DECODER 0 -+#define CONFIG_SGI_DECODER 0 -+#define CONFIG_SGIRLE_DECODER 0 -+#define CONFIG_SHEERVIDEO_DECODER 0 -+#define CONFIG_SIMBIOSIS_IMX_DECODER 0 -+#define CONFIG_SMACKER_DECODER 0 -+#define CONFIG_SMC_DECODER 0 -+#define CONFIG_SMVJPEG_DECODER 0 -+#define CONFIG_SNOW_DECODER 0 -+#define CONFIG_SP5X_DECODER 0 -+#define CONFIG_SPEEDHQ_DECODER 0 -+#define CONFIG_SPEEX_DECODER 0 -+#define CONFIG_SRGC_DECODER 0 -+#define CONFIG_SUNRAST_DECODER 0 -+#define CONFIG_SVQ1_DECODER 0 -+#define CONFIG_SVQ3_DECODER 0 -+#define CONFIG_TARGA_DECODER 0 -+#define CONFIG_TARGA_Y216_DECODER 0 -+#define CONFIG_TDSC_DECODER 0 -+#define CONFIG_THEORA_DECODER 1 -+#define CONFIG_THP_DECODER 0 -+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+#define CONFIG_TIFF_DECODER 0 -+#define CONFIG_TMV_DECODER 0 -+#define CONFIG_TRUEMOTION1_DECODER 0 -+#define CONFIG_TRUEMOTION2_DECODER 0 -+#define CONFIG_TRUEMOTION2RT_DECODER 0 -+#define CONFIG_TSCC_DECODER 0 -+#define CONFIG_TSCC2_DECODER 0 -+#define CONFIG_TXD_DECODER 0 -+#define CONFIG_ULTI_DECODER 0 -+#define CONFIG_UTVIDEO_DECODER 0 -+#define CONFIG_V210_DECODER 0 -+#define CONFIG_V210X_DECODER 0 -+#define CONFIG_V308_DECODER 0 -+#define CONFIG_V408_DECODER 0 -+#define CONFIG_V410_DECODER 0 -+#define CONFIG_VB_DECODER 0 -+#define CONFIG_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 -+#define CONFIG_VC1_V4L2M2M_DECODER 0 -+#define CONFIG_VCR1_DECODER 0 -+#define CONFIG_VMDVIDEO_DECODER 0 -+#define CONFIG_VMNC_DECODER 0 -+#define CONFIG_VP3_DECODER 1 -+#define CONFIG_VP4_DECODER 0 -+#define CONFIG_VP5_DECODER 0 -+#define CONFIG_VP6_DECODER 0 -+#define CONFIG_VP6A_DECODER 0 -+#define CONFIG_VP6F_DECODER 0 -+#define CONFIG_VP7_DECODER 0 -+#define CONFIG_VP8_DECODER 1 -+#define CONFIG_VP8_RKMPP_DECODER 0 -+#define CONFIG_VP8_V4L2M2M_DECODER 0 -+#define CONFIG_VP9_DECODER 0 -+#define CONFIG_VP9_RKMPP_DECODER 0 -+#define CONFIG_VP9_V4L2M2M_DECODER 0 -+#define CONFIG_VQA_DECODER 0 -+#define CONFIG_WEBP_DECODER 0 -+#define CONFIG_WCMV_DECODER 0 -+#define CONFIG_WRAPPED_AVFRAME_DECODER 0 -+#define CONFIG_WMV1_DECODER 0 -+#define CONFIG_WMV2_DECODER 0 -+#define CONFIG_WMV3_DECODER 0 -+#define CONFIG_WMV3_CRYSTALHD_DECODER 0 -+#define CONFIG_WMV3IMAGE_DECODER 0 -+#define CONFIG_WNV1_DECODER 0 -+#define CONFIG_XAN_WC3_DECODER 0 -+#define CONFIG_XAN_WC4_DECODER 0 -+#define CONFIG_XBM_DECODER 0 -+#define CONFIG_XFACE_DECODER 0 -+#define CONFIG_XL_DECODER 0 -+#define CONFIG_XPM_DECODER 0 -+#define CONFIG_XWD_DECODER 0 -+#define CONFIG_Y41P_DECODER 0 -+#define CONFIG_YLC_DECODER 0 -+#define CONFIG_YOP_DECODER 0 -+#define CONFIG_YUV4_DECODER 0 -+#define CONFIG_ZERO12V_DECODER 0 -+#define CONFIG_ZEROCODEC_DECODER 0 -+#define CONFIG_ZLIB_DECODER 0 -+#define CONFIG_ZMBV_DECODER 0 -+#define CONFIG_AAC_DECODER 1 -+#define CONFIG_AAC_FIXED_DECODER 0 -+#define CONFIG_AAC_LATM_DECODER 0 -+#define CONFIG_AC3_DECODER 0 -+#define CONFIG_AC3_FIXED_DECODER 0 -+#define CONFIG_ACELP_KELVIN_DECODER 0 -+#define CONFIG_ALAC_DECODER 0 -+#define CONFIG_ALS_DECODER 0 -+#define CONFIG_AMRNB_DECODER 0 -+#define CONFIG_AMRWB_DECODER 0 -+#define CONFIG_APE_DECODER 0 -+#define CONFIG_APTX_DECODER 0 -+#define CONFIG_APTX_HD_DECODER 0 -+#define CONFIG_ATRAC1_DECODER 0 -+#define CONFIG_ATRAC3_DECODER 0 -+#define CONFIG_ATRAC3AL_DECODER 0 -+#define CONFIG_ATRAC3P_DECODER 0 -+#define CONFIG_ATRAC3PAL_DECODER 0 -+#define CONFIG_ATRAC9_DECODER 0 -+#define CONFIG_BINKAUDIO_DCT_DECODER 0 -+#define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+#define CONFIG_BMV_AUDIO_DECODER 0 -+#define CONFIG_COOK_DECODER 0 -+#define CONFIG_DCA_DECODER 0 -+#define CONFIG_DOLBY_E_DECODER 0 -+#define CONFIG_DSD_LSBF_DECODER 0 -+#define CONFIG_DSD_MSBF_DECODER 0 -+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0 -+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0 -+#define CONFIG_DSICINAUDIO_DECODER 0 -+#define CONFIG_DSS_SP_DECODER 0 -+#define CONFIG_DST_DECODER 0 -+#define CONFIG_EAC3_DECODER 0 -+#define CONFIG_EVRC_DECODER 0 -+#define CONFIG_FASTAUDIO_DECODER 0 -+#define CONFIG_FFWAVESYNTH_DECODER 0 -+#define CONFIG_FLAC_DECODER 1 -+#define CONFIG_G723_1_DECODER 0 -+#define CONFIG_G729_DECODER 0 -+#define CONFIG_GSM_DECODER 0 -+#define CONFIG_GSM_MS_DECODER 0 -+#define CONFIG_HCA_DECODER 0 -+#define CONFIG_HCOM_DECODER 0 -+#define CONFIG_IAC_DECODER 0 -+#define CONFIG_ILBC_DECODER 0 -+#define CONFIG_IMC_DECODER 0 -+#define CONFIG_INTERPLAY_ACM_DECODER 0 -+#define CONFIG_MACE3_DECODER 0 -+#define CONFIG_MACE6_DECODER 0 -+#define CONFIG_METASOUND_DECODER 0 -+#define CONFIG_MLP_DECODER 0 -+#define CONFIG_MP1_DECODER 0 -+#define CONFIG_MP1FLOAT_DECODER 0 -+#define CONFIG_MP2_DECODER 0 -+#define CONFIG_MP2FLOAT_DECODER 0 -+#define CONFIG_MP3FLOAT_DECODER 0 -+#define CONFIG_MP3_DECODER 1 -+#define CONFIG_MP3ADUFLOAT_DECODER 0 -+#define CONFIG_MP3ADU_DECODER 0 -+#define CONFIG_MP3ON4FLOAT_DECODER 0 -+#define CONFIG_MP3ON4_DECODER 0 -+#define CONFIG_MPC7_DECODER 0 -+#define CONFIG_MPC8_DECODER 0 -+#define CONFIG_MSNSIREN_DECODER 0 -+#define CONFIG_NELLYMOSER_DECODER 0 -+#define CONFIG_ON2AVC_DECODER 0 -+#define CONFIG_OPUS_DECODER 0 -+#define CONFIG_PAF_AUDIO_DECODER 0 -+#define CONFIG_QCELP_DECODER 0 -+#define CONFIG_QDM2_DECODER 0 -+#define CONFIG_QDMC_DECODER 0 -+#define CONFIG_RA_144_DECODER 0 -+#define CONFIG_RA_288_DECODER 0 -+#define CONFIG_RALF_DECODER 0 -+#define CONFIG_SBC_DECODER 0 -+#define CONFIG_SHORTEN_DECODER 0 -+#define CONFIG_SIPR_DECODER 0 -+#define CONFIG_SIREN_DECODER 0 -+#define CONFIG_SMACKAUD_DECODER 0 -+#define CONFIG_SONIC_DECODER 0 -+#define CONFIG_TAK_DECODER 0 -+#define CONFIG_TRUEHD_DECODER 0 -+#define CONFIG_TRUESPEECH_DECODER 0 -+#define CONFIG_TTA_DECODER 0 -+#define CONFIG_TWINVQ_DECODER 0 -+#define CONFIG_VMDAUDIO_DECODER 0 -+#define CONFIG_VORBIS_DECODER 1 -+#define CONFIG_WAVPACK_DECODER 0 -+#define CONFIG_WMALOSSLESS_DECODER 0 -+#define CONFIG_WMAPRO_DECODER 0 -+#define CONFIG_WMAV1_DECODER 0 -+#define CONFIG_WMAV2_DECODER 0 -+#define CONFIG_WMAVOICE_DECODER 0 -+#define CONFIG_WS_SND1_DECODER 0 -+#define CONFIG_XMA1_DECODER 0 -+#define CONFIG_XMA2_DECODER 0 -+#define CONFIG_PCM_ALAW_DECODER 1 -+#define CONFIG_PCM_BLURAY_DECODER 0 -+#define CONFIG_PCM_DVD_DECODER 0 -+#define CONFIG_PCM_F16LE_DECODER 0 -+#define CONFIG_PCM_F24LE_DECODER 0 -+#define CONFIG_PCM_F32BE_DECODER 0 -+#define CONFIG_PCM_F32LE_DECODER 1 -+#define CONFIG_PCM_F64BE_DECODER 0 -+#define CONFIG_PCM_F64LE_DECODER 0 -+#define CONFIG_PCM_LXF_DECODER 0 -+#define CONFIG_PCM_MULAW_DECODER 1 -+#define CONFIG_PCM_S8_DECODER 0 -+#define CONFIG_PCM_S8_PLANAR_DECODER 0 -+#define CONFIG_PCM_S16BE_DECODER 1 -+#define CONFIG_PCM_S16BE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S16LE_DECODER 1 -+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S24BE_DECODER 1 -+#define CONFIG_PCM_S24DAUD_DECODER 0 -+#define CONFIG_PCM_S24LE_DECODER 1 -+#define CONFIG_PCM_S24LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S32BE_DECODER 0 -+#define CONFIG_PCM_S32LE_DECODER 1 -+#define CONFIG_PCM_S32LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S64BE_DECODER 0 -+#define CONFIG_PCM_S64LE_DECODER 0 -+#define CONFIG_PCM_SGA_DECODER 0 -+#define CONFIG_PCM_U8_DECODER 1 -+#define CONFIG_PCM_U16BE_DECODER 0 -+#define CONFIG_PCM_U16LE_DECODER 0 -+#define CONFIG_PCM_U24BE_DECODER 0 -+#define CONFIG_PCM_U24LE_DECODER 0 -+#define CONFIG_PCM_U32BE_DECODER 0 -+#define CONFIG_PCM_U32LE_DECODER 0 -+#define CONFIG_PCM_VIDC_DECODER 0 -+#define CONFIG_DERF_DPCM_DECODER 0 -+#define CONFIG_GREMLIN_DPCM_DECODER 0 -+#define CONFIG_INTERPLAY_DPCM_DECODER 0 -+#define CONFIG_ROQ_DPCM_DECODER 0 -+#define CONFIG_SDX2_DPCM_DECODER 0 -+#define CONFIG_SOL_DPCM_DECODER 0 -+#define CONFIG_XAN_DPCM_DECODER 0 -+#define CONFIG_ADPCM_4XM_DECODER 0 -+#define CONFIG_ADPCM_ADX_DECODER 0 -+#define CONFIG_ADPCM_AFC_DECODER 0 -+#define CONFIG_ADPCM_AGM_DECODER 0 -+#define CONFIG_ADPCM_AICA_DECODER 0 -+#define CONFIG_ADPCM_ARGO_DECODER 0 -+#define CONFIG_ADPCM_CT_DECODER 0 -+#define CONFIG_ADPCM_DTK_DECODER 0 -+#define CONFIG_ADPCM_EA_DECODER 0 -+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+#define CONFIG_ADPCM_EA_R1_DECODER 0 -+#define CONFIG_ADPCM_EA_R2_DECODER 0 -+#define CONFIG_ADPCM_EA_R3_DECODER 0 -+#define CONFIG_ADPCM_EA_XAS_DECODER 0 -+#define CONFIG_ADPCM_G722_DECODER 0 -+#define CONFIG_ADPCM_G726_DECODER 0 -+#define CONFIG_ADPCM_G726LE_DECODER 0 -+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0 -+#define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+#define CONFIG_ADPCM_IMA_ALP_DECODER 0 -+#define CONFIG_ADPCM_IMA_APC_DECODER 0 -+#define CONFIG_ADPCM_IMA_APM_DECODER 0 -+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 -+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 -+#define CONFIG_ADPCM_IMA_MTF_DECODER 0 -+#define CONFIG_ADPCM_IMA_OKI_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_DECODER 0 -+#define CONFIG_ADPCM_IMA_RAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_SSI_DECODER 0 -+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+#define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+#define CONFIG_ADPCM_IMA_WS_DECODER 0 -+#define CONFIG_ADPCM_MS_DECODER 0 -+#define CONFIG_ADPCM_MTAF_DECODER 0 -+#define CONFIG_ADPCM_PSX_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+#define CONFIG_ADPCM_SWF_DECODER 0 -+#define CONFIG_ADPCM_THP_DECODER 0 -+#define CONFIG_ADPCM_THP_LE_DECODER 0 -+#define CONFIG_ADPCM_VIMA_DECODER 0 -+#define CONFIG_ADPCM_XA_DECODER 0 -+#define CONFIG_ADPCM_YAMAHA_DECODER 0 -+#define CONFIG_ADPCM_ZORK_DECODER 0 -+#define CONFIG_SSA_DECODER 0 -+#define CONFIG_ASS_DECODER 0 -+#define CONFIG_CCAPTION_DECODER 0 -+#define CONFIG_DVBSUB_DECODER 0 -+#define CONFIG_DVDSUB_DECODER 0 -+#define CONFIG_JACOSUB_DECODER 0 -+#define CONFIG_MICRODVD_DECODER 0 -+#define CONFIG_MOVTEXT_DECODER 0 -+#define CONFIG_MPL2_DECODER 0 -+#define CONFIG_PGSSUB_DECODER 0 -+#define CONFIG_PJS_DECODER 0 -+#define CONFIG_REALTEXT_DECODER 0 -+#define CONFIG_SAMI_DECODER 0 -+#define CONFIG_SRT_DECODER 0 -+#define CONFIG_STL_DECODER 0 -+#define CONFIG_SUBRIP_DECODER 0 -+#define CONFIG_SUBVIEWER_DECODER 0 -+#define CONFIG_SUBVIEWER1_DECODER 0 -+#define CONFIG_TEXT_DECODER 0 -+#define CONFIG_VPLAYER_DECODER 0 -+#define CONFIG_WEBVTT_DECODER 0 -+#define CONFIG_XSUB_DECODER 0 -+#define CONFIG_AAC_AT_DECODER 0 -+#define CONFIG_AC3_AT_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 -+#define CONFIG_ALAC_AT_DECODER 0 -+#define CONFIG_AMR_NB_AT_DECODER 0 -+#define CONFIG_EAC3_AT_DECODER 0 -+#define CONFIG_GSM_MS_AT_DECODER 0 -+#define CONFIG_ILBC_AT_DECODER 0 -+#define CONFIG_MP1_AT_DECODER 0 -+#define CONFIG_MP2_AT_DECODER 0 -+#define CONFIG_MP3_AT_DECODER 0 -+#define CONFIG_PCM_ALAW_AT_DECODER 0 -+#define CONFIG_PCM_MULAW_AT_DECODER 0 -+#define CONFIG_QDMC_AT_DECODER 0 -+#define CONFIG_QDM2_AT_DECODER 0 -+#define CONFIG_LIBARIBB24_DECODER 0 -+#define CONFIG_LIBCELT_DECODER 0 -+#define CONFIG_LIBCODEC2_DECODER 0 -+#define CONFIG_LIBDAV1D_DECODER 0 -+#define CONFIG_LIBDAVS2_DECODER 0 -+#define CONFIG_LIBFDK_AAC_DECODER 0 -+#define CONFIG_LIBGSM_DECODER 0 -+#define CONFIG_LIBGSM_MS_DECODER 0 -+#define CONFIG_LIBILBC_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+#define CONFIG_LIBOPENJPEG_DECODER 0 -+#define CONFIG_LIBOPUS_DECODER 1 -+#define CONFIG_LIBRSVG_DECODER 0 -+#define CONFIG_LIBSPEEX_DECODER 0 -+#define CONFIG_LIBUAVS3D_DECODER 0 -+#define CONFIG_LIBVORBIS_DECODER 0 -+#define CONFIG_LIBVPX_VP8_DECODER 0 -+#define CONFIG_LIBVPX_VP9_DECODER 0 -+#define CONFIG_LIBZVBI_TELETEXT_DECODER 0 -+#define CONFIG_BINTEXT_DECODER 0 -+#define CONFIG_XBIN_DECODER 0 -+#define CONFIG_IDF_DECODER 0 -+#define CONFIG_LIBAOM_AV1_DECODER 0 -+#define CONFIG_AV1_DECODER 0 -+#define CONFIG_AV1_CUVID_DECODER 0 -+#define CONFIG_AV1_QSV_DECODER 0 -+#define CONFIG_LIBOPENH264_DECODER 0 -+#define CONFIG_H264_CUVID_DECODER 0 -+#define CONFIG_HEVC_CUVID_DECODER 0 -+#define CONFIG_HEVC_MEDIACODEC_DECODER 0 -+#define CONFIG_MJPEG_CUVID_DECODER 0 -+#define CONFIG_MJPEG_QSV_DECODER 0 -+#define CONFIG_MPEG1_CUVID_DECODER 0 -+#define CONFIG_MPEG2_CUVID_DECODER 0 -+#define CONFIG_MPEG4_CUVID_DECODER 0 -+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0 -+#define CONFIG_VC1_CUVID_DECODER 0 -+#define CONFIG_VP8_CUVID_DECODER 0 -+#define CONFIG_VP8_MEDIACODEC_DECODER 0 -+#define CONFIG_VP8_QSV_DECODER 0 -+#define CONFIG_VP9_CUVID_DECODER 0 -+#define CONFIG_VP9_MEDIACODEC_DECODER 0 -+#define CONFIG_VP9_QSV_DECODER 0 -+#define CONFIG_A64MULTI_ENCODER 0 -+#define CONFIG_A64MULTI5_ENCODER 0 -+#define CONFIG_ALIAS_PIX_ENCODER 0 -+#define CONFIG_AMV_ENCODER 0 -+#define CONFIG_APNG_ENCODER 0 -+#define CONFIG_ASV1_ENCODER 0 -+#define CONFIG_ASV2_ENCODER 0 -+#define CONFIG_AVRP_ENCODER 0 -+#define CONFIG_AVUI_ENCODER 0 -+#define CONFIG_AYUV_ENCODER 0 -+#define CONFIG_BITPACKED_ENCODER 0 -+#define CONFIG_BMP_ENCODER 0 -+#define CONFIG_CFHD_ENCODER 0 -+#define CONFIG_CINEPAK_ENCODER 0 -+#define CONFIG_CLJR_ENCODER 0 -+#define CONFIG_COMFORTNOISE_ENCODER 0 -+#define CONFIG_DNXHD_ENCODER 0 -+#define CONFIG_DPX_ENCODER 0 -+#define CONFIG_DVVIDEO_ENCODER 0 -+#define CONFIG_EXR_ENCODER 0 -+#define CONFIG_FFV1_ENCODER 0 -+#define CONFIG_FFVHUFF_ENCODER 0 -+#define CONFIG_FITS_ENCODER 0 -+#define CONFIG_FLASHSV_ENCODER 0 -+#define CONFIG_FLASHSV2_ENCODER 0 -+#define CONFIG_FLV_ENCODER 0 -+#define CONFIG_GIF_ENCODER 0 -+#define CONFIG_H261_ENCODER 0 -+#define CONFIG_H263_ENCODER 0 -+#define CONFIG_H263P_ENCODER 0 -+#define CONFIG_HAP_ENCODER 0 -+#define CONFIG_HUFFYUV_ENCODER 0 -+#define CONFIG_JPEG2000_ENCODER 0 -+#define CONFIG_JPEGLS_ENCODER 0 -+#define CONFIG_LJPEG_ENCODER 0 -+#define CONFIG_MAGICYUV_ENCODER 0 -+#define CONFIG_MJPEG_ENCODER 0 -+#define CONFIG_MPEG1VIDEO_ENCODER 0 -+#define CONFIG_MPEG2VIDEO_ENCODER 0 -+#define CONFIG_MPEG4_ENCODER 0 -+#define CONFIG_MSMPEG4V2_ENCODER 0 -+#define CONFIG_MSMPEG4V3_ENCODER 0 -+#define CONFIG_MSVIDEO1_ENCODER 0 -+#define CONFIG_PAM_ENCODER 0 -+#define CONFIG_PBM_ENCODER 0 -+#define CONFIG_PCX_ENCODER 0 -+#define CONFIG_PFM_ENCODER 0 -+#define CONFIG_PGM_ENCODER 0 -+#define CONFIG_PGMYUV_ENCODER 0 -+#define CONFIG_PNG_ENCODER 0 -+#define CONFIG_PPM_ENCODER 0 -+#define CONFIG_PRORES_ENCODER 0 -+#define CONFIG_PRORES_AW_ENCODER 0 -+#define CONFIG_PRORES_KS_ENCODER 0 -+#define CONFIG_QTRLE_ENCODER 0 -+#define CONFIG_R10K_ENCODER 0 -+#define CONFIG_R210_ENCODER 0 -+#define CONFIG_RAWVIDEO_ENCODER 0 -+#define CONFIG_ROQ_ENCODER 0 -+#define CONFIG_RPZA_ENCODER 0 -+#define CONFIG_RV10_ENCODER 0 -+#define CONFIG_RV20_ENCODER 0 -+#define CONFIG_S302M_ENCODER 0 -+#define CONFIG_SGI_ENCODER 0 -+#define CONFIG_SMC_ENCODER 0 -+#define CONFIG_SNOW_ENCODER 0 -+#define CONFIG_SPEEDHQ_ENCODER 0 -+#define CONFIG_SUNRAST_ENCODER 0 -+#define CONFIG_SVQ1_ENCODER 0 -+#define CONFIG_TARGA_ENCODER 0 -+#define CONFIG_TIFF_ENCODER 0 -+#define CONFIG_UTVIDEO_ENCODER 0 -+#define CONFIG_V210_ENCODER 0 -+#define CONFIG_V308_ENCODER 0 -+#define CONFIG_V408_ENCODER 0 -+#define CONFIG_V410_ENCODER 0 -+#define CONFIG_VC2_ENCODER 0 -+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 -+#define CONFIG_WMV1_ENCODER 0 -+#define CONFIG_WMV2_ENCODER 0 -+#define CONFIG_XBM_ENCODER 0 -+#define CONFIG_XFACE_ENCODER 0 -+#define CONFIG_XWD_ENCODER 0 -+#define CONFIG_Y41P_ENCODER 0 -+#define CONFIG_YUV4_ENCODER 0 -+#define CONFIG_ZLIB_ENCODER 0 -+#define CONFIG_ZMBV_ENCODER 0 -+#define CONFIG_AAC_ENCODER 0 -+#define CONFIG_AC3_ENCODER 0 -+#define CONFIG_AC3_FIXED_ENCODER 0 -+#define CONFIG_ALAC_ENCODER 0 -+#define CONFIG_APTX_ENCODER 0 -+#define CONFIG_APTX_HD_ENCODER 0 -+#define CONFIG_DCA_ENCODER 0 -+#define CONFIG_EAC3_ENCODER 0 -+#define CONFIG_FLAC_ENCODER 0 -+#define CONFIG_G723_1_ENCODER 0 -+#define CONFIG_MLP_ENCODER 0 -+#define CONFIG_MP2_ENCODER 0 -+#define CONFIG_MP2FIXED_ENCODER 0 -+#define CONFIG_NELLYMOSER_ENCODER 0 -+#define CONFIG_OPUS_ENCODER 0 -+#define CONFIG_RA_144_ENCODER 0 -+#define CONFIG_SBC_ENCODER 0 -+#define CONFIG_SONIC_ENCODER 0 -+#define CONFIG_SONIC_LS_ENCODER 0 -+#define CONFIG_TRUEHD_ENCODER 0 -+#define CONFIG_TTA_ENCODER 0 -+#define CONFIG_VORBIS_ENCODER 0 -+#define CONFIG_WAVPACK_ENCODER 0 -+#define CONFIG_WMAV1_ENCODER 0 -+#define CONFIG_WMAV2_ENCODER 0 -+#define CONFIG_PCM_ALAW_ENCODER 0 -+#define CONFIG_PCM_DVD_ENCODER 0 -+#define CONFIG_PCM_F32BE_ENCODER 0 -+#define CONFIG_PCM_F32LE_ENCODER 0 -+#define CONFIG_PCM_F64BE_ENCODER 0 -+#define CONFIG_PCM_F64LE_ENCODER 0 -+#define CONFIG_PCM_MULAW_ENCODER 0 -+#define CONFIG_PCM_S8_ENCODER 0 -+#define CONFIG_PCM_S8_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S16BE_ENCODER 0 -+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S16LE_ENCODER 0 -+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S24BE_ENCODER 0 -+#define CONFIG_PCM_S24DAUD_ENCODER 0 -+#define CONFIG_PCM_S24LE_ENCODER 0 -+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S32BE_ENCODER 0 -+#define CONFIG_PCM_S32LE_ENCODER 0 -+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S64BE_ENCODER 0 -+#define CONFIG_PCM_S64LE_ENCODER 0 -+#define CONFIG_PCM_U8_ENCODER 0 -+#define CONFIG_PCM_U16BE_ENCODER 0 -+#define CONFIG_PCM_U16LE_ENCODER 0 -+#define CONFIG_PCM_U24BE_ENCODER 0 -+#define CONFIG_PCM_U24LE_ENCODER 0 -+#define CONFIG_PCM_U32BE_ENCODER 0 -+#define CONFIG_PCM_U32LE_ENCODER 0 -+#define CONFIG_PCM_VIDC_ENCODER 0 -+#define CONFIG_ROQ_DPCM_ENCODER 0 -+#define CONFIG_ADPCM_ADX_ENCODER 0 -+#define CONFIG_ADPCM_ARGO_ENCODER 0 -+#define CONFIG_ADPCM_G722_ENCODER 0 -+#define CONFIG_ADPCM_G726_ENCODER 0 -+#define CONFIG_ADPCM_G726LE_ENCODER 0 -+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0 -+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0 -+#define CONFIG_ADPCM_IMA_APM_ENCODER 0 -+#define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WS_ENCODER 0 -+#define CONFIG_ADPCM_MS_ENCODER 0 -+#define CONFIG_ADPCM_SWF_ENCODER 0 -+#define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+#define CONFIG_SSA_ENCODER 0 -+#define CONFIG_ASS_ENCODER 0 -+#define CONFIG_DVBSUB_ENCODER 0 -+#define CONFIG_DVDSUB_ENCODER 0 -+#define CONFIG_MOVTEXT_ENCODER 0 -+#define CONFIG_SRT_ENCODER 0 -+#define CONFIG_SUBRIP_ENCODER 0 -+#define CONFIG_TEXT_ENCODER 0 -+#define CONFIG_TTML_ENCODER 0 -+#define CONFIG_WEBVTT_ENCODER 0 -+#define CONFIG_XSUB_ENCODER 0 -+#define CONFIG_AAC_AT_ENCODER 0 -+#define CONFIG_ALAC_AT_ENCODER 0 -+#define CONFIG_ILBC_AT_ENCODER 0 -+#define CONFIG_PCM_ALAW_AT_ENCODER 0 -+#define CONFIG_PCM_MULAW_AT_ENCODER 0 -+#define CONFIG_LIBAOM_AV1_ENCODER 0 -+#define CONFIG_LIBCODEC2_ENCODER 0 -+#define CONFIG_LIBFDK_AAC_ENCODER 0 -+#define CONFIG_LIBGSM_ENCODER 0 -+#define CONFIG_LIBGSM_MS_ENCODER 0 -+#define CONFIG_LIBILBC_ENCODER 0 -+#define CONFIG_LIBMP3LAME_ENCODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+#define CONFIG_LIBOPENJPEG_ENCODER 0 -+#define CONFIG_LIBOPUS_ENCODER 0 -+#define CONFIG_LIBRAV1E_ENCODER 0 -+#define CONFIG_LIBSHINE_ENCODER 0 -+#define CONFIG_LIBSPEEX_ENCODER 0 -+#define CONFIG_LIBSVTAV1_ENCODER 0 -+#define CONFIG_LIBTHEORA_ENCODER 0 -+#define CONFIG_LIBTWOLAME_ENCODER 0 -+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0 -+#define CONFIG_LIBVORBIS_ENCODER 0 -+#define CONFIG_LIBVPX_VP8_ENCODER 0 -+#define CONFIG_LIBVPX_VP9_ENCODER 0 -+#define CONFIG_LIBWEBP_ANIM_ENCODER 0 -+#define CONFIG_LIBWEBP_ENCODER 0 -+#define CONFIG_LIBX262_ENCODER 0 -+#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBX264RGB_ENCODER 0 -+#define CONFIG_LIBX265_ENCODER 0 -+#define CONFIG_LIBXAVS_ENCODER 0 -+#define CONFIG_LIBXAVS2_ENCODER 0 -+#define CONFIG_LIBXVID_ENCODER 0 -+#define CONFIG_AAC_MF_ENCODER 0 -+#define CONFIG_AC3_MF_ENCODER 0 -+#define CONFIG_H263_V4L2M2M_ENCODER 0 -+#define CONFIG_LIBOPENH264_ENCODER 0 -+#define CONFIG_H264_AMF_ENCODER 0 -+#define CONFIG_H264_MF_ENCODER 0 -+#define CONFIG_H264_NVENC_ENCODER 0 -+#define CONFIG_H264_OMX_ENCODER 0 -+#define CONFIG_H264_QSV_ENCODER 0 -+#define CONFIG_H264_V4L2M2M_ENCODER 0 -+#define CONFIG_H264_VAAPI_ENCODER 0 -+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_HEVC_AMF_ENCODER 0 -+#define CONFIG_HEVC_MF_ENCODER 0 -+#define CONFIG_HEVC_NVENC_ENCODER 0 -+#define CONFIG_HEVC_QSV_ENCODER 0 -+#define CONFIG_HEVC_V4L2M2M_ENCODER 0 -+#define CONFIG_HEVC_VAAPI_ENCODER 0 -+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_LIBKVAZAAR_ENCODER 0 -+#define CONFIG_MJPEG_QSV_ENCODER 0 -+#define CONFIG_MJPEG_VAAPI_ENCODER 0 -+#define CONFIG_MP3_MF_ENCODER 0 -+#define CONFIG_MPEG2_QSV_ENCODER 0 -+#define CONFIG_MPEG2_VAAPI_ENCODER 0 -+#define CONFIG_MPEG4_OMX_ENCODER 0 -+#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 -+#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_VP8_V4L2M2M_ENCODER 0 -+#define CONFIG_VP8_VAAPI_ENCODER 0 -+#define CONFIG_VP9_VAAPI_ENCODER 0 -+#define CONFIG_VP9_QSV_ENCODER 0 -+#define CONFIG_AV1_D3D11VA_HWACCEL 0 -+#define CONFIG_AV1_D3D11VA2_HWACCEL 0 -+#define CONFIG_AV1_DXVA2_HWACCEL 0 -+#define CONFIG_AV1_NVDEC_HWACCEL 0 -+#define CONFIG_AV1_VAAPI_HWACCEL 0 -+#define CONFIG_H263_VAAPI_HWACCEL 0 -+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_H264_D3D11VA_HWACCEL 0 -+#define CONFIG_H264_D3D11VA2_HWACCEL 0 -+#define CONFIG_H264_DXVA2_HWACCEL 0 -+#define CONFIG_H264_NVDEC_HWACCEL 0 -+#define CONFIG_H264_VAAPI_HWACCEL 0 -+#define CONFIG_H264_VDPAU_HWACCEL 0 -+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_HEVC_D3D11VA_HWACCEL 0 -+#define CONFIG_HEVC_D3D11VA2_HWACCEL 0 -+#define CONFIG_HEVC_DXVA2_HWACCEL 0 -+#define CONFIG_HEVC_NVDEC_HWACCEL 0 -+#define CONFIG_HEVC_VAAPI_HWACCEL 0 -+#define CONFIG_HEVC_VDPAU_HWACCEL 0 -+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MJPEG_NVDEC_HWACCEL 0 -+#define CONFIG_MJPEG_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG1_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG1_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MPEG1_XVMC_HWACCEL 0 -+#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 -+#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 -+#define CONFIG_MPEG2_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+#define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG2_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MPEG2_XVMC_HWACCEL 0 -+#define CONFIG_MPEG4_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG4_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_VC1_D3D11VA_HWACCEL 0 -+#define CONFIG_VC1_D3D11VA2_HWACCEL 0 -+#define CONFIG_VC1_DXVA2_HWACCEL 0 -+#define CONFIG_VC1_NVDEC_HWACCEL 0 -+#define CONFIG_VC1_VAAPI_HWACCEL 0 -+#define CONFIG_VC1_VDPAU_HWACCEL 0 -+#define CONFIG_VP8_NVDEC_HWACCEL 0 -+#define CONFIG_VP8_VAAPI_HWACCEL 0 -+#define CONFIG_VP9_D3D11VA_HWACCEL 0 -+#define CONFIG_VP9_D3D11VA2_HWACCEL 0 -+#define CONFIG_VP9_DXVA2_HWACCEL 0 -+#define CONFIG_VP9_NVDEC_HWACCEL 0 -+#define CONFIG_VP9_VAAPI_HWACCEL 0 -+#define CONFIG_VP9_VDPAU_HWACCEL 0 -+#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_WMV3_D3D11VA_HWACCEL 0 -+#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 -+#define CONFIG_WMV3_DXVA2_HWACCEL 0 -+#define CONFIG_WMV3_NVDEC_HWACCEL 0 -+#define CONFIG_WMV3_VAAPI_HWACCEL 0 -+#define CONFIG_WMV3_VDPAU_HWACCEL 0 -+#define CONFIG_AAC_PARSER 1 -+#define CONFIG_AAC_LATM_PARSER 0 -+#define CONFIG_AC3_PARSER 0 -+#define CONFIG_ADX_PARSER 0 -+#define CONFIG_AMR_PARSER 0 -+#define CONFIG_AV1_PARSER 0 -+#define CONFIG_AVS2_PARSER 0 -+#define CONFIG_AVS3_PARSER 0 -+#define CONFIG_BMP_PARSER 0 -+#define CONFIG_CAVSVIDEO_PARSER 0 -+#define CONFIG_COOK_PARSER 0 -+#define CONFIG_CRI_PARSER 0 -+#define CONFIG_DCA_PARSER 0 -+#define CONFIG_DIRAC_PARSER 0 -+#define CONFIG_DNXHD_PARSER 0 -+#define CONFIG_DOLBY_E_PARSER 0 -+#define CONFIG_DPX_PARSER 0 -+#define CONFIG_DVAUDIO_PARSER 0 -+#define CONFIG_DVBSUB_PARSER 0 -+#define CONFIG_DVDSUB_PARSER 0 -+#define CONFIG_DVD_NAV_PARSER 0 -+#define CONFIG_FLAC_PARSER 1 -+#define CONFIG_G723_1_PARSER 0 -+#define CONFIG_G729_PARSER 0 -+#define CONFIG_GIF_PARSER 0 -+#define CONFIG_GSM_PARSER 0 -+#define CONFIG_H261_PARSER 0 -+#define CONFIG_H263_PARSER 0 -+#define CONFIG_H264_PARSER 1 -+#define CONFIG_HEVC_PARSER 0 -+#define CONFIG_IPU_PARSER 0 -+#define CONFIG_JPEG2000_PARSER 0 -+#define CONFIG_MJPEG_PARSER 0 -+#define CONFIG_MLP_PARSER 0 -+#define CONFIG_MPEG4VIDEO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 -+#define CONFIG_MPEGVIDEO_PARSER 0 -+#define CONFIG_OPUS_PARSER 1 -+#define CONFIG_PNG_PARSER 0 -+#define CONFIG_PNM_PARSER 0 -+#define CONFIG_RV30_PARSER 0 -+#define CONFIG_RV40_PARSER 0 -+#define CONFIG_SBC_PARSER 0 -+#define CONFIG_SIPR_PARSER 0 -+#define CONFIG_TAK_PARSER 0 -+#define CONFIG_VC1_PARSER 0 -+#define CONFIG_VORBIS_PARSER 1 -+#define CONFIG_VP3_PARSER 1 -+#define CONFIG_VP8_PARSER 1 -+#define CONFIG_VP9_PARSER 1 -+#define CONFIG_WEBP_PARSER 0 -+#define CONFIG_XBM_PARSER 0 -+#define CONFIG_XMA_PARSER 0 -+#define CONFIG_ALSA_INDEV 0 -+#define CONFIG_ANDROID_CAMERA_INDEV 0 -+#define CONFIG_AVFOUNDATION_INDEV 0 -+#define CONFIG_BKTR_INDEV 0 -+#define CONFIG_DECKLINK_INDEV 0 -+#define CONFIG_DSHOW_INDEV 0 -+#define CONFIG_FBDEV_INDEV 0 -+#define CONFIG_GDIGRAB_INDEV 0 -+#define CONFIG_IEC61883_INDEV 0 -+#define CONFIG_JACK_INDEV 0 -+#define CONFIG_KMSGRAB_INDEV 0 -+#define CONFIG_LAVFI_INDEV 0 -+#define CONFIG_OPENAL_INDEV 0 -+#define CONFIG_OSS_INDEV 0 -+#define CONFIG_PULSE_INDEV 0 -+#define CONFIG_SNDIO_INDEV 0 -+#define CONFIG_V4L2_INDEV 0 -+#define CONFIG_VFWCAP_INDEV 0 -+#define CONFIG_XCBGRAB_INDEV 0 -+#define CONFIG_LIBCDIO_INDEV 0 -+#define CONFIG_LIBDC1394_INDEV 0 -+#define CONFIG_ALSA_OUTDEV 0 -+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0 -+#define CONFIG_CACA_OUTDEV 0 -+#define CONFIG_DECKLINK_OUTDEV 0 -+#define CONFIG_FBDEV_OUTDEV 0 -+#define CONFIG_OPENGL_OUTDEV 0 -+#define CONFIG_OSS_OUTDEV 0 -+#define CONFIG_PULSE_OUTDEV 0 -+#define CONFIG_SDL2_OUTDEV 0 -+#define CONFIG_SNDIO_OUTDEV 0 -+#define CONFIG_V4L2_OUTDEV 0 -+#define CONFIG_XV_OUTDEV 0 -+#define CONFIG_ABENCH_FILTER 0 -+#define CONFIG_ACOMPRESSOR_FILTER 0 -+#define CONFIG_ACONTRAST_FILTER 0 -+#define CONFIG_ACOPY_FILTER 0 -+#define CONFIG_ACUE_FILTER 0 -+#define CONFIG_ACROSSFADE_FILTER 0 -+#define CONFIG_ACROSSOVER_FILTER 0 -+#define CONFIG_ACRUSHER_FILTER 0 -+#define CONFIG_ADECLICK_FILTER 0 -+#define CONFIG_ADECLIP_FILTER 0 -+#define CONFIG_ADECORRELATE_FILTER 0 -+#define CONFIG_ADELAY_FILTER 0 -+#define CONFIG_ADENORM_FILTER 0 -+#define CONFIG_ADERIVATIVE_FILTER 0 -+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 -+#define CONFIG_ADYNAMICSMOOTH_FILTER 0 -+#define CONFIG_AECHO_FILTER 0 -+#define CONFIG_AEMPHASIS_FILTER 0 -+#define CONFIG_AEVAL_FILTER 0 -+#define CONFIG_AEXCITER_FILTER 0 -+#define CONFIG_AFADE_FILTER 0 -+#define CONFIG_AFFTDN_FILTER 0 -+#define CONFIG_AFFTFILT_FILTER 0 -+#define CONFIG_AFIR_FILTER 0 -+#define CONFIG_AFORMAT_FILTER 0 -+#define CONFIG_AFREQSHIFT_FILTER 0 -+#define CONFIG_AFWTDN_FILTER 0 -+#define CONFIG_AGATE_FILTER 0 -+#define CONFIG_AIIR_FILTER 0 -+#define CONFIG_AINTEGRAL_FILTER 0 -+#define CONFIG_AINTERLEAVE_FILTER 0 -+#define CONFIG_ALATENCY_FILTER 0 -+#define CONFIG_ALIMITER_FILTER 0 -+#define CONFIG_ALLPASS_FILTER 0 -+#define CONFIG_ALOOP_FILTER 0 -+#define CONFIG_AMERGE_FILTER 0 -+#define CONFIG_AMETADATA_FILTER 0 -+#define CONFIG_AMIX_FILTER 0 -+#define CONFIG_AMULTIPLY_FILTER 0 -+#define CONFIG_ANEQUALIZER_FILTER 0 -+#define CONFIG_ANLMDN_FILTER 0 -+#define CONFIG_ANLMF_FILTER 0 -+#define CONFIG_ANLMS_FILTER 0 -+#define CONFIG_ANULL_FILTER 0 -+#define CONFIG_APAD_FILTER 0 -+#define CONFIG_APERMS_FILTER 0 -+#define CONFIG_APHASER_FILTER 0 -+#define CONFIG_APHASESHIFT_FILTER 0 -+#define CONFIG_APSYCLIP_FILTER 0 -+#define CONFIG_APULSATOR_FILTER 0 -+#define CONFIG_AREALTIME_FILTER 0 -+#define CONFIG_ARESAMPLE_FILTER 0 -+#define CONFIG_AREVERSE_FILTER 0 -+#define CONFIG_ARNNDN_FILTER 0 -+#define CONFIG_ASDR_FILTER 0 -+#define CONFIG_ASEGMENT_FILTER 0 -+#define CONFIG_ASELECT_FILTER 0 -+#define CONFIG_ASENDCMD_FILTER 0 -+#define CONFIG_ASETNSAMPLES_FILTER 0 -+#define CONFIG_ASETPTS_FILTER 0 -+#define CONFIG_ASETRATE_FILTER 0 -+#define CONFIG_ASETTB_FILTER 0 -+#define CONFIG_ASHOWINFO_FILTER 0 -+#define CONFIG_ASIDEDATA_FILTER 0 -+#define CONFIG_ASOFTCLIP_FILTER 0 -+#define CONFIG_ASPECTRALSTATS_FILTER 0 -+#define CONFIG_ASPLIT_FILTER 0 -+#define CONFIG_ASR_FILTER 0 -+#define CONFIG_ASTATS_FILTER 0 -+#define CONFIG_ASTREAMSELECT_FILTER 0 -+#define CONFIG_ASUBBOOST_FILTER 0 -+#define CONFIG_ASUBCUT_FILTER 0 -+#define CONFIG_ASUPERCUT_FILTER 0 -+#define CONFIG_ASUPERPASS_FILTER 0 -+#define CONFIG_ASUPERSTOP_FILTER 0 -+#define CONFIG_ATEMPO_FILTER 0 -+#define CONFIG_ATILT_FILTER 0 -+#define CONFIG_ATRIM_FILTER 0 -+#define CONFIG_AXCORRELATE_FILTER 0 -+#define CONFIG_AZMQ_FILTER 0 -+#define CONFIG_BANDPASS_FILTER 0 -+#define CONFIG_BANDREJECT_FILTER 0 -+#define CONFIG_BASS_FILTER 0 -+#define CONFIG_BIQUAD_FILTER 0 -+#define CONFIG_BS2B_FILTER 0 -+#define CONFIG_CHANNELMAP_FILTER 0 -+#define CONFIG_CHANNELSPLIT_FILTER 0 -+#define CONFIG_CHORUS_FILTER 0 -+#define CONFIG_COMPAND_FILTER 0 -+#define CONFIG_COMPENSATIONDELAY_FILTER 0 -+#define CONFIG_CROSSFEED_FILTER 0 -+#define CONFIG_CRYSTALIZER_FILTER 0 -+#define CONFIG_DCSHIFT_FILTER 0 -+#define CONFIG_DEESSER_FILTER 0 -+#define CONFIG_DRMETER_FILTER 0 -+#define CONFIG_DYNAUDNORM_FILTER 0 -+#define CONFIG_EARWAX_FILTER 0 -+#define CONFIG_EBUR128_FILTER 0 -+#define CONFIG_EQUALIZER_FILTER 0 -+#define CONFIG_EXTRASTEREO_FILTER 0 -+#define CONFIG_FIREQUALIZER_FILTER 0 -+#define CONFIG_FLANGER_FILTER 0 -+#define CONFIG_HAAS_FILTER 0 -+#define CONFIG_HDCD_FILTER 0 -+#define CONFIG_HEADPHONE_FILTER 0 -+#define CONFIG_HIGHPASS_FILTER 0 -+#define CONFIG_HIGHSHELF_FILTER 0 -+#define CONFIG_JOIN_FILTER 0 -+#define CONFIG_LADSPA_FILTER 0 -+#define CONFIG_LOUDNORM_FILTER 0 -+#define CONFIG_LOWPASS_FILTER 0 -+#define CONFIG_LOWSHELF_FILTER 0 -+#define CONFIG_LV2_FILTER 0 -+#define CONFIG_MCOMPAND_FILTER 0 -+#define CONFIG_PAN_FILTER 0 -+#define CONFIG_REPLAYGAIN_FILTER 0 -+#define CONFIG_RUBBERBAND_FILTER 0 -+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 -+#define CONFIG_SIDECHAINGATE_FILTER 0 -+#define CONFIG_SILENCEDETECT_FILTER 0 -+#define CONFIG_SILENCEREMOVE_FILTER 0 -+#define CONFIG_SOFALIZER_FILTER 0 -+#define CONFIG_SPEECHNORM_FILTER 0 -+#define CONFIG_STEREOTOOLS_FILTER 0 -+#define CONFIG_STEREOWIDEN_FILTER 0 -+#define CONFIG_SUPEREQUALIZER_FILTER 0 -+#define CONFIG_SURROUND_FILTER 0 -+#define CONFIG_TREBLE_FILTER 0 -+#define CONFIG_TREMOLO_FILTER 0 -+#define CONFIG_VIBRATO_FILTER 0 -+#define CONFIG_VOLUME_FILTER 0 -+#define CONFIG_VOLUMEDETECT_FILTER 0 -+#define CONFIG_AEVALSRC_FILTER 0 -+#define CONFIG_AFIRSRC_FILTER 0 -+#define CONFIG_ANOISESRC_FILTER 0 -+#define CONFIG_ANULLSRC_FILTER 0 -+#define CONFIG_FLITE_FILTER 0 -+#define CONFIG_HILBERT_FILTER 0 -+#define CONFIG_SINC_FILTER 0 -+#define CONFIG_SINE_FILTER 0 -+#define CONFIG_ANULLSINK_FILTER 0 -+#define CONFIG_ADDROI_FILTER 0 -+#define CONFIG_ALPHAEXTRACT_FILTER 0 -+#define CONFIG_ALPHAMERGE_FILTER 0 -+#define CONFIG_AMPLIFY_FILTER 0 -+#define CONFIG_ASS_FILTER 0 -+#define CONFIG_ATADENOISE_FILTER 0 -+#define CONFIG_AVGBLUR_FILTER 0 -+#define CONFIG_AVGBLUR_OPENCL_FILTER 0 -+#define CONFIG_AVGBLUR_VULKAN_FILTER 0 -+#define CONFIG_BBOX_FILTER 0 -+#define CONFIG_BENCH_FILTER 0 -+#define CONFIG_BILATERAL_FILTER 0 -+#define CONFIG_BITPLANENOISE_FILTER 0 -+#define CONFIG_BLACKDETECT_FILTER 0 -+#define CONFIG_BLACKFRAME_FILTER 0 -+#define CONFIG_BLEND_FILTER 0 -+#define CONFIG_BLEND_VULKAN_FILTER 0 -+#define CONFIG_BM3D_FILTER 0 -+#define CONFIG_BOXBLUR_FILTER 0 -+#define CONFIG_BOXBLUR_OPENCL_FILTER 0 -+#define CONFIG_BWDIF_FILTER 0 -+#define CONFIG_CAS_FILTER 0 -+#define CONFIG_CHROMABER_VULKAN_FILTER 0 -+#define CONFIG_CHROMAHOLD_FILTER 0 -+#define CONFIG_CHROMAKEY_FILTER 0 -+#define CONFIG_CHROMANR_FILTER 0 -+#define CONFIG_CHROMASHIFT_FILTER 0 -+#define CONFIG_CIESCOPE_FILTER 0 -+#define CONFIG_CODECVIEW_FILTER 0 -+#define CONFIG_COLORBALANCE_FILTER 0 -+#define CONFIG_COLORCHANNELMIXER_FILTER 0 -+#define CONFIG_COLORCONTRAST_FILTER 0 -+#define CONFIG_COLORCORRECT_FILTER 0 -+#define CONFIG_COLORIZE_FILTER 0 -+#define CONFIG_COLORKEY_FILTER 0 -+#define CONFIG_COLORKEY_OPENCL_FILTER 0 -+#define CONFIG_COLORHOLD_FILTER 0 -+#define CONFIG_COLORLEVELS_FILTER 0 -+#define CONFIG_COLORMATRIX_FILTER 0 -+#define CONFIG_COLORSPACE_FILTER 0 -+#define CONFIG_COLORTEMPERATURE_FILTER 0 -+#define CONFIG_CONVOLUTION_FILTER 0 -+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 -+#define CONFIG_CONVOLVE_FILTER 0 -+#define CONFIG_COPY_FILTER 0 -+#define CONFIG_COREIMAGE_FILTER 0 -+#define CONFIG_COVER_RECT_FILTER 0 -+#define CONFIG_CROP_FILTER 0 -+#define CONFIG_CROPDETECT_FILTER 0 -+#define CONFIG_CUE_FILTER 0 -+#define CONFIG_CURVES_FILTER 0 -+#define CONFIG_DATASCOPE_FILTER 0 -+#define CONFIG_DBLUR_FILTER 0 -+#define CONFIG_DCTDNOIZ_FILTER 0 -+#define CONFIG_DEBAND_FILTER 0 -+#define CONFIG_DEBLOCK_FILTER 0 -+#define CONFIG_DECIMATE_FILTER 0 -+#define CONFIG_DECONVOLVE_FILTER 0 -+#define CONFIG_DEDOT_FILTER 0 -+#define CONFIG_DEFLATE_FILTER 0 -+#define CONFIG_DEFLICKER_FILTER 0 -+#define CONFIG_DEINTERLACE_QSV_FILTER 0 -+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0 -+#define CONFIG_DEJUDDER_FILTER 0 -+#define CONFIG_DELOGO_FILTER 0 -+#define CONFIG_DENOISE_VAAPI_FILTER 0 -+#define CONFIG_DERAIN_FILTER 0 -+#define CONFIG_DESHAKE_FILTER 0 -+#define CONFIG_DESHAKE_OPENCL_FILTER 0 -+#define CONFIG_DESPILL_FILTER 0 -+#define CONFIG_DETELECINE_FILTER 0 -+#define CONFIG_DILATION_FILTER 0 -+#define CONFIG_DILATION_OPENCL_FILTER 0 -+#define CONFIG_DISPLACE_FILTER 0 -+#define CONFIG_DNN_CLASSIFY_FILTER 0 -+#define CONFIG_DNN_DETECT_FILTER 0 -+#define CONFIG_DNN_PROCESSING_FILTER 0 -+#define CONFIG_DOUBLEWEAVE_FILTER 0 -+#define CONFIG_DRAWBOX_FILTER 0 -+#define CONFIG_DRAWGRAPH_FILTER 0 -+#define CONFIG_DRAWGRID_FILTER 0 -+#define CONFIG_DRAWTEXT_FILTER 0 -+#define CONFIG_EDGEDETECT_FILTER 0 -+#define CONFIG_ELBG_FILTER 0 -+#define CONFIG_ENTROPY_FILTER 0 -+#define CONFIG_EPX_FILTER 0 -+#define CONFIG_EQ_FILTER 0 -+#define CONFIG_EROSION_FILTER 0 -+#define CONFIG_EROSION_OPENCL_FILTER 0 -+#define CONFIG_ESTDIF_FILTER 0 -+#define CONFIG_EXPOSURE_FILTER 0 -+#define CONFIG_EXTRACTPLANES_FILTER 0 -+#define CONFIG_FADE_FILTER 0 -+#define CONFIG_FFTDNOIZ_FILTER 0 -+#define CONFIG_FFTFILT_FILTER 0 -+#define CONFIG_FIELD_FILTER 0 -+#define CONFIG_FIELDHINT_FILTER 0 -+#define CONFIG_FIELDMATCH_FILTER 0 -+#define CONFIG_FIELDORDER_FILTER 0 -+#define CONFIG_FILLBORDERS_FILTER 0 -+#define CONFIG_FIND_RECT_FILTER 0 -+#define CONFIG_FLIP_VULKAN_FILTER 0 -+#define CONFIG_FLOODFILL_FILTER 0 -+#define CONFIG_FORMAT_FILTER 0 -+#define CONFIG_FPS_FILTER 0 -+#define CONFIG_FRAMEPACK_FILTER 0 -+#define CONFIG_FRAMERATE_FILTER 0 -+#define CONFIG_FRAMESTEP_FILTER 0 -+#define CONFIG_FREEZEDETECT_FILTER 0 -+#define CONFIG_FREEZEFRAMES_FILTER 0 -+#define CONFIG_FREI0R_FILTER 0 -+#define CONFIG_FSPP_FILTER 0 -+#define CONFIG_GBLUR_FILTER 0 -+#define CONFIG_GBLUR_VULKAN_FILTER 0 -+#define CONFIG_GEQ_FILTER 0 -+#define CONFIG_GRADFUN_FILTER 0 -+#define CONFIG_GRAPHMONITOR_FILTER 0 -+#define CONFIG_GRAYWORLD_FILTER 0 -+#define CONFIG_GREYEDGE_FILTER 0 -+#define CONFIG_GUIDED_FILTER 0 -+#define CONFIG_HALDCLUT_FILTER 0 -+#define CONFIG_HFLIP_FILTER 0 -+#define CONFIG_HFLIP_VULKAN_FILTER 0 -+#define CONFIG_HISTEQ_FILTER 0 -+#define CONFIG_HISTOGRAM_FILTER 0 -+#define CONFIG_HQDN3D_FILTER 0 -+#define CONFIG_HQX_FILTER 0 -+#define CONFIG_HSTACK_FILTER 0 -+#define CONFIG_HSVHOLD_FILTER 0 -+#define CONFIG_HSVKEY_FILTER 0 -+#define CONFIG_HUE_FILTER 0 -+#define CONFIG_HUESATURATION_FILTER 0 -+#define CONFIG_HWDOWNLOAD_FILTER 0 -+#define CONFIG_HWMAP_FILTER 0 -+#define CONFIG_HWUPLOAD_FILTER 0 -+#define CONFIG_HWUPLOAD_CUDA_FILTER 0 -+#define CONFIG_HYSTERESIS_FILTER 0 -+#define CONFIG_IDENTITY_FILTER 0 -+#define CONFIG_IDET_FILTER 0 -+#define CONFIG_IL_FILTER 0 -+#define CONFIG_INFLATE_FILTER 0 -+#define CONFIG_INTERLACE_FILTER 0 -+#define CONFIG_INTERLEAVE_FILTER 0 -+#define CONFIG_KERNDEINT_FILTER 0 -+#define CONFIG_KIRSCH_FILTER 0 -+#define CONFIG_LAGFUN_FILTER 0 -+#define CONFIG_LATENCY_FILTER 0 -+#define CONFIG_LENSCORRECTION_FILTER 0 -+#define CONFIG_LENSFUN_FILTER 0 -+#define CONFIG_LIBPLACEBO_FILTER 0 -+#define CONFIG_LIBVMAF_FILTER 0 -+#define CONFIG_LIMITDIFF_FILTER 0 -+#define CONFIG_LIMITER_FILTER 0 -+#define CONFIG_LOOP_FILTER 0 -+#define CONFIG_LUMAKEY_FILTER 0 -+#define CONFIG_LUT_FILTER 0 -+#define CONFIG_LUT1D_FILTER 0 -+#define CONFIG_LUT2_FILTER 0 -+#define CONFIG_LUT3D_FILTER 0 -+#define CONFIG_LUTRGB_FILTER 0 -+#define CONFIG_LUTYUV_FILTER 0 -+#define CONFIG_MASKEDCLAMP_FILTER 0 -+#define CONFIG_MASKEDMAX_FILTER 0 -+#define CONFIG_MASKEDMERGE_FILTER 0 -+#define CONFIG_MASKEDMIN_FILTER 0 -+#define CONFIG_MASKEDTHRESHOLD_FILTER 0 -+#define CONFIG_MASKFUN_FILTER 0 -+#define CONFIG_MCDEINT_FILTER 0 -+#define CONFIG_MEDIAN_FILTER 0 -+#define CONFIG_MERGEPLANES_FILTER 0 -+#define CONFIG_MESTIMATE_FILTER 0 -+#define CONFIG_METADATA_FILTER 0 -+#define CONFIG_MIDEQUALIZER_FILTER 0 -+#define CONFIG_MINTERPOLATE_FILTER 0 -+#define CONFIG_MIX_FILTER 0 -+#define CONFIG_MONOCHROME_FILTER 0 -+#define CONFIG_MORPHO_FILTER 0 -+#define CONFIG_MPDECIMATE_FILTER 0 -+#define CONFIG_MSAD_FILTER 0 -+#define CONFIG_NEGATE_FILTER 0 -+#define CONFIG_NLMEANS_FILTER 0 -+#define CONFIG_NLMEANS_OPENCL_FILTER 0 -+#define CONFIG_NNEDI_FILTER 0 -+#define CONFIG_NOFORMAT_FILTER 0 -+#define CONFIG_NOISE_FILTER 0 -+#define CONFIG_NORMALIZE_FILTER 0 -+#define CONFIG_NULL_FILTER 0 -+#define CONFIG_OCR_FILTER 0 -+#define CONFIG_OCV_FILTER 0 -+#define CONFIG_OSCILLOSCOPE_FILTER 0 -+#define CONFIG_OVERLAY_FILTER 0 -+#define CONFIG_OVERLAY_OPENCL_FILTER 0 -+#define CONFIG_OVERLAY_QSV_FILTER 0 -+#define CONFIG_OVERLAY_VAAPI_FILTER 0 -+#define CONFIG_OVERLAY_VULKAN_FILTER 0 -+#define CONFIG_OVERLAY_CUDA_FILTER 0 -+#define CONFIG_OWDENOISE_FILTER 0 -+#define CONFIG_PAD_FILTER 0 -+#define CONFIG_PAD_OPENCL_FILTER 0 -+#define CONFIG_PALETTEGEN_FILTER 0 -+#define CONFIG_PALETTEUSE_FILTER 0 -+#define CONFIG_PERMS_FILTER 0 -+#define CONFIG_PERSPECTIVE_FILTER 0 -+#define CONFIG_PHASE_FILTER 0 -+#define CONFIG_PHOTOSENSITIVITY_FILTER 0 -+#define CONFIG_PIXDESCTEST_FILTER 0 -+#define CONFIG_PIXSCOPE_FILTER 0 -+#define CONFIG_PP_FILTER 0 -+#define CONFIG_PP7_FILTER 0 -+#define CONFIG_PREMULTIPLY_FILTER 0 -+#define CONFIG_PREWITT_FILTER 0 -+#define CONFIG_PREWITT_OPENCL_FILTER 0 -+#define CONFIG_PROCAMP_VAAPI_FILTER 0 -+#define CONFIG_PROGRAM_OPENCL_FILTER 0 -+#define CONFIG_PSEUDOCOLOR_FILTER 0 -+#define CONFIG_PSNR_FILTER 0 -+#define CONFIG_PULLUP_FILTER 0 -+#define CONFIG_QP_FILTER 0 -+#define CONFIG_RANDOM_FILTER 0 -+#define CONFIG_READEIA608_FILTER 0 -+#define CONFIG_READVITC_FILTER 0 -+#define CONFIG_REALTIME_FILTER 0 -+#define CONFIG_REMAP_FILTER 0 -+#define CONFIG_REMOVEGRAIN_FILTER 0 -+#define CONFIG_REMOVELOGO_FILTER 0 -+#define CONFIG_REPEATFIELDS_FILTER 0 -+#define CONFIG_REVERSE_FILTER 0 -+#define CONFIG_RGBASHIFT_FILTER 0 -+#define CONFIG_ROBERTS_FILTER 0 -+#define CONFIG_ROBERTS_OPENCL_FILTER 0 -+#define CONFIG_ROTATE_FILTER 0 -+#define CONFIG_SAB_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 -+#define CONFIG_SCALE_CUDA_FILTER 0 -+#define CONFIG_SCALE_NPP_FILTER 0 -+#define CONFIG_SCALE_QSV_FILTER 0 -+#define CONFIG_SCALE_VAAPI_FILTER 0 -+#define CONFIG_SCALE_VULKAN_FILTER 0 -+#define CONFIG_SCALE2REF_FILTER 0 -+#define CONFIG_SCALE2REF_NPP_FILTER 0 -+#define CONFIG_SCDET_FILTER 0 -+#define CONFIG_SCHARR_FILTER 0 -+#define CONFIG_SCROLL_FILTER 0 -+#define CONFIG_SEGMENT_FILTER 0 -+#define CONFIG_SELECT_FILTER 0 -+#define CONFIG_SELECTIVECOLOR_FILTER 0 -+#define CONFIG_SENDCMD_FILTER 0 -+#define CONFIG_SEPARATEFIELDS_FILTER 0 -+#define CONFIG_SETDAR_FILTER 0 -+#define CONFIG_SETFIELD_FILTER 0 -+#define CONFIG_SETPARAMS_FILTER 0 -+#define CONFIG_SETPTS_FILTER 0 -+#define CONFIG_SETRANGE_FILTER 0 -+#define CONFIG_SETSAR_FILTER 0 -+#define CONFIG_SETTB_FILTER 0 -+#define CONFIG_SHARPEN_NPP_FILTER 0 -+#define CONFIG_SHARPNESS_VAAPI_FILTER 0 -+#define CONFIG_SHEAR_FILTER 0 -+#define CONFIG_SHOWINFO_FILTER 0 -+#define CONFIG_SHOWPALETTE_FILTER 0 -+#define CONFIG_SHUFFLEFRAMES_FILTER 0 -+#define CONFIG_SHUFFLEPIXELS_FILTER 0 -+#define CONFIG_SHUFFLEPLANES_FILTER 0 -+#define CONFIG_SIDEDATA_FILTER 0 -+#define CONFIG_SIGNALSTATS_FILTER 0 -+#define CONFIG_SIGNATURE_FILTER 0 -+#define CONFIG_SMARTBLUR_FILTER 0 -+#define CONFIG_SOBEL_FILTER 0 -+#define CONFIG_SOBEL_OPENCL_FILTER 0 -+#define CONFIG_SPLIT_FILTER 0 -+#define CONFIG_SPP_FILTER 0 -+#define CONFIG_SR_FILTER 0 -+#define CONFIG_SSIM_FILTER 0 -+#define CONFIG_STEREO3D_FILTER 0 -+#define CONFIG_STREAMSELECT_FILTER 0 -+#define CONFIG_SUBTITLES_FILTER 0 -+#define CONFIG_SUPER2XSAI_FILTER 0 -+#define CONFIG_SWAPRECT_FILTER 0 -+#define CONFIG_SWAPUV_FILTER 0 -+#define CONFIG_TBLEND_FILTER 0 -+#define CONFIG_TELECINE_FILTER 0 -+#define CONFIG_THISTOGRAM_FILTER 0 -+#define CONFIG_THRESHOLD_FILTER 0 -+#define CONFIG_THUMBNAIL_FILTER 0 -+#define CONFIG_THUMBNAIL_CUDA_FILTER 0 -+#define CONFIG_TILE_FILTER 0 -+#define CONFIG_TINTERLACE_FILTER 0 -+#define CONFIG_TLUT2_FILTER 0 -+#define CONFIG_TMEDIAN_FILTER 0 -+#define CONFIG_TMIDEQUALIZER_FILTER 0 -+#define CONFIG_TMIX_FILTER 0 -+#define CONFIG_TONEMAP_FILTER 0 -+#define CONFIG_TONEMAP_OPENCL_FILTER 0 -+#define CONFIG_TONEMAP_VAAPI_FILTER 0 -+#define CONFIG_TPAD_FILTER 0 -+#define CONFIG_TRANSPOSE_FILTER 0 -+#define CONFIG_TRANSPOSE_NPP_FILTER 0 -+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 -+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 -+#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 -+#define CONFIG_TRIM_FILTER 0 -+#define CONFIG_UNPREMULTIPLY_FILTER 0 -+#define CONFIG_UNSHARP_FILTER 0 -+#define CONFIG_UNSHARP_OPENCL_FILTER 0 -+#define CONFIG_UNTILE_FILTER 0 -+#define CONFIG_USPP_FILTER 0 -+#define CONFIG_V360_FILTER 0 -+#define CONFIG_VAGUEDENOISER_FILTER 0 -+#define CONFIG_VARBLUR_FILTER 0 -+#define CONFIG_VECTORSCOPE_FILTER 0 -+#define CONFIG_VFLIP_FILTER 0 -+#define CONFIG_VFLIP_VULKAN_FILTER 0 -+#define CONFIG_VFRDET_FILTER 0 -+#define CONFIG_VIBRANCE_FILTER 0 -+#define CONFIG_VIDSTABDETECT_FILTER 0 -+#define CONFIG_VIDSTABTRANSFORM_FILTER 0 -+#define CONFIG_VIF_FILTER 0 -+#define CONFIG_VIGNETTE_FILTER 0 -+#define CONFIG_VMAFMOTION_FILTER 0 -+#define CONFIG_VPP_QSV_FILTER 0 -+#define CONFIG_VSTACK_FILTER 0 -+#define CONFIG_W3FDIF_FILTER 0 -+#define CONFIG_WAVEFORM_FILTER 0 -+#define CONFIG_WEAVE_FILTER 0 -+#define CONFIG_XBR_FILTER 0 -+#define CONFIG_XCORRELATE_FILTER 0 -+#define CONFIG_XFADE_FILTER 0 -+#define CONFIG_XFADE_OPENCL_FILTER 0 -+#define CONFIG_XMEDIAN_FILTER 0 -+#define CONFIG_XSTACK_FILTER 0 -+#define CONFIG_YADIF_FILTER 0 -+#define CONFIG_YADIF_CUDA_FILTER 0 -+#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 -+#define CONFIG_YAEPBLUR_FILTER 0 -+#define CONFIG_ZMQ_FILTER 0 -+#define CONFIG_ZOOMPAN_FILTER 0 -+#define CONFIG_ZSCALE_FILTER 0 -+#define CONFIG_ALLRGB_FILTER 0 -+#define CONFIG_ALLYUV_FILTER 0 -+#define CONFIG_CELLAUTO_FILTER 0 -+#define CONFIG_COLOR_FILTER 0 -+#define CONFIG_COLORSPECTRUM_FILTER 0 -+#define CONFIG_COREIMAGESRC_FILTER 0 -+#define CONFIG_FREI0R_SRC_FILTER 0 -+#define CONFIG_GRADIENTS_FILTER 0 -+#define CONFIG_HALDCLUTSRC_FILTER 0 -+#define CONFIG_LIFE_FILTER 0 -+#define CONFIG_MANDELBROT_FILTER 0 -+#define CONFIG_MPTESTSRC_FILTER 0 -+#define CONFIG_NULLSRC_FILTER 0 -+#define CONFIG_OPENCLSRC_FILTER 0 -+#define CONFIG_PAL75BARS_FILTER 0 -+#define CONFIG_PAL100BARS_FILTER 0 -+#define CONFIG_RGBTESTSRC_FILTER 0 -+#define CONFIG_SIERPINSKI_FILTER 0 -+#define CONFIG_SMPTEBARS_FILTER 0 -+#define CONFIG_SMPTEHDBARS_FILTER 0 -+#define CONFIG_TESTSRC_FILTER 0 -+#define CONFIG_TESTSRC2_FILTER 0 -+#define CONFIG_YUVTESTSRC_FILTER 0 -+#define CONFIG_NULLSINK_FILTER 0 -+#define CONFIG_ABITSCOPE_FILTER 0 -+#define CONFIG_ADRAWGRAPH_FILTER 0 -+#define CONFIG_AGRAPHMONITOR_FILTER 0 -+#define CONFIG_AHISTOGRAM_FILTER 0 -+#define CONFIG_APHASEMETER_FILTER 0 -+#define CONFIG_AVECTORSCOPE_FILTER 0 -+#define CONFIG_CONCAT_FILTER 0 -+#define CONFIG_SHOWCQT_FILTER 0 -+#define CONFIG_SHOWFREQS_FILTER 0 -+#define CONFIG_SHOWSPATIAL_FILTER 0 -+#define CONFIG_SHOWSPECTRUM_FILTER 0 -+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0 -+#define CONFIG_SHOWVOLUME_FILTER 0 -+#define CONFIG_SHOWWAVES_FILTER 0 -+#define CONFIG_SHOWWAVESPIC_FILTER 0 -+#define CONFIG_SPECTRUMSYNTH_FILTER 0 -+#define CONFIG_AMOVIE_FILTER 0 -+#define CONFIG_MOVIE_FILTER 0 -+#define CONFIG_AFIFO_FILTER 0 -+#define CONFIG_FIFO_FILTER 0 -+#define CONFIG_AA_DEMUXER 0 -+#define CONFIG_AAC_DEMUXER 1 -+#define CONFIG_AAX_DEMUXER 0 -+#define CONFIG_AC3_DEMUXER 0 -+#define CONFIG_ACE_DEMUXER 0 -+#define CONFIG_ACM_DEMUXER 0 -+#define CONFIG_ACT_DEMUXER 0 -+#define CONFIG_ADF_DEMUXER 0 -+#define CONFIG_ADP_DEMUXER 0 -+#define CONFIG_ADS_DEMUXER 0 -+#define CONFIG_ADX_DEMUXER 0 -+#define CONFIG_AEA_DEMUXER 0 -+#define CONFIG_AFC_DEMUXER 0 -+#define CONFIG_AIFF_DEMUXER 0 -+#define CONFIG_AIX_DEMUXER 0 -+#define CONFIG_ALP_DEMUXER 0 -+#define CONFIG_AMR_DEMUXER 0 -+#define CONFIG_AMRNB_DEMUXER 0 -+#define CONFIG_AMRWB_DEMUXER 0 -+#define CONFIG_ANM_DEMUXER 0 -+#define CONFIG_APC_DEMUXER 0 -+#define CONFIG_APE_DEMUXER 0 -+#define CONFIG_APM_DEMUXER 0 -+#define CONFIG_APNG_DEMUXER 0 -+#define CONFIG_APTX_DEMUXER 0 -+#define CONFIG_APTX_HD_DEMUXER 0 -+#define CONFIG_AQTITLE_DEMUXER 0 -+#define CONFIG_ARGO_ASF_DEMUXER 0 -+#define CONFIG_ARGO_BRP_DEMUXER 0 -+#define CONFIG_ARGO_CVG_DEMUXER 0 -+#define CONFIG_ASF_DEMUXER 0 -+#define CONFIG_ASF_O_DEMUXER 0 -+#define CONFIG_ASS_DEMUXER 0 -+#define CONFIG_AST_DEMUXER 0 -+#define CONFIG_AU_DEMUXER 0 -+#define CONFIG_AV1_DEMUXER 0 -+#define CONFIG_AVI_DEMUXER 0 -+#define CONFIG_AVISYNTH_DEMUXER 0 -+#define CONFIG_AVR_DEMUXER 0 -+#define CONFIG_AVS_DEMUXER 0 -+#define CONFIG_AVS2_DEMUXER 0 -+#define CONFIG_AVS3_DEMUXER 0 -+#define CONFIG_BETHSOFTVID_DEMUXER 0 -+#define CONFIG_BFI_DEMUXER 0 -+#define CONFIG_BINTEXT_DEMUXER 0 -+#define CONFIG_BINK_DEMUXER 0 -+#define CONFIG_BINKA_DEMUXER 0 -+#define CONFIG_BIT_DEMUXER 0 -+#define CONFIG_BITPACKED_DEMUXER 0 -+#define CONFIG_BMV_DEMUXER 0 -+#define CONFIG_BFSTM_DEMUXER 0 -+#define CONFIG_BRSTM_DEMUXER 0 -+#define CONFIG_BOA_DEMUXER 0 -+#define CONFIG_C93_DEMUXER 0 -+#define CONFIG_CAF_DEMUXER 0 -+#define CONFIG_CAVSVIDEO_DEMUXER 0 -+#define CONFIG_CDG_DEMUXER 0 -+#define CONFIG_CDXL_DEMUXER 0 -+#define CONFIG_CINE_DEMUXER 0 -+#define CONFIG_CODEC2_DEMUXER 0 -+#define CONFIG_CODEC2RAW_DEMUXER 0 -+#define CONFIG_CONCAT_DEMUXER 0 -+#define CONFIG_DASH_DEMUXER 0 -+#define CONFIG_DATA_DEMUXER 0 -+#define CONFIG_DAUD_DEMUXER 0 -+#define CONFIG_DCSTR_DEMUXER 0 -+#define CONFIG_DERF_DEMUXER 0 -+#define CONFIG_DFA_DEMUXER 0 -+#define CONFIG_DHAV_DEMUXER 0 -+#define CONFIG_DIRAC_DEMUXER 0 -+#define CONFIG_DNXHD_DEMUXER 0 -+#define CONFIG_DSF_DEMUXER 0 -+#define CONFIG_DSICIN_DEMUXER 0 -+#define CONFIG_DSS_DEMUXER 0 -+#define CONFIG_DTS_DEMUXER 0 -+#define CONFIG_DTSHD_DEMUXER 0 -+#define CONFIG_DV_DEMUXER 0 -+#define CONFIG_DVBSUB_DEMUXER 0 -+#define CONFIG_DVBTXT_DEMUXER 0 -+#define CONFIG_DXA_DEMUXER 0 -+#define CONFIG_EA_DEMUXER 0 -+#define CONFIG_EA_CDATA_DEMUXER 0 -+#define CONFIG_EAC3_DEMUXER 0 -+#define CONFIG_EPAF_DEMUXER 0 -+#define CONFIG_FFMETADATA_DEMUXER 0 -+#define CONFIG_FILMSTRIP_DEMUXER 0 -+#define CONFIG_FITS_DEMUXER 0 -+#define CONFIG_FLAC_DEMUXER 1 -+#define CONFIG_FLIC_DEMUXER 0 -+#define CONFIG_FLV_DEMUXER 0 -+#define CONFIG_LIVE_FLV_DEMUXER 0 -+#define CONFIG_FOURXM_DEMUXER 0 -+#define CONFIG_FRM_DEMUXER 0 -+#define CONFIG_FSB_DEMUXER 0 -+#define CONFIG_FWSE_DEMUXER 0 -+#define CONFIG_G722_DEMUXER 0 -+#define CONFIG_G723_1_DEMUXER 0 -+#define CONFIG_G726_DEMUXER 0 -+#define CONFIG_G726LE_DEMUXER 0 -+#define CONFIG_G729_DEMUXER 0 -+#define CONFIG_GDV_DEMUXER 0 -+#define CONFIG_GENH_DEMUXER 0 -+#define CONFIG_GIF_DEMUXER 0 -+#define CONFIG_GSM_DEMUXER 0 -+#define CONFIG_GXF_DEMUXER 0 -+#define CONFIG_H261_DEMUXER 0 -+#define CONFIG_H263_DEMUXER 0 -+#define CONFIG_H264_DEMUXER 0 -+#define CONFIG_HCA_DEMUXER 0 -+#define CONFIG_HCOM_DEMUXER 0 -+#define CONFIG_HEVC_DEMUXER 0 -+#define CONFIG_HLS_DEMUXER 0 -+#define CONFIG_HNM_DEMUXER 0 -+#define CONFIG_ICO_DEMUXER 0 -+#define CONFIG_IDCIN_DEMUXER 0 -+#define CONFIG_IDF_DEMUXER 0 -+#define CONFIG_IFF_DEMUXER 0 -+#define CONFIG_IFV_DEMUXER 0 -+#define CONFIG_ILBC_DEMUXER 0 -+#define CONFIG_IMAGE2_DEMUXER 0 -+#define CONFIG_IMAGE2PIPE_DEMUXER 0 -+#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 -+#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 -+#define CONFIG_IMF_DEMUXER 0 -+#define CONFIG_INGENIENT_DEMUXER 0 -+#define CONFIG_IPMOVIE_DEMUXER 0 -+#define CONFIG_IPU_DEMUXER 0 -+#define CONFIG_IRCAM_DEMUXER 0 -+#define CONFIG_ISS_DEMUXER 0 -+#define CONFIG_IV8_DEMUXER 0 -+#define CONFIG_IVF_DEMUXER 0 -+#define CONFIG_IVR_DEMUXER 0 -+#define CONFIG_JACOSUB_DEMUXER 0 -+#define CONFIG_JV_DEMUXER 0 -+#define CONFIG_KUX_DEMUXER 0 -+#define CONFIG_KVAG_DEMUXER 0 -+#define CONFIG_LMLM4_DEMUXER 0 -+#define CONFIG_LOAS_DEMUXER 0 -+#define CONFIG_LUODAT_DEMUXER 0 -+#define CONFIG_LRC_DEMUXER 0 -+#define CONFIG_LVF_DEMUXER 0 -+#define CONFIG_LXF_DEMUXER 0 -+#define CONFIG_M4V_DEMUXER 0 -+#define CONFIG_MCA_DEMUXER 0 -+#define CONFIG_MCC_DEMUXER 0 -+#define CONFIG_MATROSKA_DEMUXER 1 -+#define CONFIG_MGSTS_DEMUXER 0 -+#define CONFIG_MICRODVD_DEMUXER 0 -+#define CONFIG_MJPEG_DEMUXER 0 -+#define CONFIG_MJPEG_2000_DEMUXER 0 -+#define CONFIG_MLP_DEMUXER 0 -+#define CONFIG_MLV_DEMUXER 0 -+#define CONFIG_MM_DEMUXER 0 -+#define CONFIG_MMF_DEMUXER 0 -+#define CONFIG_MODS_DEMUXER 0 -+#define CONFIG_MOFLEX_DEMUXER 0 -+#define CONFIG_MOV_DEMUXER 1 -+#define CONFIG_MP3_DEMUXER 1 -+#define CONFIG_MPC_DEMUXER 0 -+#define CONFIG_MPC8_DEMUXER 0 -+#define CONFIG_MPEGPS_DEMUXER 0 -+#define CONFIG_MPEGTS_DEMUXER 0 -+#define CONFIG_MPEGTSRAW_DEMUXER 0 -+#define CONFIG_MPEGVIDEO_DEMUXER 0 -+#define CONFIG_MPJPEG_DEMUXER 0 -+#define CONFIG_MPL2_DEMUXER 0 -+#define CONFIG_MPSUB_DEMUXER 0 -+#define CONFIG_MSF_DEMUXER 0 -+#define CONFIG_MSNWC_TCP_DEMUXER 0 -+#define CONFIG_MSP_DEMUXER 0 -+#define CONFIG_MTAF_DEMUXER 0 -+#define CONFIG_MTV_DEMUXER 0 -+#define CONFIG_MUSX_DEMUXER 0 -+#define CONFIG_MV_DEMUXER 0 -+#define CONFIG_MVI_DEMUXER 0 -+#define CONFIG_MXF_DEMUXER 0 -+#define CONFIG_MXG_DEMUXER 0 -+#define CONFIG_NC_DEMUXER 0 -+#define CONFIG_NISTSPHERE_DEMUXER 0 -+#define CONFIG_NSP_DEMUXER 0 -+#define CONFIG_NSV_DEMUXER 0 -+#define CONFIG_NUT_DEMUXER 0 -+#define CONFIG_NUV_DEMUXER 0 -+#define CONFIG_OBU_DEMUXER 0 -+#define CONFIG_OGG_DEMUXER 1 -+#define CONFIG_OMA_DEMUXER 0 -+#define CONFIG_PAF_DEMUXER 0 -+#define CONFIG_PCM_ALAW_DEMUXER 0 -+#define CONFIG_PCM_MULAW_DEMUXER 0 -+#define CONFIG_PCM_VIDC_DEMUXER 0 -+#define CONFIG_PCM_F64BE_DEMUXER 0 -+#define CONFIG_PCM_F64LE_DEMUXER 0 -+#define CONFIG_PCM_F32BE_DEMUXER 0 -+#define CONFIG_PCM_F32LE_DEMUXER 0 -+#define CONFIG_PCM_S32BE_DEMUXER 0 -+#define CONFIG_PCM_S32LE_DEMUXER 0 -+#define CONFIG_PCM_S24BE_DEMUXER 0 -+#define CONFIG_PCM_S24LE_DEMUXER 0 -+#define CONFIG_PCM_S16BE_DEMUXER 0 -+#define CONFIG_PCM_S16LE_DEMUXER 0 -+#define CONFIG_PCM_S8_DEMUXER 0 -+#define CONFIG_PCM_U32BE_DEMUXER 0 -+#define CONFIG_PCM_U32LE_DEMUXER 0 -+#define CONFIG_PCM_U24BE_DEMUXER 0 -+#define CONFIG_PCM_U24LE_DEMUXER 0 -+#define CONFIG_PCM_U16BE_DEMUXER 0 -+#define CONFIG_PCM_U16LE_DEMUXER 0 -+#define CONFIG_PCM_U8_DEMUXER 0 -+#define CONFIG_PJS_DEMUXER 0 -+#define CONFIG_PMP_DEMUXER 0 -+#define CONFIG_PP_BNK_DEMUXER 0 -+#define CONFIG_PVA_DEMUXER 0 -+#define CONFIG_PVF_DEMUXER 0 -+#define CONFIG_QCP_DEMUXER 0 -+#define CONFIG_R3D_DEMUXER 0 -+#define CONFIG_RAWVIDEO_DEMUXER 0 -+#define CONFIG_REALTEXT_DEMUXER 0 -+#define CONFIG_REDSPARK_DEMUXER 0 -+#define CONFIG_RL2_DEMUXER 0 -+#define CONFIG_RM_DEMUXER 0 -+#define CONFIG_ROQ_DEMUXER 0 -+#define CONFIG_RPL_DEMUXER 0 -+#define CONFIG_RSD_DEMUXER 0 -+#define CONFIG_RSO_DEMUXER 0 -+#define CONFIG_RTP_DEMUXER 0 -+#define CONFIG_RTSP_DEMUXER 0 -+#define CONFIG_S337M_DEMUXER 0 -+#define CONFIG_SAMI_DEMUXER 0 -+#define CONFIG_SAP_DEMUXER 0 -+#define CONFIG_SBC_DEMUXER 0 -+#define CONFIG_SBG_DEMUXER 0 -+#define CONFIG_SCC_DEMUXER 0 -+#define CONFIG_SCD_DEMUXER 0 -+#define CONFIG_SDP_DEMUXER 0 -+#define CONFIG_SDR2_DEMUXER 0 -+#define CONFIG_SDS_DEMUXER 0 -+#define CONFIG_SDX_DEMUXER 0 -+#define CONFIG_SEGAFILM_DEMUXER 0 -+#define CONFIG_SER_DEMUXER 0 -+#define CONFIG_SGA_DEMUXER 0 -+#define CONFIG_SHORTEN_DEMUXER 0 -+#define CONFIG_SIFF_DEMUXER 0 -+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 -+#define CONFIG_SLN_DEMUXER 0 -+#define CONFIG_SMACKER_DEMUXER 0 -+#define CONFIG_SMJPEG_DEMUXER 0 -+#define CONFIG_SMUSH_DEMUXER 0 -+#define CONFIG_SOL_DEMUXER 0 -+#define CONFIG_SOX_DEMUXER 0 -+#define CONFIG_SPDIF_DEMUXER 0 -+#define CONFIG_SRT_DEMUXER 0 -+#define CONFIG_STR_DEMUXER 0 -+#define CONFIG_STL_DEMUXER 0 -+#define CONFIG_SUBVIEWER1_DEMUXER 0 -+#define CONFIG_SUBVIEWER_DEMUXER 0 -+#define CONFIG_SUP_DEMUXER 0 -+#define CONFIG_SVAG_DEMUXER 0 -+#define CONFIG_SVS_DEMUXER 0 -+#define CONFIG_SWF_DEMUXER 0 -+#define CONFIG_TAK_DEMUXER 0 -+#define CONFIG_TEDCAPTIONS_DEMUXER 0 -+#define CONFIG_THP_DEMUXER 0 -+#define CONFIG_THREEDOSTR_DEMUXER 0 -+#define CONFIG_TIERTEXSEQ_DEMUXER 0 -+#define CONFIG_TMV_DEMUXER 0 -+#define CONFIG_TRUEHD_DEMUXER 0 -+#define CONFIG_TTA_DEMUXER 0 -+#define CONFIG_TXD_DEMUXER 0 -+#define CONFIG_TTY_DEMUXER 0 -+#define CONFIG_TY_DEMUXER 0 -+#define CONFIG_V210_DEMUXER 0 -+#define CONFIG_V210X_DEMUXER 0 -+#define CONFIG_VAG_DEMUXER 0 -+#define CONFIG_VC1_DEMUXER 0 -+#define CONFIG_VC1T_DEMUXER 0 -+#define CONFIG_VIVIDAS_DEMUXER 0 -+#define CONFIG_VIVO_DEMUXER 0 -+#define CONFIG_VMD_DEMUXER 0 -+#define CONFIG_VOBSUB_DEMUXER 0 -+#define CONFIG_VOC_DEMUXER 0 -+#define CONFIG_VPK_DEMUXER 0 -+#define CONFIG_VPLAYER_DEMUXER 0 -+#define CONFIG_VQF_DEMUXER 0 -+#define CONFIG_W64_DEMUXER 0 -+#define CONFIG_WAV_DEMUXER 1 -+#define CONFIG_WC3_DEMUXER 0 -+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 -+#define CONFIG_WEBVTT_DEMUXER 0 -+#define CONFIG_WSAUD_DEMUXER 0 -+#define CONFIG_WSD_DEMUXER 0 -+#define CONFIG_WSVQA_DEMUXER 0 -+#define CONFIG_WTV_DEMUXER 0 -+#define CONFIG_WVE_DEMUXER 0 -+#define CONFIG_WV_DEMUXER 0 -+#define CONFIG_XA_DEMUXER 0 -+#define CONFIG_XBIN_DEMUXER 0 -+#define CONFIG_XMV_DEMUXER 0 -+#define CONFIG_XVAG_DEMUXER 0 -+#define CONFIG_XWMA_DEMUXER 0 -+#define CONFIG_YOP_DEMUXER 0 -+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 -+#define CONFIG_LIBGME_DEMUXER 0 -+#define CONFIG_LIBMODPLUG_DEMUXER 0 -+#define CONFIG_LIBOPENMPT_DEMUXER 0 -+#define CONFIG_VAPOURSYNTH_DEMUXER 0 -+#define CONFIG_A64_MUXER 0 -+#define CONFIG_AC3_MUXER 0 -+#define CONFIG_ADTS_MUXER 0 -+#define CONFIG_ADX_MUXER 0 -+#define CONFIG_AIFF_MUXER 0 -+#define CONFIG_ALP_MUXER 0 -+#define CONFIG_AMR_MUXER 0 -+#define CONFIG_AMV_MUXER 0 -+#define CONFIG_APM_MUXER 0 -+#define CONFIG_APNG_MUXER 0 -+#define CONFIG_APTX_MUXER 0 -+#define CONFIG_APTX_HD_MUXER 0 -+#define CONFIG_ARGO_ASF_MUXER 0 -+#define CONFIG_ARGO_CVG_MUXER 0 -+#define CONFIG_ASF_MUXER 0 -+#define CONFIG_ASS_MUXER 0 -+#define CONFIG_AST_MUXER 0 -+#define CONFIG_ASF_STREAM_MUXER 0 -+#define CONFIG_AU_MUXER 0 -+#define CONFIG_AVI_MUXER 0 -+#define CONFIG_AVM2_MUXER 0 -+#define CONFIG_AVS2_MUXER 0 -+#define CONFIG_AVS3_MUXER 0 -+#define CONFIG_BIT_MUXER 0 -+#define CONFIG_CAF_MUXER 0 -+#define CONFIG_CAVSVIDEO_MUXER 0 -+#define CONFIG_CODEC2_MUXER 0 -+#define CONFIG_CODEC2RAW_MUXER 0 -+#define CONFIG_CRC_MUXER 0 -+#define CONFIG_DASH_MUXER 0 -+#define CONFIG_DATA_MUXER 0 -+#define CONFIG_DAUD_MUXER 0 -+#define CONFIG_DIRAC_MUXER 0 -+#define CONFIG_DNXHD_MUXER 0 -+#define CONFIG_DTS_MUXER 0 -+#define CONFIG_DV_MUXER 0 -+#define CONFIG_EAC3_MUXER 0 -+#define CONFIG_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 -+#define CONFIG_FLV_MUXER 0 -+#define CONFIG_FRAMECRC_MUXER 0 -+#define CONFIG_FRAMEHASH_MUXER 0 -+#define CONFIG_FRAMEMD5_MUXER 0 -+#define CONFIG_G722_MUXER 0 -+#define CONFIG_G723_1_MUXER 0 -+#define CONFIG_G726_MUXER 0 -+#define CONFIG_G726LE_MUXER 0 -+#define CONFIG_GIF_MUXER 0 -+#define CONFIG_GSM_MUXER 0 -+#define CONFIG_GXF_MUXER 0 -+#define CONFIG_H261_MUXER 0 -+#define CONFIG_H263_MUXER 0 -+#define CONFIG_H264_MUXER 0 -+#define CONFIG_HASH_MUXER 0 -+#define CONFIG_HDS_MUXER 0 -+#define CONFIG_HEVC_MUXER 0 -+#define CONFIG_HLS_MUXER 0 -+#define CONFIG_ICO_MUXER 0 -+#define CONFIG_ILBC_MUXER 0 -+#define CONFIG_IMAGE2_MUXER 0 -+#define CONFIG_IMAGE2PIPE_MUXER 0 -+#define CONFIG_IPOD_MUXER 0 -+#define CONFIG_IRCAM_MUXER 0 -+#define CONFIG_ISMV_MUXER 0 -+#define CONFIG_IVF_MUXER 0 -+#define CONFIG_JACOSUB_MUXER 0 -+#define CONFIG_KVAG_MUXER 0 -+#define CONFIG_LATM_MUXER 0 -+#define CONFIG_LRC_MUXER 0 -+#define CONFIG_M4V_MUXER 0 -+#define CONFIG_MD5_MUXER 0 -+#define CONFIG_MATROSKA_MUXER 0 -+#define CONFIG_MATROSKA_AUDIO_MUXER 0 -+#define CONFIG_MICRODVD_MUXER 0 -+#define CONFIG_MJPEG_MUXER 0 -+#define CONFIG_MLP_MUXER 0 -+#define CONFIG_MMF_MUXER 0 -+#define CONFIG_MOV_MUXER 0 -+#define CONFIG_MP2_MUXER 0 -+#define CONFIG_MP3_MUXER 0 -+#define CONFIG_MP4_MUXER 0 -+#define CONFIG_MPEG1SYSTEM_MUXER 0 -+#define CONFIG_MPEG1VCD_MUXER 0 -+#define CONFIG_MPEG1VIDEO_MUXER 0 -+#define CONFIG_MPEG2DVD_MUXER 0 -+#define CONFIG_MPEG2SVCD_MUXER 0 -+#define CONFIG_MPEG2VIDEO_MUXER 0 -+#define CONFIG_MPEG2VOB_MUXER 0 -+#define CONFIG_MPEGTS_MUXER 0 -+#define CONFIG_MPJPEG_MUXER 0 -+#define CONFIG_MXF_MUXER 0 -+#define CONFIG_MXF_D10_MUXER 0 -+#define CONFIG_MXF_OPATOM_MUXER 0 -+#define CONFIG_NULL_MUXER 0 -+#define CONFIG_NUT_MUXER 0 -+#define CONFIG_OBU_MUXER 0 -+#define CONFIG_OGA_MUXER 0 -+#define CONFIG_OGG_MUXER 0 -+#define CONFIG_OGV_MUXER 0 -+#define CONFIG_OMA_MUXER 0 -+#define CONFIG_OPUS_MUXER 0 -+#define CONFIG_PCM_ALAW_MUXER 0 -+#define CONFIG_PCM_MULAW_MUXER 0 -+#define CONFIG_PCM_VIDC_MUXER 0 -+#define CONFIG_PCM_F64BE_MUXER 0 -+#define CONFIG_PCM_F64LE_MUXER 0 -+#define CONFIG_PCM_F32BE_MUXER 0 -+#define CONFIG_PCM_F32LE_MUXER 0 -+#define CONFIG_PCM_S32BE_MUXER 0 -+#define CONFIG_PCM_S32LE_MUXER 0 -+#define CONFIG_PCM_S24BE_MUXER 0 -+#define CONFIG_PCM_S24LE_MUXER 0 -+#define CONFIG_PCM_S16BE_MUXER 0 -+#define CONFIG_PCM_S16LE_MUXER 0 -+#define CONFIG_PCM_S8_MUXER 0 -+#define CONFIG_PCM_U32BE_MUXER 0 -+#define CONFIG_PCM_U32LE_MUXER 0 -+#define CONFIG_PCM_U24BE_MUXER 0 -+#define CONFIG_PCM_U24LE_MUXER 0 -+#define CONFIG_PCM_U16BE_MUXER 0 -+#define CONFIG_PCM_U16LE_MUXER 0 -+#define CONFIG_PCM_U8_MUXER 0 -+#define CONFIG_PSP_MUXER 0 -+#define CONFIG_RAWVIDEO_MUXER 0 -+#define CONFIG_RM_MUXER 0 -+#define CONFIG_ROQ_MUXER 0 -+#define CONFIG_RSO_MUXER 0 -+#define CONFIG_RTP_MUXER 0 -+#define CONFIG_RTP_MPEGTS_MUXER 0 -+#define CONFIG_RTSP_MUXER 0 -+#define CONFIG_SAP_MUXER 0 -+#define CONFIG_SBC_MUXER 0 -+#define CONFIG_SCC_MUXER 0 -+#define CONFIG_SEGAFILM_MUXER 0 -+#define CONFIG_SEGMENT_MUXER 0 -+#define CONFIG_STREAM_SEGMENT_MUXER 0 -+#define CONFIG_SMJPEG_MUXER 0 -+#define CONFIG_SMOOTHSTREAMING_MUXER 0 -+#define CONFIG_SOX_MUXER 0 -+#define CONFIG_SPX_MUXER 0 -+#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SRT_MUXER 0 -+#define CONFIG_STREAMHASH_MUXER 0 -+#define CONFIG_SUP_MUXER 0 -+#define CONFIG_SWF_MUXER 0 -+#define CONFIG_TEE_MUXER 0 -+#define CONFIG_TG2_MUXER 0 -+#define CONFIG_TGP_MUXER 0 -+#define CONFIG_MKVTIMESTAMP_V2_MUXER 0 -+#define CONFIG_TRUEHD_MUXER 0 -+#define CONFIG_TTA_MUXER 0 -+#define CONFIG_TTML_MUXER 0 -+#define CONFIG_UNCODEDFRAMECRC_MUXER 0 -+#define CONFIG_VC1_MUXER 0 -+#define CONFIG_VC1T_MUXER 0 -+#define CONFIG_VOC_MUXER 0 -+#define CONFIG_W64_MUXER 0 -+#define CONFIG_WAV_MUXER 0 -+#define CONFIG_WEBM_MUXER 0 -+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 -+#define CONFIG_WEBM_CHUNK_MUXER 0 -+#define CONFIG_WEBP_MUXER 0 -+#define CONFIG_WEBVTT_MUXER 0 -+#define CONFIG_WSAUD_MUXER 0 -+#define CONFIG_WTV_MUXER 0 -+#define CONFIG_WV_MUXER 0 -+#define CONFIG_YUV4MPEGPIPE_MUXER 0 -+#define CONFIG_CHROMAPRINT_MUXER 0 -+#define CONFIG_ASYNC_PROTOCOL 0 -+#define CONFIG_BLURAY_PROTOCOL 0 -+#define CONFIG_CACHE_PROTOCOL 0 -+#define CONFIG_CONCAT_PROTOCOL 0 -+#define CONFIG_CONCATF_PROTOCOL 0 -+#define CONFIG_CRYPTO_PROTOCOL 0 -+#define CONFIG_DATA_PROTOCOL 0 -+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 -+#define CONFIG_FFRTMPHTTP_PROTOCOL 0 -+#define CONFIG_FILE_PROTOCOL 0 -+#define CONFIG_FTP_PROTOCOL 0 -+#define CONFIG_GOPHER_PROTOCOL 0 -+#define CONFIG_GOPHERS_PROTOCOL 0 -+#define CONFIG_HLS_PROTOCOL 0 -+#define CONFIG_HTTP_PROTOCOL 0 -+#define CONFIG_HTTPPROXY_PROTOCOL 0 -+#define CONFIG_HTTPS_PROTOCOL 0 -+#define CONFIG_ICECAST_PROTOCOL 0 -+#define CONFIG_MMSH_PROTOCOL 0 -+#define CONFIG_MMST_PROTOCOL 0 -+#define CONFIG_MD5_PROTOCOL 0 -+#define CONFIG_PIPE_PROTOCOL 0 -+#define CONFIG_PROMPEG_PROTOCOL 0 -+#define CONFIG_RTMP_PROTOCOL 0 -+#define CONFIG_RTMPE_PROTOCOL 0 -+#define CONFIG_RTMPS_PROTOCOL 0 -+#define CONFIG_RTMPT_PROTOCOL 0 -+#define CONFIG_RTMPTE_PROTOCOL 0 -+#define CONFIG_RTMPTS_PROTOCOL 0 -+#define CONFIG_RTP_PROTOCOL 0 -+#define CONFIG_SCTP_PROTOCOL 0 -+#define CONFIG_SRTP_PROTOCOL 0 -+#define CONFIG_SUBFILE_PROTOCOL 0 -+#define CONFIG_TEE_PROTOCOL 0 -+#define CONFIG_TCP_PROTOCOL 0 -+#define CONFIG_TLS_PROTOCOL 0 -+#define CONFIG_UDP_PROTOCOL 0 -+#define CONFIG_UDPLITE_PROTOCOL 0 -+#define CONFIG_UNIX_PROTOCOL 0 -+#define CONFIG_LIBAMQP_PROTOCOL 0 -+#define CONFIG_LIBRIST_PROTOCOL 0 -+#define CONFIG_LIBRTMP_PROTOCOL 0 -+#define CONFIG_LIBRTMPE_PROTOCOL 0 -+#define CONFIG_LIBRTMPS_PROTOCOL 0 -+#define CONFIG_LIBRTMPT_PROTOCOL 0 -+#define CONFIG_LIBRTMPTE_PROTOCOL 0 -+#define CONFIG_LIBSRT_PROTOCOL 0 -+#define CONFIG_LIBSSH_PROTOCOL 0 -+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 -+#define CONFIG_LIBZMQ_PROTOCOL 0 +#endif /* FFMPEG_CONFIG_H */ diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h new file mode 100644 index 000000000000..7405cd8dc8d4 --- /dev/null +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h @@ -0,0 +1,2066 @@ +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h.orig 2022-10-05 07:34:01 UTC ++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h +@@ -0,0 +1,2063 @@ ++/* Automatically generated by configure - do not modify! */ ++#ifndef FFMPEG_CONFIG_COMPONENTS_H ++#define FFMPEG_CONFIG_COMPONENTS_H ++#define CONFIG_AAC_ADTSTOASC_BSF 0 ++#define CONFIG_AV1_FRAME_MERGE_BSF 0 ++#define CONFIG_AV1_FRAME_SPLIT_BSF 0 ++#define CONFIG_AV1_METADATA_BSF 0 ++#define CONFIG_CHOMP_BSF 0 ++#define CONFIG_DUMP_EXTRADATA_BSF 0 ++#define CONFIG_DCA_CORE_BSF 0 ++#define CONFIG_DV_ERROR_MARKER_BSF 0 ++#define CONFIG_EAC3_CORE_BSF 0 ++#define CONFIG_EXTRACT_EXTRADATA_BSF 0 ++#define CONFIG_FILTER_UNITS_BSF 0 ++#define CONFIG_H264_METADATA_BSF 0 ++#define CONFIG_H264_MP4TOANNEXB_BSF 0 ++#define CONFIG_H264_REDUNDANT_PPS_BSF 0 ++#define CONFIG_HAPQA_EXTRACT_BSF 0 ++#define CONFIG_HEVC_METADATA_BSF 0 ++#define CONFIG_HEVC_MP4TOANNEXB_BSF 0 ++#define CONFIG_IMX_DUMP_HEADER_BSF 0 ++#define CONFIG_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 ++#define CONFIG_NOISE_BSF 0 ++#define CONFIG_NULL_BSF 0 ++#define CONFIG_OPUS_METADATA_BSF 0 ++#define CONFIG_PCM_RECHUNK_BSF 0 ++#define CONFIG_PRORES_METADATA_BSF 0 ++#define CONFIG_REMOVE_EXTRADATA_BSF 0 ++#define CONFIG_SETTS_BSF 0 ++#define CONFIG_TEXT2MOVSUB_BSF 0 ++#define CONFIG_TRACE_HEADERS_BSF 0 ++#define CONFIG_TRUEHD_CORE_BSF 0 ++#define CONFIG_VP9_METADATA_BSF 0 ++#define CONFIG_VP9_RAW_REORDER_BSF 0 ++#define CONFIG_VP9_SUPERFRAME_BSF 0 ++#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 ++#define CONFIG_AASC_DECODER 0 ++#define CONFIG_AIC_DECODER 0 ++#define CONFIG_ALIAS_PIX_DECODER 0 ++#define CONFIG_AGM_DECODER 0 ++#define CONFIG_AMV_DECODER 0 ++#define CONFIG_ANM_DECODER 0 ++#define CONFIG_ANSI_DECODER 0 ++#define CONFIG_APNG_DECODER 0 ++#define CONFIG_ARBC_DECODER 0 ++#define CONFIG_ARGO_DECODER 0 ++#define CONFIG_ASV1_DECODER 0 ++#define CONFIG_ASV2_DECODER 0 ++#define CONFIG_AURA_DECODER 0 ++#define CONFIG_AURA2_DECODER 0 ++#define CONFIG_AVRP_DECODER 0 ++#define CONFIG_AVRN_DECODER 0 ++#define CONFIG_AVS_DECODER 0 ++#define CONFIG_AVUI_DECODER 0 ++#define CONFIG_AYUV_DECODER 0 ++#define CONFIG_BETHSOFTVID_DECODER 0 ++#define CONFIG_BFI_DECODER 0 ++#define CONFIG_BINK_DECODER 0 ++#define CONFIG_BITPACKED_DECODER 0 ++#define CONFIG_BMP_DECODER 0 ++#define CONFIG_BMV_VIDEO_DECODER 0 ++#define CONFIG_BRENDER_PIX_DECODER 0 ++#define CONFIG_C93_DECODER 0 ++#define CONFIG_CAVS_DECODER 0 ++#define CONFIG_CDGRAPHICS_DECODER 0 ++#define CONFIG_CDTOONS_DECODER 0 ++#define CONFIG_CDXL_DECODER 0 ++#define CONFIG_CFHD_DECODER 0 ++#define CONFIG_CINEPAK_DECODER 0 ++#define CONFIG_CLEARVIDEO_DECODER 0 ++#define CONFIG_CLJR_DECODER 0 ++#define CONFIG_CLLC_DECODER 0 ++#define CONFIG_COMFORTNOISE_DECODER 0 ++#define CONFIG_CPIA_DECODER 0 ++#define CONFIG_CRI_DECODER 0 ++#define CONFIG_CSCD_DECODER 0 ++#define CONFIG_CYUV_DECODER 0 ++#define CONFIG_DDS_DECODER 0 ++#define CONFIG_DFA_DECODER 0 ++#define CONFIG_DIRAC_DECODER 0 ++#define CONFIG_DNXHD_DECODER 0 ++#define CONFIG_DPX_DECODER 0 ++#define CONFIG_DSICINVIDEO_DECODER 0 ++#define CONFIG_DVAUDIO_DECODER 0 ++#define CONFIG_DVVIDEO_DECODER 0 ++#define CONFIG_DXA_DECODER 0 ++#define CONFIG_DXTORY_DECODER 0 ++#define CONFIG_DXV_DECODER 0 ++#define CONFIG_EACMV_DECODER 0 ++#define CONFIG_EAMAD_DECODER 0 ++#define CONFIG_EATGQ_DECODER 0 ++#define CONFIG_EATGV_DECODER 0 ++#define CONFIG_EATQI_DECODER 0 ++#define CONFIG_EIGHTBPS_DECODER 0 ++#define CONFIG_EIGHTSVX_EXP_DECODER 0 ++#define CONFIG_EIGHTSVX_FIB_DECODER 0 ++#define CONFIG_ESCAPE124_DECODER 0 ++#define CONFIG_ESCAPE130_DECODER 0 ++#define CONFIG_EXR_DECODER 0 ++#define CONFIG_FFV1_DECODER 0 ++#define CONFIG_FFVHUFF_DECODER 0 ++#define CONFIG_FIC_DECODER 0 ++#define CONFIG_FITS_DECODER 0 ++#define CONFIG_FLASHSV_DECODER 0 ++#define CONFIG_FLASHSV2_DECODER 0 ++#define CONFIG_FLIC_DECODER 0 ++#define CONFIG_FLV_DECODER 0 ++#define CONFIG_FMVC_DECODER 0 ++#define CONFIG_FOURXM_DECODER 0 ++#define CONFIG_FRAPS_DECODER 0 ++#define CONFIG_FRWU_DECODER 0 ++#define CONFIG_G2M_DECODER 0 ++#define CONFIG_GDV_DECODER 0 ++#define CONFIG_GEM_DECODER 0 ++#define CONFIG_GIF_DECODER 0 ++#define CONFIG_H261_DECODER 0 ++#define CONFIG_H263_DECODER 0 ++#define CONFIG_H263I_DECODER 0 ++#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 ++#define CONFIG_H264_QSV_DECODER 0 ++#define CONFIG_H264_RKMPP_DECODER 0 ++#define CONFIG_HAP_DECODER 0 ++#define CONFIG_HEVC_DECODER 0 ++#define CONFIG_HEVC_QSV_DECODER 0 ++#define CONFIG_HEVC_RKMPP_DECODER 0 ++#define CONFIG_HEVC_V4L2M2M_DECODER 0 ++#define CONFIG_HNM4_VIDEO_DECODER 0 ++#define CONFIG_HQ_HQA_DECODER 0 ++#define CONFIG_HQX_DECODER 0 ++#define CONFIG_HUFFYUV_DECODER 0 ++#define CONFIG_HYMT_DECODER 0 ++#define CONFIG_IDCIN_DECODER 0 ++#define CONFIG_IFF_ILBM_DECODER 0 ++#define CONFIG_IMM4_DECODER 0 ++#define CONFIG_IMM5_DECODER 0 ++#define CONFIG_INDEO2_DECODER 0 ++#define CONFIG_INDEO3_DECODER 0 ++#define CONFIG_INDEO4_DECODER 0 ++#define CONFIG_INDEO5_DECODER 0 ++#define CONFIG_INTERPLAY_VIDEO_DECODER 0 ++#define CONFIG_IPU_DECODER 0 ++#define CONFIG_JPEG2000_DECODER 0 ++#define CONFIG_JPEGLS_DECODER 0 ++#define CONFIG_JV_DECODER 0 ++#define CONFIG_KGV1_DECODER 0 ++#define CONFIG_KMVC_DECODER 0 ++#define CONFIG_LAGARITH_DECODER 0 ++#define CONFIG_LOCO_DECODER 0 ++#define CONFIG_LSCR_DECODER 0 ++#define CONFIG_M101_DECODER 0 ++#define CONFIG_MAGICYUV_DECODER 0 ++#define CONFIG_MDEC_DECODER 0 ++#define CONFIG_MIMIC_DECODER 0 ++#define CONFIG_MJPEG_DECODER 0 ++#define CONFIG_MJPEGB_DECODER 0 ++#define CONFIG_MMVIDEO_DECODER 0 ++#define CONFIG_MOBICLIP_DECODER 0 ++#define CONFIG_MOTIONPIXELS_DECODER 0 ++#define CONFIG_MPEG1VIDEO_DECODER 0 ++#define CONFIG_MPEG2VIDEO_DECODER 0 ++#define CONFIG_MPEG4_DECODER 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 ++#define CONFIG_MSA1_DECODER 0 ++#define CONFIG_MSCC_DECODER 0 ++#define CONFIG_MSMPEG4V1_DECODER 0 ++#define CONFIG_MSMPEG4V2_DECODER 0 ++#define CONFIG_MSMPEG4V3_DECODER 0 ++#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 ++#define CONFIG_MSP2_DECODER 0 ++#define CONFIG_MSRLE_DECODER 0 ++#define CONFIG_MSS1_DECODER 0 ++#define CONFIG_MSS2_DECODER 0 ++#define CONFIG_MSVIDEO1_DECODER 0 ++#define CONFIG_MSZH_DECODER 0 ++#define CONFIG_MTS2_DECODER 0 ++#define CONFIG_MV30_DECODER 0 ++#define CONFIG_MVC1_DECODER 0 ++#define CONFIG_MVC2_DECODER 0 ++#define CONFIG_MVDV_DECODER 0 ++#define CONFIG_MVHA_DECODER 0 ++#define CONFIG_MWSC_DECODER 0 ++#define CONFIG_MXPEG_DECODER 0 ++#define CONFIG_NOTCHLC_DECODER 0 ++#define CONFIG_NUV_DECODER 0 ++#define CONFIG_PAF_VIDEO_DECODER 0 ++#define CONFIG_PAM_DECODER 0 ++#define CONFIG_PBM_DECODER 0 ++#define CONFIG_PCX_DECODER 0 ++#define CONFIG_PFM_DECODER 0 ++#define CONFIG_PGM_DECODER 0 ++#define CONFIG_PGMYUV_DECODER 0 ++#define CONFIG_PGX_DECODER 0 ++#define CONFIG_PHOTOCD_DECODER 0 ++#define CONFIG_PICTOR_DECODER 0 ++#define CONFIG_PIXLET_DECODER 0 ++#define CONFIG_PNG_DECODER 0 ++#define CONFIG_PPM_DECODER 0 ++#define CONFIG_PRORES_DECODER 0 ++#define CONFIG_PROSUMER_DECODER 0 ++#define CONFIG_PSD_DECODER 0 ++#define CONFIG_PTX_DECODER 0 ++#define CONFIG_QDRAW_DECODER 0 ++#define CONFIG_QPEG_DECODER 0 ++#define CONFIG_QTRLE_DECODER 0 ++#define CONFIG_R10K_DECODER 0 ++#define CONFIG_R210_DECODER 0 ++#define CONFIG_RASC_DECODER 0 ++#define CONFIG_RAWVIDEO_DECODER 0 ++#define CONFIG_RL2_DECODER 0 ++#define CONFIG_ROQ_DECODER 0 ++#define CONFIG_RPZA_DECODER 0 ++#define CONFIG_RSCC_DECODER 0 ++#define CONFIG_RV10_DECODER 0 ++#define CONFIG_RV20_DECODER 0 ++#define CONFIG_RV30_DECODER 0 ++#define CONFIG_RV40_DECODER 0 ++#define CONFIG_S302M_DECODER 0 ++#define CONFIG_SANM_DECODER 0 ++#define CONFIG_SCPR_DECODER 0 ++#define CONFIG_SCREENPRESSO_DECODER 0 ++#define CONFIG_SGA_DECODER 0 ++#define CONFIG_SGI_DECODER 0 ++#define CONFIG_SGIRLE_DECODER 0 ++#define CONFIG_SHEERVIDEO_DECODER 0 ++#define CONFIG_SIMBIOSIS_IMX_DECODER 0 ++#define CONFIG_SMACKER_DECODER 0 ++#define CONFIG_SMC_DECODER 0 ++#define CONFIG_SMVJPEG_DECODER 0 ++#define CONFIG_SNOW_DECODER 0 ++#define CONFIG_SP5X_DECODER 0 ++#define CONFIG_SPEEDHQ_DECODER 0 ++#define CONFIG_SPEEX_DECODER 0 ++#define CONFIG_SRGC_DECODER 0 ++#define CONFIG_SUNRAST_DECODER 0 ++#define CONFIG_SVQ1_DECODER 0 ++#define CONFIG_SVQ3_DECODER 0 ++#define CONFIG_TARGA_DECODER 0 ++#define CONFIG_TARGA_Y216_DECODER 0 ++#define CONFIG_TDSC_DECODER 0 ++#define CONFIG_THEORA_DECODER 1 ++#define CONFIG_THP_DECODER 0 ++#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 ++#define CONFIG_TIFF_DECODER 0 ++#define CONFIG_TMV_DECODER 0 ++#define CONFIG_TRUEMOTION1_DECODER 0 ++#define CONFIG_TRUEMOTION2_DECODER 0 ++#define CONFIG_TRUEMOTION2RT_DECODER 0 ++#define CONFIG_TSCC_DECODER 0 ++#define CONFIG_TSCC2_DECODER 0 ++#define CONFIG_TXD_DECODER 0 ++#define CONFIG_ULTI_DECODER 0 ++#define CONFIG_UTVIDEO_DECODER 0 ++#define CONFIG_V210_DECODER 0 ++#define CONFIG_V210X_DECODER 0 ++#define CONFIG_V308_DECODER 0 ++#define CONFIG_V408_DECODER 0 ++#define CONFIG_V410_DECODER 0 ++#define CONFIG_VB_DECODER 0 ++#define CONFIG_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 ++#define CONFIG_VC1_V4L2M2M_DECODER 0 ++#define CONFIG_VCR1_DECODER 0 ++#define CONFIG_VMDVIDEO_DECODER 0 ++#define CONFIG_VMNC_DECODER 0 ++#define CONFIG_VP3_DECODER 1 ++#define CONFIG_VP4_DECODER 0 ++#define CONFIG_VP5_DECODER 0 ++#define CONFIG_VP6_DECODER 0 ++#define CONFIG_VP6A_DECODER 0 ++#define CONFIG_VP6F_DECODER 0 ++#define CONFIG_VP7_DECODER 0 ++#define CONFIG_VP8_DECODER 1 ++#define CONFIG_VP8_RKMPP_DECODER 0 ++#define CONFIG_VP8_V4L2M2M_DECODER 0 ++#define CONFIG_VP9_DECODER 0 ++#define CONFIG_VP9_RKMPP_DECODER 0 ++#define CONFIG_VP9_V4L2M2M_DECODER 0 ++#define CONFIG_VQA_DECODER 0 ++#define CONFIG_WEBP_DECODER 0 ++#define CONFIG_WCMV_DECODER 0 ++#define CONFIG_WRAPPED_AVFRAME_DECODER 0 ++#define CONFIG_WMV1_DECODER 0 ++#define CONFIG_WMV2_DECODER 0 ++#define CONFIG_WMV3_DECODER 0 ++#define CONFIG_WMV3_CRYSTALHD_DECODER 0 ++#define CONFIG_WMV3IMAGE_DECODER 0 ++#define CONFIG_WNV1_DECODER 0 ++#define CONFIG_XAN_WC3_DECODER 0 ++#define CONFIG_XAN_WC4_DECODER 0 ++#define CONFIG_XBM_DECODER 0 ++#define CONFIG_XFACE_DECODER 0 ++#define CONFIG_XL_DECODER 0 ++#define CONFIG_XPM_DECODER 0 ++#define CONFIG_XWD_DECODER 0 ++#define CONFIG_Y41P_DECODER 0 ++#define CONFIG_YLC_DECODER 0 ++#define CONFIG_YOP_DECODER 0 ++#define CONFIG_YUV4_DECODER 0 ++#define CONFIG_ZERO12V_DECODER 0 ++#define CONFIG_ZEROCODEC_DECODER 0 ++#define CONFIG_ZLIB_DECODER 0 ++#define CONFIG_ZMBV_DECODER 0 ++#define CONFIG_AAC_DECODER 1 ++#define CONFIG_AAC_FIXED_DECODER 0 ++#define CONFIG_AAC_LATM_DECODER 0 ++#define CONFIG_AC3_DECODER 0 ++#define CONFIG_AC3_FIXED_DECODER 0 ++#define CONFIG_ACELP_KELVIN_DECODER 0 ++#define CONFIG_ALAC_DECODER 0 ++#define CONFIG_ALS_DECODER 0 ++#define CONFIG_AMRNB_DECODER 0 ++#define CONFIG_AMRWB_DECODER 0 ++#define CONFIG_APE_DECODER 0 ++#define CONFIG_APTX_DECODER 0 ++#define CONFIG_APTX_HD_DECODER 0 ++#define CONFIG_ATRAC1_DECODER 0 ++#define CONFIG_ATRAC3_DECODER 0 ++#define CONFIG_ATRAC3AL_DECODER 0 ++#define CONFIG_ATRAC3P_DECODER 0 ++#define CONFIG_ATRAC3PAL_DECODER 0 ++#define CONFIG_ATRAC9_DECODER 0 ++#define CONFIG_BINKAUDIO_DCT_DECODER 0 ++#define CONFIG_BINKAUDIO_RDFT_DECODER 0 ++#define CONFIG_BMV_AUDIO_DECODER 0 ++#define CONFIG_COOK_DECODER 0 ++#define CONFIG_DCA_DECODER 0 ++#define CONFIG_DFPWM_DECODER 0 ++#define CONFIG_DOLBY_E_DECODER 0 ++#define CONFIG_DSD_LSBF_DECODER 0 ++#define CONFIG_DSD_MSBF_DECODER 0 ++#define CONFIG_DSD_LSBF_PLANAR_DECODER 0 ++#define CONFIG_DSD_MSBF_PLANAR_DECODER 0 ++#define CONFIG_DSICINAUDIO_DECODER 0 ++#define CONFIG_DSS_SP_DECODER 0 ++#define CONFIG_DST_DECODER 0 ++#define CONFIG_EAC3_DECODER 0 ++#define CONFIG_EVRC_DECODER 0 ++#define CONFIG_FASTAUDIO_DECODER 0 ++#define CONFIG_FFWAVESYNTH_DECODER 0 ++#define CONFIG_FLAC_DECODER 1 ++#define CONFIG_G723_1_DECODER 0 ++#define CONFIG_G729_DECODER 0 ++#define CONFIG_GSM_DECODER 0 ++#define CONFIG_GSM_MS_DECODER 0 ++#define CONFIG_HCA_DECODER 0 ++#define CONFIG_HCOM_DECODER 0 ++#define CONFIG_IAC_DECODER 0 ++#define CONFIG_ILBC_DECODER 0 ++#define CONFIG_IMC_DECODER 0 ++#define CONFIG_INTERPLAY_ACM_DECODER 0 ++#define CONFIG_MACE3_DECODER 0 ++#define CONFIG_MACE6_DECODER 0 ++#define CONFIG_METASOUND_DECODER 0 ++#define CONFIG_MLP_DECODER 0 ++#define CONFIG_MP1_DECODER 0 ++#define CONFIG_MP1FLOAT_DECODER 0 ++#define CONFIG_MP2_DECODER 0 ++#define CONFIG_MP2FLOAT_DECODER 0 ++#define CONFIG_MP3FLOAT_DECODER 0 ++#define CONFIG_MP3_DECODER 1 ++#define CONFIG_MP3ADUFLOAT_DECODER 0 ++#define CONFIG_MP3ADU_DECODER 0 ++#define CONFIG_MP3ON4FLOAT_DECODER 0 ++#define CONFIG_MP3ON4_DECODER 0 ++#define CONFIG_MPC7_DECODER 0 ++#define CONFIG_MPC8_DECODER 0 ++#define CONFIG_MSNSIREN_DECODER 0 ++#define CONFIG_NELLYMOSER_DECODER 0 ++#define CONFIG_ON2AVC_DECODER 0 ++#define CONFIG_OPUS_DECODER 0 ++#define CONFIG_PAF_AUDIO_DECODER 0 ++#define CONFIG_QCELP_DECODER 0 ++#define CONFIG_QDM2_DECODER 0 ++#define CONFIG_QDMC_DECODER 0 ++#define CONFIG_RA_144_DECODER 0 ++#define CONFIG_RA_288_DECODER 0 ++#define CONFIG_RALF_DECODER 0 ++#define CONFIG_SBC_DECODER 0 ++#define CONFIG_SHORTEN_DECODER 0 ++#define CONFIG_SIPR_DECODER 0 ++#define CONFIG_SIREN_DECODER 0 ++#define CONFIG_SMACKAUD_DECODER 0 ++#define CONFIG_SONIC_DECODER 0 ++#define CONFIG_TAK_DECODER 0 ++#define CONFIG_TRUEHD_DECODER 0 ++#define CONFIG_TRUESPEECH_DECODER 0 ++#define CONFIG_TTA_DECODER 0 ++#define CONFIG_TWINVQ_DECODER 0 ++#define CONFIG_VMDAUDIO_DECODER 0 ++#define CONFIG_VORBIS_DECODER 1 ++#define CONFIG_WAVPACK_DECODER 0 ++#define CONFIG_WMALOSSLESS_DECODER 0 ++#define CONFIG_WMAPRO_DECODER 0 ++#define CONFIG_WMAV1_DECODER 0 ++#define CONFIG_WMAV2_DECODER 0 ++#define CONFIG_WMAVOICE_DECODER 0 ++#define CONFIG_WS_SND1_DECODER 0 ++#define CONFIG_XMA1_DECODER 0 ++#define CONFIG_XMA2_DECODER 0 ++#define CONFIG_PCM_ALAW_DECODER 1 ++#define CONFIG_PCM_BLURAY_DECODER 0 ++#define CONFIG_PCM_DVD_DECODER 0 ++#define CONFIG_PCM_F16LE_DECODER 0 ++#define CONFIG_PCM_F24LE_DECODER 0 ++#define CONFIG_PCM_F32BE_DECODER 0 ++#define CONFIG_PCM_F32LE_DECODER 1 ++#define CONFIG_PCM_F64BE_DECODER 0 ++#define CONFIG_PCM_F64LE_DECODER 0 ++#define CONFIG_PCM_LXF_DECODER 0 ++#define CONFIG_PCM_MULAW_DECODER 1 ++#define CONFIG_PCM_S8_DECODER 0 ++#define CONFIG_PCM_S8_PLANAR_DECODER 0 ++#define CONFIG_PCM_S16BE_DECODER 1 ++#define CONFIG_PCM_S16BE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S16LE_DECODER 1 ++#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S24BE_DECODER 1 ++#define CONFIG_PCM_S24DAUD_DECODER 0 ++#define CONFIG_PCM_S24LE_DECODER 1 ++#define CONFIG_PCM_S24LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S32BE_DECODER 0 ++#define CONFIG_PCM_S32LE_DECODER 1 ++#define CONFIG_PCM_S32LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S64BE_DECODER 0 ++#define CONFIG_PCM_S64LE_DECODER 0 ++#define CONFIG_PCM_SGA_DECODER 0 ++#define CONFIG_PCM_U8_DECODER 1 ++#define CONFIG_PCM_U16BE_DECODER 0 ++#define CONFIG_PCM_U16LE_DECODER 0 ++#define CONFIG_PCM_U24BE_DECODER 0 ++#define CONFIG_PCM_U24LE_DECODER 0 ++#define CONFIG_PCM_U32BE_DECODER 0 ++#define CONFIG_PCM_U32LE_DECODER 0 ++#define CONFIG_PCM_VIDC_DECODER 0 ++#define CONFIG_DERF_DPCM_DECODER 0 ++#define CONFIG_GREMLIN_DPCM_DECODER 0 ++#define CONFIG_INTERPLAY_DPCM_DECODER 0 ++#define CONFIG_ROQ_DPCM_DECODER 0 ++#define CONFIG_SDX2_DPCM_DECODER 0 ++#define CONFIG_SOL_DPCM_DECODER 0 ++#define CONFIG_XAN_DPCM_DECODER 0 ++#define CONFIG_ADPCM_4XM_DECODER 0 ++#define CONFIG_ADPCM_ADX_DECODER 0 ++#define CONFIG_ADPCM_AFC_DECODER 0 ++#define CONFIG_ADPCM_AGM_DECODER 0 ++#define CONFIG_ADPCM_AICA_DECODER 0 ++#define CONFIG_ADPCM_ARGO_DECODER 0 ++#define CONFIG_ADPCM_CT_DECODER 0 ++#define CONFIG_ADPCM_DTK_DECODER 0 ++#define CONFIG_ADPCM_EA_DECODER 0 ++#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 ++#define CONFIG_ADPCM_EA_R1_DECODER 0 ++#define CONFIG_ADPCM_EA_R2_DECODER 0 ++#define CONFIG_ADPCM_EA_R3_DECODER 0 ++#define CONFIG_ADPCM_EA_XAS_DECODER 0 ++#define CONFIG_ADPCM_G722_DECODER 0 ++#define CONFIG_ADPCM_G726_DECODER 0 ++#define CONFIG_ADPCM_G726LE_DECODER 0 ++#define CONFIG_ADPCM_IMA_ACORN_DECODER 0 ++#define CONFIG_ADPCM_IMA_AMV_DECODER 0 ++#define CONFIG_ADPCM_IMA_ALP_DECODER 0 ++#define CONFIG_ADPCM_IMA_APC_DECODER 0 ++#define CONFIG_ADPCM_IMA_APM_DECODER 0 ++#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 ++#define CONFIG_ADPCM_IMA_DAT4_DECODER 0 ++#define CONFIG_ADPCM_IMA_DK3_DECODER 0 ++#define CONFIG_ADPCM_IMA_DK4_DECODER 0 ++#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 ++#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 ++#define CONFIG_ADPCM_IMA_ISS_DECODER 0 ++#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 ++#define CONFIG_ADPCM_IMA_MTF_DECODER 0 ++#define CONFIG_ADPCM_IMA_OKI_DECODER 0 ++#define CONFIG_ADPCM_IMA_QT_DECODER 0 ++#define CONFIG_ADPCM_IMA_RAD_DECODER 0 ++#define CONFIG_ADPCM_IMA_SSI_DECODER 0 ++#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 ++#define CONFIG_ADPCM_IMA_WAV_DECODER 0 ++#define CONFIG_ADPCM_IMA_WS_DECODER 0 ++#define CONFIG_ADPCM_MS_DECODER 0 ++#define CONFIG_ADPCM_MTAF_DECODER 0 ++#define CONFIG_ADPCM_PSX_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_2_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_3_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_4_DECODER 0 ++#define CONFIG_ADPCM_SWF_DECODER 0 ++#define CONFIG_ADPCM_THP_DECODER 0 ++#define CONFIG_ADPCM_THP_LE_DECODER 0 ++#define CONFIG_ADPCM_VIMA_DECODER 0 ++#define CONFIG_ADPCM_XA_DECODER 0 ++#define CONFIG_ADPCM_YAMAHA_DECODER 0 ++#define CONFIG_ADPCM_ZORK_DECODER 0 ++#define CONFIG_SSA_DECODER 0 ++#define CONFIG_ASS_DECODER 0 ++#define CONFIG_CCAPTION_DECODER 0 ++#define CONFIG_DVBSUB_DECODER 0 ++#define CONFIG_DVDSUB_DECODER 0 ++#define CONFIG_JACOSUB_DECODER 0 ++#define CONFIG_MICRODVD_DECODER 0 ++#define CONFIG_MOVTEXT_DECODER 0 ++#define CONFIG_MPL2_DECODER 0 ++#define CONFIG_PGSSUB_DECODER 0 ++#define CONFIG_PJS_DECODER 0 ++#define CONFIG_REALTEXT_DECODER 0 ++#define CONFIG_SAMI_DECODER 0 ++#define CONFIG_SRT_DECODER 0 ++#define CONFIG_STL_DECODER 0 ++#define CONFIG_SUBRIP_DECODER 0 ++#define CONFIG_SUBVIEWER_DECODER 0 ++#define CONFIG_SUBVIEWER1_DECODER 0 ++#define CONFIG_TEXT_DECODER 0 ++#define CONFIG_VPLAYER_DECODER 0 ++#define CONFIG_WEBVTT_DECODER 0 ++#define CONFIG_XSUB_DECODER 0 ++#define CONFIG_AAC_AT_DECODER 0 ++#define CONFIG_AC3_AT_DECODER 0 ++#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 ++#define CONFIG_ALAC_AT_DECODER 0 ++#define CONFIG_AMR_NB_AT_DECODER 0 ++#define CONFIG_EAC3_AT_DECODER 0 ++#define CONFIG_GSM_MS_AT_DECODER 0 ++#define CONFIG_ILBC_AT_DECODER 0 ++#define CONFIG_MP1_AT_DECODER 0 ++#define CONFIG_MP2_AT_DECODER 0 ++#define CONFIG_MP3_AT_DECODER 0 ++#define CONFIG_PCM_ALAW_AT_DECODER 0 ++#define CONFIG_PCM_MULAW_AT_DECODER 0 ++#define CONFIG_QDMC_AT_DECODER 0 ++#define CONFIG_QDM2_AT_DECODER 0 ++#define CONFIG_LIBARIBB24_DECODER 0 ++#define CONFIG_LIBCELT_DECODER 0 ++#define CONFIG_LIBCODEC2_DECODER 0 ++#define CONFIG_LIBDAV1D_DECODER 0 ++#define CONFIG_LIBDAVS2_DECODER 0 ++#define CONFIG_LIBFDK_AAC_DECODER 0 ++#define CONFIG_LIBGSM_DECODER 0 ++#define CONFIG_LIBGSM_MS_DECODER 0 ++#define CONFIG_LIBILBC_DECODER 0 ++#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 ++#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 ++#define CONFIG_LIBOPENJPEG_DECODER 0 ++#define CONFIG_LIBOPUS_DECODER 1 ++#define CONFIG_LIBRSVG_DECODER 0 ++#define CONFIG_LIBSPEEX_DECODER 0 ++#define CONFIG_LIBUAVS3D_DECODER 0 ++#define CONFIG_LIBVORBIS_DECODER 0 ++#define CONFIG_LIBVPX_VP8_DECODER 0 ++#define CONFIG_LIBVPX_VP9_DECODER 0 ++#define CONFIG_LIBZVBI_TELETEXT_DECODER 0 ++#define CONFIG_BINTEXT_DECODER 0 ++#define CONFIG_XBIN_DECODER 0 ++#define CONFIG_IDF_DECODER 0 ++#define CONFIG_LIBAOM_AV1_DECODER 0 ++#define CONFIG_AV1_DECODER 0 ++#define CONFIG_AV1_CUVID_DECODER 0 ++#define CONFIG_AV1_QSV_DECODER 0 ++#define CONFIG_LIBOPENH264_DECODER 0 ++#define CONFIG_H264_CUVID_DECODER 0 ++#define CONFIG_HEVC_CUVID_DECODER 0 ++#define CONFIG_HEVC_MEDIACODEC_DECODER 0 ++#define CONFIG_MJPEG_CUVID_DECODER 0 ++#define CONFIG_MJPEG_QSV_DECODER 0 ++#define CONFIG_MPEG1_CUVID_DECODER 0 ++#define CONFIG_MPEG2_CUVID_DECODER 0 ++#define CONFIG_MPEG4_CUVID_DECODER 0 ++#define CONFIG_MPEG4_MEDIACODEC_DECODER 0 ++#define CONFIG_VC1_CUVID_DECODER 0 ++#define CONFIG_VP8_CUVID_DECODER 0 ++#define CONFIG_VP8_MEDIACODEC_DECODER 0 ++#define CONFIG_VP8_QSV_DECODER 0 ++#define CONFIG_VP9_CUVID_DECODER 0 ++#define CONFIG_VP9_MEDIACODEC_DECODER 0 ++#define CONFIG_VP9_QSV_DECODER 0 ++#define CONFIG_A64MULTI_ENCODER 0 ++#define CONFIG_A64MULTI5_ENCODER 0 ++#define CONFIG_ALIAS_PIX_ENCODER 0 ++#define CONFIG_AMV_ENCODER 0 ++#define CONFIG_APNG_ENCODER 0 ++#define CONFIG_ASV1_ENCODER 0 ++#define CONFIG_ASV2_ENCODER 0 ++#define CONFIG_AVRP_ENCODER 0 ++#define CONFIG_AVUI_ENCODER 0 ++#define CONFIG_AYUV_ENCODER 0 ++#define CONFIG_BITPACKED_ENCODER 0 ++#define CONFIG_BMP_ENCODER 0 ++#define CONFIG_CFHD_ENCODER 0 ++#define CONFIG_CINEPAK_ENCODER 0 ++#define CONFIG_CLJR_ENCODER 0 ++#define CONFIG_COMFORTNOISE_ENCODER 0 ++#define CONFIG_DNXHD_ENCODER 0 ++#define CONFIG_DPX_ENCODER 0 ++#define CONFIG_DVVIDEO_ENCODER 0 ++#define CONFIG_EXR_ENCODER 0 ++#define CONFIG_FFV1_ENCODER 0 ++#define CONFIG_FFVHUFF_ENCODER 0 ++#define CONFIG_FITS_ENCODER 0 ++#define CONFIG_FLASHSV_ENCODER 0 ++#define CONFIG_FLASHSV2_ENCODER 0 ++#define CONFIG_FLV_ENCODER 0 ++#define CONFIG_GIF_ENCODER 0 ++#define CONFIG_H261_ENCODER 0 ++#define CONFIG_H263_ENCODER 0 ++#define CONFIG_H263P_ENCODER 0 ++#define CONFIG_HAP_ENCODER 0 ++#define CONFIG_HUFFYUV_ENCODER 0 ++#define CONFIG_JPEG2000_ENCODER 0 ++#define CONFIG_JPEGLS_ENCODER 0 ++#define CONFIG_LJPEG_ENCODER 0 ++#define CONFIG_MAGICYUV_ENCODER 0 ++#define CONFIG_MJPEG_ENCODER 0 ++#define CONFIG_MPEG1VIDEO_ENCODER 0 ++#define CONFIG_MPEG2VIDEO_ENCODER 0 ++#define CONFIG_MPEG4_ENCODER 0 ++#define CONFIG_MSMPEG4V2_ENCODER 0 ++#define CONFIG_MSMPEG4V3_ENCODER 0 ++#define CONFIG_MSVIDEO1_ENCODER 0 ++#define CONFIG_PAM_ENCODER 0 ++#define CONFIG_PBM_ENCODER 0 ++#define CONFIG_PCX_ENCODER 0 ++#define CONFIG_PFM_ENCODER 0 ++#define CONFIG_PGM_ENCODER 0 ++#define CONFIG_PGMYUV_ENCODER 0 ++#define CONFIG_PNG_ENCODER 0 ++#define CONFIG_PPM_ENCODER 0 ++#define CONFIG_PRORES_ENCODER 0 ++#define CONFIG_PRORES_AW_ENCODER 0 ++#define CONFIG_PRORES_KS_ENCODER 0 ++#define CONFIG_QTRLE_ENCODER 0 ++#define CONFIG_R10K_ENCODER 0 ++#define CONFIG_R210_ENCODER 0 ++#define CONFIG_RAWVIDEO_ENCODER 0 ++#define CONFIG_ROQ_ENCODER 0 ++#define CONFIG_RPZA_ENCODER 0 ++#define CONFIG_RV10_ENCODER 0 ++#define CONFIG_RV20_ENCODER 0 ++#define CONFIG_S302M_ENCODER 0 ++#define CONFIG_SGI_ENCODER 0 ++#define CONFIG_SMC_ENCODER 0 ++#define CONFIG_SNOW_ENCODER 0 ++#define CONFIG_SPEEDHQ_ENCODER 0 ++#define CONFIG_SUNRAST_ENCODER 0 ++#define CONFIG_SVQ1_ENCODER 0 ++#define CONFIG_TARGA_ENCODER 0 ++#define CONFIG_TIFF_ENCODER 0 ++#define CONFIG_UTVIDEO_ENCODER 0 ++#define CONFIG_V210_ENCODER 0 ++#define CONFIG_V308_ENCODER 0 ++#define CONFIG_V408_ENCODER 0 ++#define CONFIG_V410_ENCODER 0 ++#define CONFIG_VC2_ENCODER 0 ++#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 ++#define CONFIG_WMV1_ENCODER 0 ++#define CONFIG_WMV2_ENCODER 0 ++#define CONFIG_XBM_ENCODER 0 ++#define CONFIG_XFACE_ENCODER 0 ++#define CONFIG_XWD_ENCODER 0 ++#define CONFIG_Y41P_ENCODER 0 ++#define CONFIG_YUV4_ENCODER 0 ++#define CONFIG_ZLIB_ENCODER 0 ++#define CONFIG_ZMBV_ENCODER 0 ++#define CONFIG_AAC_ENCODER 0 ++#define CONFIG_AC3_ENCODER 0 ++#define CONFIG_AC3_FIXED_ENCODER 0 ++#define CONFIG_ALAC_ENCODER 0 ++#define CONFIG_APTX_ENCODER 0 ++#define CONFIG_APTX_HD_ENCODER 0 ++#define CONFIG_DCA_ENCODER 0 ++#define CONFIG_DFPWM_ENCODER 0 ++#define CONFIG_EAC3_ENCODER 0 ++#define CONFIG_FLAC_ENCODER 0 ++#define CONFIG_G723_1_ENCODER 0 ++#define CONFIG_MLP_ENCODER 0 ++#define CONFIG_MP2_ENCODER 0 ++#define CONFIG_MP2FIXED_ENCODER 0 ++#define CONFIG_NELLYMOSER_ENCODER 0 ++#define CONFIG_OPUS_ENCODER 0 ++#define CONFIG_RA_144_ENCODER 0 ++#define CONFIG_SBC_ENCODER 0 ++#define CONFIG_SONIC_ENCODER 0 ++#define CONFIG_SONIC_LS_ENCODER 0 ++#define CONFIG_TRUEHD_ENCODER 0 ++#define CONFIG_TTA_ENCODER 0 ++#define CONFIG_VORBIS_ENCODER 0 ++#define CONFIG_WAVPACK_ENCODER 0 ++#define CONFIG_WMAV1_ENCODER 0 ++#define CONFIG_WMAV2_ENCODER 0 ++#define CONFIG_PCM_ALAW_ENCODER 0 ++#define CONFIG_PCM_BLURAY_ENCODER 0 ++#define CONFIG_PCM_DVD_ENCODER 0 ++#define CONFIG_PCM_F32BE_ENCODER 0 ++#define CONFIG_PCM_F32LE_ENCODER 0 ++#define CONFIG_PCM_F64BE_ENCODER 0 ++#define CONFIG_PCM_F64LE_ENCODER 0 ++#define CONFIG_PCM_MULAW_ENCODER 0 ++#define CONFIG_PCM_S8_ENCODER 0 ++#define CONFIG_PCM_S8_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S16BE_ENCODER 0 ++#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S16LE_ENCODER 0 ++#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S24BE_ENCODER 0 ++#define CONFIG_PCM_S24DAUD_ENCODER 0 ++#define CONFIG_PCM_S24LE_ENCODER 0 ++#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S32BE_ENCODER 0 ++#define CONFIG_PCM_S32LE_ENCODER 0 ++#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S64BE_ENCODER 0 ++#define CONFIG_PCM_S64LE_ENCODER 0 ++#define CONFIG_PCM_U8_ENCODER 0 ++#define CONFIG_PCM_U16BE_ENCODER 0 ++#define CONFIG_PCM_U16LE_ENCODER 0 ++#define CONFIG_PCM_U24BE_ENCODER 0 ++#define CONFIG_PCM_U24LE_ENCODER 0 ++#define CONFIG_PCM_U32BE_ENCODER 0 ++#define CONFIG_PCM_U32LE_ENCODER 0 ++#define CONFIG_PCM_VIDC_ENCODER 0 ++#define CONFIG_ROQ_DPCM_ENCODER 0 ++#define CONFIG_ADPCM_ADX_ENCODER 0 ++#define CONFIG_ADPCM_ARGO_ENCODER 0 ++#define CONFIG_ADPCM_G722_ENCODER 0 ++#define CONFIG_ADPCM_G726_ENCODER 0 ++#define CONFIG_ADPCM_G726LE_ENCODER 0 ++#define CONFIG_ADPCM_IMA_AMV_ENCODER 0 ++#define CONFIG_ADPCM_IMA_ALP_ENCODER 0 ++#define CONFIG_ADPCM_IMA_APM_ENCODER 0 ++#define CONFIG_ADPCM_IMA_QT_ENCODER 0 ++#define CONFIG_ADPCM_IMA_SSI_ENCODER 0 ++#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 ++#define CONFIG_ADPCM_IMA_WS_ENCODER 0 ++#define CONFIG_ADPCM_MS_ENCODER 0 ++#define CONFIG_ADPCM_SWF_ENCODER 0 ++#define CONFIG_ADPCM_YAMAHA_ENCODER 0 ++#define CONFIG_SSA_ENCODER 0 ++#define CONFIG_ASS_ENCODER 0 ++#define CONFIG_DVBSUB_ENCODER 0 ++#define CONFIG_DVDSUB_ENCODER 0 ++#define CONFIG_MOVTEXT_ENCODER 0 ++#define CONFIG_SRT_ENCODER 0 ++#define CONFIG_SUBRIP_ENCODER 0 ++#define CONFIG_TEXT_ENCODER 0 ++#define CONFIG_TTML_ENCODER 0 ++#define CONFIG_WEBVTT_ENCODER 0 ++#define CONFIG_XSUB_ENCODER 0 ++#define CONFIG_AAC_AT_ENCODER 0 ++#define CONFIG_ALAC_AT_ENCODER 0 ++#define CONFIG_ILBC_AT_ENCODER 0 ++#define CONFIG_PCM_ALAW_AT_ENCODER 0 ++#define CONFIG_PCM_MULAW_AT_ENCODER 0 ++#define CONFIG_LIBAOM_AV1_ENCODER 0 ++#define CONFIG_LIBCODEC2_ENCODER 0 ++#define CONFIG_LIBFDK_AAC_ENCODER 0 ++#define CONFIG_LIBGSM_ENCODER 0 ++#define CONFIG_LIBGSM_MS_ENCODER 0 ++#define CONFIG_LIBILBC_ENCODER 0 ++#define CONFIG_LIBMP3LAME_ENCODER 0 ++#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 ++#define CONFIG_LIBOPENJPEG_ENCODER 0 ++#define CONFIG_LIBOPUS_ENCODER 0 ++#define CONFIG_LIBRAV1E_ENCODER 0 ++#define CONFIG_LIBSHINE_ENCODER 0 ++#define CONFIG_LIBSPEEX_ENCODER 0 ++#define CONFIG_LIBSVTAV1_ENCODER 0 ++#define CONFIG_LIBTHEORA_ENCODER 0 ++#define CONFIG_LIBTWOLAME_ENCODER 0 ++#define CONFIG_LIBVO_AMRWBENC_ENCODER 0 ++#define CONFIG_LIBVORBIS_ENCODER 0 ++#define CONFIG_LIBVPX_VP8_ENCODER 0 ++#define CONFIG_LIBVPX_VP9_ENCODER 0 ++#define CONFIG_LIBWEBP_ANIM_ENCODER 0 ++#define CONFIG_LIBWEBP_ENCODER 0 ++#define CONFIG_LIBX262_ENCODER 0 ++#define CONFIG_LIBX264_ENCODER 0 ++#define CONFIG_LIBX264RGB_ENCODER 0 ++#define CONFIG_LIBX265_ENCODER 0 ++#define CONFIG_LIBXAVS_ENCODER 0 ++#define CONFIG_LIBXAVS2_ENCODER 0 ++#define CONFIG_LIBXVID_ENCODER 0 ++#define CONFIG_AAC_MF_ENCODER 0 ++#define CONFIG_AC3_MF_ENCODER 0 ++#define CONFIG_H263_V4L2M2M_ENCODER 0 ++#define CONFIG_LIBOPENH264_ENCODER 0 ++#define CONFIG_H264_AMF_ENCODER 0 ++#define CONFIG_H264_MF_ENCODER 0 ++#define CONFIG_H264_NVENC_ENCODER 0 ++#define CONFIG_H264_OMX_ENCODER 0 ++#define CONFIG_H264_QSV_ENCODER 0 ++#define CONFIG_H264_V4L2M2M_ENCODER 0 ++#define CONFIG_H264_VAAPI_ENCODER 0 ++#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_HEVC_AMF_ENCODER 0 ++#define CONFIG_HEVC_MF_ENCODER 0 ++#define CONFIG_HEVC_NVENC_ENCODER 0 ++#define CONFIG_HEVC_QSV_ENCODER 0 ++#define CONFIG_HEVC_V4L2M2M_ENCODER 0 ++#define CONFIG_HEVC_VAAPI_ENCODER 0 ++#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_LIBKVAZAAR_ENCODER 0 ++#define CONFIG_MJPEG_QSV_ENCODER 0 ++#define CONFIG_MJPEG_VAAPI_ENCODER 0 ++#define CONFIG_MP3_MF_ENCODER 0 ++#define CONFIG_MPEG2_QSV_ENCODER 0 ++#define CONFIG_MPEG2_VAAPI_ENCODER 0 ++#define CONFIG_MPEG4_OMX_ENCODER 0 ++#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_VP8_V4L2M2M_ENCODER 0 ++#define CONFIG_VP8_VAAPI_ENCODER 0 ++#define CONFIG_VP9_VAAPI_ENCODER 0 ++#define CONFIG_VP9_QSV_ENCODER 0 ++#define CONFIG_AV1_D3D11VA_HWACCEL 0 ++#define CONFIG_AV1_D3D11VA2_HWACCEL 0 ++#define CONFIG_AV1_DXVA2_HWACCEL 0 ++#define CONFIG_AV1_NVDEC_HWACCEL 0 ++#define CONFIG_AV1_VAAPI_HWACCEL 0 ++#define CONFIG_H263_VAAPI_HWACCEL 0 ++#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_H264_D3D11VA_HWACCEL 0 ++#define CONFIG_H264_D3D11VA2_HWACCEL 0 ++#define CONFIG_H264_DXVA2_HWACCEL 0 ++#define CONFIG_H264_NVDEC_HWACCEL 0 ++#define CONFIG_H264_VAAPI_HWACCEL 0 ++#define CONFIG_H264_VDPAU_HWACCEL 0 ++#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_HEVC_D3D11VA_HWACCEL 0 ++#define CONFIG_HEVC_D3D11VA2_HWACCEL 0 ++#define CONFIG_HEVC_DXVA2_HWACCEL 0 ++#define CONFIG_HEVC_NVDEC_HWACCEL 0 ++#define CONFIG_HEVC_VAAPI_HWACCEL 0 ++#define CONFIG_HEVC_VDPAU_HWACCEL 0 ++#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MJPEG_NVDEC_HWACCEL 0 ++#define CONFIG_MJPEG_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG1_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG1_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 ++#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 ++#define CONFIG_MPEG2_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG2_DXVA2_HWACCEL 0 ++#define CONFIG_MPEG2_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG2_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MPEG4_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG4_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG4_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_VC1_D3D11VA_HWACCEL 0 ++#define CONFIG_VC1_D3D11VA2_HWACCEL 0 ++#define CONFIG_VC1_DXVA2_HWACCEL 0 ++#define CONFIG_VC1_NVDEC_HWACCEL 0 ++#define CONFIG_VC1_VAAPI_HWACCEL 0 ++#define CONFIG_VC1_VDPAU_HWACCEL 0 ++#define CONFIG_VP8_NVDEC_HWACCEL 0 ++#define CONFIG_VP8_VAAPI_HWACCEL 0 ++#define CONFIG_VP9_D3D11VA_HWACCEL 0 ++#define CONFIG_VP9_D3D11VA2_HWACCEL 0 ++#define CONFIG_VP9_DXVA2_HWACCEL 0 ++#define CONFIG_VP9_NVDEC_HWACCEL 0 ++#define CONFIG_VP9_VAAPI_HWACCEL 0 ++#define CONFIG_VP9_VDPAU_HWACCEL 0 ++#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_WMV3_D3D11VA_HWACCEL 0 ++#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 ++#define CONFIG_WMV3_DXVA2_HWACCEL 0 ++#define CONFIG_WMV3_NVDEC_HWACCEL 0 ++#define CONFIG_WMV3_VAAPI_HWACCEL 0 ++#define CONFIG_WMV3_VDPAU_HWACCEL 0 ++#define CONFIG_AAC_PARSER 1 ++#define CONFIG_AAC_LATM_PARSER 0 ++#define CONFIG_AC3_PARSER 0 ++#define CONFIG_ADX_PARSER 0 ++#define CONFIG_AMR_PARSER 0 ++#define CONFIG_AV1_PARSER 0 ++#define CONFIG_AVS2_PARSER 0 ++#define CONFIG_AVS3_PARSER 0 ++#define CONFIG_BMP_PARSER 0 ++#define CONFIG_CAVSVIDEO_PARSER 0 ++#define CONFIG_COOK_PARSER 0 ++#define CONFIG_CRI_PARSER 0 ++#define CONFIG_DCA_PARSER 0 ++#define CONFIG_DIRAC_PARSER 0 ++#define CONFIG_DNXHD_PARSER 0 ++#define CONFIG_DOLBY_E_PARSER 0 ++#define CONFIG_DPX_PARSER 0 ++#define CONFIG_DVAUDIO_PARSER 0 ++#define CONFIG_DVBSUB_PARSER 0 ++#define CONFIG_DVDSUB_PARSER 0 ++#define CONFIG_DVD_NAV_PARSER 0 ++#define CONFIG_FLAC_PARSER 1 ++#define CONFIG_G723_1_PARSER 0 ++#define CONFIG_G729_PARSER 0 ++#define CONFIG_GIF_PARSER 0 ++#define CONFIG_GSM_PARSER 0 ++#define CONFIG_H261_PARSER 0 ++#define CONFIG_H263_PARSER 0 ++#define CONFIG_H264_PARSER 1 ++#define CONFIG_HEVC_PARSER 0 ++#define CONFIG_IPU_PARSER 0 ++#define CONFIG_JPEG2000_PARSER 0 ++#define CONFIG_MJPEG_PARSER 0 ++#define CONFIG_MLP_PARSER 0 ++#define CONFIG_MPEG4VIDEO_PARSER 0 ++#define CONFIG_MPEGAUDIO_PARSER 1 ++#define CONFIG_MPEGVIDEO_PARSER 0 ++#define CONFIG_OPUS_PARSER 1 ++#define CONFIG_PNG_PARSER 0 ++#define CONFIG_PNM_PARSER 0 ++#define CONFIG_RV30_PARSER 0 ++#define CONFIG_RV40_PARSER 0 ++#define CONFIG_SBC_PARSER 0 ++#define CONFIG_SIPR_PARSER 0 ++#define CONFIG_TAK_PARSER 0 ++#define CONFIG_VC1_PARSER 0 ++#define CONFIG_VORBIS_PARSER 1 ++#define CONFIG_VP3_PARSER 1 ++#define CONFIG_VP8_PARSER 1 ++#define CONFIG_VP9_PARSER 1 ++#define CONFIG_WEBP_PARSER 0 ++#define CONFIG_XBM_PARSER 0 ++#define CONFIG_XMA_PARSER 0 ++#define CONFIG_ALSA_INDEV 0 ++#define CONFIG_ANDROID_CAMERA_INDEV 0 ++#define CONFIG_AVFOUNDATION_INDEV 0 ++#define CONFIG_BKTR_INDEV 0 ++#define CONFIG_DECKLINK_INDEV 0 ++#define CONFIG_DSHOW_INDEV 0 ++#define CONFIG_FBDEV_INDEV 0 ++#define CONFIG_GDIGRAB_INDEV 0 ++#define CONFIG_IEC61883_INDEV 0 ++#define CONFIG_JACK_INDEV 0 ++#define CONFIG_KMSGRAB_INDEV 0 ++#define CONFIG_LAVFI_INDEV 0 ++#define CONFIG_OPENAL_INDEV 0 ++#define CONFIG_OSS_INDEV 0 ++#define CONFIG_PULSE_INDEV 0 ++#define CONFIG_SNDIO_INDEV 0 ++#define CONFIG_V4L2_INDEV 0 ++#define CONFIG_VFWCAP_INDEV 0 ++#define CONFIG_XCBGRAB_INDEV 0 ++#define CONFIG_LIBCDIO_INDEV 0 ++#define CONFIG_LIBDC1394_INDEV 0 ++#define CONFIG_ALSA_OUTDEV 0 ++#define CONFIG_AUDIOTOOLBOX_OUTDEV 0 ++#define CONFIG_CACA_OUTDEV 0 ++#define CONFIG_DECKLINK_OUTDEV 0 ++#define CONFIG_FBDEV_OUTDEV 0 ++#define CONFIG_OPENGL_OUTDEV 0 ++#define CONFIG_OSS_OUTDEV 0 ++#define CONFIG_PULSE_OUTDEV 0 ++#define CONFIG_SDL2_OUTDEV 0 ++#define CONFIG_SNDIO_OUTDEV 0 ++#define CONFIG_V4L2_OUTDEV 0 ++#define CONFIG_XV_OUTDEV 0 ++#define CONFIG_ABENCH_FILTER 0 ++#define CONFIG_ACOMPRESSOR_FILTER 0 ++#define CONFIG_ACONTRAST_FILTER 0 ++#define CONFIG_ACOPY_FILTER 0 ++#define CONFIG_ACUE_FILTER 0 ++#define CONFIG_ACROSSFADE_FILTER 0 ++#define CONFIG_ACROSSOVER_FILTER 0 ++#define CONFIG_ACRUSHER_FILTER 0 ++#define CONFIG_ADECLICK_FILTER 0 ++#define CONFIG_ADECLIP_FILTER 0 ++#define CONFIG_ADECORRELATE_FILTER 0 ++#define CONFIG_ADELAY_FILTER 0 ++#define CONFIG_ADENORM_FILTER 0 ++#define CONFIG_ADERIVATIVE_FILTER 0 ++#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 ++#define CONFIG_ADYNAMICSMOOTH_FILTER 0 ++#define CONFIG_AECHO_FILTER 0 ++#define CONFIG_AEMPHASIS_FILTER 0 ++#define CONFIG_AEVAL_FILTER 0 ++#define CONFIG_AEXCITER_FILTER 0 ++#define CONFIG_AFADE_FILTER 0 ++#define CONFIG_AFFTDN_FILTER 0 ++#define CONFIG_AFFTFILT_FILTER 0 ++#define CONFIG_AFIR_FILTER 0 ++#define CONFIG_AFORMAT_FILTER 0 ++#define CONFIG_AFREQSHIFT_FILTER 0 ++#define CONFIG_AFWTDN_FILTER 0 ++#define CONFIG_AGATE_FILTER 0 ++#define CONFIG_AIIR_FILTER 0 ++#define CONFIG_AINTEGRAL_FILTER 0 ++#define CONFIG_AINTERLEAVE_FILTER 0 ++#define CONFIG_ALATENCY_FILTER 0 ++#define CONFIG_ALIMITER_FILTER 0 ++#define CONFIG_ALLPASS_FILTER 0 ++#define CONFIG_ALOOP_FILTER 0 ++#define CONFIG_AMERGE_FILTER 0 ++#define CONFIG_AMETADATA_FILTER 0 ++#define CONFIG_AMIX_FILTER 0 ++#define CONFIG_AMULTIPLY_FILTER 0 ++#define CONFIG_ANEQUALIZER_FILTER 0 ++#define CONFIG_ANLMDN_FILTER 0 ++#define CONFIG_ANLMF_FILTER 0 ++#define CONFIG_ANLMS_FILTER 0 ++#define CONFIG_ANULL_FILTER 0 ++#define CONFIG_APAD_FILTER 0 ++#define CONFIG_APERMS_FILTER 0 ++#define CONFIG_APHASER_FILTER 0 ++#define CONFIG_APHASESHIFT_FILTER 0 ++#define CONFIG_APSYCLIP_FILTER 0 ++#define CONFIG_APULSATOR_FILTER 0 ++#define CONFIG_AREALTIME_FILTER 0 ++#define CONFIG_ARESAMPLE_FILTER 0 ++#define CONFIG_AREVERSE_FILTER 0 ++#define CONFIG_ARNNDN_FILTER 0 ++#define CONFIG_ASDR_FILTER 0 ++#define CONFIG_ASEGMENT_FILTER 0 ++#define CONFIG_ASELECT_FILTER 0 ++#define CONFIG_ASENDCMD_FILTER 0 ++#define CONFIG_ASETNSAMPLES_FILTER 0 ++#define CONFIG_ASETPTS_FILTER 0 ++#define CONFIG_ASETRATE_FILTER 0 ++#define CONFIG_ASETTB_FILTER 0 ++#define CONFIG_ASHOWINFO_FILTER 0 ++#define CONFIG_ASIDEDATA_FILTER 0 ++#define CONFIG_ASOFTCLIP_FILTER 0 ++#define CONFIG_ASPECTRALSTATS_FILTER 0 ++#define CONFIG_ASPLIT_FILTER 0 ++#define CONFIG_ASR_FILTER 0 ++#define CONFIG_ASTATS_FILTER 0 ++#define CONFIG_ASTREAMSELECT_FILTER 0 ++#define CONFIG_ASUBBOOST_FILTER 0 ++#define CONFIG_ASUBCUT_FILTER 0 ++#define CONFIG_ASUPERCUT_FILTER 0 ++#define CONFIG_ASUPERPASS_FILTER 0 ++#define CONFIG_ASUPERSTOP_FILTER 0 ++#define CONFIG_ATEMPO_FILTER 0 ++#define CONFIG_ATILT_FILTER 0 ++#define CONFIG_ATRIM_FILTER 0 ++#define CONFIG_AXCORRELATE_FILTER 0 ++#define CONFIG_AZMQ_FILTER 0 ++#define CONFIG_BANDPASS_FILTER 0 ++#define CONFIG_BANDREJECT_FILTER 0 ++#define CONFIG_BASS_FILTER 0 ++#define CONFIG_BIQUAD_FILTER 0 ++#define CONFIG_BS2B_FILTER 0 ++#define CONFIG_CHANNELMAP_FILTER 0 ++#define CONFIG_CHANNELSPLIT_FILTER 0 ++#define CONFIG_CHORUS_FILTER 0 ++#define CONFIG_COMPAND_FILTER 0 ++#define CONFIG_COMPENSATIONDELAY_FILTER 0 ++#define CONFIG_CROSSFEED_FILTER 0 ++#define CONFIG_CRYSTALIZER_FILTER 0 ++#define CONFIG_DCSHIFT_FILTER 0 ++#define CONFIG_DEESSER_FILTER 0 ++#define CONFIG_DIALOGUENHANCE_FILTER 0 ++#define CONFIG_DRMETER_FILTER 0 ++#define CONFIG_DYNAUDNORM_FILTER 0 ++#define CONFIG_EARWAX_FILTER 0 ++#define CONFIG_EBUR128_FILTER 0 ++#define CONFIG_EQUALIZER_FILTER 0 ++#define CONFIG_EXTRASTEREO_FILTER 0 ++#define CONFIG_FIREQUALIZER_FILTER 0 ++#define CONFIG_FLANGER_FILTER 0 ++#define CONFIG_HAAS_FILTER 0 ++#define CONFIG_HDCD_FILTER 0 ++#define CONFIG_HEADPHONE_FILTER 0 ++#define CONFIG_HIGHPASS_FILTER 0 ++#define CONFIG_HIGHSHELF_FILTER 0 ++#define CONFIG_JOIN_FILTER 0 ++#define CONFIG_LADSPA_FILTER 0 ++#define CONFIG_LOUDNORM_FILTER 0 ++#define CONFIG_LOWPASS_FILTER 0 ++#define CONFIG_LOWSHELF_FILTER 0 ++#define CONFIG_LV2_FILTER 0 ++#define CONFIG_MCOMPAND_FILTER 0 ++#define CONFIG_PAN_FILTER 0 ++#define CONFIG_REPLAYGAIN_FILTER 0 ++#define CONFIG_RUBBERBAND_FILTER 0 ++#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 ++#define CONFIG_SIDECHAINGATE_FILTER 0 ++#define CONFIG_SILENCEDETECT_FILTER 0 ++#define CONFIG_SILENCEREMOVE_FILTER 0 ++#define CONFIG_SOFALIZER_FILTER 0 ++#define CONFIG_SPEECHNORM_FILTER 0 ++#define CONFIG_STEREOTOOLS_FILTER 0 ++#define CONFIG_STEREOWIDEN_FILTER 0 ++#define CONFIG_SUPEREQUALIZER_FILTER 0 ++#define CONFIG_SURROUND_FILTER 0 ++#define CONFIG_TREBLE_FILTER 0 ++#define CONFIG_TREMOLO_FILTER 0 ++#define CONFIG_VIBRATO_FILTER 0 ++#define CONFIG_VOLUME_FILTER 0 ++#define CONFIG_VOLUMEDETECT_FILTER 0 ++#define CONFIG_AEVALSRC_FILTER 0 ++#define CONFIG_AFIRSRC_FILTER 0 ++#define CONFIG_ANOISESRC_FILTER 0 ++#define CONFIG_ANULLSRC_FILTER 0 ++#define CONFIG_FLITE_FILTER 0 ++#define CONFIG_HILBERT_FILTER 0 ++#define CONFIG_SINC_FILTER 0 ++#define CONFIG_SINE_FILTER 0 ++#define CONFIG_ANULLSINK_FILTER 0 ++#define CONFIG_ADDROI_FILTER 0 ++#define CONFIG_ALPHAEXTRACT_FILTER 0 ++#define CONFIG_ALPHAMERGE_FILTER 0 ++#define CONFIG_AMPLIFY_FILTER 0 ++#define CONFIG_ASS_FILTER 0 ++#define CONFIG_ATADENOISE_FILTER 0 ++#define CONFIG_AVGBLUR_FILTER 0 ++#define CONFIG_AVGBLUR_OPENCL_FILTER 0 ++#define CONFIG_AVGBLUR_VULKAN_FILTER 0 ++#define CONFIG_BBOX_FILTER 0 ++#define CONFIG_BENCH_FILTER 0 ++#define CONFIG_BILATERAL_FILTER 0 ++#define CONFIG_BITPLANENOISE_FILTER 0 ++#define CONFIG_BLACKDETECT_FILTER 0 ++#define CONFIG_BLACKFRAME_FILTER 0 ++#define CONFIG_BLEND_FILTER 0 ++#define CONFIG_BLEND_VULKAN_FILTER 0 ++#define CONFIG_BM3D_FILTER 0 ++#define CONFIG_BOXBLUR_FILTER 0 ++#define CONFIG_BOXBLUR_OPENCL_FILTER 0 ++#define CONFIG_BWDIF_FILTER 0 ++#define CONFIG_CAS_FILTER 0 ++#define CONFIG_CHROMABER_VULKAN_FILTER 0 ++#define CONFIG_CHROMAHOLD_FILTER 0 ++#define CONFIG_CHROMAKEY_FILTER 0 ++#define CONFIG_CHROMANR_FILTER 0 ++#define CONFIG_CHROMASHIFT_FILTER 0 ++#define CONFIG_CIESCOPE_FILTER 0 ++#define CONFIG_CODECVIEW_FILTER 0 ++#define CONFIG_COLORBALANCE_FILTER 0 ++#define CONFIG_COLORCHANNELMIXER_FILTER 0 ++#define CONFIG_COLORCONTRAST_FILTER 0 ++#define CONFIG_COLORCORRECT_FILTER 0 ++#define CONFIG_COLORIZE_FILTER 0 ++#define CONFIG_COLORKEY_FILTER 0 ++#define CONFIG_COLORKEY_OPENCL_FILTER 0 ++#define CONFIG_COLORHOLD_FILTER 0 ++#define CONFIG_COLORLEVELS_FILTER 0 ++#define CONFIG_COLORMATRIX_FILTER 0 ++#define CONFIG_COLORSPACE_FILTER 0 ++#define CONFIG_COLORTEMPERATURE_FILTER 0 ++#define CONFIG_CONVOLUTION_FILTER 0 ++#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 ++#define CONFIG_CONVOLVE_FILTER 0 ++#define CONFIG_COPY_FILTER 0 ++#define CONFIG_COREIMAGE_FILTER 0 ++#define CONFIG_COVER_RECT_FILTER 0 ++#define CONFIG_CROP_FILTER 0 ++#define CONFIG_CROPDETECT_FILTER 0 ++#define CONFIG_CUE_FILTER 0 ++#define CONFIG_CURVES_FILTER 0 ++#define CONFIG_DATASCOPE_FILTER 0 ++#define CONFIG_DBLUR_FILTER 0 ++#define CONFIG_DCTDNOIZ_FILTER 0 ++#define CONFIG_DEBAND_FILTER 0 ++#define CONFIG_DEBLOCK_FILTER 0 ++#define CONFIG_DECIMATE_FILTER 0 ++#define CONFIG_DECONVOLVE_FILTER 0 ++#define CONFIG_DEDOT_FILTER 0 ++#define CONFIG_DEFLATE_FILTER 0 ++#define CONFIG_DEFLICKER_FILTER 0 ++#define CONFIG_DEINTERLACE_QSV_FILTER 0 ++#define CONFIG_DEINTERLACE_VAAPI_FILTER 0 ++#define CONFIG_DEJUDDER_FILTER 0 ++#define CONFIG_DELOGO_FILTER 0 ++#define CONFIG_DENOISE_VAAPI_FILTER 0 ++#define CONFIG_DERAIN_FILTER 0 ++#define CONFIG_DESHAKE_FILTER 0 ++#define CONFIG_DESHAKE_OPENCL_FILTER 0 ++#define CONFIG_DESPILL_FILTER 0 ++#define CONFIG_DETELECINE_FILTER 0 ++#define CONFIG_DILATION_FILTER 0 ++#define CONFIG_DILATION_OPENCL_FILTER 0 ++#define CONFIG_DISPLACE_FILTER 0 ++#define CONFIG_DNN_CLASSIFY_FILTER 0 ++#define CONFIG_DNN_DETECT_FILTER 0 ++#define CONFIG_DNN_PROCESSING_FILTER 0 ++#define CONFIG_DOUBLEWEAVE_FILTER 0 ++#define CONFIG_DRAWBOX_FILTER 0 ++#define CONFIG_DRAWGRAPH_FILTER 0 ++#define CONFIG_DRAWGRID_FILTER 0 ++#define CONFIG_DRAWTEXT_FILTER 0 ++#define CONFIG_EDGEDETECT_FILTER 0 ++#define CONFIG_ELBG_FILTER 0 ++#define CONFIG_ENTROPY_FILTER 0 ++#define CONFIG_EPX_FILTER 0 ++#define CONFIG_EQ_FILTER 0 ++#define CONFIG_EROSION_FILTER 0 ++#define CONFIG_EROSION_OPENCL_FILTER 0 ++#define CONFIG_ESTDIF_FILTER 0 ++#define CONFIG_EXPOSURE_FILTER 0 ++#define CONFIG_EXTRACTPLANES_FILTER 0 ++#define CONFIG_FADE_FILTER 0 ++#define CONFIG_FFTDNOIZ_FILTER 0 ++#define CONFIG_FFTFILT_FILTER 0 ++#define CONFIG_FIELD_FILTER 0 ++#define CONFIG_FIELDHINT_FILTER 0 ++#define CONFIG_FIELDMATCH_FILTER 0 ++#define CONFIG_FIELDORDER_FILTER 0 ++#define CONFIG_FILLBORDERS_FILTER 0 ++#define CONFIG_FIND_RECT_FILTER 0 ++#define CONFIG_FLIP_VULKAN_FILTER 0 ++#define CONFIG_FLOODFILL_FILTER 0 ++#define CONFIG_FORMAT_FILTER 0 ++#define CONFIG_FPS_FILTER 0 ++#define CONFIG_FRAMEPACK_FILTER 0 ++#define CONFIG_FRAMERATE_FILTER 0 ++#define CONFIG_FRAMESTEP_FILTER 0 ++#define CONFIG_FREEZEDETECT_FILTER 0 ++#define CONFIG_FREEZEFRAMES_FILTER 0 ++#define CONFIG_FREI0R_FILTER 0 ++#define CONFIG_FSPP_FILTER 0 ++#define CONFIG_GBLUR_FILTER 0 ++#define CONFIG_GBLUR_VULKAN_FILTER 0 ++#define CONFIG_GEQ_FILTER 0 ++#define CONFIG_GRADFUN_FILTER 0 ++#define CONFIG_GRAPHMONITOR_FILTER 0 ++#define CONFIG_GRAYWORLD_FILTER 0 ++#define CONFIG_GREYEDGE_FILTER 0 ++#define CONFIG_GUIDED_FILTER 0 ++#define CONFIG_HALDCLUT_FILTER 0 ++#define CONFIG_HFLIP_FILTER 0 ++#define CONFIG_HFLIP_VULKAN_FILTER 0 ++#define CONFIG_HISTEQ_FILTER 0 ++#define CONFIG_HISTOGRAM_FILTER 0 ++#define CONFIG_HQDN3D_FILTER 0 ++#define CONFIG_HQX_FILTER 0 ++#define CONFIG_HSTACK_FILTER 0 ++#define CONFIG_HSVHOLD_FILTER 0 ++#define CONFIG_HSVKEY_FILTER 0 ++#define CONFIG_HUE_FILTER 0 ++#define CONFIG_HUESATURATION_FILTER 0 ++#define CONFIG_HWDOWNLOAD_FILTER 0 ++#define CONFIG_HWMAP_FILTER 0 ++#define CONFIG_HWUPLOAD_FILTER 0 ++#define CONFIG_HWUPLOAD_CUDA_FILTER 0 ++#define CONFIG_HYSTERESIS_FILTER 0 ++#define CONFIG_IDENTITY_FILTER 0 ++#define CONFIG_IDET_FILTER 0 ++#define CONFIG_IL_FILTER 0 ++#define CONFIG_INFLATE_FILTER 0 ++#define CONFIG_INTERLACE_FILTER 0 ++#define CONFIG_INTERLEAVE_FILTER 0 ++#define CONFIG_KERNDEINT_FILTER 0 ++#define CONFIG_KIRSCH_FILTER 0 ++#define CONFIG_LAGFUN_FILTER 0 ++#define CONFIG_LATENCY_FILTER 0 ++#define CONFIG_LENSCORRECTION_FILTER 0 ++#define CONFIG_LENSFUN_FILTER 0 ++#define CONFIG_LIBPLACEBO_FILTER 0 ++#define CONFIG_LIBVMAF_FILTER 0 ++#define CONFIG_LIMITDIFF_FILTER 0 ++#define CONFIG_LIMITER_FILTER 0 ++#define CONFIG_LOOP_FILTER 0 ++#define CONFIG_LUMAKEY_FILTER 0 ++#define CONFIG_LUT_FILTER 0 ++#define CONFIG_LUT1D_FILTER 0 ++#define CONFIG_LUT2_FILTER 0 ++#define CONFIG_LUT3D_FILTER 0 ++#define CONFIG_LUTRGB_FILTER 0 ++#define CONFIG_LUTYUV_FILTER 0 ++#define CONFIG_MASKEDCLAMP_FILTER 0 ++#define CONFIG_MASKEDMAX_FILTER 0 ++#define CONFIG_MASKEDMERGE_FILTER 0 ++#define CONFIG_MASKEDMIN_FILTER 0 ++#define CONFIG_MASKEDTHRESHOLD_FILTER 0 ++#define CONFIG_MASKFUN_FILTER 0 ++#define CONFIG_MCDEINT_FILTER 0 ++#define CONFIG_MEDIAN_FILTER 0 ++#define CONFIG_MERGEPLANES_FILTER 0 ++#define CONFIG_MESTIMATE_FILTER 0 ++#define CONFIG_METADATA_FILTER 0 ++#define CONFIG_MIDEQUALIZER_FILTER 0 ++#define CONFIG_MINTERPOLATE_FILTER 0 ++#define CONFIG_MIX_FILTER 0 ++#define CONFIG_MONOCHROME_FILTER 0 ++#define CONFIG_MORPHO_FILTER 0 ++#define CONFIG_MPDECIMATE_FILTER 0 ++#define CONFIG_MSAD_FILTER 0 ++#define CONFIG_NEGATE_FILTER 0 ++#define CONFIG_NLMEANS_FILTER 0 ++#define CONFIG_NLMEANS_OPENCL_FILTER 0 ++#define CONFIG_NNEDI_FILTER 0 ++#define CONFIG_NOFORMAT_FILTER 0 ++#define CONFIG_NOISE_FILTER 0 ++#define CONFIG_NORMALIZE_FILTER 0 ++#define CONFIG_NULL_FILTER 0 ++#define CONFIG_OCR_FILTER 0 ++#define CONFIG_OCV_FILTER 0 ++#define CONFIG_OSCILLOSCOPE_FILTER 0 ++#define CONFIG_OVERLAY_FILTER 0 ++#define CONFIG_OVERLAY_OPENCL_FILTER 0 ++#define CONFIG_OVERLAY_QSV_FILTER 0 ++#define CONFIG_OVERLAY_VAAPI_FILTER 0 ++#define CONFIG_OVERLAY_VULKAN_FILTER 0 ++#define CONFIG_OVERLAY_CUDA_FILTER 0 ++#define CONFIG_OWDENOISE_FILTER 0 ++#define CONFIG_PAD_FILTER 0 ++#define CONFIG_PAD_OPENCL_FILTER 0 ++#define CONFIG_PALETTEGEN_FILTER 0 ++#define CONFIG_PALETTEUSE_FILTER 0 ++#define CONFIG_PERMS_FILTER 0 ++#define CONFIG_PERSPECTIVE_FILTER 0 ++#define CONFIG_PHASE_FILTER 0 ++#define CONFIG_PHOTOSENSITIVITY_FILTER 0 ++#define CONFIG_PIXDESCTEST_FILTER 0 ++#define CONFIG_PIXSCOPE_FILTER 0 ++#define CONFIG_PP_FILTER 0 ++#define CONFIG_PP7_FILTER 0 ++#define CONFIG_PREMULTIPLY_FILTER 0 ++#define CONFIG_PREWITT_FILTER 0 ++#define CONFIG_PREWITT_OPENCL_FILTER 0 ++#define CONFIG_PROCAMP_VAAPI_FILTER 0 ++#define CONFIG_PROGRAM_OPENCL_FILTER 0 ++#define CONFIG_PSEUDOCOLOR_FILTER 0 ++#define CONFIG_PSNR_FILTER 0 ++#define CONFIG_PULLUP_FILTER 0 ++#define CONFIG_QP_FILTER 0 ++#define CONFIG_RANDOM_FILTER 0 ++#define CONFIG_READEIA608_FILTER 0 ++#define CONFIG_READVITC_FILTER 0 ++#define CONFIG_REALTIME_FILTER 0 ++#define CONFIG_REMAP_FILTER 0 ++#define CONFIG_REMOVEGRAIN_FILTER 0 ++#define CONFIG_REMOVELOGO_FILTER 0 ++#define CONFIG_REPEATFIELDS_FILTER 0 ++#define CONFIG_REVERSE_FILTER 0 ++#define CONFIG_RGBASHIFT_FILTER 0 ++#define CONFIG_ROBERTS_FILTER 0 ++#define CONFIG_ROBERTS_OPENCL_FILTER 0 ++#define CONFIG_ROTATE_FILTER 0 ++#define CONFIG_SAB_FILTER 0 ++#define CONFIG_SCALE_FILTER 0 ++#define CONFIG_SCALE_CUDA_FILTER 0 ++#define CONFIG_SCALE_NPP_FILTER 0 ++#define CONFIG_SCALE_QSV_FILTER 0 ++#define CONFIG_SCALE_VAAPI_FILTER 0 ++#define CONFIG_SCALE_VULKAN_FILTER 0 ++#define CONFIG_SCALE2REF_FILTER 0 ++#define CONFIG_SCALE2REF_NPP_FILTER 0 ++#define CONFIG_SCDET_FILTER 0 ++#define CONFIG_SCHARR_FILTER 0 ++#define CONFIG_SCROLL_FILTER 0 ++#define CONFIG_SEGMENT_FILTER 0 ++#define CONFIG_SELECT_FILTER 0 ++#define CONFIG_SELECTIVECOLOR_FILTER 0 ++#define CONFIG_SENDCMD_FILTER 0 ++#define CONFIG_SEPARATEFIELDS_FILTER 0 ++#define CONFIG_SETDAR_FILTER 0 ++#define CONFIG_SETFIELD_FILTER 0 ++#define CONFIG_SETPARAMS_FILTER 0 ++#define CONFIG_SETPTS_FILTER 0 ++#define CONFIG_SETRANGE_FILTER 0 ++#define CONFIG_SETSAR_FILTER 0 ++#define CONFIG_SETTB_FILTER 0 ++#define CONFIG_SHARPEN_NPP_FILTER 0 ++#define CONFIG_SHARPNESS_VAAPI_FILTER 0 ++#define CONFIG_SHEAR_FILTER 0 ++#define CONFIG_SHOWINFO_FILTER 0 ++#define CONFIG_SHOWPALETTE_FILTER 0 ++#define CONFIG_SHUFFLEFRAMES_FILTER 0 ++#define CONFIG_SHUFFLEPIXELS_FILTER 0 ++#define CONFIG_SHUFFLEPLANES_FILTER 0 ++#define CONFIG_SIDEDATA_FILTER 0 ++#define CONFIG_SIGNALSTATS_FILTER 0 ++#define CONFIG_SIGNATURE_FILTER 0 ++#define CONFIG_SMARTBLUR_FILTER 0 ++#define CONFIG_SOBEL_FILTER 0 ++#define CONFIG_SOBEL_OPENCL_FILTER 0 ++#define CONFIG_SPLIT_FILTER 0 ++#define CONFIG_SPP_FILTER 0 ++#define CONFIG_SR_FILTER 0 ++#define CONFIG_SSIM_FILTER 0 ++#define CONFIG_STEREO3D_FILTER 0 ++#define CONFIG_STREAMSELECT_FILTER 0 ++#define CONFIG_SUBTITLES_FILTER 0 ++#define CONFIG_SUPER2XSAI_FILTER 0 ++#define CONFIG_SWAPRECT_FILTER 0 ++#define CONFIG_SWAPUV_FILTER 0 ++#define CONFIG_TBLEND_FILTER 0 ++#define CONFIG_TELECINE_FILTER 0 ++#define CONFIG_THISTOGRAM_FILTER 0 ++#define CONFIG_THRESHOLD_FILTER 0 ++#define CONFIG_THUMBNAIL_FILTER 0 ++#define CONFIG_THUMBNAIL_CUDA_FILTER 0 ++#define CONFIG_TILE_FILTER 0 ++#define CONFIG_TINTERLACE_FILTER 0 ++#define CONFIG_TLUT2_FILTER 0 ++#define CONFIG_TMEDIAN_FILTER 0 ++#define CONFIG_TMIDEQUALIZER_FILTER 0 ++#define CONFIG_TMIX_FILTER 0 ++#define CONFIG_TONEMAP_FILTER 0 ++#define CONFIG_TONEMAP_OPENCL_FILTER 0 ++#define CONFIG_TONEMAP_VAAPI_FILTER 0 ++#define CONFIG_TPAD_FILTER 0 ++#define CONFIG_TRANSPOSE_FILTER 0 ++#define CONFIG_TRANSPOSE_NPP_FILTER 0 ++#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 ++#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 ++#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 ++#define CONFIG_TRIM_FILTER 0 ++#define CONFIG_UNPREMULTIPLY_FILTER 0 ++#define CONFIG_UNSHARP_FILTER 0 ++#define CONFIG_UNSHARP_OPENCL_FILTER 0 ++#define CONFIG_UNTILE_FILTER 0 ++#define CONFIG_USPP_FILTER 0 ++#define CONFIG_V360_FILTER 0 ++#define CONFIG_VAGUEDENOISER_FILTER 0 ++#define CONFIG_VARBLUR_FILTER 0 ++#define CONFIG_VECTORSCOPE_FILTER 0 ++#define CONFIG_VFLIP_FILTER 0 ++#define CONFIG_VFLIP_VULKAN_FILTER 0 ++#define CONFIG_VFRDET_FILTER 0 ++#define CONFIG_VIBRANCE_FILTER 0 ++#define CONFIG_VIDSTABDETECT_FILTER 0 ++#define CONFIG_VIDSTABTRANSFORM_FILTER 0 ++#define CONFIG_VIF_FILTER 0 ++#define CONFIG_VIGNETTE_FILTER 0 ++#define CONFIG_VMAFMOTION_FILTER 0 ++#define CONFIG_VPP_QSV_FILTER 0 ++#define CONFIG_VSTACK_FILTER 0 ++#define CONFIG_W3FDIF_FILTER 0 ++#define CONFIG_WAVEFORM_FILTER 0 ++#define CONFIG_WEAVE_FILTER 0 ++#define CONFIG_XBR_FILTER 0 ++#define CONFIG_XCORRELATE_FILTER 0 ++#define CONFIG_XFADE_FILTER 0 ++#define CONFIG_XFADE_OPENCL_FILTER 0 ++#define CONFIG_XMEDIAN_FILTER 0 ++#define CONFIG_XSTACK_FILTER 0 ++#define CONFIG_YADIF_FILTER 0 ++#define CONFIG_YADIF_CUDA_FILTER 0 ++#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 ++#define CONFIG_YAEPBLUR_FILTER 0 ++#define CONFIG_ZMQ_FILTER 0 ++#define CONFIG_ZOOMPAN_FILTER 0 ++#define CONFIG_ZSCALE_FILTER 0 ++#define CONFIG_ALLRGB_FILTER 0 ++#define CONFIG_ALLYUV_FILTER 0 ++#define CONFIG_CELLAUTO_FILTER 0 ++#define CONFIG_COLOR_FILTER 0 ++#define CONFIG_COLORSPECTRUM_FILTER 0 ++#define CONFIG_COREIMAGESRC_FILTER 0 ++#define CONFIG_FREI0R_SRC_FILTER 0 ++#define CONFIG_GRADIENTS_FILTER 0 ++#define CONFIG_HALDCLUTSRC_FILTER 0 ++#define CONFIG_LIFE_FILTER 0 ++#define CONFIG_MANDELBROT_FILTER 0 ++#define CONFIG_MPTESTSRC_FILTER 0 ++#define CONFIG_NULLSRC_FILTER 0 ++#define CONFIG_OPENCLSRC_FILTER 0 ++#define CONFIG_PAL75BARS_FILTER 0 ++#define CONFIG_PAL100BARS_FILTER 0 ++#define CONFIG_RGBTESTSRC_FILTER 0 ++#define CONFIG_SIERPINSKI_FILTER 0 ++#define CONFIG_SMPTEBARS_FILTER 0 ++#define CONFIG_SMPTEHDBARS_FILTER 0 ++#define CONFIG_TESTSRC_FILTER 0 ++#define CONFIG_TESTSRC2_FILTER 0 ++#define CONFIG_YUVTESTSRC_FILTER 0 ++#define CONFIG_NULLSINK_FILTER 0 ++#define CONFIG_ABITSCOPE_FILTER 0 ++#define CONFIG_ADRAWGRAPH_FILTER 0 ++#define CONFIG_AGRAPHMONITOR_FILTER 0 ++#define CONFIG_AHISTOGRAM_FILTER 0 ++#define CONFIG_APHASEMETER_FILTER 0 ++#define CONFIG_AVECTORSCOPE_FILTER 0 ++#define CONFIG_CONCAT_FILTER 0 ++#define CONFIG_SHOWCQT_FILTER 0 ++#define CONFIG_SHOWFREQS_FILTER 0 ++#define CONFIG_SHOWSPATIAL_FILTER 0 ++#define CONFIG_SHOWSPECTRUM_FILTER 0 ++#define CONFIG_SHOWSPECTRUMPIC_FILTER 0 ++#define CONFIG_SHOWVOLUME_FILTER 0 ++#define CONFIG_SHOWWAVES_FILTER 0 ++#define CONFIG_SHOWWAVESPIC_FILTER 0 ++#define CONFIG_SPECTRUMSYNTH_FILTER 0 ++#define CONFIG_AMOVIE_FILTER 0 ++#define CONFIG_MOVIE_FILTER 0 ++#define CONFIG_AFIFO_FILTER 0 ++#define CONFIG_FIFO_FILTER 0 ++#define CONFIG_AA_DEMUXER 0 ++#define CONFIG_AAC_DEMUXER 1 ++#define CONFIG_AAX_DEMUXER 0 ++#define CONFIG_AC3_DEMUXER 0 ++#define CONFIG_ACE_DEMUXER 0 ++#define CONFIG_ACM_DEMUXER 0 ++#define CONFIG_ACT_DEMUXER 0 ++#define CONFIG_ADF_DEMUXER 0 ++#define CONFIG_ADP_DEMUXER 0 ++#define CONFIG_ADS_DEMUXER 0 ++#define CONFIG_ADX_DEMUXER 0 ++#define CONFIG_AEA_DEMUXER 0 ++#define CONFIG_AFC_DEMUXER 0 ++#define CONFIG_AIFF_DEMUXER 0 ++#define CONFIG_AIX_DEMUXER 0 ++#define CONFIG_ALP_DEMUXER 0 ++#define CONFIG_AMR_DEMUXER 0 ++#define CONFIG_AMRNB_DEMUXER 0 ++#define CONFIG_AMRWB_DEMUXER 0 ++#define CONFIG_ANM_DEMUXER 0 ++#define CONFIG_APC_DEMUXER 0 ++#define CONFIG_APE_DEMUXER 0 ++#define CONFIG_APM_DEMUXER 0 ++#define CONFIG_APNG_DEMUXER 0 ++#define CONFIG_APTX_DEMUXER 0 ++#define CONFIG_APTX_HD_DEMUXER 0 ++#define CONFIG_AQTITLE_DEMUXER 0 ++#define CONFIG_ARGO_ASF_DEMUXER 0 ++#define CONFIG_ARGO_BRP_DEMUXER 0 ++#define CONFIG_ARGO_CVG_DEMUXER 0 ++#define CONFIG_ASF_DEMUXER 0 ++#define CONFIG_ASF_O_DEMUXER 0 ++#define CONFIG_ASS_DEMUXER 0 ++#define CONFIG_AST_DEMUXER 0 ++#define CONFIG_AU_DEMUXER 0 ++#define CONFIG_AV1_DEMUXER 0 ++#define CONFIG_AVI_DEMUXER 0 ++#define CONFIG_AVISYNTH_DEMUXER 0 ++#define CONFIG_AVR_DEMUXER 0 ++#define CONFIG_AVS_DEMUXER 0 ++#define CONFIG_AVS2_DEMUXER 0 ++#define CONFIG_AVS3_DEMUXER 0 ++#define CONFIG_BETHSOFTVID_DEMUXER 0 ++#define CONFIG_BFI_DEMUXER 0 ++#define CONFIG_BINTEXT_DEMUXER 0 ++#define CONFIG_BINK_DEMUXER 0 ++#define CONFIG_BINKA_DEMUXER 0 ++#define CONFIG_BIT_DEMUXER 0 ++#define CONFIG_BITPACKED_DEMUXER 0 ++#define CONFIG_BMV_DEMUXER 0 ++#define CONFIG_BFSTM_DEMUXER 0 ++#define CONFIG_BRSTM_DEMUXER 0 ++#define CONFIG_BOA_DEMUXER 0 ++#define CONFIG_C93_DEMUXER 0 ++#define CONFIG_CAF_DEMUXER 0 ++#define CONFIG_CAVSVIDEO_DEMUXER 0 ++#define CONFIG_CDG_DEMUXER 0 ++#define CONFIG_CDXL_DEMUXER 0 ++#define CONFIG_CINE_DEMUXER 0 ++#define CONFIG_CODEC2_DEMUXER 0 ++#define CONFIG_CODEC2RAW_DEMUXER 0 ++#define CONFIG_CONCAT_DEMUXER 0 ++#define CONFIG_DASH_DEMUXER 0 ++#define CONFIG_DATA_DEMUXER 0 ++#define CONFIG_DAUD_DEMUXER 0 ++#define CONFIG_DCSTR_DEMUXER 0 ++#define CONFIG_DERF_DEMUXER 0 ++#define CONFIG_DFA_DEMUXER 0 ++#define CONFIG_DFPWM_DEMUXER 0 ++#define CONFIG_DHAV_DEMUXER 0 ++#define CONFIG_DIRAC_DEMUXER 0 ++#define CONFIG_DNXHD_DEMUXER 0 ++#define CONFIG_DSF_DEMUXER 0 ++#define CONFIG_DSICIN_DEMUXER 0 ++#define CONFIG_DSS_DEMUXER 0 ++#define CONFIG_DTS_DEMUXER 0 ++#define CONFIG_DTSHD_DEMUXER 0 ++#define CONFIG_DV_DEMUXER 0 ++#define CONFIG_DVBSUB_DEMUXER 0 ++#define CONFIG_DVBTXT_DEMUXER 0 ++#define CONFIG_DXA_DEMUXER 0 ++#define CONFIG_EA_DEMUXER 0 ++#define CONFIG_EA_CDATA_DEMUXER 0 ++#define CONFIG_EAC3_DEMUXER 0 ++#define CONFIG_EPAF_DEMUXER 0 ++#define CONFIG_FFMETADATA_DEMUXER 0 ++#define CONFIG_FILMSTRIP_DEMUXER 0 ++#define CONFIG_FITS_DEMUXER 0 ++#define CONFIG_FLAC_DEMUXER 1 ++#define CONFIG_FLIC_DEMUXER 0 ++#define CONFIG_FLV_DEMUXER 0 ++#define CONFIG_LIVE_FLV_DEMUXER 0 ++#define CONFIG_FOURXM_DEMUXER 0 ++#define CONFIG_FRM_DEMUXER 0 ++#define CONFIG_FSB_DEMUXER 0 ++#define CONFIG_FWSE_DEMUXER 0 ++#define CONFIG_G722_DEMUXER 0 ++#define CONFIG_G723_1_DEMUXER 0 ++#define CONFIG_G726_DEMUXER 0 ++#define CONFIG_G726LE_DEMUXER 0 ++#define CONFIG_G729_DEMUXER 0 ++#define CONFIG_GDV_DEMUXER 0 ++#define CONFIG_GENH_DEMUXER 0 ++#define CONFIG_GIF_DEMUXER 0 ++#define CONFIG_GSM_DEMUXER 0 ++#define CONFIG_GXF_DEMUXER 0 ++#define CONFIG_H261_DEMUXER 0 ++#define CONFIG_H263_DEMUXER 0 ++#define CONFIG_H264_DEMUXER 0 ++#define CONFIG_HCA_DEMUXER 0 ++#define CONFIG_HCOM_DEMUXER 0 ++#define CONFIG_HEVC_DEMUXER 0 ++#define CONFIG_HLS_DEMUXER 0 ++#define CONFIG_HNM_DEMUXER 0 ++#define CONFIG_ICO_DEMUXER 0 ++#define CONFIG_IDCIN_DEMUXER 0 ++#define CONFIG_IDF_DEMUXER 0 ++#define CONFIG_IFF_DEMUXER 0 ++#define CONFIG_IFV_DEMUXER 0 ++#define CONFIG_ILBC_DEMUXER 0 ++#define CONFIG_IMAGE2_DEMUXER 0 ++#define CONFIG_IMAGE2PIPE_DEMUXER 0 ++#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 ++#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 ++#define CONFIG_IMF_DEMUXER 0 ++#define CONFIG_INGENIENT_DEMUXER 0 ++#define CONFIG_IPMOVIE_DEMUXER 0 ++#define CONFIG_IPU_DEMUXER 0 ++#define CONFIG_IRCAM_DEMUXER 0 ++#define CONFIG_ISS_DEMUXER 0 ++#define CONFIG_IV8_DEMUXER 0 ++#define CONFIG_IVF_DEMUXER 0 ++#define CONFIG_IVR_DEMUXER 0 ++#define CONFIG_JACOSUB_DEMUXER 0 ++#define CONFIG_JV_DEMUXER 0 ++#define CONFIG_KUX_DEMUXER 0 ++#define CONFIG_KVAG_DEMUXER 0 ++#define CONFIG_LMLM4_DEMUXER 0 ++#define CONFIG_LOAS_DEMUXER 0 ++#define CONFIG_LUODAT_DEMUXER 0 ++#define CONFIG_LRC_DEMUXER 0 ++#define CONFIG_LVF_DEMUXER 0 ++#define CONFIG_LXF_DEMUXER 0 ++#define CONFIG_M4V_DEMUXER 0 ++#define CONFIG_MCA_DEMUXER 0 ++#define CONFIG_MCC_DEMUXER 0 ++#define CONFIG_MATROSKA_DEMUXER 1 ++#define CONFIG_MGSTS_DEMUXER 0 ++#define CONFIG_MICRODVD_DEMUXER 0 ++#define CONFIG_MJPEG_DEMUXER 0 ++#define CONFIG_MJPEG_2000_DEMUXER 0 ++#define CONFIG_MLP_DEMUXER 0 ++#define CONFIG_MLV_DEMUXER 0 ++#define CONFIG_MM_DEMUXER 0 ++#define CONFIG_MMF_DEMUXER 0 ++#define CONFIG_MODS_DEMUXER 0 ++#define CONFIG_MOFLEX_DEMUXER 0 ++#define CONFIG_MOV_DEMUXER 1 ++#define CONFIG_MP3_DEMUXER 1 ++#define CONFIG_MPC_DEMUXER 0 ++#define CONFIG_MPC8_DEMUXER 0 ++#define CONFIG_MPEGPS_DEMUXER 0 ++#define CONFIG_MPEGTS_DEMUXER 0 ++#define CONFIG_MPEGTSRAW_DEMUXER 0 ++#define CONFIG_MPEGVIDEO_DEMUXER 0 ++#define CONFIG_MPJPEG_DEMUXER 0 ++#define CONFIG_MPL2_DEMUXER 0 ++#define CONFIG_MPSUB_DEMUXER 0 ++#define CONFIG_MSF_DEMUXER 0 ++#define CONFIG_MSNWC_TCP_DEMUXER 0 ++#define CONFIG_MSP_DEMUXER 0 ++#define CONFIG_MTAF_DEMUXER 0 ++#define CONFIG_MTV_DEMUXER 0 ++#define CONFIG_MUSX_DEMUXER 0 ++#define CONFIG_MV_DEMUXER 0 ++#define CONFIG_MVI_DEMUXER 0 ++#define CONFIG_MXF_DEMUXER 0 ++#define CONFIG_MXG_DEMUXER 0 ++#define CONFIG_NC_DEMUXER 0 ++#define CONFIG_NISTSPHERE_DEMUXER 0 ++#define CONFIG_NSP_DEMUXER 0 ++#define CONFIG_NSV_DEMUXER 0 ++#define CONFIG_NUT_DEMUXER 0 ++#define CONFIG_NUV_DEMUXER 0 ++#define CONFIG_OBU_DEMUXER 0 ++#define CONFIG_OGG_DEMUXER 1 ++#define CONFIG_OMA_DEMUXER 0 ++#define CONFIG_PAF_DEMUXER 0 ++#define CONFIG_PCM_ALAW_DEMUXER 0 ++#define CONFIG_PCM_MULAW_DEMUXER 0 ++#define CONFIG_PCM_VIDC_DEMUXER 0 ++#define CONFIG_PCM_F64BE_DEMUXER 0 ++#define CONFIG_PCM_F64LE_DEMUXER 0 ++#define CONFIG_PCM_F32BE_DEMUXER 0 ++#define CONFIG_PCM_F32LE_DEMUXER 0 ++#define CONFIG_PCM_S32BE_DEMUXER 0 ++#define CONFIG_PCM_S32LE_DEMUXER 0 ++#define CONFIG_PCM_S24BE_DEMUXER 0 ++#define CONFIG_PCM_S24LE_DEMUXER 0 ++#define CONFIG_PCM_S16BE_DEMUXER 0 ++#define CONFIG_PCM_S16LE_DEMUXER 0 ++#define CONFIG_PCM_S8_DEMUXER 0 ++#define CONFIG_PCM_U32BE_DEMUXER 0 ++#define CONFIG_PCM_U32LE_DEMUXER 0 ++#define CONFIG_PCM_U24BE_DEMUXER 0 ++#define CONFIG_PCM_U24LE_DEMUXER 0 ++#define CONFIG_PCM_U16BE_DEMUXER 0 ++#define CONFIG_PCM_U16LE_DEMUXER 0 ++#define CONFIG_PCM_U8_DEMUXER 0 ++#define CONFIG_PJS_DEMUXER 0 ++#define CONFIG_PMP_DEMUXER 0 ++#define CONFIG_PP_BNK_DEMUXER 0 ++#define CONFIG_PVA_DEMUXER 0 ++#define CONFIG_PVF_DEMUXER 0 ++#define CONFIG_QCP_DEMUXER 0 ++#define CONFIG_R3D_DEMUXER 0 ++#define CONFIG_RAWVIDEO_DEMUXER 0 ++#define CONFIG_REALTEXT_DEMUXER 0 ++#define CONFIG_REDSPARK_DEMUXER 0 ++#define CONFIG_RL2_DEMUXER 0 ++#define CONFIG_RM_DEMUXER 0 ++#define CONFIG_ROQ_DEMUXER 0 ++#define CONFIG_RPL_DEMUXER 0 ++#define CONFIG_RSD_DEMUXER 0 ++#define CONFIG_RSO_DEMUXER 0 ++#define CONFIG_RTP_DEMUXER 0 ++#define CONFIG_RTSP_DEMUXER 0 ++#define CONFIG_S337M_DEMUXER 0 ++#define CONFIG_SAMI_DEMUXER 0 ++#define CONFIG_SAP_DEMUXER 0 ++#define CONFIG_SBC_DEMUXER 0 ++#define CONFIG_SBG_DEMUXER 0 ++#define CONFIG_SCC_DEMUXER 0 ++#define CONFIG_SCD_DEMUXER 0 ++#define CONFIG_SDP_DEMUXER 0 ++#define CONFIG_SDR2_DEMUXER 0 ++#define CONFIG_SDS_DEMUXER 0 ++#define CONFIG_SDX_DEMUXER 0 ++#define CONFIG_SEGAFILM_DEMUXER 0 ++#define CONFIG_SER_DEMUXER 0 ++#define CONFIG_SGA_DEMUXER 0 ++#define CONFIG_SHORTEN_DEMUXER 0 ++#define CONFIG_SIFF_DEMUXER 0 ++#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 ++#define CONFIG_SLN_DEMUXER 0 ++#define CONFIG_SMACKER_DEMUXER 0 ++#define CONFIG_SMJPEG_DEMUXER 0 ++#define CONFIG_SMUSH_DEMUXER 0 ++#define CONFIG_SOL_DEMUXER 0 ++#define CONFIG_SOX_DEMUXER 0 ++#define CONFIG_SPDIF_DEMUXER 0 ++#define CONFIG_SRT_DEMUXER 0 ++#define CONFIG_STR_DEMUXER 0 ++#define CONFIG_STL_DEMUXER 0 ++#define CONFIG_SUBVIEWER1_DEMUXER 0 ++#define CONFIG_SUBVIEWER_DEMUXER 0 ++#define CONFIG_SUP_DEMUXER 0 ++#define CONFIG_SVAG_DEMUXER 0 ++#define CONFIG_SVS_DEMUXER 0 ++#define CONFIG_SWF_DEMUXER 0 ++#define CONFIG_TAK_DEMUXER 0 ++#define CONFIG_TEDCAPTIONS_DEMUXER 0 ++#define CONFIG_THP_DEMUXER 0 ++#define CONFIG_THREEDOSTR_DEMUXER 0 ++#define CONFIG_TIERTEXSEQ_DEMUXER 0 ++#define CONFIG_TMV_DEMUXER 0 ++#define CONFIG_TRUEHD_DEMUXER 0 ++#define CONFIG_TTA_DEMUXER 0 ++#define CONFIG_TXD_DEMUXER 0 ++#define CONFIG_TTY_DEMUXER 0 ++#define CONFIG_TY_DEMUXER 0 ++#define CONFIG_V210_DEMUXER 0 ++#define CONFIG_V210X_DEMUXER 0 ++#define CONFIG_VAG_DEMUXER 0 ++#define CONFIG_VC1_DEMUXER 0 ++#define CONFIG_VC1T_DEMUXER 0 ++#define CONFIG_VIVIDAS_DEMUXER 0 ++#define CONFIG_VIVO_DEMUXER 0 ++#define CONFIG_VMD_DEMUXER 0 ++#define CONFIG_VOBSUB_DEMUXER 0 ++#define CONFIG_VOC_DEMUXER 0 ++#define CONFIG_VPK_DEMUXER 0 ++#define CONFIG_VPLAYER_DEMUXER 0 ++#define CONFIG_VQF_DEMUXER 0 ++#define CONFIG_W64_DEMUXER 0 ++#define CONFIG_WAV_DEMUXER 1 ++#define CONFIG_WC3_DEMUXER 0 ++#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 ++#define CONFIG_WEBVTT_DEMUXER 0 ++#define CONFIG_WSAUD_DEMUXER 0 ++#define CONFIG_WSD_DEMUXER 0 ++#define CONFIG_WSVQA_DEMUXER 0 ++#define CONFIG_WTV_DEMUXER 0 ++#define CONFIG_WVE_DEMUXER 0 ++#define CONFIG_WV_DEMUXER 0 ++#define CONFIG_XA_DEMUXER 0 ++#define CONFIG_XBIN_DEMUXER 0 ++#define CONFIG_XMV_DEMUXER 0 ++#define CONFIG_XVAG_DEMUXER 0 ++#define CONFIG_XWMA_DEMUXER 0 ++#define CONFIG_YOP_DEMUXER 0 ++#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 ++#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 ++#define CONFIG_LIBGME_DEMUXER 0 ++#define CONFIG_LIBMODPLUG_DEMUXER 0 ++#define CONFIG_LIBOPENMPT_DEMUXER 0 ++#define CONFIG_VAPOURSYNTH_DEMUXER 0 ++#define CONFIG_A64_MUXER 0 ++#define CONFIG_AC3_MUXER 0 ++#define CONFIG_ADTS_MUXER 0 ++#define CONFIG_ADX_MUXER 0 ++#define CONFIG_AIFF_MUXER 0 ++#define CONFIG_ALP_MUXER 0 ++#define CONFIG_AMR_MUXER 0 ++#define CONFIG_AMV_MUXER 0 ++#define CONFIG_APM_MUXER 0 ++#define CONFIG_APNG_MUXER 0 ++#define CONFIG_APTX_MUXER 0 ++#define CONFIG_APTX_HD_MUXER 0 ++#define CONFIG_ARGO_ASF_MUXER 0 ++#define CONFIG_ARGO_CVG_MUXER 0 ++#define CONFIG_ASF_MUXER 0 ++#define CONFIG_ASS_MUXER 0 ++#define CONFIG_AST_MUXER 0 ++#define CONFIG_ASF_STREAM_MUXER 0 ++#define CONFIG_AU_MUXER 0 ++#define CONFIG_AVI_MUXER 0 ++#define CONFIG_AVM2_MUXER 0 ++#define CONFIG_AVS2_MUXER 0 ++#define CONFIG_AVS3_MUXER 0 ++#define CONFIG_BIT_MUXER 0 ++#define CONFIG_CAF_MUXER 0 ++#define CONFIG_CAVSVIDEO_MUXER 0 ++#define CONFIG_CODEC2_MUXER 0 ++#define CONFIG_CODEC2RAW_MUXER 0 ++#define CONFIG_CRC_MUXER 0 ++#define CONFIG_DASH_MUXER 0 ++#define CONFIG_DATA_MUXER 0 ++#define CONFIG_DAUD_MUXER 0 ++#define CONFIG_DFPWM_MUXER 0 ++#define CONFIG_DIRAC_MUXER 0 ++#define CONFIG_DNXHD_MUXER 0 ++#define CONFIG_DTS_MUXER 0 ++#define CONFIG_DV_MUXER 0 ++#define CONFIG_EAC3_MUXER 0 ++#define CONFIG_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 ++#define CONFIG_FLV_MUXER 0 ++#define CONFIG_FRAMECRC_MUXER 0 ++#define CONFIG_FRAMEHASH_MUXER 0 ++#define CONFIG_FRAMEMD5_MUXER 0 ++#define CONFIG_G722_MUXER 0 ++#define CONFIG_G723_1_MUXER 0 ++#define CONFIG_G726_MUXER 0 ++#define CONFIG_G726LE_MUXER 0 ++#define CONFIG_GIF_MUXER 0 ++#define CONFIG_GSM_MUXER 0 ++#define CONFIG_GXF_MUXER 0 ++#define CONFIG_H261_MUXER 0 ++#define CONFIG_H263_MUXER 0 ++#define CONFIG_H264_MUXER 0 ++#define CONFIG_HASH_MUXER 0 ++#define CONFIG_HDS_MUXER 0 ++#define CONFIG_HEVC_MUXER 0 ++#define CONFIG_HLS_MUXER 0 ++#define CONFIG_ICO_MUXER 0 ++#define CONFIG_ILBC_MUXER 0 ++#define CONFIG_IMAGE2_MUXER 0 ++#define CONFIG_IMAGE2PIPE_MUXER 0 ++#define CONFIG_IPOD_MUXER 0 ++#define CONFIG_IRCAM_MUXER 0 ++#define CONFIG_ISMV_MUXER 0 ++#define CONFIG_IVF_MUXER 0 ++#define CONFIG_JACOSUB_MUXER 0 ++#define CONFIG_KVAG_MUXER 0 ++#define CONFIG_LATM_MUXER 0 ++#define CONFIG_LRC_MUXER 0 ++#define CONFIG_M4V_MUXER 0 ++#define CONFIG_MD5_MUXER 0 ++#define CONFIG_MATROSKA_MUXER 0 ++#define CONFIG_MATROSKA_AUDIO_MUXER 0 ++#define CONFIG_MICRODVD_MUXER 0 ++#define CONFIG_MJPEG_MUXER 0 ++#define CONFIG_MLP_MUXER 0 ++#define CONFIG_MMF_MUXER 0 ++#define CONFIG_MOV_MUXER 0 ++#define CONFIG_MP2_MUXER 0 ++#define CONFIG_MP3_MUXER 0 ++#define CONFIG_MP4_MUXER 0 ++#define CONFIG_MPEG1SYSTEM_MUXER 0 ++#define CONFIG_MPEG1VCD_MUXER 0 ++#define CONFIG_MPEG1VIDEO_MUXER 0 ++#define CONFIG_MPEG2DVD_MUXER 0 ++#define CONFIG_MPEG2SVCD_MUXER 0 ++#define CONFIG_MPEG2VIDEO_MUXER 0 ++#define CONFIG_MPEG2VOB_MUXER 0 ++#define CONFIG_MPEGTS_MUXER 0 ++#define CONFIG_MPJPEG_MUXER 0 ++#define CONFIG_MXF_MUXER 0 ++#define CONFIG_MXF_D10_MUXER 0 ++#define CONFIG_MXF_OPATOM_MUXER 0 ++#define CONFIG_NULL_MUXER 0 ++#define CONFIG_NUT_MUXER 0 ++#define CONFIG_OBU_MUXER 0 ++#define CONFIG_OGA_MUXER 0 ++#define CONFIG_OGG_MUXER 0 ++#define CONFIG_OGV_MUXER 0 ++#define CONFIG_OMA_MUXER 0 ++#define CONFIG_OPUS_MUXER 0 ++#define CONFIG_PCM_ALAW_MUXER 0 ++#define CONFIG_PCM_MULAW_MUXER 0 ++#define CONFIG_PCM_VIDC_MUXER 0 ++#define CONFIG_PCM_F64BE_MUXER 0 ++#define CONFIG_PCM_F64LE_MUXER 0 ++#define CONFIG_PCM_F32BE_MUXER 0 ++#define CONFIG_PCM_F32LE_MUXER 0 ++#define CONFIG_PCM_S32BE_MUXER 0 ++#define CONFIG_PCM_S32LE_MUXER 0 ++#define CONFIG_PCM_S24BE_MUXER 0 ++#define CONFIG_PCM_S24LE_MUXER 0 ++#define CONFIG_PCM_S16BE_MUXER 0 ++#define CONFIG_PCM_S16LE_MUXER 0 ++#define CONFIG_PCM_S8_MUXER 0 ++#define CONFIG_PCM_U32BE_MUXER 0 ++#define CONFIG_PCM_U32LE_MUXER 0 ++#define CONFIG_PCM_U24BE_MUXER 0 ++#define CONFIG_PCM_U24LE_MUXER 0 ++#define CONFIG_PCM_U16BE_MUXER 0 ++#define CONFIG_PCM_U16LE_MUXER 0 ++#define CONFIG_PCM_U8_MUXER 0 ++#define CONFIG_PSP_MUXER 0 ++#define CONFIG_RAWVIDEO_MUXER 0 ++#define CONFIG_RM_MUXER 0 ++#define CONFIG_ROQ_MUXER 0 ++#define CONFIG_RSO_MUXER 0 ++#define CONFIG_RTP_MUXER 0 ++#define CONFIG_RTP_MPEGTS_MUXER 0 ++#define CONFIG_RTSP_MUXER 0 ++#define CONFIG_SAP_MUXER 0 ++#define CONFIG_SBC_MUXER 0 ++#define CONFIG_SCC_MUXER 0 ++#define CONFIG_SEGAFILM_MUXER 0 ++#define CONFIG_SEGMENT_MUXER 0 ++#define CONFIG_STREAM_SEGMENT_MUXER 0 ++#define CONFIG_SMJPEG_MUXER 0 ++#define CONFIG_SMOOTHSTREAMING_MUXER 0 ++#define CONFIG_SOX_MUXER 0 ++#define CONFIG_SPX_MUXER 0 ++#define CONFIG_SPDIF_MUXER 0 ++#define CONFIG_SRT_MUXER 0 ++#define CONFIG_STREAMHASH_MUXER 0 ++#define CONFIG_SUP_MUXER 0 ++#define CONFIG_SWF_MUXER 0 ++#define CONFIG_TEE_MUXER 0 ++#define CONFIG_TG2_MUXER 0 ++#define CONFIG_TGP_MUXER 0 ++#define CONFIG_MKVTIMESTAMP_V2_MUXER 0 ++#define CONFIG_TRUEHD_MUXER 0 ++#define CONFIG_TTA_MUXER 0 ++#define CONFIG_TTML_MUXER 0 ++#define CONFIG_UNCODEDFRAMECRC_MUXER 0 ++#define CONFIG_VC1_MUXER 0 ++#define CONFIG_VC1T_MUXER 0 ++#define CONFIG_VOC_MUXER 0 ++#define CONFIG_W64_MUXER 0 ++#define CONFIG_WAV_MUXER 0 ++#define CONFIG_WEBM_MUXER 0 ++#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 ++#define CONFIG_WEBM_CHUNK_MUXER 0 ++#define CONFIG_WEBP_MUXER 0 ++#define CONFIG_WEBVTT_MUXER 0 ++#define CONFIG_WSAUD_MUXER 0 ++#define CONFIG_WTV_MUXER 0 ++#define CONFIG_WV_MUXER 0 ++#define CONFIG_YUV4MPEGPIPE_MUXER 0 ++#define CONFIG_CHROMAPRINT_MUXER 0 ++#define CONFIG_ASYNC_PROTOCOL 0 ++#define CONFIG_BLURAY_PROTOCOL 0 ++#define CONFIG_CACHE_PROTOCOL 0 ++#define CONFIG_CONCAT_PROTOCOL 0 ++#define CONFIG_CONCATF_PROTOCOL 0 ++#define CONFIG_CRYPTO_PROTOCOL 0 ++#define CONFIG_DATA_PROTOCOL 0 ++#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 ++#define CONFIG_FFRTMPHTTP_PROTOCOL 0 ++#define CONFIG_FILE_PROTOCOL 0 ++#define CONFIG_FTP_PROTOCOL 0 ++#define CONFIG_GOPHER_PROTOCOL 0 ++#define CONFIG_GOPHERS_PROTOCOL 0 ++#define CONFIG_HLS_PROTOCOL 0 ++#define CONFIG_HTTP_PROTOCOL 0 ++#define CONFIG_HTTPPROXY_PROTOCOL 0 ++#define CONFIG_HTTPS_PROTOCOL 0 ++#define CONFIG_ICECAST_PROTOCOL 0 ++#define CONFIG_MMSH_PROTOCOL 0 ++#define CONFIG_MMST_PROTOCOL 0 ++#define CONFIG_MD5_PROTOCOL 0 ++#define CONFIG_PIPE_PROTOCOL 0 ++#define CONFIG_PROMPEG_PROTOCOL 0 ++#define CONFIG_RTMP_PROTOCOL 0 ++#define CONFIG_RTMPE_PROTOCOL 0 ++#define CONFIG_RTMPS_PROTOCOL 0 ++#define CONFIG_RTMPT_PROTOCOL 0 ++#define CONFIG_RTMPTE_PROTOCOL 0 ++#define CONFIG_RTMPTS_PROTOCOL 0 ++#define CONFIG_RTP_PROTOCOL 0 ++#define CONFIG_SCTP_PROTOCOL 0 ++#define CONFIG_SRTP_PROTOCOL 0 ++#define CONFIG_SUBFILE_PROTOCOL 0 ++#define CONFIG_TEE_PROTOCOL 0 ++#define CONFIG_TCP_PROTOCOL 0 ++#define CONFIG_TLS_PROTOCOL 0 ++#define CONFIG_UDP_PROTOCOL 0 ++#define CONFIG_UDPLITE_PROTOCOL 0 ++#define CONFIG_UNIX_PROTOCOL 0 ++#define CONFIG_LIBAMQP_PROTOCOL 0 ++#define CONFIG_LIBRIST_PROTOCOL 0 ++#define CONFIG_LIBRTMP_PROTOCOL 0 ++#define CONFIG_LIBRTMPE_PROTOCOL 0 ++#define CONFIG_LIBRTMPS_PROTOCOL 0 ++#define CONFIG_LIBRTMPT_PROTOCOL 0 ++#define CONFIG_LIBRTMPTE_PROTOCOL 0 ++#define CONFIG_LIBSRT_PROTOCOL 0 ++#define CONFIG_LIBSSH_PROTOCOL 0 ++#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 ++#define CONFIG_LIBZMQ_PROTOCOL 0 ++#endif /* FFMPEG_CONFIG_COMPONENTS_H */ diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm index 0a3bc1faead0..b2d95967e8b2 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2022-04-01 07:48:30 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2022-10-05 07:34:01 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm -@@ -0,0 +1,2770 @@ +@@ -0,0 +1,720 @@ +; Automatically generated by configure - do not modify! +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 @@ -50,6 +50,7 @@ +%define HAVE_AVX 1 +%define HAVE_AVX2 1 +%define HAVE_AVX512 1 ++%define HAVE_AVX512ICL 1 +%define HAVE_FMA3 1 +%define HAVE_FMA4 1 +%define HAVE_MMX 1 @@ -97,6 +98,7 @@ +%define HAVE_AVX_EXTERNAL 1 +%define HAVE_AVX2_EXTERNAL 1 +%define HAVE_AVX512_EXTERNAL 1 ++%define HAVE_AVX512ICL_EXTERNAL 0 +%define HAVE_FMA3_EXTERNAL 1 +%define HAVE_FMA4_EXTERNAL 1 +%define HAVE_MMX_EXTERNAL 1 @@ -144,6 +146,7 @@ +%define HAVE_AVX_INLINE 1 +%define HAVE_AVX2_INLINE 1 +%define HAVE_AVX512_INLINE 1 ++%define HAVE_AVX512ICL_INLINE 1 +%define HAVE_FMA3_INLINE 1 +%define HAVE_FMA4_INLINE 1 +%define HAVE_MMX_INLINE 1 @@ -229,7 +232,7 @@ +%define HAVE_TERMIOS_H 1 +%define HAVE_UDPLITE_H 0 +%define HAVE_UNISTD_H 1 -+%define HAVE_VALGRIND_VALGRIND_H 0 ++%define HAVE_VALGRIND_VALGRIND_H 0 ; %define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 +%define HAVE_WINDOWS_H 0 +%define HAVE_WINSOCK2_H 0 +%define HAVE_INTRINSICS_NEON 0 @@ -277,6 +280,7 @@ +%define HAVE_COMMANDLINETOARGVW 0 +%define HAVE_FCNTL 1 +%define HAVE_GETADDRINFO 0 ++%define HAVE_GETAUXVAL 0 +%define HAVE_GETHRTIME 0 +%define HAVE_GETOPT 1 +%define HAVE_GETMODULEHANDLE 0 @@ -316,7 +320,7 @@ +%define HAVE_SLEEP 0 +%define HAVE_STRERROR_R 1 +%define HAVE_SYSCONF 1 -+%define HAVE_SYSCTL 1 ++%define HAVE_SYSCTL 0 +%define HAVE_USLEEP 1 +%define HAVE_UTGETOSTYPEFROMSTRING 0 +%define HAVE_VIRTUALALLOC 0 @@ -562,7 +566,6 @@ +%define CONFIG_VIDEOTOOLBOX 0 +%define CONFIG_VULKAN 0 +%define CONFIG_V4L2_M2M 0 -+%define CONFIG_XVMC 0 +%define CONFIG_FTRAPV 0 +%define CONFIG_GRAY 0 +%define CONFIG_HARDCODED_TABLES 0 @@ -594,7 +597,6 @@ +%define CONFIG_FAST_UNALIGNED 1 +%define CONFIG_FFT 1 +%define CONFIG_LSP 0 -+%define CONFIG_LZO 0 +%define CONFIG_MDCT 1 +%define CONFIG_PIXELUTILS 0 +%define CONFIG_NETWORK 0 @@ -639,6 +641,7 @@ +%define CONFIG_CBS_JPEG 0 +%define CONFIG_CBS_MPEG2 0 +%define CONFIG_CBS_VP9 0 ++%define CONFIG_DEFLATE_WRAPPER 0 +%define CONFIG_DIRAC_PARSE 1 +%define CONFIG_DNN 0 +%define CONFIG_DOVI_RPU 0 @@ -667,6 +670,7 @@ +%define CONFIG_IDCTDSP 0 +%define CONFIG_IIRFILTER 0 +%define CONFIG_MDCT15 1 ++%define CONFIG_INFLATE_WRAPPER 0 +%define CONFIG_INTRAX8 0 +%define CONFIG_ISO_MEDIA 1 +%define CONFIG_IVIDSP 0 @@ -717,2057 +721,3 @@ +%define CONFIG_VP8DSP 1 +%define CONFIG_WMA_FREQS 0 +%define CONFIG_WMV2DSP 0 -+%define CONFIG_AAC_ADTSTOASC_BSF 0 -+%define CONFIG_AV1_FRAME_MERGE_BSF 0 -+%define CONFIG_AV1_FRAME_SPLIT_BSF 0 -+%define CONFIG_AV1_METADATA_BSF 0 -+%define CONFIG_CHOMP_BSF 0 -+%define CONFIG_DUMP_EXTRADATA_BSF 0 -+%define CONFIG_DCA_CORE_BSF 0 -+%define CONFIG_EAC3_CORE_BSF 0 -+%define CONFIG_EXTRACT_EXTRADATA_BSF 0 -+%define CONFIG_FILTER_UNITS_BSF 0 -+%define CONFIG_H264_METADATA_BSF 0 -+%define CONFIG_H264_MP4TOANNEXB_BSF 0 -+%define CONFIG_H264_REDUNDANT_PPS_BSF 0 -+%define CONFIG_HAPQA_EXTRACT_BSF 0 -+%define CONFIG_HEVC_METADATA_BSF 0 -+%define CONFIG_HEVC_MP4TOANNEXB_BSF 0 -+%define CONFIG_IMX_DUMP_HEADER_BSF 0 -+%define CONFIG_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 -+%define CONFIG_NOISE_BSF 0 -+%define CONFIG_NULL_BSF 0 -+%define CONFIG_OPUS_METADATA_BSF 0 -+%define CONFIG_PCM_RECHUNK_BSF 0 -+%define CONFIG_PRORES_METADATA_BSF 0 -+%define CONFIG_REMOVE_EXTRADATA_BSF 0 -+%define CONFIG_SETTS_BSF 0 -+%define CONFIG_TEXT2MOVSUB_BSF 0 -+%define CONFIG_TRACE_HEADERS_BSF 0 -+%define CONFIG_TRUEHD_CORE_BSF 0 -+%define CONFIG_VP9_METADATA_BSF 0 -+%define CONFIG_VP9_RAW_REORDER_BSF 0 -+%define CONFIG_VP9_SUPERFRAME_BSF 0 -+%define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 -+%define CONFIG_AASC_DECODER 0 -+%define CONFIG_AIC_DECODER 0 -+%define CONFIG_ALIAS_PIX_DECODER 0 -+%define CONFIG_AGM_DECODER 0 -+%define CONFIG_AMV_DECODER 0 -+%define CONFIG_ANM_DECODER 0 -+%define CONFIG_ANSI_DECODER 0 -+%define CONFIG_APNG_DECODER 0 -+%define CONFIG_ARBC_DECODER 0 -+%define CONFIG_ARGO_DECODER 0 -+%define CONFIG_ASV1_DECODER 0 -+%define CONFIG_ASV2_DECODER 0 -+%define CONFIG_AURA_DECODER 0 -+%define CONFIG_AURA2_DECODER 0 -+%define CONFIG_AVRP_DECODER 0 -+%define CONFIG_AVRN_DECODER 0 -+%define CONFIG_AVS_DECODER 0 -+%define CONFIG_AVUI_DECODER 0 -+%define CONFIG_AYUV_DECODER 0 -+%define CONFIG_BETHSOFTVID_DECODER 0 -+%define CONFIG_BFI_DECODER 0 -+%define CONFIG_BINK_DECODER 0 -+%define CONFIG_BITPACKED_DECODER 0 -+%define CONFIG_BMP_DECODER 0 -+%define CONFIG_BMV_VIDEO_DECODER 0 -+%define CONFIG_BRENDER_PIX_DECODER 0 -+%define CONFIG_C93_DECODER 0 -+%define CONFIG_CAVS_DECODER 0 -+%define CONFIG_CDGRAPHICS_DECODER 0 -+%define CONFIG_CDTOONS_DECODER 0 -+%define CONFIG_CDXL_DECODER 0 -+%define CONFIG_CFHD_DECODER 0 -+%define CONFIG_CINEPAK_DECODER 0 -+%define CONFIG_CLEARVIDEO_DECODER 0 -+%define CONFIG_CLJR_DECODER 0 -+%define CONFIG_CLLC_DECODER 0 -+%define CONFIG_COMFORTNOISE_DECODER 0 -+%define CONFIG_CPIA_DECODER 0 -+%define CONFIG_CRI_DECODER 0 -+%define CONFIG_CSCD_DECODER 0 -+%define CONFIG_CYUV_DECODER 0 -+%define CONFIG_DDS_DECODER 0 -+%define CONFIG_DFA_DECODER 0 -+%define CONFIG_DIRAC_DECODER 0 -+%define CONFIG_DNXHD_DECODER 0 -+%define CONFIG_DPX_DECODER 0 -+%define CONFIG_DSICINVIDEO_DECODER 0 -+%define CONFIG_DVAUDIO_DECODER 0 -+%define CONFIG_DVVIDEO_DECODER 0 -+%define CONFIG_DXA_DECODER 0 -+%define CONFIG_DXTORY_DECODER 0 -+%define CONFIG_DXV_DECODER 0 -+%define CONFIG_EACMV_DECODER 0 -+%define CONFIG_EAMAD_DECODER 0 -+%define CONFIG_EATGQ_DECODER 0 -+%define CONFIG_EATGV_DECODER 0 -+%define CONFIG_EATQI_DECODER 0 -+%define CONFIG_EIGHTBPS_DECODER 0 -+%define CONFIG_EIGHTSVX_EXP_DECODER 0 -+%define CONFIG_EIGHTSVX_FIB_DECODER 0 -+%define CONFIG_ESCAPE124_DECODER 0 -+%define CONFIG_ESCAPE130_DECODER 0 -+%define CONFIG_EXR_DECODER 0 -+%define CONFIG_FFV1_DECODER 0 -+%define CONFIG_FFVHUFF_DECODER 0 -+%define CONFIG_FIC_DECODER 0 -+%define CONFIG_FITS_DECODER 0 -+%define CONFIG_FLASHSV_DECODER 0 -+%define CONFIG_FLASHSV2_DECODER 0 -+%define CONFIG_FLIC_DECODER 0 -+%define CONFIG_FLV_DECODER 0 -+%define CONFIG_FMVC_DECODER 0 -+%define CONFIG_FOURXM_DECODER 0 -+%define CONFIG_FRAPS_DECODER 0 -+%define CONFIG_FRWU_DECODER 0 -+%define CONFIG_G2M_DECODER 0 -+%define CONFIG_GDV_DECODER 0 -+%define CONFIG_GEM_DECODER 0 -+%define CONFIG_GIF_DECODER 0 -+%define CONFIG_H261_DECODER 0 -+%define CONFIG_H263_DECODER 0 -+%define CONFIG_H263I_DECODER 0 -+%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 -+%define CONFIG_H264_QSV_DECODER 0 -+%define CONFIG_H264_RKMPP_DECODER 0 -+%define CONFIG_HAP_DECODER 0 -+%define CONFIG_HEVC_DECODER 0 -+%define CONFIG_HEVC_QSV_DECODER 0 -+%define CONFIG_HEVC_RKMPP_DECODER 0 -+%define CONFIG_HEVC_V4L2M2M_DECODER 0 -+%define CONFIG_HNM4_VIDEO_DECODER 0 -+%define CONFIG_HQ_HQA_DECODER 0 -+%define CONFIG_HQX_DECODER 0 -+%define CONFIG_HUFFYUV_DECODER 0 -+%define CONFIG_HYMT_DECODER 0 -+%define CONFIG_IDCIN_DECODER 0 -+%define CONFIG_IFF_ILBM_DECODER 0 -+%define CONFIG_IMM4_DECODER 0 -+%define CONFIG_IMM5_DECODER 0 -+%define CONFIG_INDEO2_DECODER 0 -+%define CONFIG_INDEO3_DECODER 0 -+%define CONFIG_INDEO4_DECODER 0 -+%define CONFIG_INDEO5_DECODER 0 -+%define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+%define CONFIG_IPU_DECODER 0 -+%define CONFIG_JPEG2000_DECODER 0 -+%define CONFIG_JPEGLS_DECODER 0 -+%define CONFIG_JV_DECODER 0 -+%define CONFIG_KGV1_DECODER 0 -+%define CONFIG_KMVC_DECODER 0 -+%define CONFIG_LAGARITH_DECODER 0 -+%define CONFIG_LOCO_DECODER 0 -+%define CONFIG_LSCR_DECODER 0 -+%define CONFIG_M101_DECODER 0 -+%define CONFIG_MAGICYUV_DECODER 0 -+%define CONFIG_MDEC_DECODER 0 -+%define CONFIG_MIMIC_DECODER 0 -+%define CONFIG_MJPEG_DECODER 0 -+%define CONFIG_MJPEGB_DECODER 0 -+%define CONFIG_MMVIDEO_DECODER 0 -+%define CONFIG_MOBICLIP_DECODER 0 -+%define CONFIG_MOTIONPIXELS_DECODER 0 -+%define CONFIG_MPEG1VIDEO_DECODER 0 -+%define CONFIG_MPEG2VIDEO_DECODER 0 -+%define CONFIG_MPEG4_DECODER 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 -+%define CONFIG_MSA1_DECODER 0 -+%define CONFIG_MSCC_DECODER 0 -+%define CONFIG_MSMPEG4V1_DECODER 0 -+%define CONFIG_MSMPEG4V2_DECODER 0 -+%define CONFIG_MSMPEG4V3_DECODER 0 -+%define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 -+%define CONFIG_MSP2_DECODER 0 -+%define CONFIG_MSRLE_DECODER 0 -+%define CONFIG_MSS1_DECODER 0 -+%define CONFIG_MSS2_DECODER 0 -+%define CONFIG_MSVIDEO1_DECODER 0 -+%define CONFIG_MSZH_DECODER 0 -+%define CONFIG_MTS2_DECODER 0 -+%define CONFIG_MV30_DECODER 0 -+%define CONFIG_MVC1_DECODER 0 -+%define CONFIG_MVC2_DECODER 0 -+%define CONFIG_MVDV_DECODER 0 -+%define CONFIG_MVHA_DECODER 0 -+%define CONFIG_MWSC_DECODER 0 -+%define CONFIG_MXPEG_DECODER 0 -+%define CONFIG_NOTCHLC_DECODER 0 -+%define CONFIG_NUV_DECODER 0 -+%define CONFIG_PAF_VIDEO_DECODER 0 -+%define CONFIG_PAM_DECODER 0 -+%define CONFIG_PBM_DECODER 0 -+%define CONFIG_PCX_DECODER 0 -+%define CONFIG_PFM_DECODER 0 -+%define CONFIG_PGM_DECODER 0 -+%define CONFIG_PGMYUV_DECODER 0 -+%define CONFIG_PGX_DECODER 0 -+%define CONFIG_PHOTOCD_DECODER 0 -+%define CONFIG_PICTOR_DECODER 0 -+%define CONFIG_PIXLET_DECODER 0 -+%define CONFIG_PNG_DECODER 0 -+%define CONFIG_PPM_DECODER 0 -+%define CONFIG_PRORES_DECODER 0 -+%define CONFIG_PROSUMER_DECODER 0 -+%define CONFIG_PSD_DECODER 0 -+%define CONFIG_PTX_DECODER 0 -+%define CONFIG_QDRAW_DECODER 0 -+%define CONFIG_QPEG_DECODER 0 -+%define CONFIG_QTRLE_DECODER 0 -+%define CONFIG_R10K_DECODER 0 -+%define CONFIG_R210_DECODER 0 -+%define CONFIG_RASC_DECODER 0 -+%define CONFIG_RAWVIDEO_DECODER 0 -+%define CONFIG_RL2_DECODER 0 -+%define CONFIG_ROQ_DECODER 0 -+%define CONFIG_RPZA_DECODER 0 -+%define CONFIG_RSCC_DECODER 0 -+%define CONFIG_RV10_DECODER 0 -+%define CONFIG_RV20_DECODER 0 -+%define CONFIG_RV30_DECODER 0 -+%define CONFIG_RV40_DECODER 0 -+%define CONFIG_S302M_DECODER 0 -+%define CONFIG_SANM_DECODER 0 -+%define CONFIG_SCPR_DECODER 0 -+%define CONFIG_SCREENPRESSO_DECODER 0 -+%define CONFIG_SGA_DECODER 0 -+%define CONFIG_SGI_DECODER 0 -+%define CONFIG_SGIRLE_DECODER 0 -+%define CONFIG_SHEERVIDEO_DECODER 0 -+%define CONFIG_SIMBIOSIS_IMX_DECODER 0 -+%define CONFIG_SMACKER_DECODER 0 -+%define CONFIG_SMC_DECODER 0 -+%define CONFIG_SMVJPEG_DECODER 0 -+%define CONFIG_SNOW_DECODER 0 -+%define CONFIG_SP5X_DECODER 0 -+%define CONFIG_SPEEDHQ_DECODER 0 -+%define CONFIG_SPEEX_DECODER 0 -+%define CONFIG_SRGC_DECODER 0 -+%define CONFIG_SUNRAST_DECODER 0 -+%define CONFIG_SVQ1_DECODER 0 -+%define CONFIG_SVQ3_DECODER 0 -+%define CONFIG_TARGA_DECODER 0 -+%define CONFIG_TARGA_Y216_DECODER 0 -+%define CONFIG_TDSC_DECODER 0 -+%define CONFIG_THEORA_DECODER 1 -+%define CONFIG_THP_DECODER 0 -+%define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+%define CONFIG_TIFF_DECODER 0 -+%define CONFIG_TMV_DECODER 0 -+%define CONFIG_TRUEMOTION1_DECODER 0 -+%define CONFIG_TRUEMOTION2_DECODER 0 -+%define CONFIG_TRUEMOTION2RT_DECODER 0 -+%define CONFIG_TSCC_DECODER 0 -+%define CONFIG_TSCC2_DECODER 0 -+%define CONFIG_TXD_DECODER 0 -+%define CONFIG_ULTI_DECODER 0 -+%define CONFIG_UTVIDEO_DECODER 0 -+%define CONFIG_V210_DECODER 0 -+%define CONFIG_V210X_DECODER 0 -+%define CONFIG_V308_DECODER 0 -+%define CONFIG_V408_DECODER 0 -+%define CONFIG_V410_DECODER 0 -+%define CONFIG_VB_DECODER 0 -+%define CONFIG_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 -+%define CONFIG_VC1_V4L2M2M_DECODER 0 -+%define CONFIG_VCR1_DECODER 0 -+%define CONFIG_VMDVIDEO_DECODER 0 -+%define CONFIG_VMNC_DECODER 0 -+%define CONFIG_VP3_DECODER 1 -+%define CONFIG_VP4_DECODER 0 -+%define CONFIG_VP5_DECODER 0 -+%define CONFIG_VP6_DECODER 0 -+%define CONFIG_VP6A_DECODER 0 -+%define CONFIG_VP6F_DECODER 0 -+%define CONFIG_VP7_DECODER 0 -+%define CONFIG_VP8_DECODER 1 -+%define CONFIG_VP8_RKMPP_DECODER 0 -+%define CONFIG_VP8_V4L2M2M_DECODER 0 -+%define CONFIG_VP9_DECODER 0 -+%define CONFIG_VP9_RKMPP_DECODER 0 -+%define CONFIG_VP9_V4L2M2M_DECODER 0 -+%define CONFIG_VQA_DECODER 0 -+%define CONFIG_WEBP_DECODER 0 -+%define CONFIG_WCMV_DECODER 0 -+%define CONFIG_WRAPPED_AVFRAME_DECODER 0 -+%define CONFIG_WMV1_DECODER 0 -+%define CONFIG_WMV2_DECODER 0 -+%define CONFIG_WMV3_DECODER 0 -+%define CONFIG_WMV3_CRYSTALHD_DECODER 0 -+%define CONFIG_WMV3IMAGE_DECODER 0 -+%define CONFIG_WNV1_DECODER 0 -+%define CONFIG_XAN_WC3_DECODER 0 -+%define CONFIG_XAN_WC4_DECODER 0 -+%define CONFIG_XBM_DECODER 0 -+%define CONFIG_XFACE_DECODER 0 -+%define CONFIG_XL_DECODER 0 -+%define CONFIG_XPM_DECODER 0 -+%define CONFIG_XWD_DECODER 0 -+%define CONFIG_Y41P_DECODER 0 -+%define CONFIG_YLC_DECODER 0 -+%define CONFIG_YOP_DECODER 0 -+%define CONFIG_YUV4_DECODER 0 -+%define CONFIG_ZERO12V_DECODER 0 -+%define CONFIG_ZEROCODEC_DECODER 0 -+%define CONFIG_ZLIB_DECODER 0 -+%define CONFIG_ZMBV_DECODER 0 -+%define CONFIG_AAC_DECODER 1 -+%define CONFIG_AAC_FIXED_DECODER 0 -+%define CONFIG_AAC_LATM_DECODER 0 -+%define CONFIG_AC3_DECODER 0 -+%define CONFIG_AC3_FIXED_DECODER 0 -+%define CONFIG_ACELP_KELVIN_DECODER 0 -+%define CONFIG_ALAC_DECODER 0 -+%define CONFIG_ALS_DECODER 0 -+%define CONFIG_AMRNB_DECODER 0 -+%define CONFIG_AMRWB_DECODER 0 -+%define CONFIG_APE_DECODER 0 -+%define CONFIG_APTX_DECODER 0 -+%define CONFIG_APTX_HD_DECODER 0 -+%define CONFIG_ATRAC1_DECODER 0 -+%define CONFIG_ATRAC3_DECODER 0 -+%define CONFIG_ATRAC3AL_DECODER 0 -+%define CONFIG_ATRAC3P_DECODER 0 -+%define CONFIG_ATRAC3PAL_DECODER 0 -+%define CONFIG_ATRAC9_DECODER 0 -+%define CONFIG_BINKAUDIO_DCT_DECODER 0 -+%define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+%define CONFIG_BMV_AUDIO_DECODER 0 -+%define CONFIG_COOK_DECODER 0 -+%define CONFIG_DCA_DECODER 0 -+%define CONFIG_DOLBY_E_DECODER 0 -+%define CONFIG_DSD_LSBF_DECODER 0 -+%define CONFIG_DSD_MSBF_DECODER 0 -+%define CONFIG_DSD_LSBF_PLANAR_DECODER 0 -+%define CONFIG_DSD_MSBF_PLANAR_DECODER 0 -+%define CONFIG_DSICINAUDIO_DECODER 0 -+%define CONFIG_DSS_SP_DECODER 0 -+%define CONFIG_DST_DECODER 0 -+%define CONFIG_EAC3_DECODER 0 -+%define CONFIG_EVRC_DECODER 0 -+%define CONFIG_FASTAUDIO_DECODER 0 -+%define CONFIG_FFWAVESYNTH_DECODER 0 -+%define CONFIG_FLAC_DECODER 1 -+%define CONFIG_G723_1_DECODER 0 -+%define CONFIG_G729_DECODER 0 -+%define CONFIG_GSM_DECODER 0 -+%define CONFIG_GSM_MS_DECODER 0 -+%define CONFIG_HCA_DECODER 0 -+%define CONFIG_HCOM_DECODER 0 -+%define CONFIG_IAC_DECODER 0 -+%define CONFIG_ILBC_DECODER 0 -+%define CONFIG_IMC_DECODER 0 -+%define CONFIG_INTERPLAY_ACM_DECODER 0 -+%define CONFIG_MACE3_DECODER 0 -+%define CONFIG_MACE6_DECODER 0 -+%define CONFIG_METASOUND_DECODER 0 -+%define CONFIG_MLP_DECODER 0 -+%define CONFIG_MP1_DECODER 0 -+%define CONFIG_MP1FLOAT_DECODER 0 -+%define CONFIG_MP2_DECODER 0 -+%define CONFIG_MP2FLOAT_DECODER 0 -+%define CONFIG_MP3FLOAT_DECODER 0 -+%define CONFIG_MP3_DECODER 1 -+%define CONFIG_MP3ADUFLOAT_DECODER 0 -+%define CONFIG_MP3ADU_DECODER 0 -+%define CONFIG_MP3ON4FLOAT_DECODER 0 -+%define CONFIG_MP3ON4_DECODER 0 -+%define CONFIG_MPC7_DECODER 0 -+%define CONFIG_MPC8_DECODER 0 -+%define CONFIG_MSNSIREN_DECODER 0 -+%define CONFIG_NELLYMOSER_DECODER 0 -+%define CONFIG_ON2AVC_DECODER 0 -+%define CONFIG_OPUS_DECODER 0 -+%define CONFIG_PAF_AUDIO_DECODER 0 -+%define CONFIG_QCELP_DECODER 0 -+%define CONFIG_QDM2_DECODER 0 -+%define CONFIG_QDMC_DECODER 0 -+%define CONFIG_RA_144_DECODER 0 -+%define CONFIG_RA_288_DECODER 0 -+%define CONFIG_RALF_DECODER 0 -+%define CONFIG_SBC_DECODER 0 -+%define CONFIG_SHORTEN_DECODER 0 -+%define CONFIG_SIPR_DECODER 0 -+%define CONFIG_SIREN_DECODER 0 -+%define CONFIG_SMACKAUD_DECODER 0 -+%define CONFIG_SONIC_DECODER 0 -+%define CONFIG_TAK_DECODER 0 -+%define CONFIG_TRUEHD_DECODER 0 -+%define CONFIG_TRUESPEECH_DECODER 0 -+%define CONFIG_TTA_DECODER 0 -+%define CONFIG_TWINVQ_DECODER 0 -+%define CONFIG_VMDAUDIO_DECODER 0 -+%define CONFIG_VORBIS_DECODER 1 -+%define CONFIG_WAVPACK_DECODER 0 -+%define CONFIG_WMALOSSLESS_DECODER 0 -+%define CONFIG_WMAPRO_DECODER 0 -+%define CONFIG_WMAV1_DECODER 0 -+%define CONFIG_WMAV2_DECODER 0 -+%define CONFIG_WMAVOICE_DECODER 0 -+%define CONFIG_WS_SND1_DECODER 0 -+%define CONFIG_XMA1_DECODER 0 -+%define CONFIG_XMA2_DECODER 0 -+%define CONFIG_PCM_ALAW_DECODER 1 -+%define CONFIG_PCM_BLURAY_DECODER 0 -+%define CONFIG_PCM_DVD_DECODER 0 -+%define CONFIG_PCM_F16LE_DECODER 0 -+%define CONFIG_PCM_F24LE_DECODER 0 -+%define CONFIG_PCM_F32BE_DECODER 0 -+%define CONFIG_PCM_F32LE_DECODER 1 -+%define CONFIG_PCM_F64BE_DECODER 0 -+%define CONFIG_PCM_F64LE_DECODER 0 -+%define CONFIG_PCM_LXF_DECODER 0 -+%define CONFIG_PCM_MULAW_DECODER 1 -+%define CONFIG_PCM_S8_DECODER 0 -+%define CONFIG_PCM_S8_PLANAR_DECODER 0 -+%define CONFIG_PCM_S16BE_DECODER 1 -+%define CONFIG_PCM_S16BE_PLANAR_DECODER 0 -+%define CONFIG_PCM_S16LE_DECODER 1 -+%define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+%define CONFIG_PCM_S24BE_DECODER 1 -+%define CONFIG_PCM_S24DAUD_DECODER 0 -+%define CONFIG_PCM_S24LE_DECODER 1 -+%define CONFIG_PCM_S24LE_PLANAR_DECODER 0 -+%define CONFIG_PCM_S32BE_DECODER 0 -+%define CONFIG_PCM_S32LE_DECODER 1 -+%define CONFIG_PCM_S32LE_PLANAR_DECODER 0 -+%define CONFIG_PCM_S64BE_DECODER 0 -+%define CONFIG_PCM_S64LE_DECODER 0 -+%define CONFIG_PCM_SGA_DECODER 0 -+%define CONFIG_PCM_U8_DECODER 1 -+%define CONFIG_PCM_U16BE_DECODER 0 -+%define CONFIG_PCM_U16LE_DECODER 0 -+%define CONFIG_PCM_U24BE_DECODER 0 -+%define CONFIG_PCM_U24LE_DECODER 0 -+%define CONFIG_PCM_U32BE_DECODER 0 -+%define CONFIG_PCM_U32LE_DECODER 0 -+%define CONFIG_PCM_VIDC_DECODER 0 -+%define CONFIG_DERF_DPCM_DECODER 0 -+%define CONFIG_GREMLIN_DPCM_DECODER 0 -+%define CONFIG_INTERPLAY_DPCM_DECODER 0 -+%define CONFIG_ROQ_DPCM_DECODER 0 -+%define CONFIG_SDX2_DPCM_DECODER 0 -+%define CONFIG_SOL_DPCM_DECODER 0 -+%define CONFIG_XAN_DPCM_DECODER 0 -+%define CONFIG_ADPCM_4XM_DECODER 0 -+%define CONFIG_ADPCM_ADX_DECODER 0 -+%define CONFIG_ADPCM_AFC_DECODER 0 -+%define CONFIG_ADPCM_AGM_DECODER 0 -+%define CONFIG_ADPCM_AICA_DECODER 0 -+%define CONFIG_ADPCM_ARGO_DECODER 0 -+%define CONFIG_ADPCM_CT_DECODER 0 -+%define CONFIG_ADPCM_DTK_DECODER 0 -+%define CONFIG_ADPCM_EA_DECODER 0 -+%define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+%define CONFIG_ADPCM_EA_R1_DECODER 0 -+%define CONFIG_ADPCM_EA_R2_DECODER 0 -+%define CONFIG_ADPCM_EA_R3_DECODER 0 -+%define CONFIG_ADPCM_EA_XAS_DECODER 0 -+%define CONFIG_ADPCM_G722_DECODER 0 -+%define CONFIG_ADPCM_G726_DECODER 0 -+%define CONFIG_ADPCM_G726LE_DECODER 0 -+%define CONFIG_ADPCM_IMA_ACORN_DECODER 0 -+%define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+%define CONFIG_ADPCM_IMA_ALP_DECODER 0 -+%define CONFIG_ADPCM_IMA_APC_DECODER 0 -+%define CONFIG_ADPCM_IMA_APM_DECODER 0 -+%define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 -+%define CONFIG_ADPCM_IMA_DAT4_DECODER 0 -+%define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+%define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+%define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+%define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+%define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+%define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 -+%define CONFIG_ADPCM_IMA_MTF_DECODER 0 -+%define CONFIG_ADPCM_IMA_OKI_DECODER 0 -+%define CONFIG_ADPCM_IMA_QT_DECODER 0 -+%define CONFIG_ADPCM_IMA_RAD_DECODER 0 -+%define CONFIG_ADPCM_IMA_SSI_DECODER 0 -+%define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+%define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+%define CONFIG_ADPCM_IMA_WS_DECODER 0 -+%define CONFIG_ADPCM_MS_DECODER 0 -+%define CONFIG_ADPCM_MTAF_DECODER 0 -+%define CONFIG_ADPCM_PSX_DECODER 0 -+%define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+%define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+%define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+%define CONFIG_ADPCM_SWF_DECODER 0 -+%define CONFIG_ADPCM_THP_DECODER 0 -+%define CONFIG_ADPCM_THP_LE_DECODER 0 -+%define CONFIG_ADPCM_VIMA_DECODER 0 -+%define CONFIG_ADPCM_XA_DECODER 0 -+%define CONFIG_ADPCM_YAMAHA_DECODER 0 -+%define CONFIG_ADPCM_ZORK_DECODER 0 -+%define CONFIG_SSA_DECODER 0 -+%define CONFIG_ASS_DECODER 0 -+%define CONFIG_CCAPTION_DECODER 0 -+%define CONFIG_DVBSUB_DECODER 0 -+%define CONFIG_DVDSUB_DECODER 0 -+%define CONFIG_JACOSUB_DECODER 0 -+%define CONFIG_MICRODVD_DECODER 0 -+%define CONFIG_MOVTEXT_DECODER 0 -+%define CONFIG_MPL2_DECODER 0 -+%define CONFIG_PGSSUB_DECODER 0 -+%define CONFIG_PJS_DECODER 0 -+%define CONFIG_REALTEXT_DECODER 0 -+%define CONFIG_SAMI_DECODER 0 -+%define CONFIG_SRT_DECODER 0 -+%define CONFIG_STL_DECODER 0 -+%define CONFIG_SUBRIP_DECODER 0 -+%define CONFIG_SUBVIEWER_DECODER 0 -+%define CONFIG_SUBVIEWER1_DECODER 0 -+%define CONFIG_TEXT_DECODER 0 -+%define CONFIG_VPLAYER_DECODER 0 -+%define CONFIG_WEBVTT_DECODER 0 -+%define CONFIG_XSUB_DECODER 0 -+%define CONFIG_AAC_AT_DECODER 0 -+%define CONFIG_AC3_AT_DECODER 0 -+%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 -+%define CONFIG_ALAC_AT_DECODER 0 -+%define CONFIG_AMR_NB_AT_DECODER 0 -+%define CONFIG_EAC3_AT_DECODER 0 -+%define CONFIG_GSM_MS_AT_DECODER 0 -+%define CONFIG_ILBC_AT_DECODER 0 -+%define CONFIG_MP1_AT_DECODER 0 -+%define CONFIG_MP2_AT_DECODER 0 -+%define CONFIG_MP3_AT_DECODER 0 -+%define CONFIG_PCM_ALAW_AT_DECODER 0 -+%define CONFIG_PCM_MULAW_AT_DECODER 0 -+%define CONFIG_QDMC_AT_DECODER 0 -+%define CONFIG_QDM2_AT_DECODER 0 -+%define CONFIG_LIBARIBB24_DECODER 0 -+%define CONFIG_LIBCELT_DECODER 0 -+%define CONFIG_LIBCODEC2_DECODER 0 -+%define CONFIG_LIBDAV1D_DECODER 0 -+%define CONFIG_LIBDAVS2_DECODER 0 -+%define CONFIG_LIBFDK_AAC_DECODER 0 -+%define CONFIG_LIBGSM_DECODER 0 -+%define CONFIG_LIBGSM_MS_DECODER 0 -+%define CONFIG_LIBILBC_DECODER 0 -+%define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+%define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+%define CONFIG_LIBOPENJPEG_DECODER 0 -+%define CONFIG_LIBOPUS_DECODER 1 -+%define CONFIG_LIBRSVG_DECODER 0 -+%define CONFIG_LIBSPEEX_DECODER 0 -+%define CONFIG_LIBUAVS3D_DECODER 0 -+%define CONFIG_LIBVORBIS_DECODER 0 -+%define CONFIG_LIBVPX_VP8_DECODER 0 -+%define CONFIG_LIBVPX_VP9_DECODER 0 -+%define CONFIG_LIBZVBI_TELETEXT_DECODER 0 -+%define CONFIG_BINTEXT_DECODER 0 -+%define CONFIG_XBIN_DECODER 0 -+%define CONFIG_IDF_DECODER 0 -+%define CONFIG_LIBAOM_AV1_DECODER 0 -+%define CONFIG_AV1_DECODER 0 -+%define CONFIG_AV1_CUVID_DECODER 0 -+%define CONFIG_AV1_QSV_DECODER 0 -+%define CONFIG_LIBOPENH264_DECODER 0 -+%define CONFIG_H264_CUVID_DECODER 0 -+%define CONFIG_HEVC_CUVID_DECODER 0 -+%define CONFIG_HEVC_MEDIACODEC_DECODER 0 -+%define CONFIG_MJPEG_CUVID_DECODER 0 -+%define CONFIG_MJPEG_QSV_DECODER 0 -+%define CONFIG_MPEG1_CUVID_DECODER 0 -+%define CONFIG_MPEG2_CUVID_DECODER 0 -+%define CONFIG_MPEG4_CUVID_DECODER 0 -+%define CONFIG_MPEG4_MEDIACODEC_DECODER 0 -+%define CONFIG_VC1_CUVID_DECODER 0 -+%define CONFIG_VP8_CUVID_DECODER 0 -+%define CONFIG_VP8_MEDIACODEC_DECODER 0 -+%define CONFIG_VP8_QSV_DECODER 0 -+%define CONFIG_VP9_CUVID_DECODER 0 -+%define CONFIG_VP9_MEDIACODEC_DECODER 0 -+%define CONFIG_VP9_QSV_DECODER 0 -+%define CONFIG_A64MULTI_ENCODER 0 -+%define CONFIG_A64MULTI5_ENCODER 0 -+%define CONFIG_ALIAS_PIX_ENCODER 0 -+%define CONFIG_AMV_ENCODER 0 -+%define CONFIG_APNG_ENCODER 0 -+%define CONFIG_ASV1_ENCODER 0 -+%define CONFIG_ASV2_ENCODER 0 -+%define CONFIG_AVRP_ENCODER 0 -+%define CONFIG_AVUI_ENCODER 0 -+%define CONFIG_AYUV_ENCODER 0 -+%define CONFIG_BITPACKED_ENCODER 0 -+%define CONFIG_BMP_ENCODER 0 -+%define CONFIG_CFHD_ENCODER 0 -+%define CONFIG_CINEPAK_ENCODER 0 -+%define CONFIG_CLJR_ENCODER 0 -+%define CONFIG_COMFORTNOISE_ENCODER 0 -+%define CONFIG_DNXHD_ENCODER 0 -+%define CONFIG_DPX_ENCODER 0 -+%define CONFIG_DVVIDEO_ENCODER 0 -+%define CONFIG_EXR_ENCODER 0 -+%define CONFIG_FFV1_ENCODER 0 -+%define CONFIG_FFVHUFF_ENCODER 0 -+%define CONFIG_FITS_ENCODER 0 -+%define CONFIG_FLASHSV_ENCODER 0 -+%define CONFIG_FLASHSV2_ENCODER 0 -+%define CONFIG_FLV_ENCODER 0 -+%define CONFIG_GIF_ENCODER 0 -+%define CONFIG_H261_ENCODER 0 -+%define CONFIG_H263_ENCODER 0 -+%define CONFIG_H263P_ENCODER 0 -+%define CONFIG_HAP_ENCODER 0 -+%define CONFIG_HUFFYUV_ENCODER 0 -+%define CONFIG_JPEG2000_ENCODER 0 -+%define CONFIG_JPEGLS_ENCODER 0 -+%define CONFIG_LJPEG_ENCODER 0 -+%define CONFIG_MAGICYUV_ENCODER 0 -+%define CONFIG_MJPEG_ENCODER 0 -+%define CONFIG_MPEG1VIDEO_ENCODER 0 -+%define CONFIG_MPEG2VIDEO_ENCODER 0 -+%define CONFIG_MPEG4_ENCODER 0 -+%define CONFIG_MSMPEG4V2_ENCODER 0 -+%define CONFIG_MSMPEG4V3_ENCODER 0 -+%define CONFIG_MSVIDEO1_ENCODER 0 -+%define CONFIG_PAM_ENCODER 0 -+%define CONFIG_PBM_ENCODER 0 -+%define CONFIG_PCX_ENCODER 0 -+%define CONFIG_PFM_ENCODER 0 -+%define CONFIG_PGM_ENCODER 0 -+%define CONFIG_PGMYUV_ENCODER 0 -+%define CONFIG_PNG_ENCODER 0 -+%define CONFIG_PPM_ENCODER 0 -+%define CONFIG_PRORES_ENCODER 0 -+%define CONFIG_PRORES_AW_ENCODER 0 -+%define CONFIG_PRORES_KS_ENCODER 0 -+%define CONFIG_QTRLE_ENCODER 0 -+%define CONFIG_R10K_ENCODER 0 -+%define CONFIG_R210_ENCODER 0 -+%define CONFIG_RAWVIDEO_ENCODER 0 -+%define CONFIG_ROQ_ENCODER 0 -+%define CONFIG_RPZA_ENCODER 0 -+%define CONFIG_RV10_ENCODER 0 -+%define CONFIG_RV20_ENCODER 0 -+%define CONFIG_S302M_ENCODER 0 -+%define CONFIG_SGI_ENCODER 0 -+%define CONFIG_SMC_ENCODER 0 -+%define CONFIG_SNOW_ENCODER 0 -+%define CONFIG_SPEEDHQ_ENCODER 0 -+%define CONFIG_SUNRAST_ENCODER 0 -+%define CONFIG_SVQ1_ENCODER 0 -+%define CONFIG_TARGA_ENCODER 0 -+%define CONFIG_TIFF_ENCODER 0 -+%define CONFIG_UTVIDEO_ENCODER 0 -+%define CONFIG_V210_ENCODER 0 -+%define CONFIG_V308_ENCODER 0 -+%define CONFIG_V408_ENCODER 0 -+%define CONFIG_V410_ENCODER 0 -+%define CONFIG_VC2_ENCODER 0 -+%define CONFIG_WRAPPED_AVFRAME_ENCODER 0 -+%define CONFIG_WMV1_ENCODER 0 -+%define CONFIG_WMV2_ENCODER 0 -+%define CONFIG_XBM_ENCODER 0 -+%define CONFIG_XFACE_ENCODER 0 -+%define CONFIG_XWD_ENCODER 0 -+%define CONFIG_Y41P_ENCODER 0 -+%define CONFIG_YUV4_ENCODER 0 -+%define CONFIG_ZLIB_ENCODER 0 -+%define CONFIG_ZMBV_ENCODER 0 -+%define CONFIG_AAC_ENCODER 0 -+%define CONFIG_AC3_ENCODER 0 -+%define CONFIG_AC3_FIXED_ENCODER 0 -+%define CONFIG_ALAC_ENCODER 0 -+%define CONFIG_APTX_ENCODER 0 -+%define CONFIG_APTX_HD_ENCODER 0 -+%define CONFIG_DCA_ENCODER 0 -+%define CONFIG_EAC3_ENCODER 0 -+%define CONFIG_FLAC_ENCODER 0 -+%define CONFIG_G723_1_ENCODER 0 -+%define CONFIG_MLP_ENCODER 0 -+%define CONFIG_MP2_ENCODER 0 -+%define CONFIG_MP2FIXED_ENCODER 0 -+%define CONFIG_NELLYMOSER_ENCODER 0 -+%define CONFIG_OPUS_ENCODER 0 -+%define CONFIG_RA_144_ENCODER 0 -+%define CONFIG_SBC_ENCODER 0 -+%define CONFIG_SONIC_ENCODER 0 -+%define CONFIG_SONIC_LS_ENCODER 0 -+%define CONFIG_TRUEHD_ENCODER 0 -+%define CONFIG_TTA_ENCODER 0 -+%define CONFIG_VORBIS_ENCODER 0 -+%define CONFIG_WAVPACK_ENCODER 0 -+%define CONFIG_WMAV1_ENCODER 0 -+%define CONFIG_WMAV2_ENCODER 0 -+%define CONFIG_PCM_ALAW_ENCODER 0 -+%define CONFIG_PCM_DVD_ENCODER 0 -+%define CONFIG_PCM_F32BE_ENCODER 0 -+%define CONFIG_PCM_F32LE_ENCODER 0 -+%define CONFIG_PCM_F64BE_ENCODER 0 -+%define CONFIG_PCM_F64LE_ENCODER 0 -+%define CONFIG_PCM_MULAW_ENCODER 0 -+%define CONFIG_PCM_S8_ENCODER 0 -+%define CONFIG_PCM_S8_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S16BE_ENCODER 0 -+%define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S16LE_ENCODER 0 -+%define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S24BE_ENCODER 0 -+%define CONFIG_PCM_S24DAUD_ENCODER 0 -+%define CONFIG_PCM_S24LE_ENCODER 0 -+%define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S32BE_ENCODER 0 -+%define CONFIG_PCM_S32LE_ENCODER 0 -+%define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S64BE_ENCODER 0 -+%define CONFIG_PCM_S64LE_ENCODER 0 -+%define CONFIG_PCM_U8_ENCODER 0 -+%define CONFIG_PCM_U16BE_ENCODER 0 -+%define CONFIG_PCM_U16LE_ENCODER 0 -+%define CONFIG_PCM_U24BE_ENCODER 0 -+%define CONFIG_PCM_U24LE_ENCODER 0 -+%define CONFIG_PCM_U32BE_ENCODER 0 -+%define CONFIG_PCM_U32LE_ENCODER 0 -+%define CONFIG_PCM_VIDC_ENCODER 0 -+%define CONFIG_ROQ_DPCM_ENCODER 0 -+%define CONFIG_ADPCM_ADX_ENCODER 0 -+%define CONFIG_ADPCM_ARGO_ENCODER 0 -+%define CONFIG_ADPCM_G722_ENCODER 0 -+%define CONFIG_ADPCM_G726_ENCODER 0 -+%define CONFIG_ADPCM_G726LE_ENCODER 0 -+%define CONFIG_ADPCM_IMA_AMV_ENCODER 0 -+%define CONFIG_ADPCM_IMA_ALP_ENCODER 0 -+%define CONFIG_ADPCM_IMA_APM_ENCODER 0 -+%define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+%define CONFIG_ADPCM_IMA_SSI_ENCODER 0 -+%define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+%define CONFIG_ADPCM_IMA_WS_ENCODER 0 -+%define CONFIG_ADPCM_MS_ENCODER 0 -+%define CONFIG_ADPCM_SWF_ENCODER 0 -+%define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+%define CONFIG_SSA_ENCODER 0 -+%define CONFIG_ASS_ENCODER 0 -+%define CONFIG_DVBSUB_ENCODER 0 -+%define CONFIG_DVDSUB_ENCODER 0 -+%define CONFIG_MOVTEXT_ENCODER 0 -+%define CONFIG_SRT_ENCODER 0 -+%define CONFIG_SUBRIP_ENCODER 0 -+%define CONFIG_TEXT_ENCODER 0 -+%define CONFIG_TTML_ENCODER 0 -+%define CONFIG_WEBVTT_ENCODER 0 -+%define CONFIG_XSUB_ENCODER 0 -+%define CONFIG_AAC_AT_ENCODER 0 -+%define CONFIG_ALAC_AT_ENCODER 0 -+%define CONFIG_ILBC_AT_ENCODER 0 -+%define CONFIG_PCM_ALAW_AT_ENCODER 0 -+%define CONFIG_PCM_MULAW_AT_ENCODER 0 -+%define CONFIG_LIBAOM_AV1_ENCODER 0 -+%define CONFIG_LIBCODEC2_ENCODER 0 -+%define CONFIG_LIBFDK_AAC_ENCODER 0 -+%define CONFIG_LIBGSM_ENCODER 0 -+%define CONFIG_LIBGSM_MS_ENCODER 0 -+%define CONFIG_LIBILBC_ENCODER 0 -+%define CONFIG_LIBMP3LAME_ENCODER 0 -+%define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+%define CONFIG_LIBOPENJPEG_ENCODER 0 -+%define CONFIG_LIBOPUS_ENCODER 0 -+%define CONFIG_LIBRAV1E_ENCODER 0 -+%define CONFIG_LIBSHINE_ENCODER 0 -+%define CONFIG_LIBSPEEX_ENCODER 0 -+%define CONFIG_LIBSVTAV1_ENCODER 0 -+%define CONFIG_LIBTHEORA_ENCODER 0 -+%define CONFIG_LIBTWOLAME_ENCODER 0 -+%define CONFIG_LIBVO_AMRWBENC_ENCODER 0 -+%define CONFIG_LIBVORBIS_ENCODER 0 -+%define CONFIG_LIBVPX_VP8_ENCODER 0 -+%define CONFIG_LIBVPX_VP9_ENCODER 0 -+%define CONFIG_LIBWEBP_ANIM_ENCODER 0 -+%define CONFIG_LIBWEBP_ENCODER 0 -+%define CONFIG_LIBX262_ENCODER 0 -+%define CONFIG_LIBX264_ENCODER 0 -+%define CONFIG_LIBX264RGB_ENCODER 0 -+%define CONFIG_LIBX265_ENCODER 0 -+%define CONFIG_LIBXAVS_ENCODER 0 -+%define CONFIG_LIBXAVS2_ENCODER 0 -+%define CONFIG_LIBXVID_ENCODER 0 -+%define CONFIG_AAC_MF_ENCODER 0 -+%define CONFIG_AC3_MF_ENCODER 0 -+%define CONFIG_H263_V4L2M2M_ENCODER 0 -+%define CONFIG_LIBOPENH264_ENCODER 0 -+%define CONFIG_H264_AMF_ENCODER 0 -+%define CONFIG_H264_MF_ENCODER 0 -+%define CONFIG_H264_NVENC_ENCODER 0 -+%define CONFIG_H264_OMX_ENCODER 0 -+%define CONFIG_H264_QSV_ENCODER 0 -+%define CONFIG_H264_V4L2M2M_ENCODER 0 -+%define CONFIG_H264_VAAPI_ENCODER 0 -+%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 -+%define CONFIG_HEVC_AMF_ENCODER 0 -+%define CONFIG_HEVC_MF_ENCODER 0 -+%define CONFIG_HEVC_NVENC_ENCODER 0 -+%define CONFIG_HEVC_QSV_ENCODER 0 -+%define CONFIG_HEVC_V4L2M2M_ENCODER 0 -+%define CONFIG_HEVC_VAAPI_ENCODER 0 -+%define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 -+%define CONFIG_LIBKVAZAAR_ENCODER 0 -+%define CONFIG_MJPEG_QSV_ENCODER 0 -+%define CONFIG_MJPEG_VAAPI_ENCODER 0 -+%define CONFIG_MP3_MF_ENCODER 0 -+%define CONFIG_MPEG2_QSV_ENCODER 0 -+%define CONFIG_MPEG2_VAAPI_ENCODER 0 -+%define CONFIG_MPEG4_OMX_ENCODER 0 -+%define CONFIG_MPEG4_V4L2M2M_ENCODER 0 -+%define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 -+%define CONFIG_VP8_V4L2M2M_ENCODER 0 -+%define CONFIG_VP8_VAAPI_ENCODER 0 -+%define CONFIG_VP9_VAAPI_ENCODER 0 -+%define CONFIG_VP9_QSV_ENCODER 0 -+%define CONFIG_AV1_D3D11VA_HWACCEL 0 -+%define CONFIG_AV1_D3D11VA2_HWACCEL 0 -+%define CONFIG_AV1_DXVA2_HWACCEL 0 -+%define CONFIG_AV1_NVDEC_HWACCEL 0 -+%define CONFIG_AV1_VAAPI_HWACCEL 0 -+%define CONFIG_H263_VAAPI_HWACCEL 0 -+%define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_H264_D3D11VA_HWACCEL 0 -+%define CONFIG_H264_D3D11VA2_HWACCEL 0 -+%define CONFIG_H264_DXVA2_HWACCEL 0 -+%define CONFIG_H264_NVDEC_HWACCEL 0 -+%define CONFIG_H264_VAAPI_HWACCEL 0 -+%define CONFIG_H264_VDPAU_HWACCEL 0 -+%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_HEVC_D3D11VA_HWACCEL 0 -+%define CONFIG_HEVC_D3D11VA2_HWACCEL 0 -+%define CONFIG_HEVC_DXVA2_HWACCEL 0 -+%define CONFIG_HEVC_NVDEC_HWACCEL 0 -+%define CONFIG_HEVC_VAAPI_HWACCEL 0 -+%define CONFIG_HEVC_VDPAU_HWACCEL 0 -+%define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_MJPEG_NVDEC_HWACCEL 0 -+%define CONFIG_MJPEG_VAAPI_HWACCEL 0 -+%define CONFIG_MPEG1_NVDEC_HWACCEL 0 -+%define CONFIG_MPEG1_VDPAU_HWACCEL 0 -+%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_MPEG1_XVMC_HWACCEL 0 -+%define CONFIG_MPEG2_D3D11VA_HWACCEL 0 -+%define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 -+%define CONFIG_MPEG2_NVDEC_HWACCEL 0 -+%define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+%define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+%define CONFIG_MPEG2_VDPAU_HWACCEL 0 -+%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_MPEG2_XVMC_HWACCEL 0 -+%define CONFIG_MPEG4_NVDEC_HWACCEL 0 -+%define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+%define CONFIG_MPEG4_VDPAU_HWACCEL 0 -+%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_VC1_D3D11VA_HWACCEL 0 -+%define CONFIG_VC1_D3D11VA2_HWACCEL 0 -+%define CONFIG_VC1_DXVA2_HWACCEL 0 -+%define CONFIG_VC1_NVDEC_HWACCEL 0 -+%define CONFIG_VC1_VAAPI_HWACCEL 0 -+%define CONFIG_VC1_VDPAU_HWACCEL 0 -+%define CONFIG_VP8_NVDEC_HWACCEL 0 -+%define CONFIG_VP8_VAAPI_HWACCEL 0 -+%define CONFIG_VP9_D3D11VA_HWACCEL 0 -+%define CONFIG_VP9_D3D11VA2_HWACCEL 0 -+%define CONFIG_VP9_DXVA2_HWACCEL 0 -+%define CONFIG_VP9_NVDEC_HWACCEL 0 -+%define CONFIG_VP9_VAAPI_HWACCEL 0 -+%define CONFIG_VP9_VDPAU_HWACCEL 0 -+%define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_WMV3_D3D11VA_HWACCEL 0 -+%define CONFIG_WMV3_D3D11VA2_HWACCEL 0 -+%define CONFIG_WMV3_DXVA2_HWACCEL 0 -+%define CONFIG_WMV3_NVDEC_HWACCEL 0 -+%define CONFIG_WMV3_VAAPI_HWACCEL 0 -+%define CONFIG_WMV3_VDPAU_HWACCEL 0 -+%define CONFIG_AAC_PARSER 1 -+%define CONFIG_AAC_LATM_PARSER 0 -+%define CONFIG_AC3_PARSER 0 -+%define CONFIG_ADX_PARSER 0 -+%define CONFIG_AMR_PARSER 0 -+%define CONFIG_AV1_PARSER 0 -+%define CONFIG_AVS2_PARSER 0 -+%define CONFIG_AVS3_PARSER 0 -+%define CONFIG_BMP_PARSER 0 -+%define CONFIG_CAVSVIDEO_PARSER 0 -+%define CONFIG_COOK_PARSER 0 -+%define CONFIG_CRI_PARSER 0 -+%define CONFIG_DCA_PARSER 0 -+%define CONFIG_DIRAC_PARSER 0 -+%define CONFIG_DNXHD_PARSER 0 -+%define CONFIG_DOLBY_E_PARSER 0 -+%define CONFIG_DPX_PARSER 0 -+%define CONFIG_DVAUDIO_PARSER 0 -+%define CONFIG_DVBSUB_PARSER 0 -+%define CONFIG_DVDSUB_PARSER 0 -+%define CONFIG_DVD_NAV_PARSER 0 -+%define CONFIG_FLAC_PARSER 1 -+%define CONFIG_G723_1_PARSER 0 -+%define CONFIG_G729_PARSER 0 -+%define CONFIG_GIF_PARSER 0 -+%define CONFIG_GSM_PARSER 0 -+%define CONFIG_H261_PARSER 0 -+%define CONFIG_H263_PARSER 0 -+%define CONFIG_H264_PARSER 1 -+%define CONFIG_HEVC_PARSER 0 -+%define CONFIG_IPU_PARSER 0 -+%define CONFIG_JPEG2000_PARSER 0 -+%define CONFIG_MJPEG_PARSER 0 -+%define CONFIG_MLP_PARSER 0 -+%define CONFIG_MPEG4VIDEO_PARSER 0 -+%define CONFIG_MPEGAUDIO_PARSER 1 -+%define CONFIG_MPEGVIDEO_PARSER 0 -+%define CONFIG_OPUS_PARSER 1 -+%define CONFIG_PNG_PARSER 0 -+%define CONFIG_PNM_PARSER 0 -+%define CONFIG_RV30_PARSER 0 -+%define CONFIG_RV40_PARSER 0 -+%define CONFIG_SBC_PARSER 0 -+%define CONFIG_SIPR_PARSER 0 -+%define CONFIG_TAK_PARSER 0 -+%define CONFIG_VC1_PARSER 0 -+%define CONFIG_VORBIS_PARSER 1 -+%define CONFIG_VP3_PARSER 1 -+%define CONFIG_VP8_PARSER 1 -+%define CONFIG_VP9_PARSER 1 -+%define CONFIG_WEBP_PARSER 0 -+%define CONFIG_XBM_PARSER 0 -+%define CONFIG_XMA_PARSER 0 -+%define CONFIG_ALSA_INDEV 0 -+%define CONFIG_ANDROID_CAMERA_INDEV 0 -+%define CONFIG_AVFOUNDATION_INDEV 0 -+%define CONFIG_BKTR_INDEV 0 -+%define CONFIG_DECKLINK_INDEV 0 -+%define CONFIG_DSHOW_INDEV 0 -+%define CONFIG_FBDEV_INDEV 0 -+%define CONFIG_GDIGRAB_INDEV 0 -+%define CONFIG_IEC61883_INDEV 0 -+%define CONFIG_JACK_INDEV 0 -+%define CONFIG_KMSGRAB_INDEV 0 -+%define CONFIG_LAVFI_INDEV 0 -+%define CONFIG_OPENAL_INDEV 0 -+%define CONFIG_OSS_INDEV 0 -+%define CONFIG_PULSE_INDEV 0 -+%define CONFIG_SNDIO_INDEV 0 -+%define CONFIG_V4L2_INDEV 0 -+%define CONFIG_VFWCAP_INDEV 0 -+%define CONFIG_XCBGRAB_INDEV 0 -+%define CONFIG_LIBCDIO_INDEV 0 -+%define CONFIG_LIBDC1394_INDEV 0 -+%define CONFIG_ALSA_OUTDEV 0 -+%define CONFIG_AUDIOTOOLBOX_OUTDEV 0 -+%define CONFIG_CACA_OUTDEV 0 -+%define CONFIG_DECKLINK_OUTDEV 0 -+%define CONFIG_FBDEV_OUTDEV 0 -+%define CONFIG_OPENGL_OUTDEV 0 -+%define CONFIG_OSS_OUTDEV 0 -+%define CONFIG_PULSE_OUTDEV 0 -+%define CONFIG_SDL2_OUTDEV 0 -+%define CONFIG_SNDIO_OUTDEV 0 -+%define CONFIG_V4L2_OUTDEV 0 -+%define CONFIG_XV_OUTDEV 0 -+%define CONFIG_ABENCH_FILTER 0 -+%define CONFIG_ACOMPRESSOR_FILTER 0 -+%define CONFIG_ACONTRAST_FILTER 0 -+%define CONFIG_ACOPY_FILTER 0 -+%define CONFIG_ACUE_FILTER 0 -+%define CONFIG_ACROSSFADE_FILTER 0 -+%define CONFIG_ACROSSOVER_FILTER 0 -+%define CONFIG_ACRUSHER_FILTER 0 -+%define CONFIG_ADECLICK_FILTER 0 -+%define CONFIG_ADECLIP_FILTER 0 -+%define CONFIG_ADECORRELATE_FILTER 0 -+%define CONFIG_ADELAY_FILTER 0 -+%define CONFIG_ADENORM_FILTER 0 -+%define CONFIG_ADERIVATIVE_FILTER 0 -+%define CONFIG_ADYNAMICEQUALIZER_FILTER 0 -+%define CONFIG_ADYNAMICSMOOTH_FILTER 0 -+%define CONFIG_AECHO_FILTER 0 -+%define CONFIG_AEMPHASIS_FILTER 0 -+%define CONFIG_AEVAL_FILTER 0 -+%define CONFIG_AEXCITER_FILTER 0 -+%define CONFIG_AFADE_FILTER 0 -+%define CONFIG_AFFTDN_FILTER 0 -+%define CONFIG_AFFTFILT_FILTER 0 -+%define CONFIG_AFIR_FILTER 0 -+%define CONFIG_AFORMAT_FILTER 0 -+%define CONFIG_AFREQSHIFT_FILTER 0 -+%define CONFIG_AFWTDN_FILTER 0 -+%define CONFIG_AGATE_FILTER 0 -+%define CONFIG_AIIR_FILTER 0 -+%define CONFIG_AINTEGRAL_FILTER 0 -+%define CONFIG_AINTERLEAVE_FILTER 0 -+%define CONFIG_ALATENCY_FILTER 0 -+%define CONFIG_ALIMITER_FILTER 0 -+%define CONFIG_ALLPASS_FILTER 0 -+%define CONFIG_ALOOP_FILTER 0 -+%define CONFIG_AMERGE_FILTER 0 -+%define CONFIG_AMETADATA_FILTER 0 -+%define CONFIG_AMIX_FILTER 0 -+%define CONFIG_AMULTIPLY_FILTER 0 -+%define CONFIG_ANEQUALIZER_FILTER 0 -+%define CONFIG_ANLMDN_FILTER 0 -+%define CONFIG_ANLMF_FILTER 0 -+%define CONFIG_ANLMS_FILTER 0 -+%define CONFIG_ANULL_FILTER 0 -+%define CONFIG_APAD_FILTER 0 -+%define CONFIG_APERMS_FILTER 0 -+%define CONFIG_APHASER_FILTER 0 -+%define CONFIG_APHASESHIFT_FILTER 0 -+%define CONFIG_APSYCLIP_FILTER 0 -+%define CONFIG_APULSATOR_FILTER 0 -+%define CONFIG_AREALTIME_FILTER 0 -+%define CONFIG_ARESAMPLE_FILTER 0 -+%define CONFIG_AREVERSE_FILTER 0 -+%define CONFIG_ARNNDN_FILTER 0 -+%define CONFIG_ASDR_FILTER 0 -+%define CONFIG_ASEGMENT_FILTER 0 -+%define CONFIG_ASELECT_FILTER 0 -+%define CONFIG_ASENDCMD_FILTER 0 -+%define CONFIG_ASETNSAMPLES_FILTER 0 -+%define CONFIG_ASETPTS_FILTER 0 -+%define CONFIG_ASETRATE_FILTER 0 -+%define CONFIG_ASETTB_FILTER 0 -+%define CONFIG_ASHOWINFO_FILTER 0 -+%define CONFIG_ASIDEDATA_FILTER 0 -+%define CONFIG_ASOFTCLIP_FILTER 0 -+%define CONFIG_ASPECTRALSTATS_FILTER 0 -+%define CONFIG_ASPLIT_FILTER 0 -+%define CONFIG_ASR_FILTER 0 -+%define CONFIG_ASTATS_FILTER 0 -+%define CONFIG_ASTREAMSELECT_FILTER 0 -+%define CONFIG_ASUBBOOST_FILTER 0 -+%define CONFIG_ASUBCUT_FILTER 0 -+%define CONFIG_ASUPERCUT_FILTER 0 -+%define CONFIG_ASUPERPASS_FILTER 0 -+%define CONFIG_ASUPERSTOP_FILTER 0 -+%define CONFIG_ATEMPO_FILTER 0 -+%define CONFIG_ATILT_FILTER 0 -+%define CONFIG_ATRIM_FILTER 0 -+%define CONFIG_AXCORRELATE_FILTER 0 -+%define CONFIG_AZMQ_FILTER 0 -+%define CONFIG_BANDPASS_FILTER 0 -+%define CONFIG_BANDREJECT_FILTER 0 -+%define CONFIG_BASS_FILTER 0 -+%define CONFIG_BIQUAD_FILTER 0 -+%define CONFIG_BS2B_FILTER 0 -+%define CONFIG_CHANNELMAP_FILTER 0 -+%define CONFIG_CHANNELSPLIT_FILTER 0 -+%define CONFIG_CHORUS_FILTER 0 -+%define CONFIG_COMPAND_FILTER 0 -+%define CONFIG_COMPENSATIONDELAY_FILTER 0 -+%define CONFIG_CROSSFEED_FILTER 0 -+%define CONFIG_CRYSTALIZER_FILTER 0 -+%define CONFIG_DCSHIFT_FILTER 0 -+%define CONFIG_DEESSER_FILTER 0 -+%define CONFIG_DRMETER_FILTER 0 -+%define CONFIG_DYNAUDNORM_FILTER 0 -+%define CONFIG_EARWAX_FILTER 0 -+%define CONFIG_EBUR128_FILTER 0 -+%define CONFIG_EQUALIZER_FILTER 0 -+%define CONFIG_EXTRASTEREO_FILTER 0 -+%define CONFIG_FIREQUALIZER_FILTER 0 -+%define CONFIG_FLANGER_FILTER 0 -+%define CONFIG_HAAS_FILTER 0 -+%define CONFIG_HDCD_FILTER 0 -+%define CONFIG_HEADPHONE_FILTER 0 -+%define CONFIG_HIGHPASS_FILTER 0 -+%define CONFIG_HIGHSHELF_FILTER 0 -+%define CONFIG_JOIN_FILTER 0 -+%define CONFIG_LADSPA_FILTER 0 -+%define CONFIG_LOUDNORM_FILTER 0 -+%define CONFIG_LOWPASS_FILTER 0 -+%define CONFIG_LOWSHELF_FILTER 0 -+%define CONFIG_LV2_FILTER 0 -+%define CONFIG_MCOMPAND_FILTER 0 -+%define CONFIG_PAN_FILTER 0 -+%define CONFIG_REPLAYGAIN_FILTER 0 -+%define CONFIG_RUBBERBAND_FILTER 0 -+%define CONFIG_SIDECHAINCOMPRESS_FILTER 0 -+%define CONFIG_SIDECHAINGATE_FILTER 0 -+%define CONFIG_SILENCEDETECT_FILTER 0 -+%define CONFIG_SILENCEREMOVE_FILTER 0 -+%define CONFIG_SOFALIZER_FILTER 0 -+%define CONFIG_SPEECHNORM_FILTER 0 -+%define CONFIG_STEREOTOOLS_FILTER 0 -+%define CONFIG_STEREOWIDEN_FILTER 0 -+%define CONFIG_SUPEREQUALIZER_FILTER 0 -+%define CONFIG_SURROUND_FILTER 0 -+%define CONFIG_TREBLE_FILTER 0 -+%define CONFIG_TREMOLO_FILTER 0 -+%define CONFIG_VIBRATO_FILTER 0 -+%define CONFIG_VOLUME_FILTER 0 -+%define CONFIG_VOLUMEDETECT_FILTER 0 -+%define CONFIG_AEVALSRC_FILTER 0 -+%define CONFIG_AFIRSRC_FILTER 0 -+%define CONFIG_ANOISESRC_FILTER 0 -+%define CONFIG_ANULLSRC_FILTER 0 -+%define CONFIG_FLITE_FILTER 0 -+%define CONFIG_HILBERT_FILTER 0 -+%define CONFIG_SINC_FILTER 0 -+%define CONFIG_SINE_FILTER 0 -+%define CONFIG_ANULLSINK_FILTER 0 -+%define CONFIG_ADDROI_FILTER 0 -+%define CONFIG_ALPHAEXTRACT_FILTER 0 -+%define CONFIG_ALPHAMERGE_FILTER 0 -+%define CONFIG_AMPLIFY_FILTER 0 -+%define CONFIG_ASS_FILTER 0 -+%define CONFIG_ATADENOISE_FILTER 0 -+%define CONFIG_AVGBLUR_FILTER 0 -+%define CONFIG_AVGBLUR_OPENCL_FILTER 0 -+%define CONFIG_AVGBLUR_VULKAN_FILTER 0 -+%define CONFIG_BBOX_FILTER 0 -+%define CONFIG_BENCH_FILTER 0 -+%define CONFIG_BILATERAL_FILTER 0 -+%define CONFIG_BITPLANENOISE_FILTER 0 -+%define CONFIG_BLACKDETECT_FILTER 0 -+%define CONFIG_BLACKFRAME_FILTER 0 -+%define CONFIG_BLEND_FILTER 0 -+%define CONFIG_BLEND_VULKAN_FILTER 0 -+%define CONFIG_BM3D_FILTER 0 -+%define CONFIG_BOXBLUR_FILTER 0 -+%define CONFIG_BOXBLUR_OPENCL_FILTER 0 -+%define CONFIG_BWDIF_FILTER 0 -+%define CONFIG_CAS_FILTER 0 -+%define CONFIG_CHROMABER_VULKAN_FILTER 0 -+%define CONFIG_CHROMAHOLD_FILTER 0 -+%define CONFIG_CHROMAKEY_FILTER 0 -+%define CONFIG_CHROMANR_FILTER 0 -+%define CONFIG_CHROMASHIFT_FILTER 0 -+%define CONFIG_CIESCOPE_FILTER 0 -+%define CONFIG_CODECVIEW_FILTER 0 -+%define CONFIG_COLORBALANCE_FILTER 0 -+%define CONFIG_COLORCHANNELMIXER_FILTER 0 -+%define CONFIG_COLORCONTRAST_FILTER 0 -+%define CONFIG_COLORCORRECT_FILTER 0 -+%define CONFIG_COLORIZE_FILTER 0 -+%define CONFIG_COLORKEY_FILTER 0 -+%define CONFIG_COLORKEY_OPENCL_FILTER 0 -+%define CONFIG_COLORHOLD_FILTER 0 -+%define CONFIG_COLORLEVELS_FILTER 0 -+%define CONFIG_COLORMATRIX_FILTER 0 -+%define CONFIG_COLORSPACE_FILTER 0 -+%define CONFIG_COLORTEMPERATURE_FILTER 0 -+%define CONFIG_CONVOLUTION_FILTER 0 -+%define CONFIG_CONVOLUTION_OPENCL_FILTER 0 -+%define CONFIG_CONVOLVE_FILTER 0 -+%define CONFIG_COPY_FILTER 0 -+%define CONFIG_COREIMAGE_FILTER 0 -+%define CONFIG_COVER_RECT_FILTER 0 -+%define CONFIG_CROP_FILTER 0 -+%define CONFIG_CROPDETECT_FILTER 0 -+%define CONFIG_CUE_FILTER 0 -+%define CONFIG_CURVES_FILTER 0 -+%define CONFIG_DATASCOPE_FILTER 0 -+%define CONFIG_DBLUR_FILTER 0 -+%define CONFIG_DCTDNOIZ_FILTER 0 -+%define CONFIG_DEBAND_FILTER 0 -+%define CONFIG_DEBLOCK_FILTER 0 -+%define CONFIG_DECIMATE_FILTER 0 -+%define CONFIG_DECONVOLVE_FILTER 0 -+%define CONFIG_DEDOT_FILTER 0 -+%define CONFIG_DEFLATE_FILTER 0 -+%define CONFIG_DEFLICKER_FILTER 0 -+%define CONFIG_DEINTERLACE_QSV_FILTER 0 -+%define CONFIG_DEINTERLACE_VAAPI_FILTER 0 -+%define CONFIG_DEJUDDER_FILTER 0 -+%define CONFIG_DELOGO_FILTER 0 -+%define CONFIG_DENOISE_VAAPI_FILTER 0 -+%define CONFIG_DERAIN_FILTER 0 -+%define CONFIG_DESHAKE_FILTER 0 -+%define CONFIG_DESHAKE_OPENCL_FILTER 0 -+%define CONFIG_DESPILL_FILTER 0 -+%define CONFIG_DETELECINE_FILTER 0 -+%define CONFIG_DILATION_FILTER 0 -+%define CONFIG_DILATION_OPENCL_FILTER 0 -+%define CONFIG_DISPLACE_FILTER 0 -+%define CONFIG_DNN_CLASSIFY_FILTER 0 -+%define CONFIG_DNN_DETECT_FILTER 0 -+%define CONFIG_DNN_PROCESSING_FILTER 0 -+%define CONFIG_DOUBLEWEAVE_FILTER 0 -+%define CONFIG_DRAWBOX_FILTER 0 -+%define CONFIG_DRAWGRAPH_FILTER 0 -+%define CONFIG_DRAWGRID_FILTER 0 -+%define CONFIG_DRAWTEXT_FILTER 0 -+%define CONFIG_EDGEDETECT_FILTER 0 -+%define CONFIG_ELBG_FILTER 0 -+%define CONFIG_ENTROPY_FILTER 0 -+%define CONFIG_EPX_FILTER 0 -+%define CONFIG_EQ_FILTER 0 -+%define CONFIG_EROSION_FILTER 0 -+%define CONFIG_EROSION_OPENCL_FILTER 0 -+%define CONFIG_ESTDIF_FILTER 0 -+%define CONFIG_EXPOSURE_FILTER 0 -+%define CONFIG_EXTRACTPLANES_FILTER 0 -+%define CONFIG_FADE_FILTER 0 -+%define CONFIG_FFTDNOIZ_FILTER 0 -+%define CONFIG_FFTFILT_FILTER 0 -+%define CONFIG_FIELD_FILTER 0 -+%define CONFIG_FIELDHINT_FILTER 0 -+%define CONFIG_FIELDMATCH_FILTER 0 -+%define CONFIG_FIELDORDER_FILTER 0 -+%define CONFIG_FILLBORDERS_FILTER 0 -+%define CONFIG_FIND_RECT_FILTER 0 -+%define CONFIG_FLIP_VULKAN_FILTER 0 -+%define CONFIG_FLOODFILL_FILTER 0 -+%define CONFIG_FORMAT_FILTER 0 -+%define CONFIG_FPS_FILTER 0 -+%define CONFIG_FRAMEPACK_FILTER 0 -+%define CONFIG_FRAMERATE_FILTER 0 -+%define CONFIG_FRAMESTEP_FILTER 0 -+%define CONFIG_FREEZEDETECT_FILTER 0 -+%define CONFIG_FREEZEFRAMES_FILTER 0 -+%define CONFIG_FREI0R_FILTER 0 -+%define CONFIG_FSPP_FILTER 0 -+%define CONFIG_GBLUR_FILTER 0 -+%define CONFIG_GBLUR_VULKAN_FILTER 0 -+%define CONFIG_GEQ_FILTER 0 -+%define CONFIG_GRADFUN_FILTER 0 -+%define CONFIG_GRAPHMONITOR_FILTER 0 -+%define CONFIG_GRAYWORLD_FILTER 0 -+%define CONFIG_GREYEDGE_FILTER 0 -+%define CONFIG_GUIDED_FILTER 0 -+%define CONFIG_HALDCLUT_FILTER 0 -+%define CONFIG_HFLIP_FILTER 0 -+%define CONFIG_HFLIP_VULKAN_FILTER 0 -+%define CONFIG_HISTEQ_FILTER 0 -+%define CONFIG_HISTOGRAM_FILTER 0 -+%define CONFIG_HQDN3D_FILTER 0 -+%define CONFIG_HQX_FILTER 0 -+%define CONFIG_HSTACK_FILTER 0 -+%define CONFIG_HSVHOLD_FILTER 0 -+%define CONFIG_HSVKEY_FILTER 0 -+%define CONFIG_HUE_FILTER 0 -+%define CONFIG_HUESATURATION_FILTER 0 -+%define CONFIG_HWDOWNLOAD_FILTER 0 -+%define CONFIG_HWMAP_FILTER 0 -+%define CONFIG_HWUPLOAD_FILTER 0 -+%define CONFIG_HWUPLOAD_CUDA_FILTER 0 -+%define CONFIG_HYSTERESIS_FILTER 0 -+%define CONFIG_IDENTITY_FILTER 0 -+%define CONFIG_IDET_FILTER 0 -+%define CONFIG_IL_FILTER 0 -+%define CONFIG_INFLATE_FILTER 0 -+%define CONFIG_INTERLACE_FILTER 0 -+%define CONFIG_INTERLEAVE_FILTER 0 -+%define CONFIG_KERNDEINT_FILTER 0 -+%define CONFIG_KIRSCH_FILTER 0 -+%define CONFIG_LAGFUN_FILTER 0 -+%define CONFIG_LATENCY_FILTER 0 -+%define CONFIG_LENSCORRECTION_FILTER 0 -+%define CONFIG_LENSFUN_FILTER 0 -+%define CONFIG_LIBPLACEBO_FILTER 0 -+%define CONFIG_LIBVMAF_FILTER 0 -+%define CONFIG_LIMITDIFF_FILTER 0 -+%define CONFIG_LIMITER_FILTER 0 -+%define CONFIG_LOOP_FILTER 0 -+%define CONFIG_LUMAKEY_FILTER 0 -+%define CONFIG_LUT_FILTER 0 -+%define CONFIG_LUT1D_FILTER 0 -+%define CONFIG_LUT2_FILTER 0 -+%define CONFIG_LUT3D_FILTER 0 -+%define CONFIG_LUTRGB_FILTER 0 -+%define CONFIG_LUTYUV_FILTER 0 -+%define CONFIG_MASKEDCLAMP_FILTER 0 -+%define CONFIG_MASKEDMAX_FILTER 0 -+%define CONFIG_MASKEDMERGE_FILTER 0 -+%define CONFIG_MASKEDMIN_FILTER 0 -+%define CONFIG_MASKEDTHRESHOLD_FILTER 0 -+%define CONFIG_MASKFUN_FILTER 0 -+%define CONFIG_MCDEINT_FILTER 0 -+%define CONFIG_MEDIAN_FILTER 0 -+%define CONFIG_MERGEPLANES_FILTER 0 -+%define CONFIG_MESTIMATE_FILTER 0 -+%define CONFIG_METADATA_FILTER 0 -+%define CONFIG_MIDEQUALIZER_FILTER 0 -+%define CONFIG_MINTERPOLATE_FILTER 0 -+%define CONFIG_MIX_FILTER 0 -+%define CONFIG_MONOCHROME_FILTER 0 -+%define CONFIG_MORPHO_FILTER 0 -+%define CONFIG_MPDECIMATE_FILTER 0 -+%define CONFIG_MSAD_FILTER 0 -+%define CONFIG_NEGATE_FILTER 0 -+%define CONFIG_NLMEANS_FILTER 0 -+%define CONFIG_NLMEANS_OPENCL_FILTER 0 -+%define CONFIG_NNEDI_FILTER 0 -+%define CONFIG_NOFORMAT_FILTER 0 -+%define CONFIG_NOISE_FILTER 0 -+%define CONFIG_NORMALIZE_FILTER 0 -+%define CONFIG_NULL_FILTER 0 -+%define CONFIG_OCR_FILTER 0 -+%define CONFIG_OCV_FILTER 0 -+%define CONFIG_OSCILLOSCOPE_FILTER 0 -+%define CONFIG_OVERLAY_FILTER 0 -+%define CONFIG_OVERLAY_OPENCL_FILTER 0 -+%define CONFIG_OVERLAY_QSV_FILTER 0 -+%define CONFIG_OVERLAY_VAAPI_FILTER 0 -+%define CONFIG_OVERLAY_VULKAN_FILTER 0 -+%define CONFIG_OVERLAY_CUDA_FILTER 0 -+%define CONFIG_OWDENOISE_FILTER 0 -+%define CONFIG_PAD_FILTER 0 -+%define CONFIG_PAD_OPENCL_FILTER 0 -+%define CONFIG_PALETTEGEN_FILTER 0 -+%define CONFIG_PALETTEUSE_FILTER 0 -+%define CONFIG_PERMS_FILTER 0 -+%define CONFIG_PERSPECTIVE_FILTER 0 -+%define CONFIG_PHASE_FILTER 0 -+%define CONFIG_PHOTOSENSITIVITY_FILTER 0 -+%define CONFIG_PIXDESCTEST_FILTER 0 -+%define CONFIG_PIXSCOPE_FILTER 0 -+%define CONFIG_PP_FILTER 0 -+%define CONFIG_PP7_FILTER 0 -+%define CONFIG_PREMULTIPLY_FILTER 0 -+%define CONFIG_PREWITT_FILTER 0 -+%define CONFIG_PREWITT_OPENCL_FILTER 0 -+%define CONFIG_PROCAMP_VAAPI_FILTER 0 -+%define CONFIG_PROGRAM_OPENCL_FILTER 0 -+%define CONFIG_PSEUDOCOLOR_FILTER 0 -+%define CONFIG_PSNR_FILTER 0 -+%define CONFIG_PULLUP_FILTER 0 -+%define CONFIG_QP_FILTER 0 -+%define CONFIG_RANDOM_FILTER 0 -+%define CONFIG_READEIA608_FILTER 0 -+%define CONFIG_READVITC_FILTER 0 -+%define CONFIG_REALTIME_FILTER 0 -+%define CONFIG_REMAP_FILTER 0 -+%define CONFIG_REMOVEGRAIN_FILTER 0 -+%define CONFIG_REMOVELOGO_FILTER 0 -+%define CONFIG_REPEATFIELDS_FILTER 0 -+%define CONFIG_REVERSE_FILTER 0 -+%define CONFIG_RGBASHIFT_FILTER 0 -+%define CONFIG_ROBERTS_FILTER 0 -+%define CONFIG_ROBERTS_OPENCL_FILTER 0 -+%define CONFIG_ROTATE_FILTER 0 -+%define CONFIG_SAB_FILTER 0 -+%define CONFIG_SCALE_FILTER 0 -+%define CONFIG_SCALE_CUDA_FILTER 0 -+%define CONFIG_SCALE_NPP_FILTER 0 -+%define CONFIG_SCALE_QSV_FILTER 0 -+%define CONFIG_SCALE_VAAPI_FILTER 0 -+%define CONFIG_SCALE_VULKAN_FILTER 0 -+%define CONFIG_SCALE2REF_FILTER 0 -+%define CONFIG_SCALE2REF_NPP_FILTER 0 -+%define CONFIG_SCDET_FILTER 0 -+%define CONFIG_SCHARR_FILTER 0 -+%define CONFIG_SCROLL_FILTER 0 -+%define CONFIG_SEGMENT_FILTER 0 -+%define CONFIG_SELECT_FILTER 0 -+%define CONFIG_SELECTIVECOLOR_FILTER 0 -+%define CONFIG_SENDCMD_FILTER 0 -+%define CONFIG_SEPARATEFIELDS_FILTER 0 -+%define CONFIG_SETDAR_FILTER 0 -+%define CONFIG_SETFIELD_FILTER 0 -+%define CONFIG_SETPARAMS_FILTER 0 -+%define CONFIG_SETPTS_FILTER 0 -+%define CONFIG_SETRANGE_FILTER 0 -+%define CONFIG_SETSAR_FILTER 0 -+%define CONFIG_SETTB_FILTER 0 -+%define CONFIG_SHARPEN_NPP_FILTER 0 -+%define CONFIG_SHARPNESS_VAAPI_FILTER 0 -+%define CONFIG_SHEAR_FILTER 0 -+%define CONFIG_SHOWINFO_FILTER 0 -+%define CONFIG_SHOWPALETTE_FILTER 0 -+%define CONFIG_SHUFFLEFRAMES_FILTER 0 -+%define CONFIG_SHUFFLEPIXELS_FILTER 0 -+%define CONFIG_SHUFFLEPLANES_FILTER 0 -+%define CONFIG_SIDEDATA_FILTER 0 -+%define CONFIG_SIGNALSTATS_FILTER 0 -+%define CONFIG_SIGNATURE_FILTER 0 -+%define CONFIG_SMARTBLUR_FILTER 0 -+%define CONFIG_SOBEL_FILTER 0 -+%define CONFIG_SOBEL_OPENCL_FILTER 0 -+%define CONFIG_SPLIT_FILTER 0 -+%define CONFIG_SPP_FILTER 0 -+%define CONFIG_SR_FILTER 0 -+%define CONFIG_SSIM_FILTER 0 -+%define CONFIG_STEREO3D_FILTER 0 -+%define CONFIG_STREAMSELECT_FILTER 0 -+%define CONFIG_SUBTITLES_FILTER 0 -+%define CONFIG_SUPER2XSAI_FILTER 0 -+%define CONFIG_SWAPRECT_FILTER 0 -+%define CONFIG_SWAPUV_FILTER 0 -+%define CONFIG_TBLEND_FILTER 0 -+%define CONFIG_TELECINE_FILTER 0 -+%define CONFIG_THISTOGRAM_FILTER 0 -+%define CONFIG_THRESHOLD_FILTER 0 -+%define CONFIG_THUMBNAIL_FILTER 0 -+%define CONFIG_THUMBNAIL_CUDA_FILTER 0 -+%define CONFIG_TILE_FILTER 0 -+%define CONFIG_TINTERLACE_FILTER 0 -+%define CONFIG_TLUT2_FILTER 0 -+%define CONFIG_TMEDIAN_FILTER 0 -+%define CONFIG_TMIDEQUALIZER_FILTER 0 -+%define CONFIG_TMIX_FILTER 0 -+%define CONFIG_TONEMAP_FILTER 0 -+%define CONFIG_TONEMAP_OPENCL_FILTER 0 -+%define CONFIG_TONEMAP_VAAPI_FILTER 0 -+%define CONFIG_TPAD_FILTER 0 -+%define CONFIG_TRANSPOSE_FILTER 0 -+%define CONFIG_TRANSPOSE_NPP_FILTER 0 -+%define CONFIG_TRANSPOSE_OPENCL_FILTER 0 -+%define CONFIG_TRANSPOSE_VAAPI_FILTER 0 -+%define CONFIG_TRANSPOSE_VULKAN_FILTER 0 -+%define CONFIG_TRIM_FILTER 0 -+%define CONFIG_UNPREMULTIPLY_FILTER 0 -+%define CONFIG_UNSHARP_FILTER 0 -+%define CONFIG_UNSHARP_OPENCL_FILTER 0 -+%define CONFIG_UNTILE_FILTER 0 -+%define CONFIG_USPP_FILTER 0 -+%define CONFIG_V360_FILTER 0 -+%define CONFIG_VAGUEDENOISER_FILTER 0 -+%define CONFIG_VARBLUR_FILTER 0 -+%define CONFIG_VECTORSCOPE_FILTER 0 -+%define CONFIG_VFLIP_FILTER 0 -+%define CONFIG_VFLIP_VULKAN_FILTER 0 -+%define CONFIG_VFRDET_FILTER 0 -+%define CONFIG_VIBRANCE_FILTER 0 -+%define CONFIG_VIDSTABDETECT_FILTER 0 -+%define CONFIG_VIDSTABTRANSFORM_FILTER 0 -+%define CONFIG_VIF_FILTER 0 -+%define CONFIG_VIGNETTE_FILTER 0 -+%define CONFIG_VMAFMOTION_FILTER 0 -+%define CONFIG_VPP_QSV_FILTER 0 -+%define CONFIG_VSTACK_FILTER 0 -+%define CONFIG_W3FDIF_FILTER 0 -+%define CONFIG_WAVEFORM_FILTER 0 -+%define CONFIG_WEAVE_FILTER 0 -+%define CONFIG_XBR_FILTER 0 -+%define CONFIG_XCORRELATE_FILTER 0 -+%define CONFIG_XFADE_FILTER 0 -+%define CONFIG_XFADE_OPENCL_FILTER 0 -+%define CONFIG_XMEDIAN_FILTER 0 -+%define CONFIG_XSTACK_FILTER 0 -+%define CONFIG_YADIF_FILTER 0 -+%define CONFIG_YADIF_CUDA_FILTER 0 -+%define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 -+%define CONFIG_YAEPBLUR_FILTER 0 -+%define CONFIG_ZMQ_FILTER 0 -+%define CONFIG_ZOOMPAN_FILTER 0 -+%define CONFIG_ZSCALE_FILTER 0 -+%define CONFIG_ALLRGB_FILTER 0 -+%define CONFIG_ALLYUV_FILTER 0 -+%define CONFIG_CELLAUTO_FILTER 0 -+%define CONFIG_COLOR_FILTER 0 -+%define CONFIG_COLORSPECTRUM_FILTER 0 -+%define CONFIG_COREIMAGESRC_FILTER 0 -+%define CONFIG_FREI0R_SRC_FILTER 0 -+%define CONFIG_GRADIENTS_FILTER 0 -+%define CONFIG_HALDCLUTSRC_FILTER 0 -+%define CONFIG_LIFE_FILTER 0 -+%define CONFIG_MANDELBROT_FILTER 0 -+%define CONFIG_MPTESTSRC_FILTER 0 -+%define CONFIG_NULLSRC_FILTER 0 -+%define CONFIG_OPENCLSRC_FILTER 0 -+%define CONFIG_PAL75BARS_FILTER 0 -+%define CONFIG_PAL100BARS_FILTER 0 -+%define CONFIG_RGBTESTSRC_FILTER 0 -+%define CONFIG_SIERPINSKI_FILTER 0 -+%define CONFIG_SMPTEBARS_FILTER 0 -+%define CONFIG_SMPTEHDBARS_FILTER 0 -+%define CONFIG_TESTSRC_FILTER 0 -+%define CONFIG_TESTSRC2_FILTER 0 -+%define CONFIG_YUVTESTSRC_FILTER 0 -+%define CONFIG_NULLSINK_FILTER 0 -+%define CONFIG_ABITSCOPE_FILTER 0 -+%define CONFIG_ADRAWGRAPH_FILTER 0 -+%define CONFIG_AGRAPHMONITOR_FILTER 0 -+%define CONFIG_AHISTOGRAM_FILTER 0 -+%define CONFIG_APHASEMETER_FILTER 0 -+%define CONFIG_AVECTORSCOPE_FILTER 0 -+%define CONFIG_CONCAT_FILTER 0 -+%define CONFIG_SHOWCQT_FILTER 0 -+%define CONFIG_SHOWFREQS_FILTER 0 -+%define CONFIG_SHOWSPATIAL_FILTER 0 -+%define CONFIG_SHOWSPECTRUM_FILTER 0 -+%define CONFIG_SHOWSPECTRUMPIC_FILTER 0 -+%define CONFIG_SHOWVOLUME_FILTER 0 -+%define CONFIG_SHOWWAVES_FILTER 0 -+%define CONFIG_SHOWWAVESPIC_FILTER 0 -+%define CONFIG_SPECTRUMSYNTH_FILTER 0 -+%define CONFIG_AMOVIE_FILTER 0 -+%define CONFIG_MOVIE_FILTER 0 -+%define CONFIG_AFIFO_FILTER 0 -+%define CONFIG_FIFO_FILTER 0 -+%define CONFIG_AA_DEMUXER 0 -+%define CONFIG_AAC_DEMUXER 1 -+%define CONFIG_AAX_DEMUXER 0 -+%define CONFIG_AC3_DEMUXER 0 -+%define CONFIG_ACE_DEMUXER 0 -+%define CONFIG_ACM_DEMUXER 0 -+%define CONFIG_ACT_DEMUXER 0 -+%define CONFIG_ADF_DEMUXER 0 -+%define CONFIG_ADP_DEMUXER 0 -+%define CONFIG_ADS_DEMUXER 0 -+%define CONFIG_ADX_DEMUXER 0 -+%define CONFIG_AEA_DEMUXER 0 -+%define CONFIG_AFC_DEMUXER 0 -+%define CONFIG_AIFF_DEMUXER 0 -+%define CONFIG_AIX_DEMUXER 0 -+%define CONFIG_ALP_DEMUXER 0 -+%define CONFIG_AMR_DEMUXER 0 -+%define CONFIG_AMRNB_DEMUXER 0 -+%define CONFIG_AMRWB_DEMUXER 0 -+%define CONFIG_ANM_DEMUXER 0 -+%define CONFIG_APC_DEMUXER 0 -+%define CONFIG_APE_DEMUXER 0 -+%define CONFIG_APM_DEMUXER 0 -+%define CONFIG_APNG_DEMUXER 0 -+%define CONFIG_APTX_DEMUXER 0 -+%define CONFIG_APTX_HD_DEMUXER 0 -+%define CONFIG_AQTITLE_DEMUXER 0 -+%define CONFIG_ARGO_ASF_DEMUXER 0 -+%define CONFIG_ARGO_BRP_DEMUXER 0 -+%define CONFIG_ARGO_CVG_DEMUXER 0 -+%define CONFIG_ASF_DEMUXER 0 -+%define CONFIG_ASF_O_DEMUXER 0 -+%define CONFIG_ASS_DEMUXER 0 -+%define CONFIG_AST_DEMUXER 0 -+%define CONFIG_AU_DEMUXER 0 -+%define CONFIG_AV1_DEMUXER 0 -+%define CONFIG_AVI_DEMUXER 0 -+%define CONFIG_AVISYNTH_DEMUXER 0 -+%define CONFIG_AVR_DEMUXER 0 -+%define CONFIG_AVS_DEMUXER 0 -+%define CONFIG_AVS2_DEMUXER 0 -+%define CONFIG_AVS3_DEMUXER 0 -+%define CONFIG_BETHSOFTVID_DEMUXER 0 -+%define CONFIG_BFI_DEMUXER 0 -+%define CONFIG_BINTEXT_DEMUXER 0 -+%define CONFIG_BINK_DEMUXER 0 -+%define CONFIG_BINKA_DEMUXER 0 -+%define CONFIG_BIT_DEMUXER 0 -+%define CONFIG_BITPACKED_DEMUXER 0 -+%define CONFIG_BMV_DEMUXER 0 -+%define CONFIG_BFSTM_DEMUXER 0 -+%define CONFIG_BRSTM_DEMUXER 0 -+%define CONFIG_BOA_DEMUXER 0 -+%define CONFIG_C93_DEMUXER 0 -+%define CONFIG_CAF_DEMUXER 0 -+%define CONFIG_CAVSVIDEO_DEMUXER 0 -+%define CONFIG_CDG_DEMUXER 0 -+%define CONFIG_CDXL_DEMUXER 0 -+%define CONFIG_CINE_DEMUXER 0 -+%define CONFIG_CODEC2_DEMUXER 0 -+%define CONFIG_CODEC2RAW_DEMUXER 0 -+%define CONFIG_CONCAT_DEMUXER 0 -+%define CONFIG_DASH_DEMUXER 0 -+%define CONFIG_DATA_DEMUXER 0 -+%define CONFIG_DAUD_DEMUXER 0 -+%define CONFIG_DCSTR_DEMUXER 0 -+%define CONFIG_DERF_DEMUXER 0 -+%define CONFIG_DFA_DEMUXER 0 -+%define CONFIG_DHAV_DEMUXER 0 -+%define CONFIG_DIRAC_DEMUXER 0 -+%define CONFIG_DNXHD_DEMUXER 0 -+%define CONFIG_DSF_DEMUXER 0 -+%define CONFIG_DSICIN_DEMUXER 0 -+%define CONFIG_DSS_DEMUXER 0 -+%define CONFIG_DTS_DEMUXER 0 -+%define CONFIG_DTSHD_DEMUXER 0 -+%define CONFIG_DV_DEMUXER 0 -+%define CONFIG_DVBSUB_DEMUXER 0 -+%define CONFIG_DVBTXT_DEMUXER 0 -+%define CONFIG_DXA_DEMUXER 0 -+%define CONFIG_EA_DEMUXER 0 -+%define CONFIG_EA_CDATA_DEMUXER 0 -+%define CONFIG_EAC3_DEMUXER 0 -+%define CONFIG_EPAF_DEMUXER 0 -+%define CONFIG_FFMETADATA_DEMUXER 0 -+%define CONFIG_FILMSTRIP_DEMUXER 0 -+%define CONFIG_FITS_DEMUXER 0 -+%define CONFIG_FLAC_DEMUXER 1 -+%define CONFIG_FLIC_DEMUXER 0 -+%define CONFIG_FLV_DEMUXER 0 -+%define CONFIG_LIVE_FLV_DEMUXER 0 -+%define CONFIG_FOURXM_DEMUXER 0 -+%define CONFIG_FRM_DEMUXER 0 -+%define CONFIG_FSB_DEMUXER 0 -+%define CONFIG_FWSE_DEMUXER 0 -+%define CONFIG_G722_DEMUXER 0 -+%define CONFIG_G723_1_DEMUXER 0 -+%define CONFIG_G726_DEMUXER 0 -+%define CONFIG_G726LE_DEMUXER 0 -+%define CONFIG_G729_DEMUXER 0 -+%define CONFIG_GDV_DEMUXER 0 -+%define CONFIG_GENH_DEMUXER 0 -+%define CONFIG_GIF_DEMUXER 0 -+%define CONFIG_GSM_DEMUXER 0 -+%define CONFIG_GXF_DEMUXER 0 -+%define CONFIG_H261_DEMUXER 0 -+%define CONFIG_H263_DEMUXER 0 -+%define CONFIG_H264_DEMUXER 0 -+%define CONFIG_HCA_DEMUXER 0 -+%define CONFIG_HCOM_DEMUXER 0 -+%define CONFIG_HEVC_DEMUXER 0 -+%define CONFIG_HLS_DEMUXER 0 -+%define CONFIG_HNM_DEMUXER 0 -+%define CONFIG_ICO_DEMUXER 0 -+%define CONFIG_IDCIN_DEMUXER 0 -+%define CONFIG_IDF_DEMUXER 0 -+%define CONFIG_IFF_DEMUXER 0 -+%define CONFIG_IFV_DEMUXER 0 -+%define CONFIG_ILBC_DEMUXER 0 -+%define CONFIG_IMAGE2_DEMUXER 0 -+%define CONFIG_IMAGE2PIPE_DEMUXER 0 -+%define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 -+%define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 -+%define CONFIG_IMF_DEMUXER 0 -+%define CONFIG_INGENIENT_DEMUXER 0 -+%define CONFIG_IPMOVIE_DEMUXER 0 -+%define CONFIG_IPU_DEMUXER 0 -+%define CONFIG_IRCAM_DEMUXER 0 -+%define CONFIG_ISS_DEMUXER 0 -+%define CONFIG_IV8_DEMUXER 0 -+%define CONFIG_IVF_DEMUXER 0 -+%define CONFIG_IVR_DEMUXER 0 -+%define CONFIG_JACOSUB_DEMUXER 0 -+%define CONFIG_JV_DEMUXER 0 -+%define CONFIG_KUX_DEMUXER 0 -+%define CONFIG_KVAG_DEMUXER 0 -+%define CONFIG_LMLM4_DEMUXER 0 -+%define CONFIG_LOAS_DEMUXER 0 -+%define CONFIG_LUODAT_DEMUXER 0 -+%define CONFIG_LRC_DEMUXER 0 -+%define CONFIG_LVF_DEMUXER 0 -+%define CONFIG_LXF_DEMUXER 0 -+%define CONFIG_M4V_DEMUXER 0 -+%define CONFIG_MCA_DEMUXER 0 -+%define CONFIG_MCC_DEMUXER 0 -+%define CONFIG_MATROSKA_DEMUXER 1 -+%define CONFIG_MGSTS_DEMUXER 0 -+%define CONFIG_MICRODVD_DEMUXER 0 -+%define CONFIG_MJPEG_DEMUXER 0 -+%define CONFIG_MJPEG_2000_DEMUXER 0 -+%define CONFIG_MLP_DEMUXER 0 -+%define CONFIG_MLV_DEMUXER 0 -+%define CONFIG_MM_DEMUXER 0 -+%define CONFIG_MMF_DEMUXER 0 -+%define CONFIG_MODS_DEMUXER 0 -+%define CONFIG_MOFLEX_DEMUXER 0 -+%define CONFIG_MOV_DEMUXER 1 -+%define CONFIG_MP3_DEMUXER 1 -+%define CONFIG_MPC_DEMUXER 0 -+%define CONFIG_MPC8_DEMUXER 0 -+%define CONFIG_MPEGPS_DEMUXER 0 -+%define CONFIG_MPEGTS_DEMUXER 0 -+%define CONFIG_MPEGTSRAW_DEMUXER 0 -+%define CONFIG_MPEGVIDEO_DEMUXER 0 -+%define CONFIG_MPJPEG_DEMUXER 0 -+%define CONFIG_MPL2_DEMUXER 0 -+%define CONFIG_MPSUB_DEMUXER 0 -+%define CONFIG_MSF_DEMUXER 0 -+%define CONFIG_MSNWC_TCP_DEMUXER 0 -+%define CONFIG_MSP_DEMUXER 0 -+%define CONFIG_MTAF_DEMUXER 0 -+%define CONFIG_MTV_DEMUXER 0 -+%define CONFIG_MUSX_DEMUXER 0 -+%define CONFIG_MV_DEMUXER 0 -+%define CONFIG_MVI_DEMUXER 0 -+%define CONFIG_MXF_DEMUXER 0 -+%define CONFIG_MXG_DEMUXER 0 -+%define CONFIG_NC_DEMUXER 0 -+%define CONFIG_NISTSPHERE_DEMUXER 0 -+%define CONFIG_NSP_DEMUXER 0 -+%define CONFIG_NSV_DEMUXER 0 -+%define CONFIG_NUT_DEMUXER 0 -+%define CONFIG_NUV_DEMUXER 0 -+%define CONFIG_OBU_DEMUXER 0 -+%define CONFIG_OGG_DEMUXER 1 -+%define CONFIG_OMA_DEMUXER 0 -+%define CONFIG_PAF_DEMUXER 0 -+%define CONFIG_PCM_ALAW_DEMUXER 0 -+%define CONFIG_PCM_MULAW_DEMUXER 0 -+%define CONFIG_PCM_VIDC_DEMUXER 0 -+%define CONFIG_PCM_F64BE_DEMUXER 0 -+%define CONFIG_PCM_F64LE_DEMUXER 0 -+%define CONFIG_PCM_F32BE_DEMUXER 0 -+%define CONFIG_PCM_F32LE_DEMUXER 0 -+%define CONFIG_PCM_S32BE_DEMUXER 0 -+%define CONFIG_PCM_S32LE_DEMUXER 0 -+%define CONFIG_PCM_S24BE_DEMUXER 0 -+%define CONFIG_PCM_S24LE_DEMUXER 0 -+%define CONFIG_PCM_S16BE_DEMUXER 0 -+%define CONFIG_PCM_S16LE_DEMUXER 0 -+%define CONFIG_PCM_S8_DEMUXER 0 -+%define CONFIG_PCM_U32BE_DEMUXER 0 -+%define CONFIG_PCM_U32LE_DEMUXER 0 -+%define CONFIG_PCM_U24BE_DEMUXER 0 -+%define CONFIG_PCM_U24LE_DEMUXER 0 -+%define CONFIG_PCM_U16BE_DEMUXER 0 -+%define CONFIG_PCM_U16LE_DEMUXER 0 -+%define CONFIG_PCM_U8_DEMUXER 0 -+%define CONFIG_PJS_DEMUXER 0 -+%define CONFIG_PMP_DEMUXER 0 -+%define CONFIG_PP_BNK_DEMUXER 0 -+%define CONFIG_PVA_DEMUXER 0 -+%define CONFIG_PVF_DEMUXER 0 -+%define CONFIG_QCP_DEMUXER 0 -+%define CONFIG_R3D_DEMUXER 0 -+%define CONFIG_RAWVIDEO_DEMUXER 0 -+%define CONFIG_REALTEXT_DEMUXER 0 -+%define CONFIG_REDSPARK_DEMUXER 0 -+%define CONFIG_RL2_DEMUXER 0 -+%define CONFIG_RM_DEMUXER 0 -+%define CONFIG_ROQ_DEMUXER 0 -+%define CONFIG_RPL_DEMUXER 0 -+%define CONFIG_RSD_DEMUXER 0 -+%define CONFIG_RSO_DEMUXER 0 -+%define CONFIG_RTP_DEMUXER 0 -+%define CONFIG_RTSP_DEMUXER 0 -+%define CONFIG_S337M_DEMUXER 0 -+%define CONFIG_SAMI_DEMUXER 0 -+%define CONFIG_SAP_DEMUXER 0 -+%define CONFIG_SBC_DEMUXER 0 -+%define CONFIG_SBG_DEMUXER 0 -+%define CONFIG_SCC_DEMUXER 0 -+%define CONFIG_SCD_DEMUXER 0 -+%define CONFIG_SDP_DEMUXER 0 -+%define CONFIG_SDR2_DEMUXER 0 -+%define CONFIG_SDS_DEMUXER 0 -+%define CONFIG_SDX_DEMUXER 0 -+%define CONFIG_SEGAFILM_DEMUXER 0 -+%define CONFIG_SER_DEMUXER 0 -+%define CONFIG_SGA_DEMUXER 0 -+%define CONFIG_SHORTEN_DEMUXER 0 -+%define CONFIG_SIFF_DEMUXER 0 -+%define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 -+%define CONFIG_SLN_DEMUXER 0 -+%define CONFIG_SMACKER_DEMUXER 0 -+%define CONFIG_SMJPEG_DEMUXER 0 -+%define CONFIG_SMUSH_DEMUXER 0 -+%define CONFIG_SOL_DEMUXER 0 -+%define CONFIG_SOX_DEMUXER 0 -+%define CONFIG_SPDIF_DEMUXER 0 -+%define CONFIG_SRT_DEMUXER 0 -+%define CONFIG_STR_DEMUXER 0 -+%define CONFIG_STL_DEMUXER 0 -+%define CONFIG_SUBVIEWER1_DEMUXER 0 -+%define CONFIG_SUBVIEWER_DEMUXER 0 -+%define CONFIG_SUP_DEMUXER 0 -+%define CONFIG_SVAG_DEMUXER 0 -+%define CONFIG_SVS_DEMUXER 0 -+%define CONFIG_SWF_DEMUXER 0 -+%define CONFIG_TAK_DEMUXER 0 -+%define CONFIG_TEDCAPTIONS_DEMUXER 0 -+%define CONFIG_THP_DEMUXER 0 -+%define CONFIG_THREEDOSTR_DEMUXER 0 -+%define CONFIG_TIERTEXSEQ_DEMUXER 0 -+%define CONFIG_TMV_DEMUXER 0 -+%define CONFIG_TRUEHD_DEMUXER 0 -+%define CONFIG_TTA_DEMUXER 0 -+%define CONFIG_TXD_DEMUXER 0 -+%define CONFIG_TTY_DEMUXER 0 -+%define CONFIG_TY_DEMUXER 0 -+%define CONFIG_V210_DEMUXER 0 -+%define CONFIG_V210X_DEMUXER 0 -+%define CONFIG_VAG_DEMUXER 0 -+%define CONFIG_VC1_DEMUXER 0 -+%define CONFIG_VC1T_DEMUXER 0 -+%define CONFIG_VIVIDAS_DEMUXER 0 -+%define CONFIG_VIVO_DEMUXER 0 -+%define CONFIG_VMD_DEMUXER 0 -+%define CONFIG_VOBSUB_DEMUXER 0 -+%define CONFIG_VOC_DEMUXER 0 -+%define CONFIG_VPK_DEMUXER 0 -+%define CONFIG_VPLAYER_DEMUXER 0 -+%define CONFIG_VQF_DEMUXER 0 -+%define CONFIG_W64_DEMUXER 0 -+%define CONFIG_WAV_DEMUXER 1 -+%define CONFIG_WC3_DEMUXER 0 -+%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 -+%define CONFIG_WEBVTT_DEMUXER 0 -+%define CONFIG_WSAUD_DEMUXER 0 -+%define CONFIG_WSD_DEMUXER 0 -+%define CONFIG_WSVQA_DEMUXER 0 -+%define CONFIG_WTV_DEMUXER 0 -+%define CONFIG_WVE_DEMUXER 0 -+%define CONFIG_WV_DEMUXER 0 -+%define CONFIG_XA_DEMUXER 0 -+%define CONFIG_XBIN_DEMUXER 0 -+%define CONFIG_XMV_DEMUXER 0 -+%define CONFIG_XVAG_DEMUXER 0 -+%define CONFIG_XWMA_DEMUXER 0 -+%define CONFIG_YOP_DEMUXER 0 -+%define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 -+%define CONFIG_LIBGME_DEMUXER 0 -+%define CONFIG_LIBMODPLUG_DEMUXER 0 -+%define CONFIG_LIBOPENMPT_DEMUXER 0 -+%define CONFIG_VAPOURSYNTH_DEMUXER 0 -+%define CONFIG_A64_MUXER 0 -+%define CONFIG_AC3_MUXER 0 -+%define CONFIG_ADTS_MUXER 0 -+%define CONFIG_ADX_MUXER 0 -+%define CONFIG_AIFF_MUXER 0 -+%define CONFIG_ALP_MUXER 0 -+%define CONFIG_AMR_MUXER 0 -+%define CONFIG_AMV_MUXER 0 -+%define CONFIG_APM_MUXER 0 -+%define CONFIG_APNG_MUXER 0 -+%define CONFIG_APTX_MUXER 0 -+%define CONFIG_APTX_HD_MUXER 0 -+%define CONFIG_ARGO_ASF_MUXER 0 -+%define CONFIG_ARGO_CVG_MUXER 0 -+%define CONFIG_ASF_MUXER 0 -+%define CONFIG_ASS_MUXER 0 -+%define CONFIG_AST_MUXER 0 -+%define CONFIG_ASF_STREAM_MUXER 0 -+%define CONFIG_AU_MUXER 0 -+%define CONFIG_AVI_MUXER 0 -+%define CONFIG_AVM2_MUXER 0 -+%define CONFIG_AVS2_MUXER 0 -+%define CONFIG_AVS3_MUXER 0 -+%define CONFIG_BIT_MUXER 0 -+%define CONFIG_CAF_MUXER 0 -+%define CONFIG_CAVSVIDEO_MUXER 0 -+%define CONFIG_CODEC2_MUXER 0 -+%define CONFIG_CODEC2RAW_MUXER 0 -+%define CONFIG_CRC_MUXER 0 -+%define CONFIG_DASH_MUXER 0 -+%define CONFIG_DATA_MUXER 0 -+%define CONFIG_DAUD_MUXER 0 -+%define CONFIG_DIRAC_MUXER 0 -+%define CONFIG_DNXHD_MUXER 0 -+%define CONFIG_DTS_MUXER 0 -+%define CONFIG_DV_MUXER 0 -+%define CONFIG_EAC3_MUXER 0 -+%define CONFIG_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 -+%define CONFIG_FLV_MUXER 0 -+%define CONFIG_FRAMECRC_MUXER 0 -+%define CONFIG_FRAMEHASH_MUXER 0 -+%define CONFIG_FRAMEMD5_MUXER 0 -+%define CONFIG_G722_MUXER 0 -+%define CONFIG_G723_1_MUXER 0 -+%define CONFIG_G726_MUXER 0 -+%define CONFIG_G726LE_MUXER 0 -+%define CONFIG_GIF_MUXER 0 -+%define CONFIG_GSM_MUXER 0 -+%define CONFIG_GXF_MUXER 0 -+%define CONFIG_H261_MUXER 0 -+%define CONFIG_H263_MUXER 0 -+%define CONFIG_H264_MUXER 0 -+%define CONFIG_HASH_MUXER 0 -+%define CONFIG_HDS_MUXER 0 -+%define CONFIG_HEVC_MUXER 0 -+%define CONFIG_HLS_MUXER 0 -+%define CONFIG_ICO_MUXER 0 -+%define CONFIG_ILBC_MUXER 0 -+%define CONFIG_IMAGE2_MUXER 0 -+%define CONFIG_IMAGE2PIPE_MUXER 0 -+%define CONFIG_IPOD_MUXER 0 -+%define CONFIG_IRCAM_MUXER 0 -+%define CONFIG_ISMV_MUXER 0 -+%define CONFIG_IVF_MUXER 0 -+%define CONFIG_JACOSUB_MUXER 0 -+%define CONFIG_KVAG_MUXER 0 -+%define CONFIG_LATM_MUXER 0 -+%define CONFIG_LRC_MUXER 0 -+%define CONFIG_M4V_MUXER 0 -+%define CONFIG_MD5_MUXER 0 -+%define CONFIG_MATROSKA_MUXER 0 -+%define CONFIG_MATROSKA_AUDIO_MUXER 0 -+%define CONFIG_MICRODVD_MUXER 0 -+%define CONFIG_MJPEG_MUXER 0 -+%define CONFIG_MLP_MUXER 0 -+%define CONFIG_MMF_MUXER 0 -+%define CONFIG_MOV_MUXER 0 -+%define CONFIG_MP2_MUXER 0 -+%define CONFIG_MP3_MUXER 0 -+%define CONFIG_MP4_MUXER 0 -+%define CONFIG_MPEG1SYSTEM_MUXER 0 -+%define CONFIG_MPEG1VCD_MUXER 0 -+%define CONFIG_MPEG1VIDEO_MUXER 0 -+%define CONFIG_MPEG2DVD_MUXER 0 -+%define CONFIG_MPEG2SVCD_MUXER 0 -+%define CONFIG_MPEG2VIDEO_MUXER 0 -+%define CONFIG_MPEG2VOB_MUXER 0 -+%define CONFIG_MPEGTS_MUXER 0 -+%define CONFIG_MPJPEG_MUXER 0 -+%define CONFIG_MXF_MUXER 0 -+%define CONFIG_MXF_D10_MUXER 0 -+%define CONFIG_MXF_OPATOM_MUXER 0 -+%define CONFIG_NULL_MUXER 0 -+%define CONFIG_NUT_MUXER 0 -+%define CONFIG_OBU_MUXER 0 -+%define CONFIG_OGA_MUXER 0 -+%define CONFIG_OGG_MUXER 0 -+%define CONFIG_OGV_MUXER 0 -+%define CONFIG_OMA_MUXER 0 -+%define CONFIG_OPUS_MUXER 0 -+%define CONFIG_PCM_ALAW_MUXER 0 -+%define CONFIG_PCM_MULAW_MUXER 0 -+%define CONFIG_PCM_VIDC_MUXER 0 -+%define CONFIG_PCM_F64BE_MUXER 0 -+%define CONFIG_PCM_F64LE_MUXER 0 -+%define CONFIG_PCM_F32BE_MUXER 0 -+%define CONFIG_PCM_F32LE_MUXER 0 -+%define CONFIG_PCM_S32BE_MUXER 0 -+%define CONFIG_PCM_S32LE_MUXER 0 -+%define CONFIG_PCM_S24BE_MUXER 0 -+%define CONFIG_PCM_S24LE_MUXER 0 -+%define CONFIG_PCM_S16BE_MUXER 0 -+%define CONFIG_PCM_S16LE_MUXER 0 -+%define CONFIG_PCM_S8_MUXER 0 -+%define CONFIG_PCM_U32BE_MUXER 0 -+%define CONFIG_PCM_U32LE_MUXER 0 -+%define CONFIG_PCM_U24BE_MUXER 0 -+%define CONFIG_PCM_U24LE_MUXER 0 -+%define CONFIG_PCM_U16BE_MUXER 0 -+%define CONFIG_PCM_U16LE_MUXER 0 -+%define CONFIG_PCM_U8_MUXER 0 -+%define CONFIG_PSP_MUXER 0 -+%define CONFIG_RAWVIDEO_MUXER 0 -+%define CONFIG_RM_MUXER 0 -+%define CONFIG_ROQ_MUXER 0 -+%define CONFIG_RSO_MUXER 0 -+%define CONFIG_RTP_MUXER 0 -+%define CONFIG_RTP_MPEGTS_MUXER 0 -+%define CONFIG_RTSP_MUXER 0 -+%define CONFIG_SAP_MUXER 0 -+%define CONFIG_SBC_MUXER 0 -+%define CONFIG_SCC_MUXER 0 -+%define CONFIG_SEGAFILM_MUXER 0 -+%define CONFIG_SEGMENT_MUXER 0 -+%define CONFIG_STREAM_SEGMENT_MUXER 0 -+%define CONFIG_SMJPEG_MUXER 0 -+%define CONFIG_SMOOTHSTREAMING_MUXER 0 -+%define CONFIG_SOX_MUXER 0 -+%define CONFIG_SPX_MUXER 0 -+%define CONFIG_SPDIF_MUXER 0 -+%define CONFIG_SRT_MUXER 0 -+%define CONFIG_STREAMHASH_MUXER 0 -+%define CONFIG_SUP_MUXER 0 -+%define CONFIG_SWF_MUXER 0 -+%define CONFIG_TEE_MUXER 0 -+%define CONFIG_TG2_MUXER 0 -+%define CONFIG_TGP_MUXER 0 -+%define CONFIG_MKVTIMESTAMP_V2_MUXER 0 -+%define CONFIG_TRUEHD_MUXER 0 -+%define CONFIG_TTA_MUXER 0 -+%define CONFIG_TTML_MUXER 0 -+%define CONFIG_UNCODEDFRAMECRC_MUXER 0 -+%define CONFIG_VC1_MUXER 0 -+%define CONFIG_VC1T_MUXER 0 -+%define CONFIG_VOC_MUXER 0 -+%define CONFIG_W64_MUXER 0 -+%define CONFIG_WAV_MUXER 0 -+%define CONFIG_WEBM_MUXER 0 -+%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 -+%define CONFIG_WEBM_CHUNK_MUXER 0 -+%define CONFIG_WEBP_MUXER 0 -+%define CONFIG_WEBVTT_MUXER 0 -+%define CONFIG_WSAUD_MUXER 0 -+%define CONFIG_WTV_MUXER 0 -+%define CONFIG_WV_MUXER 0 -+%define CONFIG_YUV4MPEGPIPE_MUXER 0 -+%define CONFIG_CHROMAPRINT_MUXER 0 -+%define CONFIG_ASYNC_PROTOCOL 0 -+%define CONFIG_BLURAY_PROTOCOL 0 -+%define CONFIG_CACHE_PROTOCOL 0 -+%define CONFIG_CONCAT_PROTOCOL 0 -+%define CONFIG_CONCATF_PROTOCOL 0 -+%define CONFIG_CRYPTO_PROTOCOL 0 -+%define CONFIG_DATA_PROTOCOL 0 -+%define CONFIG_FFRTMPCRYPT_PROTOCOL 0 -+%define CONFIG_FFRTMPHTTP_PROTOCOL 0 -+%define CONFIG_FILE_PROTOCOL 0 -+%define CONFIG_FTP_PROTOCOL 0 -+%define CONFIG_GOPHER_PROTOCOL 0 -+%define CONFIG_GOPHERS_PROTOCOL 0 -+%define CONFIG_HLS_PROTOCOL 0 -+%define CONFIG_HTTP_PROTOCOL 0 -+%define CONFIG_HTTPPROXY_PROTOCOL 0 -+%define CONFIG_HTTPS_PROTOCOL 0 -+%define CONFIG_ICECAST_PROTOCOL 0 -+%define CONFIG_MMSH_PROTOCOL 0 -+%define CONFIG_MMST_PROTOCOL 0 -+%define CONFIG_MD5_PROTOCOL 0 -+%define CONFIG_PIPE_PROTOCOL 0 -+%define CONFIG_PROMPEG_PROTOCOL 0 -+%define CONFIG_RTMP_PROTOCOL 0 -+%define CONFIG_RTMPE_PROTOCOL 0 -+%define CONFIG_RTMPS_PROTOCOL 0 -+%define CONFIG_RTMPT_PROTOCOL 0 -+%define CONFIG_RTMPTE_PROTOCOL 0 -+%define CONFIG_RTMPTS_PROTOCOL 0 -+%define CONFIG_RTP_PROTOCOL 0 -+%define CONFIG_SCTP_PROTOCOL 0 -+%define CONFIG_SRTP_PROTOCOL 0 -+%define CONFIG_SUBFILE_PROTOCOL 0 -+%define CONFIG_TEE_PROTOCOL 0 -+%define CONFIG_TCP_PROTOCOL 0 -+%define CONFIG_TLS_PROTOCOL 0 -+%define CONFIG_UDP_PROTOCOL 0 -+%define CONFIG_UDPLITE_PROTOCOL 0 -+%define CONFIG_UNIX_PROTOCOL 0 -+%define CONFIG_LIBAMQP_PROTOCOL 0 -+%define CONFIG_LIBRIST_PROTOCOL 0 -+%define CONFIG_LIBRTMP_PROTOCOL 0 -+%define CONFIG_LIBRTMPE_PROTOCOL 0 -+%define CONFIG_LIBRTMPS_PROTOCOL 0 -+%define CONFIG_LIBRTMPT_PROTOCOL 0 -+%define CONFIG_LIBRTMPTE_PROTOCOL 0 -+%define CONFIG_LIBSRT_PROTOCOL 0 -+%define CONFIG_LIBSSH_PROTOCOL 0 -+%define CONFIG_LIBSMBCLIENT_PROTOCOL 0 -+%define CONFIG_LIBZMQ_PROTOCOL 0 diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h index 842dfff37ca6..dbda65372b22 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h @@ -1,10 +1,10 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2022-04-01 07:48:30 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2022-10-05 07:34:01 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h -@@ -0,0 +1,2787 @@ +@@ -0,0 +1,737 @@ +/* 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-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --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/jrummell/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --cc=clang --cxx=clang++ --ld=clang --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-fft --enable-rdft --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/d/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --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 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -66,6 +66,7 @@ +#define HAVE_AVX 1 +#define HAVE_AVX2 1 +#define HAVE_AVX512 1 ++#define HAVE_AVX512ICL 1 +#define HAVE_FMA3 1 +#define HAVE_FMA4 1 +#define HAVE_MMX 1 @@ -113,6 +114,7 @@ +#define HAVE_AVX_EXTERNAL 1 +#define HAVE_AVX2_EXTERNAL 1 +#define HAVE_AVX512_EXTERNAL 1 ++#define HAVE_AVX512ICL_EXTERNAL 0 +#define HAVE_FMA3_EXTERNAL 1 +#define HAVE_FMA4_EXTERNAL 1 +#define HAVE_MMX_EXTERNAL 1 @@ -160,6 +162,7 @@ +#define HAVE_AVX_INLINE 1 +#define HAVE_AVX2_INLINE 1 +#define HAVE_AVX512_INLINE 1 ++#define HAVE_AVX512ICL_INLINE 1 +#define HAVE_FMA3_INLINE 1 +#define HAVE_FMA4_INLINE 1 +#define HAVE_MMX_INLINE 1 @@ -245,7 +248,7 @@ +#define HAVE_TERMIOS_H 1 +#define HAVE_UDPLITE_H 0 +#define HAVE_UNISTD_H 1 -+#define HAVE_VALGRIND_VALGRIND_H 0 ++#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */ +#define HAVE_WINDOWS_H 0 +#define HAVE_WINSOCK2_H 0 +#define HAVE_INTRINSICS_NEON 0 @@ -293,6 +296,7 @@ +#define HAVE_COMMANDLINETOARGVW 0 +#define HAVE_FCNTL 1 +#define HAVE_GETADDRINFO 0 ++#define HAVE_GETAUXVAL 0 +#define HAVE_GETHRTIME 0 +#define HAVE_GETOPT 1 +#define HAVE_GETMODULEHANDLE 0 @@ -332,7 +336,7 @@ +#define HAVE_SLEEP 0 +#define HAVE_STRERROR_R 1 +#define HAVE_SYSCONF 1 -+#define HAVE_SYSCTL 1 ++#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 0 -- forced to 0 for Fuchsia */ +#define HAVE_USLEEP 1 +#define HAVE_UTGETOSTYPEFROMSTRING 0 +#define HAVE_VIRTUALALLOC 0 @@ -578,7 +582,6 @@ +#define CONFIG_VIDEOTOOLBOX 0 +#define CONFIG_VULKAN 0 +#define CONFIG_V4L2_M2M 0 -+#define CONFIG_XVMC 0 +#define CONFIG_FTRAPV 0 +#define CONFIG_GRAY 0 +#define CONFIG_HARDCODED_TABLES 0 @@ -610,7 +613,6 @@ +#define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_FFT 1 +#define CONFIG_LSP 0 -+#define CONFIG_LZO 0 +#define CONFIG_MDCT 1 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 @@ -655,6 +657,7 @@ +#define CONFIG_CBS_JPEG 0 +#define CONFIG_CBS_MPEG2 0 +#define CONFIG_CBS_VP9 0 ++#define CONFIG_DEFLATE_WRAPPER 0 +#define CONFIG_DIRAC_PARSE 1 +#define CONFIG_DNN 0 +#define CONFIG_DOVI_RPU 0 @@ -683,6 +686,7 @@ +#define CONFIG_IDCTDSP 0 +#define CONFIG_IIRFILTER 0 +#define CONFIG_MDCT15 1 ++#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INTRAX8 0 +#define CONFIG_ISO_MEDIA 1 +#define CONFIG_IVIDSP 0 @@ -733,2058 +737,4 @@ +#define CONFIG_VP8DSP 1 +#define CONFIG_WMA_FREQS 0 +#define CONFIG_WMV2DSP 0 -+#define CONFIG_AAC_ADTSTOASC_BSF 0 -+#define CONFIG_AV1_FRAME_MERGE_BSF 0 -+#define CONFIG_AV1_FRAME_SPLIT_BSF 0 -+#define CONFIG_AV1_METADATA_BSF 0 -+#define CONFIG_CHOMP_BSF 0 -+#define CONFIG_DUMP_EXTRADATA_BSF 0 -+#define CONFIG_DCA_CORE_BSF 0 -+#define CONFIG_EAC3_CORE_BSF 0 -+#define CONFIG_EXTRACT_EXTRADATA_BSF 0 -+#define CONFIG_FILTER_UNITS_BSF 0 -+#define CONFIG_H264_METADATA_BSF 0 -+#define CONFIG_H264_MP4TOANNEXB_BSF 0 -+#define CONFIG_H264_REDUNDANT_PPS_BSF 0 -+#define CONFIG_HAPQA_EXTRACT_BSF 0 -+#define CONFIG_HEVC_METADATA_BSF 0 -+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0 -+#define CONFIG_IMX_DUMP_HEADER_BSF 0 -+#define CONFIG_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 -+#define CONFIG_NOISE_BSF 0 -+#define CONFIG_NULL_BSF 0 -+#define CONFIG_OPUS_METADATA_BSF 0 -+#define CONFIG_PCM_RECHUNK_BSF 0 -+#define CONFIG_PRORES_METADATA_BSF 0 -+#define CONFIG_REMOVE_EXTRADATA_BSF 0 -+#define CONFIG_SETTS_BSF 0 -+#define CONFIG_TEXT2MOVSUB_BSF 0 -+#define CONFIG_TRACE_HEADERS_BSF 0 -+#define CONFIG_TRUEHD_CORE_BSF 0 -+#define CONFIG_VP9_METADATA_BSF 0 -+#define CONFIG_VP9_RAW_REORDER_BSF 0 -+#define CONFIG_VP9_SUPERFRAME_BSF 0 -+#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 -+#define CONFIG_AASC_DECODER 0 -+#define CONFIG_AIC_DECODER 0 -+#define CONFIG_ALIAS_PIX_DECODER 0 -+#define CONFIG_AGM_DECODER 0 -+#define CONFIG_AMV_DECODER 0 -+#define CONFIG_ANM_DECODER 0 -+#define CONFIG_ANSI_DECODER 0 -+#define CONFIG_APNG_DECODER 0 -+#define CONFIG_ARBC_DECODER 0 -+#define CONFIG_ARGO_DECODER 0 -+#define CONFIG_ASV1_DECODER 0 -+#define CONFIG_ASV2_DECODER 0 -+#define CONFIG_AURA_DECODER 0 -+#define CONFIG_AURA2_DECODER 0 -+#define CONFIG_AVRP_DECODER 0 -+#define CONFIG_AVRN_DECODER 0 -+#define CONFIG_AVS_DECODER 0 -+#define CONFIG_AVUI_DECODER 0 -+#define CONFIG_AYUV_DECODER 0 -+#define CONFIG_BETHSOFTVID_DECODER 0 -+#define CONFIG_BFI_DECODER 0 -+#define CONFIG_BINK_DECODER 0 -+#define CONFIG_BITPACKED_DECODER 0 -+#define CONFIG_BMP_DECODER 0 -+#define CONFIG_BMV_VIDEO_DECODER 0 -+#define CONFIG_BRENDER_PIX_DECODER 0 -+#define CONFIG_C93_DECODER 0 -+#define CONFIG_CAVS_DECODER 0 -+#define CONFIG_CDGRAPHICS_DECODER 0 -+#define CONFIG_CDTOONS_DECODER 0 -+#define CONFIG_CDXL_DECODER 0 -+#define CONFIG_CFHD_DECODER 0 -+#define CONFIG_CINEPAK_DECODER 0 -+#define CONFIG_CLEARVIDEO_DECODER 0 -+#define CONFIG_CLJR_DECODER 0 -+#define CONFIG_CLLC_DECODER 0 -+#define CONFIG_COMFORTNOISE_DECODER 0 -+#define CONFIG_CPIA_DECODER 0 -+#define CONFIG_CRI_DECODER 0 -+#define CONFIG_CSCD_DECODER 0 -+#define CONFIG_CYUV_DECODER 0 -+#define CONFIG_DDS_DECODER 0 -+#define CONFIG_DFA_DECODER 0 -+#define CONFIG_DIRAC_DECODER 0 -+#define CONFIG_DNXHD_DECODER 0 -+#define CONFIG_DPX_DECODER 0 -+#define CONFIG_DSICINVIDEO_DECODER 0 -+#define CONFIG_DVAUDIO_DECODER 0 -+#define CONFIG_DVVIDEO_DECODER 0 -+#define CONFIG_DXA_DECODER 0 -+#define CONFIG_DXTORY_DECODER 0 -+#define CONFIG_DXV_DECODER 0 -+#define CONFIG_EACMV_DECODER 0 -+#define CONFIG_EAMAD_DECODER 0 -+#define CONFIG_EATGQ_DECODER 0 -+#define CONFIG_EATGV_DECODER 0 -+#define CONFIG_EATQI_DECODER 0 -+#define CONFIG_EIGHTBPS_DECODER 0 -+#define CONFIG_EIGHTSVX_EXP_DECODER 0 -+#define CONFIG_EIGHTSVX_FIB_DECODER 0 -+#define CONFIG_ESCAPE124_DECODER 0 -+#define CONFIG_ESCAPE130_DECODER 0 -+#define CONFIG_EXR_DECODER 0 -+#define CONFIG_FFV1_DECODER 0 -+#define CONFIG_FFVHUFF_DECODER 0 -+#define CONFIG_FIC_DECODER 0 -+#define CONFIG_FITS_DECODER 0 -+#define CONFIG_FLASHSV_DECODER 0 -+#define CONFIG_FLASHSV2_DECODER 0 -+#define CONFIG_FLIC_DECODER 0 -+#define CONFIG_FLV_DECODER 0 -+#define CONFIG_FMVC_DECODER 0 -+#define CONFIG_FOURXM_DECODER 0 -+#define CONFIG_FRAPS_DECODER 0 -+#define CONFIG_FRWU_DECODER 0 -+#define CONFIG_G2M_DECODER 0 -+#define CONFIG_GDV_DECODER 0 -+#define CONFIG_GEM_DECODER 0 -+#define CONFIG_GIF_DECODER 0 -+#define CONFIG_H261_DECODER 0 -+#define CONFIG_H263_DECODER 0 -+#define CONFIG_H263I_DECODER 0 -+#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 -+#define CONFIG_H264_QSV_DECODER 0 -+#define CONFIG_H264_RKMPP_DECODER 0 -+#define CONFIG_HAP_DECODER 0 -+#define CONFIG_HEVC_DECODER 0 -+#define CONFIG_HEVC_QSV_DECODER 0 -+#define CONFIG_HEVC_RKMPP_DECODER 0 -+#define CONFIG_HEVC_V4L2M2M_DECODER 0 -+#define CONFIG_HNM4_VIDEO_DECODER 0 -+#define CONFIG_HQ_HQA_DECODER 0 -+#define CONFIG_HQX_DECODER 0 -+#define CONFIG_HUFFYUV_DECODER 0 -+#define CONFIG_HYMT_DECODER 0 -+#define CONFIG_IDCIN_DECODER 0 -+#define CONFIG_IFF_ILBM_DECODER 0 -+#define CONFIG_IMM4_DECODER 0 -+#define CONFIG_IMM5_DECODER 0 -+#define CONFIG_INDEO2_DECODER 0 -+#define CONFIG_INDEO3_DECODER 0 -+#define CONFIG_INDEO4_DECODER 0 -+#define CONFIG_INDEO5_DECODER 0 -+#define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+#define CONFIG_IPU_DECODER 0 -+#define CONFIG_JPEG2000_DECODER 0 -+#define CONFIG_JPEGLS_DECODER 0 -+#define CONFIG_JV_DECODER 0 -+#define CONFIG_KGV1_DECODER 0 -+#define CONFIG_KMVC_DECODER 0 -+#define CONFIG_LAGARITH_DECODER 0 -+#define CONFIG_LOCO_DECODER 0 -+#define CONFIG_LSCR_DECODER 0 -+#define CONFIG_M101_DECODER 0 -+#define CONFIG_MAGICYUV_DECODER 0 -+#define CONFIG_MDEC_DECODER 0 -+#define CONFIG_MIMIC_DECODER 0 -+#define CONFIG_MJPEG_DECODER 0 -+#define CONFIG_MJPEGB_DECODER 0 -+#define CONFIG_MMVIDEO_DECODER 0 -+#define CONFIG_MOBICLIP_DECODER 0 -+#define CONFIG_MOTIONPIXELS_DECODER 0 -+#define CONFIG_MPEG1VIDEO_DECODER 0 -+#define CONFIG_MPEG2VIDEO_DECODER 0 -+#define CONFIG_MPEG4_DECODER 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 -+#define CONFIG_MSA1_DECODER 0 -+#define CONFIG_MSCC_DECODER 0 -+#define CONFIG_MSMPEG4V1_DECODER 0 -+#define CONFIG_MSMPEG4V2_DECODER 0 -+#define CONFIG_MSMPEG4V3_DECODER 0 -+#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 -+#define CONFIG_MSP2_DECODER 0 -+#define CONFIG_MSRLE_DECODER 0 -+#define CONFIG_MSS1_DECODER 0 -+#define CONFIG_MSS2_DECODER 0 -+#define CONFIG_MSVIDEO1_DECODER 0 -+#define CONFIG_MSZH_DECODER 0 -+#define CONFIG_MTS2_DECODER 0 -+#define CONFIG_MV30_DECODER 0 -+#define CONFIG_MVC1_DECODER 0 -+#define CONFIG_MVC2_DECODER 0 -+#define CONFIG_MVDV_DECODER 0 -+#define CONFIG_MVHA_DECODER 0 -+#define CONFIG_MWSC_DECODER 0 -+#define CONFIG_MXPEG_DECODER 0 -+#define CONFIG_NOTCHLC_DECODER 0 -+#define CONFIG_NUV_DECODER 0 -+#define CONFIG_PAF_VIDEO_DECODER 0 -+#define CONFIG_PAM_DECODER 0 -+#define CONFIG_PBM_DECODER 0 -+#define CONFIG_PCX_DECODER 0 -+#define CONFIG_PFM_DECODER 0 -+#define CONFIG_PGM_DECODER 0 -+#define CONFIG_PGMYUV_DECODER 0 -+#define CONFIG_PGX_DECODER 0 -+#define CONFIG_PHOTOCD_DECODER 0 -+#define CONFIG_PICTOR_DECODER 0 -+#define CONFIG_PIXLET_DECODER 0 -+#define CONFIG_PNG_DECODER 0 -+#define CONFIG_PPM_DECODER 0 -+#define CONFIG_PRORES_DECODER 0 -+#define CONFIG_PROSUMER_DECODER 0 -+#define CONFIG_PSD_DECODER 0 -+#define CONFIG_PTX_DECODER 0 -+#define CONFIG_QDRAW_DECODER 0 -+#define CONFIG_QPEG_DECODER 0 -+#define CONFIG_QTRLE_DECODER 0 -+#define CONFIG_R10K_DECODER 0 -+#define CONFIG_R210_DECODER 0 -+#define CONFIG_RASC_DECODER 0 -+#define CONFIG_RAWVIDEO_DECODER 0 -+#define CONFIG_RL2_DECODER 0 -+#define CONFIG_ROQ_DECODER 0 -+#define CONFIG_RPZA_DECODER 0 -+#define CONFIG_RSCC_DECODER 0 -+#define CONFIG_RV10_DECODER 0 -+#define CONFIG_RV20_DECODER 0 -+#define CONFIG_RV30_DECODER 0 -+#define CONFIG_RV40_DECODER 0 -+#define CONFIG_S302M_DECODER 0 -+#define CONFIG_SANM_DECODER 0 -+#define CONFIG_SCPR_DECODER 0 -+#define CONFIG_SCREENPRESSO_DECODER 0 -+#define CONFIG_SGA_DECODER 0 -+#define CONFIG_SGI_DECODER 0 -+#define CONFIG_SGIRLE_DECODER 0 -+#define CONFIG_SHEERVIDEO_DECODER 0 -+#define CONFIG_SIMBIOSIS_IMX_DECODER 0 -+#define CONFIG_SMACKER_DECODER 0 -+#define CONFIG_SMC_DECODER 0 -+#define CONFIG_SMVJPEG_DECODER 0 -+#define CONFIG_SNOW_DECODER 0 -+#define CONFIG_SP5X_DECODER 0 -+#define CONFIG_SPEEDHQ_DECODER 0 -+#define CONFIG_SPEEX_DECODER 0 -+#define CONFIG_SRGC_DECODER 0 -+#define CONFIG_SUNRAST_DECODER 0 -+#define CONFIG_SVQ1_DECODER 0 -+#define CONFIG_SVQ3_DECODER 0 -+#define CONFIG_TARGA_DECODER 0 -+#define CONFIG_TARGA_Y216_DECODER 0 -+#define CONFIG_TDSC_DECODER 0 -+#define CONFIG_THEORA_DECODER 1 -+#define CONFIG_THP_DECODER 0 -+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+#define CONFIG_TIFF_DECODER 0 -+#define CONFIG_TMV_DECODER 0 -+#define CONFIG_TRUEMOTION1_DECODER 0 -+#define CONFIG_TRUEMOTION2_DECODER 0 -+#define CONFIG_TRUEMOTION2RT_DECODER 0 -+#define CONFIG_TSCC_DECODER 0 -+#define CONFIG_TSCC2_DECODER 0 -+#define CONFIG_TXD_DECODER 0 -+#define CONFIG_ULTI_DECODER 0 -+#define CONFIG_UTVIDEO_DECODER 0 -+#define CONFIG_V210_DECODER 0 -+#define CONFIG_V210X_DECODER 0 -+#define CONFIG_V308_DECODER 0 -+#define CONFIG_V408_DECODER 0 -+#define CONFIG_V410_DECODER 0 -+#define CONFIG_VB_DECODER 0 -+#define CONFIG_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 -+#define CONFIG_VC1_V4L2M2M_DECODER 0 -+#define CONFIG_VCR1_DECODER 0 -+#define CONFIG_VMDVIDEO_DECODER 0 -+#define CONFIG_VMNC_DECODER 0 -+#define CONFIG_VP3_DECODER 1 -+#define CONFIG_VP4_DECODER 0 -+#define CONFIG_VP5_DECODER 0 -+#define CONFIG_VP6_DECODER 0 -+#define CONFIG_VP6A_DECODER 0 -+#define CONFIG_VP6F_DECODER 0 -+#define CONFIG_VP7_DECODER 0 -+#define CONFIG_VP8_DECODER 1 -+#define CONFIG_VP8_RKMPP_DECODER 0 -+#define CONFIG_VP8_V4L2M2M_DECODER 0 -+#define CONFIG_VP9_DECODER 0 -+#define CONFIG_VP9_RKMPP_DECODER 0 -+#define CONFIG_VP9_V4L2M2M_DECODER 0 -+#define CONFIG_VQA_DECODER 0 -+#define CONFIG_WEBP_DECODER 0 -+#define CONFIG_WCMV_DECODER 0 -+#define CONFIG_WRAPPED_AVFRAME_DECODER 0 -+#define CONFIG_WMV1_DECODER 0 -+#define CONFIG_WMV2_DECODER 0 -+#define CONFIG_WMV3_DECODER 0 -+#define CONFIG_WMV3_CRYSTALHD_DECODER 0 -+#define CONFIG_WMV3IMAGE_DECODER 0 -+#define CONFIG_WNV1_DECODER 0 -+#define CONFIG_XAN_WC3_DECODER 0 -+#define CONFIG_XAN_WC4_DECODER 0 -+#define CONFIG_XBM_DECODER 0 -+#define CONFIG_XFACE_DECODER 0 -+#define CONFIG_XL_DECODER 0 -+#define CONFIG_XPM_DECODER 0 -+#define CONFIG_XWD_DECODER 0 -+#define CONFIG_Y41P_DECODER 0 -+#define CONFIG_YLC_DECODER 0 -+#define CONFIG_YOP_DECODER 0 -+#define CONFIG_YUV4_DECODER 0 -+#define CONFIG_ZERO12V_DECODER 0 -+#define CONFIG_ZEROCODEC_DECODER 0 -+#define CONFIG_ZLIB_DECODER 0 -+#define CONFIG_ZMBV_DECODER 0 -+#define CONFIG_AAC_DECODER 1 -+#define CONFIG_AAC_FIXED_DECODER 0 -+#define CONFIG_AAC_LATM_DECODER 0 -+#define CONFIG_AC3_DECODER 0 -+#define CONFIG_AC3_FIXED_DECODER 0 -+#define CONFIG_ACELP_KELVIN_DECODER 0 -+#define CONFIG_ALAC_DECODER 0 -+#define CONFIG_ALS_DECODER 0 -+#define CONFIG_AMRNB_DECODER 0 -+#define CONFIG_AMRWB_DECODER 0 -+#define CONFIG_APE_DECODER 0 -+#define CONFIG_APTX_DECODER 0 -+#define CONFIG_APTX_HD_DECODER 0 -+#define CONFIG_ATRAC1_DECODER 0 -+#define CONFIG_ATRAC3_DECODER 0 -+#define CONFIG_ATRAC3AL_DECODER 0 -+#define CONFIG_ATRAC3P_DECODER 0 -+#define CONFIG_ATRAC3PAL_DECODER 0 -+#define CONFIG_ATRAC9_DECODER 0 -+#define CONFIG_BINKAUDIO_DCT_DECODER 0 -+#define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+#define CONFIG_BMV_AUDIO_DECODER 0 -+#define CONFIG_COOK_DECODER 0 -+#define CONFIG_DCA_DECODER 0 -+#define CONFIG_DOLBY_E_DECODER 0 -+#define CONFIG_DSD_LSBF_DECODER 0 -+#define CONFIG_DSD_MSBF_DECODER 0 -+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0 -+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0 -+#define CONFIG_DSICINAUDIO_DECODER 0 -+#define CONFIG_DSS_SP_DECODER 0 -+#define CONFIG_DST_DECODER 0 -+#define CONFIG_EAC3_DECODER 0 -+#define CONFIG_EVRC_DECODER 0 -+#define CONFIG_FASTAUDIO_DECODER 0 -+#define CONFIG_FFWAVESYNTH_DECODER 0 -+#define CONFIG_FLAC_DECODER 1 -+#define CONFIG_G723_1_DECODER 0 -+#define CONFIG_G729_DECODER 0 -+#define CONFIG_GSM_DECODER 0 -+#define CONFIG_GSM_MS_DECODER 0 -+#define CONFIG_HCA_DECODER 0 -+#define CONFIG_HCOM_DECODER 0 -+#define CONFIG_IAC_DECODER 0 -+#define CONFIG_ILBC_DECODER 0 -+#define CONFIG_IMC_DECODER 0 -+#define CONFIG_INTERPLAY_ACM_DECODER 0 -+#define CONFIG_MACE3_DECODER 0 -+#define CONFIG_MACE6_DECODER 0 -+#define CONFIG_METASOUND_DECODER 0 -+#define CONFIG_MLP_DECODER 0 -+#define CONFIG_MP1_DECODER 0 -+#define CONFIG_MP1FLOAT_DECODER 0 -+#define CONFIG_MP2_DECODER 0 -+#define CONFIG_MP2FLOAT_DECODER 0 -+#define CONFIG_MP3FLOAT_DECODER 0 -+#define CONFIG_MP3_DECODER 1 -+#define CONFIG_MP3ADUFLOAT_DECODER 0 -+#define CONFIG_MP3ADU_DECODER 0 -+#define CONFIG_MP3ON4FLOAT_DECODER 0 -+#define CONFIG_MP3ON4_DECODER 0 -+#define CONFIG_MPC7_DECODER 0 -+#define CONFIG_MPC8_DECODER 0 -+#define CONFIG_MSNSIREN_DECODER 0 -+#define CONFIG_NELLYMOSER_DECODER 0 -+#define CONFIG_ON2AVC_DECODER 0 -+#define CONFIG_OPUS_DECODER 0 -+#define CONFIG_PAF_AUDIO_DECODER 0 -+#define CONFIG_QCELP_DECODER 0 -+#define CONFIG_QDM2_DECODER 0 -+#define CONFIG_QDMC_DECODER 0 -+#define CONFIG_RA_144_DECODER 0 -+#define CONFIG_RA_288_DECODER 0 -+#define CONFIG_RALF_DECODER 0 -+#define CONFIG_SBC_DECODER 0 -+#define CONFIG_SHORTEN_DECODER 0 -+#define CONFIG_SIPR_DECODER 0 -+#define CONFIG_SIREN_DECODER 0 -+#define CONFIG_SMACKAUD_DECODER 0 -+#define CONFIG_SONIC_DECODER 0 -+#define CONFIG_TAK_DECODER 0 -+#define CONFIG_TRUEHD_DECODER 0 -+#define CONFIG_TRUESPEECH_DECODER 0 -+#define CONFIG_TTA_DECODER 0 -+#define CONFIG_TWINVQ_DECODER 0 -+#define CONFIG_VMDAUDIO_DECODER 0 -+#define CONFIG_VORBIS_DECODER 1 -+#define CONFIG_WAVPACK_DECODER 0 -+#define CONFIG_WMALOSSLESS_DECODER 0 -+#define CONFIG_WMAPRO_DECODER 0 -+#define CONFIG_WMAV1_DECODER 0 -+#define CONFIG_WMAV2_DECODER 0 -+#define CONFIG_WMAVOICE_DECODER 0 -+#define CONFIG_WS_SND1_DECODER 0 -+#define CONFIG_XMA1_DECODER 0 -+#define CONFIG_XMA2_DECODER 0 -+#define CONFIG_PCM_ALAW_DECODER 1 -+#define CONFIG_PCM_BLURAY_DECODER 0 -+#define CONFIG_PCM_DVD_DECODER 0 -+#define CONFIG_PCM_F16LE_DECODER 0 -+#define CONFIG_PCM_F24LE_DECODER 0 -+#define CONFIG_PCM_F32BE_DECODER 0 -+#define CONFIG_PCM_F32LE_DECODER 1 -+#define CONFIG_PCM_F64BE_DECODER 0 -+#define CONFIG_PCM_F64LE_DECODER 0 -+#define CONFIG_PCM_LXF_DECODER 0 -+#define CONFIG_PCM_MULAW_DECODER 1 -+#define CONFIG_PCM_S8_DECODER 0 -+#define CONFIG_PCM_S8_PLANAR_DECODER 0 -+#define CONFIG_PCM_S16BE_DECODER 1 -+#define CONFIG_PCM_S16BE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S16LE_DECODER 1 -+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S24BE_DECODER 1 -+#define CONFIG_PCM_S24DAUD_DECODER 0 -+#define CONFIG_PCM_S24LE_DECODER 1 -+#define CONFIG_PCM_S24LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S32BE_DECODER 0 -+#define CONFIG_PCM_S32LE_DECODER 1 -+#define CONFIG_PCM_S32LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S64BE_DECODER 0 -+#define CONFIG_PCM_S64LE_DECODER 0 -+#define CONFIG_PCM_SGA_DECODER 0 -+#define CONFIG_PCM_U8_DECODER 1 -+#define CONFIG_PCM_U16BE_DECODER 0 -+#define CONFIG_PCM_U16LE_DECODER 0 -+#define CONFIG_PCM_U24BE_DECODER 0 -+#define CONFIG_PCM_U24LE_DECODER 0 -+#define CONFIG_PCM_U32BE_DECODER 0 -+#define CONFIG_PCM_U32LE_DECODER 0 -+#define CONFIG_PCM_VIDC_DECODER 0 -+#define CONFIG_DERF_DPCM_DECODER 0 -+#define CONFIG_GREMLIN_DPCM_DECODER 0 -+#define CONFIG_INTERPLAY_DPCM_DECODER 0 -+#define CONFIG_ROQ_DPCM_DECODER 0 -+#define CONFIG_SDX2_DPCM_DECODER 0 -+#define CONFIG_SOL_DPCM_DECODER 0 -+#define CONFIG_XAN_DPCM_DECODER 0 -+#define CONFIG_ADPCM_4XM_DECODER 0 -+#define CONFIG_ADPCM_ADX_DECODER 0 -+#define CONFIG_ADPCM_AFC_DECODER 0 -+#define CONFIG_ADPCM_AGM_DECODER 0 -+#define CONFIG_ADPCM_AICA_DECODER 0 -+#define CONFIG_ADPCM_ARGO_DECODER 0 -+#define CONFIG_ADPCM_CT_DECODER 0 -+#define CONFIG_ADPCM_DTK_DECODER 0 -+#define CONFIG_ADPCM_EA_DECODER 0 -+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+#define CONFIG_ADPCM_EA_R1_DECODER 0 -+#define CONFIG_ADPCM_EA_R2_DECODER 0 -+#define CONFIG_ADPCM_EA_R3_DECODER 0 -+#define CONFIG_ADPCM_EA_XAS_DECODER 0 -+#define CONFIG_ADPCM_G722_DECODER 0 -+#define CONFIG_ADPCM_G726_DECODER 0 -+#define CONFIG_ADPCM_G726LE_DECODER 0 -+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0 -+#define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+#define CONFIG_ADPCM_IMA_ALP_DECODER 0 -+#define CONFIG_ADPCM_IMA_APC_DECODER 0 -+#define CONFIG_ADPCM_IMA_APM_DECODER 0 -+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 -+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 -+#define CONFIG_ADPCM_IMA_MTF_DECODER 0 -+#define CONFIG_ADPCM_IMA_OKI_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_DECODER 0 -+#define CONFIG_ADPCM_IMA_RAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_SSI_DECODER 0 -+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+#define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+#define CONFIG_ADPCM_IMA_WS_DECODER 0 -+#define CONFIG_ADPCM_MS_DECODER 0 -+#define CONFIG_ADPCM_MTAF_DECODER 0 -+#define CONFIG_ADPCM_PSX_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+#define CONFIG_ADPCM_SWF_DECODER 0 -+#define CONFIG_ADPCM_THP_DECODER 0 -+#define CONFIG_ADPCM_THP_LE_DECODER 0 -+#define CONFIG_ADPCM_VIMA_DECODER 0 -+#define CONFIG_ADPCM_XA_DECODER 0 -+#define CONFIG_ADPCM_YAMAHA_DECODER 0 -+#define CONFIG_ADPCM_ZORK_DECODER 0 -+#define CONFIG_SSA_DECODER 0 -+#define CONFIG_ASS_DECODER 0 -+#define CONFIG_CCAPTION_DECODER 0 -+#define CONFIG_DVBSUB_DECODER 0 -+#define CONFIG_DVDSUB_DECODER 0 -+#define CONFIG_JACOSUB_DECODER 0 -+#define CONFIG_MICRODVD_DECODER 0 -+#define CONFIG_MOVTEXT_DECODER 0 -+#define CONFIG_MPL2_DECODER 0 -+#define CONFIG_PGSSUB_DECODER 0 -+#define CONFIG_PJS_DECODER 0 -+#define CONFIG_REALTEXT_DECODER 0 -+#define CONFIG_SAMI_DECODER 0 -+#define CONFIG_SRT_DECODER 0 -+#define CONFIG_STL_DECODER 0 -+#define CONFIG_SUBRIP_DECODER 0 -+#define CONFIG_SUBVIEWER_DECODER 0 -+#define CONFIG_SUBVIEWER1_DECODER 0 -+#define CONFIG_TEXT_DECODER 0 -+#define CONFIG_VPLAYER_DECODER 0 -+#define CONFIG_WEBVTT_DECODER 0 -+#define CONFIG_XSUB_DECODER 0 -+#define CONFIG_AAC_AT_DECODER 0 -+#define CONFIG_AC3_AT_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 -+#define CONFIG_ALAC_AT_DECODER 0 -+#define CONFIG_AMR_NB_AT_DECODER 0 -+#define CONFIG_EAC3_AT_DECODER 0 -+#define CONFIG_GSM_MS_AT_DECODER 0 -+#define CONFIG_ILBC_AT_DECODER 0 -+#define CONFIG_MP1_AT_DECODER 0 -+#define CONFIG_MP2_AT_DECODER 0 -+#define CONFIG_MP3_AT_DECODER 0 -+#define CONFIG_PCM_ALAW_AT_DECODER 0 -+#define CONFIG_PCM_MULAW_AT_DECODER 0 -+#define CONFIG_QDMC_AT_DECODER 0 -+#define CONFIG_QDM2_AT_DECODER 0 -+#define CONFIG_LIBARIBB24_DECODER 0 -+#define CONFIG_LIBCELT_DECODER 0 -+#define CONFIG_LIBCODEC2_DECODER 0 -+#define CONFIG_LIBDAV1D_DECODER 0 -+#define CONFIG_LIBDAVS2_DECODER 0 -+#define CONFIG_LIBFDK_AAC_DECODER 0 -+#define CONFIG_LIBGSM_DECODER 0 -+#define CONFIG_LIBGSM_MS_DECODER 0 -+#define CONFIG_LIBILBC_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+#define CONFIG_LIBOPENJPEG_DECODER 0 -+#define CONFIG_LIBOPUS_DECODER 1 -+#define CONFIG_LIBRSVG_DECODER 0 -+#define CONFIG_LIBSPEEX_DECODER 0 -+#define CONFIG_LIBUAVS3D_DECODER 0 -+#define CONFIG_LIBVORBIS_DECODER 0 -+#define CONFIG_LIBVPX_VP8_DECODER 0 -+#define CONFIG_LIBVPX_VP9_DECODER 0 -+#define CONFIG_LIBZVBI_TELETEXT_DECODER 0 -+#define CONFIG_BINTEXT_DECODER 0 -+#define CONFIG_XBIN_DECODER 0 -+#define CONFIG_IDF_DECODER 0 -+#define CONFIG_LIBAOM_AV1_DECODER 0 -+#define CONFIG_AV1_DECODER 0 -+#define CONFIG_AV1_CUVID_DECODER 0 -+#define CONFIG_AV1_QSV_DECODER 0 -+#define CONFIG_LIBOPENH264_DECODER 0 -+#define CONFIG_H264_CUVID_DECODER 0 -+#define CONFIG_HEVC_CUVID_DECODER 0 -+#define CONFIG_HEVC_MEDIACODEC_DECODER 0 -+#define CONFIG_MJPEG_CUVID_DECODER 0 -+#define CONFIG_MJPEG_QSV_DECODER 0 -+#define CONFIG_MPEG1_CUVID_DECODER 0 -+#define CONFIG_MPEG2_CUVID_DECODER 0 -+#define CONFIG_MPEG4_CUVID_DECODER 0 -+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0 -+#define CONFIG_VC1_CUVID_DECODER 0 -+#define CONFIG_VP8_CUVID_DECODER 0 -+#define CONFIG_VP8_MEDIACODEC_DECODER 0 -+#define CONFIG_VP8_QSV_DECODER 0 -+#define CONFIG_VP9_CUVID_DECODER 0 -+#define CONFIG_VP9_MEDIACODEC_DECODER 0 -+#define CONFIG_VP9_QSV_DECODER 0 -+#define CONFIG_A64MULTI_ENCODER 0 -+#define CONFIG_A64MULTI5_ENCODER 0 -+#define CONFIG_ALIAS_PIX_ENCODER 0 -+#define CONFIG_AMV_ENCODER 0 -+#define CONFIG_APNG_ENCODER 0 -+#define CONFIG_ASV1_ENCODER 0 -+#define CONFIG_ASV2_ENCODER 0 -+#define CONFIG_AVRP_ENCODER 0 -+#define CONFIG_AVUI_ENCODER 0 -+#define CONFIG_AYUV_ENCODER 0 -+#define CONFIG_BITPACKED_ENCODER 0 -+#define CONFIG_BMP_ENCODER 0 -+#define CONFIG_CFHD_ENCODER 0 -+#define CONFIG_CINEPAK_ENCODER 0 -+#define CONFIG_CLJR_ENCODER 0 -+#define CONFIG_COMFORTNOISE_ENCODER 0 -+#define CONFIG_DNXHD_ENCODER 0 -+#define CONFIG_DPX_ENCODER 0 -+#define CONFIG_DVVIDEO_ENCODER 0 -+#define CONFIG_EXR_ENCODER 0 -+#define CONFIG_FFV1_ENCODER 0 -+#define CONFIG_FFVHUFF_ENCODER 0 -+#define CONFIG_FITS_ENCODER 0 -+#define CONFIG_FLASHSV_ENCODER 0 -+#define CONFIG_FLASHSV2_ENCODER 0 -+#define CONFIG_FLV_ENCODER 0 -+#define CONFIG_GIF_ENCODER 0 -+#define CONFIG_H261_ENCODER 0 -+#define CONFIG_H263_ENCODER 0 -+#define CONFIG_H263P_ENCODER 0 -+#define CONFIG_HAP_ENCODER 0 -+#define CONFIG_HUFFYUV_ENCODER 0 -+#define CONFIG_JPEG2000_ENCODER 0 -+#define CONFIG_JPEGLS_ENCODER 0 -+#define CONFIG_LJPEG_ENCODER 0 -+#define CONFIG_MAGICYUV_ENCODER 0 -+#define CONFIG_MJPEG_ENCODER 0 -+#define CONFIG_MPEG1VIDEO_ENCODER 0 -+#define CONFIG_MPEG2VIDEO_ENCODER 0 -+#define CONFIG_MPEG4_ENCODER 0 -+#define CONFIG_MSMPEG4V2_ENCODER 0 -+#define CONFIG_MSMPEG4V3_ENCODER 0 -+#define CONFIG_MSVIDEO1_ENCODER 0 -+#define CONFIG_PAM_ENCODER 0 -+#define CONFIG_PBM_ENCODER 0 -+#define CONFIG_PCX_ENCODER 0 -+#define CONFIG_PFM_ENCODER 0 -+#define CONFIG_PGM_ENCODER 0 -+#define CONFIG_PGMYUV_ENCODER 0 -+#define CONFIG_PNG_ENCODER 0 -+#define CONFIG_PPM_ENCODER 0 -+#define CONFIG_PRORES_ENCODER 0 -+#define CONFIG_PRORES_AW_ENCODER 0 -+#define CONFIG_PRORES_KS_ENCODER 0 -+#define CONFIG_QTRLE_ENCODER 0 -+#define CONFIG_R10K_ENCODER 0 -+#define CONFIG_R210_ENCODER 0 -+#define CONFIG_RAWVIDEO_ENCODER 0 -+#define CONFIG_ROQ_ENCODER 0 -+#define CONFIG_RPZA_ENCODER 0 -+#define CONFIG_RV10_ENCODER 0 -+#define CONFIG_RV20_ENCODER 0 -+#define CONFIG_S302M_ENCODER 0 -+#define CONFIG_SGI_ENCODER 0 -+#define CONFIG_SMC_ENCODER 0 -+#define CONFIG_SNOW_ENCODER 0 -+#define CONFIG_SPEEDHQ_ENCODER 0 -+#define CONFIG_SUNRAST_ENCODER 0 -+#define CONFIG_SVQ1_ENCODER 0 -+#define CONFIG_TARGA_ENCODER 0 -+#define CONFIG_TIFF_ENCODER 0 -+#define CONFIG_UTVIDEO_ENCODER 0 -+#define CONFIG_V210_ENCODER 0 -+#define CONFIG_V308_ENCODER 0 -+#define CONFIG_V408_ENCODER 0 -+#define CONFIG_V410_ENCODER 0 -+#define CONFIG_VC2_ENCODER 0 -+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 -+#define CONFIG_WMV1_ENCODER 0 -+#define CONFIG_WMV2_ENCODER 0 -+#define CONFIG_XBM_ENCODER 0 -+#define CONFIG_XFACE_ENCODER 0 -+#define CONFIG_XWD_ENCODER 0 -+#define CONFIG_Y41P_ENCODER 0 -+#define CONFIG_YUV4_ENCODER 0 -+#define CONFIG_ZLIB_ENCODER 0 -+#define CONFIG_ZMBV_ENCODER 0 -+#define CONFIG_AAC_ENCODER 0 -+#define CONFIG_AC3_ENCODER 0 -+#define CONFIG_AC3_FIXED_ENCODER 0 -+#define CONFIG_ALAC_ENCODER 0 -+#define CONFIG_APTX_ENCODER 0 -+#define CONFIG_APTX_HD_ENCODER 0 -+#define CONFIG_DCA_ENCODER 0 -+#define CONFIG_EAC3_ENCODER 0 -+#define CONFIG_FLAC_ENCODER 0 -+#define CONFIG_G723_1_ENCODER 0 -+#define CONFIG_MLP_ENCODER 0 -+#define CONFIG_MP2_ENCODER 0 -+#define CONFIG_MP2FIXED_ENCODER 0 -+#define CONFIG_NELLYMOSER_ENCODER 0 -+#define CONFIG_OPUS_ENCODER 0 -+#define CONFIG_RA_144_ENCODER 0 -+#define CONFIG_SBC_ENCODER 0 -+#define CONFIG_SONIC_ENCODER 0 -+#define CONFIG_SONIC_LS_ENCODER 0 -+#define CONFIG_TRUEHD_ENCODER 0 -+#define CONFIG_TTA_ENCODER 0 -+#define CONFIG_VORBIS_ENCODER 0 -+#define CONFIG_WAVPACK_ENCODER 0 -+#define CONFIG_WMAV1_ENCODER 0 -+#define CONFIG_WMAV2_ENCODER 0 -+#define CONFIG_PCM_ALAW_ENCODER 0 -+#define CONFIG_PCM_DVD_ENCODER 0 -+#define CONFIG_PCM_F32BE_ENCODER 0 -+#define CONFIG_PCM_F32LE_ENCODER 0 -+#define CONFIG_PCM_F64BE_ENCODER 0 -+#define CONFIG_PCM_F64LE_ENCODER 0 -+#define CONFIG_PCM_MULAW_ENCODER 0 -+#define CONFIG_PCM_S8_ENCODER 0 -+#define CONFIG_PCM_S8_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S16BE_ENCODER 0 -+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S16LE_ENCODER 0 -+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S24BE_ENCODER 0 -+#define CONFIG_PCM_S24DAUD_ENCODER 0 -+#define CONFIG_PCM_S24LE_ENCODER 0 -+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S32BE_ENCODER 0 -+#define CONFIG_PCM_S32LE_ENCODER 0 -+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S64BE_ENCODER 0 -+#define CONFIG_PCM_S64LE_ENCODER 0 -+#define CONFIG_PCM_U8_ENCODER 0 -+#define CONFIG_PCM_U16BE_ENCODER 0 -+#define CONFIG_PCM_U16LE_ENCODER 0 -+#define CONFIG_PCM_U24BE_ENCODER 0 -+#define CONFIG_PCM_U24LE_ENCODER 0 -+#define CONFIG_PCM_U32BE_ENCODER 0 -+#define CONFIG_PCM_U32LE_ENCODER 0 -+#define CONFIG_PCM_VIDC_ENCODER 0 -+#define CONFIG_ROQ_DPCM_ENCODER 0 -+#define CONFIG_ADPCM_ADX_ENCODER 0 -+#define CONFIG_ADPCM_ARGO_ENCODER 0 -+#define CONFIG_ADPCM_G722_ENCODER 0 -+#define CONFIG_ADPCM_G726_ENCODER 0 -+#define CONFIG_ADPCM_G726LE_ENCODER 0 -+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0 -+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0 -+#define CONFIG_ADPCM_IMA_APM_ENCODER 0 -+#define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WS_ENCODER 0 -+#define CONFIG_ADPCM_MS_ENCODER 0 -+#define CONFIG_ADPCM_SWF_ENCODER 0 -+#define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+#define CONFIG_SSA_ENCODER 0 -+#define CONFIG_ASS_ENCODER 0 -+#define CONFIG_DVBSUB_ENCODER 0 -+#define CONFIG_DVDSUB_ENCODER 0 -+#define CONFIG_MOVTEXT_ENCODER 0 -+#define CONFIG_SRT_ENCODER 0 -+#define CONFIG_SUBRIP_ENCODER 0 -+#define CONFIG_TEXT_ENCODER 0 -+#define CONFIG_TTML_ENCODER 0 -+#define CONFIG_WEBVTT_ENCODER 0 -+#define CONFIG_XSUB_ENCODER 0 -+#define CONFIG_AAC_AT_ENCODER 0 -+#define CONFIG_ALAC_AT_ENCODER 0 -+#define CONFIG_ILBC_AT_ENCODER 0 -+#define CONFIG_PCM_ALAW_AT_ENCODER 0 -+#define CONFIG_PCM_MULAW_AT_ENCODER 0 -+#define CONFIG_LIBAOM_AV1_ENCODER 0 -+#define CONFIG_LIBCODEC2_ENCODER 0 -+#define CONFIG_LIBFDK_AAC_ENCODER 0 -+#define CONFIG_LIBGSM_ENCODER 0 -+#define CONFIG_LIBGSM_MS_ENCODER 0 -+#define CONFIG_LIBILBC_ENCODER 0 -+#define CONFIG_LIBMP3LAME_ENCODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+#define CONFIG_LIBOPENJPEG_ENCODER 0 -+#define CONFIG_LIBOPUS_ENCODER 0 -+#define CONFIG_LIBRAV1E_ENCODER 0 -+#define CONFIG_LIBSHINE_ENCODER 0 -+#define CONFIG_LIBSPEEX_ENCODER 0 -+#define CONFIG_LIBSVTAV1_ENCODER 0 -+#define CONFIG_LIBTHEORA_ENCODER 0 -+#define CONFIG_LIBTWOLAME_ENCODER 0 -+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0 -+#define CONFIG_LIBVORBIS_ENCODER 0 -+#define CONFIG_LIBVPX_VP8_ENCODER 0 -+#define CONFIG_LIBVPX_VP9_ENCODER 0 -+#define CONFIG_LIBWEBP_ANIM_ENCODER 0 -+#define CONFIG_LIBWEBP_ENCODER 0 -+#define CONFIG_LIBX262_ENCODER 0 -+#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBX264RGB_ENCODER 0 -+#define CONFIG_LIBX265_ENCODER 0 -+#define CONFIG_LIBXAVS_ENCODER 0 -+#define CONFIG_LIBXAVS2_ENCODER 0 -+#define CONFIG_LIBXVID_ENCODER 0 -+#define CONFIG_AAC_MF_ENCODER 0 -+#define CONFIG_AC3_MF_ENCODER 0 -+#define CONFIG_H263_V4L2M2M_ENCODER 0 -+#define CONFIG_LIBOPENH264_ENCODER 0 -+#define CONFIG_H264_AMF_ENCODER 0 -+#define CONFIG_H264_MF_ENCODER 0 -+#define CONFIG_H264_NVENC_ENCODER 0 -+#define CONFIG_H264_OMX_ENCODER 0 -+#define CONFIG_H264_QSV_ENCODER 0 -+#define CONFIG_H264_V4L2M2M_ENCODER 0 -+#define CONFIG_H264_VAAPI_ENCODER 0 -+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_HEVC_AMF_ENCODER 0 -+#define CONFIG_HEVC_MF_ENCODER 0 -+#define CONFIG_HEVC_NVENC_ENCODER 0 -+#define CONFIG_HEVC_QSV_ENCODER 0 -+#define CONFIG_HEVC_V4L2M2M_ENCODER 0 -+#define CONFIG_HEVC_VAAPI_ENCODER 0 -+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_LIBKVAZAAR_ENCODER 0 -+#define CONFIG_MJPEG_QSV_ENCODER 0 -+#define CONFIG_MJPEG_VAAPI_ENCODER 0 -+#define CONFIG_MP3_MF_ENCODER 0 -+#define CONFIG_MPEG2_QSV_ENCODER 0 -+#define CONFIG_MPEG2_VAAPI_ENCODER 0 -+#define CONFIG_MPEG4_OMX_ENCODER 0 -+#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 -+#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_VP8_V4L2M2M_ENCODER 0 -+#define CONFIG_VP8_VAAPI_ENCODER 0 -+#define CONFIG_VP9_VAAPI_ENCODER 0 -+#define CONFIG_VP9_QSV_ENCODER 0 -+#define CONFIG_AV1_D3D11VA_HWACCEL 0 -+#define CONFIG_AV1_D3D11VA2_HWACCEL 0 -+#define CONFIG_AV1_DXVA2_HWACCEL 0 -+#define CONFIG_AV1_NVDEC_HWACCEL 0 -+#define CONFIG_AV1_VAAPI_HWACCEL 0 -+#define CONFIG_H263_VAAPI_HWACCEL 0 -+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_H264_D3D11VA_HWACCEL 0 -+#define CONFIG_H264_D3D11VA2_HWACCEL 0 -+#define CONFIG_H264_DXVA2_HWACCEL 0 -+#define CONFIG_H264_NVDEC_HWACCEL 0 -+#define CONFIG_H264_VAAPI_HWACCEL 0 -+#define CONFIG_H264_VDPAU_HWACCEL 0 -+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_HEVC_D3D11VA_HWACCEL 0 -+#define CONFIG_HEVC_D3D11VA2_HWACCEL 0 -+#define CONFIG_HEVC_DXVA2_HWACCEL 0 -+#define CONFIG_HEVC_NVDEC_HWACCEL 0 -+#define CONFIG_HEVC_VAAPI_HWACCEL 0 -+#define CONFIG_HEVC_VDPAU_HWACCEL 0 -+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MJPEG_NVDEC_HWACCEL 0 -+#define CONFIG_MJPEG_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG1_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG1_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MPEG1_XVMC_HWACCEL 0 -+#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 -+#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 -+#define CONFIG_MPEG2_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+#define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG2_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MPEG2_XVMC_HWACCEL 0 -+#define CONFIG_MPEG4_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG4_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_VC1_D3D11VA_HWACCEL 0 -+#define CONFIG_VC1_D3D11VA2_HWACCEL 0 -+#define CONFIG_VC1_DXVA2_HWACCEL 0 -+#define CONFIG_VC1_NVDEC_HWACCEL 0 -+#define CONFIG_VC1_VAAPI_HWACCEL 0 -+#define CONFIG_VC1_VDPAU_HWACCEL 0 -+#define CONFIG_VP8_NVDEC_HWACCEL 0 -+#define CONFIG_VP8_VAAPI_HWACCEL 0 -+#define CONFIG_VP9_D3D11VA_HWACCEL 0 -+#define CONFIG_VP9_D3D11VA2_HWACCEL 0 -+#define CONFIG_VP9_DXVA2_HWACCEL 0 -+#define CONFIG_VP9_NVDEC_HWACCEL 0 -+#define CONFIG_VP9_VAAPI_HWACCEL 0 -+#define CONFIG_VP9_VDPAU_HWACCEL 0 -+#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_WMV3_D3D11VA_HWACCEL 0 -+#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 -+#define CONFIG_WMV3_DXVA2_HWACCEL 0 -+#define CONFIG_WMV3_NVDEC_HWACCEL 0 -+#define CONFIG_WMV3_VAAPI_HWACCEL 0 -+#define CONFIG_WMV3_VDPAU_HWACCEL 0 -+#define CONFIG_AAC_PARSER 1 -+#define CONFIG_AAC_LATM_PARSER 0 -+#define CONFIG_AC3_PARSER 0 -+#define CONFIG_ADX_PARSER 0 -+#define CONFIG_AMR_PARSER 0 -+#define CONFIG_AV1_PARSER 0 -+#define CONFIG_AVS2_PARSER 0 -+#define CONFIG_AVS3_PARSER 0 -+#define CONFIG_BMP_PARSER 0 -+#define CONFIG_CAVSVIDEO_PARSER 0 -+#define CONFIG_COOK_PARSER 0 -+#define CONFIG_CRI_PARSER 0 -+#define CONFIG_DCA_PARSER 0 -+#define CONFIG_DIRAC_PARSER 0 -+#define CONFIG_DNXHD_PARSER 0 -+#define CONFIG_DOLBY_E_PARSER 0 -+#define CONFIG_DPX_PARSER 0 -+#define CONFIG_DVAUDIO_PARSER 0 -+#define CONFIG_DVBSUB_PARSER 0 -+#define CONFIG_DVDSUB_PARSER 0 -+#define CONFIG_DVD_NAV_PARSER 0 -+#define CONFIG_FLAC_PARSER 1 -+#define CONFIG_G723_1_PARSER 0 -+#define CONFIG_G729_PARSER 0 -+#define CONFIG_GIF_PARSER 0 -+#define CONFIG_GSM_PARSER 0 -+#define CONFIG_H261_PARSER 0 -+#define CONFIG_H263_PARSER 0 -+#define CONFIG_H264_PARSER 1 -+#define CONFIG_HEVC_PARSER 0 -+#define CONFIG_IPU_PARSER 0 -+#define CONFIG_JPEG2000_PARSER 0 -+#define CONFIG_MJPEG_PARSER 0 -+#define CONFIG_MLP_PARSER 0 -+#define CONFIG_MPEG4VIDEO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 -+#define CONFIG_MPEGVIDEO_PARSER 0 -+#define CONFIG_OPUS_PARSER 1 -+#define CONFIG_PNG_PARSER 0 -+#define CONFIG_PNM_PARSER 0 -+#define CONFIG_RV30_PARSER 0 -+#define CONFIG_RV40_PARSER 0 -+#define CONFIG_SBC_PARSER 0 -+#define CONFIG_SIPR_PARSER 0 -+#define CONFIG_TAK_PARSER 0 -+#define CONFIG_VC1_PARSER 0 -+#define CONFIG_VORBIS_PARSER 1 -+#define CONFIG_VP3_PARSER 1 -+#define CONFIG_VP8_PARSER 1 -+#define CONFIG_VP9_PARSER 1 -+#define CONFIG_WEBP_PARSER 0 -+#define CONFIG_XBM_PARSER 0 -+#define CONFIG_XMA_PARSER 0 -+#define CONFIG_ALSA_INDEV 0 -+#define CONFIG_ANDROID_CAMERA_INDEV 0 -+#define CONFIG_AVFOUNDATION_INDEV 0 -+#define CONFIG_BKTR_INDEV 0 -+#define CONFIG_DECKLINK_INDEV 0 -+#define CONFIG_DSHOW_INDEV 0 -+#define CONFIG_FBDEV_INDEV 0 -+#define CONFIG_GDIGRAB_INDEV 0 -+#define CONFIG_IEC61883_INDEV 0 -+#define CONFIG_JACK_INDEV 0 -+#define CONFIG_KMSGRAB_INDEV 0 -+#define CONFIG_LAVFI_INDEV 0 -+#define CONFIG_OPENAL_INDEV 0 -+#define CONFIG_OSS_INDEV 0 -+#define CONFIG_PULSE_INDEV 0 -+#define CONFIG_SNDIO_INDEV 0 -+#define CONFIG_V4L2_INDEV 0 -+#define CONFIG_VFWCAP_INDEV 0 -+#define CONFIG_XCBGRAB_INDEV 0 -+#define CONFIG_LIBCDIO_INDEV 0 -+#define CONFIG_LIBDC1394_INDEV 0 -+#define CONFIG_ALSA_OUTDEV 0 -+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0 -+#define CONFIG_CACA_OUTDEV 0 -+#define CONFIG_DECKLINK_OUTDEV 0 -+#define CONFIG_FBDEV_OUTDEV 0 -+#define CONFIG_OPENGL_OUTDEV 0 -+#define CONFIG_OSS_OUTDEV 0 -+#define CONFIG_PULSE_OUTDEV 0 -+#define CONFIG_SDL2_OUTDEV 0 -+#define CONFIG_SNDIO_OUTDEV 0 -+#define CONFIG_V4L2_OUTDEV 0 -+#define CONFIG_XV_OUTDEV 0 -+#define CONFIG_ABENCH_FILTER 0 -+#define CONFIG_ACOMPRESSOR_FILTER 0 -+#define CONFIG_ACONTRAST_FILTER 0 -+#define CONFIG_ACOPY_FILTER 0 -+#define CONFIG_ACUE_FILTER 0 -+#define CONFIG_ACROSSFADE_FILTER 0 -+#define CONFIG_ACROSSOVER_FILTER 0 -+#define CONFIG_ACRUSHER_FILTER 0 -+#define CONFIG_ADECLICK_FILTER 0 -+#define CONFIG_ADECLIP_FILTER 0 -+#define CONFIG_ADECORRELATE_FILTER 0 -+#define CONFIG_ADELAY_FILTER 0 -+#define CONFIG_ADENORM_FILTER 0 -+#define CONFIG_ADERIVATIVE_FILTER 0 -+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 -+#define CONFIG_ADYNAMICSMOOTH_FILTER 0 -+#define CONFIG_AECHO_FILTER 0 -+#define CONFIG_AEMPHASIS_FILTER 0 -+#define CONFIG_AEVAL_FILTER 0 -+#define CONFIG_AEXCITER_FILTER 0 -+#define CONFIG_AFADE_FILTER 0 -+#define CONFIG_AFFTDN_FILTER 0 -+#define CONFIG_AFFTFILT_FILTER 0 -+#define CONFIG_AFIR_FILTER 0 -+#define CONFIG_AFORMAT_FILTER 0 -+#define CONFIG_AFREQSHIFT_FILTER 0 -+#define CONFIG_AFWTDN_FILTER 0 -+#define CONFIG_AGATE_FILTER 0 -+#define CONFIG_AIIR_FILTER 0 -+#define CONFIG_AINTEGRAL_FILTER 0 -+#define CONFIG_AINTERLEAVE_FILTER 0 -+#define CONFIG_ALATENCY_FILTER 0 -+#define CONFIG_ALIMITER_FILTER 0 -+#define CONFIG_ALLPASS_FILTER 0 -+#define CONFIG_ALOOP_FILTER 0 -+#define CONFIG_AMERGE_FILTER 0 -+#define CONFIG_AMETADATA_FILTER 0 -+#define CONFIG_AMIX_FILTER 0 -+#define CONFIG_AMULTIPLY_FILTER 0 -+#define CONFIG_ANEQUALIZER_FILTER 0 -+#define CONFIG_ANLMDN_FILTER 0 -+#define CONFIG_ANLMF_FILTER 0 -+#define CONFIG_ANLMS_FILTER 0 -+#define CONFIG_ANULL_FILTER 0 -+#define CONFIG_APAD_FILTER 0 -+#define CONFIG_APERMS_FILTER 0 -+#define CONFIG_APHASER_FILTER 0 -+#define CONFIG_APHASESHIFT_FILTER 0 -+#define CONFIG_APSYCLIP_FILTER 0 -+#define CONFIG_APULSATOR_FILTER 0 -+#define CONFIG_AREALTIME_FILTER 0 -+#define CONFIG_ARESAMPLE_FILTER 0 -+#define CONFIG_AREVERSE_FILTER 0 -+#define CONFIG_ARNNDN_FILTER 0 -+#define CONFIG_ASDR_FILTER 0 -+#define CONFIG_ASEGMENT_FILTER 0 -+#define CONFIG_ASELECT_FILTER 0 -+#define CONFIG_ASENDCMD_FILTER 0 -+#define CONFIG_ASETNSAMPLES_FILTER 0 -+#define CONFIG_ASETPTS_FILTER 0 -+#define CONFIG_ASETRATE_FILTER 0 -+#define CONFIG_ASETTB_FILTER 0 -+#define CONFIG_ASHOWINFO_FILTER 0 -+#define CONFIG_ASIDEDATA_FILTER 0 -+#define CONFIG_ASOFTCLIP_FILTER 0 -+#define CONFIG_ASPECTRALSTATS_FILTER 0 -+#define CONFIG_ASPLIT_FILTER 0 -+#define CONFIG_ASR_FILTER 0 -+#define CONFIG_ASTATS_FILTER 0 -+#define CONFIG_ASTREAMSELECT_FILTER 0 -+#define CONFIG_ASUBBOOST_FILTER 0 -+#define CONFIG_ASUBCUT_FILTER 0 -+#define CONFIG_ASUPERCUT_FILTER 0 -+#define CONFIG_ASUPERPASS_FILTER 0 -+#define CONFIG_ASUPERSTOP_FILTER 0 -+#define CONFIG_ATEMPO_FILTER 0 -+#define CONFIG_ATILT_FILTER 0 -+#define CONFIG_ATRIM_FILTER 0 -+#define CONFIG_AXCORRELATE_FILTER 0 -+#define CONFIG_AZMQ_FILTER 0 -+#define CONFIG_BANDPASS_FILTER 0 -+#define CONFIG_BANDREJECT_FILTER 0 -+#define CONFIG_BASS_FILTER 0 -+#define CONFIG_BIQUAD_FILTER 0 -+#define CONFIG_BS2B_FILTER 0 -+#define CONFIG_CHANNELMAP_FILTER 0 -+#define CONFIG_CHANNELSPLIT_FILTER 0 -+#define CONFIG_CHORUS_FILTER 0 -+#define CONFIG_COMPAND_FILTER 0 -+#define CONFIG_COMPENSATIONDELAY_FILTER 0 -+#define CONFIG_CROSSFEED_FILTER 0 -+#define CONFIG_CRYSTALIZER_FILTER 0 -+#define CONFIG_DCSHIFT_FILTER 0 -+#define CONFIG_DEESSER_FILTER 0 -+#define CONFIG_DRMETER_FILTER 0 -+#define CONFIG_DYNAUDNORM_FILTER 0 -+#define CONFIG_EARWAX_FILTER 0 -+#define CONFIG_EBUR128_FILTER 0 -+#define CONFIG_EQUALIZER_FILTER 0 -+#define CONFIG_EXTRASTEREO_FILTER 0 -+#define CONFIG_FIREQUALIZER_FILTER 0 -+#define CONFIG_FLANGER_FILTER 0 -+#define CONFIG_HAAS_FILTER 0 -+#define CONFIG_HDCD_FILTER 0 -+#define CONFIG_HEADPHONE_FILTER 0 -+#define CONFIG_HIGHPASS_FILTER 0 -+#define CONFIG_HIGHSHELF_FILTER 0 -+#define CONFIG_JOIN_FILTER 0 -+#define CONFIG_LADSPA_FILTER 0 -+#define CONFIG_LOUDNORM_FILTER 0 -+#define CONFIG_LOWPASS_FILTER 0 -+#define CONFIG_LOWSHELF_FILTER 0 -+#define CONFIG_LV2_FILTER 0 -+#define CONFIG_MCOMPAND_FILTER 0 -+#define CONFIG_PAN_FILTER 0 -+#define CONFIG_REPLAYGAIN_FILTER 0 -+#define CONFIG_RUBBERBAND_FILTER 0 -+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 -+#define CONFIG_SIDECHAINGATE_FILTER 0 -+#define CONFIG_SILENCEDETECT_FILTER 0 -+#define CONFIG_SILENCEREMOVE_FILTER 0 -+#define CONFIG_SOFALIZER_FILTER 0 -+#define CONFIG_SPEECHNORM_FILTER 0 -+#define CONFIG_STEREOTOOLS_FILTER 0 -+#define CONFIG_STEREOWIDEN_FILTER 0 -+#define CONFIG_SUPEREQUALIZER_FILTER 0 -+#define CONFIG_SURROUND_FILTER 0 -+#define CONFIG_TREBLE_FILTER 0 -+#define CONFIG_TREMOLO_FILTER 0 -+#define CONFIG_VIBRATO_FILTER 0 -+#define CONFIG_VOLUME_FILTER 0 -+#define CONFIG_VOLUMEDETECT_FILTER 0 -+#define CONFIG_AEVALSRC_FILTER 0 -+#define CONFIG_AFIRSRC_FILTER 0 -+#define CONFIG_ANOISESRC_FILTER 0 -+#define CONFIG_ANULLSRC_FILTER 0 -+#define CONFIG_FLITE_FILTER 0 -+#define CONFIG_HILBERT_FILTER 0 -+#define CONFIG_SINC_FILTER 0 -+#define CONFIG_SINE_FILTER 0 -+#define CONFIG_ANULLSINK_FILTER 0 -+#define CONFIG_ADDROI_FILTER 0 -+#define CONFIG_ALPHAEXTRACT_FILTER 0 -+#define CONFIG_ALPHAMERGE_FILTER 0 -+#define CONFIG_AMPLIFY_FILTER 0 -+#define CONFIG_ASS_FILTER 0 -+#define CONFIG_ATADENOISE_FILTER 0 -+#define CONFIG_AVGBLUR_FILTER 0 -+#define CONFIG_AVGBLUR_OPENCL_FILTER 0 -+#define CONFIG_AVGBLUR_VULKAN_FILTER 0 -+#define CONFIG_BBOX_FILTER 0 -+#define CONFIG_BENCH_FILTER 0 -+#define CONFIG_BILATERAL_FILTER 0 -+#define CONFIG_BITPLANENOISE_FILTER 0 -+#define CONFIG_BLACKDETECT_FILTER 0 -+#define CONFIG_BLACKFRAME_FILTER 0 -+#define CONFIG_BLEND_FILTER 0 -+#define CONFIG_BLEND_VULKAN_FILTER 0 -+#define CONFIG_BM3D_FILTER 0 -+#define CONFIG_BOXBLUR_FILTER 0 -+#define CONFIG_BOXBLUR_OPENCL_FILTER 0 -+#define CONFIG_BWDIF_FILTER 0 -+#define CONFIG_CAS_FILTER 0 -+#define CONFIG_CHROMABER_VULKAN_FILTER 0 -+#define CONFIG_CHROMAHOLD_FILTER 0 -+#define CONFIG_CHROMAKEY_FILTER 0 -+#define CONFIG_CHROMANR_FILTER 0 -+#define CONFIG_CHROMASHIFT_FILTER 0 -+#define CONFIG_CIESCOPE_FILTER 0 -+#define CONFIG_CODECVIEW_FILTER 0 -+#define CONFIG_COLORBALANCE_FILTER 0 -+#define CONFIG_COLORCHANNELMIXER_FILTER 0 -+#define CONFIG_COLORCONTRAST_FILTER 0 -+#define CONFIG_COLORCORRECT_FILTER 0 -+#define CONFIG_COLORIZE_FILTER 0 -+#define CONFIG_COLORKEY_FILTER 0 -+#define CONFIG_COLORKEY_OPENCL_FILTER 0 -+#define CONFIG_COLORHOLD_FILTER 0 -+#define CONFIG_COLORLEVELS_FILTER 0 -+#define CONFIG_COLORMATRIX_FILTER 0 -+#define CONFIG_COLORSPACE_FILTER 0 -+#define CONFIG_COLORTEMPERATURE_FILTER 0 -+#define CONFIG_CONVOLUTION_FILTER 0 -+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 -+#define CONFIG_CONVOLVE_FILTER 0 -+#define CONFIG_COPY_FILTER 0 -+#define CONFIG_COREIMAGE_FILTER 0 -+#define CONFIG_COVER_RECT_FILTER 0 -+#define CONFIG_CROP_FILTER 0 -+#define CONFIG_CROPDETECT_FILTER 0 -+#define CONFIG_CUE_FILTER 0 -+#define CONFIG_CURVES_FILTER 0 -+#define CONFIG_DATASCOPE_FILTER 0 -+#define CONFIG_DBLUR_FILTER 0 -+#define CONFIG_DCTDNOIZ_FILTER 0 -+#define CONFIG_DEBAND_FILTER 0 -+#define CONFIG_DEBLOCK_FILTER 0 -+#define CONFIG_DECIMATE_FILTER 0 -+#define CONFIG_DECONVOLVE_FILTER 0 -+#define CONFIG_DEDOT_FILTER 0 -+#define CONFIG_DEFLATE_FILTER 0 -+#define CONFIG_DEFLICKER_FILTER 0 -+#define CONFIG_DEINTERLACE_QSV_FILTER 0 -+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0 -+#define CONFIG_DEJUDDER_FILTER 0 -+#define CONFIG_DELOGO_FILTER 0 -+#define CONFIG_DENOISE_VAAPI_FILTER 0 -+#define CONFIG_DERAIN_FILTER 0 -+#define CONFIG_DESHAKE_FILTER 0 -+#define CONFIG_DESHAKE_OPENCL_FILTER 0 -+#define CONFIG_DESPILL_FILTER 0 -+#define CONFIG_DETELECINE_FILTER 0 -+#define CONFIG_DILATION_FILTER 0 -+#define CONFIG_DILATION_OPENCL_FILTER 0 -+#define CONFIG_DISPLACE_FILTER 0 -+#define CONFIG_DNN_CLASSIFY_FILTER 0 -+#define CONFIG_DNN_DETECT_FILTER 0 -+#define CONFIG_DNN_PROCESSING_FILTER 0 -+#define CONFIG_DOUBLEWEAVE_FILTER 0 -+#define CONFIG_DRAWBOX_FILTER 0 -+#define CONFIG_DRAWGRAPH_FILTER 0 -+#define CONFIG_DRAWGRID_FILTER 0 -+#define CONFIG_DRAWTEXT_FILTER 0 -+#define CONFIG_EDGEDETECT_FILTER 0 -+#define CONFIG_ELBG_FILTER 0 -+#define CONFIG_ENTROPY_FILTER 0 -+#define CONFIG_EPX_FILTER 0 -+#define CONFIG_EQ_FILTER 0 -+#define CONFIG_EROSION_FILTER 0 -+#define CONFIG_EROSION_OPENCL_FILTER 0 -+#define CONFIG_ESTDIF_FILTER 0 -+#define CONFIG_EXPOSURE_FILTER 0 -+#define CONFIG_EXTRACTPLANES_FILTER 0 -+#define CONFIG_FADE_FILTER 0 -+#define CONFIG_FFTDNOIZ_FILTER 0 -+#define CONFIG_FFTFILT_FILTER 0 -+#define CONFIG_FIELD_FILTER 0 -+#define CONFIG_FIELDHINT_FILTER 0 -+#define CONFIG_FIELDMATCH_FILTER 0 -+#define CONFIG_FIELDORDER_FILTER 0 -+#define CONFIG_FILLBORDERS_FILTER 0 -+#define CONFIG_FIND_RECT_FILTER 0 -+#define CONFIG_FLIP_VULKAN_FILTER 0 -+#define CONFIG_FLOODFILL_FILTER 0 -+#define CONFIG_FORMAT_FILTER 0 -+#define CONFIG_FPS_FILTER 0 -+#define CONFIG_FRAMEPACK_FILTER 0 -+#define CONFIG_FRAMERATE_FILTER 0 -+#define CONFIG_FRAMESTEP_FILTER 0 -+#define CONFIG_FREEZEDETECT_FILTER 0 -+#define CONFIG_FREEZEFRAMES_FILTER 0 -+#define CONFIG_FREI0R_FILTER 0 -+#define CONFIG_FSPP_FILTER 0 -+#define CONFIG_GBLUR_FILTER 0 -+#define CONFIG_GBLUR_VULKAN_FILTER 0 -+#define CONFIG_GEQ_FILTER 0 -+#define CONFIG_GRADFUN_FILTER 0 -+#define CONFIG_GRAPHMONITOR_FILTER 0 -+#define CONFIG_GRAYWORLD_FILTER 0 -+#define CONFIG_GREYEDGE_FILTER 0 -+#define CONFIG_GUIDED_FILTER 0 -+#define CONFIG_HALDCLUT_FILTER 0 -+#define CONFIG_HFLIP_FILTER 0 -+#define CONFIG_HFLIP_VULKAN_FILTER 0 -+#define CONFIG_HISTEQ_FILTER 0 -+#define CONFIG_HISTOGRAM_FILTER 0 -+#define CONFIG_HQDN3D_FILTER 0 -+#define CONFIG_HQX_FILTER 0 -+#define CONFIG_HSTACK_FILTER 0 -+#define CONFIG_HSVHOLD_FILTER 0 -+#define CONFIG_HSVKEY_FILTER 0 -+#define CONFIG_HUE_FILTER 0 -+#define CONFIG_HUESATURATION_FILTER 0 -+#define CONFIG_HWDOWNLOAD_FILTER 0 -+#define CONFIG_HWMAP_FILTER 0 -+#define CONFIG_HWUPLOAD_FILTER 0 -+#define CONFIG_HWUPLOAD_CUDA_FILTER 0 -+#define CONFIG_HYSTERESIS_FILTER 0 -+#define CONFIG_IDENTITY_FILTER 0 -+#define CONFIG_IDET_FILTER 0 -+#define CONFIG_IL_FILTER 0 -+#define CONFIG_INFLATE_FILTER 0 -+#define CONFIG_INTERLACE_FILTER 0 -+#define CONFIG_INTERLEAVE_FILTER 0 -+#define CONFIG_KERNDEINT_FILTER 0 -+#define CONFIG_KIRSCH_FILTER 0 -+#define CONFIG_LAGFUN_FILTER 0 -+#define CONFIG_LATENCY_FILTER 0 -+#define CONFIG_LENSCORRECTION_FILTER 0 -+#define CONFIG_LENSFUN_FILTER 0 -+#define CONFIG_LIBPLACEBO_FILTER 0 -+#define CONFIG_LIBVMAF_FILTER 0 -+#define CONFIG_LIMITDIFF_FILTER 0 -+#define CONFIG_LIMITER_FILTER 0 -+#define CONFIG_LOOP_FILTER 0 -+#define CONFIG_LUMAKEY_FILTER 0 -+#define CONFIG_LUT_FILTER 0 -+#define CONFIG_LUT1D_FILTER 0 -+#define CONFIG_LUT2_FILTER 0 -+#define CONFIG_LUT3D_FILTER 0 -+#define CONFIG_LUTRGB_FILTER 0 -+#define CONFIG_LUTYUV_FILTER 0 -+#define CONFIG_MASKEDCLAMP_FILTER 0 -+#define CONFIG_MASKEDMAX_FILTER 0 -+#define CONFIG_MASKEDMERGE_FILTER 0 -+#define CONFIG_MASKEDMIN_FILTER 0 -+#define CONFIG_MASKEDTHRESHOLD_FILTER 0 -+#define CONFIG_MASKFUN_FILTER 0 -+#define CONFIG_MCDEINT_FILTER 0 -+#define CONFIG_MEDIAN_FILTER 0 -+#define CONFIG_MERGEPLANES_FILTER 0 -+#define CONFIG_MESTIMATE_FILTER 0 -+#define CONFIG_METADATA_FILTER 0 -+#define CONFIG_MIDEQUALIZER_FILTER 0 -+#define CONFIG_MINTERPOLATE_FILTER 0 -+#define CONFIG_MIX_FILTER 0 -+#define CONFIG_MONOCHROME_FILTER 0 -+#define CONFIG_MORPHO_FILTER 0 -+#define CONFIG_MPDECIMATE_FILTER 0 -+#define CONFIG_MSAD_FILTER 0 -+#define CONFIG_NEGATE_FILTER 0 -+#define CONFIG_NLMEANS_FILTER 0 -+#define CONFIG_NLMEANS_OPENCL_FILTER 0 -+#define CONFIG_NNEDI_FILTER 0 -+#define CONFIG_NOFORMAT_FILTER 0 -+#define CONFIG_NOISE_FILTER 0 -+#define CONFIG_NORMALIZE_FILTER 0 -+#define CONFIG_NULL_FILTER 0 -+#define CONFIG_OCR_FILTER 0 -+#define CONFIG_OCV_FILTER 0 -+#define CONFIG_OSCILLOSCOPE_FILTER 0 -+#define CONFIG_OVERLAY_FILTER 0 -+#define CONFIG_OVERLAY_OPENCL_FILTER 0 -+#define CONFIG_OVERLAY_QSV_FILTER 0 -+#define CONFIG_OVERLAY_VAAPI_FILTER 0 -+#define CONFIG_OVERLAY_VULKAN_FILTER 0 -+#define CONFIG_OVERLAY_CUDA_FILTER 0 -+#define CONFIG_OWDENOISE_FILTER 0 -+#define CONFIG_PAD_FILTER 0 -+#define CONFIG_PAD_OPENCL_FILTER 0 -+#define CONFIG_PALETTEGEN_FILTER 0 -+#define CONFIG_PALETTEUSE_FILTER 0 -+#define CONFIG_PERMS_FILTER 0 -+#define CONFIG_PERSPECTIVE_FILTER 0 -+#define CONFIG_PHASE_FILTER 0 -+#define CONFIG_PHOTOSENSITIVITY_FILTER 0 -+#define CONFIG_PIXDESCTEST_FILTER 0 -+#define CONFIG_PIXSCOPE_FILTER 0 -+#define CONFIG_PP_FILTER 0 -+#define CONFIG_PP7_FILTER 0 -+#define CONFIG_PREMULTIPLY_FILTER 0 -+#define CONFIG_PREWITT_FILTER 0 -+#define CONFIG_PREWITT_OPENCL_FILTER 0 -+#define CONFIG_PROCAMP_VAAPI_FILTER 0 -+#define CONFIG_PROGRAM_OPENCL_FILTER 0 -+#define CONFIG_PSEUDOCOLOR_FILTER 0 -+#define CONFIG_PSNR_FILTER 0 -+#define CONFIG_PULLUP_FILTER 0 -+#define CONFIG_QP_FILTER 0 -+#define CONFIG_RANDOM_FILTER 0 -+#define CONFIG_READEIA608_FILTER 0 -+#define CONFIG_READVITC_FILTER 0 -+#define CONFIG_REALTIME_FILTER 0 -+#define CONFIG_REMAP_FILTER 0 -+#define CONFIG_REMOVEGRAIN_FILTER 0 -+#define CONFIG_REMOVELOGO_FILTER 0 -+#define CONFIG_REPEATFIELDS_FILTER 0 -+#define CONFIG_REVERSE_FILTER 0 -+#define CONFIG_RGBASHIFT_FILTER 0 -+#define CONFIG_ROBERTS_FILTER 0 -+#define CONFIG_ROBERTS_OPENCL_FILTER 0 -+#define CONFIG_ROTATE_FILTER 0 -+#define CONFIG_SAB_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 -+#define CONFIG_SCALE_CUDA_FILTER 0 -+#define CONFIG_SCALE_NPP_FILTER 0 -+#define CONFIG_SCALE_QSV_FILTER 0 -+#define CONFIG_SCALE_VAAPI_FILTER 0 -+#define CONFIG_SCALE_VULKAN_FILTER 0 -+#define CONFIG_SCALE2REF_FILTER 0 -+#define CONFIG_SCALE2REF_NPP_FILTER 0 -+#define CONFIG_SCDET_FILTER 0 -+#define CONFIG_SCHARR_FILTER 0 -+#define CONFIG_SCROLL_FILTER 0 -+#define CONFIG_SEGMENT_FILTER 0 -+#define CONFIG_SELECT_FILTER 0 -+#define CONFIG_SELECTIVECOLOR_FILTER 0 -+#define CONFIG_SENDCMD_FILTER 0 -+#define CONFIG_SEPARATEFIELDS_FILTER 0 -+#define CONFIG_SETDAR_FILTER 0 -+#define CONFIG_SETFIELD_FILTER 0 -+#define CONFIG_SETPARAMS_FILTER 0 -+#define CONFIG_SETPTS_FILTER 0 -+#define CONFIG_SETRANGE_FILTER 0 -+#define CONFIG_SETSAR_FILTER 0 -+#define CONFIG_SETTB_FILTER 0 -+#define CONFIG_SHARPEN_NPP_FILTER 0 -+#define CONFIG_SHARPNESS_VAAPI_FILTER 0 -+#define CONFIG_SHEAR_FILTER 0 -+#define CONFIG_SHOWINFO_FILTER 0 -+#define CONFIG_SHOWPALETTE_FILTER 0 -+#define CONFIG_SHUFFLEFRAMES_FILTER 0 -+#define CONFIG_SHUFFLEPIXELS_FILTER 0 -+#define CONFIG_SHUFFLEPLANES_FILTER 0 -+#define CONFIG_SIDEDATA_FILTER 0 -+#define CONFIG_SIGNALSTATS_FILTER 0 -+#define CONFIG_SIGNATURE_FILTER 0 -+#define CONFIG_SMARTBLUR_FILTER 0 -+#define CONFIG_SOBEL_FILTER 0 -+#define CONFIG_SOBEL_OPENCL_FILTER 0 -+#define CONFIG_SPLIT_FILTER 0 -+#define CONFIG_SPP_FILTER 0 -+#define CONFIG_SR_FILTER 0 -+#define CONFIG_SSIM_FILTER 0 -+#define CONFIG_STEREO3D_FILTER 0 -+#define CONFIG_STREAMSELECT_FILTER 0 -+#define CONFIG_SUBTITLES_FILTER 0 -+#define CONFIG_SUPER2XSAI_FILTER 0 -+#define CONFIG_SWAPRECT_FILTER 0 -+#define CONFIG_SWAPUV_FILTER 0 -+#define CONFIG_TBLEND_FILTER 0 -+#define CONFIG_TELECINE_FILTER 0 -+#define CONFIG_THISTOGRAM_FILTER 0 -+#define CONFIG_THRESHOLD_FILTER 0 -+#define CONFIG_THUMBNAIL_FILTER 0 -+#define CONFIG_THUMBNAIL_CUDA_FILTER 0 -+#define CONFIG_TILE_FILTER 0 -+#define CONFIG_TINTERLACE_FILTER 0 -+#define CONFIG_TLUT2_FILTER 0 -+#define CONFIG_TMEDIAN_FILTER 0 -+#define CONFIG_TMIDEQUALIZER_FILTER 0 -+#define CONFIG_TMIX_FILTER 0 -+#define CONFIG_TONEMAP_FILTER 0 -+#define CONFIG_TONEMAP_OPENCL_FILTER 0 -+#define CONFIG_TONEMAP_VAAPI_FILTER 0 -+#define CONFIG_TPAD_FILTER 0 -+#define CONFIG_TRANSPOSE_FILTER 0 -+#define CONFIG_TRANSPOSE_NPP_FILTER 0 -+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 -+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 -+#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 -+#define CONFIG_TRIM_FILTER 0 -+#define CONFIG_UNPREMULTIPLY_FILTER 0 -+#define CONFIG_UNSHARP_FILTER 0 -+#define CONFIG_UNSHARP_OPENCL_FILTER 0 -+#define CONFIG_UNTILE_FILTER 0 -+#define CONFIG_USPP_FILTER 0 -+#define CONFIG_V360_FILTER 0 -+#define CONFIG_VAGUEDENOISER_FILTER 0 -+#define CONFIG_VARBLUR_FILTER 0 -+#define CONFIG_VECTORSCOPE_FILTER 0 -+#define CONFIG_VFLIP_FILTER 0 -+#define CONFIG_VFLIP_VULKAN_FILTER 0 -+#define CONFIG_VFRDET_FILTER 0 -+#define CONFIG_VIBRANCE_FILTER 0 -+#define CONFIG_VIDSTABDETECT_FILTER 0 -+#define CONFIG_VIDSTABTRANSFORM_FILTER 0 -+#define CONFIG_VIF_FILTER 0 -+#define CONFIG_VIGNETTE_FILTER 0 -+#define CONFIG_VMAFMOTION_FILTER 0 -+#define CONFIG_VPP_QSV_FILTER 0 -+#define CONFIG_VSTACK_FILTER 0 -+#define CONFIG_W3FDIF_FILTER 0 -+#define CONFIG_WAVEFORM_FILTER 0 -+#define CONFIG_WEAVE_FILTER 0 -+#define CONFIG_XBR_FILTER 0 -+#define CONFIG_XCORRELATE_FILTER 0 -+#define CONFIG_XFADE_FILTER 0 -+#define CONFIG_XFADE_OPENCL_FILTER 0 -+#define CONFIG_XMEDIAN_FILTER 0 -+#define CONFIG_XSTACK_FILTER 0 -+#define CONFIG_YADIF_FILTER 0 -+#define CONFIG_YADIF_CUDA_FILTER 0 -+#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 -+#define CONFIG_YAEPBLUR_FILTER 0 -+#define CONFIG_ZMQ_FILTER 0 -+#define CONFIG_ZOOMPAN_FILTER 0 -+#define CONFIG_ZSCALE_FILTER 0 -+#define CONFIG_ALLRGB_FILTER 0 -+#define CONFIG_ALLYUV_FILTER 0 -+#define CONFIG_CELLAUTO_FILTER 0 -+#define CONFIG_COLOR_FILTER 0 -+#define CONFIG_COLORSPECTRUM_FILTER 0 -+#define CONFIG_COREIMAGESRC_FILTER 0 -+#define CONFIG_FREI0R_SRC_FILTER 0 -+#define CONFIG_GRADIENTS_FILTER 0 -+#define CONFIG_HALDCLUTSRC_FILTER 0 -+#define CONFIG_LIFE_FILTER 0 -+#define CONFIG_MANDELBROT_FILTER 0 -+#define CONFIG_MPTESTSRC_FILTER 0 -+#define CONFIG_NULLSRC_FILTER 0 -+#define CONFIG_OPENCLSRC_FILTER 0 -+#define CONFIG_PAL75BARS_FILTER 0 -+#define CONFIG_PAL100BARS_FILTER 0 -+#define CONFIG_RGBTESTSRC_FILTER 0 -+#define CONFIG_SIERPINSKI_FILTER 0 -+#define CONFIG_SMPTEBARS_FILTER 0 -+#define CONFIG_SMPTEHDBARS_FILTER 0 -+#define CONFIG_TESTSRC_FILTER 0 -+#define CONFIG_TESTSRC2_FILTER 0 -+#define CONFIG_YUVTESTSRC_FILTER 0 -+#define CONFIG_NULLSINK_FILTER 0 -+#define CONFIG_ABITSCOPE_FILTER 0 -+#define CONFIG_ADRAWGRAPH_FILTER 0 -+#define CONFIG_AGRAPHMONITOR_FILTER 0 -+#define CONFIG_AHISTOGRAM_FILTER 0 -+#define CONFIG_APHASEMETER_FILTER 0 -+#define CONFIG_AVECTORSCOPE_FILTER 0 -+#define CONFIG_CONCAT_FILTER 0 -+#define CONFIG_SHOWCQT_FILTER 0 -+#define CONFIG_SHOWFREQS_FILTER 0 -+#define CONFIG_SHOWSPATIAL_FILTER 0 -+#define CONFIG_SHOWSPECTRUM_FILTER 0 -+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0 -+#define CONFIG_SHOWVOLUME_FILTER 0 -+#define CONFIG_SHOWWAVES_FILTER 0 -+#define CONFIG_SHOWWAVESPIC_FILTER 0 -+#define CONFIG_SPECTRUMSYNTH_FILTER 0 -+#define CONFIG_AMOVIE_FILTER 0 -+#define CONFIG_MOVIE_FILTER 0 -+#define CONFIG_AFIFO_FILTER 0 -+#define CONFIG_FIFO_FILTER 0 -+#define CONFIG_AA_DEMUXER 0 -+#define CONFIG_AAC_DEMUXER 1 -+#define CONFIG_AAX_DEMUXER 0 -+#define CONFIG_AC3_DEMUXER 0 -+#define CONFIG_ACE_DEMUXER 0 -+#define CONFIG_ACM_DEMUXER 0 -+#define CONFIG_ACT_DEMUXER 0 -+#define CONFIG_ADF_DEMUXER 0 -+#define CONFIG_ADP_DEMUXER 0 -+#define CONFIG_ADS_DEMUXER 0 -+#define CONFIG_ADX_DEMUXER 0 -+#define CONFIG_AEA_DEMUXER 0 -+#define CONFIG_AFC_DEMUXER 0 -+#define CONFIG_AIFF_DEMUXER 0 -+#define CONFIG_AIX_DEMUXER 0 -+#define CONFIG_ALP_DEMUXER 0 -+#define CONFIG_AMR_DEMUXER 0 -+#define CONFIG_AMRNB_DEMUXER 0 -+#define CONFIG_AMRWB_DEMUXER 0 -+#define CONFIG_ANM_DEMUXER 0 -+#define CONFIG_APC_DEMUXER 0 -+#define CONFIG_APE_DEMUXER 0 -+#define CONFIG_APM_DEMUXER 0 -+#define CONFIG_APNG_DEMUXER 0 -+#define CONFIG_APTX_DEMUXER 0 -+#define CONFIG_APTX_HD_DEMUXER 0 -+#define CONFIG_AQTITLE_DEMUXER 0 -+#define CONFIG_ARGO_ASF_DEMUXER 0 -+#define CONFIG_ARGO_BRP_DEMUXER 0 -+#define CONFIG_ARGO_CVG_DEMUXER 0 -+#define CONFIG_ASF_DEMUXER 0 -+#define CONFIG_ASF_O_DEMUXER 0 -+#define CONFIG_ASS_DEMUXER 0 -+#define CONFIG_AST_DEMUXER 0 -+#define CONFIG_AU_DEMUXER 0 -+#define CONFIG_AV1_DEMUXER 0 -+#define CONFIG_AVI_DEMUXER 0 -+#define CONFIG_AVISYNTH_DEMUXER 0 -+#define CONFIG_AVR_DEMUXER 0 -+#define CONFIG_AVS_DEMUXER 0 -+#define CONFIG_AVS2_DEMUXER 0 -+#define CONFIG_AVS3_DEMUXER 0 -+#define CONFIG_BETHSOFTVID_DEMUXER 0 -+#define CONFIG_BFI_DEMUXER 0 -+#define CONFIG_BINTEXT_DEMUXER 0 -+#define CONFIG_BINK_DEMUXER 0 -+#define CONFIG_BINKA_DEMUXER 0 -+#define CONFIG_BIT_DEMUXER 0 -+#define CONFIG_BITPACKED_DEMUXER 0 -+#define CONFIG_BMV_DEMUXER 0 -+#define CONFIG_BFSTM_DEMUXER 0 -+#define CONFIG_BRSTM_DEMUXER 0 -+#define CONFIG_BOA_DEMUXER 0 -+#define CONFIG_C93_DEMUXER 0 -+#define CONFIG_CAF_DEMUXER 0 -+#define CONFIG_CAVSVIDEO_DEMUXER 0 -+#define CONFIG_CDG_DEMUXER 0 -+#define CONFIG_CDXL_DEMUXER 0 -+#define CONFIG_CINE_DEMUXER 0 -+#define CONFIG_CODEC2_DEMUXER 0 -+#define CONFIG_CODEC2RAW_DEMUXER 0 -+#define CONFIG_CONCAT_DEMUXER 0 -+#define CONFIG_DASH_DEMUXER 0 -+#define CONFIG_DATA_DEMUXER 0 -+#define CONFIG_DAUD_DEMUXER 0 -+#define CONFIG_DCSTR_DEMUXER 0 -+#define CONFIG_DERF_DEMUXER 0 -+#define CONFIG_DFA_DEMUXER 0 -+#define CONFIG_DHAV_DEMUXER 0 -+#define CONFIG_DIRAC_DEMUXER 0 -+#define CONFIG_DNXHD_DEMUXER 0 -+#define CONFIG_DSF_DEMUXER 0 -+#define CONFIG_DSICIN_DEMUXER 0 -+#define CONFIG_DSS_DEMUXER 0 -+#define CONFIG_DTS_DEMUXER 0 -+#define CONFIG_DTSHD_DEMUXER 0 -+#define CONFIG_DV_DEMUXER 0 -+#define CONFIG_DVBSUB_DEMUXER 0 -+#define CONFIG_DVBTXT_DEMUXER 0 -+#define CONFIG_DXA_DEMUXER 0 -+#define CONFIG_EA_DEMUXER 0 -+#define CONFIG_EA_CDATA_DEMUXER 0 -+#define CONFIG_EAC3_DEMUXER 0 -+#define CONFIG_EPAF_DEMUXER 0 -+#define CONFIG_FFMETADATA_DEMUXER 0 -+#define CONFIG_FILMSTRIP_DEMUXER 0 -+#define CONFIG_FITS_DEMUXER 0 -+#define CONFIG_FLAC_DEMUXER 1 -+#define CONFIG_FLIC_DEMUXER 0 -+#define CONFIG_FLV_DEMUXER 0 -+#define CONFIG_LIVE_FLV_DEMUXER 0 -+#define CONFIG_FOURXM_DEMUXER 0 -+#define CONFIG_FRM_DEMUXER 0 -+#define CONFIG_FSB_DEMUXER 0 -+#define CONFIG_FWSE_DEMUXER 0 -+#define CONFIG_G722_DEMUXER 0 -+#define CONFIG_G723_1_DEMUXER 0 -+#define CONFIG_G726_DEMUXER 0 -+#define CONFIG_G726LE_DEMUXER 0 -+#define CONFIG_G729_DEMUXER 0 -+#define CONFIG_GDV_DEMUXER 0 -+#define CONFIG_GENH_DEMUXER 0 -+#define CONFIG_GIF_DEMUXER 0 -+#define CONFIG_GSM_DEMUXER 0 -+#define CONFIG_GXF_DEMUXER 0 -+#define CONFIG_H261_DEMUXER 0 -+#define CONFIG_H263_DEMUXER 0 -+#define CONFIG_H264_DEMUXER 0 -+#define CONFIG_HCA_DEMUXER 0 -+#define CONFIG_HCOM_DEMUXER 0 -+#define CONFIG_HEVC_DEMUXER 0 -+#define CONFIG_HLS_DEMUXER 0 -+#define CONFIG_HNM_DEMUXER 0 -+#define CONFIG_ICO_DEMUXER 0 -+#define CONFIG_IDCIN_DEMUXER 0 -+#define CONFIG_IDF_DEMUXER 0 -+#define CONFIG_IFF_DEMUXER 0 -+#define CONFIG_IFV_DEMUXER 0 -+#define CONFIG_ILBC_DEMUXER 0 -+#define CONFIG_IMAGE2_DEMUXER 0 -+#define CONFIG_IMAGE2PIPE_DEMUXER 0 -+#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 -+#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 -+#define CONFIG_IMF_DEMUXER 0 -+#define CONFIG_INGENIENT_DEMUXER 0 -+#define CONFIG_IPMOVIE_DEMUXER 0 -+#define CONFIG_IPU_DEMUXER 0 -+#define CONFIG_IRCAM_DEMUXER 0 -+#define CONFIG_ISS_DEMUXER 0 -+#define CONFIG_IV8_DEMUXER 0 -+#define CONFIG_IVF_DEMUXER 0 -+#define CONFIG_IVR_DEMUXER 0 -+#define CONFIG_JACOSUB_DEMUXER 0 -+#define CONFIG_JV_DEMUXER 0 -+#define CONFIG_KUX_DEMUXER 0 -+#define CONFIG_KVAG_DEMUXER 0 -+#define CONFIG_LMLM4_DEMUXER 0 -+#define CONFIG_LOAS_DEMUXER 0 -+#define CONFIG_LUODAT_DEMUXER 0 -+#define CONFIG_LRC_DEMUXER 0 -+#define CONFIG_LVF_DEMUXER 0 -+#define CONFIG_LXF_DEMUXER 0 -+#define CONFIG_M4V_DEMUXER 0 -+#define CONFIG_MCA_DEMUXER 0 -+#define CONFIG_MCC_DEMUXER 0 -+#define CONFIG_MATROSKA_DEMUXER 1 -+#define CONFIG_MGSTS_DEMUXER 0 -+#define CONFIG_MICRODVD_DEMUXER 0 -+#define CONFIG_MJPEG_DEMUXER 0 -+#define CONFIG_MJPEG_2000_DEMUXER 0 -+#define CONFIG_MLP_DEMUXER 0 -+#define CONFIG_MLV_DEMUXER 0 -+#define CONFIG_MM_DEMUXER 0 -+#define CONFIG_MMF_DEMUXER 0 -+#define CONFIG_MODS_DEMUXER 0 -+#define CONFIG_MOFLEX_DEMUXER 0 -+#define CONFIG_MOV_DEMUXER 1 -+#define CONFIG_MP3_DEMUXER 1 -+#define CONFIG_MPC_DEMUXER 0 -+#define CONFIG_MPC8_DEMUXER 0 -+#define CONFIG_MPEGPS_DEMUXER 0 -+#define CONFIG_MPEGTS_DEMUXER 0 -+#define CONFIG_MPEGTSRAW_DEMUXER 0 -+#define CONFIG_MPEGVIDEO_DEMUXER 0 -+#define CONFIG_MPJPEG_DEMUXER 0 -+#define CONFIG_MPL2_DEMUXER 0 -+#define CONFIG_MPSUB_DEMUXER 0 -+#define CONFIG_MSF_DEMUXER 0 -+#define CONFIG_MSNWC_TCP_DEMUXER 0 -+#define CONFIG_MSP_DEMUXER 0 -+#define CONFIG_MTAF_DEMUXER 0 -+#define CONFIG_MTV_DEMUXER 0 -+#define CONFIG_MUSX_DEMUXER 0 -+#define CONFIG_MV_DEMUXER 0 -+#define CONFIG_MVI_DEMUXER 0 -+#define CONFIG_MXF_DEMUXER 0 -+#define CONFIG_MXG_DEMUXER 0 -+#define CONFIG_NC_DEMUXER 0 -+#define CONFIG_NISTSPHERE_DEMUXER 0 -+#define CONFIG_NSP_DEMUXER 0 -+#define CONFIG_NSV_DEMUXER 0 -+#define CONFIG_NUT_DEMUXER 0 -+#define CONFIG_NUV_DEMUXER 0 -+#define CONFIG_OBU_DEMUXER 0 -+#define CONFIG_OGG_DEMUXER 1 -+#define CONFIG_OMA_DEMUXER 0 -+#define CONFIG_PAF_DEMUXER 0 -+#define CONFIG_PCM_ALAW_DEMUXER 0 -+#define CONFIG_PCM_MULAW_DEMUXER 0 -+#define CONFIG_PCM_VIDC_DEMUXER 0 -+#define CONFIG_PCM_F64BE_DEMUXER 0 -+#define CONFIG_PCM_F64LE_DEMUXER 0 -+#define CONFIG_PCM_F32BE_DEMUXER 0 -+#define CONFIG_PCM_F32LE_DEMUXER 0 -+#define CONFIG_PCM_S32BE_DEMUXER 0 -+#define CONFIG_PCM_S32LE_DEMUXER 0 -+#define CONFIG_PCM_S24BE_DEMUXER 0 -+#define CONFIG_PCM_S24LE_DEMUXER 0 -+#define CONFIG_PCM_S16BE_DEMUXER 0 -+#define CONFIG_PCM_S16LE_DEMUXER 0 -+#define CONFIG_PCM_S8_DEMUXER 0 -+#define CONFIG_PCM_U32BE_DEMUXER 0 -+#define CONFIG_PCM_U32LE_DEMUXER 0 -+#define CONFIG_PCM_U24BE_DEMUXER 0 -+#define CONFIG_PCM_U24LE_DEMUXER 0 -+#define CONFIG_PCM_U16BE_DEMUXER 0 -+#define CONFIG_PCM_U16LE_DEMUXER 0 -+#define CONFIG_PCM_U8_DEMUXER 0 -+#define CONFIG_PJS_DEMUXER 0 -+#define CONFIG_PMP_DEMUXER 0 -+#define CONFIG_PP_BNK_DEMUXER 0 -+#define CONFIG_PVA_DEMUXER 0 -+#define CONFIG_PVF_DEMUXER 0 -+#define CONFIG_QCP_DEMUXER 0 -+#define CONFIG_R3D_DEMUXER 0 -+#define CONFIG_RAWVIDEO_DEMUXER 0 -+#define CONFIG_REALTEXT_DEMUXER 0 -+#define CONFIG_REDSPARK_DEMUXER 0 -+#define CONFIG_RL2_DEMUXER 0 -+#define CONFIG_RM_DEMUXER 0 -+#define CONFIG_ROQ_DEMUXER 0 -+#define CONFIG_RPL_DEMUXER 0 -+#define CONFIG_RSD_DEMUXER 0 -+#define CONFIG_RSO_DEMUXER 0 -+#define CONFIG_RTP_DEMUXER 0 -+#define CONFIG_RTSP_DEMUXER 0 -+#define CONFIG_S337M_DEMUXER 0 -+#define CONFIG_SAMI_DEMUXER 0 -+#define CONFIG_SAP_DEMUXER 0 -+#define CONFIG_SBC_DEMUXER 0 -+#define CONFIG_SBG_DEMUXER 0 -+#define CONFIG_SCC_DEMUXER 0 -+#define CONFIG_SCD_DEMUXER 0 -+#define CONFIG_SDP_DEMUXER 0 -+#define CONFIG_SDR2_DEMUXER 0 -+#define CONFIG_SDS_DEMUXER 0 -+#define CONFIG_SDX_DEMUXER 0 -+#define CONFIG_SEGAFILM_DEMUXER 0 -+#define CONFIG_SER_DEMUXER 0 -+#define CONFIG_SGA_DEMUXER 0 -+#define CONFIG_SHORTEN_DEMUXER 0 -+#define CONFIG_SIFF_DEMUXER 0 -+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 -+#define CONFIG_SLN_DEMUXER 0 -+#define CONFIG_SMACKER_DEMUXER 0 -+#define CONFIG_SMJPEG_DEMUXER 0 -+#define CONFIG_SMUSH_DEMUXER 0 -+#define CONFIG_SOL_DEMUXER 0 -+#define CONFIG_SOX_DEMUXER 0 -+#define CONFIG_SPDIF_DEMUXER 0 -+#define CONFIG_SRT_DEMUXER 0 -+#define CONFIG_STR_DEMUXER 0 -+#define CONFIG_STL_DEMUXER 0 -+#define CONFIG_SUBVIEWER1_DEMUXER 0 -+#define CONFIG_SUBVIEWER_DEMUXER 0 -+#define CONFIG_SUP_DEMUXER 0 -+#define CONFIG_SVAG_DEMUXER 0 -+#define CONFIG_SVS_DEMUXER 0 -+#define CONFIG_SWF_DEMUXER 0 -+#define CONFIG_TAK_DEMUXER 0 -+#define CONFIG_TEDCAPTIONS_DEMUXER 0 -+#define CONFIG_THP_DEMUXER 0 -+#define CONFIG_THREEDOSTR_DEMUXER 0 -+#define CONFIG_TIERTEXSEQ_DEMUXER 0 -+#define CONFIG_TMV_DEMUXER 0 -+#define CONFIG_TRUEHD_DEMUXER 0 -+#define CONFIG_TTA_DEMUXER 0 -+#define CONFIG_TXD_DEMUXER 0 -+#define CONFIG_TTY_DEMUXER 0 -+#define CONFIG_TY_DEMUXER 0 -+#define CONFIG_V210_DEMUXER 0 -+#define CONFIG_V210X_DEMUXER 0 -+#define CONFIG_VAG_DEMUXER 0 -+#define CONFIG_VC1_DEMUXER 0 -+#define CONFIG_VC1T_DEMUXER 0 -+#define CONFIG_VIVIDAS_DEMUXER 0 -+#define CONFIG_VIVO_DEMUXER 0 -+#define CONFIG_VMD_DEMUXER 0 -+#define CONFIG_VOBSUB_DEMUXER 0 -+#define CONFIG_VOC_DEMUXER 0 -+#define CONFIG_VPK_DEMUXER 0 -+#define CONFIG_VPLAYER_DEMUXER 0 -+#define CONFIG_VQF_DEMUXER 0 -+#define CONFIG_W64_DEMUXER 0 -+#define CONFIG_WAV_DEMUXER 1 -+#define CONFIG_WC3_DEMUXER 0 -+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 -+#define CONFIG_WEBVTT_DEMUXER 0 -+#define CONFIG_WSAUD_DEMUXER 0 -+#define CONFIG_WSD_DEMUXER 0 -+#define CONFIG_WSVQA_DEMUXER 0 -+#define CONFIG_WTV_DEMUXER 0 -+#define CONFIG_WVE_DEMUXER 0 -+#define CONFIG_WV_DEMUXER 0 -+#define CONFIG_XA_DEMUXER 0 -+#define CONFIG_XBIN_DEMUXER 0 -+#define CONFIG_XMV_DEMUXER 0 -+#define CONFIG_XVAG_DEMUXER 0 -+#define CONFIG_XWMA_DEMUXER 0 -+#define CONFIG_YOP_DEMUXER 0 -+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 -+#define CONFIG_LIBGME_DEMUXER 0 -+#define CONFIG_LIBMODPLUG_DEMUXER 0 -+#define CONFIG_LIBOPENMPT_DEMUXER 0 -+#define CONFIG_VAPOURSYNTH_DEMUXER 0 -+#define CONFIG_A64_MUXER 0 -+#define CONFIG_AC3_MUXER 0 -+#define CONFIG_ADTS_MUXER 0 -+#define CONFIG_ADX_MUXER 0 -+#define CONFIG_AIFF_MUXER 0 -+#define CONFIG_ALP_MUXER 0 -+#define CONFIG_AMR_MUXER 0 -+#define CONFIG_AMV_MUXER 0 -+#define CONFIG_APM_MUXER 0 -+#define CONFIG_APNG_MUXER 0 -+#define CONFIG_APTX_MUXER 0 -+#define CONFIG_APTX_HD_MUXER 0 -+#define CONFIG_ARGO_ASF_MUXER 0 -+#define CONFIG_ARGO_CVG_MUXER 0 -+#define CONFIG_ASF_MUXER 0 -+#define CONFIG_ASS_MUXER 0 -+#define CONFIG_AST_MUXER 0 -+#define CONFIG_ASF_STREAM_MUXER 0 -+#define CONFIG_AU_MUXER 0 -+#define CONFIG_AVI_MUXER 0 -+#define CONFIG_AVM2_MUXER 0 -+#define CONFIG_AVS2_MUXER 0 -+#define CONFIG_AVS3_MUXER 0 -+#define CONFIG_BIT_MUXER 0 -+#define CONFIG_CAF_MUXER 0 -+#define CONFIG_CAVSVIDEO_MUXER 0 -+#define CONFIG_CODEC2_MUXER 0 -+#define CONFIG_CODEC2RAW_MUXER 0 -+#define CONFIG_CRC_MUXER 0 -+#define CONFIG_DASH_MUXER 0 -+#define CONFIG_DATA_MUXER 0 -+#define CONFIG_DAUD_MUXER 0 -+#define CONFIG_DIRAC_MUXER 0 -+#define CONFIG_DNXHD_MUXER 0 -+#define CONFIG_DTS_MUXER 0 -+#define CONFIG_DV_MUXER 0 -+#define CONFIG_EAC3_MUXER 0 -+#define CONFIG_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 -+#define CONFIG_FLV_MUXER 0 -+#define CONFIG_FRAMECRC_MUXER 0 -+#define CONFIG_FRAMEHASH_MUXER 0 -+#define CONFIG_FRAMEMD5_MUXER 0 -+#define CONFIG_G722_MUXER 0 -+#define CONFIG_G723_1_MUXER 0 -+#define CONFIG_G726_MUXER 0 -+#define CONFIG_G726LE_MUXER 0 -+#define CONFIG_GIF_MUXER 0 -+#define CONFIG_GSM_MUXER 0 -+#define CONFIG_GXF_MUXER 0 -+#define CONFIG_H261_MUXER 0 -+#define CONFIG_H263_MUXER 0 -+#define CONFIG_H264_MUXER 0 -+#define CONFIG_HASH_MUXER 0 -+#define CONFIG_HDS_MUXER 0 -+#define CONFIG_HEVC_MUXER 0 -+#define CONFIG_HLS_MUXER 0 -+#define CONFIG_ICO_MUXER 0 -+#define CONFIG_ILBC_MUXER 0 -+#define CONFIG_IMAGE2_MUXER 0 -+#define CONFIG_IMAGE2PIPE_MUXER 0 -+#define CONFIG_IPOD_MUXER 0 -+#define CONFIG_IRCAM_MUXER 0 -+#define CONFIG_ISMV_MUXER 0 -+#define CONFIG_IVF_MUXER 0 -+#define CONFIG_JACOSUB_MUXER 0 -+#define CONFIG_KVAG_MUXER 0 -+#define CONFIG_LATM_MUXER 0 -+#define CONFIG_LRC_MUXER 0 -+#define CONFIG_M4V_MUXER 0 -+#define CONFIG_MD5_MUXER 0 -+#define CONFIG_MATROSKA_MUXER 0 -+#define CONFIG_MATROSKA_AUDIO_MUXER 0 -+#define CONFIG_MICRODVD_MUXER 0 -+#define CONFIG_MJPEG_MUXER 0 -+#define CONFIG_MLP_MUXER 0 -+#define CONFIG_MMF_MUXER 0 -+#define CONFIG_MOV_MUXER 0 -+#define CONFIG_MP2_MUXER 0 -+#define CONFIG_MP3_MUXER 0 -+#define CONFIG_MP4_MUXER 0 -+#define CONFIG_MPEG1SYSTEM_MUXER 0 -+#define CONFIG_MPEG1VCD_MUXER 0 -+#define CONFIG_MPEG1VIDEO_MUXER 0 -+#define CONFIG_MPEG2DVD_MUXER 0 -+#define CONFIG_MPEG2SVCD_MUXER 0 -+#define CONFIG_MPEG2VIDEO_MUXER 0 -+#define CONFIG_MPEG2VOB_MUXER 0 -+#define CONFIG_MPEGTS_MUXER 0 -+#define CONFIG_MPJPEG_MUXER 0 -+#define CONFIG_MXF_MUXER 0 -+#define CONFIG_MXF_D10_MUXER 0 -+#define CONFIG_MXF_OPATOM_MUXER 0 -+#define CONFIG_NULL_MUXER 0 -+#define CONFIG_NUT_MUXER 0 -+#define CONFIG_OBU_MUXER 0 -+#define CONFIG_OGA_MUXER 0 -+#define CONFIG_OGG_MUXER 0 -+#define CONFIG_OGV_MUXER 0 -+#define CONFIG_OMA_MUXER 0 -+#define CONFIG_OPUS_MUXER 0 -+#define CONFIG_PCM_ALAW_MUXER 0 -+#define CONFIG_PCM_MULAW_MUXER 0 -+#define CONFIG_PCM_VIDC_MUXER 0 -+#define CONFIG_PCM_F64BE_MUXER 0 -+#define CONFIG_PCM_F64LE_MUXER 0 -+#define CONFIG_PCM_F32BE_MUXER 0 -+#define CONFIG_PCM_F32LE_MUXER 0 -+#define CONFIG_PCM_S32BE_MUXER 0 -+#define CONFIG_PCM_S32LE_MUXER 0 -+#define CONFIG_PCM_S24BE_MUXER 0 -+#define CONFIG_PCM_S24LE_MUXER 0 -+#define CONFIG_PCM_S16BE_MUXER 0 -+#define CONFIG_PCM_S16LE_MUXER 0 -+#define CONFIG_PCM_S8_MUXER 0 -+#define CONFIG_PCM_U32BE_MUXER 0 -+#define CONFIG_PCM_U32LE_MUXER 0 -+#define CONFIG_PCM_U24BE_MUXER 0 -+#define CONFIG_PCM_U24LE_MUXER 0 -+#define CONFIG_PCM_U16BE_MUXER 0 -+#define CONFIG_PCM_U16LE_MUXER 0 -+#define CONFIG_PCM_U8_MUXER 0 -+#define CONFIG_PSP_MUXER 0 -+#define CONFIG_RAWVIDEO_MUXER 0 -+#define CONFIG_RM_MUXER 0 -+#define CONFIG_ROQ_MUXER 0 -+#define CONFIG_RSO_MUXER 0 -+#define CONFIG_RTP_MUXER 0 -+#define CONFIG_RTP_MPEGTS_MUXER 0 -+#define CONFIG_RTSP_MUXER 0 -+#define CONFIG_SAP_MUXER 0 -+#define CONFIG_SBC_MUXER 0 -+#define CONFIG_SCC_MUXER 0 -+#define CONFIG_SEGAFILM_MUXER 0 -+#define CONFIG_SEGMENT_MUXER 0 -+#define CONFIG_STREAM_SEGMENT_MUXER 0 -+#define CONFIG_SMJPEG_MUXER 0 -+#define CONFIG_SMOOTHSTREAMING_MUXER 0 -+#define CONFIG_SOX_MUXER 0 -+#define CONFIG_SPX_MUXER 0 -+#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SRT_MUXER 0 -+#define CONFIG_STREAMHASH_MUXER 0 -+#define CONFIG_SUP_MUXER 0 -+#define CONFIG_SWF_MUXER 0 -+#define CONFIG_TEE_MUXER 0 -+#define CONFIG_TG2_MUXER 0 -+#define CONFIG_TGP_MUXER 0 -+#define CONFIG_MKVTIMESTAMP_V2_MUXER 0 -+#define CONFIG_TRUEHD_MUXER 0 -+#define CONFIG_TTA_MUXER 0 -+#define CONFIG_TTML_MUXER 0 -+#define CONFIG_UNCODEDFRAMECRC_MUXER 0 -+#define CONFIG_VC1_MUXER 0 -+#define CONFIG_VC1T_MUXER 0 -+#define CONFIG_VOC_MUXER 0 -+#define CONFIG_W64_MUXER 0 -+#define CONFIG_WAV_MUXER 0 -+#define CONFIG_WEBM_MUXER 0 -+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 -+#define CONFIG_WEBM_CHUNK_MUXER 0 -+#define CONFIG_WEBP_MUXER 0 -+#define CONFIG_WEBVTT_MUXER 0 -+#define CONFIG_WSAUD_MUXER 0 -+#define CONFIG_WTV_MUXER 0 -+#define CONFIG_WV_MUXER 0 -+#define CONFIG_YUV4MPEGPIPE_MUXER 0 -+#define CONFIG_CHROMAPRINT_MUXER 0 -+#define CONFIG_ASYNC_PROTOCOL 0 -+#define CONFIG_BLURAY_PROTOCOL 0 -+#define CONFIG_CACHE_PROTOCOL 0 -+#define CONFIG_CONCAT_PROTOCOL 0 -+#define CONFIG_CONCATF_PROTOCOL 0 -+#define CONFIG_CRYPTO_PROTOCOL 0 -+#define CONFIG_DATA_PROTOCOL 0 -+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 -+#define CONFIG_FFRTMPHTTP_PROTOCOL 0 -+#define CONFIG_FILE_PROTOCOL 0 -+#define CONFIG_FTP_PROTOCOL 0 -+#define CONFIG_GOPHER_PROTOCOL 0 -+#define CONFIG_GOPHERS_PROTOCOL 0 -+#define CONFIG_HLS_PROTOCOL 0 -+#define CONFIG_HTTP_PROTOCOL 0 -+#define CONFIG_HTTPPROXY_PROTOCOL 0 -+#define CONFIG_HTTPS_PROTOCOL 0 -+#define CONFIG_ICECAST_PROTOCOL 0 -+#define CONFIG_MMSH_PROTOCOL 0 -+#define CONFIG_MMST_PROTOCOL 0 -+#define CONFIG_MD5_PROTOCOL 0 -+#define CONFIG_PIPE_PROTOCOL 0 -+#define CONFIG_PROMPEG_PROTOCOL 0 -+#define CONFIG_RTMP_PROTOCOL 0 -+#define CONFIG_RTMPE_PROTOCOL 0 -+#define CONFIG_RTMPS_PROTOCOL 0 -+#define CONFIG_RTMPT_PROTOCOL 0 -+#define CONFIG_RTMPTE_PROTOCOL 0 -+#define CONFIG_RTMPTS_PROTOCOL 0 -+#define CONFIG_RTP_PROTOCOL 0 -+#define CONFIG_SCTP_PROTOCOL 0 -+#define CONFIG_SRTP_PROTOCOL 0 -+#define CONFIG_SUBFILE_PROTOCOL 0 -+#define CONFIG_TEE_PROTOCOL 0 -+#define CONFIG_TCP_PROTOCOL 0 -+#define CONFIG_TLS_PROTOCOL 0 -+#define CONFIG_UDP_PROTOCOL 0 -+#define CONFIG_UDPLITE_PROTOCOL 0 -+#define CONFIG_UNIX_PROTOCOL 0 -+#define CONFIG_LIBAMQP_PROTOCOL 0 -+#define CONFIG_LIBRIST_PROTOCOL 0 -+#define CONFIG_LIBRTMP_PROTOCOL 0 -+#define CONFIG_LIBRTMPE_PROTOCOL 0 -+#define CONFIG_LIBRTMPS_PROTOCOL 0 -+#define CONFIG_LIBRTMPT_PROTOCOL 0 -+#define CONFIG_LIBRTMPTE_PROTOCOL 0 -+#define CONFIG_LIBSRT_PROTOCOL 0 -+#define CONFIG_LIBSSH_PROTOCOL 0 -+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 -+#define CONFIG_LIBZMQ_PROTOCOL 0 +#endif /* FFMPEG_CONFIG_H */ diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h new file mode 100644 index 000000000000..0fa75e6fdda2 --- /dev/null +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h @@ -0,0 +1,2066 @@ +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h.orig 2022-10-05 07:34:01 UTC ++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h +@@ -0,0 +1,2063 @@ ++/* Automatically generated by configure - do not modify! */ ++#ifndef FFMPEG_CONFIG_COMPONENTS_H ++#define FFMPEG_CONFIG_COMPONENTS_H ++#define CONFIG_AAC_ADTSTOASC_BSF 0 ++#define CONFIG_AV1_FRAME_MERGE_BSF 0 ++#define CONFIG_AV1_FRAME_SPLIT_BSF 0 ++#define CONFIG_AV1_METADATA_BSF 0 ++#define CONFIG_CHOMP_BSF 0 ++#define CONFIG_DUMP_EXTRADATA_BSF 0 ++#define CONFIG_DCA_CORE_BSF 0 ++#define CONFIG_DV_ERROR_MARKER_BSF 0 ++#define CONFIG_EAC3_CORE_BSF 0 ++#define CONFIG_EXTRACT_EXTRADATA_BSF 0 ++#define CONFIG_FILTER_UNITS_BSF 0 ++#define CONFIG_H264_METADATA_BSF 0 ++#define CONFIG_H264_MP4TOANNEXB_BSF 0 ++#define CONFIG_H264_REDUNDANT_PPS_BSF 0 ++#define CONFIG_HAPQA_EXTRACT_BSF 0 ++#define CONFIG_HEVC_METADATA_BSF 0 ++#define CONFIG_HEVC_MP4TOANNEXB_BSF 0 ++#define CONFIG_IMX_DUMP_HEADER_BSF 0 ++#define CONFIG_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 ++#define CONFIG_NOISE_BSF 0 ++#define CONFIG_NULL_BSF 0 ++#define CONFIG_OPUS_METADATA_BSF 0 ++#define CONFIG_PCM_RECHUNK_BSF 0 ++#define CONFIG_PRORES_METADATA_BSF 0 ++#define CONFIG_REMOVE_EXTRADATA_BSF 0 ++#define CONFIG_SETTS_BSF 0 ++#define CONFIG_TEXT2MOVSUB_BSF 0 ++#define CONFIG_TRACE_HEADERS_BSF 0 ++#define CONFIG_TRUEHD_CORE_BSF 0 ++#define CONFIG_VP9_METADATA_BSF 0 ++#define CONFIG_VP9_RAW_REORDER_BSF 0 ++#define CONFIG_VP9_SUPERFRAME_BSF 0 ++#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 ++#define CONFIG_AASC_DECODER 0 ++#define CONFIG_AIC_DECODER 0 ++#define CONFIG_ALIAS_PIX_DECODER 0 ++#define CONFIG_AGM_DECODER 0 ++#define CONFIG_AMV_DECODER 0 ++#define CONFIG_ANM_DECODER 0 ++#define CONFIG_ANSI_DECODER 0 ++#define CONFIG_APNG_DECODER 0 ++#define CONFIG_ARBC_DECODER 0 ++#define CONFIG_ARGO_DECODER 0 ++#define CONFIG_ASV1_DECODER 0 ++#define CONFIG_ASV2_DECODER 0 ++#define CONFIG_AURA_DECODER 0 ++#define CONFIG_AURA2_DECODER 0 ++#define CONFIG_AVRP_DECODER 0 ++#define CONFIG_AVRN_DECODER 0 ++#define CONFIG_AVS_DECODER 0 ++#define CONFIG_AVUI_DECODER 0 ++#define CONFIG_AYUV_DECODER 0 ++#define CONFIG_BETHSOFTVID_DECODER 0 ++#define CONFIG_BFI_DECODER 0 ++#define CONFIG_BINK_DECODER 0 ++#define CONFIG_BITPACKED_DECODER 0 ++#define CONFIG_BMP_DECODER 0 ++#define CONFIG_BMV_VIDEO_DECODER 0 ++#define CONFIG_BRENDER_PIX_DECODER 0 ++#define CONFIG_C93_DECODER 0 ++#define CONFIG_CAVS_DECODER 0 ++#define CONFIG_CDGRAPHICS_DECODER 0 ++#define CONFIG_CDTOONS_DECODER 0 ++#define CONFIG_CDXL_DECODER 0 ++#define CONFIG_CFHD_DECODER 0 ++#define CONFIG_CINEPAK_DECODER 0 ++#define CONFIG_CLEARVIDEO_DECODER 0 ++#define CONFIG_CLJR_DECODER 0 ++#define CONFIG_CLLC_DECODER 0 ++#define CONFIG_COMFORTNOISE_DECODER 0 ++#define CONFIG_CPIA_DECODER 0 ++#define CONFIG_CRI_DECODER 0 ++#define CONFIG_CSCD_DECODER 0 ++#define CONFIG_CYUV_DECODER 0 ++#define CONFIG_DDS_DECODER 0 ++#define CONFIG_DFA_DECODER 0 ++#define CONFIG_DIRAC_DECODER 0 ++#define CONFIG_DNXHD_DECODER 0 ++#define CONFIG_DPX_DECODER 0 ++#define CONFIG_DSICINVIDEO_DECODER 0 ++#define CONFIG_DVAUDIO_DECODER 0 ++#define CONFIG_DVVIDEO_DECODER 0 ++#define CONFIG_DXA_DECODER 0 ++#define CONFIG_DXTORY_DECODER 0 ++#define CONFIG_DXV_DECODER 0 ++#define CONFIG_EACMV_DECODER 0 ++#define CONFIG_EAMAD_DECODER 0 ++#define CONFIG_EATGQ_DECODER 0 ++#define CONFIG_EATGV_DECODER 0 ++#define CONFIG_EATQI_DECODER 0 ++#define CONFIG_EIGHTBPS_DECODER 0 ++#define CONFIG_EIGHTSVX_EXP_DECODER 0 ++#define CONFIG_EIGHTSVX_FIB_DECODER 0 ++#define CONFIG_ESCAPE124_DECODER 0 ++#define CONFIG_ESCAPE130_DECODER 0 ++#define CONFIG_EXR_DECODER 0 ++#define CONFIG_FFV1_DECODER 0 ++#define CONFIG_FFVHUFF_DECODER 0 ++#define CONFIG_FIC_DECODER 0 ++#define CONFIG_FITS_DECODER 0 ++#define CONFIG_FLASHSV_DECODER 0 ++#define CONFIG_FLASHSV2_DECODER 0 ++#define CONFIG_FLIC_DECODER 0 ++#define CONFIG_FLV_DECODER 0 ++#define CONFIG_FMVC_DECODER 0 ++#define CONFIG_FOURXM_DECODER 0 ++#define CONFIG_FRAPS_DECODER 0 ++#define CONFIG_FRWU_DECODER 0 ++#define CONFIG_G2M_DECODER 0 ++#define CONFIG_GDV_DECODER 0 ++#define CONFIG_GEM_DECODER 0 ++#define CONFIG_GIF_DECODER 0 ++#define CONFIG_H261_DECODER 0 ++#define CONFIG_H263_DECODER 0 ++#define CONFIG_H263I_DECODER 0 ++#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 ++#define CONFIG_H264_QSV_DECODER 0 ++#define CONFIG_H264_RKMPP_DECODER 0 ++#define CONFIG_HAP_DECODER 0 ++#define CONFIG_HEVC_DECODER 0 ++#define CONFIG_HEVC_QSV_DECODER 0 ++#define CONFIG_HEVC_RKMPP_DECODER 0 ++#define CONFIG_HEVC_V4L2M2M_DECODER 0 ++#define CONFIG_HNM4_VIDEO_DECODER 0 ++#define CONFIG_HQ_HQA_DECODER 0 ++#define CONFIG_HQX_DECODER 0 ++#define CONFIG_HUFFYUV_DECODER 0 ++#define CONFIG_HYMT_DECODER 0 ++#define CONFIG_IDCIN_DECODER 0 ++#define CONFIG_IFF_ILBM_DECODER 0 ++#define CONFIG_IMM4_DECODER 0 ++#define CONFIG_IMM5_DECODER 0 ++#define CONFIG_INDEO2_DECODER 0 ++#define CONFIG_INDEO3_DECODER 0 ++#define CONFIG_INDEO4_DECODER 0 ++#define CONFIG_INDEO5_DECODER 0 ++#define CONFIG_INTERPLAY_VIDEO_DECODER 0 ++#define CONFIG_IPU_DECODER 0 ++#define CONFIG_JPEG2000_DECODER 0 ++#define CONFIG_JPEGLS_DECODER 0 ++#define CONFIG_JV_DECODER 0 ++#define CONFIG_KGV1_DECODER 0 ++#define CONFIG_KMVC_DECODER 0 ++#define CONFIG_LAGARITH_DECODER 0 ++#define CONFIG_LOCO_DECODER 0 ++#define CONFIG_LSCR_DECODER 0 ++#define CONFIG_M101_DECODER 0 ++#define CONFIG_MAGICYUV_DECODER 0 ++#define CONFIG_MDEC_DECODER 0 ++#define CONFIG_MIMIC_DECODER 0 ++#define CONFIG_MJPEG_DECODER 0 ++#define CONFIG_MJPEGB_DECODER 0 ++#define CONFIG_MMVIDEO_DECODER 0 ++#define CONFIG_MOBICLIP_DECODER 0 ++#define CONFIG_MOTIONPIXELS_DECODER 0 ++#define CONFIG_MPEG1VIDEO_DECODER 0 ++#define CONFIG_MPEG2VIDEO_DECODER 0 ++#define CONFIG_MPEG4_DECODER 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 ++#define CONFIG_MSA1_DECODER 0 ++#define CONFIG_MSCC_DECODER 0 ++#define CONFIG_MSMPEG4V1_DECODER 0 ++#define CONFIG_MSMPEG4V2_DECODER 0 ++#define CONFIG_MSMPEG4V3_DECODER 0 ++#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 ++#define CONFIG_MSP2_DECODER 0 ++#define CONFIG_MSRLE_DECODER 0 ++#define CONFIG_MSS1_DECODER 0 ++#define CONFIG_MSS2_DECODER 0 ++#define CONFIG_MSVIDEO1_DECODER 0 ++#define CONFIG_MSZH_DECODER 0 ++#define CONFIG_MTS2_DECODER 0 ++#define CONFIG_MV30_DECODER 0 ++#define CONFIG_MVC1_DECODER 0 ++#define CONFIG_MVC2_DECODER 0 ++#define CONFIG_MVDV_DECODER 0 ++#define CONFIG_MVHA_DECODER 0 ++#define CONFIG_MWSC_DECODER 0 ++#define CONFIG_MXPEG_DECODER 0 ++#define CONFIG_NOTCHLC_DECODER 0 ++#define CONFIG_NUV_DECODER 0 ++#define CONFIG_PAF_VIDEO_DECODER 0 ++#define CONFIG_PAM_DECODER 0 ++#define CONFIG_PBM_DECODER 0 ++#define CONFIG_PCX_DECODER 0 ++#define CONFIG_PFM_DECODER 0 ++#define CONFIG_PGM_DECODER 0 ++#define CONFIG_PGMYUV_DECODER 0 ++#define CONFIG_PGX_DECODER 0 ++#define CONFIG_PHOTOCD_DECODER 0 ++#define CONFIG_PICTOR_DECODER 0 ++#define CONFIG_PIXLET_DECODER 0 ++#define CONFIG_PNG_DECODER 0 ++#define CONFIG_PPM_DECODER 0 ++#define CONFIG_PRORES_DECODER 0 ++#define CONFIG_PROSUMER_DECODER 0 ++#define CONFIG_PSD_DECODER 0 ++#define CONFIG_PTX_DECODER 0 ++#define CONFIG_QDRAW_DECODER 0 ++#define CONFIG_QPEG_DECODER 0 ++#define CONFIG_QTRLE_DECODER 0 ++#define CONFIG_R10K_DECODER 0 ++#define CONFIG_R210_DECODER 0 ++#define CONFIG_RASC_DECODER 0 ++#define CONFIG_RAWVIDEO_DECODER 0 ++#define CONFIG_RL2_DECODER 0 ++#define CONFIG_ROQ_DECODER 0 ++#define CONFIG_RPZA_DECODER 0 ++#define CONFIG_RSCC_DECODER 0 ++#define CONFIG_RV10_DECODER 0 ++#define CONFIG_RV20_DECODER 0 ++#define CONFIG_RV30_DECODER 0 ++#define CONFIG_RV40_DECODER 0 ++#define CONFIG_S302M_DECODER 0 ++#define CONFIG_SANM_DECODER 0 ++#define CONFIG_SCPR_DECODER 0 ++#define CONFIG_SCREENPRESSO_DECODER 0 ++#define CONFIG_SGA_DECODER 0 ++#define CONFIG_SGI_DECODER 0 ++#define CONFIG_SGIRLE_DECODER 0 ++#define CONFIG_SHEERVIDEO_DECODER 0 ++#define CONFIG_SIMBIOSIS_IMX_DECODER 0 ++#define CONFIG_SMACKER_DECODER 0 ++#define CONFIG_SMC_DECODER 0 ++#define CONFIG_SMVJPEG_DECODER 0 ++#define CONFIG_SNOW_DECODER 0 ++#define CONFIG_SP5X_DECODER 0 ++#define CONFIG_SPEEDHQ_DECODER 0 ++#define CONFIG_SPEEX_DECODER 0 ++#define CONFIG_SRGC_DECODER 0 ++#define CONFIG_SUNRAST_DECODER 0 ++#define CONFIG_SVQ1_DECODER 0 ++#define CONFIG_SVQ3_DECODER 0 ++#define CONFIG_TARGA_DECODER 0 ++#define CONFIG_TARGA_Y216_DECODER 0 ++#define CONFIG_TDSC_DECODER 0 ++#define CONFIG_THEORA_DECODER 1 ++#define CONFIG_THP_DECODER 0 ++#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 ++#define CONFIG_TIFF_DECODER 0 ++#define CONFIG_TMV_DECODER 0 ++#define CONFIG_TRUEMOTION1_DECODER 0 ++#define CONFIG_TRUEMOTION2_DECODER 0 ++#define CONFIG_TRUEMOTION2RT_DECODER 0 ++#define CONFIG_TSCC_DECODER 0 ++#define CONFIG_TSCC2_DECODER 0 ++#define CONFIG_TXD_DECODER 0 ++#define CONFIG_ULTI_DECODER 0 ++#define CONFIG_UTVIDEO_DECODER 0 ++#define CONFIG_V210_DECODER 0 ++#define CONFIG_V210X_DECODER 0 ++#define CONFIG_V308_DECODER 0 ++#define CONFIG_V408_DECODER 0 ++#define CONFIG_V410_DECODER 0 ++#define CONFIG_VB_DECODER 0 ++#define CONFIG_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 ++#define CONFIG_VC1_V4L2M2M_DECODER 0 ++#define CONFIG_VCR1_DECODER 0 ++#define CONFIG_VMDVIDEO_DECODER 0 ++#define CONFIG_VMNC_DECODER 0 ++#define CONFIG_VP3_DECODER 1 ++#define CONFIG_VP4_DECODER 0 ++#define CONFIG_VP5_DECODER 0 ++#define CONFIG_VP6_DECODER 0 ++#define CONFIG_VP6A_DECODER 0 ++#define CONFIG_VP6F_DECODER 0 ++#define CONFIG_VP7_DECODER 0 ++#define CONFIG_VP8_DECODER 1 ++#define CONFIG_VP8_RKMPP_DECODER 0 ++#define CONFIG_VP8_V4L2M2M_DECODER 0 ++#define CONFIG_VP9_DECODER 0 ++#define CONFIG_VP9_RKMPP_DECODER 0 ++#define CONFIG_VP9_V4L2M2M_DECODER 0 ++#define CONFIG_VQA_DECODER 0 ++#define CONFIG_WEBP_DECODER 0 ++#define CONFIG_WCMV_DECODER 0 ++#define CONFIG_WRAPPED_AVFRAME_DECODER 0 ++#define CONFIG_WMV1_DECODER 0 ++#define CONFIG_WMV2_DECODER 0 ++#define CONFIG_WMV3_DECODER 0 ++#define CONFIG_WMV3_CRYSTALHD_DECODER 0 ++#define CONFIG_WMV3IMAGE_DECODER 0 ++#define CONFIG_WNV1_DECODER 0 ++#define CONFIG_XAN_WC3_DECODER 0 ++#define CONFIG_XAN_WC4_DECODER 0 ++#define CONFIG_XBM_DECODER 0 ++#define CONFIG_XFACE_DECODER 0 ++#define CONFIG_XL_DECODER 0 ++#define CONFIG_XPM_DECODER 0 ++#define CONFIG_XWD_DECODER 0 ++#define CONFIG_Y41P_DECODER 0 ++#define CONFIG_YLC_DECODER 0 ++#define CONFIG_YOP_DECODER 0 ++#define CONFIG_YUV4_DECODER 0 ++#define CONFIG_ZERO12V_DECODER 0 ++#define CONFIG_ZEROCODEC_DECODER 0 ++#define CONFIG_ZLIB_DECODER 0 ++#define CONFIG_ZMBV_DECODER 0 ++#define CONFIG_AAC_DECODER 1 ++#define CONFIG_AAC_FIXED_DECODER 0 ++#define CONFIG_AAC_LATM_DECODER 0 ++#define CONFIG_AC3_DECODER 0 ++#define CONFIG_AC3_FIXED_DECODER 0 ++#define CONFIG_ACELP_KELVIN_DECODER 0 ++#define CONFIG_ALAC_DECODER 0 ++#define CONFIG_ALS_DECODER 0 ++#define CONFIG_AMRNB_DECODER 0 ++#define CONFIG_AMRWB_DECODER 0 ++#define CONFIG_APE_DECODER 0 ++#define CONFIG_APTX_DECODER 0 ++#define CONFIG_APTX_HD_DECODER 0 ++#define CONFIG_ATRAC1_DECODER 0 ++#define CONFIG_ATRAC3_DECODER 0 ++#define CONFIG_ATRAC3AL_DECODER 0 ++#define CONFIG_ATRAC3P_DECODER 0 ++#define CONFIG_ATRAC3PAL_DECODER 0 ++#define CONFIG_ATRAC9_DECODER 0 ++#define CONFIG_BINKAUDIO_DCT_DECODER 0 ++#define CONFIG_BINKAUDIO_RDFT_DECODER 0 ++#define CONFIG_BMV_AUDIO_DECODER 0 ++#define CONFIG_COOK_DECODER 0 ++#define CONFIG_DCA_DECODER 0 ++#define CONFIG_DFPWM_DECODER 0 ++#define CONFIG_DOLBY_E_DECODER 0 ++#define CONFIG_DSD_LSBF_DECODER 0 ++#define CONFIG_DSD_MSBF_DECODER 0 ++#define CONFIG_DSD_LSBF_PLANAR_DECODER 0 ++#define CONFIG_DSD_MSBF_PLANAR_DECODER 0 ++#define CONFIG_DSICINAUDIO_DECODER 0 ++#define CONFIG_DSS_SP_DECODER 0 ++#define CONFIG_DST_DECODER 0 ++#define CONFIG_EAC3_DECODER 0 ++#define CONFIG_EVRC_DECODER 0 ++#define CONFIG_FASTAUDIO_DECODER 0 ++#define CONFIG_FFWAVESYNTH_DECODER 0 ++#define CONFIG_FLAC_DECODER 1 ++#define CONFIG_G723_1_DECODER 0 ++#define CONFIG_G729_DECODER 0 ++#define CONFIG_GSM_DECODER 0 ++#define CONFIG_GSM_MS_DECODER 0 ++#define CONFIG_HCA_DECODER 0 ++#define CONFIG_HCOM_DECODER 0 ++#define CONFIG_IAC_DECODER 0 ++#define CONFIG_ILBC_DECODER 0 ++#define CONFIG_IMC_DECODER 0 ++#define CONFIG_INTERPLAY_ACM_DECODER 0 ++#define CONFIG_MACE3_DECODER 0 ++#define CONFIG_MACE6_DECODER 0 ++#define CONFIG_METASOUND_DECODER 0 ++#define CONFIG_MLP_DECODER 0 ++#define CONFIG_MP1_DECODER 0 ++#define CONFIG_MP1FLOAT_DECODER 0 ++#define CONFIG_MP2_DECODER 0 ++#define CONFIG_MP2FLOAT_DECODER 0 ++#define CONFIG_MP3FLOAT_DECODER 0 ++#define CONFIG_MP3_DECODER 1 ++#define CONFIG_MP3ADUFLOAT_DECODER 0 ++#define CONFIG_MP3ADU_DECODER 0 ++#define CONFIG_MP3ON4FLOAT_DECODER 0 ++#define CONFIG_MP3ON4_DECODER 0 ++#define CONFIG_MPC7_DECODER 0 ++#define CONFIG_MPC8_DECODER 0 ++#define CONFIG_MSNSIREN_DECODER 0 ++#define CONFIG_NELLYMOSER_DECODER 0 ++#define CONFIG_ON2AVC_DECODER 0 ++#define CONFIG_OPUS_DECODER 0 ++#define CONFIG_PAF_AUDIO_DECODER 0 ++#define CONFIG_QCELP_DECODER 0 ++#define CONFIG_QDM2_DECODER 0 ++#define CONFIG_QDMC_DECODER 0 ++#define CONFIG_RA_144_DECODER 0 ++#define CONFIG_RA_288_DECODER 0 ++#define CONFIG_RALF_DECODER 0 ++#define CONFIG_SBC_DECODER 0 ++#define CONFIG_SHORTEN_DECODER 0 ++#define CONFIG_SIPR_DECODER 0 ++#define CONFIG_SIREN_DECODER 0 ++#define CONFIG_SMACKAUD_DECODER 0 ++#define CONFIG_SONIC_DECODER 0 ++#define CONFIG_TAK_DECODER 0 ++#define CONFIG_TRUEHD_DECODER 0 ++#define CONFIG_TRUESPEECH_DECODER 0 ++#define CONFIG_TTA_DECODER 0 ++#define CONFIG_TWINVQ_DECODER 0 ++#define CONFIG_VMDAUDIO_DECODER 0 ++#define CONFIG_VORBIS_DECODER 1 ++#define CONFIG_WAVPACK_DECODER 0 ++#define CONFIG_WMALOSSLESS_DECODER 0 ++#define CONFIG_WMAPRO_DECODER 0 ++#define CONFIG_WMAV1_DECODER 0 ++#define CONFIG_WMAV2_DECODER 0 ++#define CONFIG_WMAVOICE_DECODER 0 ++#define CONFIG_WS_SND1_DECODER 0 ++#define CONFIG_XMA1_DECODER 0 ++#define CONFIG_XMA2_DECODER 0 ++#define CONFIG_PCM_ALAW_DECODER 1 ++#define CONFIG_PCM_BLURAY_DECODER 0 ++#define CONFIG_PCM_DVD_DECODER 0 ++#define CONFIG_PCM_F16LE_DECODER 0 ++#define CONFIG_PCM_F24LE_DECODER 0 ++#define CONFIG_PCM_F32BE_DECODER 0 ++#define CONFIG_PCM_F32LE_DECODER 1 ++#define CONFIG_PCM_F64BE_DECODER 0 ++#define CONFIG_PCM_F64LE_DECODER 0 ++#define CONFIG_PCM_LXF_DECODER 0 ++#define CONFIG_PCM_MULAW_DECODER 1 ++#define CONFIG_PCM_S8_DECODER 0 ++#define CONFIG_PCM_S8_PLANAR_DECODER 0 ++#define CONFIG_PCM_S16BE_DECODER 1 ++#define CONFIG_PCM_S16BE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S16LE_DECODER 1 ++#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S24BE_DECODER 1 ++#define CONFIG_PCM_S24DAUD_DECODER 0 ++#define CONFIG_PCM_S24LE_DECODER 1 ++#define CONFIG_PCM_S24LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S32BE_DECODER 0 ++#define CONFIG_PCM_S32LE_DECODER 1 ++#define CONFIG_PCM_S32LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S64BE_DECODER 0 ++#define CONFIG_PCM_S64LE_DECODER 0 ++#define CONFIG_PCM_SGA_DECODER 0 ++#define CONFIG_PCM_U8_DECODER 1 ++#define CONFIG_PCM_U16BE_DECODER 0 ++#define CONFIG_PCM_U16LE_DECODER 0 ++#define CONFIG_PCM_U24BE_DECODER 0 ++#define CONFIG_PCM_U24LE_DECODER 0 ++#define CONFIG_PCM_U32BE_DECODER 0 ++#define CONFIG_PCM_U32LE_DECODER 0 ++#define CONFIG_PCM_VIDC_DECODER 0 ++#define CONFIG_DERF_DPCM_DECODER 0 ++#define CONFIG_GREMLIN_DPCM_DECODER 0 ++#define CONFIG_INTERPLAY_DPCM_DECODER 0 ++#define CONFIG_ROQ_DPCM_DECODER 0 ++#define CONFIG_SDX2_DPCM_DECODER 0 ++#define CONFIG_SOL_DPCM_DECODER 0 ++#define CONFIG_XAN_DPCM_DECODER 0 ++#define CONFIG_ADPCM_4XM_DECODER 0 ++#define CONFIG_ADPCM_ADX_DECODER 0 ++#define CONFIG_ADPCM_AFC_DECODER 0 ++#define CONFIG_ADPCM_AGM_DECODER 0 ++#define CONFIG_ADPCM_AICA_DECODER 0 ++#define CONFIG_ADPCM_ARGO_DECODER 0 ++#define CONFIG_ADPCM_CT_DECODER 0 ++#define CONFIG_ADPCM_DTK_DECODER 0 ++#define CONFIG_ADPCM_EA_DECODER 0 ++#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 ++#define CONFIG_ADPCM_EA_R1_DECODER 0 ++#define CONFIG_ADPCM_EA_R2_DECODER 0 ++#define CONFIG_ADPCM_EA_R3_DECODER 0 ++#define CONFIG_ADPCM_EA_XAS_DECODER 0 ++#define CONFIG_ADPCM_G722_DECODER 0 ++#define CONFIG_ADPCM_G726_DECODER 0 ++#define CONFIG_ADPCM_G726LE_DECODER 0 ++#define CONFIG_ADPCM_IMA_ACORN_DECODER 0 ++#define CONFIG_ADPCM_IMA_AMV_DECODER 0 ++#define CONFIG_ADPCM_IMA_ALP_DECODER 0 ++#define CONFIG_ADPCM_IMA_APC_DECODER 0 ++#define CONFIG_ADPCM_IMA_APM_DECODER 0 ++#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 ++#define CONFIG_ADPCM_IMA_DAT4_DECODER 0 ++#define CONFIG_ADPCM_IMA_DK3_DECODER 0 ++#define CONFIG_ADPCM_IMA_DK4_DECODER 0 ++#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 ++#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 ++#define CONFIG_ADPCM_IMA_ISS_DECODER 0 ++#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 ++#define CONFIG_ADPCM_IMA_MTF_DECODER 0 ++#define CONFIG_ADPCM_IMA_OKI_DECODER 0 ++#define CONFIG_ADPCM_IMA_QT_DECODER 0 ++#define CONFIG_ADPCM_IMA_RAD_DECODER 0 ++#define CONFIG_ADPCM_IMA_SSI_DECODER 0 ++#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 ++#define CONFIG_ADPCM_IMA_WAV_DECODER 0 ++#define CONFIG_ADPCM_IMA_WS_DECODER 0 ++#define CONFIG_ADPCM_MS_DECODER 0 ++#define CONFIG_ADPCM_MTAF_DECODER 0 ++#define CONFIG_ADPCM_PSX_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_2_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_3_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_4_DECODER 0 ++#define CONFIG_ADPCM_SWF_DECODER 0 ++#define CONFIG_ADPCM_THP_DECODER 0 ++#define CONFIG_ADPCM_THP_LE_DECODER 0 ++#define CONFIG_ADPCM_VIMA_DECODER 0 ++#define CONFIG_ADPCM_XA_DECODER 0 ++#define CONFIG_ADPCM_YAMAHA_DECODER 0 ++#define CONFIG_ADPCM_ZORK_DECODER 0 ++#define CONFIG_SSA_DECODER 0 ++#define CONFIG_ASS_DECODER 0 ++#define CONFIG_CCAPTION_DECODER 0 ++#define CONFIG_DVBSUB_DECODER 0 ++#define CONFIG_DVDSUB_DECODER 0 ++#define CONFIG_JACOSUB_DECODER 0 ++#define CONFIG_MICRODVD_DECODER 0 ++#define CONFIG_MOVTEXT_DECODER 0 ++#define CONFIG_MPL2_DECODER 0 ++#define CONFIG_PGSSUB_DECODER 0 ++#define CONFIG_PJS_DECODER 0 ++#define CONFIG_REALTEXT_DECODER 0 ++#define CONFIG_SAMI_DECODER 0 ++#define CONFIG_SRT_DECODER 0 ++#define CONFIG_STL_DECODER 0 ++#define CONFIG_SUBRIP_DECODER 0 ++#define CONFIG_SUBVIEWER_DECODER 0 ++#define CONFIG_SUBVIEWER1_DECODER 0 ++#define CONFIG_TEXT_DECODER 0 ++#define CONFIG_VPLAYER_DECODER 0 ++#define CONFIG_WEBVTT_DECODER 0 ++#define CONFIG_XSUB_DECODER 0 ++#define CONFIG_AAC_AT_DECODER 0 ++#define CONFIG_AC3_AT_DECODER 0 ++#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 ++#define CONFIG_ALAC_AT_DECODER 0 ++#define CONFIG_AMR_NB_AT_DECODER 0 ++#define CONFIG_EAC3_AT_DECODER 0 ++#define CONFIG_GSM_MS_AT_DECODER 0 ++#define CONFIG_ILBC_AT_DECODER 0 ++#define CONFIG_MP1_AT_DECODER 0 ++#define CONFIG_MP2_AT_DECODER 0 ++#define CONFIG_MP3_AT_DECODER 0 ++#define CONFIG_PCM_ALAW_AT_DECODER 0 ++#define CONFIG_PCM_MULAW_AT_DECODER 0 ++#define CONFIG_QDMC_AT_DECODER 0 ++#define CONFIG_QDM2_AT_DECODER 0 ++#define CONFIG_LIBARIBB24_DECODER 0 ++#define CONFIG_LIBCELT_DECODER 0 ++#define CONFIG_LIBCODEC2_DECODER 0 ++#define CONFIG_LIBDAV1D_DECODER 0 ++#define CONFIG_LIBDAVS2_DECODER 0 ++#define CONFIG_LIBFDK_AAC_DECODER 0 ++#define CONFIG_LIBGSM_DECODER 0 ++#define CONFIG_LIBGSM_MS_DECODER 0 ++#define CONFIG_LIBILBC_DECODER 0 ++#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 ++#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 ++#define CONFIG_LIBOPENJPEG_DECODER 0 ++#define CONFIG_LIBOPUS_DECODER 1 ++#define CONFIG_LIBRSVG_DECODER 0 ++#define CONFIG_LIBSPEEX_DECODER 0 ++#define CONFIG_LIBUAVS3D_DECODER 0 ++#define CONFIG_LIBVORBIS_DECODER 0 ++#define CONFIG_LIBVPX_VP8_DECODER 0 ++#define CONFIG_LIBVPX_VP9_DECODER 0 ++#define CONFIG_LIBZVBI_TELETEXT_DECODER 0 ++#define CONFIG_BINTEXT_DECODER 0 ++#define CONFIG_XBIN_DECODER 0 ++#define CONFIG_IDF_DECODER 0 ++#define CONFIG_LIBAOM_AV1_DECODER 0 ++#define CONFIG_AV1_DECODER 0 ++#define CONFIG_AV1_CUVID_DECODER 0 ++#define CONFIG_AV1_QSV_DECODER 0 ++#define CONFIG_LIBOPENH264_DECODER 0 ++#define CONFIG_H264_CUVID_DECODER 0 ++#define CONFIG_HEVC_CUVID_DECODER 0 ++#define CONFIG_HEVC_MEDIACODEC_DECODER 0 ++#define CONFIG_MJPEG_CUVID_DECODER 0 ++#define CONFIG_MJPEG_QSV_DECODER 0 ++#define CONFIG_MPEG1_CUVID_DECODER 0 ++#define CONFIG_MPEG2_CUVID_DECODER 0 ++#define CONFIG_MPEG4_CUVID_DECODER 0 ++#define CONFIG_MPEG4_MEDIACODEC_DECODER 0 ++#define CONFIG_VC1_CUVID_DECODER 0 ++#define CONFIG_VP8_CUVID_DECODER 0 ++#define CONFIG_VP8_MEDIACODEC_DECODER 0 ++#define CONFIG_VP8_QSV_DECODER 0 ++#define CONFIG_VP9_CUVID_DECODER 0 ++#define CONFIG_VP9_MEDIACODEC_DECODER 0 ++#define CONFIG_VP9_QSV_DECODER 0 ++#define CONFIG_A64MULTI_ENCODER 0 ++#define CONFIG_A64MULTI5_ENCODER 0 ++#define CONFIG_ALIAS_PIX_ENCODER 0 ++#define CONFIG_AMV_ENCODER 0 ++#define CONFIG_APNG_ENCODER 0 ++#define CONFIG_ASV1_ENCODER 0 ++#define CONFIG_ASV2_ENCODER 0 ++#define CONFIG_AVRP_ENCODER 0 ++#define CONFIG_AVUI_ENCODER 0 ++#define CONFIG_AYUV_ENCODER 0 ++#define CONFIG_BITPACKED_ENCODER 0 ++#define CONFIG_BMP_ENCODER 0 ++#define CONFIG_CFHD_ENCODER 0 ++#define CONFIG_CINEPAK_ENCODER 0 ++#define CONFIG_CLJR_ENCODER 0 ++#define CONFIG_COMFORTNOISE_ENCODER 0 ++#define CONFIG_DNXHD_ENCODER 0 ++#define CONFIG_DPX_ENCODER 0 ++#define CONFIG_DVVIDEO_ENCODER 0 ++#define CONFIG_EXR_ENCODER 0 ++#define CONFIG_FFV1_ENCODER 0 ++#define CONFIG_FFVHUFF_ENCODER 0 ++#define CONFIG_FITS_ENCODER 0 ++#define CONFIG_FLASHSV_ENCODER 0 ++#define CONFIG_FLASHSV2_ENCODER 0 ++#define CONFIG_FLV_ENCODER 0 ++#define CONFIG_GIF_ENCODER 0 ++#define CONFIG_H261_ENCODER 0 ++#define CONFIG_H263_ENCODER 0 ++#define CONFIG_H263P_ENCODER 0 ++#define CONFIG_HAP_ENCODER 0 ++#define CONFIG_HUFFYUV_ENCODER 0 ++#define CONFIG_JPEG2000_ENCODER 0 ++#define CONFIG_JPEGLS_ENCODER 0 ++#define CONFIG_LJPEG_ENCODER 0 ++#define CONFIG_MAGICYUV_ENCODER 0 ++#define CONFIG_MJPEG_ENCODER 0 ++#define CONFIG_MPEG1VIDEO_ENCODER 0 ++#define CONFIG_MPEG2VIDEO_ENCODER 0 ++#define CONFIG_MPEG4_ENCODER 0 ++#define CONFIG_MSMPEG4V2_ENCODER 0 ++#define CONFIG_MSMPEG4V3_ENCODER 0 ++#define CONFIG_MSVIDEO1_ENCODER 0 ++#define CONFIG_PAM_ENCODER 0 ++#define CONFIG_PBM_ENCODER 0 ++#define CONFIG_PCX_ENCODER 0 ++#define CONFIG_PFM_ENCODER 0 ++#define CONFIG_PGM_ENCODER 0 ++#define CONFIG_PGMYUV_ENCODER 0 ++#define CONFIG_PNG_ENCODER 0 ++#define CONFIG_PPM_ENCODER 0 ++#define CONFIG_PRORES_ENCODER 0 ++#define CONFIG_PRORES_AW_ENCODER 0 ++#define CONFIG_PRORES_KS_ENCODER 0 ++#define CONFIG_QTRLE_ENCODER 0 ++#define CONFIG_R10K_ENCODER 0 ++#define CONFIG_R210_ENCODER 0 ++#define CONFIG_RAWVIDEO_ENCODER 0 ++#define CONFIG_ROQ_ENCODER 0 ++#define CONFIG_RPZA_ENCODER 0 ++#define CONFIG_RV10_ENCODER 0 ++#define CONFIG_RV20_ENCODER 0 ++#define CONFIG_S302M_ENCODER 0 ++#define CONFIG_SGI_ENCODER 0 ++#define CONFIG_SMC_ENCODER 0 ++#define CONFIG_SNOW_ENCODER 0 ++#define CONFIG_SPEEDHQ_ENCODER 0 ++#define CONFIG_SUNRAST_ENCODER 0 ++#define CONFIG_SVQ1_ENCODER 0 ++#define CONFIG_TARGA_ENCODER 0 ++#define CONFIG_TIFF_ENCODER 0 ++#define CONFIG_UTVIDEO_ENCODER 0 ++#define CONFIG_V210_ENCODER 0 ++#define CONFIG_V308_ENCODER 0 ++#define CONFIG_V408_ENCODER 0 ++#define CONFIG_V410_ENCODER 0 ++#define CONFIG_VC2_ENCODER 0 ++#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 ++#define CONFIG_WMV1_ENCODER 0 ++#define CONFIG_WMV2_ENCODER 0 ++#define CONFIG_XBM_ENCODER 0 ++#define CONFIG_XFACE_ENCODER 0 ++#define CONFIG_XWD_ENCODER 0 ++#define CONFIG_Y41P_ENCODER 0 ++#define CONFIG_YUV4_ENCODER 0 ++#define CONFIG_ZLIB_ENCODER 0 ++#define CONFIG_ZMBV_ENCODER 0 ++#define CONFIG_AAC_ENCODER 0 ++#define CONFIG_AC3_ENCODER 0 ++#define CONFIG_AC3_FIXED_ENCODER 0 ++#define CONFIG_ALAC_ENCODER 0 ++#define CONFIG_APTX_ENCODER 0 ++#define CONFIG_APTX_HD_ENCODER 0 ++#define CONFIG_DCA_ENCODER 0 ++#define CONFIG_DFPWM_ENCODER 0 ++#define CONFIG_EAC3_ENCODER 0 ++#define CONFIG_FLAC_ENCODER 0 ++#define CONFIG_G723_1_ENCODER 0 ++#define CONFIG_MLP_ENCODER 0 ++#define CONFIG_MP2_ENCODER 0 ++#define CONFIG_MP2FIXED_ENCODER 0 ++#define CONFIG_NELLYMOSER_ENCODER 0 ++#define CONFIG_OPUS_ENCODER 0 ++#define CONFIG_RA_144_ENCODER 0 ++#define CONFIG_SBC_ENCODER 0 ++#define CONFIG_SONIC_ENCODER 0 ++#define CONFIG_SONIC_LS_ENCODER 0 ++#define CONFIG_TRUEHD_ENCODER 0 ++#define CONFIG_TTA_ENCODER 0 ++#define CONFIG_VORBIS_ENCODER 0 ++#define CONFIG_WAVPACK_ENCODER 0 ++#define CONFIG_WMAV1_ENCODER 0 ++#define CONFIG_WMAV2_ENCODER 0 ++#define CONFIG_PCM_ALAW_ENCODER 0 ++#define CONFIG_PCM_BLURAY_ENCODER 0 ++#define CONFIG_PCM_DVD_ENCODER 0 ++#define CONFIG_PCM_F32BE_ENCODER 0 ++#define CONFIG_PCM_F32LE_ENCODER 0 ++#define CONFIG_PCM_F64BE_ENCODER 0 ++#define CONFIG_PCM_F64LE_ENCODER 0 ++#define CONFIG_PCM_MULAW_ENCODER 0 ++#define CONFIG_PCM_S8_ENCODER 0 ++#define CONFIG_PCM_S8_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S16BE_ENCODER 0 ++#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S16LE_ENCODER 0 ++#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S24BE_ENCODER 0 ++#define CONFIG_PCM_S24DAUD_ENCODER 0 ++#define CONFIG_PCM_S24LE_ENCODER 0 ++#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S32BE_ENCODER 0 ++#define CONFIG_PCM_S32LE_ENCODER 0 ++#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S64BE_ENCODER 0 ++#define CONFIG_PCM_S64LE_ENCODER 0 ++#define CONFIG_PCM_U8_ENCODER 0 ++#define CONFIG_PCM_U16BE_ENCODER 0 ++#define CONFIG_PCM_U16LE_ENCODER 0 ++#define CONFIG_PCM_U24BE_ENCODER 0 ++#define CONFIG_PCM_U24LE_ENCODER 0 ++#define CONFIG_PCM_U32BE_ENCODER 0 ++#define CONFIG_PCM_U32LE_ENCODER 0 ++#define CONFIG_PCM_VIDC_ENCODER 0 ++#define CONFIG_ROQ_DPCM_ENCODER 0 ++#define CONFIG_ADPCM_ADX_ENCODER 0 ++#define CONFIG_ADPCM_ARGO_ENCODER 0 ++#define CONFIG_ADPCM_G722_ENCODER 0 ++#define CONFIG_ADPCM_G726_ENCODER 0 ++#define CONFIG_ADPCM_G726LE_ENCODER 0 ++#define CONFIG_ADPCM_IMA_AMV_ENCODER 0 ++#define CONFIG_ADPCM_IMA_ALP_ENCODER 0 ++#define CONFIG_ADPCM_IMA_APM_ENCODER 0 ++#define CONFIG_ADPCM_IMA_QT_ENCODER 0 ++#define CONFIG_ADPCM_IMA_SSI_ENCODER 0 ++#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 ++#define CONFIG_ADPCM_IMA_WS_ENCODER 0 ++#define CONFIG_ADPCM_MS_ENCODER 0 ++#define CONFIG_ADPCM_SWF_ENCODER 0 ++#define CONFIG_ADPCM_YAMAHA_ENCODER 0 ++#define CONFIG_SSA_ENCODER 0 ++#define CONFIG_ASS_ENCODER 0 ++#define CONFIG_DVBSUB_ENCODER 0 ++#define CONFIG_DVDSUB_ENCODER 0 ++#define CONFIG_MOVTEXT_ENCODER 0 ++#define CONFIG_SRT_ENCODER 0 ++#define CONFIG_SUBRIP_ENCODER 0 ++#define CONFIG_TEXT_ENCODER 0 ++#define CONFIG_TTML_ENCODER 0 ++#define CONFIG_WEBVTT_ENCODER 0 ++#define CONFIG_XSUB_ENCODER 0 ++#define CONFIG_AAC_AT_ENCODER 0 ++#define CONFIG_ALAC_AT_ENCODER 0 ++#define CONFIG_ILBC_AT_ENCODER 0 ++#define CONFIG_PCM_ALAW_AT_ENCODER 0 ++#define CONFIG_PCM_MULAW_AT_ENCODER 0 ++#define CONFIG_LIBAOM_AV1_ENCODER 0 ++#define CONFIG_LIBCODEC2_ENCODER 0 ++#define CONFIG_LIBFDK_AAC_ENCODER 0 ++#define CONFIG_LIBGSM_ENCODER 0 ++#define CONFIG_LIBGSM_MS_ENCODER 0 ++#define CONFIG_LIBILBC_ENCODER 0 ++#define CONFIG_LIBMP3LAME_ENCODER 0 ++#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 ++#define CONFIG_LIBOPENJPEG_ENCODER 0 ++#define CONFIG_LIBOPUS_ENCODER 0 ++#define CONFIG_LIBRAV1E_ENCODER 0 ++#define CONFIG_LIBSHINE_ENCODER 0 ++#define CONFIG_LIBSPEEX_ENCODER 0 ++#define CONFIG_LIBSVTAV1_ENCODER 0 ++#define CONFIG_LIBTHEORA_ENCODER 0 ++#define CONFIG_LIBTWOLAME_ENCODER 0 ++#define CONFIG_LIBVO_AMRWBENC_ENCODER 0 ++#define CONFIG_LIBVORBIS_ENCODER 0 ++#define CONFIG_LIBVPX_VP8_ENCODER 0 ++#define CONFIG_LIBVPX_VP9_ENCODER 0 ++#define CONFIG_LIBWEBP_ANIM_ENCODER 0 ++#define CONFIG_LIBWEBP_ENCODER 0 ++#define CONFIG_LIBX262_ENCODER 0 ++#define CONFIG_LIBX264_ENCODER 0 ++#define CONFIG_LIBX264RGB_ENCODER 0 ++#define CONFIG_LIBX265_ENCODER 0 ++#define CONFIG_LIBXAVS_ENCODER 0 ++#define CONFIG_LIBXAVS2_ENCODER 0 ++#define CONFIG_LIBXVID_ENCODER 0 ++#define CONFIG_AAC_MF_ENCODER 0 ++#define CONFIG_AC3_MF_ENCODER 0 ++#define CONFIG_H263_V4L2M2M_ENCODER 0 ++#define CONFIG_LIBOPENH264_ENCODER 0 ++#define CONFIG_H264_AMF_ENCODER 0 ++#define CONFIG_H264_MF_ENCODER 0 ++#define CONFIG_H264_NVENC_ENCODER 0 ++#define CONFIG_H264_OMX_ENCODER 0 ++#define CONFIG_H264_QSV_ENCODER 0 ++#define CONFIG_H264_V4L2M2M_ENCODER 0 ++#define CONFIG_H264_VAAPI_ENCODER 0 ++#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_HEVC_AMF_ENCODER 0 ++#define CONFIG_HEVC_MF_ENCODER 0 ++#define CONFIG_HEVC_NVENC_ENCODER 0 ++#define CONFIG_HEVC_QSV_ENCODER 0 ++#define CONFIG_HEVC_V4L2M2M_ENCODER 0 ++#define CONFIG_HEVC_VAAPI_ENCODER 0 ++#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_LIBKVAZAAR_ENCODER 0 ++#define CONFIG_MJPEG_QSV_ENCODER 0 ++#define CONFIG_MJPEG_VAAPI_ENCODER 0 ++#define CONFIG_MP3_MF_ENCODER 0 ++#define CONFIG_MPEG2_QSV_ENCODER 0 ++#define CONFIG_MPEG2_VAAPI_ENCODER 0 ++#define CONFIG_MPEG4_OMX_ENCODER 0 ++#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_VP8_V4L2M2M_ENCODER 0 ++#define CONFIG_VP8_VAAPI_ENCODER 0 ++#define CONFIG_VP9_VAAPI_ENCODER 0 ++#define CONFIG_VP9_QSV_ENCODER 0 ++#define CONFIG_AV1_D3D11VA_HWACCEL 0 ++#define CONFIG_AV1_D3D11VA2_HWACCEL 0 ++#define CONFIG_AV1_DXVA2_HWACCEL 0 ++#define CONFIG_AV1_NVDEC_HWACCEL 0 ++#define CONFIG_AV1_VAAPI_HWACCEL 0 ++#define CONFIG_H263_VAAPI_HWACCEL 0 ++#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_H264_D3D11VA_HWACCEL 0 ++#define CONFIG_H264_D3D11VA2_HWACCEL 0 ++#define CONFIG_H264_DXVA2_HWACCEL 0 ++#define CONFIG_H264_NVDEC_HWACCEL 0 ++#define CONFIG_H264_VAAPI_HWACCEL 0 ++#define CONFIG_H264_VDPAU_HWACCEL 0 ++#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_HEVC_D3D11VA_HWACCEL 0 ++#define CONFIG_HEVC_D3D11VA2_HWACCEL 0 ++#define CONFIG_HEVC_DXVA2_HWACCEL 0 ++#define CONFIG_HEVC_NVDEC_HWACCEL 0 ++#define CONFIG_HEVC_VAAPI_HWACCEL 0 ++#define CONFIG_HEVC_VDPAU_HWACCEL 0 ++#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MJPEG_NVDEC_HWACCEL 0 ++#define CONFIG_MJPEG_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG1_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG1_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 ++#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 ++#define CONFIG_MPEG2_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG2_DXVA2_HWACCEL 0 ++#define CONFIG_MPEG2_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG2_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MPEG4_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG4_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG4_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_VC1_D3D11VA_HWACCEL 0 ++#define CONFIG_VC1_D3D11VA2_HWACCEL 0 ++#define CONFIG_VC1_DXVA2_HWACCEL 0 ++#define CONFIG_VC1_NVDEC_HWACCEL 0 ++#define CONFIG_VC1_VAAPI_HWACCEL 0 ++#define CONFIG_VC1_VDPAU_HWACCEL 0 ++#define CONFIG_VP8_NVDEC_HWACCEL 0 ++#define CONFIG_VP8_VAAPI_HWACCEL 0 ++#define CONFIG_VP9_D3D11VA_HWACCEL 0 ++#define CONFIG_VP9_D3D11VA2_HWACCEL 0 ++#define CONFIG_VP9_DXVA2_HWACCEL 0 ++#define CONFIG_VP9_NVDEC_HWACCEL 0 ++#define CONFIG_VP9_VAAPI_HWACCEL 0 ++#define CONFIG_VP9_VDPAU_HWACCEL 0 ++#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_WMV3_D3D11VA_HWACCEL 0 ++#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 ++#define CONFIG_WMV3_DXVA2_HWACCEL 0 ++#define CONFIG_WMV3_NVDEC_HWACCEL 0 ++#define CONFIG_WMV3_VAAPI_HWACCEL 0 ++#define CONFIG_WMV3_VDPAU_HWACCEL 0 ++#define CONFIG_AAC_PARSER 1 ++#define CONFIG_AAC_LATM_PARSER 0 ++#define CONFIG_AC3_PARSER 0 ++#define CONFIG_ADX_PARSER 0 ++#define CONFIG_AMR_PARSER 0 ++#define CONFIG_AV1_PARSER 0 ++#define CONFIG_AVS2_PARSER 0 ++#define CONFIG_AVS3_PARSER 0 ++#define CONFIG_BMP_PARSER 0 ++#define CONFIG_CAVSVIDEO_PARSER 0 ++#define CONFIG_COOK_PARSER 0 ++#define CONFIG_CRI_PARSER 0 ++#define CONFIG_DCA_PARSER 0 ++#define CONFIG_DIRAC_PARSER 0 ++#define CONFIG_DNXHD_PARSER 0 ++#define CONFIG_DOLBY_E_PARSER 0 ++#define CONFIG_DPX_PARSER 0 ++#define CONFIG_DVAUDIO_PARSER 0 ++#define CONFIG_DVBSUB_PARSER 0 ++#define CONFIG_DVDSUB_PARSER 0 ++#define CONFIG_DVD_NAV_PARSER 0 ++#define CONFIG_FLAC_PARSER 1 ++#define CONFIG_G723_1_PARSER 0 ++#define CONFIG_G729_PARSER 0 ++#define CONFIG_GIF_PARSER 0 ++#define CONFIG_GSM_PARSER 0 ++#define CONFIG_H261_PARSER 0 ++#define CONFIG_H263_PARSER 0 ++#define CONFIG_H264_PARSER 1 ++#define CONFIG_HEVC_PARSER 0 ++#define CONFIG_IPU_PARSER 0 ++#define CONFIG_JPEG2000_PARSER 0 ++#define CONFIG_MJPEG_PARSER 0 ++#define CONFIG_MLP_PARSER 0 ++#define CONFIG_MPEG4VIDEO_PARSER 0 ++#define CONFIG_MPEGAUDIO_PARSER 1 ++#define CONFIG_MPEGVIDEO_PARSER 0 ++#define CONFIG_OPUS_PARSER 1 ++#define CONFIG_PNG_PARSER 0 ++#define CONFIG_PNM_PARSER 0 ++#define CONFIG_RV30_PARSER 0 ++#define CONFIG_RV40_PARSER 0 ++#define CONFIG_SBC_PARSER 0 ++#define CONFIG_SIPR_PARSER 0 ++#define CONFIG_TAK_PARSER 0 ++#define CONFIG_VC1_PARSER 0 ++#define CONFIG_VORBIS_PARSER 1 ++#define CONFIG_VP3_PARSER 1 ++#define CONFIG_VP8_PARSER 1 ++#define CONFIG_VP9_PARSER 1 ++#define CONFIG_WEBP_PARSER 0 ++#define CONFIG_XBM_PARSER 0 ++#define CONFIG_XMA_PARSER 0 ++#define CONFIG_ALSA_INDEV 0 ++#define CONFIG_ANDROID_CAMERA_INDEV 0 ++#define CONFIG_AVFOUNDATION_INDEV 0 ++#define CONFIG_BKTR_INDEV 0 ++#define CONFIG_DECKLINK_INDEV 0 ++#define CONFIG_DSHOW_INDEV 0 ++#define CONFIG_FBDEV_INDEV 0 ++#define CONFIG_GDIGRAB_INDEV 0 ++#define CONFIG_IEC61883_INDEV 0 ++#define CONFIG_JACK_INDEV 0 ++#define CONFIG_KMSGRAB_INDEV 0 ++#define CONFIG_LAVFI_INDEV 0 ++#define CONFIG_OPENAL_INDEV 0 ++#define CONFIG_OSS_INDEV 0 ++#define CONFIG_PULSE_INDEV 0 ++#define CONFIG_SNDIO_INDEV 0 ++#define CONFIG_V4L2_INDEV 0 ++#define CONFIG_VFWCAP_INDEV 0 ++#define CONFIG_XCBGRAB_INDEV 0 ++#define CONFIG_LIBCDIO_INDEV 0 ++#define CONFIG_LIBDC1394_INDEV 0 ++#define CONFIG_ALSA_OUTDEV 0 ++#define CONFIG_AUDIOTOOLBOX_OUTDEV 0 ++#define CONFIG_CACA_OUTDEV 0 ++#define CONFIG_DECKLINK_OUTDEV 0 ++#define CONFIG_FBDEV_OUTDEV 0 ++#define CONFIG_OPENGL_OUTDEV 0 ++#define CONFIG_OSS_OUTDEV 0 ++#define CONFIG_PULSE_OUTDEV 0 ++#define CONFIG_SDL2_OUTDEV 0 ++#define CONFIG_SNDIO_OUTDEV 0 ++#define CONFIG_V4L2_OUTDEV 0 ++#define CONFIG_XV_OUTDEV 0 ++#define CONFIG_ABENCH_FILTER 0 ++#define CONFIG_ACOMPRESSOR_FILTER 0 ++#define CONFIG_ACONTRAST_FILTER 0 ++#define CONFIG_ACOPY_FILTER 0 ++#define CONFIG_ACUE_FILTER 0 ++#define CONFIG_ACROSSFADE_FILTER 0 ++#define CONFIG_ACROSSOVER_FILTER 0 ++#define CONFIG_ACRUSHER_FILTER 0 ++#define CONFIG_ADECLICK_FILTER 0 ++#define CONFIG_ADECLIP_FILTER 0 ++#define CONFIG_ADECORRELATE_FILTER 0 ++#define CONFIG_ADELAY_FILTER 0 ++#define CONFIG_ADENORM_FILTER 0 ++#define CONFIG_ADERIVATIVE_FILTER 0 ++#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 ++#define CONFIG_ADYNAMICSMOOTH_FILTER 0 ++#define CONFIG_AECHO_FILTER 0 ++#define CONFIG_AEMPHASIS_FILTER 0 ++#define CONFIG_AEVAL_FILTER 0 ++#define CONFIG_AEXCITER_FILTER 0 ++#define CONFIG_AFADE_FILTER 0 ++#define CONFIG_AFFTDN_FILTER 0 ++#define CONFIG_AFFTFILT_FILTER 0 ++#define CONFIG_AFIR_FILTER 0 ++#define CONFIG_AFORMAT_FILTER 0 ++#define CONFIG_AFREQSHIFT_FILTER 0 ++#define CONFIG_AFWTDN_FILTER 0 ++#define CONFIG_AGATE_FILTER 0 ++#define CONFIG_AIIR_FILTER 0 ++#define CONFIG_AINTEGRAL_FILTER 0 ++#define CONFIG_AINTERLEAVE_FILTER 0 ++#define CONFIG_ALATENCY_FILTER 0 ++#define CONFIG_ALIMITER_FILTER 0 ++#define CONFIG_ALLPASS_FILTER 0 ++#define CONFIG_ALOOP_FILTER 0 ++#define CONFIG_AMERGE_FILTER 0 ++#define CONFIG_AMETADATA_FILTER 0 ++#define CONFIG_AMIX_FILTER 0 ++#define CONFIG_AMULTIPLY_FILTER 0 ++#define CONFIG_ANEQUALIZER_FILTER 0 ++#define CONFIG_ANLMDN_FILTER 0 ++#define CONFIG_ANLMF_FILTER 0 ++#define CONFIG_ANLMS_FILTER 0 ++#define CONFIG_ANULL_FILTER 0 ++#define CONFIG_APAD_FILTER 0 ++#define CONFIG_APERMS_FILTER 0 ++#define CONFIG_APHASER_FILTER 0 ++#define CONFIG_APHASESHIFT_FILTER 0 ++#define CONFIG_APSYCLIP_FILTER 0 ++#define CONFIG_APULSATOR_FILTER 0 ++#define CONFIG_AREALTIME_FILTER 0 ++#define CONFIG_ARESAMPLE_FILTER 0 ++#define CONFIG_AREVERSE_FILTER 0 ++#define CONFIG_ARNNDN_FILTER 0 ++#define CONFIG_ASDR_FILTER 0 ++#define CONFIG_ASEGMENT_FILTER 0 ++#define CONFIG_ASELECT_FILTER 0 ++#define CONFIG_ASENDCMD_FILTER 0 ++#define CONFIG_ASETNSAMPLES_FILTER 0 ++#define CONFIG_ASETPTS_FILTER 0 ++#define CONFIG_ASETRATE_FILTER 0 ++#define CONFIG_ASETTB_FILTER 0 ++#define CONFIG_ASHOWINFO_FILTER 0 ++#define CONFIG_ASIDEDATA_FILTER 0 ++#define CONFIG_ASOFTCLIP_FILTER 0 ++#define CONFIG_ASPECTRALSTATS_FILTER 0 ++#define CONFIG_ASPLIT_FILTER 0 ++#define CONFIG_ASR_FILTER 0 ++#define CONFIG_ASTATS_FILTER 0 ++#define CONFIG_ASTREAMSELECT_FILTER 0 ++#define CONFIG_ASUBBOOST_FILTER 0 ++#define CONFIG_ASUBCUT_FILTER 0 ++#define CONFIG_ASUPERCUT_FILTER 0 ++#define CONFIG_ASUPERPASS_FILTER 0 ++#define CONFIG_ASUPERSTOP_FILTER 0 ++#define CONFIG_ATEMPO_FILTER 0 ++#define CONFIG_ATILT_FILTER 0 ++#define CONFIG_ATRIM_FILTER 0 ++#define CONFIG_AXCORRELATE_FILTER 0 ++#define CONFIG_AZMQ_FILTER 0 ++#define CONFIG_BANDPASS_FILTER 0 ++#define CONFIG_BANDREJECT_FILTER 0 ++#define CONFIG_BASS_FILTER 0 ++#define CONFIG_BIQUAD_FILTER 0 ++#define CONFIG_BS2B_FILTER 0 ++#define CONFIG_CHANNELMAP_FILTER 0 ++#define CONFIG_CHANNELSPLIT_FILTER 0 ++#define CONFIG_CHORUS_FILTER 0 ++#define CONFIG_COMPAND_FILTER 0 ++#define CONFIG_COMPENSATIONDELAY_FILTER 0 ++#define CONFIG_CROSSFEED_FILTER 0 ++#define CONFIG_CRYSTALIZER_FILTER 0 ++#define CONFIG_DCSHIFT_FILTER 0 ++#define CONFIG_DEESSER_FILTER 0 ++#define CONFIG_DIALOGUENHANCE_FILTER 0 ++#define CONFIG_DRMETER_FILTER 0 ++#define CONFIG_DYNAUDNORM_FILTER 0 ++#define CONFIG_EARWAX_FILTER 0 ++#define CONFIG_EBUR128_FILTER 0 ++#define CONFIG_EQUALIZER_FILTER 0 ++#define CONFIG_EXTRASTEREO_FILTER 0 ++#define CONFIG_FIREQUALIZER_FILTER 0 ++#define CONFIG_FLANGER_FILTER 0 ++#define CONFIG_HAAS_FILTER 0 ++#define CONFIG_HDCD_FILTER 0 ++#define CONFIG_HEADPHONE_FILTER 0 ++#define CONFIG_HIGHPASS_FILTER 0 ++#define CONFIG_HIGHSHELF_FILTER 0 ++#define CONFIG_JOIN_FILTER 0 ++#define CONFIG_LADSPA_FILTER 0 ++#define CONFIG_LOUDNORM_FILTER 0 ++#define CONFIG_LOWPASS_FILTER 0 ++#define CONFIG_LOWSHELF_FILTER 0 ++#define CONFIG_LV2_FILTER 0 ++#define CONFIG_MCOMPAND_FILTER 0 ++#define CONFIG_PAN_FILTER 0 ++#define CONFIG_REPLAYGAIN_FILTER 0 ++#define CONFIG_RUBBERBAND_FILTER 0 ++#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 ++#define CONFIG_SIDECHAINGATE_FILTER 0 ++#define CONFIG_SILENCEDETECT_FILTER 0 ++#define CONFIG_SILENCEREMOVE_FILTER 0 ++#define CONFIG_SOFALIZER_FILTER 0 ++#define CONFIG_SPEECHNORM_FILTER 0 ++#define CONFIG_STEREOTOOLS_FILTER 0 ++#define CONFIG_STEREOWIDEN_FILTER 0 ++#define CONFIG_SUPEREQUALIZER_FILTER 0 ++#define CONFIG_SURROUND_FILTER 0 ++#define CONFIG_TREBLE_FILTER 0 ++#define CONFIG_TREMOLO_FILTER 0 ++#define CONFIG_VIBRATO_FILTER 0 ++#define CONFIG_VOLUME_FILTER 0 ++#define CONFIG_VOLUMEDETECT_FILTER 0 ++#define CONFIG_AEVALSRC_FILTER 0 ++#define CONFIG_AFIRSRC_FILTER 0 ++#define CONFIG_ANOISESRC_FILTER 0 ++#define CONFIG_ANULLSRC_FILTER 0 ++#define CONFIG_FLITE_FILTER 0 ++#define CONFIG_HILBERT_FILTER 0 ++#define CONFIG_SINC_FILTER 0 ++#define CONFIG_SINE_FILTER 0 ++#define CONFIG_ANULLSINK_FILTER 0 ++#define CONFIG_ADDROI_FILTER 0 ++#define CONFIG_ALPHAEXTRACT_FILTER 0 ++#define CONFIG_ALPHAMERGE_FILTER 0 ++#define CONFIG_AMPLIFY_FILTER 0 ++#define CONFIG_ASS_FILTER 0 ++#define CONFIG_ATADENOISE_FILTER 0 ++#define CONFIG_AVGBLUR_FILTER 0 ++#define CONFIG_AVGBLUR_OPENCL_FILTER 0 ++#define CONFIG_AVGBLUR_VULKAN_FILTER 0 ++#define CONFIG_BBOX_FILTER 0 ++#define CONFIG_BENCH_FILTER 0 ++#define CONFIG_BILATERAL_FILTER 0 ++#define CONFIG_BITPLANENOISE_FILTER 0 ++#define CONFIG_BLACKDETECT_FILTER 0 ++#define CONFIG_BLACKFRAME_FILTER 0 ++#define CONFIG_BLEND_FILTER 0 ++#define CONFIG_BLEND_VULKAN_FILTER 0 ++#define CONFIG_BM3D_FILTER 0 ++#define CONFIG_BOXBLUR_FILTER 0 ++#define CONFIG_BOXBLUR_OPENCL_FILTER 0 ++#define CONFIG_BWDIF_FILTER 0 ++#define CONFIG_CAS_FILTER 0 ++#define CONFIG_CHROMABER_VULKAN_FILTER 0 ++#define CONFIG_CHROMAHOLD_FILTER 0 ++#define CONFIG_CHROMAKEY_FILTER 0 ++#define CONFIG_CHROMANR_FILTER 0 ++#define CONFIG_CHROMASHIFT_FILTER 0 ++#define CONFIG_CIESCOPE_FILTER 0 ++#define CONFIG_CODECVIEW_FILTER 0 ++#define CONFIG_COLORBALANCE_FILTER 0 ++#define CONFIG_COLORCHANNELMIXER_FILTER 0 ++#define CONFIG_COLORCONTRAST_FILTER 0 ++#define CONFIG_COLORCORRECT_FILTER 0 ++#define CONFIG_COLORIZE_FILTER 0 ++#define CONFIG_COLORKEY_FILTER 0 ++#define CONFIG_COLORKEY_OPENCL_FILTER 0 ++#define CONFIG_COLORHOLD_FILTER 0 ++#define CONFIG_COLORLEVELS_FILTER 0 ++#define CONFIG_COLORMATRIX_FILTER 0 ++#define CONFIG_COLORSPACE_FILTER 0 ++#define CONFIG_COLORTEMPERATURE_FILTER 0 ++#define CONFIG_CONVOLUTION_FILTER 0 ++#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 ++#define CONFIG_CONVOLVE_FILTER 0 ++#define CONFIG_COPY_FILTER 0 ++#define CONFIG_COREIMAGE_FILTER 0 ++#define CONFIG_COVER_RECT_FILTER 0 ++#define CONFIG_CROP_FILTER 0 ++#define CONFIG_CROPDETECT_FILTER 0 ++#define CONFIG_CUE_FILTER 0 ++#define CONFIG_CURVES_FILTER 0 ++#define CONFIG_DATASCOPE_FILTER 0 ++#define CONFIG_DBLUR_FILTER 0 ++#define CONFIG_DCTDNOIZ_FILTER 0 ++#define CONFIG_DEBAND_FILTER 0 ++#define CONFIG_DEBLOCK_FILTER 0 ++#define CONFIG_DECIMATE_FILTER 0 ++#define CONFIG_DECONVOLVE_FILTER 0 ++#define CONFIG_DEDOT_FILTER 0 ++#define CONFIG_DEFLATE_FILTER 0 ++#define CONFIG_DEFLICKER_FILTER 0 ++#define CONFIG_DEINTERLACE_QSV_FILTER 0 ++#define CONFIG_DEINTERLACE_VAAPI_FILTER 0 ++#define CONFIG_DEJUDDER_FILTER 0 ++#define CONFIG_DELOGO_FILTER 0 ++#define CONFIG_DENOISE_VAAPI_FILTER 0 ++#define CONFIG_DERAIN_FILTER 0 ++#define CONFIG_DESHAKE_FILTER 0 ++#define CONFIG_DESHAKE_OPENCL_FILTER 0 ++#define CONFIG_DESPILL_FILTER 0 ++#define CONFIG_DETELECINE_FILTER 0 ++#define CONFIG_DILATION_FILTER 0 ++#define CONFIG_DILATION_OPENCL_FILTER 0 ++#define CONFIG_DISPLACE_FILTER 0 ++#define CONFIG_DNN_CLASSIFY_FILTER 0 ++#define CONFIG_DNN_DETECT_FILTER 0 ++#define CONFIG_DNN_PROCESSING_FILTER 0 ++#define CONFIG_DOUBLEWEAVE_FILTER 0 ++#define CONFIG_DRAWBOX_FILTER 0 ++#define CONFIG_DRAWGRAPH_FILTER 0 ++#define CONFIG_DRAWGRID_FILTER 0 ++#define CONFIG_DRAWTEXT_FILTER 0 ++#define CONFIG_EDGEDETECT_FILTER 0 ++#define CONFIG_ELBG_FILTER 0 ++#define CONFIG_ENTROPY_FILTER 0 ++#define CONFIG_EPX_FILTER 0 ++#define CONFIG_EQ_FILTER 0 ++#define CONFIG_EROSION_FILTER 0 ++#define CONFIG_EROSION_OPENCL_FILTER 0 ++#define CONFIG_ESTDIF_FILTER 0 ++#define CONFIG_EXPOSURE_FILTER 0 ++#define CONFIG_EXTRACTPLANES_FILTER 0 ++#define CONFIG_FADE_FILTER 0 ++#define CONFIG_FFTDNOIZ_FILTER 0 ++#define CONFIG_FFTFILT_FILTER 0 ++#define CONFIG_FIELD_FILTER 0 ++#define CONFIG_FIELDHINT_FILTER 0 ++#define CONFIG_FIELDMATCH_FILTER 0 ++#define CONFIG_FIELDORDER_FILTER 0 ++#define CONFIG_FILLBORDERS_FILTER 0 ++#define CONFIG_FIND_RECT_FILTER 0 ++#define CONFIG_FLIP_VULKAN_FILTER 0 ++#define CONFIG_FLOODFILL_FILTER 0 ++#define CONFIG_FORMAT_FILTER 0 ++#define CONFIG_FPS_FILTER 0 ++#define CONFIG_FRAMEPACK_FILTER 0 ++#define CONFIG_FRAMERATE_FILTER 0 ++#define CONFIG_FRAMESTEP_FILTER 0 ++#define CONFIG_FREEZEDETECT_FILTER 0 ++#define CONFIG_FREEZEFRAMES_FILTER 0 ++#define CONFIG_FREI0R_FILTER 0 ++#define CONFIG_FSPP_FILTER 0 ++#define CONFIG_GBLUR_FILTER 0 ++#define CONFIG_GBLUR_VULKAN_FILTER 0 ++#define CONFIG_GEQ_FILTER 0 ++#define CONFIG_GRADFUN_FILTER 0 ++#define CONFIG_GRAPHMONITOR_FILTER 0 ++#define CONFIG_GRAYWORLD_FILTER 0 ++#define CONFIG_GREYEDGE_FILTER 0 ++#define CONFIG_GUIDED_FILTER 0 ++#define CONFIG_HALDCLUT_FILTER 0 ++#define CONFIG_HFLIP_FILTER 0 ++#define CONFIG_HFLIP_VULKAN_FILTER 0 ++#define CONFIG_HISTEQ_FILTER 0 ++#define CONFIG_HISTOGRAM_FILTER 0 ++#define CONFIG_HQDN3D_FILTER 0 ++#define CONFIG_HQX_FILTER 0 ++#define CONFIG_HSTACK_FILTER 0 ++#define CONFIG_HSVHOLD_FILTER 0 ++#define CONFIG_HSVKEY_FILTER 0 ++#define CONFIG_HUE_FILTER 0 ++#define CONFIG_HUESATURATION_FILTER 0 ++#define CONFIG_HWDOWNLOAD_FILTER 0 ++#define CONFIG_HWMAP_FILTER 0 ++#define CONFIG_HWUPLOAD_FILTER 0 ++#define CONFIG_HWUPLOAD_CUDA_FILTER 0 ++#define CONFIG_HYSTERESIS_FILTER 0 ++#define CONFIG_IDENTITY_FILTER 0 ++#define CONFIG_IDET_FILTER 0 ++#define CONFIG_IL_FILTER 0 ++#define CONFIG_INFLATE_FILTER 0 ++#define CONFIG_INTERLACE_FILTER 0 ++#define CONFIG_INTERLEAVE_FILTER 0 ++#define CONFIG_KERNDEINT_FILTER 0 ++#define CONFIG_KIRSCH_FILTER 0 ++#define CONFIG_LAGFUN_FILTER 0 ++#define CONFIG_LATENCY_FILTER 0 ++#define CONFIG_LENSCORRECTION_FILTER 0 ++#define CONFIG_LENSFUN_FILTER 0 ++#define CONFIG_LIBPLACEBO_FILTER 0 ++#define CONFIG_LIBVMAF_FILTER 0 ++#define CONFIG_LIMITDIFF_FILTER 0 ++#define CONFIG_LIMITER_FILTER 0 ++#define CONFIG_LOOP_FILTER 0 ++#define CONFIG_LUMAKEY_FILTER 0 ++#define CONFIG_LUT_FILTER 0 ++#define CONFIG_LUT1D_FILTER 0 ++#define CONFIG_LUT2_FILTER 0 ++#define CONFIG_LUT3D_FILTER 0 ++#define CONFIG_LUTRGB_FILTER 0 ++#define CONFIG_LUTYUV_FILTER 0 ++#define CONFIG_MASKEDCLAMP_FILTER 0 ++#define CONFIG_MASKEDMAX_FILTER 0 ++#define CONFIG_MASKEDMERGE_FILTER 0 ++#define CONFIG_MASKEDMIN_FILTER 0 ++#define CONFIG_MASKEDTHRESHOLD_FILTER 0 ++#define CONFIG_MASKFUN_FILTER 0 ++#define CONFIG_MCDEINT_FILTER 0 ++#define CONFIG_MEDIAN_FILTER 0 ++#define CONFIG_MERGEPLANES_FILTER 0 ++#define CONFIG_MESTIMATE_FILTER 0 ++#define CONFIG_METADATA_FILTER 0 ++#define CONFIG_MIDEQUALIZER_FILTER 0 ++#define CONFIG_MINTERPOLATE_FILTER 0 ++#define CONFIG_MIX_FILTER 0 ++#define CONFIG_MONOCHROME_FILTER 0 ++#define CONFIG_MORPHO_FILTER 0 ++#define CONFIG_MPDECIMATE_FILTER 0 ++#define CONFIG_MSAD_FILTER 0 ++#define CONFIG_NEGATE_FILTER 0 ++#define CONFIG_NLMEANS_FILTER 0 ++#define CONFIG_NLMEANS_OPENCL_FILTER 0 ++#define CONFIG_NNEDI_FILTER 0 ++#define CONFIG_NOFORMAT_FILTER 0 ++#define CONFIG_NOISE_FILTER 0 ++#define CONFIG_NORMALIZE_FILTER 0 ++#define CONFIG_NULL_FILTER 0 ++#define CONFIG_OCR_FILTER 0 ++#define CONFIG_OCV_FILTER 0 ++#define CONFIG_OSCILLOSCOPE_FILTER 0 ++#define CONFIG_OVERLAY_FILTER 0 ++#define CONFIG_OVERLAY_OPENCL_FILTER 0 ++#define CONFIG_OVERLAY_QSV_FILTER 0 ++#define CONFIG_OVERLAY_VAAPI_FILTER 0 ++#define CONFIG_OVERLAY_VULKAN_FILTER 0 ++#define CONFIG_OVERLAY_CUDA_FILTER 0 ++#define CONFIG_OWDENOISE_FILTER 0 ++#define CONFIG_PAD_FILTER 0 ++#define CONFIG_PAD_OPENCL_FILTER 0 ++#define CONFIG_PALETTEGEN_FILTER 0 ++#define CONFIG_PALETTEUSE_FILTER 0 ++#define CONFIG_PERMS_FILTER 0 ++#define CONFIG_PERSPECTIVE_FILTER 0 ++#define CONFIG_PHASE_FILTER 0 ++#define CONFIG_PHOTOSENSITIVITY_FILTER 0 ++#define CONFIG_PIXDESCTEST_FILTER 0 ++#define CONFIG_PIXSCOPE_FILTER 0 ++#define CONFIG_PP_FILTER 0 ++#define CONFIG_PP7_FILTER 0 ++#define CONFIG_PREMULTIPLY_FILTER 0 ++#define CONFIG_PREWITT_FILTER 0 ++#define CONFIG_PREWITT_OPENCL_FILTER 0 ++#define CONFIG_PROCAMP_VAAPI_FILTER 0 ++#define CONFIG_PROGRAM_OPENCL_FILTER 0 ++#define CONFIG_PSEUDOCOLOR_FILTER 0 ++#define CONFIG_PSNR_FILTER 0 ++#define CONFIG_PULLUP_FILTER 0 ++#define CONFIG_QP_FILTER 0 ++#define CONFIG_RANDOM_FILTER 0 ++#define CONFIG_READEIA608_FILTER 0 ++#define CONFIG_READVITC_FILTER 0 ++#define CONFIG_REALTIME_FILTER 0 ++#define CONFIG_REMAP_FILTER 0 ++#define CONFIG_REMOVEGRAIN_FILTER 0 ++#define CONFIG_REMOVELOGO_FILTER 0 ++#define CONFIG_REPEATFIELDS_FILTER 0 ++#define CONFIG_REVERSE_FILTER 0 ++#define CONFIG_RGBASHIFT_FILTER 0 ++#define CONFIG_ROBERTS_FILTER 0 ++#define CONFIG_ROBERTS_OPENCL_FILTER 0 ++#define CONFIG_ROTATE_FILTER 0 ++#define CONFIG_SAB_FILTER 0 ++#define CONFIG_SCALE_FILTER 0 ++#define CONFIG_SCALE_CUDA_FILTER 0 ++#define CONFIG_SCALE_NPP_FILTER 0 ++#define CONFIG_SCALE_QSV_FILTER 0 ++#define CONFIG_SCALE_VAAPI_FILTER 0 ++#define CONFIG_SCALE_VULKAN_FILTER 0 ++#define CONFIG_SCALE2REF_FILTER 0 ++#define CONFIG_SCALE2REF_NPP_FILTER 0 ++#define CONFIG_SCDET_FILTER 0 ++#define CONFIG_SCHARR_FILTER 0 ++#define CONFIG_SCROLL_FILTER 0 ++#define CONFIG_SEGMENT_FILTER 0 ++#define CONFIG_SELECT_FILTER 0 ++#define CONFIG_SELECTIVECOLOR_FILTER 0 ++#define CONFIG_SENDCMD_FILTER 0 ++#define CONFIG_SEPARATEFIELDS_FILTER 0 ++#define CONFIG_SETDAR_FILTER 0 ++#define CONFIG_SETFIELD_FILTER 0 ++#define CONFIG_SETPARAMS_FILTER 0 ++#define CONFIG_SETPTS_FILTER 0 ++#define CONFIG_SETRANGE_FILTER 0 ++#define CONFIG_SETSAR_FILTER 0 ++#define CONFIG_SETTB_FILTER 0 ++#define CONFIG_SHARPEN_NPP_FILTER 0 ++#define CONFIG_SHARPNESS_VAAPI_FILTER 0 ++#define CONFIG_SHEAR_FILTER 0 ++#define CONFIG_SHOWINFO_FILTER 0 ++#define CONFIG_SHOWPALETTE_FILTER 0 ++#define CONFIG_SHUFFLEFRAMES_FILTER 0 ++#define CONFIG_SHUFFLEPIXELS_FILTER 0 ++#define CONFIG_SHUFFLEPLANES_FILTER 0 ++#define CONFIG_SIDEDATA_FILTER 0 ++#define CONFIG_SIGNALSTATS_FILTER 0 ++#define CONFIG_SIGNATURE_FILTER 0 ++#define CONFIG_SMARTBLUR_FILTER 0 ++#define CONFIG_SOBEL_FILTER 0 ++#define CONFIG_SOBEL_OPENCL_FILTER 0 ++#define CONFIG_SPLIT_FILTER 0 ++#define CONFIG_SPP_FILTER 0 ++#define CONFIG_SR_FILTER 0 ++#define CONFIG_SSIM_FILTER 0 ++#define CONFIG_STEREO3D_FILTER 0 ++#define CONFIG_STREAMSELECT_FILTER 0 ++#define CONFIG_SUBTITLES_FILTER 0 ++#define CONFIG_SUPER2XSAI_FILTER 0 ++#define CONFIG_SWAPRECT_FILTER 0 ++#define CONFIG_SWAPUV_FILTER 0 ++#define CONFIG_TBLEND_FILTER 0 ++#define CONFIG_TELECINE_FILTER 0 ++#define CONFIG_THISTOGRAM_FILTER 0 ++#define CONFIG_THRESHOLD_FILTER 0 ++#define CONFIG_THUMBNAIL_FILTER 0 ++#define CONFIG_THUMBNAIL_CUDA_FILTER 0 ++#define CONFIG_TILE_FILTER 0 ++#define CONFIG_TINTERLACE_FILTER 0 ++#define CONFIG_TLUT2_FILTER 0 ++#define CONFIG_TMEDIAN_FILTER 0 ++#define CONFIG_TMIDEQUALIZER_FILTER 0 ++#define CONFIG_TMIX_FILTER 0 ++#define CONFIG_TONEMAP_FILTER 0 ++#define CONFIG_TONEMAP_OPENCL_FILTER 0 ++#define CONFIG_TONEMAP_VAAPI_FILTER 0 ++#define CONFIG_TPAD_FILTER 0 ++#define CONFIG_TRANSPOSE_FILTER 0 ++#define CONFIG_TRANSPOSE_NPP_FILTER 0 ++#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 ++#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 ++#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 ++#define CONFIG_TRIM_FILTER 0 ++#define CONFIG_UNPREMULTIPLY_FILTER 0 ++#define CONFIG_UNSHARP_FILTER 0 ++#define CONFIG_UNSHARP_OPENCL_FILTER 0 ++#define CONFIG_UNTILE_FILTER 0 ++#define CONFIG_USPP_FILTER 0 ++#define CONFIG_V360_FILTER 0 ++#define CONFIG_VAGUEDENOISER_FILTER 0 ++#define CONFIG_VARBLUR_FILTER 0 ++#define CONFIG_VECTORSCOPE_FILTER 0 ++#define CONFIG_VFLIP_FILTER 0 ++#define CONFIG_VFLIP_VULKAN_FILTER 0 ++#define CONFIG_VFRDET_FILTER 0 ++#define CONFIG_VIBRANCE_FILTER 0 ++#define CONFIG_VIDSTABDETECT_FILTER 0 ++#define CONFIG_VIDSTABTRANSFORM_FILTER 0 ++#define CONFIG_VIF_FILTER 0 ++#define CONFIG_VIGNETTE_FILTER 0 ++#define CONFIG_VMAFMOTION_FILTER 0 ++#define CONFIG_VPP_QSV_FILTER 0 ++#define CONFIG_VSTACK_FILTER 0 ++#define CONFIG_W3FDIF_FILTER 0 ++#define CONFIG_WAVEFORM_FILTER 0 ++#define CONFIG_WEAVE_FILTER 0 ++#define CONFIG_XBR_FILTER 0 ++#define CONFIG_XCORRELATE_FILTER 0 ++#define CONFIG_XFADE_FILTER 0 ++#define CONFIG_XFADE_OPENCL_FILTER 0 ++#define CONFIG_XMEDIAN_FILTER 0 ++#define CONFIG_XSTACK_FILTER 0 ++#define CONFIG_YADIF_FILTER 0 ++#define CONFIG_YADIF_CUDA_FILTER 0 ++#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 ++#define CONFIG_YAEPBLUR_FILTER 0 ++#define CONFIG_ZMQ_FILTER 0 ++#define CONFIG_ZOOMPAN_FILTER 0 ++#define CONFIG_ZSCALE_FILTER 0 ++#define CONFIG_ALLRGB_FILTER 0 ++#define CONFIG_ALLYUV_FILTER 0 ++#define CONFIG_CELLAUTO_FILTER 0 ++#define CONFIG_COLOR_FILTER 0 ++#define CONFIG_COLORSPECTRUM_FILTER 0 ++#define CONFIG_COREIMAGESRC_FILTER 0 ++#define CONFIG_FREI0R_SRC_FILTER 0 ++#define CONFIG_GRADIENTS_FILTER 0 ++#define CONFIG_HALDCLUTSRC_FILTER 0 ++#define CONFIG_LIFE_FILTER 0 ++#define CONFIG_MANDELBROT_FILTER 0 ++#define CONFIG_MPTESTSRC_FILTER 0 ++#define CONFIG_NULLSRC_FILTER 0 ++#define CONFIG_OPENCLSRC_FILTER 0 ++#define CONFIG_PAL75BARS_FILTER 0 ++#define CONFIG_PAL100BARS_FILTER 0 ++#define CONFIG_RGBTESTSRC_FILTER 0 ++#define CONFIG_SIERPINSKI_FILTER 0 ++#define CONFIG_SMPTEBARS_FILTER 0 ++#define CONFIG_SMPTEHDBARS_FILTER 0 ++#define CONFIG_TESTSRC_FILTER 0 ++#define CONFIG_TESTSRC2_FILTER 0 ++#define CONFIG_YUVTESTSRC_FILTER 0 ++#define CONFIG_NULLSINK_FILTER 0 ++#define CONFIG_ABITSCOPE_FILTER 0 ++#define CONFIG_ADRAWGRAPH_FILTER 0 ++#define CONFIG_AGRAPHMONITOR_FILTER 0 ++#define CONFIG_AHISTOGRAM_FILTER 0 ++#define CONFIG_APHASEMETER_FILTER 0 ++#define CONFIG_AVECTORSCOPE_FILTER 0 ++#define CONFIG_CONCAT_FILTER 0 ++#define CONFIG_SHOWCQT_FILTER 0 ++#define CONFIG_SHOWFREQS_FILTER 0 ++#define CONFIG_SHOWSPATIAL_FILTER 0 ++#define CONFIG_SHOWSPECTRUM_FILTER 0 ++#define CONFIG_SHOWSPECTRUMPIC_FILTER 0 ++#define CONFIG_SHOWVOLUME_FILTER 0 ++#define CONFIG_SHOWWAVES_FILTER 0 ++#define CONFIG_SHOWWAVESPIC_FILTER 0 ++#define CONFIG_SPECTRUMSYNTH_FILTER 0 ++#define CONFIG_AMOVIE_FILTER 0 ++#define CONFIG_MOVIE_FILTER 0 ++#define CONFIG_AFIFO_FILTER 0 ++#define CONFIG_FIFO_FILTER 0 ++#define CONFIG_AA_DEMUXER 0 ++#define CONFIG_AAC_DEMUXER 1 ++#define CONFIG_AAX_DEMUXER 0 ++#define CONFIG_AC3_DEMUXER 0 ++#define CONFIG_ACE_DEMUXER 0 ++#define CONFIG_ACM_DEMUXER 0 ++#define CONFIG_ACT_DEMUXER 0 ++#define CONFIG_ADF_DEMUXER 0 ++#define CONFIG_ADP_DEMUXER 0 ++#define CONFIG_ADS_DEMUXER 0 ++#define CONFIG_ADX_DEMUXER 0 ++#define CONFIG_AEA_DEMUXER 0 ++#define CONFIG_AFC_DEMUXER 0 ++#define CONFIG_AIFF_DEMUXER 0 ++#define CONFIG_AIX_DEMUXER 0 ++#define CONFIG_ALP_DEMUXER 0 ++#define CONFIG_AMR_DEMUXER 0 ++#define CONFIG_AMRNB_DEMUXER 0 ++#define CONFIG_AMRWB_DEMUXER 0 ++#define CONFIG_ANM_DEMUXER 0 ++#define CONFIG_APC_DEMUXER 0 ++#define CONFIG_APE_DEMUXER 0 ++#define CONFIG_APM_DEMUXER 0 ++#define CONFIG_APNG_DEMUXER 0 ++#define CONFIG_APTX_DEMUXER 0 ++#define CONFIG_APTX_HD_DEMUXER 0 ++#define CONFIG_AQTITLE_DEMUXER 0 ++#define CONFIG_ARGO_ASF_DEMUXER 0 ++#define CONFIG_ARGO_BRP_DEMUXER 0 ++#define CONFIG_ARGO_CVG_DEMUXER 0 ++#define CONFIG_ASF_DEMUXER 0 ++#define CONFIG_ASF_O_DEMUXER 0 ++#define CONFIG_ASS_DEMUXER 0 ++#define CONFIG_AST_DEMUXER 0 ++#define CONFIG_AU_DEMUXER 0 ++#define CONFIG_AV1_DEMUXER 0 ++#define CONFIG_AVI_DEMUXER 0 ++#define CONFIG_AVISYNTH_DEMUXER 0 ++#define CONFIG_AVR_DEMUXER 0 ++#define CONFIG_AVS_DEMUXER 0 ++#define CONFIG_AVS2_DEMUXER 0 ++#define CONFIG_AVS3_DEMUXER 0 ++#define CONFIG_BETHSOFTVID_DEMUXER 0 ++#define CONFIG_BFI_DEMUXER 0 ++#define CONFIG_BINTEXT_DEMUXER 0 ++#define CONFIG_BINK_DEMUXER 0 ++#define CONFIG_BINKA_DEMUXER 0 ++#define CONFIG_BIT_DEMUXER 0 ++#define CONFIG_BITPACKED_DEMUXER 0 ++#define CONFIG_BMV_DEMUXER 0 ++#define CONFIG_BFSTM_DEMUXER 0 ++#define CONFIG_BRSTM_DEMUXER 0 ++#define CONFIG_BOA_DEMUXER 0 ++#define CONFIG_C93_DEMUXER 0 ++#define CONFIG_CAF_DEMUXER 0 ++#define CONFIG_CAVSVIDEO_DEMUXER 0 ++#define CONFIG_CDG_DEMUXER 0 ++#define CONFIG_CDXL_DEMUXER 0 ++#define CONFIG_CINE_DEMUXER 0 ++#define CONFIG_CODEC2_DEMUXER 0 ++#define CONFIG_CODEC2RAW_DEMUXER 0 ++#define CONFIG_CONCAT_DEMUXER 0 ++#define CONFIG_DASH_DEMUXER 0 ++#define CONFIG_DATA_DEMUXER 0 ++#define CONFIG_DAUD_DEMUXER 0 ++#define CONFIG_DCSTR_DEMUXER 0 ++#define CONFIG_DERF_DEMUXER 0 ++#define CONFIG_DFA_DEMUXER 0 ++#define CONFIG_DFPWM_DEMUXER 0 ++#define CONFIG_DHAV_DEMUXER 0 ++#define CONFIG_DIRAC_DEMUXER 0 ++#define CONFIG_DNXHD_DEMUXER 0 ++#define CONFIG_DSF_DEMUXER 0 ++#define CONFIG_DSICIN_DEMUXER 0 ++#define CONFIG_DSS_DEMUXER 0 ++#define CONFIG_DTS_DEMUXER 0 ++#define CONFIG_DTSHD_DEMUXER 0 ++#define CONFIG_DV_DEMUXER 0 ++#define CONFIG_DVBSUB_DEMUXER 0 ++#define CONFIG_DVBTXT_DEMUXER 0 ++#define CONFIG_DXA_DEMUXER 0 ++#define CONFIG_EA_DEMUXER 0 ++#define CONFIG_EA_CDATA_DEMUXER 0 ++#define CONFIG_EAC3_DEMUXER 0 ++#define CONFIG_EPAF_DEMUXER 0 ++#define CONFIG_FFMETADATA_DEMUXER 0 ++#define CONFIG_FILMSTRIP_DEMUXER 0 ++#define CONFIG_FITS_DEMUXER 0 ++#define CONFIG_FLAC_DEMUXER 1 ++#define CONFIG_FLIC_DEMUXER 0 ++#define CONFIG_FLV_DEMUXER 0 ++#define CONFIG_LIVE_FLV_DEMUXER 0 ++#define CONFIG_FOURXM_DEMUXER 0 ++#define CONFIG_FRM_DEMUXER 0 ++#define CONFIG_FSB_DEMUXER 0 ++#define CONFIG_FWSE_DEMUXER 0 ++#define CONFIG_G722_DEMUXER 0 ++#define CONFIG_G723_1_DEMUXER 0 ++#define CONFIG_G726_DEMUXER 0 ++#define CONFIG_G726LE_DEMUXER 0 ++#define CONFIG_G729_DEMUXER 0 ++#define CONFIG_GDV_DEMUXER 0 ++#define CONFIG_GENH_DEMUXER 0 ++#define CONFIG_GIF_DEMUXER 0 ++#define CONFIG_GSM_DEMUXER 0 ++#define CONFIG_GXF_DEMUXER 0 ++#define CONFIG_H261_DEMUXER 0 ++#define CONFIG_H263_DEMUXER 0 ++#define CONFIG_H264_DEMUXER 0 ++#define CONFIG_HCA_DEMUXER 0 ++#define CONFIG_HCOM_DEMUXER 0 ++#define CONFIG_HEVC_DEMUXER 0 ++#define CONFIG_HLS_DEMUXER 0 ++#define CONFIG_HNM_DEMUXER 0 ++#define CONFIG_ICO_DEMUXER 0 ++#define CONFIG_IDCIN_DEMUXER 0 ++#define CONFIG_IDF_DEMUXER 0 ++#define CONFIG_IFF_DEMUXER 0 ++#define CONFIG_IFV_DEMUXER 0 ++#define CONFIG_ILBC_DEMUXER 0 ++#define CONFIG_IMAGE2_DEMUXER 0 ++#define CONFIG_IMAGE2PIPE_DEMUXER 0 ++#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 ++#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 ++#define CONFIG_IMF_DEMUXER 0 ++#define CONFIG_INGENIENT_DEMUXER 0 ++#define CONFIG_IPMOVIE_DEMUXER 0 ++#define CONFIG_IPU_DEMUXER 0 ++#define CONFIG_IRCAM_DEMUXER 0 ++#define CONFIG_ISS_DEMUXER 0 ++#define CONFIG_IV8_DEMUXER 0 ++#define CONFIG_IVF_DEMUXER 0 ++#define CONFIG_IVR_DEMUXER 0 ++#define CONFIG_JACOSUB_DEMUXER 0 ++#define CONFIG_JV_DEMUXER 0 ++#define CONFIG_KUX_DEMUXER 0 ++#define CONFIG_KVAG_DEMUXER 0 ++#define CONFIG_LMLM4_DEMUXER 0 ++#define CONFIG_LOAS_DEMUXER 0 ++#define CONFIG_LUODAT_DEMUXER 0 ++#define CONFIG_LRC_DEMUXER 0 ++#define CONFIG_LVF_DEMUXER 0 ++#define CONFIG_LXF_DEMUXER 0 ++#define CONFIG_M4V_DEMUXER 0 ++#define CONFIG_MCA_DEMUXER 0 ++#define CONFIG_MCC_DEMUXER 0 ++#define CONFIG_MATROSKA_DEMUXER 1 ++#define CONFIG_MGSTS_DEMUXER 0 ++#define CONFIG_MICRODVD_DEMUXER 0 ++#define CONFIG_MJPEG_DEMUXER 0 ++#define CONFIG_MJPEG_2000_DEMUXER 0 ++#define CONFIG_MLP_DEMUXER 0 ++#define CONFIG_MLV_DEMUXER 0 ++#define CONFIG_MM_DEMUXER 0 ++#define CONFIG_MMF_DEMUXER 0 ++#define CONFIG_MODS_DEMUXER 0 ++#define CONFIG_MOFLEX_DEMUXER 0 ++#define CONFIG_MOV_DEMUXER 1 ++#define CONFIG_MP3_DEMUXER 1 ++#define CONFIG_MPC_DEMUXER 0 ++#define CONFIG_MPC8_DEMUXER 0 ++#define CONFIG_MPEGPS_DEMUXER 0 ++#define CONFIG_MPEGTS_DEMUXER 0 ++#define CONFIG_MPEGTSRAW_DEMUXER 0 ++#define CONFIG_MPEGVIDEO_DEMUXER 0 ++#define CONFIG_MPJPEG_DEMUXER 0 ++#define CONFIG_MPL2_DEMUXER 0 ++#define CONFIG_MPSUB_DEMUXER 0 ++#define CONFIG_MSF_DEMUXER 0 ++#define CONFIG_MSNWC_TCP_DEMUXER 0 ++#define CONFIG_MSP_DEMUXER 0 ++#define CONFIG_MTAF_DEMUXER 0 ++#define CONFIG_MTV_DEMUXER 0 ++#define CONFIG_MUSX_DEMUXER 0 ++#define CONFIG_MV_DEMUXER 0 ++#define CONFIG_MVI_DEMUXER 0 ++#define CONFIG_MXF_DEMUXER 0 ++#define CONFIG_MXG_DEMUXER 0 ++#define CONFIG_NC_DEMUXER 0 ++#define CONFIG_NISTSPHERE_DEMUXER 0 ++#define CONFIG_NSP_DEMUXER 0 ++#define CONFIG_NSV_DEMUXER 0 ++#define CONFIG_NUT_DEMUXER 0 ++#define CONFIG_NUV_DEMUXER 0 ++#define CONFIG_OBU_DEMUXER 0 ++#define CONFIG_OGG_DEMUXER 1 ++#define CONFIG_OMA_DEMUXER 0 ++#define CONFIG_PAF_DEMUXER 0 ++#define CONFIG_PCM_ALAW_DEMUXER 0 ++#define CONFIG_PCM_MULAW_DEMUXER 0 ++#define CONFIG_PCM_VIDC_DEMUXER 0 ++#define CONFIG_PCM_F64BE_DEMUXER 0 ++#define CONFIG_PCM_F64LE_DEMUXER 0 ++#define CONFIG_PCM_F32BE_DEMUXER 0 ++#define CONFIG_PCM_F32LE_DEMUXER 0 ++#define CONFIG_PCM_S32BE_DEMUXER 0 ++#define CONFIG_PCM_S32LE_DEMUXER 0 ++#define CONFIG_PCM_S24BE_DEMUXER 0 ++#define CONFIG_PCM_S24LE_DEMUXER 0 ++#define CONFIG_PCM_S16BE_DEMUXER 0 ++#define CONFIG_PCM_S16LE_DEMUXER 0 ++#define CONFIG_PCM_S8_DEMUXER 0 ++#define CONFIG_PCM_U32BE_DEMUXER 0 ++#define CONFIG_PCM_U32LE_DEMUXER 0 ++#define CONFIG_PCM_U24BE_DEMUXER 0 ++#define CONFIG_PCM_U24LE_DEMUXER 0 ++#define CONFIG_PCM_U16BE_DEMUXER 0 ++#define CONFIG_PCM_U16LE_DEMUXER 0 ++#define CONFIG_PCM_U8_DEMUXER 0 ++#define CONFIG_PJS_DEMUXER 0 ++#define CONFIG_PMP_DEMUXER 0 ++#define CONFIG_PP_BNK_DEMUXER 0 ++#define CONFIG_PVA_DEMUXER 0 ++#define CONFIG_PVF_DEMUXER 0 ++#define CONFIG_QCP_DEMUXER 0 ++#define CONFIG_R3D_DEMUXER 0 ++#define CONFIG_RAWVIDEO_DEMUXER 0 ++#define CONFIG_REALTEXT_DEMUXER 0 ++#define CONFIG_REDSPARK_DEMUXER 0 ++#define CONFIG_RL2_DEMUXER 0 ++#define CONFIG_RM_DEMUXER 0 ++#define CONFIG_ROQ_DEMUXER 0 ++#define CONFIG_RPL_DEMUXER 0 ++#define CONFIG_RSD_DEMUXER 0 ++#define CONFIG_RSO_DEMUXER 0 ++#define CONFIG_RTP_DEMUXER 0 ++#define CONFIG_RTSP_DEMUXER 0 ++#define CONFIG_S337M_DEMUXER 0 ++#define CONFIG_SAMI_DEMUXER 0 ++#define CONFIG_SAP_DEMUXER 0 ++#define CONFIG_SBC_DEMUXER 0 ++#define CONFIG_SBG_DEMUXER 0 ++#define CONFIG_SCC_DEMUXER 0 ++#define CONFIG_SCD_DEMUXER 0 ++#define CONFIG_SDP_DEMUXER 0 ++#define CONFIG_SDR2_DEMUXER 0 ++#define CONFIG_SDS_DEMUXER 0 ++#define CONFIG_SDX_DEMUXER 0 ++#define CONFIG_SEGAFILM_DEMUXER 0 ++#define CONFIG_SER_DEMUXER 0 ++#define CONFIG_SGA_DEMUXER 0 ++#define CONFIG_SHORTEN_DEMUXER 0 ++#define CONFIG_SIFF_DEMUXER 0 ++#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 ++#define CONFIG_SLN_DEMUXER 0 ++#define CONFIG_SMACKER_DEMUXER 0 ++#define CONFIG_SMJPEG_DEMUXER 0 ++#define CONFIG_SMUSH_DEMUXER 0 ++#define CONFIG_SOL_DEMUXER 0 ++#define CONFIG_SOX_DEMUXER 0 ++#define CONFIG_SPDIF_DEMUXER 0 ++#define CONFIG_SRT_DEMUXER 0 ++#define CONFIG_STR_DEMUXER 0 ++#define CONFIG_STL_DEMUXER 0 ++#define CONFIG_SUBVIEWER1_DEMUXER 0 ++#define CONFIG_SUBVIEWER_DEMUXER 0 ++#define CONFIG_SUP_DEMUXER 0 ++#define CONFIG_SVAG_DEMUXER 0 ++#define CONFIG_SVS_DEMUXER 0 ++#define CONFIG_SWF_DEMUXER 0 ++#define CONFIG_TAK_DEMUXER 0 ++#define CONFIG_TEDCAPTIONS_DEMUXER 0 ++#define CONFIG_THP_DEMUXER 0 ++#define CONFIG_THREEDOSTR_DEMUXER 0 ++#define CONFIG_TIERTEXSEQ_DEMUXER 0 ++#define CONFIG_TMV_DEMUXER 0 ++#define CONFIG_TRUEHD_DEMUXER 0 ++#define CONFIG_TTA_DEMUXER 0 ++#define CONFIG_TXD_DEMUXER 0 ++#define CONFIG_TTY_DEMUXER 0 ++#define CONFIG_TY_DEMUXER 0 ++#define CONFIG_V210_DEMUXER 0 ++#define CONFIG_V210X_DEMUXER 0 ++#define CONFIG_VAG_DEMUXER 0 ++#define CONFIG_VC1_DEMUXER 0 ++#define CONFIG_VC1T_DEMUXER 0 ++#define CONFIG_VIVIDAS_DEMUXER 0 ++#define CONFIG_VIVO_DEMUXER 0 ++#define CONFIG_VMD_DEMUXER 0 ++#define CONFIG_VOBSUB_DEMUXER 0 ++#define CONFIG_VOC_DEMUXER 0 ++#define CONFIG_VPK_DEMUXER 0 ++#define CONFIG_VPLAYER_DEMUXER 0 ++#define CONFIG_VQF_DEMUXER 0 ++#define CONFIG_W64_DEMUXER 0 ++#define CONFIG_WAV_DEMUXER 1 ++#define CONFIG_WC3_DEMUXER 0 ++#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 ++#define CONFIG_WEBVTT_DEMUXER 0 ++#define CONFIG_WSAUD_DEMUXER 0 ++#define CONFIG_WSD_DEMUXER 0 ++#define CONFIG_WSVQA_DEMUXER 0 ++#define CONFIG_WTV_DEMUXER 0 ++#define CONFIG_WVE_DEMUXER 0 ++#define CONFIG_WV_DEMUXER 0 ++#define CONFIG_XA_DEMUXER 0 ++#define CONFIG_XBIN_DEMUXER 0 ++#define CONFIG_XMV_DEMUXER 0 ++#define CONFIG_XVAG_DEMUXER 0 ++#define CONFIG_XWMA_DEMUXER 0 ++#define CONFIG_YOP_DEMUXER 0 ++#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 ++#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 ++#define CONFIG_LIBGME_DEMUXER 0 ++#define CONFIG_LIBMODPLUG_DEMUXER 0 ++#define CONFIG_LIBOPENMPT_DEMUXER 0 ++#define CONFIG_VAPOURSYNTH_DEMUXER 0 ++#define CONFIG_A64_MUXER 0 ++#define CONFIG_AC3_MUXER 0 ++#define CONFIG_ADTS_MUXER 0 ++#define CONFIG_ADX_MUXER 0 ++#define CONFIG_AIFF_MUXER 0 ++#define CONFIG_ALP_MUXER 0 ++#define CONFIG_AMR_MUXER 0 ++#define CONFIG_AMV_MUXER 0 ++#define CONFIG_APM_MUXER 0 ++#define CONFIG_APNG_MUXER 0 ++#define CONFIG_APTX_MUXER 0 ++#define CONFIG_APTX_HD_MUXER 0 ++#define CONFIG_ARGO_ASF_MUXER 0 ++#define CONFIG_ARGO_CVG_MUXER 0 ++#define CONFIG_ASF_MUXER 0 ++#define CONFIG_ASS_MUXER 0 ++#define CONFIG_AST_MUXER 0 ++#define CONFIG_ASF_STREAM_MUXER 0 ++#define CONFIG_AU_MUXER 0 ++#define CONFIG_AVI_MUXER 0 ++#define CONFIG_AVM2_MUXER 0 ++#define CONFIG_AVS2_MUXER 0 ++#define CONFIG_AVS3_MUXER 0 ++#define CONFIG_BIT_MUXER 0 ++#define CONFIG_CAF_MUXER 0 ++#define CONFIG_CAVSVIDEO_MUXER 0 ++#define CONFIG_CODEC2_MUXER 0 ++#define CONFIG_CODEC2RAW_MUXER 0 ++#define CONFIG_CRC_MUXER 0 ++#define CONFIG_DASH_MUXER 0 ++#define CONFIG_DATA_MUXER 0 ++#define CONFIG_DAUD_MUXER 0 ++#define CONFIG_DFPWM_MUXER 0 ++#define CONFIG_DIRAC_MUXER 0 ++#define CONFIG_DNXHD_MUXER 0 ++#define CONFIG_DTS_MUXER 0 ++#define CONFIG_DV_MUXER 0 ++#define CONFIG_EAC3_MUXER 0 ++#define CONFIG_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 ++#define CONFIG_FLV_MUXER 0 ++#define CONFIG_FRAMECRC_MUXER 0 ++#define CONFIG_FRAMEHASH_MUXER 0 ++#define CONFIG_FRAMEMD5_MUXER 0 ++#define CONFIG_G722_MUXER 0 ++#define CONFIG_G723_1_MUXER 0 ++#define CONFIG_G726_MUXER 0 ++#define CONFIG_G726LE_MUXER 0 ++#define CONFIG_GIF_MUXER 0 ++#define CONFIG_GSM_MUXER 0 ++#define CONFIG_GXF_MUXER 0 ++#define CONFIG_H261_MUXER 0 ++#define CONFIG_H263_MUXER 0 ++#define CONFIG_H264_MUXER 0 ++#define CONFIG_HASH_MUXER 0 ++#define CONFIG_HDS_MUXER 0 ++#define CONFIG_HEVC_MUXER 0 ++#define CONFIG_HLS_MUXER 0 ++#define CONFIG_ICO_MUXER 0 ++#define CONFIG_ILBC_MUXER 0 ++#define CONFIG_IMAGE2_MUXER 0 ++#define CONFIG_IMAGE2PIPE_MUXER 0 ++#define CONFIG_IPOD_MUXER 0 ++#define CONFIG_IRCAM_MUXER 0 ++#define CONFIG_ISMV_MUXER 0 ++#define CONFIG_IVF_MUXER 0 ++#define CONFIG_JACOSUB_MUXER 0 ++#define CONFIG_KVAG_MUXER 0 ++#define CONFIG_LATM_MUXER 0 ++#define CONFIG_LRC_MUXER 0 ++#define CONFIG_M4V_MUXER 0 ++#define CONFIG_MD5_MUXER 0 ++#define CONFIG_MATROSKA_MUXER 0 ++#define CONFIG_MATROSKA_AUDIO_MUXER 0 ++#define CONFIG_MICRODVD_MUXER 0 ++#define CONFIG_MJPEG_MUXER 0 ++#define CONFIG_MLP_MUXER 0 ++#define CONFIG_MMF_MUXER 0 ++#define CONFIG_MOV_MUXER 0 ++#define CONFIG_MP2_MUXER 0 ++#define CONFIG_MP3_MUXER 0 ++#define CONFIG_MP4_MUXER 0 ++#define CONFIG_MPEG1SYSTEM_MUXER 0 ++#define CONFIG_MPEG1VCD_MUXER 0 ++#define CONFIG_MPEG1VIDEO_MUXER 0 ++#define CONFIG_MPEG2DVD_MUXER 0 ++#define CONFIG_MPEG2SVCD_MUXER 0 ++#define CONFIG_MPEG2VIDEO_MUXER 0 ++#define CONFIG_MPEG2VOB_MUXER 0 ++#define CONFIG_MPEGTS_MUXER 0 ++#define CONFIG_MPJPEG_MUXER 0 ++#define CONFIG_MXF_MUXER 0 ++#define CONFIG_MXF_D10_MUXER 0 ++#define CONFIG_MXF_OPATOM_MUXER 0 ++#define CONFIG_NULL_MUXER 0 ++#define CONFIG_NUT_MUXER 0 ++#define CONFIG_OBU_MUXER 0 ++#define CONFIG_OGA_MUXER 0 ++#define CONFIG_OGG_MUXER 0 ++#define CONFIG_OGV_MUXER 0 ++#define CONFIG_OMA_MUXER 0 ++#define CONFIG_OPUS_MUXER 0 ++#define CONFIG_PCM_ALAW_MUXER 0 ++#define CONFIG_PCM_MULAW_MUXER 0 ++#define CONFIG_PCM_VIDC_MUXER 0 ++#define CONFIG_PCM_F64BE_MUXER 0 ++#define CONFIG_PCM_F64LE_MUXER 0 ++#define CONFIG_PCM_F32BE_MUXER 0 ++#define CONFIG_PCM_F32LE_MUXER 0 ++#define CONFIG_PCM_S32BE_MUXER 0 ++#define CONFIG_PCM_S32LE_MUXER 0 ++#define CONFIG_PCM_S24BE_MUXER 0 ++#define CONFIG_PCM_S24LE_MUXER 0 ++#define CONFIG_PCM_S16BE_MUXER 0 ++#define CONFIG_PCM_S16LE_MUXER 0 ++#define CONFIG_PCM_S8_MUXER 0 ++#define CONFIG_PCM_U32BE_MUXER 0 ++#define CONFIG_PCM_U32LE_MUXER 0 ++#define CONFIG_PCM_U24BE_MUXER 0 ++#define CONFIG_PCM_U24LE_MUXER 0 ++#define CONFIG_PCM_U16BE_MUXER 0 ++#define CONFIG_PCM_U16LE_MUXER 0 ++#define CONFIG_PCM_U8_MUXER 0 ++#define CONFIG_PSP_MUXER 0 ++#define CONFIG_RAWVIDEO_MUXER 0 ++#define CONFIG_RM_MUXER 0 ++#define CONFIG_ROQ_MUXER 0 ++#define CONFIG_RSO_MUXER 0 ++#define CONFIG_RTP_MUXER 0 ++#define CONFIG_RTP_MPEGTS_MUXER 0 ++#define CONFIG_RTSP_MUXER 0 ++#define CONFIG_SAP_MUXER 0 ++#define CONFIG_SBC_MUXER 0 ++#define CONFIG_SCC_MUXER 0 ++#define CONFIG_SEGAFILM_MUXER 0 ++#define CONFIG_SEGMENT_MUXER 0 ++#define CONFIG_STREAM_SEGMENT_MUXER 0 ++#define CONFIG_SMJPEG_MUXER 0 ++#define CONFIG_SMOOTHSTREAMING_MUXER 0 ++#define CONFIG_SOX_MUXER 0 ++#define CONFIG_SPX_MUXER 0 ++#define CONFIG_SPDIF_MUXER 0 ++#define CONFIG_SRT_MUXER 0 ++#define CONFIG_STREAMHASH_MUXER 0 ++#define CONFIG_SUP_MUXER 0 ++#define CONFIG_SWF_MUXER 0 ++#define CONFIG_TEE_MUXER 0 ++#define CONFIG_TG2_MUXER 0 ++#define CONFIG_TGP_MUXER 0 ++#define CONFIG_MKVTIMESTAMP_V2_MUXER 0 ++#define CONFIG_TRUEHD_MUXER 0 ++#define CONFIG_TTA_MUXER 0 ++#define CONFIG_TTML_MUXER 0 ++#define CONFIG_UNCODEDFRAMECRC_MUXER 0 ++#define CONFIG_VC1_MUXER 0 ++#define CONFIG_VC1T_MUXER 0 ++#define CONFIG_VOC_MUXER 0 ++#define CONFIG_W64_MUXER 0 ++#define CONFIG_WAV_MUXER 0 ++#define CONFIG_WEBM_MUXER 0 ++#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 ++#define CONFIG_WEBM_CHUNK_MUXER 0 ++#define CONFIG_WEBP_MUXER 0 ++#define CONFIG_WEBVTT_MUXER 0 ++#define CONFIG_WSAUD_MUXER 0 ++#define CONFIG_WTV_MUXER 0 ++#define CONFIG_WV_MUXER 0 ++#define CONFIG_YUV4MPEGPIPE_MUXER 0 ++#define CONFIG_CHROMAPRINT_MUXER 0 ++#define CONFIG_ASYNC_PROTOCOL 0 ++#define CONFIG_BLURAY_PROTOCOL 0 ++#define CONFIG_CACHE_PROTOCOL 0 ++#define CONFIG_CONCAT_PROTOCOL 0 ++#define CONFIG_CONCATF_PROTOCOL 0 ++#define CONFIG_CRYPTO_PROTOCOL 0 ++#define CONFIG_DATA_PROTOCOL 0 ++#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 ++#define CONFIG_FFRTMPHTTP_PROTOCOL 0 ++#define CONFIG_FILE_PROTOCOL 0 ++#define CONFIG_FTP_PROTOCOL 0 ++#define CONFIG_GOPHER_PROTOCOL 0 ++#define CONFIG_GOPHERS_PROTOCOL 0 ++#define CONFIG_HLS_PROTOCOL 0 ++#define CONFIG_HTTP_PROTOCOL 0 ++#define CONFIG_HTTPPROXY_PROTOCOL 0 ++#define CONFIG_HTTPS_PROTOCOL 0 ++#define CONFIG_ICECAST_PROTOCOL 0 ++#define CONFIG_MMSH_PROTOCOL 0 ++#define CONFIG_MMST_PROTOCOL 0 ++#define CONFIG_MD5_PROTOCOL 0 ++#define CONFIG_PIPE_PROTOCOL 0 ++#define CONFIG_PROMPEG_PROTOCOL 0 ++#define CONFIG_RTMP_PROTOCOL 0 ++#define CONFIG_RTMPE_PROTOCOL 0 ++#define CONFIG_RTMPS_PROTOCOL 0 ++#define CONFIG_RTMPT_PROTOCOL 0 ++#define CONFIG_RTMPTE_PROTOCOL 0 ++#define CONFIG_RTMPTS_PROTOCOL 0 ++#define CONFIG_RTP_PROTOCOL 0 ++#define CONFIG_SCTP_PROTOCOL 0 ++#define CONFIG_SRTP_PROTOCOL 0 ++#define CONFIG_SUBFILE_PROTOCOL 0 ++#define CONFIG_TEE_PROTOCOL 0 ++#define CONFIG_TCP_PROTOCOL 0 ++#define CONFIG_TLS_PROTOCOL 0 ++#define CONFIG_UDP_PROTOCOL 0 ++#define CONFIG_UDPLITE_PROTOCOL 0 ++#define CONFIG_UNIX_PROTOCOL 0 ++#define CONFIG_LIBAMQP_PROTOCOL 0 ++#define CONFIG_LIBRIST_PROTOCOL 0 ++#define CONFIG_LIBRTMP_PROTOCOL 0 ++#define CONFIG_LIBRTMPE_PROTOCOL 0 ++#define CONFIG_LIBRTMPS_PROTOCOL 0 ++#define CONFIG_LIBRTMPT_PROTOCOL 0 ++#define CONFIG_LIBRTMPTE_PROTOCOL 0 ++#define CONFIG_LIBSRT_PROTOCOL 0 ++#define CONFIG_LIBSSH_PROTOCOL 0 ++#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 ++#define CONFIG_LIBZMQ_PROTOCOL 0 ++#endif /* FFMPEG_CONFIG_COMPONENTS_H */ diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm index ed16af0b3137..09755a9cca57 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2022-04-01 07:48:30 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2022-10-05 07:34:01 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm -@@ -0,0 +1,2770 @@ +@@ -0,0 +1,722 @@ +; Automatically generated by configure - do not modify! +%define ARCH_AARCH64 0 +%define ARCH_ALPHA 0 @@ -50,6 +50,7 @@ +%define HAVE_AVX 1 +%define HAVE_AVX2 1 +%define HAVE_AVX512 1 ++%define HAVE_AVX512ICL 1 +%define HAVE_FMA3 1 +%define HAVE_FMA4 1 +%define HAVE_MMX 1 @@ -97,6 +98,7 @@ +%define HAVE_AVX_EXTERNAL 1 +%define HAVE_AVX2_EXTERNAL 1 +%define HAVE_AVX512_EXTERNAL 1 ++%define HAVE_AVX512ICL_EXTERNAL 1 +%define HAVE_FMA3_EXTERNAL 1 +%define HAVE_FMA4_EXTERNAL 1 +%define HAVE_MMX_EXTERNAL 1 @@ -144,6 +146,7 @@ +%define HAVE_AVX_INLINE 1 +%define HAVE_AVX2_INLINE 1 +%define HAVE_AVX512_INLINE 1 ++%define HAVE_AVX512ICL_INLINE 1 +%define HAVE_FMA3_INLINE 1 +%define HAVE_FMA4_INLINE 1 +%define HAVE_MMX_INLINE 1 @@ -229,7 +232,7 @@ +%define HAVE_TERMIOS_H 1 +%define HAVE_UDPLITE_H 0 +%define HAVE_UNISTD_H 1 -+%define HAVE_VALGRIND_VALGRIND_H 0 ++%define HAVE_VALGRIND_VALGRIND_H 0 ; %define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 +%define HAVE_WINDOWS_H 0 +%define HAVE_WINSOCK2_H 0 +%define HAVE_INTRINSICS_NEON 0 @@ -277,6 +280,7 @@ +%define HAVE_COMMANDLINETOARGVW 0 +%define HAVE_FCNTL 1 +%define HAVE_GETADDRINFO 0 ++%define HAVE_GETAUXVAL 0 +%define HAVE_GETHRTIME 0 +%define HAVE_GETOPT 1 +%define HAVE_GETMODULEHANDLE 0 @@ -316,7 +320,7 @@ +%define HAVE_SLEEP 0 +%define HAVE_STRERROR_R 1 +%define HAVE_SYSCONF 1 -+%define HAVE_SYSCTL 1 ++%define HAVE_SYSCTL 0 +%define HAVE_USLEEP 1 +%define HAVE_UTGETOSTYPEFROMSTRING 0 +%define HAVE_VIRTUALALLOC 0 @@ -452,6 +456,7 @@ +%define CONFIG_GNUTLS 0 +%define CONFIG_JNI 0 +%define CONFIG_LADSPA 0 ++%define CONFIG_LCMS2 0 +%define CONFIG_LIBAOM 0 +%define CONFIG_LIBASS 0 +%define CONFIG_LIBBLURAY 0 @@ -472,6 +477,7 @@ +%define CONFIG_LIBIEC61883 0 +%define CONFIG_LIBILBC 0 +%define CONFIG_LIBJACK 0 ++%define CONFIG_LIBJXL 0 +%define CONFIG_LIBKLVANC 0 +%define CONFIG_LIBKVAZAAR 0 +%define CONFIG_LIBMODPLUG 0 @@ -562,7 +568,6 @@ +%define CONFIG_VIDEOTOOLBOX 0 +%define CONFIG_VULKAN 0 +%define CONFIG_V4L2_M2M 0 -+%define CONFIG_XVMC 0 +%define CONFIG_FTRAPV 0 +%define CONFIG_GRAY 0 +%define CONFIG_HARDCODED_TABLES 0 @@ -594,7 +599,6 @@ +%define CONFIG_FAST_UNALIGNED 1 +%define CONFIG_FFT 1 +%define CONFIG_LSP 0 -+%define CONFIG_LZO 0 +%define CONFIG_MDCT 1 +%define CONFIG_PIXELUTILS 0 +%define CONFIG_NETWORK 0 @@ -639,6 +643,7 @@ +%define CONFIG_CBS_JPEG 0 +%define CONFIG_CBS_MPEG2 0 +%define CONFIG_CBS_VP9 0 ++%define CONFIG_DEFLATE_WRAPPER 0 +%define CONFIG_DIRAC_PARSE 1 +%define CONFIG_DNN 0 +%define CONFIG_DOVI_RPU 0 @@ -667,6 +672,7 @@ +%define CONFIG_IDCTDSP 0 +%define CONFIG_IIRFILTER 0 +%define CONFIG_MDCT15 1 ++%define CONFIG_INFLATE_WRAPPER 0 +%define CONFIG_INTRAX8 0 +%define CONFIG_ISO_MEDIA 1 +%define CONFIG_IVIDSP 0 @@ -717,2057 +723,3 @@ +%define CONFIG_VP8DSP 1 +%define CONFIG_WMA_FREQS 0 +%define CONFIG_WMV2DSP 0 -+%define CONFIG_AAC_ADTSTOASC_BSF 0 -+%define CONFIG_AV1_FRAME_MERGE_BSF 0 -+%define CONFIG_AV1_FRAME_SPLIT_BSF 0 -+%define CONFIG_AV1_METADATA_BSF 0 -+%define CONFIG_CHOMP_BSF 0 -+%define CONFIG_DUMP_EXTRADATA_BSF 0 -+%define CONFIG_DCA_CORE_BSF 0 -+%define CONFIG_EAC3_CORE_BSF 0 -+%define CONFIG_EXTRACT_EXTRADATA_BSF 0 -+%define CONFIG_FILTER_UNITS_BSF 0 -+%define CONFIG_H264_METADATA_BSF 0 -+%define CONFIG_H264_MP4TOANNEXB_BSF 0 -+%define CONFIG_H264_REDUNDANT_PPS_BSF 0 -+%define CONFIG_HAPQA_EXTRACT_BSF 0 -+%define CONFIG_HEVC_METADATA_BSF 0 -+%define CONFIG_HEVC_MP4TOANNEXB_BSF 0 -+%define CONFIG_IMX_DUMP_HEADER_BSF 0 -+%define CONFIG_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 -+%define CONFIG_NOISE_BSF 0 -+%define CONFIG_NULL_BSF 0 -+%define CONFIG_OPUS_METADATA_BSF 0 -+%define CONFIG_PCM_RECHUNK_BSF 0 -+%define CONFIG_PRORES_METADATA_BSF 0 -+%define CONFIG_REMOVE_EXTRADATA_BSF 0 -+%define CONFIG_SETTS_BSF 0 -+%define CONFIG_TEXT2MOVSUB_BSF 0 -+%define CONFIG_TRACE_HEADERS_BSF 0 -+%define CONFIG_TRUEHD_CORE_BSF 0 -+%define CONFIG_VP9_METADATA_BSF 0 -+%define CONFIG_VP9_RAW_REORDER_BSF 0 -+%define CONFIG_VP9_SUPERFRAME_BSF 0 -+%define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 -+%define CONFIG_AASC_DECODER 0 -+%define CONFIG_AIC_DECODER 0 -+%define CONFIG_ALIAS_PIX_DECODER 0 -+%define CONFIG_AGM_DECODER 0 -+%define CONFIG_AMV_DECODER 0 -+%define CONFIG_ANM_DECODER 0 -+%define CONFIG_ANSI_DECODER 0 -+%define CONFIG_APNG_DECODER 0 -+%define CONFIG_ARBC_DECODER 0 -+%define CONFIG_ARGO_DECODER 0 -+%define CONFIG_ASV1_DECODER 0 -+%define CONFIG_ASV2_DECODER 0 -+%define CONFIG_AURA_DECODER 0 -+%define CONFIG_AURA2_DECODER 0 -+%define CONFIG_AVRP_DECODER 0 -+%define CONFIG_AVRN_DECODER 0 -+%define CONFIG_AVS_DECODER 0 -+%define CONFIG_AVUI_DECODER 0 -+%define CONFIG_AYUV_DECODER 0 -+%define CONFIG_BETHSOFTVID_DECODER 0 -+%define CONFIG_BFI_DECODER 0 -+%define CONFIG_BINK_DECODER 0 -+%define CONFIG_BITPACKED_DECODER 0 -+%define CONFIG_BMP_DECODER 0 -+%define CONFIG_BMV_VIDEO_DECODER 0 -+%define CONFIG_BRENDER_PIX_DECODER 0 -+%define CONFIG_C93_DECODER 0 -+%define CONFIG_CAVS_DECODER 0 -+%define CONFIG_CDGRAPHICS_DECODER 0 -+%define CONFIG_CDTOONS_DECODER 0 -+%define CONFIG_CDXL_DECODER 0 -+%define CONFIG_CFHD_DECODER 0 -+%define CONFIG_CINEPAK_DECODER 0 -+%define CONFIG_CLEARVIDEO_DECODER 0 -+%define CONFIG_CLJR_DECODER 0 -+%define CONFIG_CLLC_DECODER 0 -+%define CONFIG_COMFORTNOISE_DECODER 0 -+%define CONFIG_CPIA_DECODER 0 -+%define CONFIG_CRI_DECODER 0 -+%define CONFIG_CSCD_DECODER 0 -+%define CONFIG_CYUV_DECODER 0 -+%define CONFIG_DDS_DECODER 0 -+%define CONFIG_DFA_DECODER 0 -+%define CONFIG_DIRAC_DECODER 0 -+%define CONFIG_DNXHD_DECODER 0 -+%define CONFIG_DPX_DECODER 0 -+%define CONFIG_DSICINVIDEO_DECODER 0 -+%define CONFIG_DVAUDIO_DECODER 0 -+%define CONFIG_DVVIDEO_DECODER 0 -+%define CONFIG_DXA_DECODER 0 -+%define CONFIG_DXTORY_DECODER 0 -+%define CONFIG_DXV_DECODER 0 -+%define CONFIG_EACMV_DECODER 0 -+%define CONFIG_EAMAD_DECODER 0 -+%define CONFIG_EATGQ_DECODER 0 -+%define CONFIG_EATGV_DECODER 0 -+%define CONFIG_EATQI_DECODER 0 -+%define CONFIG_EIGHTBPS_DECODER 0 -+%define CONFIG_EIGHTSVX_EXP_DECODER 0 -+%define CONFIG_EIGHTSVX_FIB_DECODER 0 -+%define CONFIG_ESCAPE124_DECODER 0 -+%define CONFIG_ESCAPE130_DECODER 0 -+%define CONFIG_EXR_DECODER 0 -+%define CONFIG_FFV1_DECODER 0 -+%define CONFIG_FFVHUFF_DECODER 0 -+%define CONFIG_FIC_DECODER 0 -+%define CONFIG_FITS_DECODER 0 -+%define CONFIG_FLASHSV_DECODER 0 -+%define CONFIG_FLASHSV2_DECODER 0 -+%define CONFIG_FLIC_DECODER 0 -+%define CONFIG_FLV_DECODER 0 -+%define CONFIG_FMVC_DECODER 0 -+%define CONFIG_FOURXM_DECODER 0 -+%define CONFIG_FRAPS_DECODER 0 -+%define CONFIG_FRWU_DECODER 0 -+%define CONFIG_G2M_DECODER 0 -+%define CONFIG_GDV_DECODER 0 -+%define CONFIG_GEM_DECODER 0 -+%define CONFIG_GIF_DECODER 0 -+%define CONFIG_H261_DECODER 0 -+%define CONFIG_H263_DECODER 0 -+%define CONFIG_H263I_DECODER 0 -+%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 -+%define CONFIG_H264_QSV_DECODER 0 -+%define CONFIG_H264_RKMPP_DECODER 0 -+%define CONFIG_HAP_DECODER 0 -+%define CONFIG_HEVC_DECODER 0 -+%define CONFIG_HEVC_QSV_DECODER 0 -+%define CONFIG_HEVC_RKMPP_DECODER 0 -+%define CONFIG_HEVC_V4L2M2M_DECODER 0 -+%define CONFIG_HNM4_VIDEO_DECODER 0 -+%define CONFIG_HQ_HQA_DECODER 0 -+%define CONFIG_HQX_DECODER 0 -+%define CONFIG_HUFFYUV_DECODER 0 -+%define CONFIG_HYMT_DECODER 0 -+%define CONFIG_IDCIN_DECODER 0 -+%define CONFIG_IFF_ILBM_DECODER 0 -+%define CONFIG_IMM4_DECODER 0 -+%define CONFIG_IMM5_DECODER 0 -+%define CONFIG_INDEO2_DECODER 0 -+%define CONFIG_INDEO3_DECODER 0 -+%define CONFIG_INDEO4_DECODER 0 -+%define CONFIG_INDEO5_DECODER 0 -+%define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+%define CONFIG_IPU_DECODER 0 -+%define CONFIG_JPEG2000_DECODER 0 -+%define CONFIG_JPEGLS_DECODER 0 -+%define CONFIG_JV_DECODER 0 -+%define CONFIG_KGV1_DECODER 0 -+%define CONFIG_KMVC_DECODER 0 -+%define CONFIG_LAGARITH_DECODER 0 -+%define CONFIG_LOCO_DECODER 0 -+%define CONFIG_LSCR_DECODER 0 -+%define CONFIG_M101_DECODER 0 -+%define CONFIG_MAGICYUV_DECODER 0 -+%define CONFIG_MDEC_DECODER 0 -+%define CONFIG_MIMIC_DECODER 0 -+%define CONFIG_MJPEG_DECODER 0 -+%define CONFIG_MJPEGB_DECODER 0 -+%define CONFIG_MMVIDEO_DECODER 0 -+%define CONFIG_MOBICLIP_DECODER 0 -+%define CONFIG_MOTIONPIXELS_DECODER 0 -+%define CONFIG_MPEG1VIDEO_DECODER 0 -+%define CONFIG_MPEG2VIDEO_DECODER 0 -+%define CONFIG_MPEG4_DECODER 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 -+%define CONFIG_MSA1_DECODER 0 -+%define CONFIG_MSCC_DECODER 0 -+%define CONFIG_MSMPEG4V1_DECODER 0 -+%define CONFIG_MSMPEG4V2_DECODER 0 -+%define CONFIG_MSMPEG4V3_DECODER 0 -+%define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 -+%define CONFIG_MSP2_DECODER 0 -+%define CONFIG_MSRLE_DECODER 0 -+%define CONFIG_MSS1_DECODER 0 -+%define CONFIG_MSS2_DECODER 0 -+%define CONFIG_MSVIDEO1_DECODER 0 -+%define CONFIG_MSZH_DECODER 0 -+%define CONFIG_MTS2_DECODER 0 -+%define CONFIG_MV30_DECODER 0 -+%define CONFIG_MVC1_DECODER 0 -+%define CONFIG_MVC2_DECODER 0 -+%define CONFIG_MVDV_DECODER 0 -+%define CONFIG_MVHA_DECODER 0 -+%define CONFIG_MWSC_DECODER 0 -+%define CONFIG_MXPEG_DECODER 0 -+%define CONFIG_NOTCHLC_DECODER 0 -+%define CONFIG_NUV_DECODER 0 -+%define CONFIG_PAF_VIDEO_DECODER 0 -+%define CONFIG_PAM_DECODER 0 -+%define CONFIG_PBM_DECODER 0 -+%define CONFIG_PCX_DECODER 0 -+%define CONFIG_PFM_DECODER 0 -+%define CONFIG_PGM_DECODER 0 -+%define CONFIG_PGMYUV_DECODER 0 -+%define CONFIG_PGX_DECODER 0 -+%define CONFIG_PHOTOCD_DECODER 0 -+%define CONFIG_PICTOR_DECODER 0 -+%define CONFIG_PIXLET_DECODER 0 -+%define CONFIG_PNG_DECODER 0 -+%define CONFIG_PPM_DECODER 0 -+%define CONFIG_PRORES_DECODER 0 -+%define CONFIG_PROSUMER_DECODER 0 -+%define CONFIG_PSD_DECODER 0 -+%define CONFIG_PTX_DECODER 0 -+%define CONFIG_QDRAW_DECODER 0 -+%define CONFIG_QPEG_DECODER 0 -+%define CONFIG_QTRLE_DECODER 0 -+%define CONFIG_R10K_DECODER 0 -+%define CONFIG_R210_DECODER 0 -+%define CONFIG_RASC_DECODER 0 -+%define CONFIG_RAWVIDEO_DECODER 0 -+%define CONFIG_RL2_DECODER 0 -+%define CONFIG_ROQ_DECODER 0 -+%define CONFIG_RPZA_DECODER 0 -+%define CONFIG_RSCC_DECODER 0 -+%define CONFIG_RV10_DECODER 0 -+%define CONFIG_RV20_DECODER 0 -+%define CONFIG_RV30_DECODER 0 -+%define CONFIG_RV40_DECODER 0 -+%define CONFIG_S302M_DECODER 0 -+%define CONFIG_SANM_DECODER 0 -+%define CONFIG_SCPR_DECODER 0 -+%define CONFIG_SCREENPRESSO_DECODER 0 -+%define CONFIG_SGA_DECODER 0 -+%define CONFIG_SGI_DECODER 0 -+%define CONFIG_SGIRLE_DECODER 0 -+%define CONFIG_SHEERVIDEO_DECODER 0 -+%define CONFIG_SIMBIOSIS_IMX_DECODER 0 -+%define CONFIG_SMACKER_DECODER 0 -+%define CONFIG_SMC_DECODER 0 -+%define CONFIG_SMVJPEG_DECODER 0 -+%define CONFIG_SNOW_DECODER 0 -+%define CONFIG_SP5X_DECODER 0 -+%define CONFIG_SPEEDHQ_DECODER 0 -+%define CONFIG_SPEEX_DECODER 0 -+%define CONFIG_SRGC_DECODER 0 -+%define CONFIG_SUNRAST_DECODER 0 -+%define CONFIG_SVQ1_DECODER 0 -+%define CONFIG_SVQ3_DECODER 0 -+%define CONFIG_TARGA_DECODER 0 -+%define CONFIG_TARGA_Y216_DECODER 0 -+%define CONFIG_TDSC_DECODER 0 -+%define CONFIG_THEORA_DECODER 1 -+%define CONFIG_THP_DECODER 0 -+%define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+%define CONFIG_TIFF_DECODER 0 -+%define CONFIG_TMV_DECODER 0 -+%define CONFIG_TRUEMOTION1_DECODER 0 -+%define CONFIG_TRUEMOTION2_DECODER 0 -+%define CONFIG_TRUEMOTION2RT_DECODER 0 -+%define CONFIG_TSCC_DECODER 0 -+%define CONFIG_TSCC2_DECODER 0 -+%define CONFIG_TXD_DECODER 0 -+%define CONFIG_ULTI_DECODER 0 -+%define CONFIG_UTVIDEO_DECODER 0 -+%define CONFIG_V210_DECODER 0 -+%define CONFIG_V210X_DECODER 0 -+%define CONFIG_V308_DECODER 0 -+%define CONFIG_V408_DECODER 0 -+%define CONFIG_V410_DECODER 0 -+%define CONFIG_VB_DECODER 0 -+%define CONFIG_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 -+%define CONFIG_VC1_V4L2M2M_DECODER 0 -+%define CONFIG_VCR1_DECODER 0 -+%define CONFIG_VMDVIDEO_DECODER 0 -+%define CONFIG_VMNC_DECODER 0 -+%define CONFIG_VP3_DECODER 1 -+%define CONFIG_VP4_DECODER 0 -+%define CONFIG_VP5_DECODER 0 -+%define CONFIG_VP6_DECODER 0 -+%define CONFIG_VP6A_DECODER 0 -+%define CONFIG_VP6F_DECODER 0 -+%define CONFIG_VP7_DECODER 0 -+%define CONFIG_VP8_DECODER 1 -+%define CONFIG_VP8_RKMPP_DECODER 0 -+%define CONFIG_VP8_V4L2M2M_DECODER 0 -+%define CONFIG_VP9_DECODER 0 -+%define CONFIG_VP9_RKMPP_DECODER 0 -+%define CONFIG_VP9_V4L2M2M_DECODER 0 -+%define CONFIG_VQA_DECODER 0 -+%define CONFIG_WEBP_DECODER 0 -+%define CONFIG_WCMV_DECODER 0 -+%define CONFIG_WRAPPED_AVFRAME_DECODER 0 -+%define CONFIG_WMV1_DECODER 0 -+%define CONFIG_WMV2_DECODER 0 -+%define CONFIG_WMV3_DECODER 0 -+%define CONFIG_WMV3_CRYSTALHD_DECODER 0 -+%define CONFIG_WMV3IMAGE_DECODER 0 -+%define CONFIG_WNV1_DECODER 0 -+%define CONFIG_XAN_WC3_DECODER 0 -+%define CONFIG_XAN_WC4_DECODER 0 -+%define CONFIG_XBM_DECODER 0 -+%define CONFIG_XFACE_DECODER 0 -+%define CONFIG_XL_DECODER 0 -+%define CONFIG_XPM_DECODER 0 -+%define CONFIG_XWD_DECODER 0 -+%define CONFIG_Y41P_DECODER 0 -+%define CONFIG_YLC_DECODER 0 -+%define CONFIG_YOP_DECODER 0 -+%define CONFIG_YUV4_DECODER 0 -+%define CONFIG_ZERO12V_DECODER 0 -+%define CONFIG_ZEROCODEC_DECODER 0 -+%define CONFIG_ZLIB_DECODER 0 -+%define CONFIG_ZMBV_DECODER 0 -+%define CONFIG_AAC_DECODER 1 -+%define CONFIG_AAC_FIXED_DECODER 0 -+%define CONFIG_AAC_LATM_DECODER 0 -+%define CONFIG_AC3_DECODER 0 -+%define CONFIG_AC3_FIXED_DECODER 0 -+%define CONFIG_ACELP_KELVIN_DECODER 0 -+%define CONFIG_ALAC_DECODER 0 -+%define CONFIG_ALS_DECODER 0 -+%define CONFIG_AMRNB_DECODER 0 -+%define CONFIG_AMRWB_DECODER 0 -+%define CONFIG_APE_DECODER 0 -+%define CONFIG_APTX_DECODER 0 -+%define CONFIG_APTX_HD_DECODER 0 -+%define CONFIG_ATRAC1_DECODER 0 -+%define CONFIG_ATRAC3_DECODER 0 -+%define CONFIG_ATRAC3AL_DECODER 0 -+%define CONFIG_ATRAC3P_DECODER 0 -+%define CONFIG_ATRAC3PAL_DECODER 0 -+%define CONFIG_ATRAC9_DECODER 0 -+%define CONFIG_BINKAUDIO_DCT_DECODER 0 -+%define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+%define CONFIG_BMV_AUDIO_DECODER 0 -+%define CONFIG_COOK_DECODER 0 -+%define CONFIG_DCA_DECODER 0 -+%define CONFIG_DOLBY_E_DECODER 0 -+%define CONFIG_DSD_LSBF_DECODER 0 -+%define CONFIG_DSD_MSBF_DECODER 0 -+%define CONFIG_DSD_LSBF_PLANAR_DECODER 0 -+%define CONFIG_DSD_MSBF_PLANAR_DECODER 0 -+%define CONFIG_DSICINAUDIO_DECODER 0 -+%define CONFIG_DSS_SP_DECODER 0 -+%define CONFIG_DST_DECODER 0 -+%define CONFIG_EAC3_DECODER 0 -+%define CONFIG_EVRC_DECODER 0 -+%define CONFIG_FASTAUDIO_DECODER 0 -+%define CONFIG_FFWAVESYNTH_DECODER 0 -+%define CONFIG_FLAC_DECODER 1 -+%define CONFIG_G723_1_DECODER 0 -+%define CONFIG_G729_DECODER 0 -+%define CONFIG_GSM_DECODER 0 -+%define CONFIG_GSM_MS_DECODER 0 -+%define CONFIG_HCA_DECODER 0 -+%define CONFIG_HCOM_DECODER 0 -+%define CONFIG_IAC_DECODER 0 -+%define CONFIG_ILBC_DECODER 0 -+%define CONFIG_IMC_DECODER 0 -+%define CONFIG_INTERPLAY_ACM_DECODER 0 -+%define CONFIG_MACE3_DECODER 0 -+%define CONFIG_MACE6_DECODER 0 -+%define CONFIG_METASOUND_DECODER 0 -+%define CONFIG_MLP_DECODER 0 -+%define CONFIG_MP1_DECODER 0 -+%define CONFIG_MP1FLOAT_DECODER 0 -+%define CONFIG_MP2_DECODER 0 -+%define CONFIG_MP2FLOAT_DECODER 0 -+%define CONFIG_MP3FLOAT_DECODER 0 -+%define CONFIG_MP3_DECODER 1 -+%define CONFIG_MP3ADUFLOAT_DECODER 0 -+%define CONFIG_MP3ADU_DECODER 0 -+%define CONFIG_MP3ON4FLOAT_DECODER 0 -+%define CONFIG_MP3ON4_DECODER 0 -+%define CONFIG_MPC7_DECODER 0 -+%define CONFIG_MPC8_DECODER 0 -+%define CONFIG_MSNSIREN_DECODER 0 -+%define CONFIG_NELLYMOSER_DECODER 0 -+%define CONFIG_ON2AVC_DECODER 0 -+%define CONFIG_OPUS_DECODER 0 -+%define CONFIG_PAF_AUDIO_DECODER 0 -+%define CONFIG_QCELP_DECODER 0 -+%define CONFIG_QDM2_DECODER 0 -+%define CONFIG_QDMC_DECODER 0 -+%define CONFIG_RA_144_DECODER 0 -+%define CONFIG_RA_288_DECODER 0 -+%define CONFIG_RALF_DECODER 0 -+%define CONFIG_SBC_DECODER 0 -+%define CONFIG_SHORTEN_DECODER 0 -+%define CONFIG_SIPR_DECODER 0 -+%define CONFIG_SIREN_DECODER 0 -+%define CONFIG_SMACKAUD_DECODER 0 -+%define CONFIG_SONIC_DECODER 0 -+%define CONFIG_TAK_DECODER 0 -+%define CONFIG_TRUEHD_DECODER 0 -+%define CONFIG_TRUESPEECH_DECODER 0 -+%define CONFIG_TTA_DECODER 0 -+%define CONFIG_TWINVQ_DECODER 0 -+%define CONFIG_VMDAUDIO_DECODER 0 -+%define CONFIG_VORBIS_DECODER 1 -+%define CONFIG_WAVPACK_DECODER 0 -+%define CONFIG_WMALOSSLESS_DECODER 0 -+%define CONFIG_WMAPRO_DECODER 0 -+%define CONFIG_WMAV1_DECODER 0 -+%define CONFIG_WMAV2_DECODER 0 -+%define CONFIG_WMAVOICE_DECODER 0 -+%define CONFIG_WS_SND1_DECODER 0 -+%define CONFIG_XMA1_DECODER 0 -+%define CONFIG_XMA2_DECODER 0 -+%define CONFIG_PCM_ALAW_DECODER 1 -+%define CONFIG_PCM_BLURAY_DECODER 0 -+%define CONFIG_PCM_DVD_DECODER 0 -+%define CONFIG_PCM_F16LE_DECODER 0 -+%define CONFIG_PCM_F24LE_DECODER 0 -+%define CONFIG_PCM_F32BE_DECODER 0 -+%define CONFIG_PCM_F32LE_DECODER 1 -+%define CONFIG_PCM_F64BE_DECODER 0 -+%define CONFIG_PCM_F64LE_DECODER 0 -+%define CONFIG_PCM_LXF_DECODER 0 -+%define CONFIG_PCM_MULAW_DECODER 1 -+%define CONFIG_PCM_S8_DECODER 0 -+%define CONFIG_PCM_S8_PLANAR_DECODER 0 -+%define CONFIG_PCM_S16BE_DECODER 1 -+%define CONFIG_PCM_S16BE_PLANAR_DECODER 0 -+%define CONFIG_PCM_S16LE_DECODER 1 -+%define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+%define CONFIG_PCM_S24BE_DECODER 1 -+%define CONFIG_PCM_S24DAUD_DECODER 0 -+%define CONFIG_PCM_S24LE_DECODER 1 -+%define CONFIG_PCM_S24LE_PLANAR_DECODER 0 -+%define CONFIG_PCM_S32BE_DECODER 0 -+%define CONFIG_PCM_S32LE_DECODER 1 -+%define CONFIG_PCM_S32LE_PLANAR_DECODER 0 -+%define CONFIG_PCM_S64BE_DECODER 0 -+%define CONFIG_PCM_S64LE_DECODER 0 -+%define CONFIG_PCM_SGA_DECODER 0 -+%define CONFIG_PCM_U8_DECODER 1 -+%define CONFIG_PCM_U16BE_DECODER 0 -+%define CONFIG_PCM_U16LE_DECODER 0 -+%define CONFIG_PCM_U24BE_DECODER 0 -+%define CONFIG_PCM_U24LE_DECODER 0 -+%define CONFIG_PCM_U32BE_DECODER 0 -+%define CONFIG_PCM_U32LE_DECODER 0 -+%define CONFIG_PCM_VIDC_DECODER 0 -+%define CONFIG_DERF_DPCM_DECODER 0 -+%define CONFIG_GREMLIN_DPCM_DECODER 0 -+%define CONFIG_INTERPLAY_DPCM_DECODER 0 -+%define CONFIG_ROQ_DPCM_DECODER 0 -+%define CONFIG_SDX2_DPCM_DECODER 0 -+%define CONFIG_SOL_DPCM_DECODER 0 -+%define CONFIG_XAN_DPCM_DECODER 0 -+%define CONFIG_ADPCM_4XM_DECODER 0 -+%define CONFIG_ADPCM_ADX_DECODER 0 -+%define CONFIG_ADPCM_AFC_DECODER 0 -+%define CONFIG_ADPCM_AGM_DECODER 0 -+%define CONFIG_ADPCM_AICA_DECODER 0 -+%define CONFIG_ADPCM_ARGO_DECODER 0 -+%define CONFIG_ADPCM_CT_DECODER 0 -+%define CONFIG_ADPCM_DTK_DECODER 0 -+%define CONFIG_ADPCM_EA_DECODER 0 -+%define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+%define CONFIG_ADPCM_EA_R1_DECODER 0 -+%define CONFIG_ADPCM_EA_R2_DECODER 0 -+%define CONFIG_ADPCM_EA_R3_DECODER 0 -+%define CONFIG_ADPCM_EA_XAS_DECODER 0 -+%define CONFIG_ADPCM_G722_DECODER 0 -+%define CONFIG_ADPCM_G726_DECODER 0 -+%define CONFIG_ADPCM_G726LE_DECODER 0 -+%define CONFIG_ADPCM_IMA_ACORN_DECODER 0 -+%define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+%define CONFIG_ADPCM_IMA_ALP_DECODER 0 -+%define CONFIG_ADPCM_IMA_APC_DECODER 0 -+%define CONFIG_ADPCM_IMA_APM_DECODER 0 -+%define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 -+%define CONFIG_ADPCM_IMA_DAT4_DECODER 0 -+%define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+%define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+%define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+%define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+%define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+%define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 -+%define CONFIG_ADPCM_IMA_MTF_DECODER 0 -+%define CONFIG_ADPCM_IMA_OKI_DECODER 0 -+%define CONFIG_ADPCM_IMA_QT_DECODER 0 -+%define CONFIG_ADPCM_IMA_RAD_DECODER 0 -+%define CONFIG_ADPCM_IMA_SSI_DECODER 0 -+%define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+%define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+%define CONFIG_ADPCM_IMA_WS_DECODER 0 -+%define CONFIG_ADPCM_MS_DECODER 0 -+%define CONFIG_ADPCM_MTAF_DECODER 0 -+%define CONFIG_ADPCM_PSX_DECODER 0 -+%define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+%define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+%define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+%define CONFIG_ADPCM_SWF_DECODER 0 -+%define CONFIG_ADPCM_THP_DECODER 0 -+%define CONFIG_ADPCM_THP_LE_DECODER 0 -+%define CONFIG_ADPCM_VIMA_DECODER 0 -+%define CONFIG_ADPCM_XA_DECODER 0 -+%define CONFIG_ADPCM_YAMAHA_DECODER 0 -+%define CONFIG_ADPCM_ZORK_DECODER 0 -+%define CONFIG_SSA_DECODER 0 -+%define CONFIG_ASS_DECODER 0 -+%define CONFIG_CCAPTION_DECODER 0 -+%define CONFIG_DVBSUB_DECODER 0 -+%define CONFIG_DVDSUB_DECODER 0 -+%define CONFIG_JACOSUB_DECODER 0 -+%define CONFIG_MICRODVD_DECODER 0 -+%define CONFIG_MOVTEXT_DECODER 0 -+%define CONFIG_MPL2_DECODER 0 -+%define CONFIG_PGSSUB_DECODER 0 -+%define CONFIG_PJS_DECODER 0 -+%define CONFIG_REALTEXT_DECODER 0 -+%define CONFIG_SAMI_DECODER 0 -+%define CONFIG_SRT_DECODER 0 -+%define CONFIG_STL_DECODER 0 -+%define CONFIG_SUBRIP_DECODER 0 -+%define CONFIG_SUBVIEWER_DECODER 0 -+%define CONFIG_SUBVIEWER1_DECODER 0 -+%define CONFIG_TEXT_DECODER 0 -+%define CONFIG_VPLAYER_DECODER 0 -+%define CONFIG_WEBVTT_DECODER 0 -+%define CONFIG_XSUB_DECODER 0 -+%define CONFIG_AAC_AT_DECODER 0 -+%define CONFIG_AC3_AT_DECODER 0 -+%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 -+%define CONFIG_ALAC_AT_DECODER 0 -+%define CONFIG_AMR_NB_AT_DECODER 0 -+%define CONFIG_EAC3_AT_DECODER 0 -+%define CONFIG_GSM_MS_AT_DECODER 0 -+%define CONFIG_ILBC_AT_DECODER 0 -+%define CONFIG_MP1_AT_DECODER 0 -+%define CONFIG_MP2_AT_DECODER 0 -+%define CONFIG_MP3_AT_DECODER 0 -+%define CONFIG_PCM_ALAW_AT_DECODER 0 -+%define CONFIG_PCM_MULAW_AT_DECODER 0 -+%define CONFIG_QDMC_AT_DECODER 0 -+%define CONFIG_QDM2_AT_DECODER 0 -+%define CONFIG_LIBARIBB24_DECODER 0 -+%define CONFIG_LIBCELT_DECODER 0 -+%define CONFIG_LIBCODEC2_DECODER 0 -+%define CONFIG_LIBDAV1D_DECODER 0 -+%define CONFIG_LIBDAVS2_DECODER 0 -+%define CONFIG_LIBFDK_AAC_DECODER 0 -+%define CONFIG_LIBGSM_DECODER 0 -+%define CONFIG_LIBGSM_MS_DECODER 0 -+%define CONFIG_LIBILBC_DECODER 0 -+%define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+%define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+%define CONFIG_LIBOPENJPEG_DECODER 0 -+%define CONFIG_LIBOPUS_DECODER 1 -+%define CONFIG_LIBRSVG_DECODER 0 -+%define CONFIG_LIBSPEEX_DECODER 0 -+%define CONFIG_LIBUAVS3D_DECODER 0 -+%define CONFIG_LIBVORBIS_DECODER 0 -+%define CONFIG_LIBVPX_VP8_DECODER 0 -+%define CONFIG_LIBVPX_VP9_DECODER 0 -+%define CONFIG_LIBZVBI_TELETEXT_DECODER 0 -+%define CONFIG_BINTEXT_DECODER 0 -+%define CONFIG_XBIN_DECODER 0 -+%define CONFIG_IDF_DECODER 0 -+%define CONFIG_LIBAOM_AV1_DECODER 0 -+%define CONFIG_AV1_DECODER 0 -+%define CONFIG_AV1_CUVID_DECODER 0 -+%define CONFIG_AV1_QSV_DECODER 0 -+%define CONFIG_LIBOPENH264_DECODER 0 -+%define CONFIG_H264_CUVID_DECODER 0 -+%define CONFIG_HEVC_CUVID_DECODER 0 -+%define CONFIG_HEVC_MEDIACODEC_DECODER 0 -+%define CONFIG_MJPEG_CUVID_DECODER 0 -+%define CONFIG_MJPEG_QSV_DECODER 0 -+%define CONFIG_MPEG1_CUVID_DECODER 0 -+%define CONFIG_MPEG2_CUVID_DECODER 0 -+%define CONFIG_MPEG4_CUVID_DECODER 0 -+%define CONFIG_MPEG4_MEDIACODEC_DECODER 0 -+%define CONFIG_VC1_CUVID_DECODER 0 -+%define CONFIG_VP8_CUVID_DECODER 0 -+%define CONFIG_VP8_MEDIACODEC_DECODER 0 -+%define CONFIG_VP8_QSV_DECODER 0 -+%define CONFIG_VP9_CUVID_DECODER 0 -+%define CONFIG_VP9_MEDIACODEC_DECODER 0 -+%define CONFIG_VP9_QSV_DECODER 0 -+%define CONFIG_A64MULTI_ENCODER 0 -+%define CONFIG_A64MULTI5_ENCODER 0 -+%define CONFIG_ALIAS_PIX_ENCODER 0 -+%define CONFIG_AMV_ENCODER 0 -+%define CONFIG_APNG_ENCODER 0 -+%define CONFIG_ASV1_ENCODER 0 -+%define CONFIG_ASV2_ENCODER 0 -+%define CONFIG_AVRP_ENCODER 0 -+%define CONFIG_AVUI_ENCODER 0 -+%define CONFIG_AYUV_ENCODER 0 -+%define CONFIG_BITPACKED_ENCODER 0 -+%define CONFIG_BMP_ENCODER 0 -+%define CONFIG_CFHD_ENCODER 0 -+%define CONFIG_CINEPAK_ENCODER 0 -+%define CONFIG_CLJR_ENCODER 0 -+%define CONFIG_COMFORTNOISE_ENCODER 0 -+%define CONFIG_DNXHD_ENCODER 0 -+%define CONFIG_DPX_ENCODER 0 -+%define CONFIG_DVVIDEO_ENCODER 0 -+%define CONFIG_EXR_ENCODER 0 -+%define CONFIG_FFV1_ENCODER 0 -+%define CONFIG_FFVHUFF_ENCODER 0 -+%define CONFIG_FITS_ENCODER 0 -+%define CONFIG_FLASHSV_ENCODER 0 -+%define CONFIG_FLASHSV2_ENCODER 0 -+%define CONFIG_FLV_ENCODER 0 -+%define CONFIG_GIF_ENCODER 0 -+%define CONFIG_H261_ENCODER 0 -+%define CONFIG_H263_ENCODER 0 -+%define CONFIG_H263P_ENCODER 0 -+%define CONFIG_HAP_ENCODER 0 -+%define CONFIG_HUFFYUV_ENCODER 0 -+%define CONFIG_JPEG2000_ENCODER 0 -+%define CONFIG_JPEGLS_ENCODER 0 -+%define CONFIG_LJPEG_ENCODER 0 -+%define CONFIG_MAGICYUV_ENCODER 0 -+%define CONFIG_MJPEG_ENCODER 0 -+%define CONFIG_MPEG1VIDEO_ENCODER 0 -+%define CONFIG_MPEG2VIDEO_ENCODER 0 -+%define CONFIG_MPEG4_ENCODER 0 -+%define CONFIG_MSMPEG4V2_ENCODER 0 -+%define CONFIG_MSMPEG4V3_ENCODER 0 -+%define CONFIG_MSVIDEO1_ENCODER 0 -+%define CONFIG_PAM_ENCODER 0 -+%define CONFIG_PBM_ENCODER 0 -+%define CONFIG_PCX_ENCODER 0 -+%define CONFIG_PFM_ENCODER 0 -+%define CONFIG_PGM_ENCODER 0 -+%define CONFIG_PGMYUV_ENCODER 0 -+%define CONFIG_PNG_ENCODER 0 -+%define CONFIG_PPM_ENCODER 0 -+%define CONFIG_PRORES_ENCODER 0 -+%define CONFIG_PRORES_AW_ENCODER 0 -+%define CONFIG_PRORES_KS_ENCODER 0 -+%define CONFIG_QTRLE_ENCODER 0 -+%define CONFIG_R10K_ENCODER 0 -+%define CONFIG_R210_ENCODER 0 -+%define CONFIG_RAWVIDEO_ENCODER 0 -+%define CONFIG_ROQ_ENCODER 0 -+%define CONFIG_RPZA_ENCODER 0 -+%define CONFIG_RV10_ENCODER 0 -+%define CONFIG_RV20_ENCODER 0 -+%define CONFIG_S302M_ENCODER 0 -+%define CONFIG_SGI_ENCODER 0 -+%define CONFIG_SMC_ENCODER 0 -+%define CONFIG_SNOW_ENCODER 0 -+%define CONFIG_SPEEDHQ_ENCODER 0 -+%define CONFIG_SUNRAST_ENCODER 0 -+%define CONFIG_SVQ1_ENCODER 0 -+%define CONFIG_TARGA_ENCODER 0 -+%define CONFIG_TIFF_ENCODER 0 -+%define CONFIG_UTVIDEO_ENCODER 0 -+%define CONFIG_V210_ENCODER 0 -+%define CONFIG_V308_ENCODER 0 -+%define CONFIG_V408_ENCODER 0 -+%define CONFIG_V410_ENCODER 0 -+%define CONFIG_VC2_ENCODER 0 -+%define CONFIG_WRAPPED_AVFRAME_ENCODER 0 -+%define CONFIG_WMV1_ENCODER 0 -+%define CONFIG_WMV2_ENCODER 0 -+%define CONFIG_XBM_ENCODER 0 -+%define CONFIG_XFACE_ENCODER 0 -+%define CONFIG_XWD_ENCODER 0 -+%define CONFIG_Y41P_ENCODER 0 -+%define CONFIG_YUV4_ENCODER 0 -+%define CONFIG_ZLIB_ENCODER 0 -+%define CONFIG_ZMBV_ENCODER 0 -+%define CONFIG_AAC_ENCODER 0 -+%define CONFIG_AC3_ENCODER 0 -+%define CONFIG_AC3_FIXED_ENCODER 0 -+%define CONFIG_ALAC_ENCODER 0 -+%define CONFIG_APTX_ENCODER 0 -+%define CONFIG_APTX_HD_ENCODER 0 -+%define CONFIG_DCA_ENCODER 0 -+%define CONFIG_EAC3_ENCODER 0 -+%define CONFIG_FLAC_ENCODER 0 -+%define CONFIG_G723_1_ENCODER 0 -+%define CONFIG_MLP_ENCODER 0 -+%define CONFIG_MP2_ENCODER 0 -+%define CONFIG_MP2FIXED_ENCODER 0 -+%define CONFIG_NELLYMOSER_ENCODER 0 -+%define CONFIG_OPUS_ENCODER 0 -+%define CONFIG_RA_144_ENCODER 0 -+%define CONFIG_SBC_ENCODER 0 -+%define CONFIG_SONIC_ENCODER 0 -+%define CONFIG_SONIC_LS_ENCODER 0 -+%define CONFIG_TRUEHD_ENCODER 0 -+%define CONFIG_TTA_ENCODER 0 -+%define CONFIG_VORBIS_ENCODER 0 -+%define CONFIG_WAVPACK_ENCODER 0 -+%define CONFIG_WMAV1_ENCODER 0 -+%define CONFIG_WMAV2_ENCODER 0 -+%define CONFIG_PCM_ALAW_ENCODER 0 -+%define CONFIG_PCM_DVD_ENCODER 0 -+%define CONFIG_PCM_F32BE_ENCODER 0 -+%define CONFIG_PCM_F32LE_ENCODER 0 -+%define CONFIG_PCM_F64BE_ENCODER 0 -+%define CONFIG_PCM_F64LE_ENCODER 0 -+%define CONFIG_PCM_MULAW_ENCODER 0 -+%define CONFIG_PCM_S8_ENCODER 0 -+%define CONFIG_PCM_S8_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S16BE_ENCODER 0 -+%define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S16LE_ENCODER 0 -+%define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S24BE_ENCODER 0 -+%define CONFIG_PCM_S24DAUD_ENCODER 0 -+%define CONFIG_PCM_S24LE_ENCODER 0 -+%define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S32BE_ENCODER 0 -+%define CONFIG_PCM_S32LE_ENCODER 0 -+%define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 -+%define CONFIG_PCM_S64BE_ENCODER 0 -+%define CONFIG_PCM_S64LE_ENCODER 0 -+%define CONFIG_PCM_U8_ENCODER 0 -+%define CONFIG_PCM_U16BE_ENCODER 0 -+%define CONFIG_PCM_U16LE_ENCODER 0 -+%define CONFIG_PCM_U24BE_ENCODER 0 -+%define CONFIG_PCM_U24LE_ENCODER 0 -+%define CONFIG_PCM_U32BE_ENCODER 0 -+%define CONFIG_PCM_U32LE_ENCODER 0 -+%define CONFIG_PCM_VIDC_ENCODER 0 -+%define CONFIG_ROQ_DPCM_ENCODER 0 -+%define CONFIG_ADPCM_ADX_ENCODER 0 -+%define CONFIG_ADPCM_ARGO_ENCODER 0 -+%define CONFIG_ADPCM_G722_ENCODER 0 -+%define CONFIG_ADPCM_G726_ENCODER 0 -+%define CONFIG_ADPCM_G726LE_ENCODER 0 -+%define CONFIG_ADPCM_IMA_AMV_ENCODER 0 -+%define CONFIG_ADPCM_IMA_ALP_ENCODER 0 -+%define CONFIG_ADPCM_IMA_APM_ENCODER 0 -+%define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+%define CONFIG_ADPCM_IMA_SSI_ENCODER 0 -+%define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+%define CONFIG_ADPCM_IMA_WS_ENCODER 0 -+%define CONFIG_ADPCM_MS_ENCODER 0 -+%define CONFIG_ADPCM_SWF_ENCODER 0 -+%define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+%define CONFIG_SSA_ENCODER 0 -+%define CONFIG_ASS_ENCODER 0 -+%define CONFIG_DVBSUB_ENCODER 0 -+%define CONFIG_DVDSUB_ENCODER 0 -+%define CONFIG_MOVTEXT_ENCODER 0 -+%define CONFIG_SRT_ENCODER 0 -+%define CONFIG_SUBRIP_ENCODER 0 -+%define CONFIG_TEXT_ENCODER 0 -+%define CONFIG_TTML_ENCODER 0 -+%define CONFIG_WEBVTT_ENCODER 0 -+%define CONFIG_XSUB_ENCODER 0 -+%define CONFIG_AAC_AT_ENCODER 0 -+%define CONFIG_ALAC_AT_ENCODER 0 -+%define CONFIG_ILBC_AT_ENCODER 0 -+%define CONFIG_PCM_ALAW_AT_ENCODER 0 -+%define CONFIG_PCM_MULAW_AT_ENCODER 0 -+%define CONFIG_LIBAOM_AV1_ENCODER 0 -+%define CONFIG_LIBCODEC2_ENCODER 0 -+%define CONFIG_LIBFDK_AAC_ENCODER 0 -+%define CONFIG_LIBGSM_ENCODER 0 -+%define CONFIG_LIBGSM_MS_ENCODER 0 -+%define CONFIG_LIBILBC_ENCODER 0 -+%define CONFIG_LIBMP3LAME_ENCODER 0 -+%define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+%define CONFIG_LIBOPENJPEG_ENCODER 0 -+%define CONFIG_LIBOPUS_ENCODER 0 -+%define CONFIG_LIBRAV1E_ENCODER 0 -+%define CONFIG_LIBSHINE_ENCODER 0 -+%define CONFIG_LIBSPEEX_ENCODER 0 -+%define CONFIG_LIBSVTAV1_ENCODER 0 -+%define CONFIG_LIBTHEORA_ENCODER 0 -+%define CONFIG_LIBTWOLAME_ENCODER 0 -+%define CONFIG_LIBVO_AMRWBENC_ENCODER 0 -+%define CONFIG_LIBVORBIS_ENCODER 0 -+%define CONFIG_LIBVPX_VP8_ENCODER 0 -+%define CONFIG_LIBVPX_VP9_ENCODER 0 -+%define CONFIG_LIBWEBP_ANIM_ENCODER 0 -+%define CONFIG_LIBWEBP_ENCODER 0 -+%define CONFIG_LIBX262_ENCODER 0 -+%define CONFIG_LIBX264_ENCODER 0 -+%define CONFIG_LIBX264RGB_ENCODER 0 -+%define CONFIG_LIBX265_ENCODER 0 -+%define CONFIG_LIBXAVS_ENCODER 0 -+%define CONFIG_LIBXAVS2_ENCODER 0 -+%define CONFIG_LIBXVID_ENCODER 0 -+%define CONFIG_AAC_MF_ENCODER 0 -+%define CONFIG_AC3_MF_ENCODER 0 -+%define CONFIG_H263_V4L2M2M_ENCODER 0 -+%define CONFIG_LIBOPENH264_ENCODER 0 -+%define CONFIG_H264_AMF_ENCODER 0 -+%define CONFIG_H264_MF_ENCODER 0 -+%define CONFIG_H264_NVENC_ENCODER 0 -+%define CONFIG_H264_OMX_ENCODER 0 -+%define CONFIG_H264_QSV_ENCODER 0 -+%define CONFIG_H264_V4L2M2M_ENCODER 0 -+%define CONFIG_H264_VAAPI_ENCODER 0 -+%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 -+%define CONFIG_HEVC_AMF_ENCODER 0 -+%define CONFIG_HEVC_MF_ENCODER 0 -+%define CONFIG_HEVC_NVENC_ENCODER 0 -+%define CONFIG_HEVC_QSV_ENCODER 0 -+%define CONFIG_HEVC_V4L2M2M_ENCODER 0 -+%define CONFIG_HEVC_VAAPI_ENCODER 0 -+%define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 -+%define CONFIG_LIBKVAZAAR_ENCODER 0 -+%define CONFIG_MJPEG_QSV_ENCODER 0 -+%define CONFIG_MJPEG_VAAPI_ENCODER 0 -+%define CONFIG_MP3_MF_ENCODER 0 -+%define CONFIG_MPEG2_QSV_ENCODER 0 -+%define CONFIG_MPEG2_VAAPI_ENCODER 0 -+%define CONFIG_MPEG4_OMX_ENCODER 0 -+%define CONFIG_MPEG4_V4L2M2M_ENCODER 0 -+%define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 -+%define CONFIG_VP8_V4L2M2M_ENCODER 0 -+%define CONFIG_VP8_VAAPI_ENCODER 0 -+%define CONFIG_VP9_VAAPI_ENCODER 0 -+%define CONFIG_VP9_QSV_ENCODER 0 -+%define CONFIG_AV1_D3D11VA_HWACCEL 0 -+%define CONFIG_AV1_D3D11VA2_HWACCEL 0 -+%define CONFIG_AV1_DXVA2_HWACCEL 0 -+%define CONFIG_AV1_NVDEC_HWACCEL 0 -+%define CONFIG_AV1_VAAPI_HWACCEL 0 -+%define CONFIG_H263_VAAPI_HWACCEL 0 -+%define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_H264_D3D11VA_HWACCEL 0 -+%define CONFIG_H264_D3D11VA2_HWACCEL 0 -+%define CONFIG_H264_DXVA2_HWACCEL 0 -+%define CONFIG_H264_NVDEC_HWACCEL 0 -+%define CONFIG_H264_VAAPI_HWACCEL 0 -+%define CONFIG_H264_VDPAU_HWACCEL 0 -+%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_HEVC_D3D11VA_HWACCEL 0 -+%define CONFIG_HEVC_D3D11VA2_HWACCEL 0 -+%define CONFIG_HEVC_DXVA2_HWACCEL 0 -+%define CONFIG_HEVC_NVDEC_HWACCEL 0 -+%define CONFIG_HEVC_VAAPI_HWACCEL 0 -+%define CONFIG_HEVC_VDPAU_HWACCEL 0 -+%define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_MJPEG_NVDEC_HWACCEL 0 -+%define CONFIG_MJPEG_VAAPI_HWACCEL 0 -+%define CONFIG_MPEG1_NVDEC_HWACCEL 0 -+%define CONFIG_MPEG1_VDPAU_HWACCEL 0 -+%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_MPEG1_XVMC_HWACCEL 0 -+%define CONFIG_MPEG2_D3D11VA_HWACCEL 0 -+%define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 -+%define CONFIG_MPEG2_NVDEC_HWACCEL 0 -+%define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+%define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+%define CONFIG_MPEG2_VDPAU_HWACCEL 0 -+%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_MPEG2_XVMC_HWACCEL 0 -+%define CONFIG_MPEG4_NVDEC_HWACCEL 0 -+%define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+%define CONFIG_MPEG4_VDPAU_HWACCEL 0 -+%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_VC1_D3D11VA_HWACCEL 0 -+%define CONFIG_VC1_D3D11VA2_HWACCEL 0 -+%define CONFIG_VC1_DXVA2_HWACCEL 0 -+%define CONFIG_VC1_NVDEC_HWACCEL 0 -+%define CONFIG_VC1_VAAPI_HWACCEL 0 -+%define CONFIG_VC1_VDPAU_HWACCEL 0 -+%define CONFIG_VP8_NVDEC_HWACCEL 0 -+%define CONFIG_VP8_VAAPI_HWACCEL 0 -+%define CONFIG_VP9_D3D11VA_HWACCEL 0 -+%define CONFIG_VP9_D3D11VA2_HWACCEL 0 -+%define CONFIG_VP9_DXVA2_HWACCEL 0 -+%define CONFIG_VP9_NVDEC_HWACCEL 0 -+%define CONFIG_VP9_VAAPI_HWACCEL 0 -+%define CONFIG_VP9_VDPAU_HWACCEL 0 -+%define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 -+%define CONFIG_WMV3_D3D11VA_HWACCEL 0 -+%define CONFIG_WMV3_D3D11VA2_HWACCEL 0 -+%define CONFIG_WMV3_DXVA2_HWACCEL 0 -+%define CONFIG_WMV3_NVDEC_HWACCEL 0 -+%define CONFIG_WMV3_VAAPI_HWACCEL 0 -+%define CONFIG_WMV3_VDPAU_HWACCEL 0 -+%define CONFIG_AAC_PARSER 1 -+%define CONFIG_AAC_LATM_PARSER 0 -+%define CONFIG_AC3_PARSER 0 -+%define CONFIG_ADX_PARSER 0 -+%define CONFIG_AMR_PARSER 0 -+%define CONFIG_AV1_PARSER 0 -+%define CONFIG_AVS2_PARSER 0 -+%define CONFIG_AVS3_PARSER 0 -+%define CONFIG_BMP_PARSER 0 -+%define CONFIG_CAVSVIDEO_PARSER 0 -+%define CONFIG_COOK_PARSER 0 -+%define CONFIG_CRI_PARSER 0 -+%define CONFIG_DCA_PARSER 0 -+%define CONFIG_DIRAC_PARSER 0 -+%define CONFIG_DNXHD_PARSER 0 -+%define CONFIG_DOLBY_E_PARSER 0 -+%define CONFIG_DPX_PARSER 0 -+%define CONFIG_DVAUDIO_PARSER 0 -+%define CONFIG_DVBSUB_PARSER 0 -+%define CONFIG_DVDSUB_PARSER 0 -+%define CONFIG_DVD_NAV_PARSER 0 -+%define CONFIG_FLAC_PARSER 1 -+%define CONFIG_G723_1_PARSER 0 -+%define CONFIG_G729_PARSER 0 -+%define CONFIG_GIF_PARSER 0 -+%define CONFIG_GSM_PARSER 0 -+%define CONFIG_H261_PARSER 0 -+%define CONFIG_H263_PARSER 0 -+%define CONFIG_H264_PARSER 1 -+%define CONFIG_HEVC_PARSER 0 -+%define CONFIG_IPU_PARSER 0 -+%define CONFIG_JPEG2000_PARSER 0 -+%define CONFIG_MJPEG_PARSER 0 -+%define CONFIG_MLP_PARSER 0 -+%define CONFIG_MPEG4VIDEO_PARSER 0 -+%define CONFIG_MPEGAUDIO_PARSER 1 -+%define CONFIG_MPEGVIDEO_PARSER 0 -+%define CONFIG_OPUS_PARSER 1 -+%define CONFIG_PNG_PARSER 0 -+%define CONFIG_PNM_PARSER 0 -+%define CONFIG_RV30_PARSER 0 -+%define CONFIG_RV40_PARSER 0 -+%define CONFIG_SBC_PARSER 0 -+%define CONFIG_SIPR_PARSER 0 -+%define CONFIG_TAK_PARSER 0 -+%define CONFIG_VC1_PARSER 0 -+%define CONFIG_VORBIS_PARSER 1 -+%define CONFIG_VP3_PARSER 1 -+%define CONFIG_VP8_PARSER 1 -+%define CONFIG_VP9_PARSER 1 -+%define CONFIG_WEBP_PARSER 0 -+%define CONFIG_XBM_PARSER 0 -+%define CONFIG_XMA_PARSER 0 -+%define CONFIG_ALSA_INDEV 0 -+%define CONFIG_ANDROID_CAMERA_INDEV 0 -+%define CONFIG_AVFOUNDATION_INDEV 0 -+%define CONFIG_BKTR_INDEV 0 -+%define CONFIG_DECKLINK_INDEV 0 -+%define CONFIG_DSHOW_INDEV 0 -+%define CONFIG_FBDEV_INDEV 0 -+%define CONFIG_GDIGRAB_INDEV 0 -+%define CONFIG_IEC61883_INDEV 0 -+%define CONFIG_JACK_INDEV 0 -+%define CONFIG_KMSGRAB_INDEV 0 -+%define CONFIG_LAVFI_INDEV 0 -+%define CONFIG_OPENAL_INDEV 0 -+%define CONFIG_OSS_INDEV 0 -+%define CONFIG_PULSE_INDEV 0 -+%define CONFIG_SNDIO_INDEV 0 -+%define CONFIG_V4L2_INDEV 0 -+%define CONFIG_VFWCAP_INDEV 0 -+%define CONFIG_XCBGRAB_INDEV 0 -+%define CONFIG_LIBCDIO_INDEV 0 -+%define CONFIG_LIBDC1394_INDEV 0 -+%define CONFIG_ALSA_OUTDEV 0 -+%define CONFIG_AUDIOTOOLBOX_OUTDEV 0 -+%define CONFIG_CACA_OUTDEV 0 -+%define CONFIG_DECKLINK_OUTDEV 0 -+%define CONFIG_FBDEV_OUTDEV 0 -+%define CONFIG_OPENGL_OUTDEV 0 -+%define CONFIG_OSS_OUTDEV 0 -+%define CONFIG_PULSE_OUTDEV 0 -+%define CONFIG_SDL2_OUTDEV 0 -+%define CONFIG_SNDIO_OUTDEV 0 -+%define CONFIG_V4L2_OUTDEV 0 -+%define CONFIG_XV_OUTDEV 0 -+%define CONFIG_ABENCH_FILTER 0 -+%define CONFIG_ACOMPRESSOR_FILTER 0 -+%define CONFIG_ACONTRAST_FILTER 0 -+%define CONFIG_ACOPY_FILTER 0 -+%define CONFIG_ACUE_FILTER 0 -+%define CONFIG_ACROSSFADE_FILTER 0 -+%define CONFIG_ACROSSOVER_FILTER 0 -+%define CONFIG_ACRUSHER_FILTER 0 -+%define CONFIG_ADECLICK_FILTER 0 -+%define CONFIG_ADECLIP_FILTER 0 -+%define CONFIG_ADECORRELATE_FILTER 0 -+%define CONFIG_ADELAY_FILTER 0 -+%define CONFIG_ADENORM_FILTER 0 -+%define CONFIG_ADERIVATIVE_FILTER 0 -+%define CONFIG_ADYNAMICEQUALIZER_FILTER 0 -+%define CONFIG_ADYNAMICSMOOTH_FILTER 0 -+%define CONFIG_AECHO_FILTER 0 -+%define CONFIG_AEMPHASIS_FILTER 0 -+%define CONFIG_AEVAL_FILTER 0 -+%define CONFIG_AEXCITER_FILTER 0 -+%define CONFIG_AFADE_FILTER 0 -+%define CONFIG_AFFTDN_FILTER 0 -+%define CONFIG_AFFTFILT_FILTER 0 -+%define CONFIG_AFIR_FILTER 0 -+%define CONFIG_AFORMAT_FILTER 0 -+%define CONFIG_AFREQSHIFT_FILTER 0 -+%define CONFIG_AFWTDN_FILTER 0 -+%define CONFIG_AGATE_FILTER 0 -+%define CONFIG_AIIR_FILTER 0 -+%define CONFIG_AINTEGRAL_FILTER 0 -+%define CONFIG_AINTERLEAVE_FILTER 0 -+%define CONFIG_ALATENCY_FILTER 0 -+%define CONFIG_ALIMITER_FILTER 0 -+%define CONFIG_ALLPASS_FILTER 0 -+%define CONFIG_ALOOP_FILTER 0 -+%define CONFIG_AMERGE_FILTER 0 -+%define CONFIG_AMETADATA_FILTER 0 -+%define CONFIG_AMIX_FILTER 0 -+%define CONFIG_AMULTIPLY_FILTER 0 -+%define CONFIG_ANEQUALIZER_FILTER 0 -+%define CONFIG_ANLMDN_FILTER 0 -+%define CONFIG_ANLMF_FILTER 0 -+%define CONFIG_ANLMS_FILTER 0 -+%define CONFIG_ANULL_FILTER 0 -+%define CONFIG_APAD_FILTER 0 -+%define CONFIG_APERMS_FILTER 0 -+%define CONFIG_APHASER_FILTER 0 -+%define CONFIG_APHASESHIFT_FILTER 0 -+%define CONFIG_APSYCLIP_FILTER 0 -+%define CONFIG_APULSATOR_FILTER 0 -+%define CONFIG_AREALTIME_FILTER 0 -+%define CONFIG_ARESAMPLE_FILTER 0 -+%define CONFIG_AREVERSE_FILTER 0 -+%define CONFIG_ARNNDN_FILTER 0 -+%define CONFIG_ASDR_FILTER 0 -+%define CONFIG_ASEGMENT_FILTER 0 -+%define CONFIG_ASELECT_FILTER 0 -+%define CONFIG_ASENDCMD_FILTER 0 -+%define CONFIG_ASETNSAMPLES_FILTER 0 -+%define CONFIG_ASETPTS_FILTER 0 -+%define CONFIG_ASETRATE_FILTER 0 -+%define CONFIG_ASETTB_FILTER 0 -+%define CONFIG_ASHOWINFO_FILTER 0 -+%define CONFIG_ASIDEDATA_FILTER 0 -+%define CONFIG_ASOFTCLIP_FILTER 0 -+%define CONFIG_ASPECTRALSTATS_FILTER 0 -+%define CONFIG_ASPLIT_FILTER 0 -+%define CONFIG_ASR_FILTER 0 -+%define CONFIG_ASTATS_FILTER 0 -+%define CONFIG_ASTREAMSELECT_FILTER 0 -+%define CONFIG_ASUBBOOST_FILTER 0 -+%define CONFIG_ASUBCUT_FILTER 0 -+%define CONFIG_ASUPERCUT_FILTER 0 -+%define CONFIG_ASUPERPASS_FILTER 0 -+%define CONFIG_ASUPERSTOP_FILTER 0 -+%define CONFIG_ATEMPO_FILTER 0 -+%define CONFIG_ATILT_FILTER 0 -+%define CONFIG_ATRIM_FILTER 0 -+%define CONFIG_AXCORRELATE_FILTER 0 -+%define CONFIG_AZMQ_FILTER 0 -+%define CONFIG_BANDPASS_FILTER 0 -+%define CONFIG_BANDREJECT_FILTER 0 -+%define CONFIG_BASS_FILTER 0 -+%define CONFIG_BIQUAD_FILTER 0 -+%define CONFIG_BS2B_FILTER 0 -+%define CONFIG_CHANNELMAP_FILTER 0 -+%define CONFIG_CHANNELSPLIT_FILTER 0 -+%define CONFIG_CHORUS_FILTER 0 -+%define CONFIG_COMPAND_FILTER 0 -+%define CONFIG_COMPENSATIONDELAY_FILTER 0 -+%define CONFIG_CROSSFEED_FILTER 0 -+%define CONFIG_CRYSTALIZER_FILTER 0 -+%define CONFIG_DCSHIFT_FILTER 0 -+%define CONFIG_DEESSER_FILTER 0 -+%define CONFIG_DRMETER_FILTER 0 -+%define CONFIG_DYNAUDNORM_FILTER 0 -+%define CONFIG_EARWAX_FILTER 0 -+%define CONFIG_EBUR128_FILTER 0 -+%define CONFIG_EQUALIZER_FILTER 0 -+%define CONFIG_EXTRASTEREO_FILTER 0 -+%define CONFIG_FIREQUALIZER_FILTER 0 -+%define CONFIG_FLANGER_FILTER 0 -+%define CONFIG_HAAS_FILTER 0 -+%define CONFIG_HDCD_FILTER 0 -+%define CONFIG_HEADPHONE_FILTER 0 -+%define CONFIG_HIGHPASS_FILTER 0 -+%define CONFIG_HIGHSHELF_FILTER 0 -+%define CONFIG_JOIN_FILTER 0 -+%define CONFIG_LADSPA_FILTER 0 -+%define CONFIG_LOUDNORM_FILTER 0 -+%define CONFIG_LOWPASS_FILTER 0 -+%define CONFIG_LOWSHELF_FILTER 0 -+%define CONFIG_LV2_FILTER 0 -+%define CONFIG_MCOMPAND_FILTER 0 -+%define CONFIG_PAN_FILTER 0 -+%define CONFIG_REPLAYGAIN_FILTER 0 -+%define CONFIG_RUBBERBAND_FILTER 0 -+%define CONFIG_SIDECHAINCOMPRESS_FILTER 0 -+%define CONFIG_SIDECHAINGATE_FILTER 0 -+%define CONFIG_SILENCEDETECT_FILTER 0 -+%define CONFIG_SILENCEREMOVE_FILTER 0 -+%define CONFIG_SOFALIZER_FILTER 0 -+%define CONFIG_SPEECHNORM_FILTER 0 -+%define CONFIG_STEREOTOOLS_FILTER 0 -+%define CONFIG_STEREOWIDEN_FILTER 0 -+%define CONFIG_SUPEREQUALIZER_FILTER 0 -+%define CONFIG_SURROUND_FILTER 0 -+%define CONFIG_TREBLE_FILTER 0 -+%define CONFIG_TREMOLO_FILTER 0 -+%define CONFIG_VIBRATO_FILTER 0 -+%define CONFIG_VOLUME_FILTER 0 -+%define CONFIG_VOLUMEDETECT_FILTER 0 -+%define CONFIG_AEVALSRC_FILTER 0 -+%define CONFIG_AFIRSRC_FILTER 0 -+%define CONFIG_ANOISESRC_FILTER 0 -+%define CONFIG_ANULLSRC_FILTER 0 -+%define CONFIG_FLITE_FILTER 0 -+%define CONFIG_HILBERT_FILTER 0 -+%define CONFIG_SINC_FILTER 0 -+%define CONFIG_SINE_FILTER 0 -+%define CONFIG_ANULLSINK_FILTER 0 -+%define CONFIG_ADDROI_FILTER 0 -+%define CONFIG_ALPHAEXTRACT_FILTER 0 -+%define CONFIG_ALPHAMERGE_FILTER 0 -+%define CONFIG_AMPLIFY_FILTER 0 -+%define CONFIG_ASS_FILTER 0 -+%define CONFIG_ATADENOISE_FILTER 0 -+%define CONFIG_AVGBLUR_FILTER 0 -+%define CONFIG_AVGBLUR_OPENCL_FILTER 0 -+%define CONFIG_AVGBLUR_VULKAN_FILTER 0 -+%define CONFIG_BBOX_FILTER 0 -+%define CONFIG_BENCH_FILTER 0 -+%define CONFIG_BILATERAL_FILTER 0 -+%define CONFIG_BITPLANENOISE_FILTER 0 -+%define CONFIG_BLACKDETECT_FILTER 0 -+%define CONFIG_BLACKFRAME_FILTER 0 -+%define CONFIG_BLEND_FILTER 0 -+%define CONFIG_BLEND_VULKAN_FILTER 0 -+%define CONFIG_BM3D_FILTER 0 -+%define CONFIG_BOXBLUR_FILTER 0 -+%define CONFIG_BOXBLUR_OPENCL_FILTER 0 -+%define CONFIG_BWDIF_FILTER 0 -+%define CONFIG_CAS_FILTER 0 -+%define CONFIG_CHROMABER_VULKAN_FILTER 0 -+%define CONFIG_CHROMAHOLD_FILTER 0 -+%define CONFIG_CHROMAKEY_FILTER 0 -+%define CONFIG_CHROMANR_FILTER 0 -+%define CONFIG_CHROMASHIFT_FILTER 0 -+%define CONFIG_CIESCOPE_FILTER 0 -+%define CONFIG_CODECVIEW_FILTER 0 -+%define CONFIG_COLORBALANCE_FILTER 0 -+%define CONFIG_COLORCHANNELMIXER_FILTER 0 -+%define CONFIG_COLORCONTRAST_FILTER 0 -+%define CONFIG_COLORCORRECT_FILTER 0 -+%define CONFIG_COLORIZE_FILTER 0 -+%define CONFIG_COLORKEY_FILTER 0 -+%define CONFIG_COLORKEY_OPENCL_FILTER 0 -+%define CONFIG_COLORHOLD_FILTER 0 -+%define CONFIG_COLORLEVELS_FILTER 0 -+%define CONFIG_COLORMATRIX_FILTER 0 -+%define CONFIG_COLORSPACE_FILTER 0 -+%define CONFIG_COLORTEMPERATURE_FILTER 0 -+%define CONFIG_CONVOLUTION_FILTER 0 -+%define CONFIG_CONVOLUTION_OPENCL_FILTER 0 -+%define CONFIG_CONVOLVE_FILTER 0 -+%define CONFIG_COPY_FILTER 0 -+%define CONFIG_COREIMAGE_FILTER 0 -+%define CONFIG_COVER_RECT_FILTER 0 -+%define CONFIG_CROP_FILTER 0 -+%define CONFIG_CROPDETECT_FILTER 0 -+%define CONFIG_CUE_FILTER 0 -+%define CONFIG_CURVES_FILTER 0 -+%define CONFIG_DATASCOPE_FILTER 0 -+%define CONFIG_DBLUR_FILTER 0 -+%define CONFIG_DCTDNOIZ_FILTER 0 -+%define CONFIG_DEBAND_FILTER 0 -+%define CONFIG_DEBLOCK_FILTER 0 -+%define CONFIG_DECIMATE_FILTER 0 -+%define CONFIG_DECONVOLVE_FILTER 0 -+%define CONFIG_DEDOT_FILTER 0 -+%define CONFIG_DEFLATE_FILTER 0 -+%define CONFIG_DEFLICKER_FILTER 0 -+%define CONFIG_DEINTERLACE_QSV_FILTER 0 -+%define CONFIG_DEINTERLACE_VAAPI_FILTER 0 -+%define CONFIG_DEJUDDER_FILTER 0 -+%define CONFIG_DELOGO_FILTER 0 -+%define CONFIG_DENOISE_VAAPI_FILTER 0 -+%define CONFIG_DERAIN_FILTER 0 -+%define CONFIG_DESHAKE_FILTER 0 -+%define CONFIG_DESHAKE_OPENCL_FILTER 0 -+%define CONFIG_DESPILL_FILTER 0 -+%define CONFIG_DETELECINE_FILTER 0 -+%define CONFIG_DILATION_FILTER 0 -+%define CONFIG_DILATION_OPENCL_FILTER 0 -+%define CONFIG_DISPLACE_FILTER 0 -+%define CONFIG_DNN_CLASSIFY_FILTER 0 -+%define CONFIG_DNN_DETECT_FILTER 0 -+%define CONFIG_DNN_PROCESSING_FILTER 0 -+%define CONFIG_DOUBLEWEAVE_FILTER 0 -+%define CONFIG_DRAWBOX_FILTER 0 -+%define CONFIG_DRAWGRAPH_FILTER 0 -+%define CONFIG_DRAWGRID_FILTER 0 -+%define CONFIG_DRAWTEXT_FILTER 0 -+%define CONFIG_EDGEDETECT_FILTER 0 -+%define CONFIG_ELBG_FILTER 0 -+%define CONFIG_ENTROPY_FILTER 0 -+%define CONFIG_EPX_FILTER 0 -+%define CONFIG_EQ_FILTER 0 -+%define CONFIG_EROSION_FILTER 0 -+%define CONFIG_EROSION_OPENCL_FILTER 0 -+%define CONFIG_ESTDIF_FILTER 0 -+%define CONFIG_EXPOSURE_FILTER 0 -+%define CONFIG_EXTRACTPLANES_FILTER 0 -+%define CONFIG_FADE_FILTER 0 -+%define CONFIG_FFTDNOIZ_FILTER 0 -+%define CONFIG_FFTFILT_FILTER 0 -+%define CONFIG_FIELD_FILTER 0 -+%define CONFIG_FIELDHINT_FILTER 0 -+%define CONFIG_FIELDMATCH_FILTER 0 -+%define CONFIG_FIELDORDER_FILTER 0 -+%define CONFIG_FILLBORDERS_FILTER 0 -+%define CONFIG_FIND_RECT_FILTER 0 -+%define CONFIG_FLIP_VULKAN_FILTER 0 -+%define CONFIG_FLOODFILL_FILTER 0 -+%define CONFIG_FORMAT_FILTER 0 -+%define CONFIG_FPS_FILTER 0 -+%define CONFIG_FRAMEPACK_FILTER 0 -+%define CONFIG_FRAMERATE_FILTER 0 -+%define CONFIG_FRAMESTEP_FILTER 0 -+%define CONFIG_FREEZEDETECT_FILTER 0 -+%define CONFIG_FREEZEFRAMES_FILTER 0 -+%define CONFIG_FREI0R_FILTER 0 -+%define CONFIG_FSPP_FILTER 0 -+%define CONFIG_GBLUR_FILTER 0 -+%define CONFIG_GBLUR_VULKAN_FILTER 0 -+%define CONFIG_GEQ_FILTER 0 -+%define CONFIG_GRADFUN_FILTER 0 -+%define CONFIG_GRAPHMONITOR_FILTER 0 -+%define CONFIG_GRAYWORLD_FILTER 0 -+%define CONFIG_GREYEDGE_FILTER 0 -+%define CONFIG_GUIDED_FILTER 0 -+%define CONFIG_HALDCLUT_FILTER 0 -+%define CONFIG_HFLIP_FILTER 0 -+%define CONFIG_HFLIP_VULKAN_FILTER 0 -+%define CONFIG_HISTEQ_FILTER 0 -+%define CONFIG_HISTOGRAM_FILTER 0 -+%define CONFIG_HQDN3D_FILTER 0 -+%define CONFIG_HQX_FILTER 0 -+%define CONFIG_HSTACK_FILTER 0 -+%define CONFIG_HSVHOLD_FILTER 0 -+%define CONFIG_HSVKEY_FILTER 0 -+%define CONFIG_HUE_FILTER 0 -+%define CONFIG_HUESATURATION_FILTER 0 -+%define CONFIG_HWDOWNLOAD_FILTER 0 -+%define CONFIG_HWMAP_FILTER 0 -+%define CONFIG_HWUPLOAD_FILTER 0 -+%define CONFIG_HWUPLOAD_CUDA_FILTER 0 -+%define CONFIG_HYSTERESIS_FILTER 0 -+%define CONFIG_IDENTITY_FILTER 0 -+%define CONFIG_IDET_FILTER 0 -+%define CONFIG_IL_FILTER 0 -+%define CONFIG_INFLATE_FILTER 0 -+%define CONFIG_INTERLACE_FILTER 0 -+%define CONFIG_INTERLEAVE_FILTER 0 -+%define CONFIG_KERNDEINT_FILTER 0 -+%define CONFIG_KIRSCH_FILTER 0 -+%define CONFIG_LAGFUN_FILTER 0 -+%define CONFIG_LATENCY_FILTER 0 -+%define CONFIG_LENSCORRECTION_FILTER 0 -+%define CONFIG_LENSFUN_FILTER 0 -+%define CONFIG_LIBPLACEBO_FILTER 0 -+%define CONFIG_LIBVMAF_FILTER 0 -+%define CONFIG_LIMITDIFF_FILTER 0 -+%define CONFIG_LIMITER_FILTER 0 -+%define CONFIG_LOOP_FILTER 0 -+%define CONFIG_LUMAKEY_FILTER 0 -+%define CONFIG_LUT_FILTER 0 -+%define CONFIG_LUT1D_FILTER 0 -+%define CONFIG_LUT2_FILTER 0 -+%define CONFIG_LUT3D_FILTER 0 -+%define CONFIG_LUTRGB_FILTER 0 -+%define CONFIG_LUTYUV_FILTER 0 -+%define CONFIG_MASKEDCLAMP_FILTER 0 -+%define CONFIG_MASKEDMAX_FILTER 0 -+%define CONFIG_MASKEDMERGE_FILTER 0 -+%define CONFIG_MASKEDMIN_FILTER 0 -+%define CONFIG_MASKEDTHRESHOLD_FILTER 0 -+%define CONFIG_MASKFUN_FILTER 0 -+%define CONFIG_MCDEINT_FILTER 0 -+%define CONFIG_MEDIAN_FILTER 0 -+%define CONFIG_MERGEPLANES_FILTER 0 -+%define CONFIG_MESTIMATE_FILTER 0 -+%define CONFIG_METADATA_FILTER 0 -+%define CONFIG_MIDEQUALIZER_FILTER 0 -+%define CONFIG_MINTERPOLATE_FILTER 0 -+%define CONFIG_MIX_FILTER 0 -+%define CONFIG_MONOCHROME_FILTER 0 -+%define CONFIG_MORPHO_FILTER 0 -+%define CONFIG_MPDECIMATE_FILTER 0 -+%define CONFIG_MSAD_FILTER 0 -+%define CONFIG_NEGATE_FILTER 0 -+%define CONFIG_NLMEANS_FILTER 0 -+%define CONFIG_NLMEANS_OPENCL_FILTER 0 -+%define CONFIG_NNEDI_FILTER 0 -+%define CONFIG_NOFORMAT_FILTER 0 -+%define CONFIG_NOISE_FILTER 0 -+%define CONFIG_NORMALIZE_FILTER 0 -+%define CONFIG_NULL_FILTER 0 -+%define CONFIG_OCR_FILTER 0 -+%define CONFIG_OCV_FILTER 0 -+%define CONFIG_OSCILLOSCOPE_FILTER 0 -+%define CONFIG_OVERLAY_FILTER 0 -+%define CONFIG_OVERLAY_OPENCL_FILTER 0 -+%define CONFIG_OVERLAY_QSV_FILTER 0 -+%define CONFIG_OVERLAY_VAAPI_FILTER 0 -+%define CONFIG_OVERLAY_VULKAN_FILTER 0 -+%define CONFIG_OVERLAY_CUDA_FILTER 0 -+%define CONFIG_OWDENOISE_FILTER 0 -+%define CONFIG_PAD_FILTER 0 -+%define CONFIG_PAD_OPENCL_FILTER 0 -+%define CONFIG_PALETTEGEN_FILTER 0 -+%define CONFIG_PALETTEUSE_FILTER 0 -+%define CONFIG_PERMS_FILTER 0 -+%define CONFIG_PERSPECTIVE_FILTER 0 -+%define CONFIG_PHASE_FILTER 0 -+%define CONFIG_PHOTOSENSITIVITY_FILTER 0 -+%define CONFIG_PIXDESCTEST_FILTER 0 -+%define CONFIG_PIXSCOPE_FILTER 0 -+%define CONFIG_PP_FILTER 0 -+%define CONFIG_PP7_FILTER 0 -+%define CONFIG_PREMULTIPLY_FILTER 0 -+%define CONFIG_PREWITT_FILTER 0 -+%define CONFIG_PREWITT_OPENCL_FILTER 0 -+%define CONFIG_PROCAMP_VAAPI_FILTER 0 -+%define CONFIG_PROGRAM_OPENCL_FILTER 0 -+%define CONFIG_PSEUDOCOLOR_FILTER 0 -+%define CONFIG_PSNR_FILTER 0 -+%define CONFIG_PULLUP_FILTER 0 -+%define CONFIG_QP_FILTER 0 -+%define CONFIG_RANDOM_FILTER 0 -+%define CONFIG_READEIA608_FILTER 0 -+%define CONFIG_READVITC_FILTER 0 -+%define CONFIG_REALTIME_FILTER 0 -+%define CONFIG_REMAP_FILTER 0 -+%define CONFIG_REMOVEGRAIN_FILTER 0 -+%define CONFIG_REMOVELOGO_FILTER 0 -+%define CONFIG_REPEATFIELDS_FILTER 0 -+%define CONFIG_REVERSE_FILTER 0 -+%define CONFIG_RGBASHIFT_FILTER 0 -+%define CONFIG_ROBERTS_FILTER 0 -+%define CONFIG_ROBERTS_OPENCL_FILTER 0 -+%define CONFIG_ROTATE_FILTER 0 -+%define CONFIG_SAB_FILTER 0 -+%define CONFIG_SCALE_FILTER 0 -+%define CONFIG_SCALE_CUDA_FILTER 0 -+%define CONFIG_SCALE_NPP_FILTER 0 -+%define CONFIG_SCALE_QSV_FILTER 0 -+%define CONFIG_SCALE_VAAPI_FILTER 0 -+%define CONFIG_SCALE_VULKAN_FILTER 0 -+%define CONFIG_SCALE2REF_FILTER 0 -+%define CONFIG_SCALE2REF_NPP_FILTER 0 -+%define CONFIG_SCDET_FILTER 0 -+%define CONFIG_SCHARR_FILTER 0 -+%define CONFIG_SCROLL_FILTER 0 -+%define CONFIG_SEGMENT_FILTER 0 -+%define CONFIG_SELECT_FILTER 0 -+%define CONFIG_SELECTIVECOLOR_FILTER 0 -+%define CONFIG_SENDCMD_FILTER 0 -+%define CONFIG_SEPARATEFIELDS_FILTER 0 -+%define CONFIG_SETDAR_FILTER 0 -+%define CONFIG_SETFIELD_FILTER 0 -+%define CONFIG_SETPARAMS_FILTER 0 -+%define CONFIG_SETPTS_FILTER 0 -+%define CONFIG_SETRANGE_FILTER 0 -+%define CONFIG_SETSAR_FILTER 0 -+%define CONFIG_SETTB_FILTER 0 -+%define CONFIG_SHARPEN_NPP_FILTER 0 -+%define CONFIG_SHARPNESS_VAAPI_FILTER 0 -+%define CONFIG_SHEAR_FILTER 0 -+%define CONFIG_SHOWINFO_FILTER 0 -+%define CONFIG_SHOWPALETTE_FILTER 0 -+%define CONFIG_SHUFFLEFRAMES_FILTER 0 -+%define CONFIG_SHUFFLEPIXELS_FILTER 0 -+%define CONFIG_SHUFFLEPLANES_FILTER 0 -+%define CONFIG_SIDEDATA_FILTER 0 -+%define CONFIG_SIGNALSTATS_FILTER 0 -+%define CONFIG_SIGNATURE_FILTER 0 -+%define CONFIG_SMARTBLUR_FILTER 0 -+%define CONFIG_SOBEL_FILTER 0 -+%define CONFIG_SOBEL_OPENCL_FILTER 0 -+%define CONFIG_SPLIT_FILTER 0 -+%define CONFIG_SPP_FILTER 0 -+%define CONFIG_SR_FILTER 0 -+%define CONFIG_SSIM_FILTER 0 -+%define CONFIG_STEREO3D_FILTER 0 -+%define CONFIG_STREAMSELECT_FILTER 0 -+%define CONFIG_SUBTITLES_FILTER 0 -+%define CONFIG_SUPER2XSAI_FILTER 0 -+%define CONFIG_SWAPRECT_FILTER 0 -+%define CONFIG_SWAPUV_FILTER 0 -+%define CONFIG_TBLEND_FILTER 0 -+%define CONFIG_TELECINE_FILTER 0 -+%define CONFIG_THISTOGRAM_FILTER 0 -+%define CONFIG_THRESHOLD_FILTER 0 -+%define CONFIG_THUMBNAIL_FILTER 0 -+%define CONFIG_THUMBNAIL_CUDA_FILTER 0 -+%define CONFIG_TILE_FILTER 0 -+%define CONFIG_TINTERLACE_FILTER 0 -+%define CONFIG_TLUT2_FILTER 0 -+%define CONFIG_TMEDIAN_FILTER 0 -+%define CONFIG_TMIDEQUALIZER_FILTER 0 -+%define CONFIG_TMIX_FILTER 0 -+%define CONFIG_TONEMAP_FILTER 0 -+%define CONFIG_TONEMAP_OPENCL_FILTER 0 -+%define CONFIG_TONEMAP_VAAPI_FILTER 0 -+%define CONFIG_TPAD_FILTER 0 -+%define CONFIG_TRANSPOSE_FILTER 0 -+%define CONFIG_TRANSPOSE_NPP_FILTER 0 -+%define CONFIG_TRANSPOSE_OPENCL_FILTER 0 -+%define CONFIG_TRANSPOSE_VAAPI_FILTER 0 -+%define CONFIG_TRANSPOSE_VULKAN_FILTER 0 -+%define CONFIG_TRIM_FILTER 0 -+%define CONFIG_UNPREMULTIPLY_FILTER 0 -+%define CONFIG_UNSHARP_FILTER 0 -+%define CONFIG_UNSHARP_OPENCL_FILTER 0 -+%define CONFIG_UNTILE_FILTER 0 -+%define CONFIG_USPP_FILTER 0 -+%define CONFIG_V360_FILTER 0 -+%define CONFIG_VAGUEDENOISER_FILTER 0 -+%define CONFIG_VARBLUR_FILTER 0 -+%define CONFIG_VECTORSCOPE_FILTER 0 -+%define CONFIG_VFLIP_FILTER 0 -+%define CONFIG_VFLIP_VULKAN_FILTER 0 -+%define CONFIG_VFRDET_FILTER 0 -+%define CONFIG_VIBRANCE_FILTER 0 -+%define CONFIG_VIDSTABDETECT_FILTER 0 -+%define CONFIG_VIDSTABTRANSFORM_FILTER 0 -+%define CONFIG_VIF_FILTER 0 -+%define CONFIG_VIGNETTE_FILTER 0 -+%define CONFIG_VMAFMOTION_FILTER 0 -+%define CONFIG_VPP_QSV_FILTER 0 -+%define CONFIG_VSTACK_FILTER 0 -+%define CONFIG_W3FDIF_FILTER 0 -+%define CONFIG_WAVEFORM_FILTER 0 -+%define CONFIG_WEAVE_FILTER 0 -+%define CONFIG_XBR_FILTER 0 -+%define CONFIG_XCORRELATE_FILTER 0 -+%define CONFIG_XFADE_FILTER 0 -+%define CONFIG_XFADE_OPENCL_FILTER 0 -+%define CONFIG_XMEDIAN_FILTER 0 -+%define CONFIG_XSTACK_FILTER 0 -+%define CONFIG_YADIF_FILTER 0 -+%define CONFIG_YADIF_CUDA_FILTER 0 -+%define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 -+%define CONFIG_YAEPBLUR_FILTER 0 -+%define CONFIG_ZMQ_FILTER 0 -+%define CONFIG_ZOOMPAN_FILTER 0 -+%define CONFIG_ZSCALE_FILTER 0 -+%define CONFIG_ALLRGB_FILTER 0 -+%define CONFIG_ALLYUV_FILTER 0 -+%define CONFIG_CELLAUTO_FILTER 0 -+%define CONFIG_COLOR_FILTER 0 -+%define CONFIG_COLORSPECTRUM_FILTER 0 -+%define CONFIG_COREIMAGESRC_FILTER 0 -+%define CONFIG_FREI0R_SRC_FILTER 0 -+%define CONFIG_GRADIENTS_FILTER 0 -+%define CONFIG_HALDCLUTSRC_FILTER 0 -+%define CONFIG_LIFE_FILTER 0 -+%define CONFIG_MANDELBROT_FILTER 0 -+%define CONFIG_MPTESTSRC_FILTER 0 -+%define CONFIG_NULLSRC_FILTER 0 -+%define CONFIG_OPENCLSRC_FILTER 0 -+%define CONFIG_PAL75BARS_FILTER 0 -+%define CONFIG_PAL100BARS_FILTER 0 -+%define CONFIG_RGBTESTSRC_FILTER 0 -+%define CONFIG_SIERPINSKI_FILTER 0 -+%define CONFIG_SMPTEBARS_FILTER 0 -+%define CONFIG_SMPTEHDBARS_FILTER 0 -+%define CONFIG_TESTSRC_FILTER 0 -+%define CONFIG_TESTSRC2_FILTER 0 -+%define CONFIG_YUVTESTSRC_FILTER 0 -+%define CONFIG_NULLSINK_FILTER 0 -+%define CONFIG_ABITSCOPE_FILTER 0 -+%define CONFIG_ADRAWGRAPH_FILTER 0 -+%define CONFIG_AGRAPHMONITOR_FILTER 0 -+%define CONFIG_AHISTOGRAM_FILTER 0 -+%define CONFIG_APHASEMETER_FILTER 0 -+%define CONFIG_AVECTORSCOPE_FILTER 0 -+%define CONFIG_CONCAT_FILTER 0 -+%define CONFIG_SHOWCQT_FILTER 0 -+%define CONFIG_SHOWFREQS_FILTER 0 -+%define CONFIG_SHOWSPATIAL_FILTER 0 -+%define CONFIG_SHOWSPECTRUM_FILTER 0 -+%define CONFIG_SHOWSPECTRUMPIC_FILTER 0 -+%define CONFIG_SHOWVOLUME_FILTER 0 -+%define CONFIG_SHOWWAVES_FILTER 0 -+%define CONFIG_SHOWWAVESPIC_FILTER 0 -+%define CONFIG_SPECTRUMSYNTH_FILTER 0 -+%define CONFIG_AMOVIE_FILTER 0 -+%define CONFIG_MOVIE_FILTER 0 -+%define CONFIG_AFIFO_FILTER 0 -+%define CONFIG_FIFO_FILTER 0 -+%define CONFIG_AA_DEMUXER 0 -+%define CONFIG_AAC_DEMUXER 1 -+%define CONFIG_AAX_DEMUXER 0 -+%define CONFIG_AC3_DEMUXER 0 -+%define CONFIG_ACE_DEMUXER 0 -+%define CONFIG_ACM_DEMUXER 0 -+%define CONFIG_ACT_DEMUXER 0 -+%define CONFIG_ADF_DEMUXER 0 -+%define CONFIG_ADP_DEMUXER 0 -+%define CONFIG_ADS_DEMUXER 0 -+%define CONFIG_ADX_DEMUXER 0 -+%define CONFIG_AEA_DEMUXER 0 -+%define CONFIG_AFC_DEMUXER 0 -+%define CONFIG_AIFF_DEMUXER 0 -+%define CONFIG_AIX_DEMUXER 0 -+%define CONFIG_ALP_DEMUXER 0 -+%define CONFIG_AMR_DEMUXER 0 -+%define CONFIG_AMRNB_DEMUXER 0 -+%define CONFIG_AMRWB_DEMUXER 0 -+%define CONFIG_ANM_DEMUXER 0 -+%define CONFIG_APC_DEMUXER 0 -+%define CONFIG_APE_DEMUXER 0 -+%define CONFIG_APM_DEMUXER 0 -+%define CONFIG_APNG_DEMUXER 0 -+%define CONFIG_APTX_DEMUXER 0 -+%define CONFIG_APTX_HD_DEMUXER 0 -+%define CONFIG_AQTITLE_DEMUXER 0 -+%define CONFIG_ARGO_ASF_DEMUXER 0 -+%define CONFIG_ARGO_BRP_DEMUXER 0 -+%define CONFIG_ARGO_CVG_DEMUXER 0 -+%define CONFIG_ASF_DEMUXER 0 -+%define CONFIG_ASF_O_DEMUXER 0 -+%define CONFIG_ASS_DEMUXER 0 -+%define CONFIG_AST_DEMUXER 0 -+%define CONFIG_AU_DEMUXER 0 -+%define CONFIG_AV1_DEMUXER 0 -+%define CONFIG_AVI_DEMUXER 0 -+%define CONFIG_AVISYNTH_DEMUXER 0 -+%define CONFIG_AVR_DEMUXER 0 -+%define CONFIG_AVS_DEMUXER 0 -+%define CONFIG_AVS2_DEMUXER 0 -+%define CONFIG_AVS3_DEMUXER 0 -+%define CONFIG_BETHSOFTVID_DEMUXER 0 -+%define CONFIG_BFI_DEMUXER 0 -+%define CONFIG_BINTEXT_DEMUXER 0 -+%define CONFIG_BINK_DEMUXER 0 -+%define CONFIG_BINKA_DEMUXER 0 -+%define CONFIG_BIT_DEMUXER 0 -+%define CONFIG_BITPACKED_DEMUXER 0 -+%define CONFIG_BMV_DEMUXER 0 -+%define CONFIG_BFSTM_DEMUXER 0 -+%define CONFIG_BRSTM_DEMUXER 0 -+%define CONFIG_BOA_DEMUXER 0 -+%define CONFIG_C93_DEMUXER 0 -+%define CONFIG_CAF_DEMUXER 0 -+%define CONFIG_CAVSVIDEO_DEMUXER 0 -+%define CONFIG_CDG_DEMUXER 0 -+%define CONFIG_CDXL_DEMUXER 0 -+%define CONFIG_CINE_DEMUXER 0 -+%define CONFIG_CODEC2_DEMUXER 0 -+%define CONFIG_CODEC2RAW_DEMUXER 0 -+%define CONFIG_CONCAT_DEMUXER 0 -+%define CONFIG_DASH_DEMUXER 0 -+%define CONFIG_DATA_DEMUXER 0 -+%define CONFIG_DAUD_DEMUXER 0 -+%define CONFIG_DCSTR_DEMUXER 0 -+%define CONFIG_DERF_DEMUXER 0 -+%define CONFIG_DFA_DEMUXER 0 -+%define CONFIG_DHAV_DEMUXER 0 -+%define CONFIG_DIRAC_DEMUXER 0 -+%define CONFIG_DNXHD_DEMUXER 0 -+%define CONFIG_DSF_DEMUXER 0 -+%define CONFIG_DSICIN_DEMUXER 0 -+%define CONFIG_DSS_DEMUXER 0 -+%define CONFIG_DTS_DEMUXER 0 -+%define CONFIG_DTSHD_DEMUXER 0 -+%define CONFIG_DV_DEMUXER 0 -+%define CONFIG_DVBSUB_DEMUXER 0 -+%define CONFIG_DVBTXT_DEMUXER 0 -+%define CONFIG_DXA_DEMUXER 0 -+%define CONFIG_EA_DEMUXER 0 -+%define CONFIG_EA_CDATA_DEMUXER 0 -+%define CONFIG_EAC3_DEMUXER 0 -+%define CONFIG_EPAF_DEMUXER 0 -+%define CONFIG_FFMETADATA_DEMUXER 0 -+%define CONFIG_FILMSTRIP_DEMUXER 0 -+%define CONFIG_FITS_DEMUXER 0 -+%define CONFIG_FLAC_DEMUXER 1 -+%define CONFIG_FLIC_DEMUXER 0 -+%define CONFIG_FLV_DEMUXER 0 -+%define CONFIG_LIVE_FLV_DEMUXER 0 -+%define CONFIG_FOURXM_DEMUXER 0 -+%define CONFIG_FRM_DEMUXER 0 -+%define CONFIG_FSB_DEMUXER 0 -+%define CONFIG_FWSE_DEMUXER 0 -+%define CONFIG_G722_DEMUXER 0 -+%define CONFIG_G723_1_DEMUXER 0 -+%define CONFIG_G726_DEMUXER 0 -+%define CONFIG_G726LE_DEMUXER 0 -+%define CONFIG_G729_DEMUXER 0 -+%define CONFIG_GDV_DEMUXER 0 -+%define CONFIG_GENH_DEMUXER 0 -+%define CONFIG_GIF_DEMUXER 0 -+%define CONFIG_GSM_DEMUXER 0 -+%define CONFIG_GXF_DEMUXER 0 -+%define CONFIG_H261_DEMUXER 0 -+%define CONFIG_H263_DEMUXER 0 -+%define CONFIG_H264_DEMUXER 0 -+%define CONFIG_HCA_DEMUXER 0 -+%define CONFIG_HCOM_DEMUXER 0 -+%define CONFIG_HEVC_DEMUXER 0 -+%define CONFIG_HLS_DEMUXER 0 -+%define CONFIG_HNM_DEMUXER 0 -+%define CONFIG_ICO_DEMUXER 0 -+%define CONFIG_IDCIN_DEMUXER 0 -+%define CONFIG_IDF_DEMUXER 0 -+%define CONFIG_IFF_DEMUXER 0 -+%define CONFIG_IFV_DEMUXER 0 -+%define CONFIG_ILBC_DEMUXER 0 -+%define CONFIG_IMAGE2_DEMUXER 0 -+%define CONFIG_IMAGE2PIPE_DEMUXER 0 -+%define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 -+%define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 -+%define CONFIG_IMF_DEMUXER 0 -+%define CONFIG_INGENIENT_DEMUXER 0 -+%define CONFIG_IPMOVIE_DEMUXER 0 -+%define CONFIG_IPU_DEMUXER 0 -+%define CONFIG_IRCAM_DEMUXER 0 -+%define CONFIG_ISS_DEMUXER 0 -+%define CONFIG_IV8_DEMUXER 0 -+%define CONFIG_IVF_DEMUXER 0 -+%define CONFIG_IVR_DEMUXER 0 -+%define CONFIG_JACOSUB_DEMUXER 0 -+%define CONFIG_JV_DEMUXER 0 -+%define CONFIG_KUX_DEMUXER 0 -+%define CONFIG_KVAG_DEMUXER 0 -+%define CONFIG_LMLM4_DEMUXER 0 -+%define CONFIG_LOAS_DEMUXER 0 -+%define CONFIG_LUODAT_DEMUXER 0 -+%define CONFIG_LRC_DEMUXER 0 -+%define CONFIG_LVF_DEMUXER 0 -+%define CONFIG_LXF_DEMUXER 0 -+%define CONFIG_M4V_DEMUXER 0 -+%define CONFIG_MCA_DEMUXER 0 -+%define CONFIG_MCC_DEMUXER 0 -+%define CONFIG_MATROSKA_DEMUXER 1 -+%define CONFIG_MGSTS_DEMUXER 0 -+%define CONFIG_MICRODVD_DEMUXER 0 -+%define CONFIG_MJPEG_DEMUXER 0 -+%define CONFIG_MJPEG_2000_DEMUXER 0 -+%define CONFIG_MLP_DEMUXER 0 -+%define CONFIG_MLV_DEMUXER 0 -+%define CONFIG_MM_DEMUXER 0 -+%define CONFIG_MMF_DEMUXER 0 -+%define CONFIG_MODS_DEMUXER 0 -+%define CONFIG_MOFLEX_DEMUXER 0 -+%define CONFIG_MOV_DEMUXER 1 -+%define CONFIG_MP3_DEMUXER 1 -+%define CONFIG_MPC_DEMUXER 0 -+%define CONFIG_MPC8_DEMUXER 0 -+%define CONFIG_MPEGPS_DEMUXER 0 -+%define CONFIG_MPEGTS_DEMUXER 0 -+%define CONFIG_MPEGTSRAW_DEMUXER 0 -+%define CONFIG_MPEGVIDEO_DEMUXER 0 -+%define CONFIG_MPJPEG_DEMUXER 0 -+%define CONFIG_MPL2_DEMUXER 0 -+%define CONFIG_MPSUB_DEMUXER 0 -+%define CONFIG_MSF_DEMUXER 0 -+%define CONFIG_MSNWC_TCP_DEMUXER 0 -+%define CONFIG_MSP_DEMUXER 0 -+%define CONFIG_MTAF_DEMUXER 0 -+%define CONFIG_MTV_DEMUXER 0 -+%define CONFIG_MUSX_DEMUXER 0 -+%define CONFIG_MV_DEMUXER 0 -+%define CONFIG_MVI_DEMUXER 0 -+%define CONFIG_MXF_DEMUXER 0 -+%define CONFIG_MXG_DEMUXER 0 -+%define CONFIG_NC_DEMUXER 0 -+%define CONFIG_NISTSPHERE_DEMUXER 0 -+%define CONFIG_NSP_DEMUXER 0 -+%define CONFIG_NSV_DEMUXER 0 -+%define CONFIG_NUT_DEMUXER 0 -+%define CONFIG_NUV_DEMUXER 0 -+%define CONFIG_OBU_DEMUXER 0 -+%define CONFIG_OGG_DEMUXER 1 -+%define CONFIG_OMA_DEMUXER 0 -+%define CONFIG_PAF_DEMUXER 0 -+%define CONFIG_PCM_ALAW_DEMUXER 0 -+%define CONFIG_PCM_MULAW_DEMUXER 0 -+%define CONFIG_PCM_VIDC_DEMUXER 0 -+%define CONFIG_PCM_F64BE_DEMUXER 0 -+%define CONFIG_PCM_F64LE_DEMUXER 0 -+%define CONFIG_PCM_F32BE_DEMUXER 0 -+%define CONFIG_PCM_F32LE_DEMUXER 0 -+%define CONFIG_PCM_S32BE_DEMUXER 0 -+%define CONFIG_PCM_S32LE_DEMUXER 0 -+%define CONFIG_PCM_S24BE_DEMUXER 0 -+%define CONFIG_PCM_S24LE_DEMUXER 0 -+%define CONFIG_PCM_S16BE_DEMUXER 0 -+%define CONFIG_PCM_S16LE_DEMUXER 0 -+%define CONFIG_PCM_S8_DEMUXER 0 -+%define CONFIG_PCM_U32BE_DEMUXER 0 -+%define CONFIG_PCM_U32LE_DEMUXER 0 -+%define CONFIG_PCM_U24BE_DEMUXER 0 -+%define CONFIG_PCM_U24LE_DEMUXER 0 -+%define CONFIG_PCM_U16BE_DEMUXER 0 -+%define CONFIG_PCM_U16LE_DEMUXER 0 -+%define CONFIG_PCM_U8_DEMUXER 0 -+%define CONFIG_PJS_DEMUXER 0 -+%define CONFIG_PMP_DEMUXER 0 -+%define CONFIG_PP_BNK_DEMUXER 0 -+%define CONFIG_PVA_DEMUXER 0 -+%define CONFIG_PVF_DEMUXER 0 -+%define CONFIG_QCP_DEMUXER 0 -+%define CONFIG_R3D_DEMUXER 0 -+%define CONFIG_RAWVIDEO_DEMUXER 0 -+%define CONFIG_REALTEXT_DEMUXER 0 -+%define CONFIG_REDSPARK_DEMUXER 0 -+%define CONFIG_RL2_DEMUXER 0 -+%define CONFIG_RM_DEMUXER 0 -+%define CONFIG_ROQ_DEMUXER 0 -+%define CONFIG_RPL_DEMUXER 0 -+%define CONFIG_RSD_DEMUXER 0 -+%define CONFIG_RSO_DEMUXER 0 -+%define CONFIG_RTP_DEMUXER 0 -+%define CONFIG_RTSP_DEMUXER 0 -+%define CONFIG_S337M_DEMUXER 0 -+%define CONFIG_SAMI_DEMUXER 0 -+%define CONFIG_SAP_DEMUXER 0 -+%define CONFIG_SBC_DEMUXER 0 -+%define CONFIG_SBG_DEMUXER 0 -+%define CONFIG_SCC_DEMUXER 0 -+%define CONFIG_SCD_DEMUXER 0 -+%define CONFIG_SDP_DEMUXER 0 -+%define CONFIG_SDR2_DEMUXER 0 -+%define CONFIG_SDS_DEMUXER 0 -+%define CONFIG_SDX_DEMUXER 0 -+%define CONFIG_SEGAFILM_DEMUXER 0 -+%define CONFIG_SER_DEMUXER 0 -+%define CONFIG_SGA_DEMUXER 0 -+%define CONFIG_SHORTEN_DEMUXER 0 -+%define CONFIG_SIFF_DEMUXER 0 -+%define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 -+%define CONFIG_SLN_DEMUXER 0 -+%define CONFIG_SMACKER_DEMUXER 0 -+%define CONFIG_SMJPEG_DEMUXER 0 -+%define CONFIG_SMUSH_DEMUXER 0 -+%define CONFIG_SOL_DEMUXER 0 -+%define CONFIG_SOX_DEMUXER 0 -+%define CONFIG_SPDIF_DEMUXER 0 -+%define CONFIG_SRT_DEMUXER 0 -+%define CONFIG_STR_DEMUXER 0 -+%define CONFIG_STL_DEMUXER 0 -+%define CONFIG_SUBVIEWER1_DEMUXER 0 -+%define CONFIG_SUBVIEWER_DEMUXER 0 -+%define CONFIG_SUP_DEMUXER 0 -+%define CONFIG_SVAG_DEMUXER 0 -+%define CONFIG_SVS_DEMUXER 0 -+%define CONFIG_SWF_DEMUXER 0 -+%define CONFIG_TAK_DEMUXER 0 -+%define CONFIG_TEDCAPTIONS_DEMUXER 0 -+%define CONFIG_THP_DEMUXER 0 -+%define CONFIG_THREEDOSTR_DEMUXER 0 -+%define CONFIG_TIERTEXSEQ_DEMUXER 0 -+%define CONFIG_TMV_DEMUXER 0 -+%define CONFIG_TRUEHD_DEMUXER 0 -+%define CONFIG_TTA_DEMUXER 0 -+%define CONFIG_TXD_DEMUXER 0 -+%define CONFIG_TTY_DEMUXER 0 -+%define CONFIG_TY_DEMUXER 0 -+%define CONFIG_V210_DEMUXER 0 -+%define CONFIG_V210X_DEMUXER 0 -+%define CONFIG_VAG_DEMUXER 0 -+%define CONFIG_VC1_DEMUXER 0 -+%define CONFIG_VC1T_DEMUXER 0 -+%define CONFIG_VIVIDAS_DEMUXER 0 -+%define CONFIG_VIVO_DEMUXER 0 -+%define CONFIG_VMD_DEMUXER 0 -+%define CONFIG_VOBSUB_DEMUXER 0 -+%define CONFIG_VOC_DEMUXER 0 -+%define CONFIG_VPK_DEMUXER 0 -+%define CONFIG_VPLAYER_DEMUXER 0 -+%define CONFIG_VQF_DEMUXER 0 -+%define CONFIG_W64_DEMUXER 0 -+%define CONFIG_WAV_DEMUXER 1 -+%define CONFIG_WC3_DEMUXER 0 -+%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 -+%define CONFIG_WEBVTT_DEMUXER 0 -+%define CONFIG_WSAUD_DEMUXER 0 -+%define CONFIG_WSD_DEMUXER 0 -+%define CONFIG_WSVQA_DEMUXER 0 -+%define CONFIG_WTV_DEMUXER 0 -+%define CONFIG_WVE_DEMUXER 0 -+%define CONFIG_WV_DEMUXER 0 -+%define CONFIG_XA_DEMUXER 0 -+%define CONFIG_XBIN_DEMUXER 0 -+%define CONFIG_XMV_DEMUXER 0 -+%define CONFIG_XVAG_DEMUXER 0 -+%define CONFIG_XWMA_DEMUXER 0 -+%define CONFIG_YOP_DEMUXER 0 -+%define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 -+%define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 -+%define CONFIG_LIBGME_DEMUXER 0 -+%define CONFIG_LIBMODPLUG_DEMUXER 0 -+%define CONFIG_LIBOPENMPT_DEMUXER 0 -+%define CONFIG_VAPOURSYNTH_DEMUXER 0 -+%define CONFIG_A64_MUXER 0 -+%define CONFIG_AC3_MUXER 0 -+%define CONFIG_ADTS_MUXER 0 -+%define CONFIG_ADX_MUXER 0 -+%define CONFIG_AIFF_MUXER 0 -+%define CONFIG_ALP_MUXER 0 -+%define CONFIG_AMR_MUXER 0 -+%define CONFIG_AMV_MUXER 0 -+%define CONFIG_APM_MUXER 0 -+%define CONFIG_APNG_MUXER 0 -+%define CONFIG_APTX_MUXER 0 -+%define CONFIG_APTX_HD_MUXER 0 -+%define CONFIG_ARGO_ASF_MUXER 0 -+%define CONFIG_ARGO_CVG_MUXER 0 -+%define CONFIG_ASF_MUXER 0 -+%define CONFIG_ASS_MUXER 0 -+%define CONFIG_AST_MUXER 0 -+%define CONFIG_ASF_STREAM_MUXER 0 -+%define CONFIG_AU_MUXER 0 -+%define CONFIG_AVI_MUXER 0 -+%define CONFIG_AVM2_MUXER 0 -+%define CONFIG_AVS2_MUXER 0 -+%define CONFIG_AVS3_MUXER 0 -+%define CONFIG_BIT_MUXER 0 -+%define CONFIG_CAF_MUXER 0 -+%define CONFIG_CAVSVIDEO_MUXER 0 -+%define CONFIG_CODEC2_MUXER 0 -+%define CONFIG_CODEC2RAW_MUXER 0 -+%define CONFIG_CRC_MUXER 0 -+%define CONFIG_DASH_MUXER 0 -+%define CONFIG_DATA_MUXER 0 -+%define CONFIG_DAUD_MUXER 0 -+%define CONFIG_DIRAC_MUXER 0 -+%define CONFIG_DNXHD_MUXER 0 -+%define CONFIG_DTS_MUXER 0 -+%define CONFIG_DV_MUXER 0 -+%define CONFIG_EAC3_MUXER 0 -+%define CONFIG_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 -+%define CONFIG_FLV_MUXER 0 -+%define CONFIG_FRAMECRC_MUXER 0 -+%define CONFIG_FRAMEHASH_MUXER 0 -+%define CONFIG_FRAMEMD5_MUXER 0 -+%define CONFIG_G722_MUXER 0 -+%define CONFIG_G723_1_MUXER 0 -+%define CONFIG_G726_MUXER 0 -+%define CONFIG_G726LE_MUXER 0 -+%define CONFIG_GIF_MUXER 0 -+%define CONFIG_GSM_MUXER 0 -+%define CONFIG_GXF_MUXER 0 -+%define CONFIG_H261_MUXER 0 -+%define CONFIG_H263_MUXER 0 -+%define CONFIG_H264_MUXER 0 -+%define CONFIG_HASH_MUXER 0 -+%define CONFIG_HDS_MUXER 0 -+%define CONFIG_HEVC_MUXER 0 -+%define CONFIG_HLS_MUXER 0 -+%define CONFIG_ICO_MUXER 0 -+%define CONFIG_ILBC_MUXER 0 -+%define CONFIG_IMAGE2_MUXER 0 -+%define CONFIG_IMAGE2PIPE_MUXER 0 -+%define CONFIG_IPOD_MUXER 0 -+%define CONFIG_IRCAM_MUXER 0 -+%define CONFIG_ISMV_MUXER 0 -+%define CONFIG_IVF_MUXER 0 -+%define CONFIG_JACOSUB_MUXER 0 -+%define CONFIG_KVAG_MUXER 0 -+%define CONFIG_LATM_MUXER 0 -+%define CONFIG_LRC_MUXER 0 -+%define CONFIG_M4V_MUXER 0 -+%define CONFIG_MD5_MUXER 0 -+%define CONFIG_MATROSKA_MUXER 0 -+%define CONFIG_MATROSKA_AUDIO_MUXER 0 -+%define CONFIG_MICRODVD_MUXER 0 -+%define CONFIG_MJPEG_MUXER 0 -+%define CONFIG_MLP_MUXER 0 -+%define CONFIG_MMF_MUXER 0 -+%define CONFIG_MOV_MUXER 0 -+%define CONFIG_MP2_MUXER 0 -+%define CONFIG_MP3_MUXER 0 -+%define CONFIG_MP4_MUXER 0 -+%define CONFIG_MPEG1SYSTEM_MUXER 0 -+%define CONFIG_MPEG1VCD_MUXER 0 -+%define CONFIG_MPEG1VIDEO_MUXER 0 -+%define CONFIG_MPEG2DVD_MUXER 0 -+%define CONFIG_MPEG2SVCD_MUXER 0 -+%define CONFIG_MPEG2VIDEO_MUXER 0 -+%define CONFIG_MPEG2VOB_MUXER 0 -+%define CONFIG_MPEGTS_MUXER 0 -+%define CONFIG_MPJPEG_MUXER 0 -+%define CONFIG_MXF_MUXER 0 -+%define CONFIG_MXF_D10_MUXER 0 -+%define CONFIG_MXF_OPATOM_MUXER 0 -+%define CONFIG_NULL_MUXER 0 -+%define CONFIG_NUT_MUXER 0 -+%define CONFIG_OBU_MUXER 0 -+%define CONFIG_OGA_MUXER 0 -+%define CONFIG_OGG_MUXER 0 -+%define CONFIG_OGV_MUXER 0 -+%define CONFIG_OMA_MUXER 0 -+%define CONFIG_OPUS_MUXER 0 -+%define CONFIG_PCM_ALAW_MUXER 0 -+%define CONFIG_PCM_MULAW_MUXER 0 -+%define CONFIG_PCM_VIDC_MUXER 0 -+%define CONFIG_PCM_F64BE_MUXER 0 -+%define CONFIG_PCM_F64LE_MUXER 0 -+%define CONFIG_PCM_F32BE_MUXER 0 -+%define CONFIG_PCM_F32LE_MUXER 0 -+%define CONFIG_PCM_S32BE_MUXER 0 -+%define CONFIG_PCM_S32LE_MUXER 0 -+%define CONFIG_PCM_S24BE_MUXER 0 -+%define CONFIG_PCM_S24LE_MUXER 0 -+%define CONFIG_PCM_S16BE_MUXER 0 -+%define CONFIG_PCM_S16LE_MUXER 0 -+%define CONFIG_PCM_S8_MUXER 0 -+%define CONFIG_PCM_U32BE_MUXER 0 -+%define CONFIG_PCM_U32LE_MUXER 0 -+%define CONFIG_PCM_U24BE_MUXER 0 -+%define CONFIG_PCM_U24LE_MUXER 0 -+%define CONFIG_PCM_U16BE_MUXER 0 -+%define CONFIG_PCM_U16LE_MUXER 0 -+%define CONFIG_PCM_U8_MUXER 0 -+%define CONFIG_PSP_MUXER 0 -+%define CONFIG_RAWVIDEO_MUXER 0 -+%define CONFIG_RM_MUXER 0 -+%define CONFIG_ROQ_MUXER 0 -+%define CONFIG_RSO_MUXER 0 -+%define CONFIG_RTP_MUXER 0 -+%define CONFIG_RTP_MPEGTS_MUXER 0 -+%define CONFIG_RTSP_MUXER 0 -+%define CONFIG_SAP_MUXER 0 -+%define CONFIG_SBC_MUXER 0 -+%define CONFIG_SCC_MUXER 0 -+%define CONFIG_SEGAFILM_MUXER 0 -+%define CONFIG_SEGMENT_MUXER 0 -+%define CONFIG_STREAM_SEGMENT_MUXER 0 -+%define CONFIG_SMJPEG_MUXER 0 -+%define CONFIG_SMOOTHSTREAMING_MUXER 0 -+%define CONFIG_SOX_MUXER 0 -+%define CONFIG_SPX_MUXER 0 -+%define CONFIG_SPDIF_MUXER 0 -+%define CONFIG_SRT_MUXER 0 -+%define CONFIG_STREAMHASH_MUXER 0 -+%define CONFIG_SUP_MUXER 0 -+%define CONFIG_SWF_MUXER 0 -+%define CONFIG_TEE_MUXER 0 -+%define CONFIG_TG2_MUXER 0 -+%define CONFIG_TGP_MUXER 0 -+%define CONFIG_MKVTIMESTAMP_V2_MUXER 0 -+%define CONFIG_TRUEHD_MUXER 0 -+%define CONFIG_TTA_MUXER 0 -+%define CONFIG_TTML_MUXER 0 -+%define CONFIG_UNCODEDFRAMECRC_MUXER 0 -+%define CONFIG_VC1_MUXER 0 -+%define CONFIG_VC1T_MUXER 0 -+%define CONFIG_VOC_MUXER 0 -+%define CONFIG_W64_MUXER 0 -+%define CONFIG_WAV_MUXER 0 -+%define CONFIG_WEBM_MUXER 0 -+%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 -+%define CONFIG_WEBM_CHUNK_MUXER 0 -+%define CONFIG_WEBP_MUXER 0 -+%define CONFIG_WEBVTT_MUXER 0 -+%define CONFIG_WSAUD_MUXER 0 -+%define CONFIG_WTV_MUXER 0 -+%define CONFIG_WV_MUXER 0 -+%define CONFIG_YUV4MPEGPIPE_MUXER 0 -+%define CONFIG_CHROMAPRINT_MUXER 0 -+%define CONFIG_ASYNC_PROTOCOL 0 -+%define CONFIG_BLURAY_PROTOCOL 0 -+%define CONFIG_CACHE_PROTOCOL 0 -+%define CONFIG_CONCAT_PROTOCOL 0 -+%define CONFIG_CONCATF_PROTOCOL 0 -+%define CONFIG_CRYPTO_PROTOCOL 0 -+%define CONFIG_DATA_PROTOCOL 0 -+%define CONFIG_FFRTMPCRYPT_PROTOCOL 0 -+%define CONFIG_FFRTMPHTTP_PROTOCOL 0 -+%define CONFIG_FILE_PROTOCOL 0 -+%define CONFIG_FTP_PROTOCOL 0 -+%define CONFIG_GOPHER_PROTOCOL 0 -+%define CONFIG_GOPHERS_PROTOCOL 0 -+%define CONFIG_HLS_PROTOCOL 0 -+%define CONFIG_HTTP_PROTOCOL 0 -+%define CONFIG_HTTPPROXY_PROTOCOL 0 -+%define CONFIG_HTTPS_PROTOCOL 0 -+%define CONFIG_ICECAST_PROTOCOL 0 -+%define CONFIG_MMSH_PROTOCOL 0 -+%define CONFIG_MMST_PROTOCOL 0 -+%define CONFIG_MD5_PROTOCOL 0 -+%define CONFIG_PIPE_PROTOCOL 0 -+%define CONFIG_PROMPEG_PROTOCOL 0 -+%define CONFIG_RTMP_PROTOCOL 0 -+%define CONFIG_RTMPE_PROTOCOL 0 -+%define CONFIG_RTMPS_PROTOCOL 0 -+%define CONFIG_RTMPT_PROTOCOL 0 -+%define CONFIG_RTMPTE_PROTOCOL 0 -+%define CONFIG_RTMPTS_PROTOCOL 0 -+%define CONFIG_RTP_PROTOCOL 0 -+%define CONFIG_SCTP_PROTOCOL 0 -+%define CONFIG_SRTP_PROTOCOL 0 -+%define CONFIG_SUBFILE_PROTOCOL 0 -+%define CONFIG_TEE_PROTOCOL 0 -+%define CONFIG_TCP_PROTOCOL 0 -+%define CONFIG_TLS_PROTOCOL 0 -+%define CONFIG_UDP_PROTOCOL 0 -+%define CONFIG_UDPLITE_PROTOCOL 0 -+%define CONFIG_UNIX_PROTOCOL 0 -+%define CONFIG_LIBAMQP_PROTOCOL 0 -+%define CONFIG_LIBRIST_PROTOCOL 0 -+%define CONFIG_LIBRTMP_PROTOCOL 0 -+%define CONFIG_LIBRTMPE_PROTOCOL 0 -+%define CONFIG_LIBRTMPS_PROTOCOL 0 -+%define CONFIG_LIBRTMPT_PROTOCOL 0 -+%define CONFIG_LIBRTMPTE_PROTOCOL 0 -+%define CONFIG_LIBSRT_PROTOCOL 0 -+%define CONFIG_LIBSSH_PROTOCOL 0 -+%define CONFIG_LIBSMBCLIENT_PROTOCOL 0 -+%define CONFIG_LIBZMQ_PROTOCOL 0 diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h index f873a18baa9a..ae6932f12d82 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h @@ -1,10 +1,10 @@ ---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2022-04-01 07:48:30 UTC +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2022-10-05 07:34:01 UTC +++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h -@@ -0,0 +1,2787 @@ +@@ -0,0 +1,739 @@ +/* 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-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --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/chcunningham/src/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --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-fft --enable-rdft --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/sandersd/src/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --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 2022 +#define FFMPEG_DATADIR "/usr/local/share/ffmpeg" @@ -66,6 +66,7 @@ +#define HAVE_AVX 1 +#define HAVE_AVX2 1 +#define HAVE_AVX512 1 ++#define HAVE_AVX512ICL 1 +#define HAVE_FMA3 1 +#define HAVE_FMA4 1 +#define HAVE_MMX 1 @@ -113,6 +114,7 @@ +#define HAVE_AVX_EXTERNAL 1 +#define HAVE_AVX2_EXTERNAL 1 +#define HAVE_AVX512_EXTERNAL 1 ++#define HAVE_AVX512ICL_EXTERNAL 1 +#define HAVE_FMA3_EXTERNAL 1 +#define HAVE_FMA4_EXTERNAL 1 +#define HAVE_MMX_EXTERNAL 1 @@ -160,6 +162,7 @@ +#define HAVE_AVX_INLINE 1 +#define HAVE_AVX2_INLINE 1 +#define HAVE_AVX512_INLINE 1 ++#define HAVE_AVX512ICL_INLINE 1 +#define HAVE_FMA3_INLINE 1 +#define HAVE_FMA4_INLINE 1 +#define HAVE_MMX_INLINE 1 @@ -293,6 +296,7 @@ +#define HAVE_COMMANDLINETOARGVW 0 +#define HAVE_FCNTL 1 +#define HAVE_GETADDRINFO 0 ++#define HAVE_GETAUXVAL 0 +#define HAVE_GETHRTIME 0 +#define HAVE_GETOPT 1 +#define HAVE_GETMODULEHANDLE 0 @@ -332,7 +336,7 @@ +#define HAVE_SLEEP 0 +#define HAVE_STRERROR_R 1 +#define HAVE_SYSCONF 1 -+#define HAVE_SYSCTL 1 ++#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 0 -- forced to 0 for Fuchsia */ +#define HAVE_USLEEP 1 +#define HAVE_UTGETOSTYPEFROMSTRING 0 +#define HAVE_VIRTUALALLOC 0 @@ -468,6 +472,7 @@ +#define CONFIG_GNUTLS 0 +#define CONFIG_JNI 0 +#define CONFIG_LADSPA 0 ++#define CONFIG_LCMS2 0 +#define CONFIG_LIBAOM 0 +#define CONFIG_LIBASS 0 +#define CONFIG_LIBBLURAY 0 @@ -488,6 +493,7 @@ +#define CONFIG_LIBIEC61883 0 +#define CONFIG_LIBILBC 0 +#define CONFIG_LIBJACK 0 ++#define CONFIG_LIBJXL 0 +#define CONFIG_LIBKLVANC 0 +#define CONFIG_LIBKVAZAAR 0 +#define CONFIG_LIBMODPLUG 0 @@ -578,7 +584,6 @@ +#define CONFIG_VIDEOTOOLBOX 0 +#define CONFIG_VULKAN 0 +#define CONFIG_V4L2_M2M 0 -+#define CONFIG_XVMC 0 +#define CONFIG_FTRAPV 0 +#define CONFIG_GRAY 0 +#define CONFIG_HARDCODED_TABLES 0 @@ -610,7 +615,6 @@ +#define CONFIG_FAST_UNALIGNED 1 +#define CONFIG_FFT 1 +#define CONFIG_LSP 0 -+#define CONFIG_LZO 0 +#define CONFIG_MDCT 1 +#define CONFIG_PIXELUTILS 0 +#define CONFIG_NETWORK 0 @@ -655,6 +659,7 @@ +#define CONFIG_CBS_JPEG 0 +#define CONFIG_CBS_MPEG2 0 +#define CONFIG_CBS_VP9 0 ++#define CONFIG_DEFLATE_WRAPPER 0 +#define CONFIG_DIRAC_PARSE 1 +#define CONFIG_DNN 0 +#define CONFIG_DOVI_RPU 0 @@ -683,6 +688,7 @@ +#define CONFIG_IDCTDSP 0 +#define CONFIG_IIRFILTER 0 +#define CONFIG_MDCT15 1 ++#define CONFIG_INFLATE_WRAPPER 0 +#define CONFIG_INTRAX8 0 +#define CONFIG_ISO_MEDIA 1 +#define CONFIG_IVIDSP 0 @@ -733,2058 +739,4 @@ +#define CONFIG_VP8DSP 1 +#define CONFIG_WMA_FREQS 0 +#define CONFIG_WMV2DSP 0 -+#define CONFIG_AAC_ADTSTOASC_BSF 0 -+#define CONFIG_AV1_FRAME_MERGE_BSF 0 -+#define CONFIG_AV1_FRAME_SPLIT_BSF 0 -+#define CONFIG_AV1_METADATA_BSF 0 -+#define CONFIG_CHOMP_BSF 0 -+#define CONFIG_DUMP_EXTRADATA_BSF 0 -+#define CONFIG_DCA_CORE_BSF 0 -+#define CONFIG_EAC3_CORE_BSF 0 -+#define CONFIG_EXTRACT_EXTRADATA_BSF 0 -+#define CONFIG_FILTER_UNITS_BSF 0 -+#define CONFIG_H264_METADATA_BSF 0 -+#define CONFIG_H264_MP4TOANNEXB_BSF 0 -+#define CONFIG_H264_REDUNDANT_PPS_BSF 0 -+#define CONFIG_HAPQA_EXTRACT_BSF 0 -+#define CONFIG_HEVC_METADATA_BSF 0 -+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0 -+#define CONFIG_IMX_DUMP_HEADER_BSF 0 -+#define CONFIG_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 -+#define CONFIG_NOISE_BSF 0 -+#define CONFIG_NULL_BSF 0 -+#define CONFIG_OPUS_METADATA_BSF 0 -+#define CONFIG_PCM_RECHUNK_BSF 0 -+#define CONFIG_PRORES_METADATA_BSF 0 -+#define CONFIG_REMOVE_EXTRADATA_BSF 0 -+#define CONFIG_SETTS_BSF 0 -+#define CONFIG_TEXT2MOVSUB_BSF 0 -+#define CONFIG_TRACE_HEADERS_BSF 0 -+#define CONFIG_TRUEHD_CORE_BSF 0 -+#define CONFIG_VP9_METADATA_BSF 0 -+#define CONFIG_VP9_RAW_REORDER_BSF 0 -+#define CONFIG_VP9_SUPERFRAME_BSF 0 -+#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 -+#define CONFIG_AASC_DECODER 0 -+#define CONFIG_AIC_DECODER 0 -+#define CONFIG_ALIAS_PIX_DECODER 0 -+#define CONFIG_AGM_DECODER 0 -+#define CONFIG_AMV_DECODER 0 -+#define CONFIG_ANM_DECODER 0 -+#define CONFIG_ANSI_DECODER 0 -+#define CONFIG_APNG_DECODER 0 -+#define CONFIG_ARBC_DECODER 0 -+#define CONFIG_ARGO_DECODER 0 -+#define CONFIG_ASV1_DECODER 0 -+#define CONFIG_ASV2_DECODER 0 -+#define CONFIG_AURA_DECODER 0 -+#define CONFIG_AURA2_DECODER 0 -+#define CONFIG_AVRP_DECODER 0 -+#define CONFIG_AVRN_DECODER 0 -+#define CONFIG_AVS_DECODER 0 -+#define CONFIG_AVUI_DECODER 0 -+#define CONFIG_AYUV_DECODER 0 -+#define CONFIG_BETHSOFTVID_DECODER 0 -+#define CONFIG_BFI_DECODER 0 -+#define CONFIG_BINK_DECODER 0 -+#define CONFIG_BITPACKED_DECODER 0 -+#define CONFIG_BMP_DECODER 0 -+#define CONFIG_BMV_VIDEO_DECODER 0 -+#define CONFIG_BRENDER_PIX_DECODER 0 -+#define CONFIG_C93_DECODER 0 -+#define CONFIG_CAVS_DECODER 0 -+#define CONFIG_CDGRAPHICS_DECODER 0 -+#define CONFIG_CDTOONS_DECODER 0 -+#define CONFIG_CDXL_DECODER 0 -+#define CONFIG_CFHD_DECODER 0 -+#define CONFIG_CINEPAK_DECODER 0 -+#define CONFIG_CLEARVIDEO_DECODER 0 -+#define CONFIG_CLJR_DECODER 0 -+#define CONFIG_CLLC_DECODER 0 -+#define CONFIG_COMFORTNOISE_DECODER 0 -+#define CONFIG_CPIA_DECODER 0 -+#define CONFIG_CRI_DECODER 0 -+#define CONFIG_CSCD_DECODER 0 -+#define CONFIG_CYUV_DECODER 0 -+#define CONFIG_DDS_DECODER 0 -+#define CONFIG_DFA_DECODER 0 -+#define CONFIG_DIRAC_DECODER 0 -+#define CONFIG_DNXHD_DECODER 0 -+#define CONFIG_DPX_DECODER 0 -+#define CONFIG_DSICINVIDEO_DECODER 0 -+#define CONFIG_DVAUDIO_DECODER 0 -+#define CONFIG_DVVIDEO_DECODER 0 -+#define CONFIG_DXA_DECODER 0 -+#define CONFIG_DXTORY_DECODER 0 -+#define CONFIG_DXV_DECODER 0 -+#define CONFIG_EACMV_DECODER 0 -+#define CONFIG_EAMAD_DECODER 0 -+#define CONFIG_EATGQ_DECODER 0 -+#define CONFIG_EATGV_DECODER 0 -+#define CONFIG_EATQI_DECODER 0 -+#define CONFIG_EIGHTBPS_DECODER 0 -+#define CONFIG_EIGHTSVX_EXP_DECODER 0 -+#define CONFIG_EIGHTSVX_FIB_DECODER 0 -+#define CONFIG_ESCAPE124_DECODER 0 -+#define CONFIG_ESCAPE130_DECODER 0 -+#define CONFIG_EXR_DECODER 0 -+#define CONFIG_FFV1_DECODER 0 -+#define CONFIG_FFVHUFF_DECODER 0 -+#define CONFIG_FIC_DECODER 0 -+#define CONFIG_FITS_DECODER 0 -+#define CONFIG_FLASHSV_DECODER 0 -+#define CONFIG_FLASHSV2_DECODER 0 -+#define CONFIG_FLIC_DECODER 0 -+#define CONFIG_FLV_DECODER 0 -+#define CONFIG_FMVC_DECODER 0 -+#define CONFIG_FOURXM_DECODER 0 -+#define CONFIG_FRAPS_DECODER 0 -+#define CONFIG_FRWU_DECODER 0 -+#define CONFIG_G2M_DECODER 0 -+#define CONFIG_GDV_DECODER 0 -+#define CONFIG_GEM_DECODER 0 -+#define CONFIG_GIF_DECODER 0 -+#define CONFIG_H261_DECODER 0 -+#define CONFIG_H263_DECODER 0 -+#define CONFIG_H263I_DECODER 0 -+#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 -+#define CONFIG_H264_QSV_DECODER 0 -+#define CONFIG_H264_RKMPP_DECODER 0 -+#define CONFIG_HAP_DECODER 0 -+#define CONFIG_HEVC_DECODER 0 -+#define CONFIG_HEVC_QSV_DECODER 0 -+#define CONFIG_HEVC_RKMPP_DECODER 0 -+#define CONFIG_HEVC_V4L2M2M_DECODER 0 -+#define CONFIG_HNM4_VIDEO_DECODER 0 -+#define CONFIG_HQ_HQA_DECODER 0 -+#define CONFIG_HQX_DECODER 0 -+#define CONFIG_HUFFYUV_DECODER 0 -+#define CONFIG_HYMT_DECODER 0 -+#define CONFIG_IDCIN_DECODER 0 -+#define CONFIG_IFF_ILBM_DECODER 0 -+#define CONFIG_IMM4_DECODER 0 -+#define CONFIG_IMM5_DECODER 0 -+#define CONFIG_INDEO2_DECODER 0 -+#define CONFIG_INDEO3_DECODER 0 -+#define CONFIG_INDEO4_DECODER 0 -+#define CONFIG_INDEO5_DECODER 0 -+#define CONFIG_INTERPLAY_VIDEO_DECODER 0 -+#define CONFIG_IPU_DECODER 0 -+#define CONFIG_JPEG2000_DECODER 0 -+#define CONFIG_JPEGLS_DECODER 0 -+#define CONFIG_JV_DECODER 0 -+#define CONFIG_KGV1_DECODER 0 -+#define CONFIG_KMVC_DECODER 0 -+#define CONFIG_LAGARITH_DECODER 0 -+#define CONFIG_LOCO_DECODER 0 -+#define CONFIG_LSCR_DECODER 0 -+#define CONFIG_M101_DECODER 0 -+#define CONFIG_MAGICYUV_DECODER 0 -+#define CONFIG_MDEC_DECODER 0 -+#define CONFIG_MIMIC_DECODER 0 -+#define CONFIG_MJPEG_DECODER 0 -+#define CONFIG_MJPEGB_DECODER 0 -+#define CONFIG_MMVIDEO_DECODER 0 -+#define CONFIG_MOBICLIP_DECODER 0 -+#define CONFIG_MOTIONPIXELS_DECODER 0 -+#define CONFIG_MPEG1VIDEO_DECODER 0 -+#define CONFIG_MPEG2VIDEO_DECODER 0 -+#define CONFIG_MPEG4_DECODER 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 -+#define CONFIG_MSA1_DECODER 0 -+#define CONFIG_MSCC_DECODER 0 -+#define CONFIG_MSMPEG4V1_DECODER 0 -+#define CONFIG_MSMPEG4V2_DECODER 0 -+#define CONFIG_MSMPEG4V3_DECODER 0 -+#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 -+#define CONFIG_MSP2_DECODER 0 -+#define CONFIG_MSRLE_DECODER 0 -+#define CONFIG_MSS1_DECODER 0 -+#define CONFIG_MSS2_DECODER 0 -+#define CONFIG_MSVIDEO1_DECODER 0 -+#define CONFIG_MSZH_DECODER 0 -+#define CONFIG_MTS2_DECODER 0 -+#define CONFIG_MV30_DECODER 0 -+#define CONFIG_MVC1_DECODER 0 -+#define CONFIG_MVC2_DECODER 0 -+#define CONFIG_MVDV_DECODER 0 -+#define CONFIG_MVHA_DECODER 0 -+#define CONFIG_MWSC_DECODER 0 -+#define CONFIG_MXPEG_DECODER 0 -+#define CONFIG_NOTCHLC_DECODER 0 -+#define CONFIG_NUV_DECODER 0 -+#define CONFIG_PAF_VIDEO_DECODER 0 -+#define CONFIG_PAM_DECODER 0 -+#define CONFIG_PBM_DECODER 0 -+#define CONFIG_PCX_DECODER 0 -+#define CONFIG_PFM_DECODER 0 -+#define CONFIG_PGM_DECODER 0 -+#define CONFIG_PGMYUV_DECODER 0 -+#define CONFIG_PGX_DECODER 0 -+#define CONFIG_PHOTOCD_DECODER 0 -+#define CONFIG_PICTOR_DECODER 0 -+#define CONFIG_PIXLET_DECODER 0 -+#define CONFIG_PNG_DECODER 0 -+#define CONFIG_PPM_DECODER 0 -+#define CONFIG_PRORES_DECODER 0 -+#define CONFIG_PROSUMER_DECODER 0 -+#define CONFIG_PSD_DECODER 0 -+#define CONFIG_PTX_DECODER 0 -+#define CONFIG_QDRAW_DECODER 0 -+#define CONFIG_QPEG_DECODER 0 -+#define CONFIG_QTRLE_DECODER 0 -+#define CONFIG_R10K_DECODER 0 -+#define CONFIG_R210_DECODER 0 -+#define CONFIG_RASC_DECODER 0 -+#define CONFIG_RAWVIDEO_DECODER 0 -+#define CONFIG_RL2_DECODER 0 -+#define CONFIG_ROQ_DECODER 0 -+#define CONFIG_RPZA_DECODER 0 -+#define CONFIG_RSCC_DECODER 0 -+#define CONFIG_RV10_DECODER 0 -+#define CONFIG_RV20_DECODER 0 -+#define CONFIG_RV30_DECODER 0 -+#define CONFIG_RV40_DECODER 0 -+#define CONFIG_S302M_DECODER 0 -+#define CONFIG_SANM_DECODER 0 -+#define CONFIG_SCPR_DECODER 0 -+#define CONFIG_SCREENPRESSO_DECODER 0 -+#define CONFIG_SGA_DECODER 0 -+#define CONFIG_SGI_DECODER 0 -+#define CONFIG_SGIRLE_DECODER 0 -+#define CONFIG_SHEERVIDEO_DECODER 0 -+#define CONFIG_SIMBIOSIS_IMX_DECODER 0 -+#define CONFIG_SMACKER_DECODER 0 -+#define CONFIG_SMC_DECODER 0 -+#define CONFIG_SMVJPEG_DECODER 0 -+#define CONFIG_SNOW_DECODER 0 -+#define CONFIG_SP5X_DECODER 0 -+#define CONFIG_SPEEDHQ_DECODER 0 -+#define CONFIG_SPEEX_DECODER 0 -+#define CONFIG_SRGC_DECODER 0 -+#define CONFIG_SUNRAST_DECODER 0 -+#define CONFIG_SVQ1_DECODER 0 -+#define CONFIG_SVQ3_DECODER 0 -+#define CONFIG_TARGA_DECODER 0 -+#define CONFIG_TARGA_Y216_DECODER 0 -+#define CONFIG_TDSC_DECODER 0 -+#define CONFIG_THEORA_DECODER 1 -+#define CONFIG_THP_DECODER 0 -+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 -+#define CONFIG_TIFF_DECODER 0 -+#define CONFIG_TMV_DECODER 0 -+#define CONFIG_TRUEMOTION1_DECODER 0 -+#define CONFIG_TRUEMOTION2_DECODER 0 -+#define CONFIG_TRUEMOTION2RT_DECODER 0 -+#define CONFIG_TSCC_DECODER 0 -+#define CONFIG_TSCC2_DECODER 0 -+#define CONFIG_TXD_DECODER 0 -+#define CONFIG_ULTI_DECODER 0 -+#define CONFIG_UTVIDEO_DECODER 0 -+#define CONFIG_V210_DECODER 0 -+#define CONFIG_V210X_DECODER 0 -+#define CONFIG_V308_DECODER 0 -+#define CONFIG_V408_DECODER 0 -+#define CONFIG_V410_DECODER 0 -+#define CONFIG_VB_DECODER 0 -+#define CONFIG_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 -+#define CONFIG_VC1_V4L2M2M_DECODER 0 -+#define CONFIG_VCR1_DECODER 0 -+#define CONFIG_VMDVIDEO_DECODER 0 -+#define CONFIG_VMNC_DECODER 0 -+#define CONFIG_VP3_DECODER 1 -+#define CONFIG_VP4_DECODER 0 -+#define CONFIG_VP5_DECODER 0 -+#define CONFIG_VP6_DECODER 0 -+#define CONFIG_VP6A_DECODER 0 -+#define CONFIG_VP6F_DECODER 0 -+#define CONFIG_VP7_DECODER 0 -+#define CONFIG_VP8_DECODER 1 -+#define CONFIG_VP8_RKMPP_DECODER 0 -+#define CONFIG_VP8_V4L2M2M_DECODER 0 -+#define CONFIG_VP9_DECODER 0 -+#define CONFIG_VP9_RKMPP_DECODER 0 -+#define CONFIG_VP9_V4L2M2M_DECODER 0 -+#define CONFIG_VQA_DECODER 0 -+#define CONFIG_WEBP_DECODER 0 -+#define CONFIG_WCMV_DECODER 0 -+#define CONFIG_WRAPPED_AVFRAME_DECODER 0 -+#define CONFIG_WMV1_DECODER 0 -+#define CONFIG_WMV2_DECODER 0 -+#define CONFIG_WMV3_DECODER 0 -+#define CONFIG_WMV3_CRYSTALHD_DECODER 0 -+#define CONFIG_WMV3IMAGE_DECODER 0 -+#define CONFIG_WNV1_DECODER 0 -+#define CONFIG_XAN_WC3_DECODER 0 -+#define CONFIG_XAN_WC4_DECODER 0 -+#define CONFIG_XBM_DECODER 0 -+#define CONFIG_XFACE_DECODER 0 -+#define CONFIG_XL_DECODER 0 -+#define CONFIG_XPM_DECODER 0 -+#define CONFIG_XWD_DECODER 0 -+#define CONFIG_Y41P_DECODER 0 -+#define CONFIG_YLC_DECODER 0 -+#define CONFIG_YOP_DECODER 0 -+#define CONFIG_YUV4_DECODER 0 -+#define CONFIG_ZERO12V_DECODER 0 -+#define CONFIG_ZEROCODEC_DECODER 0 -+#define CONFIG_ZLIB_DECODER 0 -+#define CONFIG_ZMBV_DECODER 0 -+#define CONFIG_AAC_DECODER 1 -+#define CONFIG_AAC_FIXED_DECODER 0 -+#define CONFIG_AAC_LATM_DECODER 0 -+#define CONFIG_AC3_DECODER 0 -+#define CONFIG_AC3_FIXED_DECODER 0 -+#define CONFIG_ACELP_KELVIN_DECODER 0 -+#define CONFIG_ALAC_DECODER 0 -+#define CONFIG_ALS_DECODER 0 -+#define CONFIG_AMRNB_DECODER 0 -+#define CONFIG_AMRWB_DECODER 0 -+#define CONFIG_APE_DECODER 0 -+#define CONFIG_APTX_DECODER 0 -+#define CONFIG_APTX_HD_DECODER 0 -+#define CONFIG_ATRAC1_DECODER 0 -+#define CONFIG_ATRAC3_DECODER 0 -+#define CONFIG_ATRAC3AL_DECODER 0 -+#define CONFIG_ATRAC3P_DECODER 0 -+#define CONFIG_ATRAC3PAL_DECODER 0 -+#define CONFIG_ATRAC9_DECODER 0 -+#define CONFIG_BINKAUDIO_DCT_DECODER 0 -+#define CONFIG_BINKAUDIO_RDFT_DECODER 0 -+#define CONFIG_BMV_AUDIO_DECODER 0 -+#define CONFIG_COOK_DECODER 0 -+#define CONFIG_DCA_DECODER 0 -+#define CONFIG_DOLBY_E_DECODER 0 -+#define CONFIG_DSD_LSBF_DECODER 0 -+#define CONFIG_DSD_MSBF_DECODER 0 -+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0 -+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0 -+#define CONFIG_DSICINAUDIO_DECODER 0 -+#define CONFIG_DSS_SP_DECODER 0 -+#define CONFIG_DST_DECODER 0 -+#define CONFIG_EAC3_DECODER 0 -+#define CONFIG_EVRC_DECODER 0 -+#define CONFIG_FASTAUDIO_DECODER 0 -+#define CONFIG_FFWAVESYNTH_DECODER 0 -+#define CONFIG_FLAC_DECODER 1 -+#define CONFIG_G723_1_DECODER 0 -+#define CONFIG_G729_DECODER 0 -+#define CONFIG_GSM_DECODER 0 -+#define CONFIG_GSM_MS_DECODER 0 -+#define CONFIG_HCA_DECODER 0 -+#define CONFIG_HCOM_DECODER 0 -+#define CONFIG_IAC_DECODER 0 -+#define CONFIG_ILBC_DECODER 0 -+#define CONFIG_IMC_DECODER 0 -+#define CONFIG_INTERPLAY_ACM_DECODER 0 -+#define CONFIG_MACE3_DECODER 0 -+#define CONFIG_MACE6_DECODER 0 -+#define CONFIG_METASOUND_DECODER 0 -+#define CONFIG_MLP_DECODER 0 -+#define CONFIG_MP1_DECODER 0 -+#define CONFIG_MP1FLOAT_DECODER 0 -+#define CONFIG_MP2_DECODER 0 -+#define CONFIG_MP2FLOAT_DECODER 0 -+#define CONFIG_MP3FLOAT_DECODER 0 -+#define CONFIG_MP3_DECODER 1 -+#define CONFIG_MP3ADUFLOAT_DECODER 0 -+#define CONFIG_MP3ADU_DECODER 0 -+#define CONFIG_MP3ON4FLOAT_DECODER 0 -+#define CONFIG_MP3ON4_DECODER 0 -+#define CONFIG_MPC7_DECODER 0 -+#define CONFIG_MPC8_DECODER 0 -+#define CONFIG_MSNSIREN_DECODER 0 -+#define CONFIG_NELLYMOSER_DECODER 0 -+#define CONFIG_ON2AVC_DECODER 0 -+#define CONFIG_OPUS_DECODER 0 -+#define CONFIG_PAF_AUDIO_DECODER 0 -+#define CONFIG_QCELP_DECODER 0 -+#define CONFIG_QDM2_DECODER 0 -+#define CONFIG_QDMC_DECODER 0 -+#define CONFIG_RA_144_DECODER 0 -+#define CONFIG_RA_288_DECODER 0 -+#define CONFIG_RALF_DECODER 0 -+#define CONFIG_SBC_DECODER 0 -+#define CONFIG_SHORTEN_DECODER 0 -+#define CONFIG_SIPR_DECODER 0 -+#define CONFIG_SIREN_DECODER 0 -+#define CONFIG_SMACKAUD_DECODER 0 -+#define CONFIG_SONIC_DECODER 0 -+#define CONFIG_TAK_DECODER 0 -+#define CONFIG_TRUEHD_DECODER 0 -+#define CONFIG_TRUESPEECH_DECODER 0 -+#define CONFIG_TTA_DECODER 0 -+#define CONFIG_TWINVQ_DECODER 0 -+#define CONFIG_VMDAUDIO_DECODER 0 -+#define CONFIG_VORBIS_DECODER 1 -+#define CONFIG_WAVPACK_DECODER 0 -+#define CONFIG_WMALOSSLESS_DECODER 0 -+#define CONFIG_WMAPRO_DECODER 0 -+#define CONFIG_WMAV1_DECODER 0 -+#define CONFIG_WMAV2_DECODER 0 -+#define CONFIG_WMAVOICE_DECODER 0 -+#define CONFIG_WS_SND1_DECODER 0 -+#define CONFIG_XMA1_DECODER 0 -+#define CONFIG_XMA2_DECODER 0 -+#define CONFIG_PCM_ALAW_DECODER 1 -+#define CONFIG_PCM_BLURAY_DECODER 0 -+#define CONFIG_PCM_DVD_DECODER 0 -+#define CONFIG_PCM_F16LE_DECODER 0 -+#define CONFIG_PCM_F24LE_DECODER 0 -+#define CONFIG_PCM_F32BE_DECODER 0 -+#define CONFIG_PCM_F32LE_DECODER 1 -+#define CONFIG_PCM_F64BE_DECODER 0 -+#define CONFIG_PCM_F64LE_DECODER 0 -+#define CONFIG_PCM_LXF_DECODER 0 -+#define CONFIG_PCM_MULAW_DECODER 1 -+#define CONFIG_PCM_S8_DECODER 0 -+#define CONFIG_PCM_S8_PLANAR_DECODER 0 -+#define CONFIG_PCM_S16BE_DECODER 1 -+#define CONFIG_PCM_S16BE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S16LE_DECODER 1 -+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S24BE_DECODER 1 -+#define CONFIG_PCM_S24DAUD_DECODER 0 -+#define CONFIG_PCM_S24LE_DECODER 1 -+#define CONFIG_PCM_S24LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S32BE_DECODER 0 -+#define CONFIG_PCM_S32LE_DECODER 1 -+#define CONFIG_PCM_S32LE_PLANAR_DECODER 0 -+#define CONFIG_PCM_S64BE_DECODER 0 -+#define CONFIG_PCM_S64LE_DECODER 0 -+#define CONFIG_PCM_SGA_DECODER 0 -+#define CONFIG_PCM_U8_DECODER 1 -+#define CONFIG_PCM_U16BE_DECODER 0 -+#define CONFIG_PCM_U16LE_DECODER 0 -+#define CONFIG_PCM_U24BE_DECODER 0 -+#define CONFIG_PCM_U24LE_DECODER 0 -+#define CONFIG_PCM_U32BE_DECODER 0 -+#define CONFIG_PCM_U32LE_DECODER 0 -+#define CONFIG_PCM_VIDC_DECODER 0 -+#define CONFIG_DERF_DPCM_DECODER 0 -+#define CONFIG_GREMLIN_DPCM_DECODER 0 -+#define CONFIG_INTERPLAY_DPCM_DECODER 0 -+#define CONFIG_ROQ_DPCM_DECODER 0 -+#define CONFIG_SDX2_DPCM_DECODER 0 -+#define CONFIG_SOL_DPCM_DECODER 0 -+#define CONFIG_XAN_DPCM_DECODER 0 -+#define CONFIG_ADPCM_4XM_DECODER 0 -+#define CONFIG_ADPCM_ADX_DECODER 0 -+#define CONFIG_ADPCM_AFC_DECODER 0 -+#define CONFIG_ADPCM_AGM_DECODER 0 -+#define CONFIG_ADPCM_AICA_DECODER 0 -+#define CONFIG_ADPCM_ARGO_DECODER 0 -+#define CONFIG_ADPCM_CT_DECODER 0 -+#define CONFIG_ADPCM_DTK_DECODER 0 -+#define CONFIG_ADPCM_EA_DECODER 0 -+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 -+#define CONFIG_ADPCM_EA_R1_DECODER 0 -+#define CONFIG_ADPCM_EA_R2_DECODER 0 -+#define CONFIG_ADPCM_EA_R3_DECODER 0 -+#define CONFIG_ADPCM_EA_XAS_DECODER 0 -+#define CONFIG_ADPCM_G722_DECODER 0 -+#define CONFIG_ADPCM_G726_DECODER 0 -+#define CONFIG_ADPCM_G726LE_DECODER 0 -+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0 -+#define CONFIG_ADPCM_IMA_AMV_DECODER 0 -+#define CONFIG_ADPCM_IMA_ALP_DECODER 0 -+#define CONFIG_ADPCM_IMA_APC_DECODER 0 -+#define CONFIG_ADPCM_IMA_APM_DECODER 0 -+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 -+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK3_DECODER 0 -+#define CONFIG_ADPCM_IMA_DK4_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 -+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_ISS_DECODER 0 -+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 -+#define CONFIG_ADPCM_IMA_MTF_DECODER 0 -+#define CONFIG_ADPCM_IMA_OKI_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_DECODER 0 -+#define CONFIG_ADPCM_IMA_RAD_DECODER 0 -+#define CONFIG_ADPCM_IMA_SSI_DECODER 0 -+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 -+#define CONFIG_ADPCM_IMA_WAV_DECODER 0 -+#define CONFIG_ADPCM_IMA_WS_DECODER 0 -+#define CONFIG_ADPCM_MS_DECODER 0 -+#define CONFIG_ADPCM_MTAF_DECODER 0 -+#define CONFIG_ADPCM_PSX_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_2_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_3_DECODER 0 -+#define CONFIG_ADPCM_SBPRO_4_DECODER 0 -+#define CONFIG_ADPCM_SWF_DECODER 0 -+#define CONFIG_ADPCM_THP_DECODER 0 -+#define CONFIG_ADPCM_THP_LE_DECODER 0 -+#define CONFIG_ADPCM_VIMA_DECODER 0 -+#define CONFIG_ADPCM_XA_DECODER 0 -+#define CONFIG_ADPCM_YAMAHA_DECODER 0 -+#define CONFIG_ADPCM_ZORK_DECODER 0 -+#define CONFIG_SSA_DECODER 0 -+#define CONFIG_ASS_DECODER 0 -+#define CONFIG_CCAPTION_DECODER 0 -+#define CONFIG_DVBSUB_DECODER 0 -+#define CONFIG_DVDSUB_DECODER 0 -+#define CONFIG_JACOSUB_DECODER 0 -+#define CONFIG_MICRODVD_DECODER 0 -+#define CONFIG_MOVTEXT_DECODER 0 -+#define CONFIG_MPL2_DECODER 0 -+#define CONFIG_PGSSUB_DECODER 0 -+#define CONFIG_PJS_DECODER 0 -+#define CONFIG_REALTEXT_DECODER 0 -+#define CONFIG_SAMI_DECODER 0 -+#define CONFIG_SRT_DECODER 0 -+#define CONFIG_STL_DECODER 0 -+#define CONFIG_SUBRIP_DECODER 0 -+#define CONFIG_SUBVIEWER_DECODER 0 -+#define CONFIG_SUBVIEWER1_DECODER 0 -+#define CONFIG_TEXT_DECODER 0 -+#define CONFIG_VPLAYER_DECODER 0 -+#define CONFIG_WEBVTT_DECODER 0 -+#define CONFIG_XSUB_DECODER 0 -+#define CONFIG_AAC_AT_DECODER 0 -+#define CONFIG_AC3_AT_DECODER 0 -+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 -+#define CONFIG_ALAC_AT_DECODER 0 -+#define CONFIG_AMR_NB_AT_DECODER 0 -+#define CONFIG_EAC3_AT_DECODER 0 -+#define CONFIG_GSM_MS_AT_DECODER 0 -+#define CONFIG_ILBC_AT_DECODER 0 -+#define CONFIG_MP1_AT_DECODER 0 -+#define CONFIG_MP2_AT_DECODER 0 -+#define CONFIG_MP3_AT_DECODER 0 -+#define CONFIG_PCM_ALAW_AT_DECODER 0 -+#define CONFIG_PCM_MULAW_AT_DECODER 0 -+#define CONFIG_QDMC_AT_DECODER 0 -+#define CONFIG_QDM2_AT_DECODER 0 -+#define CONFIG_LIBARIBB24_DECODER 0 -+#define CONFIG_LIBCELT_DECODER 0 -+#define CONFIG_LIBCODEC2_DECODER 0 -+#define CONFIG_LIBDAV1D_DECODER 0 -+#define CONFIG_LIBDAVS2_DECODER 0 -+#define CONFIG_LIBFDK_AAC_DECODER 0 -+#define CONFIG_LIBGSM_DECODER 0 -+#define CONFIG_LIBGSM_MS_DECODER 0 -+#define CONFIG_LIBILBC_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 -+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 -+#define CONFIG_LIBOPENJPEG_DECODER 0 -+#define CONFIG_LIBOPUS_DECODER 1 -+#define CONFIG_LIBRSVG_DECODER 0 -+#define CONFIG_LIBSPEEX_DECODER 0 -+#define CONFIG_LIBUAVS3D_DECODER 0 -+#define CONFIG_LIBVORBIS_DECODER 0 -+#define CONFIG_LIBVPX_VP8_DECODER 0 -+#define CONFIG_LIBVPX_VP9_DECODER 0 -+#define CONFIG_LIBZVBI_TELETEXT_DECODER 0 -+#define CONFIG_BINTEXT_DECODER 0 -+#define CONFIG_XBIN_DECODER 0 -+#define CONFIG_IDF_DECODER 0 -+#define CONFIG_LIBAOM_AV1_DECODER 0 -+#define CONFIG_AV1_DECODER 0 -+#define CONFIG_AV1_CUVID_DECODER 0 -+#define CONFIG_AV1_QSV_DECODER 0 -+#define CONFIG_LIBOPENH264_DECODER 0 -+#define CONFIG_H264_CUVID_DECODER 0 -+#define CONFIG_HEVC_CUVID_DECODER 0 -+#define CONFIG_HEVC_MEDIACODEC_DECODER 0 -+#define CONFIG_MJPEG_CUVID_DECODER 0 -+#define CONFIG_MJPEG_QSV_DECODER 0 -+#define CONFIG_MPEG1_CUVID_DECODER 0 -+#define CONFIG_MPEG2_CUVID_DECODER 0 -+#define CONFIG_MPEG4_CUVID_DECODER 0 -+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0 -+#define CONFIG_VC1_CUVID_DECODER 0 -+#define CONFIG_VP8_CUVID_DECODER 0 -+#define CONFIG_VP8_MEDIACODEC_DECODER 0 -+#define CONFIG_VP8_QSV_DECODER 0 -+#define CONFIG_VP9_CUVID_DECODER 0 -+#define CONFIG_VP9_MEDIACODEC_DECODER 0 -+#define CONFIG_VP9_QSV_DECODER 0 -+#define CONFIG_A64MULTI_ENCODER 0 -+#define CONFIG_A64MULTI5_ENCODER 0 -+#define CONFIG_ALIAS_PIX_ENCODER 0 -+#define CONFIG_AMV_ENCODER 0 -+#define CONFIG_APNG_ENCODER 0 -+#define CONFIG_ASV1_ENCODER 0 -+#define CONFIG_ASV2_ENCODER 0 -+#define CONFIG_AVRP_ENCODER 0 -+#define CONFIG_AVUI_ENCODER 0 -+#define CONFIG_AYUV_ENCODER 0 -+#define CONFIG_BITPACKED_ENCODER 0 -+#define CONFIG_BMP_ENCODER 0 -+#define CONFIG_CFHD_ENCODER 0 -+#define CONFIG_CINEPAK_ENCODER 0 -+#define CONFIG_CLJR_ENCODER 0 -+#define CONFIG_COMFORTNOISE_ENCODER 0 -+#define CONFIG_DNXHD_ENCODER 0 -+#define CONFIG_DPX_ENCODER 0 -+#define CONFIG_DVVIDEO_ENCODER 0 -+#define CONFIG_EXR_ENCODER 0 -+#define CONFIG_FFV1_ENCODER 0 -+#define CONFIG_FFVHUFF_ENCODER 0 -+#define CONFIG_FITS_ENCODER 0 -+#define CONFIG_FLASHSV_ENCODER 0 -+#define CONFIG_FLASHSV2_ENCODER 0 -+#define CONFIG_FLV_ENCODER 0 -+#define CONFIG_GIF_ENCODER 0 -+#define CONFIG_H261_ENCODER 0 -+#define CONFIG_H263_ENCODER 0 -+#define CONFIG_H263P_ENCODER 0 -+#define CONFIG_HAP_ENCODER 0 -+#define CONFIG_HUFFYUV_ENCODER 0 -+#define CONFIG_JPEG2000_ENCODER 0 -+#define CONFIG_JPEGLS_ENCODER 0 -+#define CONFIG_LJPEG_ENCODER 0 -+#define CONFIG_MAGICYUV_ENCODER 0 -+#define CONFIG_MJPEG_ENCODER 0 -+#define CONFIG_MPEG1VIDEO_ENCODER 0 -+#define CONFIG_MPEG2VIDEO_ENCODER 0 -+#define CONFIG_MPEG4_ENCODER 0 -+#define CONFIG_MSMPEG4V2_ENCODER 0 -+#define CONFIG_MSMPEG4V3_ENCODER 0 -+#define CONFIG_MSVIDEO1_ENCODER 0 -+#define CONFIG_PAM_ENCODER 0 -+#define CONFIG_PBM_ENCODER 0 -+#define CONFIG_PCX_ENCODER 0 -+#define CONFIG_PFM_ENCODER 0 -+#define CONFIG_PGM_ENCODER 0 -+#define CONFIG_PGMYUV_ENCODER 0 -+#define CONFIG_PNG_ENCODER 0 -+#define CONFIG_PPM_ENCODER 0 -+#define CONFIG_PRORES_ENCODER 0 -+#define CONFIG_PRORES_AW_ENCODER 0 -+#define CONFIG_PRORES_KS_ENCODER 0 -+#define CONFIG_QTRLE_ENCODER 0 -+#define CONFIG_R10K_ENCODER 0 -+#define CONFIG_R210_ENCODER 0 -+#define CONFIG_RAWVIDEO_ENCODER 0 -+#define CONFIG_ROQ_ENCODER 0 -+#define CONFIG_RPZA_ENCODER 0 -+#define CONFIG_RV10_ENCODER 0 -+#define CONFIG_RV20_ENCODER 0 -+#define CONFIG_S302M_ENCODER 0 -+#define CONFIG_SGI_ENCODER 0 -+#define CONFIG_SMC_ENCODER 0 -+#define CONFIG_SNOW_ENCODER 0 -+#define CONFIG_SPEEDHQ_ENCODER 0 -+#define CONFIG_SUNRAST_ENCODER 0 -+#define CONFIG_SVQ1_ENCODER 0 -+#define CONFIG_TARGA_ENCODER 0 -+#define CONFIG_TIFF_ENCODER 0 -+#define CONFIG_UTVIDEO_ENCODER 0 -+#define CONFIG_V210_ENCODER 0 -+#define CONFIG_V308_ENCODER 0 -+#define CONFIG_V408_ENCODER 0 -+#define CONFIG_V410_ENCODER 0 -+#define CONFIG_VC2_ENCODER 0 -+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 -+#define CONFIG_WMV1_ENCODER 0 -+#define CONFIG_WMV2_ENCODER 0 -+#define CONFIG_XBM_ENCODER 0 -+#define CONFIG_XFACE_ENCODER 0 -+#define CONFIG_XWD_ENCODER 0 -+#define CONFIG_Y41P_ENCODER 0 -+#define CONFIG_YUV4_ENCODER 0 -+#define CONFIG_ZLIB_ENCODER 0 -+#define CONFIG_ZMBV_ENCODER 0 -+#define CONFIG_AAC_ENCODER 0 -+#define CONFIG_AC3_ENCODER 0 -+#define CONFIG_AC3_FIXED_ENCODER 0 -+#define CONFIG_ALAC_ENCODER 0 -+#define CONFIG_APTX_ENCODER 0 -+#define CONFIG_APTX_HD_ENCODER 0 -+#define CONFIG_DCA_ENCODER 0 -+#define CONFIG_EAC3_ENCODER 0 -+#define CONFIG_FLAC_ENCODER 0 -+#define CONFIG_G723_1_ENCODER 0 -+#define CONFIG_MLP_ENCODER 0 -+#define CONFIG_MP2_ENCODER 0 -+#define CONFIG_MP2FIXED_ENCODER 0 -+#define CONFIG_NELLYMOSER_ENCODER 0 -+#define CONFIG_OPUS_ENCODER 0 -+#define CONFIG_RA_144_ENCODER 0 -+#define CONFIG_SBC_ENCODER 0 -+#define CONFIG_SONIC_ENCODER 0 -+#define CONFIG_SONIC_LS_ENCODER 0 -+#define CONFIG_TRUEHD_ENCODER 0 -+#define CONFIG_TTA_ENCODER 0 -+#define CONFIG_VORBIS_ENCODER 0 -+#define CONFIG_WAVPACK_ENCODER 0 -+#define CONFIG_WMAV1_ENCODER 0 -+#define CONFIG_WMAV2_ENCODER 0 -+#define CONFIG_PCM_ALAW_ENCODER 0 -+#define CONFIG_PCM_DVD_ENCODER 0 -+#define CONFIG_PCM_F32BE_ENCODER 0 -+#define CONFIG_PCM_F32LE_ENCODER 0 -+#define CONFIG_PCM_F64BE_ENCODER 0 -+#define CONFIG_PCM_F64LE_ENCODER 0 -+#define CONFIG_PCM_MULAW_ENCODER 0 -+#define CONFIG_PCM_S8_ENCODER 0 -+#define CONFIG_PCM_S8_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S16BE_ENCODER 0 -+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S16LE_ENCODER 0 -+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S24BE_ENCODER 0 -+#define CONFIG_PCM_S24DAUD_ENCODER 0 -+#define CONFIG_PCM_S24LE_ENCODER 0 -+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S32BE_ENCODER 0 -+#define CONFIG_PCM_S32LE_ENCODER 0 -+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 -+#define CONFIG_PCM_S64BE_ENCODER 0 -+#define CONFIG_PCM_S64LE_ENCODER 0 -+#define CONFIG_PCM_U8_ENCODER 0 -+#define CONFIG_PCM_U16BE_ENCODER 0 -+#define CONFIG_PCM_U16LE_ENCODER 0 -+#define CONFIG_PCM_U24BE_ENCODER 0 -+#define CONFIG_PCM_U24LE_ENCODER 0 -+#define CONFIG_PCM_U32BE_ENCODER 0 -+#define CONFIG_PCM_U32LE_ENCODER 0 -+#define CONFIG_PCM_VIDC_ENCODER 0 -+#define CONFIG_ROQ_DPCM_ENCODER 0 -+#define CONFIG_ADPCM_ADX_ENCODER 0 -+#define CONFIG_ADPCM_ARGO_ENCODER 0 -+#define CONFIG_ADPCM_G722_ENCODER 0 -+#define CONFIG_ADPCM_G726_ENCODER 0 -+#define CONFIG_ADPCM_G726LE_ENCODER 0 -+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0 -+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0 -+#define CONFIG_ADPCM_IMA_APM_ENCODER 0 -+#define CONFIG_ADPCM_IMA_QT_ENCODER 0 -+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 -+#define CONFIG_ADPCM_IMA_WS_ENCODER 0 -+#define CONFIG_ADPCM_MS_ENCODER 0 -+#define CONFIG_ADPCM_SWF_ENCODER 0 -+#define CONFIG_ADPCM_YAMAHA_ENCODER 0 -+#define CONFIG_SSA_ENCODER 0 -+#define CONFIG_ASS_ENCODER 0 -+#define CONFIG_DVBSUB_ENCODER 0 -+#define CONFIG_DVDSUB_ENCODER 0 -+#define CONFIG_MOVTEXT_ENCODER 0 -+#define CONFIG_SRT_ENCODER 0 -+#define CONFIG_SUBRIP_ENCODER 0 -+#define CONFIG_TEXT_ENCODER 0 -+#define CONFIG_TTML_ENCODER 0 -+#define CONFIG_WEBVTT_ENCODER 0 -+#define CONFIG_XSUB_ENCODER 0 -+#define CONFIG_AAC_AT_ENCODER 0 -+#define CONFIG_ALAC_AT_ENCODER 0 -+#define CONFIG_ILBC_AT_ENCODER 0 -+#define CONFIG_PCM_ALAW_AT_ENCODER 0 -+#define CONFIG_PCM_MULAW_AT_ENCODER 0 -+#define CONFIG_LIBAOM_AV1_ENCODER 0 -+#define CONFIG_LIBCODEC2_ENCODER 0 -+#define CONFIG_LIBFDK_AAC_ENCODER 0 -+#define CONFIG_LIBGSM_ENCODER 0 -+#define CONFIG_LIBGSM_MS_ENCODER 0 -+#define CONFIG_LIBILBC_ENCODER 0 -+#define CONFIG_LIBMP3LAME_ENCODER 0 -+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 -+#define CONFIG_LIBOPENJPEG_ENCODER 0 -+#define CONFIG_LIBOPUS_ENCODER 0 -+#define CONFIG_LIBRAV1E_ENCODER 0 -+#define CONFIG_LIBSHINE_ENCODER 0 -+#define CONFIG_LIBSPEEX_ENCODER 0 -+#define CONFIG_LIBSVTAV1_ENCODER 0 -+#define CONFIG_LIBTHEORA_ENCODER 0 -+#define CONFIG_LIBTWOLAME_ENCODER 0 -+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0 -+#define CONFIG_LIBVORBIS_ENCODER 0 -+#define CONFIG_LIBVPX_VP8_ENCODER 0 -+#define CONFIG_LIBVPX_VP9_ENCODER 0 -+#define CONFIG_LIBWEBP_ANIM_ENCODER 0 -+#define CONFIG_LIBWEBP_ENCODER 0 -+#define CONFIG_LIBX262_ENCODER 0 -+#define CONFIG_LIBX264_ENCODER 0 -+#define CONFIG_LIBX264RGB_ENCODER 0 -+#define CONFIG_LIBX265_ENCODER 0 -+#define CONFIG_LIBXAVS_ENCODER 0 -+#define CONFIG_LIBXAVS2_ENCODER 0 -+#define CONFIG_LIBXVID_ENCODER 0 -+#define CONFIG_AAC_MF_ENCODER 0 -+#define CONFIG_AC3_MF_ENCODER 0 -+#define CONFIG_H263_V4L2M2M_ENCODER 0 -+#define CONFIG_LIBOPENH264_ENCODER 0 -+#define CONFIG_H264_AMF_ENCODER 0 -+#define CONFIG_H264_MF_ENCODER 0 -+#define CONFIG_H264_NVENC_ENCODER 0 -+#define CONFIG_H264_OMX_ENCODER 0 -+#define CONFIG_H264_QSV_ENCODER 0 -+#define CONFIG_H264_V4L2M2M_ENCODER 0 -+#define CONFIG_H264_VAAPI_ENCODER 0 -+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_HEVC_AMF_ENCODER 0 -+#define CONFIG_HEVC_MF_ENCODER 0 -+#define CONFIG_HEVC_NVENC_ENCODER 0 -+#define CONFIG_HEVC_QSV_ENCODER 0 -+#define CONFIG_HEVC_V4L2M2M_ENCODER 0 -+#define CONFIG_HEVC_VAAPI_ENCODER 0 -+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_LIBKVAZAAR_ENCODER 0 -+#define CONFIG_MJPEG_QSV_ENCODER 0 -+#define CONFIG_MJPEG_VAAPI_ENCODER 0 -+#define CONFIG_MP3_MF_ENCODER 0 -+#define CONFIG_MPEG2_QSV_ENCODER 0 -+#define CONFIG_MPEG2_VAAPI_ENCODER 0 -+#define CONFIG_MPEG4_OMX_ENCODER 0 -+#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 -+#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 -+#define CONFIG_VP8_V4L2M2M_ENCODER 0 -+#define CONFIG_VP8_VAAPI_ENCODER 0 -+#define CONFIG_VP9_VAAPI_ENCODER 0 -+#define CONFIG_VP9_QSV_ENCODER 0 -+#define CONFIG_AV1_D3D11VA_HWACCEL 0 -+#define CONFIG_AV1_D3D11VA2_HWACCEL 0 -+#define CONFIG_AV1_DXVA2_HWACCEL 0 -+#define CONFIG_AV1_NVDEC_HWACCEL 0 -+#define CONFIG_AV1_VAAPI_HWACCEL 0 -+#define CONFIG_H263_VAAPI_HWACCEL 0 -+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_H264_D3D11VA_HWACCEL 0 -+#define CONFIG_H264_D3D11VA2_HWACCEL 0 -+#define CONFIG_H264_DXVA2_HWACCEL 0 -+#define CONFIG_H264_NVDEC_HWACCEL 0 -+#define CONFIG_H264_VAAPI_HWACCEL 0 -+#define CONFIG_H264_VDPAU_HWACCEL 0 -+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_HEVC_D3D11VA_HWACCEL 0 -+#define CONFIG_HEVC_D3D11VA2_HWACCEL 0 -+#define CONFIG_HEVC_DXVA2_HWACCEL 0 -+#define CONFIG_HEVC_NVDEC_HWACCEL 0 -+#define CONFIG_HEVC_VAAPI_HWACCEL 0 -+#define CONFIG_HEVC_VDPAU_HWACCEL 0 -+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MJPEG_NVDEC_HWACCEL 0 -+#define CONFIG_MJPEG_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG1_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG1_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MPEG1_XVMC_HWACCEL 0 -+#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 -+#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 -+#define CONFIG_MPEG2_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG2_DXVA2_HWACCEL 0 -+#define CONFIG_MPEG2_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG2_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_MPEG2_XVMC_HWACCEL 0 -+#define CONFIG_MPEG4_NVDEC_HWACCEL 0 -+#define CONFIG_MPEG4_VAAPI_HWACCEL 0 -+#define CONFIG_MPEG4_VDPAU_HWACCEL 0 -+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_VC1_D3D11VA_HWACCEL 0 -+#define CONFIG_VC1_D3D11VA2_HWACCEL 0 -+#define CONFIG_VC1_DXVA2_HWACCEL 0 -+#define CONFIG_VC1_NVDEC_HWACCEL 0 -+#define CONFIG_VC1_VAAPI_HWACCEL 0 -+#define CONFIG_VC1_VDPAU_HWACCEL 0 -+#define CONFIG_VP8_NVDEC_HWACCEL 0 -+#define CONFIG_VP8_VAAPI_HWACCEL 0 -+#define CONFIG_VP9_D3D11VA_HWACCEL 0 -+#define CONFIG_VP9_D3D11VA2_HWACCEL 0 -+#define CONFIG_VP9_DXVA2_HWACCEL 0 -+#define CONFIG_VP9_NVDEC_HWACCEL 0 -+#define CONFIG_VP9_VAAPI_HWACCEL 0 -+#define CONFIG_VP9_VDPAU_HWACCEL 0 -+#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 -+#define CONFIG_WMV3_D3D11VA_HWACCEL 0 -+#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 -+#define CONFIG_WMV3_DXVA2_HWACCEL 0 -+#define CONFIG_WMV3_NVDEC_HWACCEL 0 -+#define CONFIG_WMV3_VAAPI_HWACCEL 0 -+#define CONFIG_WMV3_VDPAU_HWACCEL 0 -+#define CONFIG_AAC_PARSER 1 -+#define CONFIG_AAC_LATM_PARSER 0 -+#define CONFIG_AC3_PARSER 0 -+#define CONFIG_ADX_PARSER 0 -+#define CONFIG_AMR_PARSER 0 -+#define CONFIG_AV1_PARSER 0 -+#define CONFIG_AVS2_PARSER 0 -+#define CONFIG_AVS3_PARSER 0 -+#define CONFIG_BMP_PARSER 0 -+#define CONFIG_CAVSVIDEO_PARSER 0 -+#define CONFIG_COOK_PARSER 0 -+#define CONFIG_CRI_PARSER 0 -+#define CONFIG_DCA_PARSER 0 -+#define CONFIG_DIRAC_PARSER 0 -+#define CONFIG_DNXHD_PARSER 0 -+#define CONFIG_DOLBY_E_PARSER 0 -+#define CONFIG_DPX_PARSER 0 -+#define CONFIG_DVAUDIO_PARSER 0 -+#define CONFIG_DVBSUB_PARSER 0 -+#define CONFIG_DVDSUB_PARSER 0 -+#define CONFIG_DVD_NAV_PARSER 0 -+#define CONFIG_FLAC_PARSER 1 -+#define CONFIG_G723_1_PARSER 0 -+#define CONFIG_G729_PARSER 0 -+#define CONFIG_GIF_PARSER 0 -+#define CONFIG_GSM_PARSER 0 -+#define CONFIG_H261_PARSER 0 -+#define CONFIG_H263_PARSER 0 -+#define CONFIG_H264_PARSER 1 -+#define CONFIG_HEVC_PARSER 0 -+#define CONFIG_IPU_PARSER 0 -+#define CONFIG_JPEG2000_PARSER 0 -+#define CONFIG_MJPEG_PARSER 0 -+#define CONFIG_MLP_PARSER 0 -+#define CONFIG_MPEG4VIDEO_PARSER 0 -+#define CONFIG_MPEGAUDIO_PARSER 1 -+#define CONFIG_MPEGVIDEO_PARSER 0 -+#define CONFIG_OPUS_PARSER 1 -+#define CONFIG_PNG_PARSER 0 -+#define CONFIG_PNM_PARSER 0 -+#define CONFIG_RV30_PARSER 0 -+#define CONFIG_RV40_PARSER 0 -+#define CONFIG_SBC_PARSER 0 -+#define CONFIG_SIPR_PARSER 0 -+#define CONFIG_TAK_PARSER 0 -+#define CONFIG_VC1_PARSER 0 -+#define CONFIG_VORBIS_PARSER 1 -+#define CONFIG_VP3_PARSER 1 -+#define CONFIG_VP8_PARSER 1 -+#define CONFIG_VP9_PARSER 1 -+#define CONFIG_WEBP_PARSER 0 -+#define CONFIG_XBM_PARSER 0 -+#define CONFIG_XMA_PARSER 0 -+#define CONFIG_ALSA_INDEV 0 -+#define CONFIG_ANDROID_CAMERA_INDEV 0 -+#define CONFIG_AVFOUNDATION_INDEV 0 -+#define CONFIG_BKTR_INDEV 0 -+#define CONFIG_DECKLINK_INDEV 0 -+#define CONFIG_DSHOW_INDEV 0 -+#define CONFIG_FBDEV_INDEV 0 -+#define CONFIG_GDIGRAB_INDEV 0 -+#define CONFIG_IEC61883_INDEV 0 -+#define CONFIG_JACK_INDEV 0 -+#define CONFIG_KMSGRAB_INDEV 0 -+#define CONFIG_LAVFI_INDEV 0 -+#define CONFIG_OPENAL_INDEV 0 -+#define CONFIG_OSS_INDEV 0 -+#define CONFIG_PULSE_INDEV 0 -+#define CONFIG_SNDIO_INDEV 0 -+#define CONFIG_V4L2_INDEV 0 -+#define CONFIG_VFWCAP_INDEV 0 -+#define CONFIG_XCBGRAB_INDEV 0 -+#define CONFIG_LIBCDIO_INDEV 0 -+#define CONFIG_LIBDC1394_INDEV 0 -+#define CONFIG_ALSA_OUTDEV 0 -+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0 -+#define CONFIG_CACA_OUTDEV 0 -+#define CONFIG_DECKLINK_OUTDEV 0 -+#define CONFIG_FBDEV_OUTDEV 0 -+#define CONFIG_OPENGL_OUTDEV 0 -+#define CONFIG_OSS_OUTDEV 0 -+#define CONFIG_PULSE_OUTDEV 0 -+#define CONFIG_SDL2_OUTDEV 0 -+#define CONFIG_SNDIO_OUTDEV 0 -+#define CONFIG_V4L2_OUTDEV 0 -+#define CONFIG_XV_OUTDEV 0 -+#define CONFIG_ABENCH_FILTER 0 -+#define CONFIG_ACOMPRESSOR_FILTER 0 -+#define CONFIG_ACONTRAST_FILTER 0 -+#define CONFIG_ACOPY_FILTER 0 -+#define CONFIG_ACUE_FILTER 0 -+#define CONFIG_ACROSSFADE_FILTER 0 -+#define CONFIG_ACROSSOVER_FILTER 0 -+#define CONFIG_ACRUSHER_FILTER 0 -+#define CONFIG_ADECLICK_FILTER 0 -+#define CONFIG_ADECLIP_FILTER 0 -+#define CONFIG_ADECORRELATE_FILTER 0 -+#define CONFIG_ADELAY_FILTER 0 -+#define CONFIG_ADENORM_FILTER 0 -+#define CONFIG_ADERIVATIVE_FILTER 0 -+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 -+#define CONFIG_ADYNAMICSMOOTH_FILTER 0 -+#define CONFIG_AECHO_FILTER 0 -+#define CONFIG_AEMPHASIS_FILTER 0 -+#define CONFIG_AEVAL_FILTER 0 -+#define CONFIG_AEXCITER_FILTER 0 -+#define CONFIG_AFADE_FILTER 0 -+#define CONFIG_AFFTDN_FILTER 0 -+#define CONFIG_AFFTFILT_FILTER 0 -+#define CONFIG_AFIR_FILTER 0 -+#define CONFIG_AFORMAT_FILTER 0 -+#define CONFIG_AFREQSHIFT_FILTER 0 -+#define CONFIG_AFWTDN_FILTER 0 -+#define CONFIG_AGATE_FILTER 0 -+#define CONFIG_AIIR_FILTER 0 -+#define CONFIG_AINTEGRAL_FILTER 0 -+#define CONFIG_AINTERLEAVE_FILTER 0 -+#define CONFIG_ALATENCY_FILTER 0 -+#define CONFIG_ALIMITER_FILTER 0 -+#define CONFIG_ALLPASS_FILTER 0 -+#define CONFIG_ALOOP_FILTER 0 -+#define CONFIG_AMERGE_FILTER 0 -+#define CONFIG_AMETADATA_FILTER 0 -+#define CONFIG_AMIX_FILTER 0 -+#define CONFIG_AMULTIPLY_FILTER 0 -+#define CONFIG_ANEQUALIZER_FILTER 0 -+#define CONFIG_ANLMDN_FILTER 0 -+#define CONFIG_ANLMF_FILTER 0 -+#define CONFIG_ANLMS_FILTER 0 -+#define CONFIG_ANULL_FILTER 0 -+#define CONFIG_APAD_FILTER 0 -+#define CONFIG_APERMS_FILTER 0 -+#define CONFIG_APHASER_FILTER 0 -+#define CONFIG_APHASESHIFT_FILTER 0 -+#define CONFIG_APSYCLIP_FILTER 0 -+#define CONFIG_APULSATOR_FILTER 0 -+#define CONFIG_AREALTIME_FILTER 0 -+#define CONFIG_ARESAMPLE_FILTER 0 -+#define CONFIG_AREVERSE_FILTER 0 -+#define CONFIG_ARNNDN_FILTER 0 -+#define CONFIG_ASDR_FILTER 0 -+#define CONFIG_ASEGMENT_FILTER 0 -+#define CONFIG_ASELECT_FILTER 0 -+#define CONFIG_ASENDCMD_FILTER 0 -+#define CONFIG_ASETNSAMPLES_FILTER 0 -+#define CONFIG_ASETPTS_FILTER 0 -+#define CONFIG_ASETRATE_FILTER 0 -+#define CONFIG_ASETTB_FILTER 0 -+#define CONFIG_ASHOWINFO_FILTER 0 -+#define CONFIG_ASIDEDATA_FILTER 0 -+#define CONFIG_ASOFTCLIP_FILTER 0 -+#define CONFIG_ASPECTRALSTATS_FILTER 0 -+#define CONFIG_ASPLIT_FILTER 0 -+#define CONFIG_ASR_FILTER 0 -+#define CONFIG_ASTATS_FILTER 0 -+#define CONFIG_ASTREAMSELECT_FILTER 0 -+#define CONFIG_ASUBBOOST_FILTER 0 -+#define CONFIG_ASUBCUT_FILTER 0 -+#define CONFIG_ASUPERCUT_FILTER 0 -+#define CONFIG_ASUPERPASS_FILTER 0 -+#define CONFIG_ASUPERSTOP_FILTER 0 -+#define CONFIG_ATEMPO_FILTER 0 -+#define CONFIG_ATILT_FILTER 0 -+#define CONFIG_ATRIM_FILTER 0 -+#define CONFIG_AXCORRELATE_FILTER 0 -+#define CONFIG_AZMQ_FILTER 0 -+#define CONFIG_BANDPASS_FILTER 0 -+#define CONFIG_BANDREJECT_FILTER 0 -+#define CONFIG_BASS_FILTER 0 -+#define CONFIG_BIQUAD_FILTER 0 -+#define CONFIG_BS2B_FILTER 0 -+#define CONFIG_CHANNELMAP_FILTER 0 -+#define CONFIG_CHANNELSPLIT_FILTER 0 -+#define CONFIG_CHORUS_FILTER 0 -+#define CONFIG_COMPAND_FILTER 0 -+#define CONFIG_COMPENSATIONDELAY_FILTER 0 -+#define CONFIG_CROSSFEED_FILTER 0 -+#define CONFIG_CRYSTALIZER_FILTER 0 -+#define CONFIG_DCSHIFT_FILTER 0 -+#define CONFIG_DEESSER_FILTER 0 -+#define CONFIG_DRMETER_FILTER 0 -+#define CONFIG_DYNAUDNORM_FILTER 0 -+#define CONFIG_EARWAX_FILTER 0 -+#define CONFIG_EBUR128_FILTER 0 -+#define CONFIG_EQUALIZER_FILTER 0 -+#define CONFIG_EXTRASTEREO_FILTER 0 -+#define CONFIG_FIREQUALIZER_FILTER 0 -+#define CONFIG_FLANGER_FILTER 0 -+#define CONFIG_HAAS_FILTER 0 -+#define CONFIG_HDCD_FILTER 0 -+#define CONFIG_HEADPHONE_FILTER 0 -+#define CONFIG_HIGHPASS_FILTER 0 -+#define CONFIG_HIGHSHELF_FILTER 0 -+#define CONFIG_JOIN_FILTER 0 -+#define CONFIG_LADSPA_FILTER 0 -+#define CONFIG_LOUDNORM_FILTER 0 -+#define CONFIG_LOWPASS_FILTER 0 -+#define CONFIG_LOWSHELF_FILTER 0 -+#define CONFIG_LV2_FILTER 0 -+#define CONFIG_MCOMPAND_FILTER 0 -+#define CONFIG_PAN_FILTER 0 -+#define CONFIG_REPLAYGAIN_FILTER 0 -+#define CONFIG_RUBBERBAND_FILTER 0 -+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 -+#define CONFIG_SIDECHAINGATE_FILTER 0 -+#define CONFIG_SILENCEDETECT_FILTER 0 -+#define CONFIG_SILENCEREMOVE_FILTER 0 -+#define CONFIG_SOFALIZER_FILTER 0 -+#define CONFIG_SPEECHNORM_FILTER 0 -+#define CONFIG_STEREOTOOLS_FILTER 0 -+#define CONFIG_STEREOWIDEN_FILTER 0 -+#define CONFIG_SUPEREQUALIZER_FILTER 0 -+#define CONFIG_SURROUND_FILTER 0 -+#define CONFIG_TREBLE_FILTER 0 -+#define CONFIG_TREMOLO_FILTER 0 -+#define CONFIG_VIBRATO_FILTER 0 -+#define CONFIG_VOLUME_FILTER 0 -+#define CONFIG_VOLUMEDETECT_FILTER 0 -+#define CONFIG_AEVALSRC_FILTER 0 -+#define CONFIG_AFIRSRC_FILTER 0 -+#define CONFIG_ANOISESRC_FILTER 0 -+#define CONFIG_ANULLSRC_FILTER 0 -+#define CONFIG_FLITE_FILTER 0 -+#define CONFIG_HILBERT_FILTER 0 -+#define CONFIG_SINC_FILTER 0 -+#define CONFIG_SINE_FILTER 0 -+#define CONFIG_ANULLSINK_FILTER 0 -+#define CONFIG_ADDROI_FILTER 0 -+#define CONFIG_ALPHAEXTRACT_FILTER 0 -+#define CONFIG_ALPHAMERGE_FILTER 0 -+#define CONFIG_AMPLIFY_FILTER 0 -+#define CONFIG_ASS_FILTER 0 -+#define CONFIG_ATADENOISE_FILTER 0 -+#define CONFIG_AVGBLUR_FILTER 0 -+#define CONFIG_AVGBLUR_OPENCL_FILTER 0 -+#define CONFIG_AVGBLUR_VULKAN_FILTER 0 -+#define CONFIG_BBOX_FILTER 0 -+#define CONFIG_BENCH_FILTER 0 -+#define CONFIG_BILATERAL_FILTER 0 -+#define CONFIG_BITPLANENOISE_FILTER 0 -+#define CONFIG_BLACKDETECT_FILTER 0 -+#define CONFIG_BLACKFRAME_FILTER 0 -+#define CONFIG_BLEND_FILTER 0 -+#define CONFIG_BLEND_VULKAN_FILTER 0 -+#define CONFIG_BM3D_FILTER 0 -+#define CONFIG_BOXBLUR_FILTER 0 -+#define CONFIG_BOXBLUR_OPENCL_FILTER 0 -+#define CONFIG_BWDIF_FILTER 0 -+#define CONFIG_CAS_FILTER 0 -+#define CONFIG_CHROMABER_VULKAN_FILTER 0 -+#define CONFIG_CHROMAHOLD_FILTER 0 -+#define CONFIG_CHROMAKEY_FILTER 0 -+#define CONFIG_CHROMANR_FILTER 0 -+#define CONFIG_CHROMASHIFT_FILTER 0 -+#define CONFIG_CIESCOPE_FILTER 0 -+#define CONFIG_CODECVIEW_FILTER 0 -+#define CONFIG_COLORBALANCE_FILTER 0 -+#define CONFIG_COLORCHANNELMIXER_FILTER 0 -+#define CONFIG_COLORCONTRAST_FILTER 0 -+#define CONFIG_COLORCORRECT_FILTER 0 -+#define CONFIG_COLORIZE_FILTER 0 -+#define CONFIG_COLORKEY_FILTER 0 -+#define CONFIG_COLORKEY_OPENCL_FILTER 0 -+#define CONFIG_COLORHOLD_FILTER 0 -+#define CONFIG_COLORLEVELS_FILTER 0 -+#define CONFIG_COLORMATRIX_FILTER 0 -+#define CONFIG_COLORSPACE_FILTER 0 -+#define CONFIG_COLORTEMPERATURE_FILTER 0 -+#define CONFIG_CONVOLUTION_FILTER 0 -+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 -+#define CONFIG_CONVOLVE_FILTER 0 -+#define CONFIG_COPY_FILTER 0 -+#define CONFIG_COREIMAGE_FILTER 0 -+#define CONFIG_COVER_RECT_FILTER 0 -+#define CONFIG_CROP_FILTER 0 -+#define CONFIG_CROPDETECT_FILTER 0 -+#define CONFIG_CUE_FILTER 0 -+#define CONFIG_CURVES_FILTER 0 -+#define CONFIG_DATASCOPE_FILTER 0 -+#define CONFIG_DBLUR_FILTER 0 -+#define CONFIG_DCTDNOIZ_FILTER 0 -+#define CONFIG_DEBAND_FILTER 0 -+#define CONFIG_DEBLOCK_FILTER 0 -+#define CONFIG_DECIMATE_FILTER 0 -+#define CONFIG_DECONVOLVE_FILTER 0 -+#define CONFIG_DEDOT_FILTER 0 -+#define CONFIG_DEFLATE_FILTER 0 -+#define CONFIG_DEFLICKER_FILTER 0 -+#define CONFIG_DEINTERLACE_QSV_FILTER 0 -+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0 -+#define CONFIG_DEJUDDER_FILTER 0 -+#define CONFIG_DELOGO_FILTER 0 -+#define CONFIG_DENOISE_VAAPI_FILTER 0 -+#define CONFIG_DERAIN_FILTER 0 -+#define CONFIG_DESHAKE_FILTER 0 -+#define CONFIG_DESHAKE_OPENCL_FILTER 0 -+#define CONFIG_DESPILL_FILTER 0 -+#define CONFIG_DETELECINE_FILTER 0 -+#define CONFIG_DILATION_FILTER 0 -+#define CONFIG_DILATION_OPENCL_FILTER 0 -+#define CONFIG_DISPLACE_FILTER 0 -+#define CONFIG_DNN_CLASSIFY_FILTER 0 -+#define CONFIG_DNN_DETECT_FILTER 0 -+#define CONFIG_DNN_PROCESSING_FILTER 0 -+#define CONFIG_DOUBLEWEAVE_FILTER 0 -+#define CONFIG_DRAWBOX_FILTER 0 -+#define CONFIG_DRAWGRAPH_FILTER 0 -+#define CONFIG_DRAWGRID_FILTER 0 -+#define CONFIG_DRAWTEXT_FILTER 0 -+#define CONFIG_EDGEDETECT_FILTER 0 -+#define CONFIG_ELBG_FILTER 0 -+#define CONFIG_ENTROPY_FILTER 0 -+#define CONFIG_EPX_FILTER 0 -+#define CONFIG_EQ_FILTER 0 -+#define CONFIG_EROSION_FILTER 0 -+#define CONFIG_EROSION_OPENCL_FILTER 0 -+#define CONFIG_ESTDIF_FILTER 0 -+#define CONFIG_EXPOSURE_FILTER 0 -+#define CONFIG_EXTRACTPLANES_FILTER 0 -+#define CONFIG_FADE_FILTER 0 -+#define CONFIG_FFTDNOIZ_FILTER 0 -+#define CONFIG_FFTFILT_FILTER 0 -+#define CONFIG_FIELD_FILTER 0 -+#define CONFIG_FIELDHINT_FILTER 0 -+#define CONFIG_FIELDMATCH_FILTER 0 -+#define CONFIG_FIELDORDER_FILTER 0 -+#define CONFIG_FILLBORDERS_FILTER 0 -+#define CONFIG_FIND_RECT_FILTER 0 -+#define CONFIG_FLIP_VULKAN_FILTER 0 -+#define CONFIG_FLOODFILL_FILTER 0 -+#define CONFIG_FORMAT_FILTER 0 -+#define CONFIG_FPS_FILTER 0 -+#define CONFIG_FRAMEPACK_FILTER 0 -+#define CONFIG_FRAMERATE_FILTER 0 -+#define CONFIG_FRAMESTEP_FILTER 0 -+#define CONFIG_FREEZEDETECT_FILTER 0 -+#define CONFIG_FREEZEFRAMES_FILTER 0 -+#define CONFIG_FREI0R_FILTER 0 -+#define CONFIG_FSPP_FILTER 0 -+#define CONFIG_GBLUR_FILTER 0 -+#define CONFIG_GBLUR_VULKAN_FILTER 0 -+#define CONFIG_GEQ_FILTER 0 -+#define CONFIG_GRADFUN_FILTER 0 -+#define CONFIG_GRAPHMONITOR_FILTER 0 -+#define CONFIG_GRAYWORLD_FILTER 0 -+#define CONFIG_GREYEDGE_FILTER 0 -+#define CONFIG_GUIDED_FILTER 0 -+#define CONFIG_HALDCLUT_FILTER 0 -+#define CONFIG_HFLIP_FILTER 0 -+#define CONFIG_HFLIP_VULKAN_FILTER 0 -+#define CONFIG_HISTEQ_FILTER 0 -+#define CONFIG_HISTOGRAM_FILTER 0 -+#define CONFIG_HQDN3D_FILTER 0 -+#define CONFIG_HQX_FILTER 0 -+#define CONFIG_HSTACK_FILTER 0 -+#define CONFIG_HSVHOLD_FILTER 0 -+#define CONFIG_HSVKEY_FILTER 0 -+#define CONFIG_HUE_FILTER 0 -+#define CONFIG_HUESATURATION_FILTER 0 -+#define CONFIG_HWDOWNLOAD_FILTER 0 -+#define CONFIG_HWMAP_FILTER 0 -+#define CONFIG_HWUPLOAD_FILTER 0 -+#define CONFIG_HWUPLOAD_CUDA_FILTER 0 -+#define CONFIG_HYSTERESIS_FILTER 0 -+#define CONFIG_IDENTITY_FILTER 0 -+#define CONFIG_IDET_FILTER 0 -+#define CONFIG_IL_FILTER 0 -+#define CONFIG_INFLATE_FILTER 0 -+#define CONFIG_INTERLACE_FILTER 0 -+#define CONFIG_INTERLEAVE_FILTER 0 -+#define CONFIG_KERNDEINT_FILTER 0 -+#define CONFIG_KIRSCH_FILTER 0 -+#define CONFIG_LAGFUN_FILTER 0 -+#define CONFIG_LATENCY_FILTER 0 -+#define CONFIG_LENSCORRECTION_FILTER 0 -+#define CONFIG_LENSFUN_FILTER 0 -+#define CONFIG_LIBPLACEBO_FILTER 0 -+#define CONFIG_LIBVMAF_FILTER 0 -+#define CONFIG_LIMITDIFF_FILTER 0 -+#define CONFIG_LIMITER_FILTER 0 -+#define CONFIG_LOOP_FILTER 0 -+#define CONFIG_LUMAKEY_FILTER 0 -+#define CONFIG_LUT_FILTER 0 -+#define CONFIG_LUT1D_FILTER 0 -+#define CONFIG_LUT2_FILTER 0 -+#define CONFIG_LUT3D_FILTER 0 -+#define CONFIG_LUTRGB_FILTER 0 -+#define CONFIG_LUTYUV_FILTER 0 -+#define CONFIG_MASKEDCLAMP_FILTER 0 -+#define CONFIG_MASKEDMAX_FILTER 0 -+#define CONFIG_MASKEDMERGE_FILTER 0 -+#define CONFIG_MASKEDMIN_FILTER 0 -+#define CONFIG_MASKEDTHRESHOLD_FILTER 0 -+#define CONFIG_MASKFUN_FILTER 0 -+#define CONFIG_MCDEINT_FILTER 0 -+#define CONFIG_MEDIAN_FILTER 0 -+#define CONFIG_MERGEPLANES_FILTER 0 -+#define CONFIG_MESTIMATE_FILTER 0 -+#define CONFIG_METADATA_FILTER 0 -+#define CONFIG_MIDEQUALIZER_FILTER 0 -+#define CONFIG_MINTERPOLATE_FILTER 0 -+#define CONFIG_MIX_FILTER 0 -+#define CONFIG_MONOCHROME_FILTER 0 -+#define CONFIG_MORPHO_FILTER 0 -+#define CONFIG_MPDECIMATE_FILTER 0 -+#define CONFIG_MSAD_FILTER 0 -+#define CONFIG_NEGATE_FILTER 0 -+#define CONFIG_NLMEANS_FILTER 0 -+#define CONFIG_NLMEANS_OPENCL_FILTER 0 -+#define CONFIG_NNEDI_FILTER 0 -+#define CONFIG_NOFORMAT_FILTER 0 -+#define CONFIG_NOISE_FILTER 0 -+#define CONFIG_NORMALIZE_FILTER 0 -+#define CONFIG_NULL_FILTER 0 -+#define CONFIG_OCR_FILTER 0 -+#define CONFIG_OCV_FILTER 0 -+#define CONFIG_OSCILLOSCOPE_FILTER 0 -+#define CONFIG_OVERLAY_FILTER 0 -+#define CONFIG_OVERLAY_OPENCL_FILTER 0 -+#define CONFIG_OVERLAY_QSV_FILTER 0 -+#define CONFIG_OVERLAY_VAAPI_FILTER 0 -+#define CONFIG_OVERLAY_VULKAN_FILTER 0 -+#define CONFIG_OVERLAY_CUDA_FILTER 0 -+#define CONFIG_OWDENOISE_FILTER 0 -+#define CONFIG_PAD_FILTER 0 -+#define CONFIG_PAD_OPENCL_FILTER 0 -+#define CONFIG_PALETTEGEN_FILTER 0 -+#define CONFIG_PALETTEUSE_FILTER 0 -+#define CONFIG_PERMS_FILTER 0 -+#define CONFIG_PERSPECTIVE_FILTER 0 -+#define CONFIG_PHASE_FILTER 0 -+#define CONFIG_PHOTOSENSITIVITY_FILTER 0 -+#define CONFIG_PIXDESCTEST_FILTER 0 -+#define CONFIG_PIXSCOPE_FILTER 0 -+#define CONFIG_PP_FILTER 0 -+#define CONFIG_PP7_FILTER 0 -+#define CONFIG_PREMULTIPLY_FILTER 0 -+#define CONFIG_PREWITT_FILTER 0 -+#define CONFIG_PREWITT_OPENCL_FILTER 0 -+#define CONFIG_PROCAMP_VAAPI_FILTER 0 -+#define CONFIG_PROGRAM_OPENCL_FILTER 0 -+#define CONFIG_PSEUDOCOLOR_FILTER 0 -+#define CONFIG_PSNR_FILTER 0 -+#define CONFIG_PULLUP_FILTER 0 -+#define CONFIG_QP_FILTER 0 -+#define CONFIG_RANDOM_FILTER 0 -+#define CONFIG_READEIA608_FILTER 0 -+#define CONFIG_READVITC_FILTER 0 -+#define CONFIG_REALTIME_FILTER 0 -+#define CONFIG_REMAP_FILTER 0 -+#define CONFIG_REMOVEGRAIN_FILTER 0 -+#define CONFIG_REMOVELOGO_FILTER 0 -+#define CONFIG_REPEATFIELDS_FILTER 0 -+#define CONFIG_REVERSE_FILTER 0 -+#define CONFIG_RGBASHIFT_FILTER 0 -+#define CONFIG_ROBERTS_FILTER 0 -+#define CONFIG_ROBERTS_OPENCL_FILTER 0 -+#define CONFIG_ROTATE_FILTER 0 -+#define CONFIG_SAB_FILTER 0 -+#define CONFIG_SCALE_FILTER 0 -+#define CONFIG_SCALE_CUDA_FILTER 0 -+#define CONFIG_SCALE_NPP_FILTER 0 -+#define CONFIG_SCALE_QSV_FILTER 0 -+#define CONFIG_SCALE_VAAPI_FILTER 0 -+#define CONFIG_SCALE_VULKAN_FILTER 0 -+#define CONFIG_SCALE2REF_FILTER 0 -+#define CONFIG_SCALE2REF_NPP_FILTER 0 -+#define CONFIG_SCDET_FILTER 0 -+#define CONFIG_SCHARR_FILTER 0 -+#define CONFIG_SCROLL_FILTER 0 -+#define CONFIG_SEGMENT_FILTER 0 -+#define CONFIG_SELECT_FILTER 0 -+#define CONFIG_SELECTIVECOLOR_FILTER 0 -+#define CONFIG_SENDCMD_FILTER 0 -+#define CONFIG_SEPARATEFIELDS_FILTER 0 -+#define CONFIG_SETDAR_FILTER 0 -+#define CONFIG_SETFIELD_FILTER 0 -+#define CONFIG_SETPARAMS_FILTER 0 -+#define CONFIG_SETPTS_FILTER 0 -+#define CONFIG_SETRANGE_FILTER 0 -+#define CONFIG_SETSAR_FILTER 0 -+#define CONFIG_SETTB_FILTER 0 -+#define CONFIG_SHARPEN_NPP_FILTER 0 -+#define CONFIG_SHARPNESS_VAAPI_FILTER 0 -+#define CONFIG_SHEAR_FILTER 0 -+#define CONFIG_SHOWINFO_FILTER 0 -+#define CONFIG_SHOWPALETTE_FILTER 0 -+#define CONFIG_SHUFFLEFRAMES_FILTER 0 -+#define CONFIG_SHUFFLEPIXELS_FILTER 0 -+#define CONFIG_SHUFFLEPLANES_FILTER 0 -+#define CONFIG_SIDEDATA_FILTER 0 -+#define CONFIG_SIGNALSTATS_FILTER 0 -+#define CONFIG_SIGNATURE_FILTER 0 -+#define CONFIG_SMARTBLUR_FILTER 0 -+#define CONFIG_SOBEL_FILTER 0 -+#define CONFIG_SOBEL_OPENCL_FILTER 0 -+#define CONFIG_SPLIT_FILTER 0 -+#define CONFIG_SPP_FILTER 0 -+#define CONFIG_SR_FILTER 0 -+#define CONFIG_SSIM_FILTER 0 -+#define CONFIG_STEREO3D_FILTER 0 -+#define CONFIG_STREAMSELECT_FILTER 0 -+#define CONFIG_SUBTITLES_FILTER 0 -+#define CONFIG_SUPER2XSAI_FILTER 0 -+#define CONFIG_SWAPRECT_FILTER 0 -+#define CONFIG_SWAPUV_FILTER 0 -+#define CONFIG_TBLEND_FILTER 0 -+#define CONFIG_TELECINE_FILTER 0 -+#define CONFIG_THISTOGRAM_FILTER 0 -+#define CONFIG_THRESHOLD_FILTER 0 -+#define CONFIG_THUMBNAIL_FILTER 0 -+#define CONFIG_THUMBNAIL_CUDA_FILTER 0 -+#define CONFIG_TILE_FILTER 0 -+#define CONFIG_TINTERLACE_FILTER 0 -+#define CONFIG_TLUT2_FILTER 0 -+#define CONFIG_TMEDIAN_FILTER 0 -+#define CONFIG_TMIDEQUALIZER_FILTER 0 -+#define CONFIG_TMIX_FILTER 0 -+#define CONFIG_TONEMAP_FILTER 0 -+#define CONFIG_TONEMAP_OPENCL_FILTER 0 -+#define CONFIG_TONEMAP_VAAPI_FILTER 0 -+#define CONFIG_TPAD_FILTER 0 -+#define CONFIG_TRANSPOSE_FILTER 0 -+#define CONFIG_TRANSPOSE_NPP_FILTER 0 -+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 -+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 -+#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 -+#define CONFIG_TRIM_FILTER 0 -+#define CONFIG_UNPREMULTIPLY_FILTER 0 -+#define CONFIG_UNSHARP_FILTER 0 -+#define CONFIG_UNSHARP_OPENCL_FILTER 0 -+#define CONFIG_UNTILE_FILTER 0 -+#define CONFIG_USPP_FILTER 0 -+#define CONFIG_V360_FILTER 0 -+#define CONFIG_VAGUEDENOISER_FILTER 0 -+#define CONFIG_VARBLUR_FILTER 0 -+#define CONFIG_VECTORSCOPE_FILTER 0 -+#define CONFIG_VFLIP_FILTER 0 -+#define CONFIG_VFLIP_VULKAN_FILTER 0 -+#define CONFIG_VFRDET_FILTER 0 -+#define CONFIG_VIBRANCE_FILTER 0 -+#define CONFIG_VIDSTABDETECT_FILTER 0 -+#define CONFIG_VIDSTABTRANSFORM_FILTER 0 -+#define CONFIG_VIF_FILTER 0 -+#define CONFIG_VIGNETTE_FILTER 0 -+#define CONFIG_VMAFMOTION_FILTER 0 -+#define CONFIG_VPP_QSV_FILTER 0 -+#define CONFIG_VSTACK_FILTER 0 -+#define CONFIG_W3FDIF_FILTER 0 -+#define CONFIG_WAVEFORM_FILTER 0 -+#define CONFIG_WEAVE_FILTER 0 -+#define CONFIG_XBR_FILTER 0 -+#define CONFIG_XCORRELATE_FILTER 0 -+#define CONFIG_XFADE_FILTER 0 -+#define CONFIG_XFADE_OPENCL_FILTER 0 -+#define CONFIG_XMEDIAN_FILTER 0 -+#define CONFIG_XSTACK_FILTER 0 -+#define CONFIG_YADIF_FILTER 0 -+#define CONFIG_YADIF_CUDA_FILTER 0 -+#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 -+#define CONFIG_YAEPBLUR_FILTER 0 -+#define CONFIG_ZMQ_FILTER 0 -+#define CONFIG_ZOOMPAN_FILTER 0 -+#define CONFIG_ZSCALE_FILTER 0 -+#define CONFIG_ALLRGB_FILTER 0 -+#define CONFIG_ALLYUV_FILTER 0 -+#define CONFIG_CELLAUTO_FILTER 0 -+#define CONFIG_COLOR_FILTER 0 -+#define CONFIG_COLORSPECTRUM_FILTER 0 -+#define CONFIG_COREIMAGESRC_FILTER 0 -+#define CONFIG_FREI0R_SRC_FILTER 0 -+#define CONFIG_GRADIENTS_FILTER 0 -+#define CONFIG_HALDCLUTSRC_FILTER 0 -+#define CONFIG_LIFE_FILTER 0 -+#define CONFIG_MANDELBROT_FILTER 0 -+#define CONFIG_MPTESTSRC_FILTER 0 -+#define CONFIG_NULLSRC_FILTER 0 -+#define CONFIG_OPENCLSRC_FILTER 0 -+#define CONFIG_PAL75BARS_FILTER 0 -+#define CONFIG_PAL100BARS_FILTER 0 -+#define CONFIG_RGBTESTSRC_FILTER 0 -+#define CONFIG_SIERPINSKI_FILTER 0 -+#define CONFIG_SMPTEBARS_FILTER 0 -+#define CONFIG_SMPTEHDBARS_FILTER 0 -+#define CONFIG_TESTSRC_FILTER 0 -+#define CONFIG_TESTSRC2_FILTER 0 -+#define CONFIG_YUVTESTSRC_FILTER 0 -+#define CONFIG_NULLSINK_FILTER 0 -+#define CONFIG_ABITSCOPE_FILTER 0 -+#define CONFIG_ADRAWGRAPH_FILTER 0 -+#define CONFIG_AGRAPHMONITOR_FILTER 0 -+#define CONFIG_AHISTOGRAM_FILTER 0 -+#define CONFIG_APHASEMETER_FILTER 0 -+#define CONFIG_AVECTORSCOPE_FILTER 0 -+#define CONFIG_CONCAT_FILTER 0 -+#define CONFIG_SHOWCQT_FILTER 0 -+#define CONFIG_SHOWFREQS_FILTER 0 -+#define CONFIG_SHOWSPATIAL_FILTER 0 -+#define CONFIG_SHOWSPECTRUM_FILTER 0 -+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0 -+#define CONFIG_SHOWVOLUME_FILTER 0 -+#define CONFIG_SHOWWAVES_FILTER 0 -+#define CONFIG_SHOWWAVESPIC_FILTER 0 -+#define CONFIG_SPECTRUMSYNTH_FILTER 0 -+#define CONFIG_AMOVIE_FILTER 0 -+#define CONFIG_MOVIE_FILTER 0 -+#define CONFIG_AFIFO_FILTER 0 -+#define CONFIG_FIFO_FILTER 0 -+#define CONFIG_AA_DEMUXER 0 -+#define CONFIG_AAC_DEMUXER 1 -+#define CONFIG_AAX_DEMUXER 0 -+#define CONFIG_AC3_DEMUXER 0 -+#define CONFIG_ACE_DEMUXER 0 -+#define CONFIG_ACM_DEMUXER 0 -+#define CONFIG_ACT_DEMUXER 0 -+#define CONFIG_ADF_DEMUXER 0 -+#define CONFIG_ADP_DEMUXER 0 -+#define CONFIG_ADS_DEMUXER 0 -+#define CONFIG_ADX_DEMUXER 0 -+#define CONFIG_AEA_DEMUXER 0 -+#define CONFIG_AFC_DEMUXER 0 -+#define CONFIG_AIFF_DEMUXER 0 -+#define CONFIG_AIX_DEMUXER 0 -+#define CONFIG_ALP_DEMUXER 0 -+#define CONFIG_AMR_DEMUXER 0 -+#define CONFIG_AMRNB_DEMUXER 0 -+#define CONFIG_AMRWB_DEMUXER 0 -+#define CONFIG_ANM_DEMUXER 0 -+#define CONFIG_APC_DEMUXER 0 -+#define CONFIG_APE_DEMUXER 0 -+#define CONFIG_APM_DEMUXER 0 -+#define CONFIG_APNG_DEMUXER 0 -+#define CONFIG_APTX_DEMUXER 0 -+#define CONFIG_APTX_HD_DEMUXER 0 -+#define CONFIG_AQTITLE_DEMUXER 0 -+#define CONFIG_ARGO_ASF_DEMUXER 0 -+#define CONFIG_ARGO_BRP_DEMUXER 0 -+#define CONFIG_ARGO_CVG_DEMUXER 0 -+#define CONFIG_ASF_DEMUXER 0 -+#define CONFIG_ASF_O_DEMUXER 0 -+#define CONFIG_ASS_DEMUXER 0 -+#define CONFIG_AST_DEMUXER 0 -+#define CONFIG_AU_DEMUXER 0 -+#define CONFIG_AV1_DEMUXER 0 -+#define CONFIG_AVI_DEMUXER 0 -+#define CONFIG_AVISYNTH_DEMUXER 0 -+#define CONFIG_AVR_DEMUXER 0 -+#define CONFIG_AVS_DEMUXER 0 -+#define CONFIG_AVS2_DEMUXER 0 -+#define CONFIG_AVS3_DEMUXER 0 -+#define CONFIG_BETHSOFTVID_DEMUXER 0 -+#define CONFIG_BFI_DEMUXER 0 -+#define CONFIG_BINTEXT_DEMUXER 0 -+#define CONFIG_BINK_DEMUXER 0 -+#define CONFIG_BINKA_DEMUXER 0 -+#define CONFIG_BIT_DEMUXER 0 -+#define CONFIG_BITPACKED_DEMUXER 0 -+#define CONFIG_BMV_DEMUXER 0 -+#define CONFIG_BFSTM_DEMUXER 0 -+#define CONFIG_BRSTM_DEMUXER 0 -+#define CONFIG_BOA_DEMUXER 0 -+#define CONFIG_C93_DEMUXER 0 -+#define CONFIG_CAF_DEMUXER 0 -+#define CONFIG_CAVSVIDEO_DEMUXER 0 -+#define CONFIG_CDG_DEMUXER 0 -+#define CONFIG_CDXL_DEMUXER 0 -+#define CONFIG_CINE_DEMUXER 0 -+#define CONFIG_CODEC2_DEMUXER 0 -+#define CONFIG_CODEC2RAW_DEMUXER 0 -+#define CONFIG_CONCAT_DEMUXER 0 -+#define CONFIG_DASH_DEMUXER 0 -+#define CONFIG_DATA_DEMUXER 0 -+#define CONFIG_DAUD_DEMUXER 0 -+#define CONFIG_DCSTR_DEMUXER 0 -+#define CONFIG_DERF_DEMUXER 0 -+#define CONFIG_DFA_DEMUXER 0 -+#define CONFIG_DHAV_DEMUXER 0 -+#define CONFIG_DIRAC_DEMUXER 0 -+#define CONFIG_DNXHD_DEMUXER 0 -+#define CONFIG_DSF_DEMUXER 0 -+#define CONFIG_DSICIN_DEMUXER 0 -+#define CONFIG_DSS_DEMUXER 0 -+#define CONFIG_DTS_DEMUXER 0 -+#define CONFIG_DTSHD_DEMUXER 0 -+#define CONFIG_DV_DEMUXER 0 -+#define CONFIG_DVBSUB_DEMUXER 0 -+#define CONFIG_DVBTXT_DEMUXER 0 -+#define CONFIG_DXA_DEMUXER 0 -+#define CONFIG_EA_DEMUXER 0 -+#define CONFIG_EA_CDATA_DEMUXER 0 -+#define CONFIG_EAC3_DEMUXER 0 -+#define CONFIG_EPAF_DEMUXER 0 -+#define CONFIG_FFMETADATA_DEMUXER 0 -+#define CONFIG_FILMSTRIP_DEMUXER 0 -+#define CONFIG_FITS_DEMUXER 0 -+#define CONFIG_FLAC_DEMUXER 1 -+#define CONFIG_FLIC_DEMUXER 0 -+#define CONFIG_FLV_DEMUXER 0 -+#define CONFIG_LIVE_FLV_DEMUXER 0 -+#define CONFIG_FOURXM_DEMUXER 0 -+#define CONFIG_FRM_DEMUXER 0 -+#define CONFIG_FSB_DEMUXER 0 -+#define CONFIG_FWSE_DEMUXER 0 -+#define CONFIG_G722_DEMUXER 0 -+#define CONFIG_G723_1_DEMUXER 0 -+#define CONFIG_G726_DEMUXER 0 -+#define CONFIG_G726LE_DEMUXER 0 -+#define CONFIG_G729_DEMUXER 0 -+#define CONFIG_GDV_DEMUXER 0 -+#define CONFIG_GENH_DEMUXER 0 -+#define CONFIG_GIF_DEMUXER 0 -+#define CONFIG_GSM_DEMUXER 0 -+#define CONFIG_GXF_DEMUXER 0 -+#define CONFIG_H261_DEMUXER 0 -+#define CONFIG_H263_DEMUXER 0 -+#define CONFIG_H264_DEMUXER 0 -+#define CONFIG_HCA_DEMUXER 0 -+#define CONFIG_HCOM_DEMUXER 0 -+#define CONFIG_HEVC_DEMUXER 0 -+#define CONFIG_HLS_DEMUXER 0 -+#define CONFIG_HNM_DEMUXER 0 -+#define CONFIG_ICO_DEMUXER 0 -+#define CONFIG_IDCIN_DEMUXER 0 -+#define CONFIG_IDF_DEMUXER 0 -+#define CONFIG_IFF_DEMUXER 0 -+#define CONFIG_IFV_DEMUXER 0 -+#define CONFIG_ILBC_DEMUXER 0 -+#define CONFIG_IMAGE2_DEMUXER 0 -+#define CONFIG_IMAGE2PIPE_DEMUXER 0 -+#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 -+#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 -+#define CONFIG_IMF_DEMUXER 0 -+#define CONFIG_INGENIENT_DEMUXER 0 -+#define CONFIG_IPMOVIE_DEMUXER 0 -+#define CONFIG_IPU_DEMUXER 0 -+#define CONFIG_IRCAM_DEMUXER 0 -+#define CONFIG_ISS_DEMUXER 0 -+#define CONFIG_IV8_DEMUXER 0 -+#define CONFIG_IVF_DEMUXER 0 -+#define CONFIG_IVR_DEMUXER 0 -+#define CONFIG_JACOSUB_DEMUXER 0 -+#define CONFIG_JV_DEMUXER 0 -+#define CONFIG_KUX_DEMUXER 0 -+#define CONFIG_KVAG_DEMUXER 0 -+#define CONFIG_LMLM4_DEMUXER 0 -+#define CONFIG_LOAS_DEMUXER 0 -+#define CONFIG_LUODAT_DEMUXER 0 -+#define CONFIG_LRC_DEMUXER 0 -+#define CONFIG_LVF_DEMUXER 0 -+#define CONFIG_LXF_DEMUXER 0 -+#define CONFIG_M4V_DEMUXER 0 -+#define CONFIG_MCA_DEMUXER 0 -+#define CONFIG_MCC_DEMUXER 0 -+#define CONFIG_MATROSKA_DEMUXER 1 -+#define CONFIG_MGSTS_DEMUXER 0 -+#define CONFIG_MICRODVD_DEMUXER 0 -+#define CONFIG_MJPEG_DEMUXER 0 -+#define CONFIG_MJPEG_2000_DEMUXER 0 -+#define CONFIG_MLP_DEMUXER 0 -+#define CONFIG_MLV_DEMUXER 0 -+#define CONFIG_MM_DEMUXER 0 -+#define CONFIG_MMF_DEMUXER 0 -+#define CONFIG_MODS_DEMUXER 0 -+#define CONFIG_MOFLEX_DEMUXER 0 -+#define CONFIG_MOV_DEMUXER 1 -+#define CONFIG_MP3_DEMUXER 1 -+#define CONFIG_MPC_DEMUXER 0 -+#define CONFIG_MPC8_DEMUXER 0 -+#define CONFIG_MPEGPS_DEMUXER 0 -+#define CONFIG_MPEGTS_DEMUXER 0 -+#define CONFIG_MPEGTSRAW_DEMUXER 0 -+#define CONFIG_MPEGVIDEO_DEMUXER 0 -+#define CONFIG_MPJPEG_DEMUXER 0 -+#define CONFIG_MPL2_DEMUXER 0 -+#define CONFIG_MPSUB_DEMUXER 0 -+#define CONFIG_MSF_DEMUXER 0 -+#define CONFIG_MSNWC_TCP_DEMUXER 0 -+#define CONFIG_MSP_DEMUXER 0 -+#define CONFIG_MTAF_DEMUXER 0 -+#define CONFIG_MTV_DEMUXER 0 -+#define CONFIG_MUSX_DEMUXER 0 -+#define CONFIG_MV_DEMUXER 0 -+#define CONFIG_MVI_DEMUXER 0 -+#define CONFIG_MXF_DEMUXER 0 -+#define CONFIG_MXG_DEMUXER 0 -+#define CONFIG_NC_DEMUXER 0 -+#define CONFIG_NISTSPHERE_DEMUXER 0 -+#define CONFIG_NSP_DEMUXER 0 -+#define CONFIG_NSV_DEMUXER 0 -+#define CONFIG_NUT_DEMUXER 0 -+#define CONFIG_NUV_DEMUXER 0 -+#define CONFIG_OBU_DEMUXER 0 -+#define CONFIG_OGG_DEMUXER 1 -+#define CONFIG_OMA_DEMUXER 0 -+#define CONFIG_PAF_DEMUXER 0 -+#define CONFIG_PCM_ALAW_DEMUXER 0 -+#define CONFIG_PCM_MULAW_DEMUXER 0 -+#define CONFIG_PCM_VIDC_DEMUXER 0 -+#define CONFIG_PCM_F64BE_DEMUXER 0 -+#define CONFIG_PCM_F64LE_DEMUXER 0 -+#define CONFIG_PCM_F32BE_DEMUXER 0 -+#define CONFIG_PCM_F32LE_DEMUXER 0 -+#define CONFIG_PCM_S32BE_DEMUXER 0 -+#define CONFIG_PCM_S32LE_DEMUXER 0 -+#define CONFIG_PCM_S24BE_DEMUXER 0 -+#define CONFIG_PCM_S24LE_DEMUXER 0 -+#define CONFIG_PCM_S16BE_DEMUXER 0 -+#define CONFIG_PCM_S16LE_DEMUXER 0 -+#define CONFIG_PCM_S8_DEMUXER 0 -+#define CONFIG_PCM_U32BE_DEMUXER 0 -+#define CONFIG_PCM_U32LE_DEMUXER 0 -+#define CONFIG_PCM_U24BE_DEMUXER 0 -+#define CONFIG_PCM_U24LE_DEMUXER 0 -+#define CONFIG_PCM_U16BE_DEMUXER 0 -+#define CONFIG_PCM_U16LE_DEMUXER 0 -+#define CONFIG_PCM_U8_DEMUXER 0 -+#define CONFIG_PJS_DEMUXER 0 -+#define CONFIG_PMP_DEMUXER 0 -+#define CONFIG_PP_BNK_DEMUXER 0 -+#define CONFIG_PVA_DEMUXER 0 -+#define CONFIG_PVF_DEMUXER 0 -+#define CONFIG_QCP_DEMUXER 0 -+#define CONFIG_R3D_DEMUXER 0 -+#define CONFIG_RAWVIDEO_DEMUXER 0 -+#define CONFIG_REALTEXT_DEMUXER 0 -+#define CONFIG_REDSPARK_DEMUXER 0 -+#define CONFIG_RL2_DEMUXER 0 -+#define CONFIG_RM_DEMUXER 0 -+#define CONFIG_ROQ_DEMUXER 0 -+#define CONFIG_RPL_DEMUXER 0 -+#define CONFIG_RSD_DEMUXER 0 -+#define CONFIG_RSO_DEMUXER 0 -+#define CONFIG_RTP_DEMUXER 0 -+#define CONFIG_RTSP_DEMUXER 0 -+#define CONFIG_S337M_DEMUXER 0 -+#define CONFIG_SAMI_DEMUXER 0 -+#define CONFIG_SAP_DEMUXER 0 -+#define CONFIG_SBC_DEMUXER 0 -+#define CONFIG_SBG_DEMUXER 0 -+#define CONFIG_SCC_DEMUXER 0 -+#define CONFIG_SCD_DEMUXER 0 -+#define CONFIG_SDP_DEMUXER 0 -+#define CONFIG_SDR2_DEMUXER 0 -+#define CONFIG_SDS_DEMUXER 0 -+#define CONFIG_SDX_DEMUXER 0 -+#define CONFIG_SEGAFILM_DEMUXER 0 -+#define CONFIG_SER_DEMUXER 0 -+#define CONFIG_SGA_DEMUXER 0 -+#define CONFIG_SHORTEN_DEMUXER 0 -+#define CONFIG_SIFF_DEMUXER 0 -+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 -+#define CONFIG_SLN_DEMUXER 0 -+#define CONFIG_SMACKER_DEMUXER 0 -+#define CONFIG_SMJPEG_DEMUXER 0 -+#define CONFIG_SMUSH_DEMUXER 0 -+#define CONFIG_SOL_DEMUXER 0 -+#define CONFIG_SOX_DEMUXER 0 -+#define CONFIG_SPDIF_DEMUXER 0 -+#define CONFIG_SRT_DEMUXER 0 -+#define CONFIG_STR_DEMUXER 0 -+#define CONFIG_STL_DEMUXER 0 -+#define CONFIG_SUBVIEWER1_DEMUXER 0 -+#define CONFIG_SUBVIEWER_DEMUXER 0 -+#define CONFIG_SUP_DEMUXER 0 -+#define CONFIG_SVAG_DEMUXER 0 -+#define CONFIG_SVS_DEMUXER 0 -+#define CONFIG_SWF_DEMUXER 0 -+#define CONFIG_TAK_DEMUXER 0 -+#define CONFIG_TEDCAPTIONS_DEMUXER 0 -+#define CONFIG_THP_DEMUXER 0 -+#define CONFIG_THREEDOSTR_DEMUXER 0 -+#define CONFIG_TIERTEXSEQ_DEMUXER 0 -+#define CONFIG_TMV_DEMUXER 0 -+#define CONFIG_TRUEHD_DEMUXER 0 -+#define CONFIG_TTA_DEMUXER 0 -+#define CONFIG_TXD_DEMUXER 0 -+#define CONFIG_TTY_DEMUXER 0 -+#define CONFIG_TY_DEMUXER 0 -+#define CONFIG_V210_DEMUXER 0 -+#define CONFIG_V210X_DEMUXER 0 -+#define CONFIG_VAG_DEMUXER 0 -+#define CONFIG_VC1_DEMUXER 0 -+#define CONFIG_VC1T_DEMUXER 0 -+#define CONFIG_VIVIDAS_DEMUXER 0 -+#define CONFIG_VIVO_DEMUXER 0 -+#define CONFIG_VMD_DEMUXER 0 -+#define CONFIG_VOBSUB_DEMUXER 0 -+#define CONFIG_VOC_DEMUXER 0 -+#define CONFIG_VPK_DEMUXER 0 -+#define CONFIG_VPLAYER_DEMUXER 0 -+#define CONFIG_VQF_DEMUXER 0 -+#define CONFIG_W64_DEMUXER 0 -+#define CONFIG_WAV_DEMUXER 1 -+#define CONFIG_WC3_DEMUXER 0 -+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 -+#define CONFIG_WEBVTT_DEMUXER 0 -+#define CONFIG_WSAUD_DEMUXER 0 -+#define CONFIG_WSD_DEMUXER 0 -+#define CONFIG_WSVQA_DEMUXER 0 -+#define CONFIG_WTV_DEMUXER 0 -+#define CONFIG_WVE_DEMUXER 0 -+#define CONFIG_WV_DEMUXER 0 -+#define CONFIG_XA_DEMUXER 0 -+#define CONFIG_XBIN_DEMUXER 0 -+#define CONFIG_XMV_DEMUXER 0 -+#define CONFIG_XVAG_DEMUXER 0 -+#define CONFIG_XWMA_DEMUXER 0 -+#define CONFIG_YOP_DEMUXER 0 -+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 -+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 -+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 -+#define CONFIG_LIBGME_DEMUXER 0 -+#define CONFIG_LIBMODPLUG_DEMUXER 0 -+#define CONFIG_LIBOPENMPT_DEMUXER 0 -+#define CONFIG_VAPOURSYNTH_DEMUXER 0 -+#define CONFIG_A64_MUXER 0 -+#define CONFIG_AC3_MUXER 0 -+#define CONFIG_ADTS_MUXER 0 -+#define CONFIG_ADX_MUXER 0 -+#define CONFIG_AIFF_MUXER 0 -+#define CONFIG_ALP_MUXER 0 -+#define CONFIG_AMR_MUXER 0 -+#define CONFIG_AMV_MUXER 0 -+#define CONFIG_APM_MUXER 0 -+#define CONFIG_APNG_MUXER 0 -+#define CONFIG_APTX_MUXER 0 -+#define CONFIG_APTX_HD_MUXER 0 -+#define CONFIG_ARGO_ASF_MUXER 0 -+#define CONFIG_ARGO_CVG_MUXER 0 -+#define CONFIG_ASF_MUXER 0 -+#define CONFIG_ASS_MUXER 0 -+#define CONFIG_AST_MUXER 0 -+#define CONFIG_ASF_STREAM_MUXER 0 -+#define CONFIG_AU_MUXER 0 -+#define CONFIG_AVI_MUXER 0 -+#define CONFIG_AVM2_MUXER 0 -+#define CONFIG_AVS2_MUXER 0 -+#define CONFIG_AVS3_MUXER 0 -+#define CONFIG_BIT_MUXER 0 -+#define CONFIG_CAF_MUXER 0 -+#define CONFIG_CAVSVIDEO_MUXER 0 -+#define CONFIG_CODEC2_MUXER 0 -+#define CONFIG_CODEC2RAW_MUXER 0 -+#define CONFIG_CRC_MUXER 0 -+#define CONFIG_DASH_MUXER 0 -+#define CONFIG_DATA_MUXER 0 -+#define CONFIG_DAUD_MUXER 0 -+#define CONFIG_DIRAC_MUXER 0 -+#define CONFIG_DNXHD_MUXER 0 -+#define CONFIG_DTS_MUXER 0 -+#define CONFIG_DV_MUXER 0 -+#define CONFIG_EAC3_MUXER 0 -+#define CONFIG_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 -+#define CONFIG_FLV_MUXER 0 -+#define CONFIG_FRAMECRC_MUXER 0 -+#define CONFIG_FRAMEHASH_MUXER 0 -+#define CONFIG_FRAMEMD5_MUXER 0 -+#define CONFIG_G722_MUXER 0 -+#define CONFIG_G723_1_MUXER 0 -+#define CONFIG_G726_MUXER 0 -+#define CONFIG_G726LE_MUXER 0 -+#define CONFIG_GIF_MUXER 0 -+#define CONFIG_GSM_MUXER 0 -+#define CONFIG_GXF_MUXER 0 -+#define CONFIG_H261_MUXER 0 -+#define CONFIG_H263_MUXER 0 -+#define CONFIG_H264_MUXER 0 -+#define CONFIG_HASH_MUXER 0 -+#define CONFIG_HDS_MUXER 0 -+#define CONFIG_HEVC_MUXER 0 -+#define CONFIG_HLS_MUXER 0 -+#define CONFIG_ICO_MUXER 0 -+#define CONFIG_ILBC_MUXER 0 -+#define CONFIG_IMAGE2_MUXER 0 -+#define CONFIG_IMAGE2PIPE_MUXER 0 -+#define CONFIG_IPOD_MUXER 0 -+#define CONFIG_IRCAM_MUXER 0 -+#define CONFIG_ISMV_MUXER 0 -+#define CONFIG_IVF_MUXER 0 -+#define CONFIG_JACOSUB_MUXER 0 -+#define CONFIG_KVAG_MUXER 0 -+#define CONFIG_LATM_MUXER 0 -+#define CONFIG_LRC_MUXER 0 -+#define CONFIG_M4V_MUXER 0 -+#define CONFIG_MD5_MUXER 0 -+#define CONFIG_MATROSKA_MUXER 0 -+#define CONFIG_MATROSKA_AUDIO_MUXER 0 -+#define CONFIG_MICRODVD_MUXER 0 -+#define CONFIG_MJPEG_MUXER 0 -+#define CONFIG_MLP_MUXER 0 -+#define CONFIG_MMF_MUXER 0 -+#define CONFIG_MOV_MUXER 0 -+#define CONFIG_MP2_MUXER 0 -+#define CONFIG_MP3_MUXER 0 -+#define CONFIG_MP4_MUXER 0 -+#define CONFIG_MPEG1SYSTEM_MUXER 0 -+#define CONFIG_MPEG1VCD_MUXER 0 -+#define CONFIG_MPEG1VIDEO_MUXER 0 -+#define CONFIG_MPEG2DVD_MUXER 0 -+#define CONFIG_MPEG2SVCD_MUXER 0 -+#define CONFIG_MPEG2VIDEO_MUXER 0 -+#define CONFIG_MPEG2VOB_MUXER 0 -+#define CONFIG_MPEGTS_MUXER 0 -+#define CONFIG_MPJPEG_MUXER 0 -+#define CONFIG_MXF_MUXER 0 -+#define CONFIG_MXF_D10_MUXER 0 -+#define CONFIG_MXF_OPATOM_MUXER 0 -+#define CONFIG_NULL_MUXER 0 -+#define CONFIG_NUT_MUXER 0 -+#define CONFIG_OBU_MUXER 0 -+#define CONFIG_OGA_MUXER 0 -+#define CONFIG_OGG_MUXER 0 -+#define CONFIG_OGV_MUXER 0 -+#define CONFIG_OMA_MUXER 0 -+#define CONFIG_OPUS_MUXER 0 -+#define CONFIG_PCM_ALAW_MUXER 0 -+#define CONFIG_PCM_MULAW_MUXER 0 -+#define CONFIG_PCM_VIDC_MUXER 0 -+#define CONFIG_PCM_F64BE_MUXER 0 -+#define CONFIG_PCM_F64LE_MUXER 0 -+#define CONFIG_PCM_F32BE_MUXER 0 -+#define CONFIG_PCM_F32LE_MUXER 0 -+#define CONFIG_PCM_S32BE_MUXER 0 -+#define CONFIG_PCM_S32LE_MUXER 0 -+#define CONFIG_PCM_S24BE_MUXER 0 -+#define CONFIG_PCM_S24LE_MUXER 0 -+#define CONFIG_PCM_S16BE_MUXER 0 -+#define CONFIG_PCM_S16LE_MUXER 0 -+#define CONFIG_PCM_S8_MUXER 0 -+#define CONFIG_PCM_U32BE_MUXER 0 -+#define CONFIG_PCM_U32LE_MUXER 0 -+#define CONFIG_PCM_U24BE_MUXER 0 -+#define CONFIG_PCM_U24LE_MUXER 0 -+#define CONFIG_PCM_U16BE_MUXER 0 -+#define CONFIG_PCM_U16LE_MUXER 0 -+#define CONFIG_PCM_U8_MUXER 0 -+#define CONFIG_PSP_MUXER 0 -+#define CONFIG_RAWVIDEO_MUXER 0 -+#define CONFIG_RM_MUXER 0 -+#define CONFIG_ROQ_MUXER 0 -+#define CONFIG_RSO_MUXER 0 -+#define CONFIG_RTP_MUXER 0 -+#define CONFIG_RTP_MPEGTS_MUXER 0 -+#define CONFIG_RTSP_MUXER 0 -+#define CONFIG_SAP_MUXER 0 -+#define CONFIG_SBC_MUXER 0 -+#define CONFIG_SCC_MUXER 0 -+#define CONFIG_SEGAFILM_MUXER 0 -+#define CONFIG_SEGMENT_MUXER 0 -+#define CONFIG_STREAM_SEGMENT_MUXER 0 -+#define CONFIG_SMJPEG_MUXER 0 -+#define CONFIG_SMOOTHSTREAMING_MUXER 0 -+#define CONFIG_SOX_MUXER 0 -+#define CONFIG_SPX_MUXER 0 -+#define CONFIG_SPDIF_MUXER 0 -+#define CONFIG_SRT_MUXER 0 -+#define CONFIG_STREAMHASH_MUXER 0 -+#define CONFIG_SUP_MUXER 0 -+#define CONFIG_SWF_MUXER 0 -+#define CONFIG_TEE_MUXER 0 -+#define CONFIG_TG2_MUXER 0 -+#define CONFIG_TGP_MUXER 0 -+#define CONFIG_MKVTIMESTAMP_V2_MUXER 0 -+#define CONFIG_TRUEHD_MUXER 0 -+#define CONFIG_TTA_MUXER 0 -+#define CONFIG_TTML_MUXER 0 -+#define CONFIG_UNCODEDFRAMECRC_MUXER 0 -+#define CONFIG_VC1_MUXER 0 -+#define CONFIG_VC1T_MUXER 0 -+#define CONFIG_VOC_MUXER 0 -+#define CONFIG_W64_MUXER 0 -+#define CONFIG_WAV_MUXER 0 -+#define CONFIG_WEBM_MUXER 0 -+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 -+#define CONFIG_WEBM_CHUNK_MUXER 0 -+#define CONFIG_WEBP_MUXER 0 -+#define CONFIG_WEBVTT_MUXER 0 -+#define CONFIG_WSAUD_MUXER 0 -+#define CONFIG_WTV_MUXER 0 -+#define CONFIG_WV_MUXER 0 -+#define CONFIG_YUV4MPEGPIPE_MUXER 0 -+#define CONFIG_CHROMAPRINT_MUXER 0 -+#define CONFIG_ASYNC_PROTOCOL 0 -+#define CONFIG_BLURAY_PROTOCOL 0 -+#define CONFIG_CACHE_PROTOCOL 0 -+#define CONFIG_CONCAT_PROTOCOL 0 -+#define CONFIG_CONCATF_PROTOCOL 0 -+#define CONFIG_CRYPTO_PROTOCOL 0 -+#define CONFIG_DATA_PROTOCOL 0 -+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 -+#define CONFIG_FFRTMPHTTP_PROTOCOL 0 -+#define CONFIG_FILE_PROTOCOL 0 -+#define CONFIG_FTP_PROTOCOL 0 -+#define CONFIG_GOPHER_PROTOCOL 0 -+#define CONFIG_GOPHERS_PROTOCOL 0 -+#define CONFIG_HLS_PROTOCOL 0 -+#define CONFIG_HTTP_PROTOCOL 0 -+#define CONFIG_HTTPPROXY_PROTOCOL 0 -+#define CONFIG_HTTPS_PROTOCOL 0 -+#define CONFIG_ICECAST_PROTOCOL 0 -+#define CONFIG_MMSH_PROTOCOL 0 -+#define CONFIG_MMST_PROTOCOL 0 -+#define CONFIG_MD5_PROTOCOL 0 -+#define CONFIG_PIPE_PROTOCOL 0 -+#define CONFIG_PROMPEG_PROTOCOL 0 -+#define CONFIG_RTMP_PROTOCOL 0 -+#define CONFIG_RTMPE_PROTOCOL 0 -+#define CONFIG_RTMPS_PROTOCOL 0 -+#define CONFIG_RTMPT_PROTOCOL 0 -+#define CONFIG_RTMPTE_PROTOCOL 0 -+#define CONFIG_RTMPTS_PROTOCOL 0 -+#define CONFIG_RTP_PROTOCOL 0 -+#define CONFIG_SCTP_PROTOCOL 0 -+#define CONFIG_SRTP_PROTOCOL 0 -+#define CONFIG_SUBFILE_PROTOCOL 0 -+#define CONFIG_TEE_PROTOCOL 0 -+#define CONFIG_TCP_PROTOCOL 0 -+#define CONFIG_TLS_PROTOCOL 0 -+#define CONFIG_UDP_PROTOCOL 0 -+#define CONFIG_UDPLITE_PROTOCOL 0 -+#define CONFIG_UNIX_PROTOCOL 0 -+#define CONFIG_LIBAMQP_PROTOCOL 0 -+#define CONFIG_LIBRIST_PROTOCOL 0 -+#define CONFIG_LIBRTMP_PROTOCOL 0 -+#define CONFIG_LIBRTMPE_PROTOCOL 0 -+#define CONFIG_LIBRTMPS_PROTOCOL 0 -+#define CONFIG_LIBRTMPT_PROTOCOL 0 -+#define CONFIG_LIBRTMPTE_PROTOCOL 0 -+#define CONFIG_LIBSRT_PROTOCOL 0 -+#define CONFIG_LIBSSH_PROTOCOL 0 -+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 -+#define CONFIG_LIBZMQ_PROTOCOL 0 +#endif /* FFMPEG_CONFIG_H */ diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h new file mode 100644 index 000000000000..ab76c506c0fb --- /dev/null +++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h @@ -0,0 +1,2086 @@ +--- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h.orig 2022-10-05 07:34:01 UTC ++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h +@@ -0,0 +1,2083 @@ ++/* Automatically generated by configure - do not modify! */ ++#ifndef FFMPEG_CONFIG_COMPONENTS_H ++#define FFMPEG_CONFIG_COMPONENTS_H ++#define CONFIG_AAC_ADTSTOASC_BSF 0 ++#define CONFIG_AV1_FRAME_MERGE_BSF 0 ++#define CONFIG_AV1_FRAME_SPLIT_BSF 0 ++#define CONFIG_AV1_METADATA_BSF 0 ++#define CONFIG_CHOMP_BSF 0 ++#define CONFIG_DUMP_EXTRADATA_BSF 0 ++#define CONFIG_DCA_CORE_BSF 0 ++#define CONFIG_DV_ERROR_MARKER_BSF 0 ++#define CONFIG_EAC3_CORE_BSF 0 ++#define CONFIG_EXTRACT_EXTRADATA_BSF 0 ++#define CONFIG_FILTER_UNITS_BSF 0 ++#define CONFIG_H264_METADATA_BSF 0 ++#define CONFIG_H264_MP4TOANNEXB_BSF 0 ++#define CONFIG_H264_REDUNDANT_PPS_BSF 0 ++#define CONFIG_HAPQA_EXTRACT_BSF 0 ++#define CONFIG_HEVC_METADATA_BSF 0 ++#define CONFIG_HEVC_MP4TOANNEXB_BSF 0 ++#define CONFIG_IMX_DUMP_HEADER_BSF 0 ++#define CONFIG_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 ++#define CONFIG_NOISE_BSF 0 ++#define CONFIG_NULL_BSF 0 ++#define CONFIG_OPUS_METADATA_BSF 0 ++#define CONFIG_PCM_RECHUNK_BSF 0 ++#define CONFIG_PGS_FRAME_MERGE_BSF 0 ++#define CONFIG_PRORES_METADATA_BSF 0 ++#define CONFIG_REMOVE_EXTRADATA_BSF 0 ++#define CONFIG_SETTS_BSF 0 ++#define CONFIG_TEXT2MOVSUB_BSF 0 ++#define CONFIG_TRACE_HEADERS_BSF 0 ++#define CONFIG_TRUEHD_CORE_BSF 0 ++#define CONFIG_VP9_METADATA_BSF 0 ++#define CONFIG_VP9_RAW_REORDER_BSF 0 ++#define CONFIG_VP9_SUPERFRAME_BSF 0 ++#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0 ++#define CONFIG_AASC_DECODER 0 ++#define CONFIG_AIC_DECODER 0 ++#define CONFIG_ALIAS_PIX_DECODER 0 ++#define CONFIG_AGM_DECODER 0 ++#define CONFIG_AMV_DECODER 0 ++#define CONFIG_ANM_DECODER 0 ++#define CONFIG_ANSI_DECODER 0 ++#define CONFIG_APNG_DECODER 0 ++#define CONFIG_ARBC_DECODER 0 ++#define CONFIG_ARGO_DECODER 0 ++#define CONFIG_ASV1_DECODER 0 ++#define CONFIG_ASV2_DECODER 0 ++#define CONFIG_AURA_DECODER 0 ++#define CONFIG_AURA2_DECODER 0 ++#define CONFIG_AVRP_DECODER 0 ++#define CONFIG_AVRN_DECODER 0 ++#define CONFIG_AVS_DECODER 0 ++#define CONFIG_AVUI_DECODER 0 ++#define CONFIG_AYUV_DECODER 0 ++#define CONFIG_BETHSOFTVID_DECODER 0 ++#define CONFIG_BFI_DECODER 0 ++#define CONFIG_BINK_DECODER 0 ++#define CONFIG_BITPACKED_DECODER 0 ++#define CONFIG_BMP_DECODER 0 ++#define CONFIG_BMV_VIDEO_DECODER 0 ++#define CONFIG_BRENDER_PIX_DECODER 0 ++#define CONFIG_C93_DECODER 0 ++#define CONFIG_CAVS_DECODER 0 ++#define CONFIG_CDGRAPHICS_DECODER 0 ++#define CONFIG_CDTOONS_DECODER 0 ++#define CONFIG_CDXL_DECODER 0 ++#define CONFIG_CFHD_DECODER 0 ++#define CONFIG_CINEPAK_DECODER 0 ++#define CONFIG_CLEARVIDEO_DECODER 0 ++#define CONFIG_CLJR_DECODER 0 ++#define CONFIG_CLLC_DECODER 0 ++#define CONFIG_COMFORTNOISE_DECODER 0 ++#define CONFIG_CPIA_DECODER 0 ++#define CONFIG_CRI_DECODER 0 ++#define CONFIG_CSCD_DECODER 0 ++#define CONFIG_CYUV_DECODER 0 ++#define CONFIG_DDS_DECODER 0 ++#define CONFIG_DFA_DECODER 0 ++#define CONFIG_DIRAC_DECODER 0 ++#define CONFIG_DNXHD_DECODER 0 ++#define CONFIG_DPX_DECODER 0 ++#define CONFIG_DSICINVIDEO_DECODER 0 ++#define CONFIG_DVAUDIO_DECODER 0 ++#define CONFIG_DVVIDEO_DECODER 0 ++#define CONFIG_DXA_DECODER 0 ++#define CONFIG_DXTORY_DECODER 0 ++#define CONFIG_DXV_DECODER 0 ++#define CONFIG_EACMV_DECODER 0 ++#define CONFIG_EAMAD_DECODER 0 ++#define CONFIG_EATGQ_DECODER 0 ++#define CONFIG_EATGV_DECODER 0 ++#define CONFIG_EATQI_DECODER 0 ++#define CONFIG_EIGHTBPS_DECODER 0 ++#define CONFIG_EIGHTSVX_EXP_DECODER 0 ++#define CONFIG_EIGHTSVX_FIB_DECODER 0 ++#define CONFIG_ESCAPE124_DECODER 0 ++#define CONFIG_ESCAPE130_DECODER 0 ++#define CONFIG_EXR_DECODER 0 ++#define CONFIG_FFV1_DECODER 0 ++#define CONFIG_FFVHUFF_DECODER 0 ++#define CONFIG_FIC_DECODER 0 ++#define CONFIG_FITS_DECODER 0 ++#define CONFIG_FLASHSV_DECODER 0 ++#define CONFIG_FLASHSV2_DECODER 0 ++#define CONFIG_FLIC_DECODER 0 ++#define CONFIG_FLV_DECODER 0 ++#define CONFIG_FMVC_DECODER 0 ++#define CONFIG_FOURXM_DECODER 0 ++#define CONFIG_FRAPS_DECODER 0 ++#define CONFIG_FRWU_DECODER 0 ++#define CONFIG_G2M_DECODER 0 ++#define CONFIG_GDV_DECODER 0 ++#define CONFIG_GEM_DECODER 0 ++#define CONFIG_GIF_DECODER 0 ++#define CONFIG_H261_DECODER 0 ++#define CONFIG_H263_DECODER 0 ++#define CONFIG_H263I_DECODER 0 ++#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 ++#define CONFIG_H264_QSV_DECODER 0 ++#define CONFIG_H264_RKMPP_DECODER 0 ++#define CONFIG_HAP_DECODER 0 ++#define CONFIG_HEVC_DECODER 0 ++#define CONFIG_HEVC_QSV_DECODER 0 ++#define CONFIG_HEVC_RKMPP_DECODER 0 ++#define CONFIG_HEVC_V4L2M2M_DECODER 0 ++#define CONFIG_HNM4_VIDEO_DECODER 0 ++#define CONFIG_HQ_HQA_DECODER 0 ++#define CONFIG_HQX_DECODER 0 ++#define CONFIG_HUFFYUV_DECODER 0 ++#define CONFIG_HYMT_DECODER 0 ++#define CONFIG_IDCIN_DECODER 0 ++#define CONFIG_IFF_ILBM_DECODER 0 ++#define CONFIG_IMM4_DECODER 0 ++#define CONFIG_IMM5_DECODER 0 ++#define CONFIG_INDEO2_DECODER 0 ++#define CONFIG_INDEO3_DECODER 0 ++#define CONFIG_INDEO4_DECODER 0 ++#define CONFIG_INDEO5_DECODER 0 ++#define CONFIG_INTERPLAY_VIDEO_DECODER 0 ++#define CONFIG_IPU_DECODER 0 ++#define CONFIG_JPEG2000_DECODER 0 ++#define CONFIG_JPEGLS_DECODER 0 ++#define CONFIG_JV_DECODER 0 ++#define CONFIG_KGV1_DECODER 0 ++#define CONFIG_KMVC_DECODER 0 ++#define CONFIG_LAGARITH_DECODER 0 ++#define CONFIG_LOCO_DECODER 0 ++#define CONFIG_LSCR_DECODER 0 ++#define CONFIG_M101_DECODER 0 ++#define CONFIG_MAGICYUV_DECODER 0 ++#define CONFIG_MDEC_DECODER 0 ++#define CONFIG_MIMIC_DECODER 0 ++#define CONFIG_MJPEG_DECODER 0 ++#define CONFIG_MJPEGB_DECODER 0 ++#define CONFIG_MMVIDEO_DECODER 0 ++#define CONFIG_MOBICLIP_DECODER 0 ++#define CONFIG_MOTIONPIXELS_DECODER 0 ++#define CONFIG_MPEG1VIDEO_DECODER 0 ++#define CONFIG_MPEG2VIDEO_DECODER 0 ++#define CONFIG_MPEG4_DECODER 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 ++#define CONFIG_MSA1_DECODER 0 ++#define CONFIG_MSCC_DECODER 0 ++#define CONFIG_MSMPEG4V1_DECODER 0 ++#define CONFIG_MSMPEG4V2_DECODER 0 ++#define CONFIG_MSMPEG4V3_DECODER 0 ++#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0 ++#define CONFIG_MSP2_DECODER 0 ++#define CONFIG_MSRLE_DECODER 0 ++#define CONFIG_MSS1_DECODER 0 ++#define CONFIG_MSS2_DECODER 0 ++#define CONFIG_MSVIDEO1_DECODER 0 ++#define CONFIG_MSZH_DECODER 0 ++#define CONFIG_MTS2_DECODER 0 ++#define CONFIG_MV30_DECODER 0 ++#define CONFIG_MVC1_DECODER 0 ++#define CONFIG_MVC2_DECODER 0 ++#define CONFIG_MVDV_DECODER 0 ++#define CONFIG_MVHA_DECODER 0 ++#define CONFIG_MWSC_DECODER 0 ++#define CONFIG_MXPEG_DECODER 0 ++#define CONFIG_NOTCHLC_DECODER 0 ++#define CONFIG_NUV_DECODER 0 ++#define CONFIG_PAF_VIDEO_DECODER 0 ++#define CONFIG_PAM_DECODER 0 ++#define CONFIG_PBM_DECODER 0 ++#define CONFIG_PCX_DECODER 0 ++#define CONFIG_PFM_DECODER 0 ++#define CONFIG_PGM_DECODER 0 ++#define CONFIG_PGMYUV_DECODER 0 ++#define CONFIG_PGX_DECODER 0 ++#define CONFIG_PHOTOCD_DECODER 0 ++#define CONFIG_PICTOR_DECODER 0 ++#define CONFIG_PIXLET_DECODER 0 ++#define CONFIG_PNG_DECODER 0 ++#define CONFIG_PPM_DECODER 0 ++#define CONFIG_PRORES_DECODER 0 ++#define CONFIG_PROSUMER_DECODER 0 ++#define CONFIG_PSD_DECODER 0 ++#define CONFIG_PTX_DECODER 0 ++#define CONFIG_QDRAW_DECODER 0 ++#define CONFIG_QPEG_DECODER 0 ++#define CONFIG_QTRLE_DECODER 0 ++#define CONFIG_R10K_DECODER 0 ++#define CONFIG_R210_DECODER 0 ++#define CONFIG_RASC_DECODER 0 ++#define CONFIG_RAWVIDEO_DECODER 0 ++#define CONFIG_RL2_DECODER 0 ++#define CONFIG_ROQ_DECODER 0 ++#define CONFIG_RPZA_DECODER 0 ++#define CONFIG_RSCC_DECODER 0 ++#define CONFIG_RV10_DECODER 0 ++#define CONFIG_RV20_DECODER 0 ++#define CONFIG_RV30_DECODER 0 ++#define CONFIG_RV40_DECODER 0 ++#define CONFIG_S302M_DECODER 0 ++#define CONFIG_SANM_DECODER 0 ++#define CONFIG_SCPR_DECODER 0 ++#define CONFIG_SCREENPRESSO_DECODER 0 ++#define CONFIG_SGA_DECODER 0 ++#define CONFIG_SGI_DECODER 0 ++#define CONFIG_SGIRLE_DECODER 0 ++#define CONFIG_SHEERVIDEO_DECODER 0 ++#define CONFIG_SIMBIOSIS_IMX_DECODER 0 ++#define CONFIG_SMACKER_DECODER 0 ++#define CONFIG_SMC_DECODER 0 ++#define CONFIG_SMVJPEG_DECODER 0 ++#define CONFIG_SNOW_DECODER 0 ++#define CONFIG_SP5X_DECODER 0 ++#define CONFIG_SPEEDHQ_DECODER 0 ++#define CONFIG_SPEEX_DECODER 0 ++#define CONFIG_SRGC_DECODER 0 ++#define CONFIG_SUNRAST_DECODER 0 ++#define CONFIG_SVQ1_DECODER 0 ++#define CONFIG_SVQ3_DECODER 0 ++#define CONFIG_TARGA_DECODER 0 ++#define CONFIG_TARGA_Y216_DECODER 0 ++#define CONFIG_TDSC_DECODER 0 ++#define CONFIG_THEORA_DECODER 1 ++#define CONFIG_THP_DECODER 0 ++#define CONFIG_TIERTEXSEQVIDEO_DECODER 0 ++#define CONFIG_TIFF_DECODER 0 ++#define CONFIG_TMV_DECODER 0 ++#define CONFIG_TRUEMOTION1_DECODER 0 ++#define CONFIG_TRUEMOTION2_DECODER 0 ++#define CONFIG_TRUEMOTION2RT_DECODER 0 ++#define CONFIG_TSCC_DECODER 0 ++#define CONFIG_TSCC2_DECODER 0 ++#define CONFIG_TXD_DECODER 0 ++#define CONFIG_ULTI_DECODER 0 ++#define CONFIG_UTVIDEO_DECODER 0 ++#define CONFIG_V210_DECODER 0 ++#define CONFIG_V210X_DECODER 0 ++#define CONFIG_V308_DECODER 0 ++#define CONFIG_V408_DECODER 0 ++#define CONFIG_V410_DECODER 0 ++#define CONFIG_VB_DECODER 0 ++#define CONFIG_VBN_DECODER 0 ++#define CONFIG_VBLE_DECODER 0 ++#define CONFIG_VC1_DECODER 0 ++#define CONFIG_VC1_CRYSTALHD_DECODER 0 ++#define CONFIG_VC1IMAGE_DECODER 0 ++#define CONFIG_VC1_MMAL_DECODER 0 ++#define CONFIG_VC1_QSV_DECODER 0 ++#define CONFIG_VC1_V4L2M2M_DECODER 0 ++#define CONFIG_VCR1_DECODER 0 ++#define CONFIG_VMDVIDEO_DECODER 0 ++#define CONFIG_VMNC_DECODER 0 ++#define CONFIG_VP3_DECODER 1 ++#define CONFIG_VP4_DECODER 0 ++#define CONFIG_VP5_DECODER 0 ++#define CONFIG_VP6_DECODER 0 ++#define CONFIG_VP6A_DECODER 0 ++#define CONFIG_VP6F_DECODER 0 ++#define CONFIG_VP7_DECODER 0 ++#define CONFIG_VP8_DECODER 1 ++#define CONFIG_VP8_RKMPP_DECODER 0 ++#define CONFIG_VP8_V4L2M2M_DECODER 0 ++#define CONFIG_VP9_DECODER 0 ++#define CONFIG_VP9_RKMPP_DECODER 0 ++#define CONFIG_VP9_V4L2M2M_DECODER 0 ++#define CONFIG_VQA_DECODER 0 ++#define CONFIG_WEBP_DECODER 0 ++#define CONFIG_WCMV_DECODER 0 ++#define CONFIG_WRAPPED_AVFRAME_DECODER 0 ++#define CONFIG_WMV1_DECODER 0 ++#define CONFIG_WMV2_DECODER 0 ++#define CONFIG_WMV3_DECODER 0 ++#define CONFIG_WMV3_CRYSTALHD_DECODER 0 ++#define CONFIG_WMV3IMAGE_DECODER 0 ++#define CONFIG_WNV1_DECODER 0 ++#define CONFIG_XAN_WC3_DECODER 0 ++#define CONFIG_XAN_WC4_DECODER 0 ++#define CONFIG_XBM_DECODER 0 ++#define CONFIG_XFACE_DECODER 0 ++#define CONFIG_XL_DECODER 0 ++#define CONFIG_XPM_DECODER 0 ++#define CONFIG_XWD_DECODER 0 ++#define CONFIG_Y41P_DECODER 0 ++#define CONFIG_YLC_DECODER 0 ++#define CONFIG_YOP_DECODER 0 ++#define CONFIG_YUV4_DECODER 0 ++#define CONFIG_ZERO12V_DECODER 0 ++#define CONFIG_ZEROCODEC_DECODER 0 ++#define CONFIG_ZLIB_DECODER 0 ++#define CONFIG_ZMBV_DECODER 0 ++#define CONFIG_AAC_DECODER 1 ++#define CONFIG_AAC_FIXED_DECODER 0 ++#define CONFIG_AAC_LATM_DECODER 0 ++#define CONFIG_AC3_DECODER 0 ++#define CONFIG_AC3_FIXED_DECODER 0 ++#define CONFIG_ACELP_KELVIN_DECODER 0 ++#define CONFIG_ALAC_DECODER 0 ++#define CONFIG_ALS_DECODER 0 ++#define CONFIG_AMRNB_DECODER 0 ++#define CONFIG_AMRWB_DECODER 0 ++#define CONFIG_APE_DECODER 0 ++#define CONFIG_APTX_DECODER 0 ++#define CONFIG_APTX_HD_DECODER 0 ++#define CONFIG_ATRAC1_DECODER 0 ++#define CONFIG_ATRAC3_DECODER 0 ++#define CONFIG_ATRAC3AL_DECODER 0 ++#define CONFIG_ATRAC3P_DECODER 0 ++#define CONFIG_ATRAC3PAL_DECODER 0 ++#define CONFIG_ATRAC9_DECODER 0 ++#define CONFIG_BINKAUDIO_DCT_DECODER 0 ++#define CONFIG_BINKAUDIO_RDFT_DECODER 0 ++#define CONFIG_BMV_AUDIO_DECODER 0 ++#define CONFIG_COOK_DECODER 0 ++#define CONFIG_DCA_DECODER 0 ++#define CONFIG_DFPWM_DECODER 0 ++#define CONFIG_DOLBY_E_DECODER 0 ++#define CONFIG_DSD_LSBF_DECODER 0 ++#define CONFIG_DSD_MSBF_DECODER 0 ++#define CONFIG_DSD_LSBF_PLANAR_DECODER 0 ++#define CONFIG_DSD_MSBF_PLANAR_DECODER 0 ++#define CONFIG_DSICINAUDIO_DECODER 0 ++#define CONFIG_DSS_SP_DECODER 0 ++#define CONFIG_DST_DECODER 0 ++#define CONFIG_EAC3_DECODER 0 ++#define CONFIG_EVRC_DECODER 0 ++#define CONFIG_FASTAUDIO_DECODER 0 ++#define CONFIG_FFWAVESYNTH_DECODER 0 ++#define CONFIG_FLAC_DECODER 1 ++#define CONFIG_G723_1_DECODER 0 ++#define CONFIG_G729_DECODER 0 ++#define CONFIG_GSM_DECODER 0 ++#define CONFIG_GSM_MS_DECODER 0 ++#define CONFIG_HCA_DECODER 0 ++#define CONFIG_HCOM_DECODER 0 ++#define CONFIG_IAC_DECODER 0 ++#define CONFIG_ILBC_DECODER 0 ++#define CONFIG_IMC_DECODER 0 ++#define CONFIG_INTERPLAY_ACM_DECODER 0 ++#define CONFIG_MACE3_DECODER 0 ++#define CONFIG_MACE6_DECODER 0 ++#define CONFIG_METASOUND_DECODER 0 ++#define CONFIG_MLP_DECODER 0 ++#define CONFIG_MP1_DECODER 0 ++#define CONFIG_MP1FLOAT_DECODER 0 ++#define CONFIG_MP2_DECODER 0 ++#define CONFIG_MP2FLOAT_DECODER 0 ++#define CONFIG_MP3FLOAT_DECODER 0 ++#define CONFIG_MP3_DECODER 1 ++#define CONFIG_MP3ADUFLOAT_DECODER 0 ++#define CONFIG_MP3ADU_DECODER 0 ++#define CONFIG_MP3ON4FLOAT_DECODER 0 ++#define CONFIG_MP3ON4_DECODER 0 ++#define CONFIG_MPC7_DECODER 0 ++#define CONFIG_MPC8_DECODER 0 ++#define CONFIG_MSNSIREN_DECODER 0 ++#define CONFIG_NELLYMOSER_DECODER 0 ++#define CONFIG_ON2AVC_DECODER 0 ++#define CONFIG_OPUS_DECODER 0 ++#define CONFIG_PAF_AUDIO_DECODER 0 ++#define CONFIG_QCELP_DECODER 0 ++#define CONFIG_QDM2_DECODER 0 ++#define CONFIG_QDMC_DECODER 0 ++#define CONFIG_RA_144_DECODER 0 ++#define CONFIG_RA_288_DECODER 0 ++#define CONFIG_RALF_DECODER 0 ++#define CONFIG_SBC_DECODER 0 ++#define CONFIG_SHORTEN_DECODER 0 ++#define CONFIG_SIPR_DECODER 0 ++#define CONFIG_SIREN_DECODER 0 ++#define CONFIG_SMACKAUD_DECODER 0 ++#define CONFIG_SONIC_DECODER 0 ++#define CONFIG_TAK_DECODER 0 ++#define CONFIG_TRUEHD_DECODER 0 ++#define CONFIG_TRUESPEECH_DECODER 0 ++#define CONFIG_TTA_DECODER 0 ++#define CONFIG_TWINVQ_DECODER 0 ++#define CONFIG_VMDAUDIO_DECODER 0 ++#define CONFIG_VORBIS_DECODER 1 ++#define CONFIG_WAVPACK_DECODER 0 ++#define CONFIG_WMALOSSLESS_DECODER 0 ++#define CONFIG_WMAPRO_DECODER 0 ++#define CONFIG_WMAV1_DECODER 0 ++#define CONFIG_WMAV2_DECODER 0 ++#define CONFIG_WMAVOICE_DECODER 0 ++#define CONFIG_WS_SND1_DECODER 0 ++#define CONFIG_XMA1_DECODER 0 ++#define CONFIG_XMA2_DECODER 0 ++#define CONFIG_PCM_ALAW_DECODER 1 ++#define CONFIG_PCM_BLURAY_DECODER 0 ++#define CONFIG_PCM_DVD_DECODER 0 ++#define CONFIG_PCM_F16LE_DECODER 0 ++#define CONFIG_PCM_F24LE_DECODER 0 ++#define CONFIG_PCM_F32BE_DECODER 0 ++#define CONFIG_PCM_F32LE_DECODER 1 ++#define CONFIG_PCM_F64BE_DECODER 0 ++#define CONFIG_PCM_F64LE_DECODER 0 ++#define CONFIG_PCM_LXF_DECODER 0 ++#define CONFIG_PCM_MULAW_DECODER 1 ++#define CONFIG_PCM_S8_DECODER 0 ++#define CONFIG_PCM_S8_PLANAR_DECODER 0 ++#define CONFIG_PCM_S16BE_DECODER 1 ++#define CONFIG_PCM_S16BE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S16LE_DECODER 1 ++#define CONFIG_PCM_S16LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S24BE_DECODER 1 ++#define CONFIG_PCM_S24DAUD_DECODER 0 ++#define CONFIG_PCM_S24LE_DECODER 1 ++#define CONFIG_PCM_S24LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S32BE_DECODER 0 ++#define CONFIG_PCM_S32LE_DECODER 1 ++#define CONFIG_PCM_S32LE_PLANAR_DECODER 0 ++#define CONFIG_PCM_S64BE_DECODER 0 ++#define CONFIG_PCM_S64LE_DECODER 0 ++#define CONFIG_PCM_SGA_DECODER 0 ++#define CONFIG_PCM_U8_DECODER 1 ++#define CONFIG_PCM_U16BE_DECODER 0 ++#define CONFIG_PCM_U16LE_DECODER 0 ++#define CONFIG_PCM_U24BE_DECODER 0 ++#define CONFIG_PCM_U24LE_DECODER 0 ++#define CONFIG_PCM_U32BE_DECODER 0 ++#define CONFIG_PCM_U32LE_DECODER 0 ++#define CONFIG_PCM_VIDC_DECODER 0 ++#define CONFIG_DERF_DPCM_DECODER 0 ++#define CONFIG_GREMLIN_DPCM_DECODER 0 ++#define CONFIG_INTERPLAY_DPCM_DECODER 0 ++#define CONFIG_ROQ_DPCM_DECODER 0 ++#define CONFIG_SDX2_DPCM_DECODER 0 ++#define CONFIG_SOL_DPCM_DECODER 0 ++#define CONFIG_XAN_DPCM_DECODER 0 ++#define CONFIG_ADPCM_4XM_DECODER 0 ++#define CONFIG_ADPCM_ADX_DECODER 0 ++#define CONFIG_ADPCM_AFC_DECODER 0 ++#define CONFIG_ADPCM_AGM_DECODER 0 ++#define CONFIG_ADPCM_AICA_DECODER 0 ++#define CONFIG_ADPCM_ARGO_DECODER 0 ++#define CONFIG_ADPCM_CT_DECODER 0 ++#define CONFIG_ADPCM_DTK_DECODER 0 ++#define CONFIG_ADPCM_EA_DECODER 0 ++#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0 ++#define CONFIG_ADPCM_EA_R1_DECODER 0 ++#define CONFIG_ADPCM_EA_R2_DECODER 0 ++#define CONFIG_ADPCM_EA_R3_DECODER 0 ++#define CONFIG_ADPCM_EA_XAS_DECODER 0 ++#define CONFIG_ADPCM_G722_DECODER 0 ++#define CONFIG_ADPCM_G726_DECODER 0 ++#define CONFIG_ADPCM_G726LE_DECODER 0 ++#define CONFIG_ADPCM_IMA_ACORN_DECODER 0 ++#define CONFIG_ADPCM_IMA_AMV_DECODER 0 ++#define CONFIG_ADPCM_IMA_ALP_DECODER 0 ++#define CONFIG_ADPCM_IMA_APC_DECODER 0 ++#define CONFIG_ADPCM_IMA_APM_DECODER 0 ++#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0 ++#define CONFIG_ADPCM_IMA_DAT4_DECODER 0 ++#define CONFIG_ADPCM_IMA_DK3_DECODER 0 ++#define CONFIG_ADPCM_IMA_DK4_DECODER 0 ++#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0 ++#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0 ++#define CONFIG_ADPCM_IMA_ISS_DECODER 0 ++#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0 ++#define CONFIG_ADPCM_IMA_MTF_DECODER 0 ++#define CONFIG_ADPCM_IMA_OKI_DECODER 0 ++#define CONFIG_ADPCM_IMA_QT_DECODER 0 ++#define CONFIG_ADPCM_IMA_RAD_DECODER 0 ++#define CONFIG_ADPCM_IMA_SSI_DECODER 0 ++#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0 ++#define CONFIG_ADPCM_IMA_WAV_DECODER 0 ++#define CONFIG_ADPCM_IMA_WS_DECODER 0 ++#define CONFIG_ADPCM_MS_DECODER 0 ++#define CONFIG_ADPCM_MTAF_DECODER 0 ++#define CONFIG_ADPCM_PSX_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_2_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_3_DECODER 0 ++#define CONFIG_ADPCM_SBPRO_4_DECODER 0 ++#define CONFIG_ADPCM_SWF_DECODER 0 ++#define CONFIG_ADPCM_THP_DECODER 0 ++#define CONFIG_ADPCM_THP_LE_DECODER 0 ++#define CONFIG_ADPCM_VIMA_DECODER 0 ++#define CONFIG_ADPCM_XA_DECODER 0 ++#define CONFIG_ADPCM_YAMAHA_DECODER 0 ++#define CONFIG_ADPCM_ZORK_DECODER 0 ++#define CONFIG_SSA_DECODER 0 ++#define CONFIG_ASS_DECODER 0 ++#define CONFIG_CCAPTION_DECODER 0 ++#define CONFIG_DVBSUB_DECODER 0 ++#define CONFIG_DVDSUB_DECODER 0 ++#define CONFIG_JACOSUB_DECODER 0 ++#define CONFIG_MICRODVD_DECODER 0 ++#define CONFIG_MOVTEXT_DECODER 0 ++#define CONFIG_MPL2_DECODER 0 ++#define CONFIG_PGSSUB_DECODER 0 ++#define CONFIG_PJS_DECODER 0 ++#define CONFIG_REALTEXT_DECODER 0 ++#define CONFIG_SAMI_DECODER 0 ++#define CONFIG_SRT_DECODER 0 ++#define CONFIG_STL_DECODER 0 ++#define CONFIG_SUBRIP_DECODER 0 ++#define CONFIG_SUBVIEWER_DECODER 0 ++#define CONFIG_SUBVIEWER1_DECODER 0 ++#define CONFIG_TEXT_DECODER 0 ++#define CONFIG_VPLAYER_DECODER 0 ++#define CONFIG_WEBVTT_DECODER 0 ++#define CONFIG_XSUB_DECODER 0 ++#define CONFIG_AAC_AT_DECODER 0 ++#define CONFIG_AC3_AT_DECODER 0 ++#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0 ++#define CONFIG_ALAC_AT_DECODER 0 ++#define CONFIG_AMR_NB_AT_DECODER 0 ++#define CONFIG_EAC3_AT_DECODER 0 ++#define CONFIG_GSM_MS_AT_DECODER 0 ++#define CONFIG_ILBC_AT_DECODER 0 ++#define CONFIG_MP1_AT_DECODER 0 ++#define CONFIG_MP2_AT_DECODER 0 ++#define CONFIG_MP3_AT_DECODER 0 ++#define CONFIG_PCM_ALAW_AT_DECODER 0 ++#define CONFIG_PCM_MULAW_AT_DECODER 0 ++#define CONFIG_QDMC_AT_DECODER 0 ++#define CONFIG_QDM2_AT_DECODER 0 ++#define CONFIG_LIBARIBB24_DECODER 0 ++#define CONFIG_LIBCELT_DECODER 0 ++#define CONFIG_LIBCODEC2_DECODER 0 ++#define CONFIG_LIBDAV1D_DECODER 0 ++#define CONFIG_LIBDAVS2_DECODER 0 ++#define CONFIG_LIBFDK_AAC_DECODER 0 ++#define CONFIG_LIBGSM_DECODER 0 ++#define CONFIG_LIBGSM_MS_DECODER 0 ++#define CONFIG_LIBILBC_DECODER 0 ++#define CONFIG_LIBJXL_DECODER 0 ++#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0 ++#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0 ++#define CONFIG_LIBOPENJPEG_DECODER 0 ++#define CONFIG_LIBOPUS_DECODER 1 ++#define CONFIG_LIBRSVG_DECODER 0 ++#define CONFIG_LIBSPEEX_DECODER 0 ++#define CONFIG_LIBUAVS3D_DECODER 0 ++#define CONFIG_LIBVORBIS_DECODER 0 ++#define CONFIG_LIBVPX_VP8_DECODER 0 ++#define CONFIG_LIBVPX_VP9_DECODER 0 ++#define CONFIG_LIBZVBI_TELETEXT_DECODER 0 ++#define CONFIG_BINTEXT_DECODER 0 ++#define CONFIG_XBIN_DECODER 0 ++#define CONFIG_IDF_DECODER 0 ++#define CONFIG_LIBAOM_AV1_DECODER 0 ++#define CONFIG_AV1_DECODER 0 ++#define CONFIG_AV1_CUVID_DECODER 0 ++#define CONFIG_AV1_QSV_DECODER 0 ++#define CONFIG_LIBOPENH264_DECODER 0 ++#define CONFIG_H264_CUVID_DECODER 0 ++#define CONFIG_HEVC_CUVID_DECODER 0 ++#define CONFIG_HEVC_MEDIACODEC_DECODER 0 ++#define CONFIG_MJPEG_CUVID_DECODER 0 ++#define CONFIG_MJPEG_QSV_DECODER 0 ++#define CONFIG_MPEG1_CUVID_DECODER 0 ++#define CONFIG_MPEG2_CUVID_DECODER 0 ++#define CONFIG_MPEG4_CUVID_DECODER 0 ++#define CONFIG_MPEG4_MEDIACODEC_DECODER 0 ++#define CONFIG_VC1_CUVID_DECODER 0 ++#define CONFIG_VP8_CUVID_DECODER 0 ++#define CONFIG_VP8_MEDIACODEC_DECODER 0 ++#define CONFIG_VP8_QSV_DECODER 0 ++#define CONFIG_VP9_CUVID_DECODER 0 ++#define CONFIG_VP9_MEDIACODEC_DECODER 0 ++#define CONFIG_VP9_QSV_DECODER 0 ++#define CONFIG_A64MULTI_ENCODER 0 ++#define CONFIG_A64MULTI5_ENCODER 0 ++#define CONFIG_ALIAS_PIX_ENCODER 0 ++#define CONFIG_AMV_ENCODER 0 ++#define CONFIG_APNG_ENCODER 0 ++#define CONFIG_ASV1_ENCODER 0 ++#define CONFIG_ASV2_ENCODER 0 ++#define CONFIG_AVRP_ENCODER 0 ++#define CONFIG_AVUI_ENCODER 0 ++#define CONFIG_AYUV_ENCODER 0 ++#define CONFIG_BITPACKED_ENCODER 0 ++#define CONFIG_BMP_ENCODER 0 ++#define CONFIG_CFHD_ENCODER 0 ++#define CONFIG_CINEPAK_ENCODER 0 ++#define CONFIG_CLJR_ENCODER 0 ++#define CONFIG_COMFORTNOISE_ENCODER 0 ++#define CONFIG_DNXHD_ENCODER 0 ++#define CONFIG_DPX_ENCODER 0 ++#define CONFIG_DVVIDEO_ENCODER 0 ++#define CONFIG_EXR_ENCODER 0 ++#define CONFIG_FFV1_ENCODER 0 ++#define CONFIG_FFVHUFF_ENCODER 0 ++#define CONFIG_FITS_ENCODER 0 ++#define CONFIG_FLASHSV_ENCODER 0 ++#define CONFIG_FLASHSV2_ENCODER 0 ++#define CONFIG_FLV_ENCODER 0 ++#define CONFIG_GIF_ENCODER 0 ++#define CONFIG_H261_ENCODER 0 ++#define CONFIG_H263_ENCODER 0 ++#define CONFIG_H263P_ENCODER 0 ++#define CONFIG_HAP_ENCODER 0 ++#define CONFIG_HUFFYUV_ENCODER 0 ++#define CONFIG_JPEG2000_ENCODER 0 ++#define CONFIG_JPEGLS_ENCODER 0 ++#define CONFIG_LJPEG_ENCODER 0 ++#define CONFIG_MAGICYUV_ENCODER 0 ++#define CONFIG_MJPEG_ENCODER 0 ++#define CONFIG_MPEG1VIDEO_ENCODER 0 ++#define CONFIG_MPEG2VIDEO_ENCODER 0 ++#define CONFIG_MPEG4_ENCODER 0 ++#define CONFIG_MSMPEG4V2_ENCODER 0 ++#define CONFIG_MSMPEG4V3_ENCODER 0 ++#define CONFIG_MSVIDEO1_ENCODER 0 ++#define CONFIG_PAM_ENCODER 0 ++#define CONFIG_PBM_ENCODER 0 ++#define CONFIG_PCX_ENCODER 0 ++#define CONFIG_PFM_ENCODER 0 ++#define CONFIG_PGM_ENCODER 0 ++#define CONFIG_PGMYUV_ENCODER 0 ++#define CONFIG_PNG_ENCODER 0 ++#define CONFIG_PPM_ENCODER 0 ++#define CONFIG_PRORES_ENCODER 0 ++#define CONFIG_PRORES_AW_ENCODER 0 ++#define CONFIG_PRORES_KS_ENCODER 0 ++#define CONFIG_QTRLE_ENCODER 0 ++#define CONFIG_R10K_ENCODER 0 ++#define CONFIG_R210_ENCODER 0 ++#define CONFIG_RAWVIDEO_ENCODER 0 ++#define CONFIG_ROQ_ENCODER 0 ++#define CONFIG_RPZA_ENCODER 0 ++#define CONFIG_RV10_ENCODER 0 ++#define CONFIG_RV20_ENCODER 0 ++#define CONFIG_S302M_ENCODER 0 ++#define CONFIG_SGI_ENCODER 0 ++#define CONFIG_SMC_ENCODER 0 ++#define CONFIG_SNOW_ENCODER 0 ++#define CONFIG_SPEEDHQ_ENCODER 0 ++#define CONFIG_SUNRAST_ENCODER 0 ++#define CONFIG_SVQ1_ENCODER 0 ++#define CONFIG_TARGA_ENCODER 0 ++#define CONFIG_TIFF_ENCODER 0 ++#define CONFIG_UTVIDEO_ENCODER 0 ++#define CONFIG_V210_ENCODER 0 ++#define CONFIG_V308_ENCODER 0 ++#define CONFIG_V408_ENCODER 0 ++#define CONFIG_V410_ENCODER 0 ++#define CONFIG_VBN_ENCODER 0 ++#define CONFIG_VC2_ENCODER 0 ++#define CONFIG_WRAPPED_AVFRAME_ENCODER 0 ++#define CONFIG_WMV1_ENCODER 0 ++#define CONFIG_WMV2_ENCODER 0 ++#define CONFIG_XBM_ENCODER 0 ++#define CONFIG_XFACE_ENCODER 0 ++#define CONFIG_XWD_ENCODER 0 ++#define CONFIG_Y41P_ENCODER 0 ++#define CONFIG_YUV4_ENCODER 0 ++#define CONFIG_ZLIB_ENCODER 0 ++#define CONFIG_ZMBV_ENCODER 0 ++#define CONFIG_AAC_ENCODER 0 ++#define CONFIG_AC3_ENCODER 0 ++#define CONFIG_AC3_FIXED_ENCODER 0 ++#define CONFIG_ALAC_ENCODER 0 ++#define CONFIG_APTX_ENCODER 0 ++#define CONFIG_APTX_HD_ENCODER 0 ++#define CONFIG_DCA_ENCODER 0 ++#define CONFIG_DFPWM_ENCODER 0 ++#define CONFIG_EAC3_ENCODER 0 ++#define CONFIG_FLAC_ENCODER 0 ++#define CONFIG_G723_1_ENCODER 0 ++#define CONFIG_MLP_ENCODER 0 ++#define CONFIG_MP2_ENCODER 0 ++#define CONFIG_MP2FIXED_ENCODER 0 ++#define CONFIG_NELLYMOSER_ENCODER 0 ++#define CONFIG_OPUS_ENCODER 0 ++#define CONFIG_RA_144_ENCODER 0 ++#define CONFIG_SBC_ENCODER 0 ++#define CONFIG_SONIC_ENCODER 0 ++#define CONFIG_SONIC_LS_ENCODER 0 ++#define CONFIG_TRUEHD_ENCODER 0 ++#define CONFIG_TTA_ENCODER 0 ++#define CONFIG_VORBIS_ENCODER 0 ++#define CONFIG_WAVPACK_ENCODER 0 ++#define CONFIG_WMAV1_ENCODER 0 ++#define CONFIG_WMAV2_ENCODER 0 ++#define CONFIG_PCM_ALAW_ENCODER 0 ++#define CONFIG_PCM_BLURAY_ENCODER 0 ++#define CONFIG_PCM_DVD_ENCODER 0 ++#define CONFIG_PCM_F32BE_ENCODER 0 ++#define CONFIG_PCM_F32LE_ENCODER 0 ++#define CONFIG_PCM_F64BE_ENCODER 0 ++#define CONFIG_PCM_F64LE_ENCODER 0 ++#define CONFIG_PCM_MULAW_ENCODER 0 ++#define CONFIG_PCM_S8_ENCODER 0 ++#define CONFIG_PCM_S8_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S16BE_ENCODER 0 ++#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S16LE_ENCODER 0 ++#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S24BE_ENCODER 0 ++#define CONFIG_PCM_S24DAUD_ENCODER 0 ++#define CONFIG_PCM_S24LE_ENCODER 0 ++#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S32BE_ENCODER 0 ++#define CONFIG_PCM_S32LE_ENCODER 0 ++#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0 ++#define CONFIG_PCM_S64BE_ENCODER 0 ++#define CONFIG_PCM_S64LE_ENCODER 0 ++#define CONFIG_PCM_U8_ENCODER 0 ++#define CONFIG_PCM_U16BE_ENCODER 0 ++#define CONFIG_PCM_U16LE_ENCODER 0 ++#define CONFIG_PCM_U24BE_ENCODER 0 ++#define CONFIG_PCM_U24LE_ENCODER 0 ++#define CONFIG_PCM_U32BE_ENCODER 0 ++#define CONFIG_PCM_U32LE_ENCODER 0 ++#define CONFIG_PCM_VIDC_ENCODER 0 ++#define CONFIG_ROQ_DPCM_ENCODER 0 ++#define CONFIG_ADPCM_ADX_ENCODER 0 ++#define CONFIG_ADPCM_ARGO_ENCODER 0 ++#define CONFIG_ADPCM_G722_ENCODER 0 ++#define CONFIG_ADPCM_G726_ENCODER 0 ++#define CONFIG_ADPCM_G726LE_ENCODER 0 ++#define CONFIG_ADPCM_IMA_AMV_ENCODER 0 ++#define CONFIG_ADPCM_IMA_ALP_ENCODER 0 ++#define CONFIG_ADPCM_IMA_APM_ENCODER 0 ++#define CONFIG_ADPCM_IMA_QT_ENCODER 0 ++#define CONFIG_ADPCM_IMA_SSI_ENCODER 0 ++#define CONFIG_ADPCM_IMA_WAV_ENCODER 0 ++#define CONFIG_ADPCM_IMA_WS_ENCODER 0 ++#define CONFIG_ADPCM_MS_ENCODER 0 ++#define CONFIG_ADPCM_SWF_ENCODER 0 ++#define CONFIG_ADPCM_YAMAHA_ENCODER 0 ++#define CONFIG_SSA_ENCODER 0 ++#define CONFIG_ASS_ENCODER 0 ++#define CONFIG_DVBSUB_ENCODER 0 ++#define CONFIG_DVDSUB_ENCODER 0 ++#define CONFIG_MOVTEXT_ENCODER 0 ++#define CONFIG_SRT_ENCODER 0 ++#define CONFIG_SUBRIP_ENCODER 0 ++#define CONFIG_TEXT_ENCODER 0 ++#define CONFIG_TTML_ENCODER 0 ++#define CONFIG_WEBVTT_ENCODER 0 ++#define CONFIG_XSUB_ENCODER 0 ++#define CONFIG_AAC_AT_ENCODER 0 ++#define CONFIG_ALAC_AT_ENCODER 0 ++#define CONFIG_ILBC_AT_ENCODER 0 ++#define CONFIG_PCM_ALAW_AT_ENCODER 0 ++#define CONFIG_PCM_MULAW_AT_ENCODER 0 ++#define CONFIG_LIBAOM_AV1_ENCODER 0 ++#define CONFIG_LIBCODEC2_ENCODER 0 ++#define CONFIG_LIBFDK_AAC_ENCODER 0 ++#define CONFIG_LIBGSM_ENCODER 0 ++#define CONFIG_LIBGSM_MS_ENCODER 0 ++#define CONFIG_LIBILBC_ENCODER 0 ++#define CONFIG_LIBJXL_ENCODER 0 ++#define CONFIG_LIBMP3LAME_ENCODER 0 ++#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0 ++#define CONFIG_LIBOPENJPEG_ENCODER 0 ++#define CONFIG_LIBOPUS_ENCODER 0 ++#define CONFIG_LIBRAV1E_ENCODER 0 ++#define CONFIG_LIBSHINE_ENCODER 0 ++#define CONFIG_LIBSPEEX_ENCODER 0 ++#define CONFIG_LIBSVTAV1_ENCODER 0 ++#define CONFIG_LIBTHEORA_ENCODER 0 ++#define CONFIG_LIBTWOLAME_ENCODER 0 ++#define CONFIG_LIBVO_AMRWBENC_ENCODER 0 ++#define CONFIG_LIBVORBIS_ENCODER 0 ++#define CONFIG_LIBVPX_VP8_ENCODER 0 ++#define CONFIG_LIBVPX_VP9_ENCODER 0 ++#define CONFIG_LIBWEBP_ANIM_ENCODER 0 ++#define CONFIG_LIBWEBP_ENCODER 0 ++#define CONFIG_LIBX262_ENCODER 0 ++#define CONFIG_LIBX264_ENCODER 0 ++#define CONFIG_LIBX264RGB_ENCODER 0 ++#define CONFIG_LIBX265_ENCODER 0 ++#define CONFIG_LIBXAVS_ENCODER 0 ++#define CONFIG_LIBXAVS2_ENCODER 0 ++#define CONFIG_LIBXVID_ENCODER 0 ++#define CONFIG_AAC_MF_ENCODER 0 ++#define CONFIG_AC3_MF_ENCODER 0 ++#define CONFIG_H263_V4L2M2M_ENCODER 0 ++#define CONFIG_LIBOPENH264_ENCODER 0 ++#define CONFIG_H264_AMF_ENCODER 0 ++#define CONFIG_H264_MF_ENCODER 0 ++#define CONFIG_H264_NVENC_ENCODER 0 ++#define CONFIG_H264_OMX_ENCODER 0 ++#define CONFIG_H264_QSV_ENCODER 0 ++#define CONFIG_H264_V4L2M2M_ENCODER 0 ++#define CONFIG_H264_VAAPI_ENCODER 0 ++#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_HEVC_AMF_ENCODER 0 ++#define CONFIG_HEVC_MF_ENCODER 0 ++#define CONFIG_HEVC_NVENC_ENCODER 0 ++#define CONFIG_HEVC_QSV_ENCODER 0 ++#define CONFIG_HEVC_V4L2M2M_ENCODER 0 ++#define CONFIG_HEVC_VAAPI_ENCODER 0 ++#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_LIBKVAZAAR_ENCODER 0 ++#define CONFIG_MJPEG_QSV_ENCODER 0 ++#define CONFIG_MJPEG_VAAPI_ENCODER 0 ++#define CONFIG_MP3_MF_ENCODER 0 ++#define CONFIG_MPEG2_QSV_ENCODER 0 ++#define CONFIG_MPEG2_VAAPI_ENCODER 0 ++#define CONFIG_MPEG4_OMX_ENCODER 0 ++#define CONFIG_MPEG4_V4L2M2M_ENCODER 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0 ++#define CONFIG_VP8_V4L2M2M_ENCODER 0 ++#define CONFIG_VP8_VAAPI_ENCODER 0 ++#define CONFIG_VP9_VAAPI_ENCODER 0 ++#define CONFIG_VP9_QSV_ENCODER 0 ++#define CONFIG_AV1_D3D11VA_HWACCEL 0 ++#define CONFIG_AV1_D3D11VA2_HWACCEL 0 ++#define CONFIG_AV1_DXVA2_HWACCEL 0 ++#define CONFIG_AV1_NVDEC_HWACCEL 0 ++#define CONFIG_AV1_VAAPI_HWACCEL 0 ++#define CONFIG_H263_VAAPI_HWACCEL 0 ++#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_H264_D3D11VA_HWACCEL 0 ++#define CONFIG_H264_D3D11VA2_HWACCEL 0 ++#define CONFIG_H264_DXVA2_HWACCEL 0 ++#define CONFIG_H264_NVDEC_HWACCEL 0 ++#define CONFIG_H264_VAAPI_HWACCEL 0 ++#define CONFIG_H264_VDPAU_HWACCEL 0 ++#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_HEVC_D3D11VA_HWACCEL 0 ++#define CONFIG_HEVC_D3D11VA2_HWACCEL 0 ++#define CONFIG_HEVC_DXVA2_HWACCEL 0 ++#define CONFIG_HEVC_NVDEC_HWACCEL 0 ++#define CONFIG_HEVC_VAAPI_HWACCEL 0 ++#define CONFIG_HEVC_VDPAU_HWACCEL 0 ++#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MJPEG_NVDEC_HWACCEL 0 ++#define CONFIG_MJPEG_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG1_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG1_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MPEG2_D3D11VA_HWACCEL 0 ++#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0 ++#define CONFIG_MPEG2_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG2_DXVA2_HWACCEL 0 ++#define CONFIG_MPEG2_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG2_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_MPEG4_NVDEC_HWACCEL 0 ++#define CONFIG_MPEG4_VAAPI_HWACCEL 0 ++#define CONFIG_MPEG4_VDPAU_HWACCEL 0 ++#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_VC1_D3D11VA_HWACCEL 0 ++#define CONFIG_VC1_D3D11VA2_HWACCEL 0 ++#define CONFIG_VC1_DXVA2_HWACCEL 0 ++#define CONFIG_VC1_NVDEC_HWACCEL 0 ++#define CONFIG_VC1_VAAPI_HWACCEL 0 ++#define CONFIG_VC1_VDPAU_HWACCEL 0 ++#define CONFIG_VP8_NVDEC_HWACCEL 0 ++#define CONFIG_VP8_VAAPI_HWACCEL 0 ++#define CONFIG_VP9_D3D11VA_HWACCEL 0 ++#define CONFIG_VP9_D3D11VA2_HWACCEL 0 ++#define CONFIG_VP9_DXVA2_HWACCEL 0 ++#define CONFIG_VP9_NVDEC_HWACCEL 0 ++#define CONFIG_VP9_VAAPI_HWACCEL 0 ++#define CONFIG_VP9_VDPAU_HWACCEL 0 ++#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0 ++#define CONFIG_WMV3_D3D11VA_HWACCEL 0 ++#define CONFIG_WMV3_D3D11VA2_HWACCEL 0 ++#define CONFIG_WMV3_DXVA2_HWACCEL 0 ++#define CONFIG_WMV3_NVDEC_HWACCEL 0 ++#define CONFIG_WMV3_VAAPI_HWACCEL 0 ++#define CONFIG_WMV3_VDPAU_HWACCEL 0 ++#define CONFIG_AAC_PARSER 1 ++#define CONFIG_AAC_LATM_PARSER 0 ++#define CONFIG_AC3_PARSER 0 ++#define CONFIG_ADX_PARSER 0 ++#define CONFIG_AMR_PARSER 0 ++#define CONFIG_AV1_PARSER 0 ++#define CONFIG_AVS2_PARSER 0 ++#define CONFIG_AVS3_PARSER 0 ++#define CONFIG_BMP_PARSER 0 ++#define CONFIG_CAVSVIDEO_PARSER 0 ++#define CONFIG_COOK_PARSER 0 ++#define CONFIG_CRI_PARSER 0 ++#define CONFIG_DCA_PARSER 0 ++#define CONFIG_DIRAC_PARSER 0 ++#define CONFIG_DNXHD_PARSER 0 ++#define CONFIG_DOLBY_E_PARSER 0 ++#define CONFIG_DPX_PARSER 0 ++#define CONFIG_DVAUDIO_PARSER 0 ++#define CONFIG_DVBSUB_PARSER 0 ++#define CONFIG_DVDSUB_PARSER 0 ++#define CONFIG_DVD_NAV_PARSER 0 ++#define CONFIG_FLAC_PARSER 1 ++#define CONFIG_G723_1_PARSER 0 ++#define CONFIG_G729_PARSER 0 ++#define CONFIG_GIF_PARSER 0 ++#define CONFIG_GSM_PARSER 0 ++#define CONFIG_H261_PARSER 0 ++#define CONFIG_H263_PARSER 0 ++#define CONFIG_H264_PARSER 1 ++#define CONFIG_HEVC_PARSER 0 ++#define CONFIG_IPU_PARSER 0 ++#define CONFIG_JPEG2000_PARSER 0 ++#define CONFIG_MJPEG_PARSER 0 ++#define CONFIG_MLP_PARSER 0 ++#define CONFIG_MPEG4VIDEO_PARSER 0 ++#define CONFIG_MPEGAUDIO_PARSER 1 ++#define CONFIG_MPEGVIDEO_PARSER 0 ++#define CONFIG_OPUS_PARSER 1 ++#define CONFIG_PNG_PARSER 0 ++#define CONFIG_PNM_PARSER 0 ++#define CONFIG_RV30_PARSER 0 ++#define CONFIG_RV40_PARSER 0 ++#define CONFIG_SBC_PARSER 0 ++#define CONFIG_SIPR_PARSER 0 ++#define CONFIG_TAK_PARSER 0 ++#define CONFIG_VC1_PARSER 0 ++#define CONFIG_VORBIS_PARSER 1 ++#define CONFIG_VP3_PARSER 1 ++#define CONFIG_VP8_PARSER 1 ++#define CONFIG_VP9_PARSER 1 ++#define CONFIG_WEBP_PARSER 0 ++#define CONFIG_XBM_PARSER 0 ++#define CONFIG_XMA_PARSER 0 ++#define CONFIG_ALSA_INDEV 0 ++#define CONFIG_ANDROID_CAMERA_INDEV 0 ++#define CONFIG_AVFOUNDATION_INDEV 0 ++#define CONFIG_BKTR_INDEV 0 ++#define CONFIG_DECKLINK_INDEV 0 ++#define CONFIG_DSHOW_INDEV 0 ++#define CONFIG_FBDEV_INDEV 0 ++#define CONFIG_GDIGRAB_INDEV 0 ++#define CONFIG_IEC61883_INDEV 0 ++#define CONFIG_JACK_INDEV 0 ++#define CONFIG_KMSGRAB_INDEV 0 ++#define CONFIG_LAVFI_INDEV 0 ++#define CONFIG_OPENAL_INDEV 0 ++#define CONFIG_OSS_INDEV 0 ++#define CONFIG_PULSE_INDEV 0 ++#define CONFIG_SNDIO_INDEV 0 ++#define CONFIG_V4L2_INDEV 0 ++#define CONFIG_VFWCAP_INDEV 0 ++#define CONFIG_XCBGRAB_INDEV 0 ++#define CONFIG_LIBCDIO_INDEV 0 ++#define CONFIG_LIBDC1394_INDEV 0 ++#define CONFIG_ALSA_OUTDEV 0 ++#define CONFIG_AUDIOTOOLBOX_OUTDEV 0 ++#define CONFIG_CACA_OUTDEV 0 ++#define CONFIG_DECKLINK_OUTDEV 0 ++#define CONFIG_FBDEV_OUTDEV 0 ++#define CONFIG_OPENGL_OUTDEV 0 ++#define CONFIG_OSS_OUTDEV 0 ++#define CONFIG_PULSE_OUTDEV 0 ++#define CONFIG_SDL2_OUTDEV 0 ++#define CONFIG_SNDIO_OUTDEV 0 ++#define CONFIG_V4L2_OUTDEV 0 ++#define CONFIG_XV_OUTDEV 0 ++#define CONFIG_ABENCH_FILTER 0 ++#define CONFIG_ACOMPRESSOR_FILTER 0 ++#define CONFIG_ACONTRAST_FILTER 0 ++#define CONFIG_ACOPY_FILTER 0 ++#define CONFIG_ACUE_FILTER 0 ++#define CONFIG_ACROSSFADE_FILTER 0 ++#define CONFIG_ACROSSOVER_FILTER 0 ++#define CONFIG_ACRUSHER_FILTER 0 ++#define CONFIG_ADECLICK_FILTER 0 ++#define CONFIG_ADECLIP_FILTER 0 ++#define CONFIG_ADECORRELATE_FILTER 0 ++#define CONFIG_ADELAY_FILTER 0 ++#define CONFIG_ADENORM_FILTER 0 ++#define CONFIG_ADERIVATIVE_FILTER 0 ++#define CONFIG_ADYNAMICEQUALIZER_FILTER 0 ++#define CONFIG_ADYNAMICSMOOTH_FILTER 0 ++#define CONFIG_AECHO_FILTER 0 ++#define CONFIG_AEMPHASIS_FILTER 0 ++#define CONFIG_AEVAL_FILTER 0 ++#define CONFIG_AEXCITER_FILTER 0 ++#define CONFIG_AFADE_FILTER 0 ++#define CONFIG_AFFTDN_FILTER 0 ++#define CONFIG_AFFTFILT_FILTER 0 ++#define CONFIG_AFIR_FILTER 0 ++#define CONFIG_AFORMAT_FILTER 0 ++#define CONFIG_AFREQSHIFT_FILTER 0 ++#define CONFIG_AFWTDN_FILTER 0 ++#define CONFIG_AGATE_FILTER 0 ++#define CONFIG_AIIR_FILTER 0 ++#define CONFIG_AINTEGRAL_FILTER 0 ++#define CONFIG_AINTERLEAVE_FILTER 0 ++#define CONFIG_ALATENCY_FILTER 0 ++#define CONFIG_ALIMITER_FILTER 0 ++#define CONFIG_ALLPASS_FILTER 0 ++#define CONFIG_ALOOP_FILTER 0 ++#define CONFIG_AMERGE_FILTER 0 ++#define CONFIG_AMETADATA_FILTER 0 ++#define CONFIG_AMIX_FILTER 0 ++#define CONFIG_AMULTIPLY_FILTER 0 ++#define CONFIG_ANEQUALIZER_FILTER 0 ++#define CONFIG_ANLMDN_FILTER 0 ++#define CONFIG_ANLMF_FILTER 0 ++#define CONFIG_ANLMS_FILTER 0 ++#define CONFIG_ANULL_FILTER 0 ++#define CONFIG_APAD_FILTER 0 ++#define CONFIG_APERMS_FILTER 0 ++#define CONFIG_APHASER_FILTER 0 ++#define CONFIG_APHASESHIFT_FILTER 0 ++#define CONFIG_APSYCLIP_FILTER 0 ++#define CONFIG_APULSATOR_FILTER 0 ++#define CONFIG_AREALTIME_FILTER 0 ++#define CONFIG_ARESAMPLE_FILTER 0 ++#define CONFIG_AREVERSE_FILTER 0 ++#define CONFIG_ARNNDN_FILTER 0 ++#define CONFIG_ASDR_FILTER 0 ++#define CONFIG_ASEGMENT_FILTER 0 ++#define CONFIG_ASELECT_FILTER 0 ++#define CONFIG_ASENDCMD_FILTER 0 ++#define CONFIG_ASETNSAMPLES_FILTER 0 ++#define CONFIG_ASETPTS_FILTER 0 ++#define CONFIG_ASETRATE_FILTER 0 ++#define CONFIG_ASETTB_FILTER 0 ++#define CONFIG_ASHOWINFO_FILTER 0 ++#define CONFIG_ASIDEDATA_FILTER 0 ++#define CONFIG_ASOFTCLIP_FILTER 0 ++#define CONFIG_ASPECTRALSTATS_FILTER 0 ++#define CONFIG_ASPLIT_FILTER 0 ++#define CONFIG_ASR_FILTER 0 ++#define CONFIG_ASTATS_FILTER 0 ++#define CONFIG_ASTREAMSELECT_FILTER 0 ++#define CONFIG_ASUBBOOST_FILTER 0 ++#define CONFIG_ASUBCUT_FILTER 0 ++#define CONFIG_ASUPERCUT_FILTER 0 ++#define CONFIG_ASUPERPASS_FILTER 0 ++#define CONFIG_ASUPERSTOP_FILTER 0 ++#define CONFIG_ATEMPO_FILTER 0 ++#define CONFIG_ATILT_FILTER 0 ++#define CONFIG_ATRIM_FILTER 0 ++#define CONFIG_AXCORRELATE_FILTER 0 ++#define CONFIG_AZMQ_FILTER 0 ++#define CONFIG_BANDPASS_FILTER 0 ++#define CONFIG_BANDREJECT_FILTER 0 ++#define CONFIG_BASS_FILTER 0 ++#define CONFIG_BIQUAD_FILTER 0 ++#define CONFIG_BS2B_FILTER 0 ++#define CONFIG_CHANNELMAP_FILTER 0 ++#define CONFIG_CHANNELSPLIT_FILTER 0 ++#define CONFIG_CHORUS_FILTER 0 ++#define CONFIG_COMPAND_FILTER 0 ++#define CONFIG_COMPENSATIONDELAY_FILTER 0 ++#define CONFIG_CROSSFEED_FILTER 0 ++#define CONFIG_CRYSTALIZER_FILTER 0 ++#define CONFIG_DCSHIFT_FILTER 0 ++#define CONFIG_DEESSER_FILTER 0 ++#define CONFIG_DIALOGUENHANCE_FILTER 0 ++#define CONFIG_DRMETER_FILTER 0 ++#define CONFIG_DYNAUDNORM_FILTER 0 ++#define CONFIG_EARWAX_FILTER 0 ++#define CONFIG_EBUR128_FILTER 0 ++#define CONFIG_EQUALIZER_FILTER 0 ++#define CONFIG_EXTRASTEREO_FILTER 0 ++#define CONFIG_FIREQUALIZER_FILTER 0 ++#define CONFIG_FLANGER_FILTER 0 ++#define CONFIG_HAAS_FILTER 0 ++#define CONFIG_HDCD_FILTER 0 ++#define CONFIG_HEADPHONE_FILTER 0 ++#define CONFIG_HIGHPASS_FILTER 0 ++#define CONFIG_HIGHSHELF_FILTER 0 ++#define CONFIG_JOIN_FILTER 0 ++#define CONFIG_LADSPA_FILTER 0 ++#define CONFIG_LOUDNORM_FILTER 0 ++#define CONFIG_LOWPASS_FILTER 0 ++#define CONFIG_LOWSHELF_FILTER 0 ++#define CONFIG_LV2_FILTER 0 ++#define CONFIG_MCOMPAND_FILTER 0 ++#define CONFIG_PAN_FILTER 0 ++#define CONFIG_REPLAYGAIN_FILTER 0 ++#define CONFIG_RUBBERBAND_FILTER 0 ++#define CONFIG_SIDECHAINCOMPRESS_FILTER 0 ++#define CONFIG_SIDECHAINGATE_FILTER 0 ++#define CONFIG_SILENCEDETECT_FILTER 0 ++#define CONFIG_SILENCEREMOVE_FILTER 0 ++#define CONFIG_SOFALIZER_FILTER 0 ++#define CONFIG_SPEECHNORM_FILTER 0 ++#define CONFIG_STEREOTOOLS_FILTER 0 ++#define CONFIG_STEREOWIDEN_FILTER 0 ++#define CONFIG_SUPEREQUALIZER_FILTER 0 ++#define CONFIG_SURROUND_FILTER 0 ++#define CONFIG_TREBLE_FILTER 0 ++#define CONFIG_TREMOLO_FILTER 0 ++#define CONFIG_VIBRATO_FILTER 0 ++#define CONFIG_VOLUME_FILTER 0 ++#define CONFIG_VOLUMEDETECT_FILTER 0 ++#define CONFIG_AEVALSRC_FILTER 0 ++#define CONFIG_AFIRSRC_FILTER 0 ++#define CONFIG_ANOISESRC_FILTER 0 ++#define CONFIG_ANULLSRC_FILTER 0 ++#define CONFIG_FLITE_FILTER 0 ++#define CONFIG_HILBERT_FILTER 0 ++#define CONFIG_SINC_FILTER 0 ++#define CONFIG_SINE_FILTER 0 ++#define CONFIG_ANULLSINK_FILTER 0 ++#define CONFIG_ADDROI_FILTER 0 ++#define CONFIG_ALPHAEXTRACT_FILTER 0 ++#define CONFIG_ALPHAMERGE_FILTER 0 ++#define CONFIG_AMPLIFY_FILTER 0 ++#define CONFIG_ASS_FILTER 0 ++#define CONFIG_ATADENOISE_FILTER 0 ++#define CONFIG_AVGBLUR_FILTER 0 ++#define CONFIG_AVGBLUR_OPENCL_FILTER 0 ++#define CONFIG_AVGBLUR_VULKAN_FILTER 0 ++#define CONFIG_BBOX_FILTER 0 ++#define CONFIG_BENCH_FILTER 0 ++#define CONFIG_BILATERAL_FILTER 0 ++#define CONFIG_BITPLANENOISE_FILTER 0 ++#define CONFIG_BLACKDETECT_FILTER 0 ++#define CONFIG_BLACKFRAME_FILTER 0 ++#define CONFIG_BLEND_FILTER 0 ++#define CONFIG_BLEND_VULKAN_FILTER 0 ++#define CONFIG_BLURDETECT_FILTER 0 ++#define CONFIG_BM3D_FILTER 0 ++#define CONFIG_BOXBLUR_FILTER 0 ++#define CONFIG_BOXBLUR_OPENCL_FILTER 0 ++#define CONFIG_BWDIF_FILTER 0 ++#define CONFIG_CAS_FILTER 0 ++#define CONFIG_CHROMABER_VULKAN_FILTER 0 ++#define CONFIG_CHROMAHOLD_FILTER 0 ++#define CONFIG_CHROMAKEY_FILTER 0 ++#define CONFIG_CHROMANR_FILTER 0 ++#define CONFIG_CHROMASHIFT_FILTER 0 ++#define CONFIG_CIESCOPE_FILTER 0 ++#define CONFIG_CODECVIEW_FILTER 0 ++#define CONFIG_COLORBALANCE_FILTER 0 ++#define CONFIG_COLORCHANNELMIXER_FILTER 0 ++#define CONFIG_COLORCONTRAST_FILTER 0 ++#define CONFIG_COLORCORRECT_FILTER 0 ++#define CONFIG_COLORIZE_FILTER 0 ++#define CONFIG_COLORKEY_FILTER 0 ++#define CONFIG_COLORKEY_OPENCL_FILTER 0 ++#define CONFIG_COLORHOLD_FILTER 0 ++#define CONFIG_COLORLEVELS_FILTER 0 ++#define CONFIG_COLORMAP_FILTER 0 ++#define CONFIG_COLORMATRIX_FILTER 0 ++#define CONFIG_COLORSPACE_FILTER 0 ++#define CONFIG_COLORTEMPERATURE_FILTER 0 ++#define CONFIG_CONVOLUTION_FILTER 0 ++#define CONFIG_CONVOLUTION_OPENCL_FILTER 0 ++#define CONFIG_CONVOLVE_FILTER 0 ++#define CONFIG_COPY_FILTER 0 ++#define CONFIG_COREIMAGE_FILTER 0 ++#define CONFIG_COVER_RECT_FILTER 0 ++#define CONFIG_CROP_FILTER 0 ++#define CONFIG_CROPDETECT_FILTER 0 ++#define CONFIG_CUE_FILTER 0 ++#define CONFIG_CURVES_FILTER 0 ++#define CONFIG_DATASCOPE_FILTER 0 ++#define CONFIG_DBLUR_FILTER 0 ++#define CONFIG_DCTDNOIZ_FILTER 0 ++#define CONFIG_DEBAND_FILTER 0 ++#define CONFIG_DEBLOCK_FILTER 0 ++#define CONFIG_DECIMATE_FILTER 0 ++#define CONFIG_DECONVOLVE_FILTER 0 ++#define CONFIG_DEDOT_FILTER 0 ++#define CONFIG_DEFLATE_FILTER 0 ++#define CONFIG_DEFLICKER_FILTER 0 ++#define CONFIG_DEINTERLACE_QSV_FILTER 0 ++#define CONFIG_DEINTERLACE_VAAPI_FILTER 0 ++#define CONFIG_DEJUDDER_FILTER 0 ++#define CONFIG_DELOGO_FILTER 0 ++#define CONFIG_DENOISE_VAAPI_FILTER 0 ++#define CONFIG_DERAIN_FILTER 0 ++#define CONFIG_DESHAKE_FILTER 0 ++#define CONFIG_DESHAKE_OPENCL_FILTER 0 ++#define CONFIG_DESPILL_FILTER 0 ++#define CONFIG_DETELECINE_FILTER 0 ++#define CONFIG_DILATION_FILTER 0 ++#define CONFIG_DILATION_OPENCL_FILTER 0 ++#define CONFIG_DISPLACE_FILTER 0 ++#define CONFIG_DNN_CLASSIFY_FILTER 0 ++#define CONFIG_DNN_DETECT_FILTER 0 ++#define CONFIG_DNN_PROCESSING_FILTER 0 ++#define CONFIG_DOUBLEWEAVE_FILTER 0 ++#define CONFIG_DRAWBOX_FILTER 0 ++#define CONFIG_DRAWGRAPH_FILTER 0 ++#define CONFIG_DRAWGRID_FILTER 0 ++#define CONFIG_DRAWTEXT_FILTER 0 ++#define CONFIG_EDGEDETECT_FILTER 0 ++#define CONFIG_ELBG_FILTER 0 ++#define CONFIG_ENTROPY_FILTER 0 ++#define CONFIG_EPX_FILTER 0 ++#define CONFIG_EQ_FILTER 0 ++#define CONFIG_EROSION_FILTER 0 ++#define CONFIG_EROSION_OPENCL_FILTER 0 ++#define CONFIG_ESTDIF_FILTER 0 ++#define CONFIG_EXPOSURE_FILTER 0 ++#define CONFIG_EXTRACTPLANES_FILTER 0 ++#define CONFIG_FADE_FILTER 0 ++#define CONFIG_FEEDBACK_FILTER 0 ++#define CONFIG_FFTDNOIZ_FILTER 0 ++#define CONFIG_FFTFILT_FILTER 0 ++#define CONFIG_FIELD_FILTER 0 ++#define CONFIG_FIELDHINT_FILTER 0 ++#define CONFIG_FIELDMATCH_FILTER 0 ++#define CONFIG_FIELDORDER_FILTER 0 ++#define CONFIG_FILLBORDERS_FILTER 0 ++#define CONFIG_FIND_RECT_FILTER 0 ++#define CONFIG_FLIP_VULKAN_FILTER 0 ++#define CONFIG_FLOODFILL_FILTER 0 ++#define CONFIG_FORMAT_FILTER 0 ++#define CONFIG_FPS_FILTER 0 ++#define CONFIG_FRAMEPACK_FILTER 0 ++#define CONFIG_FRAMERATE_FILTER 0 ++#define CONFIG_FRAMESTEP_FILTER 0 ++#define CONFIG_FREEZEDETECT_FILTER 0 ++#define CONFIG_FREEZEFRAMES_FILTER 0 ++#define CONFIG_FREI0R_FILTER 0 ++#define CONFIG_FSPP_FILTER 0 ++#define CONFIG_GBLUR_FILTER 0 ++#define CONFIG_GBLUR_VULKAN_FILTER 0 ++#define CONFIG_GEQ_FILTER 0 ++#define CONFIG_GRADFUN_FILTER 0 ++#define CONFIG_GRAPHMONITOR_FILTER 0 ++#define CONFIG_GRAYWORLD_FILTER 0 ++#define CONFIG_GREYEDGE_FILTER 0 ++#define CONFIG_GUIDED_FILTER 0 ++#define CONFIG_HALDCLUT_FILTER 0 ++#define CONFIG_HFLIP_FILTER 0 ++#define CONFIG_HFLIP_VULKAN_FILTER 0 ++#define CONFIG_HISTEQ_FILTER 0 ++#define CONFIG_HISTOGRAM_FILTER 0 ++#define CONFIG_HQDN3D_FILTER 0 ++#define CONFIG_HQX_FILTER 0 ++#define CONFIG_HSTACK_FILTER 0 ++#define CONFIG_HSVHOLD_FILTER 0 ++#define CONFIG_HSVKEY_FILTER 0 ++#define CONFIG_HUE_FILTER 0 ++#define CONFIG_HUESATURATION_FILTER 0 ++#define CONFIG_HWDOWNLOAD_FILTER 0 ++#define CONFIG_HWMAP_FILTER 0 ++#define CONFIG_HWUPLOAD_FILTER 0 ++#define CONFIG_HWUPLOAD_CUDA_FILTER 0 ++#define CONFIG_HYSTERESIS_FILTER 0 ++#define CONFIG_ICCDETECT_FILTER 0 ++#define CONFIG_ICCGEN_FILTER 0 ++#define CONFIG_IDENTITY_FILTER 0 ++#define CONFIG_IDET_FILTER 0 ++#define CONFIG_IL_FILTER 0 ++#define CONFIG_INFLATE_FILTER 0 ++#define CONFIG_INTERLACE_FILTER 0 ++#define CONFIG_INTERLEAVE_FILTER 0 ++#define CONFIG_KERNDEINT_FILTER 0 ++#define CONFIG_KIRSCH_FILTER 0 ++#define CONFIG_LAGFUN_FILTER 0 ++#define CONFIG_LATENCY_FILTER 0 ++#define CONFIG_LENSCORRECTION_FILTER 0 ++#define CONFIG_LENSFUN_FILTER 0 ++#define CONFIG_LIBPLACEBO_FILTER 0 ++#define CONFIG_LIBVMAF_FILTER 0 ++#define CONFIG_LIMITDIFF_FILTER 0 ++#define CONFIG_LIMITER_FILTER 0 ++#define CONFIG_LOOP_FILTER 0 ++#define CONFIG_LUMAKEY_FILTER 0 ++#define CONFIG_LUT_FILTER 0 ++#define CONFIG_LUT1D_FILTER 0 ++#define CONFIG_LUT2_FILTER 0 ++#define CONFIG_LUT3D_FILTER 0 ++#define CONFIG_LUTRGB_FILTER 0 ++#define CONFIG_LUTYUV_FILTER 0 ++#define CONFIG_MASKEDCLAMP_FILTER 0 ++#define CONFIG_MASKEDMAX_FILTER 0 ++#define CONFIG_MASKEDMERGE_FILTER 0 ++#define CONFIG_MASKEDMIN_FILTER 0 ++#define CONFIG_MASKEDTHRESHOLD_FILTER 0 ++#define CONFIG_MASKFUN_FILTER 0 ++#define CONFIG_MCDEINT_FILTER 0 ++#define CONFIG_MEDIAN_FILTER 0 ++#define CONFIG_MERGEPLANES_FILTER 0 ++#define CONFIG_MESTIMATE_FILTER 0 ++#define CONFIG_METADATA_FILTER 0 ++#define CONFIG_MIDEQUALIZER_FILTER 0 ++#define CONFIG_MINTERPOLATE_FILTER 0 ++#define CONFIG_MIX_FILTER 0 ++#define CONFIG_MONOCHROME_FILTER 0 ++#define CONFIG_MORPHO_FILTER 0 ++#define CONFIG_MPDECIMATE_FILTER 0 ++#define CONFIG_MSAD_FILTER 0 ++#define CONFIG_MULTIPLY_FILTER 0 ++#define CONFIG_NEGATE_FILTER 0 ++#define CONFIG_NLMEANS_FILTER 0 ++#define CONFIG_NLMEANS_OPENCL_FILTER 0 ++#define CONFIG_NNEDI_FILTER 0 ++#define CONFIG_NOFORMAT_FILTER 0 ++#define CONFIG_NOISE_FILTER 0 ++#define CONFIG_NORMALIZE_FILTER 0 ++#define CONFIG_NULL_FILTER 0 ++#define CONFIG_OCR_FILTER 0 ++#define CONFIG_OCV_FILTER 0 ++#define CONFIG_OSCILLOSCOPE_FILTER 0 ++#define CONFIG_OVERLAY_FILTER 0 ++#define CONFIG_OVERLAY_OPENCL_FILTER 0 ++#define CONFIG_OVERLAY_QSV_FILTER 0 ++#define CONFIG_OVERLAY_VAAPI_FILTER 0 ++#define CONFIG_OVERLAY_VULKAN_FILTER 0 ++#define CONFIG_OVERLAY_CUDA_FILTER 0 ++#define CONFIG_OWDENOISE_FILTER 0 ++#define CONFIG_PAD_FILTER 0 ++#define CONFIG_PAD_OPENCL_FILTER 0 ++#define CONFIG_PALETTEGEN_FILTER 0 ++#define CONFIG_PALETTEUSE_FILTER 0 ++#define CONFIG_PERMS_FILTER 0 ++#define CONFIG_PERSPECTIVE_FILTER 0 ++#define CONFIG_PHASE_FILTER 0 ++#define CONFIG_PHOTOSENSITIVITY_FILTER 0 ++#define CONFIG_PIXDESCTEST_FILTER 0 ++#define CONFIG_PIXELIZE_FILTER 0 ++#define CONFIG_PIXSCOPE_FILTER 0 ++#define CONFIG_PP_FILTER 0 ++#define CONFIG_PP7_FILTER 0 ++#define CONFIG_PREMULTIPLY_FILTER 0 ++#define CONFIG_PREWITT_FILTER 0 ++#define CONFIG_PREWITT_OPENCL_FILTER 0 ++#define CONFIG_PROCAMP_VAAPI_FILTER 0 ++#define CONFIG_PROGRAM_OPENCL_FILTER 0 ++#define CONFIG_PSEUDOCOLOR_FILTER 0 ++#define CONFIG_PSNR_FILTER 0 ++#define CONFIG_PULLUP_FILTER 0 ++#define CONFIG_QP_FILTER 0 ++#define CONFIG_RANDOM_FILTER 0 ++#define CONFIG_READEIA608_FILTER 0 ++#define CONFIG_READVITC_FILTER 0 ++#define CONFIG_REALTIME_FILTER 0 ++#define CONFIG_REMAP_FILTER 0 ++#define CONFIG_REMOVEGRAIN_FILTER 0 ++#define CONFIG_REMOVELOGO_FILTER 0 ++#define CONFIG_REPEATFIELDS_FILTER 0 ++#define CONFIG_REVERSE_FILTER 0 ++#define CONFIG_RGBASHIFT_FILTER 0 ++#define CONFIG_ROBERTS_FILTER 0 ++#define CONFIG_ROBERTS_OPENCL_FILTER 0 ++#define CONFIG_ROTATE_FILTER 0 ++#define CONFIG_SAB_FILTER 0 ++#define CONFIG_SCALE_FILTER 0 ++#define CONFIG_SCALE_CUDA_FILTER 0 ++#define CONFIG_SCALE_NPP_FILTER 0 ++#define CONFIG_SCALE_QSV_FILTER 0 ++#define CONFIG_SCALE_VAAPI_FILTER 0 ++#define CONFIG_SCALE_VULKAN_FILTER 0 ++#define CONFIG_SCALE2REF_FILTER 0 ++#define CONFIG_SCALE2REF_NPP_FILTER 0 ++#define CONFIG_SCDET_FILTER 0 ++#define CONFIG_SCHARR_FILTER 0 ++#define CONFIG_SCROLL_FILTER 0 ++#define CONFIG_SEGMENT_FILTER 0 ++#define CONFIG_SELECT_FILTER 0 ++#define CONFIG_SELECTIVECOLOR_FILTER 0 ++#define CONFIG_SENDCMD_FILTER 0 ++#define CONFIG_SEPARATEFIELDS_FILTER 0 ++#define CONFIG_SETDAR_FILTER 0 ++#define CONFIG_SETFIELD_FILTER 0 ++#define CONFIG_SETPARAMS_FILTER 0 ++#define CONFIG_SETPTS_FILTER 0 ++#define CONFIG_SETRANGE_FILTER 0 ++#define CONFIG_SETSAR_FILTER 0 ++#define CONFIG_SETTB_FILTER 0 ++#define CONFIG_SHARPEN_NPP_FILTER 0 ++#define CONFIG_SHARPNESS_VAAPI_FILTER 0 ++#define CONFIG_SHEAR_FILTER 0 ++#define CONFIG_SHOWINFO_FILTER 0 ++#define CONFIG_SHOWPALETTE_FILTER 0 ++#define CONFIG_SHUFFLEFRAMES_FILTER 0 ++#define CONFIG_SHUFFLEPIXELS_FILTER 0 ++#define CONFIG_SHUFFLEPLANES_FILTER 0 ++#define CONFIG_SIDEDATA_FILTER 0 ++#define CONFIG_SIGNALSTATS_FILTER 0 ++#define CONFIG_SIGNATURE_FILTER 0 ++#define CONFIG_SITI_FILTER 0 ++#define CONFIG_SMARTBLUR_FILTER 0 ++#define CONFIG_SOBEL_FILTER 0 ++#define CONFIG_SOBEL_OPENCL_FILTER 0 ++#define CONFIG_SPLIT_FILTER 0 ++#define CONFIG_SPP_FILTER 0 ++#define CONFIG_SR_FILTER 0 ++#define CONFIG_SSIM_FILTER 0 ++#define CONFIG_STEREO3D_FILTER 0 ++#define CONFIG_STREAMSELECT_FILTER 0 ++#define CONFIG_SUBTITLES_FILTER 0 ++#define CONFIG_SUPER2XSAI_FILTER 0 ++#define CONFIG_SWAPRECT_FILTER 0 ++#define CONFIG_SWAPUV_FILTER 0 ++#define CONFIG_TBLEND_FILTER 0 ++#define CONFIG_TELECINE_FILTER 0 ++#define CONFIG_THISTOGRAM_FILTER 0 ++#define CONFIG_THRESHOLD_FILTER 0 ++#define CONFIG_THUMBNAIL_FILTER 0 ++#define CONFIG_THUMBNAIL_CUDA_FILTER 0 ++#define CONFIG_TILE_FILTER 0 ++#define CONFIG_TINTERLACE_FILTER 0 ++#define CONFIG_TLUT2_FILTER 0 ++#define CONFIG_TMEDIAN_FILTER 0 ++#define CONFIG_TMIDEQUALIZER_FILTER 0 ++#define CONFIG_TMIX_FILTER 0 ++#define CONFIG_TONEMAP_FILTER 0 ++#define CONFIG_TONEMAP_OPENCL_FILTER 0 ++#define CONFIG_TONEMAP_VAAPI_FILTER 0 ++#define CONFIG_TPAD_FILTER 0 ++#define CONFIG_TRANSPOSE_FILTER 0 ++#define CONFIG_TRANSPOSE_NPP_FILTER 0 ++#define CONFIG_TRANSPOSE_OPENCL_FILTER 0 ++#define CONFIG_TRANSPOSE_VAAPI_FILTER 0 ++#define CONFIG_TRANSPOSE_VULKAN_FILTER 0 ++#define CONFIG_TRIM_FILTER 0 ++#define CONFIG_UNPREMULTIPLY_FILTER 0 ++#define CONFIG_UNSHARP_FILTER 0 ++#define CONFIG_UNSHARP_OPENCL_FILTER 0 ++#define CONFIG_UNTILE_FILTER 0 ++#define CONFIG_USPP_FILTER 0 ++#define CONFIG_V360_FILTER 0 ++#define CONFIG_VAGUEDENOISER_FILTER 0 ++#define CONFIG_VARBLUR_FILTER 0 ++#define CONFIG_VECTORSCOPE_FILTER 0 ++#define CONFIG_VFLIP_FILTER 0 ++#define CONFIG_VFLIP_VULKAN_FILTER 0 ++#define CONFIG_VFRDET_FILTER 0 ++#define CONFIG_VIBRANCE_FILTER 0 ++#define CONFIG_VIDSTABDETECT_FILTER 0 ++#define CONFIG_VIDSTABTRANSFORM_FILTER 0 ++#define CONFIG_VIF_FILTER 0 ++#define CONFIG_VIGNETTE_FILTER 0 ++#define CONFIG_VMAFMOTION_FILTER 0 ++#define CONFIG_VPP_QSV_FILTER 0 ++#define CONFIG_VSTACK_FILTER 0 ++#define CONFIG_W3FDIF_FILTER 0 ++#define CONFIG_WAVEFORM_FILTER 0 ++#define CONFIG_WEAVE_FILTER 0 ++#define CONFIG_XBR_FILTER 0 ++#define CONFIG_XCORRELATE_FILTER 0 ++#define CONFIG_XFADE_FILTER 0 ++#define CONFIG_XFADE_OPENCL_FILTER 0 ++#define CONFIG_XMEDIAN_FILTER 0 ++#define CONFIG_XSTACK_FILTER 0 ++#define CONFIG_YADIF_FILTER 0 ++#define CONFIG_YADIF_CUDA_FILTER 0 ++#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0 ++#define CONFIG_YAEPBLUR_FILTER 0 ++#define CONFIG_ZMQ_FILTER 0 ++#define CONFIG_ZOOMPAN_FILTER 0 ++#define CONFIG_ZSCALE_FILTER 0 ++#define CONFIG_ALLRGB_FILTER 0 ++#define CONFIG_ALLYUV_FILTER 0 ++#define CONFIG_CELLAUTO_FILTER 0 ++#define CONFIG_COLOR_FILTER 0 ++#define CONFIG_COLORCHART_FILTER 0 ++#define CONFIG_COLORSPECTRUM_FILTER 0 ++#define CONFIG_COREIMAGESRC_FILTER 0 ++#define CONFIG_FREI0R_SRC_FILTER 0 ++#define CONFIG_GRADIENTS_FILTER 0 ++#define CONFIG_HALDCLUTSRC_FILTER 0 ++#define CONFIG_LIFE_FILTER 0 ++#define CONFIG_MANDELBROT_FILTER 0 ++#define CONFIG_MPTESTSRC_FILTER 0 ++#define CONFIG_NULLSRC_FILTER 0 ++#define CONFIG_OPENCLSRC_FILTER 0 ++#define CONFIG_PAL75BARS_FILTER 0 ++#define CONFIG_PAL100BARS_FILTER 0 ++#define CONFIG_RGBTESTSRC_FILTER 0 ++#define CONFIG_SIERPINSKI_FILTER 0 ++#define CONFIG_SMPTEBARS_FILTER 0 ++#define CONFIG_SMPTEHDBARS_FILTER 0 ++#define CONFIG_TESTSRC_FILTER 0 ++#define CONFIG_TESTSRC2_FILTER 0 ++#define CONFIG_YUVTESTSRC_FILTER 0 ++#define CONFIG_NULLSINK_FILTER 0 ++#define CONFIG_ABITSCOPE_FILTER 0 ++#define CONFIG_ADRAWGRAPH_FILTER 0 ++#define CONFIG_AGRAPHMONITOR_FILTER 0 ++#define CONFIG_AHISTOGRAM_FILTER 0 ++#define CONFIG_APHASEMETER_FILTER 0 ++#define CONFIG_AVECTORSCOPE_FILTER 0 ++#define CONFIG_CONCAT_FILTER 0 ++#define CONFIG_SHOWCQT_FILTER 0 ++#define CONFIG_SHOWFREQS_FILTER 0 ++#define CONFIG_SHOWSPATIAL_FILTER 0 ++#define CONFIG_SHOWSPECTRUM_FILTER 0 ++#define CONFIG_SHOWSPECTRUMPIC_FILTER 0 ++#define CONFIG_SHOWVOLUME_FILTER 0 ++#define CONFIG_SHOWWAVES_FILTER 0 ++#define CONFIG_SHOWWAVESPIC_FILTER 0 ++#define CONFIG_SPECTRUMSYNTH_FILTER 0 ++#define CONFIG_AVSYNCTEST_FILTER 0 ++#define CONFIG_AMOVIE_FILTER 0 ++#define CONFIG_MOVIE_FILTER 0 ++#define CONFIG_AFIFO_FILTER 0 ++#define CONFIG_FIFO_FILTER 0 ++#define CONFIG_AA_DEMUXER 0 ++#define CONFIG_AAC_DEMUXER 1 ++#define CONFIG_AAX_DEMUXER 0 ++#define CONFIG_AC3_DEMUXER 0 ++#define CONFIG_ACE_DEMUXER 0 ++#define CONFIG_ACM_DEMUXER 0 ++#define CONFIG_ACT_DEMUXER 0 ++#define CONFIG_ADF_DEMUXER 0 ++#define CONFIG_ADP_DEMUXER 0 ++#define CONFIG_ADS_DEMUXER 0 ++#define CONFIG_ADX_DEMUXER 0 ++#define CONFIG_AEA_DEMUXER 0 ++#define CONFIG_AFC_DEMUXER 0 ++#define CONFIG_AIFF_DEMUXER 0 ++#define CONFIG_AIX_DEMUXER 0 ++#define CONFIG_ALP_DEMUXER 0 ++#define CONFIG_AMR_DEMUXER 0 ++#define CONFIG_AMRNB_DEMUXER 0 ++#define CONFIG_AMRWB_DEMUXER 0 ++#define CONFIG_ANM_DEMUXER 0 ++#define CONFIG_APC_DEMUXER 0 ++#define CONFIG_APE_DEMUXER 0 ++#define CONFIG_APM_DEMUXER 0 ++#define CONFIG_APNG_DEMUXER 0 ++#define CONFIG_APTX_DEMUXER 0 ++#define CONFIG_APTX_HD_DEMUXER 0 ++#define CONFIG_AQTITLE_DEMUXER 0 ++#define CONFIG_ARGO_ASF_DEMUXER 0 ++#define CONFIG_ARGO_BRP_DEMUXER 0 ++#define CONFIG_ARGO_CVG_DEMUXER 0 ++#define CONFIG_ASF_DEMUXER 0 ++#define CONFIG_ASF_O_DEMUXER 0 ++#define CONFIG_ASS_DEMUXER 0 ++#define CONFIG_AST_DEMUXER 0 ++#define CONFIG_AU_DEMUXER 0 ++#define CONFIG_AV1_DEMUXER 0 ++#define CONFIG_AVI_DEMUXER 0 ++#define CONFIG_AVISYNTH_DEMUXER 0 ++#define CONFIG_AVR_DEMUXER 0 ++#define CONFIG_AVS_DEMUXER 0 ++#define CONFIG_AVS2_DEMUXER 0 ++#define CONFIG_AVS3_DEMUXER 0 ++#define CONFIG_BETHSOFTVID_DEMUXER 0 ++#define CONFIG_BFI_DEMUXER 0 ++#define CONFIG_BINTEXT_DEMUXER 0 ++#define CONFIG_BINK_DEMUXER 0 ++#define CONFIG_BINKA_DEMUXER 0 ++#define CONFIG_BIT_DEMUXER 0 ++#define CONFIG_BITPACKED_DEMUXER 0 ++#define CONFIG_BMV_DEMUXER 0 ++#define CONFIG_BFSTM_DEMUXER 0 ++#define CONFIG_BRSTM_DEMUXER 0 ++#define CONFIG_BOA_DEMUXER 0 ++#define CONFIG_C93_DEMUXER 0 ++#define CONFIG_CAF_DEMUXER 0 ++#define CONFIG_CAVSVIDEO_DEMUXER 0 ++#define CONFIG_CDG_DEMUXER 0 ++#define CONFIG_CDXL_DEMUXER 0 ++#define CONFIG_CINE_DEMUXER 0 ++#define CONFIG_CODEC2_DEMUXER 0 ++#define CONFIG_CODEC2RAW_DEMUXER 0 ++#define CONFIG_CONCAT_DEMUXER 0 ++#define CONFIG_DASH_DEMUXER 0 ++#define CONFIG_DATA_DEMUXER 0 ++#define CONFIG_DAUD_DEMUXER 0 ++#define CONFIG_DCSTR_DEMUXER 0 ++#define CONFIG_DERF_DEMUXER 0 ++#define CONFIG_DFA_DEMUXER 0 ++#define CONFIG_DFPWM_DEMUXER 0 ++#define CONFIG_DHAV_DEMUXER 0 ++#define CONFIG_DIRAC_DEMUXER 0 ++#define CONFIG_DNXHD_DEMUXER 0 ++#define CONFIG_DSF_DEMUXER 0 ++#define CONFIG_DSICIN_DEMUXER 0 ++#define CONFIG_DSS_DEMUXER 0 ++#define CONFIG_DTS_DEMUXER 0 ++#define CONFIG_DTSHD_DEMUXER 0 ++#define CONFIG_DV_DEMUXER 0 ++#define CONFIG_DVBSUB_DEMUXER 0 ++#define CONFIG_DVBTXT_DEMUXER 0 ++#define CONFIG_DXA_DEMUXER 0 ++#define CONFIG_EA_DEMUXER 0 ++#define CONFIG_EA_CDATA_DEMUXER 0 ++#define CONFIG_EAC3_DEMUXER 0 ++#define CONFIG_EPAF_DEMUXER 0 ++#define CONFIG_FFMETADATA_DEMUXER 0 ++#define CONFIG_FILMSTRIP_DEMUXER 0 ++#define CONFIG_FITS_DEMUXER 0 ++#define CONFIG_FLAC_DEMUXER 1 ++#define CONFIG_FLIC_DEMUXER 0 ++#define CONFIG_FLV_DEMUXER 0 ++#define CONFIG_LIVE_FLV_DEMUXER 0 ++#define CONFIG_FOURXM_DEMUXER 0 ++#define CONFIG_FRM_DEMUXER 0 ++#define CONFIG_FSB_DEMUXER 0 ++#define CONFIG_FWSE_DEMUXER 0 ++#define CONFIG_G722_DEMUXER 0 ++#define CONFIG_G723_1_DEMUXER 0 ++#define CONFIG_G726_DEMUXER 0 ++#define CONFIG_G726LE_DEMUXER 0 ++#define CONFIG_G729_DEMUXER 0 ++#define CONFIG_GDV_DEMUXER 0 ++#define CONFIG_GENH_DEMUXER 0 ++#define CONFIG_GIF_DEMUXER 0 ++#define CONFIG_GSM_DEMUXER 0 ++#define CONFIG_GXF_DEMUXER 0 ++#define CONFIG_H261_DEMUXER 0 ++#define CONFIG_H263_DEMUXER 0 ++#define CONFIG_H264_DEMUXER 0 ++#define CONFIG_HCA_DEMUXER 0 ++#define CONFIG_HCOM_DEMUXER 0 ++#define CONFIG_HEVC_DEMUXER 0 ++#define CONFIG_HLS_DEMUXER 0 ++#define CONFIG_HNM_DEMUXER 0 ++#define CONFIG_ICO_DEMUXER 0 ++#define CONFIG_IDCIN_DEMUXER 0 ++#define CONFIG_IDF_DEMUXER 0 ++#define CONFIG_IFF_DEMUXER 0 ++#define CONFIG_IFV_DEMUXER 0 ++#define CONFIG_ILBC_DEMUXER 0 ++#define CONFIG_IMAGE2_DEMUXER 0 ++#define CONFIG_IMAGE2PIPE_DEMUXER 0 ++#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0 ++#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0 ++#define CONFIG_IMF_DEMUXER 0 ++#define CONFIG_INGENIENT_DEMUXER 0 ++#define CONFIG_IPMOVIE_DEMUXER 0 ++#define CONFIG_IPU_DEMUXER 0 ++#define CONFIG_IRCAM_DEMUXER 0 ++#define CONFIG_ISS_DEMUXER 0 ++#define CONFIG_IV8_DEMUXER 0 ++#define CONFIG_IVF_DEMUXER 0 ++#define CONFIG_IVR_DEMUXER 0 ++#define CONFIG_JACOSUB_DEMUXER 0 ++#define CONFIG_JV_DEMUXER 0 ++#define CONFIG_KUX_DEMUXER 0 ++#define CONFIG_KVAG_DEMUXER 0 ++#define CONFIG_LMLM4_DEMUXER 0 ++#define CONFIG_LOAS_DEMUXER 0 ++#define CONFIG_LUODAT_DEMUXER 0 ++#define CONFIG_LRC_DEMUXER 0 ++#define CONFIG_LVF_DEMUXER 0 ++#define CONFIG_LXF_DEMUXER 0 ++#define CONFIG_M4V_DEMUXER 0 ++#define CONFIG_MCA_DEMUXER 0 ++#define CONFIG_MCC_DEMUXER 0 ++#define CONFIG_MATROSKA_DEMUXER 1 ++#define CONFIG_MGSTS_DEMUXER 0 ++#define CONFIG_MICRODVD_DEMUXER 0 ++#define CONFIG_MJPEG_DEMUXER 0 ++#define CONFIG_MJPEG_2000_DEMUXER 0 ++#define CONFIG_MLP_DEMUXER 0 ++#define CONFIG_MLV_DEMUXER 0 ++#define CONFIG_MM_DEMUXER 0 ++#define CONFIG_MMF_DEMUXER 0 ++#define CONFIG_MODS_DEMUXER 0 ++#define CONFIG_MOFLEX_DEMUXER 0 ++#define CONFIG_MOV_DEMUXER 1 ++#define CONFIG_MP3_DEMUXER 1 ++#define CONFIG_MPC_DEMUXER 0 ++#define CONFIG_MPC8_DEMUXER 0 ++#define CONFIG_MPEGPS_DEMUXER 0 ++#define CONFIG_MPEGTS_DEMUXER 0 ++#define CONFIG_MPEGTSRAW_DEMUXER 0 ++#define CONFIG_MPEGVIDEO_DEMUXER 0 ++#define CONFIG_MPJPEG_DEMUXER 0 ++#define CONFIG_MPL2_DEMUXER 0 ++#define CONFIG_MPSUB_DEMUXER 0 ++#define CONFIG_MSF_DEMUXER 0 ++#define CONFIG_MSNWC_TCP_DEMUXER 0 ++#define CONFIG_MSP_DEMUXER 0 ++#define CONFIG_MTAF_DEMUXER 0 ++#define CONFIG_MTV_DEMUXER 0 ++#define CONFIG_MUSX_DEMUXER 0 ++#define CONFIG_MV_DEMUXER 0 ++#define CONFIG_MVI_DEMUXER 0 ++#define CONFIG_MXF_DEMUXER 0 ++#define CONFIG_MXG_DEMUXER 0 ++#define CONFIG_NC_DEMUXER 0 ++#define CONFIG_NISTSPHERE_DEMUXER 0 ++#define CONFIG_NSP_DEMUXER 0 ++#define CONFIG_NSV_DEMUXER 0 ++#define CONFIG_NUT_DEMUXER 0 ++#define CONFIG_NUV_DEMUXER 0 ++#define CONFIG_OBU_DEMUXER 0 ++#define CONFIG_OGG_DEMUXER 1 ++#define CONFIG_OMA_DEMUXER 0 ++#define CONFIG_PAF_DEMUXER 0 ++#define CONFIG_PCM_ALAW_DEMUXER 0 ++#define CONFIG_PCM_MULAW_DEMUXER 0 ++#define CONFIG_PCM_VIDC_DEMUXER 0 ++#define CONFIG_PCM_F64BE_DEMUXER 0 ++#define CONFIG_PCM_F64LE_DEMUXER 0 ++#define CONFIG_PCM_F32BE_DEMUXER 0 ++#define CONFIG_PCM_F32LE_DEMUXER 0 ++#define CONFIG_PCM_S32BE_DEMUXER 0 ++#define CONFIG_PCM_S32LE_DEMUXER 0 ++#define CONFIG_PCM_S24BE_DEMUXER 0 ++#define CONFIG_PCM_S24LE_DEMUXER 0 ++#define CONFIG_PCM_S16BE_DEMUXER 0 ++#define CONFIG_PCM_S16LE_DEMUXER 0 ++#define CONFIG_PCM_S8_DEMUXER 0 ++#define CONFIG_PCM_U32BE_DEMUXER 0 ++#define CONFIG_PCM_U32LE_DEMUXER 0 ++#define CONFIG_PCM_U24BE_DEMUXER 0 ++#define CONFIG_PCM_U24LE_DEMUXER 0 ++#define CONFIG_PCM_U16BE_DEMUXER 0 ++#define CONFIG_PCM_U16LE_DEMUXER 0 ++#define CONFIG_PCM_U8_DEMUXER 0 ++#define CONFIG_PJS_DEMUXER 0 ++#define CONFIG_PMP_DEMUXER 0 ++#define CONFIG_PP_BNK_DEMUXER 0 ++#define CONFIG_PVA_DEMUXER 0 ++#define CONFIG_PVF_DEMUXER 0 ++#define CONFIG_QCP_DEMUXER 0 ++#define CONFIG_R3D_DEMUXER 0 ++#define CONFIG_RAWVIDEO_DEMUXER 0 ++#define CONFIG_REALTEXT_DEMUXER 0 ++#define CONFIG_REDSPARK_DEMUXER 0 ++#define CONFIG_RL2_DEMUXER 0 ++#define CONFIG_RM_DEMUXER 0 ++#define CONFIG_ROQ_DEMUXER 0 ++#define CONFIG_RPL_DEMUXER 0 ++#define CONFIG_RSD_DEMUXER 0 ++#define CONFIG_RSO_DEMUXER 0 ++#define CONFIG_RTP_DEMUXER 0 ++#define CONFIG_RTSP_DEMUXER 0 ++#define CONFIG_S337M_DEMUXER 0 ++#define CONFIG_SAMI_DEMUXER 0 ++#define CONFIG_SAP_DEMUXER 0 ++#define CONFIG_SBC_DEMUXER 0 ++#define CONFIG_SBG_DEMUXER 0 ++#define CONFIG_SCC_DEMUXER 0 ++#define CONFIG_SCD_DEMUXER 0 ++#define CONFIG_SDP_DEMUXER 0 ++#define CONFIG_SDR2_DEMUXER 0 ++#define CONFIG_SDS_DEMUXER 0 ++#define CONFIG_SDX_DEMUXER 0 ++#define CONFIG_SEGAFILM_DEMUXER 0 ++#define CONFIG_SER_DEMUXER 0 ++#define CONFIG_SGA_DEMUXER 0 ++#define CONFIG_SHORTEN_DEMUXER 0 ++#define CONFIG_SIFF_DEMUXER 0 ++#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0 ++#define CONFIG_SLN_DEMUXER 0 ++#define CONFIG_SMACKER_DEMUXER 0 ++#define CONFIG_SMJPEG_DEMUXER 0 ++#define CONFIG_SMUSH_DEMUXER 0 ++#define CONFIG_SOL_DEMUXER 0 ++#define CONFIG_SOX_DEMUXER 0 ++#define CONFIG_SPDIF_DEMUXER 0 ++#define CONFIG_SRT_DEMUXER 0 ++#define CONFIG_STR_DEMUXER 0 ++#define CONFIG_STL_DEMUXER 0 ++#define CONFIG_SUBVIEWER1_DEMUXER 0 ++#define CONFIG_SUBVIEWER_DEMUXER 0 ++#define CONFIG_SUP_DEMUXER 0 ++#define CONFIG_SVAG_DEMUXER 0 ++#define CONFIG_SVS_DEMUXER 0 ++#define CONFIG_SWF_DEMUXER 0 ++#define CONFIG_TAK_DEMUXER 0 ++#define CONFIG_TEDCAPTIONS_DEMUXER 0 ++#define CONFIG_THP_DEMUXER 0 ++#define CONFIG_THREEDOSTR_DEMUXER 0 ++#define CONFIG_TIERTEXSEQ_DEMUXER 0 ++#define CONFIG_TMV_DEMUXER 0 ++#define CONFIG_TRUEHD_DEMUXER 0 ++#define CONFIG_TTA_DEMUXER 0 ++#define CONFIG_TXD_DEMUXER 0 ++#define CONFIG_TTY_DEMUXER 0 ++#define CONFIG_TY_DEMUXER 0 ++#define CONFIG_V210_DEMUXER 0 ++#define CONFIG_V210X_DEMUXER 0 ++#define CONFIG_VAG_DEMUXER 0 ++#define CONFIG_VC1_DEMUXER 0 ++#define CONFIG_VC1T_DEMUXER 0 ++#define CONFIG_VIVIDAS_DEMUXER 0 ++#define CONFIG_VIVO_DEMUXER 0 ++#define CONFIG_VMD_DEMUXER 0 ++#define CONFIG_VOBSUB_DEMUXER 0 ++#define CONFIG_VOC_DEMUXER 0 ++#define CONFIG_VPK_DEMUXER 0 ++#define CONFIG_VPLAYER_DEMUXER 0 ++#define CONFIG_VQF_DEMUXER 0 ++#define CONFIG_W64_DEMUXER 0 ++#define CONFIG_WAV_DEMUXER 1 ++#define CONFIG_WC3_DEMUXER 0 ++#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0 ++#define CONFIG_WEBVTT_DEMUXER 0 ++#define CONFIG_WSAUD_DEMUXER 0 ++#define CONFIG_WSD_DEMUXER 0 ++#define CONFIG_WSVQA_DEMUXER 0 ++#define CONFIG_WTV_DEMUXER 0 ++#define CONFIG_WVE_DEMUXER 0 ++#define CONFIG_WV_DEMUXER 0 ++#define CONFIG_XA_DEMUXER 0 ++#define CONFIG_XBIN_DEMUXER 0 ++#define CONFIG_XMV_DEMUXER 0 ++#define CONFIG_XVAG_DEMUXER 0 ++#define CONFIG_XWMA_DEMUXER 0 ++#define CONFIG_YOP_DEMUXER 0 ++#define CONFIG_YUV4MPEGPIPE_DEMUXER 0 ++#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_VBN_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0 ++#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0 ++#define CONFIG_LIBGME_DEMUXER 0 ++#define CONFIG_LIBMODPLUG_DEMUXER 0 ++#define CONFIG_LIBOPENMPT_DEMUXER 0 ++#define CONFIG_VAPOURSYNTH_DEMUXER 0 ++#define CONFIG_A64_MUXER 0 ++#define CONFIG_AC3_MUXER 0 ++#define CONFIG_ADTS_MUXER 0 ++#define CONFIG_ADX_MUXER 0 ++#define CONFIG_AIFF_MUXER 0 ++#define CONFIG_ALP_MUXER 0 ++#define CONFIG_AMR_MUXER 0 ++#define CONFIG_AMV_MUXER 0 ++#define CONFIG_APM_MUXER 0 ++#define CONFIG_APNG_MUXER 0 ++#define CONFIG_APTX_MUXER 0 ++#define CONFIG_APTX_HD_MUXER 0 ++#define CONFIG_ARGO_ASF_MUXER 0 ++#define CONFIG_ARGO_CVG_MUXER 0 ++#define CONFIG_ASF_MUXER 0 ++#define CONFIG_ASS_MUXER 0 ++#define CONFIG_AST_MUXER 0 ++#define CONFIG_ASF_STREAM_MUXER 0 ++#define CONFIG_AU_MUXER 0 ++#define CONFIG_AVI_MUXER 0 ++#define CONFIG_AVIF_MUXER 0 ++#define CONFIG_AVM2_MUXER 0 ++#define CONFIG_AVS2_MUXER 0 ++#define CONFIG_AVS3_MUXER 0 ++#define CONFIG_BIT_MUXER 0 ++#define CONFIG_CAF_MUXER 0 ++#define CONFIG_CAVSVIDEO_MUXER 0 ++#define CONFIG_CODEC2_MUXER 0 ++#define CONFIG_CODEC2RAW_MUXER 0 ++#define CONFIG_CRC_MUXER 0 ++#define CONFIG_DASH_MUXER 0 ++#define CONFIG_DATA_MUXER 0 ++#define CONFIG_DAUD_MUXER 0 ++#define CONFIG_DFPWM_MUXER 0 ++#define CONFIG_DIRAC_MUXER 0 ++#define CONFIG_DNXHD_MUXER 0 ++#define CONFIG_DTS_MUXER 0 ++#define CONFIG_DV_MUXER 0 ++#define CONFIG_EAC3_MUXER 0 ++#define CONFIG_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 ++#define CONFIG_FLV_MUXER 0 ++#define CONFIG_FRAMECRC_MUXER 0 ++#define CONFIG_FRAMEHASH_MUXER 0 ++#define CONFIG_FRAMEMD5_MUXER 0 ++#define CONFIG_G722_MUXER 0 ++#define CONFIG_G723_1_MUXER 0 ++#define CONFIG_G726_MUXER 0 ++#define CONFIG_G726LE_MUXER 0 ++#define CONFIG_GIF_MUXER 0 ++#define CONFIG_GSM_MUXER 0 ++#define CONFIG_GXF_MUXER 0 ++#define CONFIG_H261_MUXER 0 ++#define CONFIG_H263_MUXER 0 ++#define CONFIG_H264_MUXER 0 ++#define CONFIG_HASH_MUXER 0 ++#define CONFIG_HDS_MUXER 0 ++#define CONFIG_HEVC_MUXER 0 ++#define CONFIG_HLS_MUXER 0 ++#define CONFIG_ICO_MUXER 0 ++#define CONFIG_ILBC_MUXER 0 ++#define CONFIG_IMAGE2_MUXER 0 ++#define CONFIG_IMAGE2PIPE_MUXER 0 ++#define CONFIG_IPOD_MUXER 0 ++#define CONFIG_IRCAM_MUXER 0 ++#define CONFIG_ISMV_MUXER 0 ++#define CONFIG_IVF_MUXER 0 ++#define CONFIG_JACOSUB_MUXER 0 ++#define CONFIG_KVAG_MUXER 0 ++#define CONFIG_LATM_MUXER 0 ++#define CONFIG_LRC_MUXER 0 ++#define CONFIG_M4V_MUXER 0 ++#define CONFIG_MD5_MUXER 0 ++#define CONFIG_MATROSKA_MUXER 0 ++#define CONFIG_MATROSKA_AUDIO_MUXER 0 ++#define CONFIG_MICRODVD_MUXER 0 ++#define CONFIG_MJPEG_MUXER 0 ++#define CONFIG_MLP_MUXER 0 ++#define CONFIG_MMF_MUXER 0 ++#define CONFIG_MOV_MUXER 0 ++#define CONFIG_MP2_MUXER 0 ++#define CONFIG_MP3_MUXER 0 ++#define CONFIG_MP4_MUXER 0 ++#define CONFIG_MPEG1SYSTEM_MUXER 0 ++#define CONFIG_MPEG1VCD_MUXER 0 ++#define CONFIG_MPEG1VIDEO_MUXER 0 ++#define CONFIG_MPEG2DVD_MUXER 0 ++#define CONFIG_MPEG2SVCD_MUXER 0 ++#define CONFIG_MPEG2VIDEO_MUXER 0 ++#define CONFIG_MPEG2VOB_MUXER 0 ++#define CONFIG_MPEGTS_MUXER 0 ++#define CONFIG_MPJPEG_MUXER 0 ++#define CONFIG_MXF_MUXER 0 ++#define CONFIG_MXF_D10_MUXER 0 ++#define CONFIG_MXF_OPATOM_MUXER 0 ++#define CONFIG_NULL_MUXER 0 ++#define CONFIG_NUT_MUXER 0 ++#define CONFIG_OBU_MUXER 0 ++#define CONFIG_OGA_MUXER 0 ++#define CONFIG_OGG_MUXER 0 ++#define CONFIG_OGV_MUXER 0 ++#define CONFIG_OMA_MUXER 0 ++#define CONFIG_OPUS_MUXER 0 ++#define CONFIG_PCM_ALAW_MUXER 0 ++#define CONFIG_PCM_MULAW_MUXER 0 ++#define CONFIG_PCM_VIDC_MUXER 0 ++#define CONFIG_PCM_F64BE_MUXER 0 ++#define CONFIG_PCM_F64LE_MUXER 0 ++#define CONFIG_PCM_F32BE_MUXER 0 ++#define CONFIG_PCM_F32LE_MUXER 0 ++#define CONFIG_PCM_S32BE_MUXER 0 ++#define CONFIG_PCM_S32LE_MUXER 0 ++#define CONFIG_PCM_S24BE_MUXER 0 ++#define CONFIG_PCM_S24LE_MUXER 0 ++#define CONFIG_PCM_S16BE_MUXER 0 ++#define CONFIG_PCM_S16LE_MUXER 0 ++#define CONFIG_PCM_S8_MUXER 0 ++#define CONFIG_PCM_U32BE_MUXER 0 ++#define CONFIG_PCM_U32LE_MUXER 0 ++#define CONFIG_PCM_U24BE_MUXER 0 ++#define CONFIG_PCM_U24LE_MUXER 0 ++#define CONFIG_PCM_U16BE_MUXER 0 ++#define CONFIG_PCM_U16LE_MUXER 0 ++#define CONFIG_PCM_U8_MUXER 0 ++#define CONFIG_PSP_MUXER 0 ++#define CONFIG_RAWVIDEO_MUXER 0 ++#define CONFIG_RM_MUXER 0 ++#define CONFIG_ROQ_MUXER 0 ++#define CONFIG_RSO_MUXER 0 ++#define CONFIG_RTP_MUXER 0 ++#define CONFIG_RTP_MPEGTS_MUXER 0 ++#define CONFIG_RTSP_MUXER 0 ++#define CONFIG_SAP_MUXER 0 ++#define CONFIG_SBC_MUXER 0 ++#define CONFIG_SCC_MUXER 0 ++#define CONFIG_SEGAFILM_MUXER 0 ++#define CONFIG_SEGMENT_MUXER 0 ++#define CONFIG_STREAM_SEGMENT_MUXER 0 ++#define CONFIG_SMJPEG_MUXER 0 ++#define CONFIG_SMOOTHSTREAMING_MUXER 0 ++#define CONFIG_SOX_MUXER 0 ++#define CONFIG_SPX_MUXER 0 ++#define CONFIG_SPDIF_MUXER 0 ++#define CONFIG_SRT_MUXER 0 ++#define CONFIG_STREAMHASH_MUXER 0 ++#define CONFIG_SUP_MUXER 0 ++#define CONFIG_SWF_MUXER 0 ++#define CONFIG_TEE_MUXER 0 ++#define CONFIG_TG2_MUXER 0 ++#define CONFIG_TGP_MUXER 0 ++#define CONFIG_MKVTIMESTAMP_V2_MUXER 0 ++#define CONFIG_TRUEHD_MUXER 0 ++#define CONFIG_TTA_MUXER 0 ++#define CONFIG_TTML_MUXER 0 ++#define CONFIG_UNCODEDFRAMECRC_MUXER 0 ++#define CONFIG_VC1_MUXER 0 ++#define CONFIG_VC1T_MUXER 0 ++#define CONFIG_VOC_MUXER 0 ++#define CONFIG_W64_MUXER 0 ++#define CONFIG_WAV_MUXER 0 ++#define CONFIG_WEBM_MUXER 0 ++#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0 ++#define CONFIG_WEBM_CHUNK_MUXER 0 ++#define CONFIG_WEBP_MUXER 0 ++#define CONFIG_WEBVTT_MUXER 0 ++#define CONFIG_WSAUD_MUXER 0 ++#define CONFIG_WTV_MUXER 0 ++#define CONFIG_WV_MUXER 0 ++#define CONFIG_YUV4MPEGPIPE_MUXER 0 ++#define CONFIG_CHROMAPRINT_MUXER 0 ++#define CONFIG_ASYNC_PROTOCOL 0 ++#define CONFIG_BLURAY_PROTOCOL 0 ++#define CONFIG_CACHE_PROTOCOL 0 ++#define CONFIG_CONCAT_PROTOCOL 0 ++#define CONFIG_CONCATF_PROTOCOL 0 ++#define CONFIG_CRYPTO_PROTOCOL 0 ++#define CONFIG_DATA_PROTOCOL 0 ++#define CONFIG_FFRTMPCRYPT_PROTOCOL 0 ++#define CONFIG_FFRTMPHTTP_PROTOCOL 0 ++#define CONFIG_FILE_PROTOCOL 0 ++#define CONFIG_FTP_PROTOCOL 0 ++#define CONFIG_GOPHER_PROTOCOL 0 ++#define CONFIG_GOPHERS_PROTOCOL 0 ++#define CONFIG_HLS_PROTOCOL 0 ++#define CONFIG_HTTP_PROTOCOL 0 ++#define CONFIG_HTTPPROXY_PROTOCOL 0 ++#define CONFIG_HTTPS_PROTOCOL 0 ++#define CONFIG_ICECAST_PROTOCOL 0 ++#define CONFIG_MMSH_PROTOCOL 0 ++#define CONFIG_MMST_PROTOCOL 0 ++#define CONFIG_MD5_PROTOCOL 0 ++#define CONFIG_PIPE_PROTOCOL 0 ++#define CONFIG_PROMPEG_PROTOCOL 0 ++#define CONFIG_RTMP_PROTOCOL 0 ++#define CONFIG_RTMPE_PROTOCOL 0 ++#define CONFIG_RTMPS_PROTOCOL 0 ++#define CONFIG_RTMPT_PROTOCOL 0 ++#define CONFIG_RTMPTE_PROTOCOL 0 ++#define CONFIG_RTMPTS_PROTOCOL 0 ++#define CONFIG_RTP_PROTOCOL 0 ++#define CONFIG_SCTP_PROTOCOL 0 ++#define CONFIG_SRTP_PROTOCOL 0 ++#define CONFIG_SUBFILE_PROTOCOL 0 ++#define CONFIG_TEE_PROTOCOL 0 ++#define CONFIG_TCP_PROTOCOL 0 ++#define CONFIG_TLS_PROTOCOL 0 ++#define CONFIG_UDP_PROTOCOL 0 ++#define CONFIG_UDPLITE_PROTOCOL 0 ++#define CONFIG_UNIX_PROTOCOL 0 ++#define CONFIG_LIBAMQP_PROTOCOL 0 ++#define CONFIG_LIBRIST_PROTOCOL 0 ++#define CONFIG_LIBRTMP_PROTOCOL 0 ++#define CONFIG_LIBRTMPE_PROTOCOL 0 ++#define CONFIG_LIBRTMPS_PROTOCOL 0 ++#define CONFIG_LIBRTMPT_PROTOCOL 0 ++#define CONFIG_LIBRTMPTE_PROTOCOL 0 ++#define CONFIG_LIBSRT_PROTOCOL 0 ++#define CONFIG_LIBSSH_PROTOCOL 0 ++#define CONFIG_LIBSMBCLIENT_PROTOCOL 0 ++#define CONFIG_LIBZMQ_PROTOCOL 0 ++#define CONFIG_IPFS_PROTOCOL 0 ++#define CONFIG_IPNS_PROTOCOL 0 ++#endif /* FFMPEG_CONFIG_COMPONENTS_H */ diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavutil_cpu.c b/www/iridium/files/patch-third__party_ffmpeg_libavutil_cpu.c index 445b7b5099dd..f7857f6eb341 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_libavutil_cpu.c +++ b/www/iridium/files/patch-third__party_ffmpeg_libavutil_cpu.c @@ -1,6 +1,6 @@ ---- third_party/ffmpeg/libavutil/cpu.c.orig 2022-03-28 18:11:04 UTC +--- third_party/ffmpeg/libavutil/cpu.c.orig 2022-10-05 07:34:01 UTC +++ third_party/ffmpeg/libavutil/cpu.c -@@ -36,10 +36,7 @@ +@@ -38,10 +38,7 @@ #if HAVE_GETPROCESSAFFINITYMASK || HAVE_WINRT #include <windows.h> #endif diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavutil_mem.c b/www/iridium/files/patch-third__party_ffmpeg_libavutil_mem.c index 7dc7494aa265..9af6bf1717dc 100644 --- a/www/iridium/files/patch-third__party_ffmpeg_libavutil_mem.c +++ b/www/iridium/files/patch-third__party_ffmpeg_libavutil_mem.c @@ -1,4 +1,4 @@ ---- third_party/ffmpeg/libavutil/mem.c.orig 2022-03-28 18:11:04 UTC +--- third_party/ffmpeg/libavutil/mem.c.orig 2022-10-05 07:34:01 UTC +++ third_party/ffmpeg/libavutil/mem.c @@ -33,9 +33,6 @@ #include <stdlib.h> @@ -8,5 +8,5 @@ -#include <malloc.h> -#endif - #include "avutil.h" - #include "common.h" + #include "attributes.h" + #include "avassert.h" diff --git a/www/iridium/files/patch-third__party_glfw_src_src_egl__context.c b/www/iridium/files/patch-third__party_glfw_src_src_egl__context.c deleted file mode 100644 index 13efbb5ad71c..000000000000 --- a/www/iridium/files/patch-third__party_glfw_src_src_egl__context.c +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/glfw/src/src/egl_context.c.orig 2022-03-28 18:11:04 UTC -+++ third_party/glfw/src/src/egl_context.c -@@ -712,7 +712,7 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window, - #elif defined(_GLFW_WIN32) - #elif defined(_GLFW_COCOA) - #else -- "libGL.so.1", -+ "libGL.so", - #endif - NULL - }; diff --git a/www/iridium/files/patch-third__party_ipcz_src_reference__drivers_random.cc b/www/iridium/files/patch-third__party_ipcz_src_reference__drivers_random.cc new file mode 100644 index 000000000000..89c2f6240247 --- /dev/null +++ b/www/iridium/files/patch-third__party_ipcz_src_reference__drivers_random.cc @@ -0,0 +1,20 @@ +--- third_party/ipcz/src/reference_drivers/random.cc.orig 2022-10-05 07:34:01 UTC ++++ third_party/ipcz/src/reference_drivers/random.cc +@@ -15,7 +15,7 @@ + #include <limits> + #elif BUILDFLAG(IS_FUCHSIA) + #include <zircon/syscalls.h> +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + #include <asm/unistd.h> + #include <errno.h> + #include <sys/syscall.h> +@@ -78,7 +78,7 @@ void RandomBytes(absl::Span<uint8_t> destination) { + ABSL_ASSERT(ok); + #elif BUILDFLAG(IS_FUCHSIA) + zx_cprng_draw(destination.data(), destination.size()); +-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD) + while (!destination.empty()) { + ssize_t result = + syscall(__NR_getrandom, destination.data(), destination.size(), 0); diff --git a/www/iridium/files/patch-third__party_ipcz_src_standalone_base_logging.cc b/www/iridium/files/patch-third__party_ipcz_src_standalone_base_logging.cc new file mode 100644 index 000000000000..7b3178150db6 --- /dev/null +++ b/www/iridium/files/patch-third__party_ipcz_src_standalone_base_logging.cc @@ -0,0 +1,12 @@ +--- third_party/ipcz/src/standalone/base/logging.cc.orig 2022-10-05 07:34:01 UTC ++++ third_party/ipcz/src/standalone/base/logging.cc +@@ -50,6 +50,9 @@ LogMessage::LogMessage(const char* file, int line, Lev + #elif BUILDFLAG(IS_ANDROID) + stream_ << getpid() << ":" << gettid() << ":"; + const char* trimmed_file = strrchr(file, '/') + 1; ++#elif BUILDFLAG(IS_BSD) ++ stream_ << getpid() << ":" << pthread_self() << ":"; ++ const char* trimmed_file = strrchr(file, '/') + 1; + #elif BUILDFLAG(IS_WIN) + const char* trimmed_file = file; + stream_ << (::GetCurrentProcessId()) << ":" << ::GetCurrentThreadId() << ":"; diff --git a/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc b/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc index 6ec5744cc5b9..e75468256e4e 100644 --- a/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc +++ b/www/iridium/files/patch-third__party_leveldatabase_env__chromium.cc @@ -1,6 +1,6 @@ ---- third_party/leveldatabase/env_chromium.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/leveldatabase/env_chromium.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/leveldatabase/env_chromium.cc -@@ -316,7 +316,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: +@@ -317,7 +317,8 @@ ChromiumWritableFile::ChromiumWritableFile(const std:: Status ChromiumWritableFile::SyncParent() { TRACE_EVENT0("leveldb", "SyncParent"); diff --git a/www/iridium/files/patch-third__party_libXNVCtrl_NVCtrl.c b/www/iridium/files/patch-third__party_libXNVCtrl_NVCtrl.c deleted file mode 100644 index b64cca13da03..000000000000 --- a/www/iridium/files/patch-third__party_libXNVCtrl_NVCtrl.c +++ /dev/null @@ -1,25 +0,0 @@ ---- third_party/libXNVCtrl/NVCtrl.c.orig 2022-03-28 18:11:04 UTC -+++ third_party/libXNVCtrl/NVCtrl.c -@@ -27,10 +27,6 @@ - * libXNVCtrl library properly protects the Display connection. - */ - --#if !defined(XTHREADS) --#define XTHREADS --#endif /* XTHREADS */ -- - #define NEED_EVENTS - #define NEED_REPLIES - #include <stdint.h> -@@ -39,6 +35,11 @@ - #include <X11/Xutil.h> - #include <X11/extensions/Xext.h> - #include <X11/extensions/extutil.h> -+ -+#if !defined(XTHREADS) -+#define XTHREADS -+#endif /* XTHREADS */ -+ - #include "NVCtrlLib.h" - #include "nv_control.h" - diff --git a/www/iridium/files/patch-base_third__party_libevent_event.h b/www/iridium/files/patch-third__party_libevent_event.h index 282a35d03ee9..d57850e37963 100644 --- a/www/iridium/files/patch-base_third__party_libevent_event.h +++ b/www/iridium/files/patch-third__party_libevent_event.h @@ -1,5 +1,5 @@ ---- base/third_party/libevent/event.h.orig 2022-05-28 07:21:18 UTC -+++ base/third_party/libevent/event.h +--- third_party/libevent/event.h.orig 2022-10-05 07:34:01 UTC ++++ third_party/libevent/event.h @@ -1,3 +1,6 @@ +#if defined(USE_SYSTEM_LIBEVENT) +#include <event.h> diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h index ebf9556afeb8..4cfa933c6ebc 100644 --- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h +++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_memory_singleton.h @@ -1,12 +1,11 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2022-03-28 18:11:04 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h.orig 2022-10-05 07:34:01 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/memory/singleton.h -@@ -56,7 +56,8 @@ template <class T> boost::once_flag Singleton<T>::flag - #include "phonenumbers/base/logging.h" - #include "phonenumbers/base/thread_checker.h" - --#if !defined(__linux__) && !defined(__APPLE__) -+#if !defined(__linux__) && !defined(__APPLE__) && !defined(__OpenBSD__) && \ -+ !defined(__FreeBSD__) - - namespace i18n { - namespace phonenumbers { +@@ -22,7 +22,7 @@ + #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX) + // C++11 Lock implementation based on std::mutex. + #include "phonenumbers/base/memory/singleton_stdmutex.h" +-#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) ++#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) + #include "phonenumbers/base/memory/singleton_posix.h" + #elif defined(WIN32) + #include "phonenumbers/base/memory/singleton_win32.h" diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h index d122562a829c..cf920aa09227 100644 --- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h +++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_synchronization_lock.h @@ -1,12 +1,11 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2022-03-28 18:11:04 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h.orig 2022-10-05 07:34:01 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/synchronization/lock.h -@@ -63,7 +63,8 @@ class Lock { (private) - // Dummy lock implementation on non-POSIX platforms. If you are running on a - // different platform and care about thread-safety, please compile with - // -DI18N_PHONENUMBERS_USE_BOOST. --#elif !defined(__linux__) && !defined(__APPLE__) -+#elif !defined(__linux__) && !defined(__APPLE__) && !defined(__OpenBSD__) && \ -+ !defined(__FreeBSD__) - - namespace i18n { - namespace phonenumbers { +@@ -22,7 +22,7 @@ + #elif (__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX) + // C++11 Lock implementation based on std::mutex. + #include "phonenumbers/base/synchronization/lock_stdmutex.h" +-#elif defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) ++#elif defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) + #include "phonenumbers/base/synchronization/lock_posix.h" + #elif defined(WIN32) + #include "phonenumbers/base/synchronization/lock_win32.h" diff --git a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h index 5bcf2debec5f..03d9351e40ed 100644 --- a/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h +++ b/www/iridium/files/patch-third__party_libphonenumber_dist_cpp_src_phonenumbers_base_thread__checker.h @@ -1,22 +1,20 @@ ---- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2022-03-28 18:11:04 UTC +--- third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h.orig 2022-10-05 07:34:01 UTC +++ third_party/libphonenumber/dist/cpp/src/phonenumbers/base/thread_checker.h -@@ -23,7 +23,8 @@ +@@ -22,7 +22,7 @@ + // Note that I18N_PHONENUMBERS_NO_THREAD_SAFETY must be defined only to let the // user of the library know that it can't be used in a thread-safe manner when // it is not depending on Boost. - #if !defined(__linux__) && !defined(__APPLE__) && \ -- !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) -+ !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && !defined(__OpenBSD__) && \ -+ !defined(__FreeBSD__) - #error Building without Boost, please provide \ - -DI18N_PHONENUMBERS_NO_THREAD_SAFETY - #endif -@@ -31,7 +32,8 @@ +-#if !defined(__linux__) && !defined(__APPLE__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \ ++#if !defined(__linux__) && !defined(__APPLE__) && !defined(__OpenBSD__) && !defined(__FreeBSD__) && !defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD) && \ + !defined(I18N_PHONENUMBERS_NO_THREAD_SAFETY) && \ + !((__cplusplus >= 201103L) && defined(I18N_PHONENUMBERS_USE_STDMUTEX)) && \ + !defined(WIN32) +@@ -33,7 +33,7 @@ #endif #if !defined(NDEBUG) && !defined(I18N_PHONENUMBERS_USE_BOOST) && \ -- (defined(__linux__) || defined(__apple__)) -+ (defined(__linux__) || defined(__apple__) || defined(__OpenBSD__) || \ -+ defined(__FreeBSD__)) +- (defined(__linux__) || defined(__APPLE__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)) ++ (defined(__linux__) || defined(__APPLE__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(I18N_PHONENUMBERS_HAVE_POSIX_THREAD)) #include <pthread.h> diff --git a/www/iridium/files/patch-third__party_libxml_src_dict.c b/www/iridium/files/patch-third__party_libxml_src_dict.c index 80a24b5cb21e..f0f92b429db4 100644 --- a/www/iridium/files/patch-third__party_libxml_src_dict.c +++ b/www/iridium/files/patch-third__party_libxml_src_dict.c @@ -1,6 +1,6 @@ ---- third_party/libxml/src/dict.c.orig 2022-04-01 07:48:30 UTC +--- third_party/libxml/src/dict.c.orig 2022-10-05 07:34:01 UTC +++ third_party/libxml/src/dict.c -@@ -135,7 +135,7 @@ static xmlRMutexPtr xmlDictMutex = NULL; +@@ -135,7 +135,7 @@ static xmlMutexPtr xmlDictMutex = NULL; static int xmlDictInitialized = 0; #ifdef DICT_RANDOMIZATION @@ -9,23 +9,23 @@ /* * Internal data for random function, protected by xmlDictMutex */ -@@ -176,7 +176,7 @@ int __xmlInitializeDict(void) { +@@ -178,7 +178,7 @@ int __xmlInitializeDict(void) { return(0); - xmlRMutexLock(xmlDictMutex); + xmlMutexLock(xmlDictMutex); -#ifdef DICT_RANDOMIZATION +#if defined(DICT_RANDOMIZATION) && !defined(HAVE_ARC4RANDOM) #ifdef HAVE_RAND_R rand_seed = time(NULL); rand_r(& rand_seed); -@@ -196,13 +196,17 @@ int __xmlRandom(void) { +@@ -198,13 +198,17 @@ int __xmlRandom(void) { if (xmlDictInitialized == 0) __xmlInitializeDict(); +#ifdef HAVE_ARC4RANDOM + ret = arc4random(); +#else - xmlRMutexLock(xmlDictMutex); + xmlMutexLock(xmlDictMutex); -#ifdef HAVE_RAND_R +# ifdef HAVE_RAND_R ret = rand_r(& rand_seed); @@ -34,7 +34,7 @@ ret = rand(); -#endif +# endif - xmlRMutexUnlock(xmlDictMutex); + xmlMutexUnlock(xmlDictMutex); +#endif return(ret); } diff --git a/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c b/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c new file mode 100644 index 000000000000..0bd8a5427be6 --- /dev/null +++ b/www/iridium/files/patch-third__party_lzma__sdk_C_CpuArch.c @@ -0,0 +1,44 @@ +--- third_party/lzma_sdk/C/CpuArch.c.orig 2022-10-05 07:34:01 UTC ++++ third_party/lzma_sdk/C/CpuArch.c +@@ -412,12 +412,40 @@ BoolInt CPU_IsSupported_SHA1(void) { return APPLE_CRYP + BoolInt CPU_IsSupported_SHA2(void) { return APPLE_CRYPTO_SUPPORT_VAL; } + BoolInt CPU_IsSupported_AES (void) { return APPLE_CRYPTO_SUPPORT_VAL; } + ++#elif defined(__OpenBSD__) + ++#include <sys/param.h> ++#include <sys/sysctl.h> ++#include <machine/cpu.h> ++#include <machine/armreg.h> ++ ++BoolInt CPU_IsSupported_NEON() { return 1; } ++ ++#define MY_HWCAP_CHECK_FUNC_2(name1, name2) \ ++ BoolInt CPU_IsSupported_ ## name1() { \ ++ int isar0_mib[] = { CTL_MACHDEP, CPU_ID_AA64ISAR0 }; \ ++ size_t len = sizeof(uint64_t); \ ++ uint64_t cpu_id = 0; \ ++ if (sysctl(isar0_mib, 2, &cpu_id, &len, NULL, 0) < 0) \ ++ return 0; \ ++ if (ID_AA64ISAR0_ ## name2(cpu_id) >= ID_AA64ISAR0_## name2 ##_BASE) \ ++ return 1; \ ++ return 0; \ ++ } ++ ++#define MY_HWCAP_CHECK_FUNC(name) \ ++ MY_HWCAP_CHECK_FUNC_2(name, name) ++ ++MY_HWCAP_CHECK_FUNC (CRC32) ++MY_HWCAP_CHECK_FUNC (SHA1) ++MY_HWCAP_CHECK_FUNC (SHA2) ++MY_HWCAP_CHECK_FUNC (AES) ++ + #else // __APPLE__ + + #include <sys/auxv.h> + +-#if !defined(ARMV8_OS_FUCHSIA) ++#if !defined(ARMV8_OS_FUCHSIA) && !defined(__FreeBSD__) + #define USE_HWCAP + #endif // !defined(ARMV8_OS_FUCHSIA) + diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp deleted file mode 100644 index bbc598bcd2c2..000000000000 --- a/www/iridium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/pdfium/core/fxcrt/cfx_datetime.cpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/pdfium/core/fxcrt/cfx_datetime.cpp -@@ -11,7 +11,7 @@ - #include "third_party/base/check.h" - - #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \ -- BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) -+ BUILDFLAG(IS_APPLE) || defined(OS_ASMJS) || BUILDFLAG(IS_BSD) - #include <sys/time.h> - #include <time.h> - #endif diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp index bfd202231a52..7a73e22a3a97 100644 --- a/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp +++ b/www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-03-28 18:11:04 UTC +--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2022-10-05 07:34:01 UTC +++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp -@@ -155,7 +155,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { +@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = { {"ForteMT", "Forte"}, }; diff --git a/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp b/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp index fb935477bda9..a67ad8698d9d 100644 --- a/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp +++ b/www/iridium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp @@ -1,15 +1,15 @@ ---- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-03-28 18:11:04 UTC +--- third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp.orig 2022-10-05 07:34:01 UTC +++ third_party/pdfium/core/fxge/linux/fx_linux_impl.cpp -@@ -17,7 +17,7 @@ +@@ -18,7 +18,7 @@ #include "third_party/base/check.h" - #include "third_party/base/cxx17_backports.h" --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD) + #if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !defined(OS_FUCHSIA) && \ +- !defined(OS_ASMJS) ++ !defined(OS_ASMJS) && !BUILDFLAG(IS_BSD) #error "Included on the wrong platform" #endif -@@ -165,9 +165,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf +@@ -166,9 +166,8 @@ class CLinuxPlatform : public CFX_GEModule::PlatformIf std::unique_ptr<SystemFontInfoIface> CreateDefaultSystemFontInfo() override { auto pInfo = std::make_unique<CFX_LinuxFontInfo>(); if (!pInfo->ParseFontCfg(CFX_GEModule::Get()->GetUserFontPaths())) { diff --git a/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp b/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp index d7f7705df076..af90f679109c 100644 --- a/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp +++ b/www/iridium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp @@ -1,6 +1,6 @@ ---- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2022-03-28 18:11:04 UTC +--- third_party/pdfium/fxjs/fx_date_helpers.cpp.orig 2022-10-05 07:34:01 UTC +++ third_party/pdfium/fxjs/fx_date_helpers.cpp -@@ -36,6 +36,11 @@ double GetLocalTZA() { +@@ -37,6 +37,11 @@ double GetLocalTZA() { return 0; time_t t = 0; FXSYS_time(&t); @@ -12,7 +12,7 @@ FXSYS_localtime(&t); #if BUILDFLAG(IS_WIN) // In gcc 'timezone' is a global variable declared in time.h. In VC++, that -@@ -44,6 +49,7 @@ double GetLocalTZA() { +@@ -45,6 +50,7 @@ double GetLocalTZA() { _get_timezone(&timezone); #endif return (double)(-(timezone * 1000)); diff --git a/www/iridium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto b/www/iridium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto new file mode 100644 index 000000000000..19941967ccb9 --- /dev/null +++ b/www/iridium/files/patch-third__party_perfetto_protos_perfetto_trace_ftrace_v4l2.proto @@ -0,0 +1,56 @@ +--- third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto.orig 2022-10-05 07:34:01 UTC ++++ third_party/perfetto/protos/perfetto/trace/ftrace/v4l2.proto +@@ -10,7 +10,7 @@ message V4l2QbufFtraceEvent { + optional uint32 field = 2; + optional uint32 flags = 3; + optional uint32 index = 4; +- optional int32 minor = 5; ++ optional int32 gminor = 5; + optional uint32 sequence = 6; + optional uint32 timecode_flags = 7; + optional uint32 timecode_frames = 8; +@@ -30,7 +30,7 @@ message V4l2DqbufFtraceEvent { + optional uint32 field = 2; + optional uint32 flags = 3; + optional uint32 index = 4; +- optional int32 minor = 5; ++ optional int32 gminor = 5; + optional uint32 sequence = 6; + optional uint32 timecode_flags = 7; + optional uint32 timecode_frames = 8; +@@ -48,7 +48,7 @@ message V4l2DqbufFtraceEvent { + message Vb2V4l2BufQueueFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -65,7 +65,7 @@ message Vb2V4l2BufQueueFtraceEvent { + message Vb2V4l2BufDoneFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -82,7 +82,7 @@ message Vb2V4l2BufDoneFtraceEvent { + message Vb2V4l2QbufFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; +@@ -99,7 +99,7 @@ message Vb2V4l2QbufFtraceEvent { + message Vb2V4l2DqbufFtraceEvent { + optional uint32 field = 1; + optional uint32 flags = 2; +- optional int32 minor = 3; ++ optional int32 gminor = 3; + optional uint32 sequence = 4; + optional uint32 timecode_flags = 5; + optional uint32 timecode_frames = 6; diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc b/www/iridium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc index 268f4b97d20d..5c18b9e06764 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/base/test/vm_test_utils.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/perfetto/src/base/test/vm_test_utils.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/perfetto/src/base/test/vm_test_utils.cc -@@ -92,7 +92,7 @@ bool IsMapped(void* start, size_t size) { +@@ -91,7 +91,7 @@ bool IsMapped(void* start, size_t size) { // Fuchsia doesn't yet support paging (b/119503290). ignore_result(page_size); return true; diff --git a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc index 57ed0f7077db..1c45cbf42175 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_base_unix__socket.cc @@ -1,4 +1,4 @@ ---- third_party/perfetto/src/base/unix_socket.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/perfetto/src/base/unix_socket.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/perfetto/src/base/unix_socket.cc @@ -42,7 +42,7 @@ #include <unistd.h> @@ -9,7 +9,7 @@ #include <sys/ucred.h> #endif -@@ -791,9 +791,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { +@@ -801,9 +801,13 @@ void UnixSocket::ReadPeerCredentialsPosix() { return; PERFETTO_CHECK(peer_cred_mode_ != SockPeerCredMode::kIgnore); diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc index f287c7a339ca..883782156bf2 100644 --- a/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc +++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc @@ -1,6 +1,6 @@ ---- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc -@@ -3042,7 +3042,8 @@ bool TracingServiceImpl::SnapshotClocks( +@@ -3037,7 +3037,8 @@ bool TracingServiceImpl::SnapshotClocks( #if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \ !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \ diff --git a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc new file mode 100644 index 000000000000..9bd908838775 --- /dev/null +++ b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_arenastring.cc @@ -0,0 +1,12 @@ +--- third_party/protobuf/src/google/protobuf/arenastring.cc.orig 2022-10-05 07:34:01 UTC ++++ third_party/protobuf/src/google/protobuf/arenastring.cc +@@ -64,7 +64,9 @@ constexpr size_t kNewAlign = alignof(std::max_align_t) + #endif + constexpr size_t kStringAlign = alignof(std::string); + ++#if !(defined(__FreeBSD__) && defined(__i386__)) + static_assert((kStringAlign > kNewAlign ? kStringAlign : kNewAlign) >= 8, ""); ++#endif + static_assert(alignof(ExplicitlyConstructedArenaString) >= 8, ""); + + } // namespace diff --git a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h index 6968c2dddde5..d8fe63cb0499 100644 --- a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h +++ b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_platform__macros.h @@ -1,6 +1,6 @@ ---- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2022-03-28 18:11:04 UTC +--- third_party/protobuf/src/google/protobuf/stubs/platform_macros.h.orig 2022-10-05 07:34:01 UTC +++ third_party/protobuf/src/google/protobuf/stubs/platform_macros.h -@@ -118,7 +118,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR +@@ -122,7 +122,7 @@ GOOGLE_PROTOBUF_PLATFORM_ERROR #undef GOOGLE_PROTOBUF_PLATFORM_ERROR diff --git a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_strutil.h b/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_strutil.h deleted file mode 100644 index 63bf9b75abb0..000000000000 --- a/www/iridium/files/patch-third__party_protobuf_src_google_protobuf_stubs_strutil.h +++ /dev/null @@ -1,18 +0,0 @@ ---- third_party/protobuf/src/google/protobuf/stubs/strutil.h.orig 2022-03-28 18:11:04 UTC -+++ third_party/protobuf/src/google/protobuf/stubs/strutil.h -@@ -373,13 +373,13 @@ inline uint32 strtou32(const char *nptr, char **endptr - inline int64 strto64(const char *nptr, char **endptr, int base) { - GOOGLE_COMPILE_ASSERT(sizeof(int64) == sizeof(long long), - sizeof_int64_is_not_sizeof_long_long); -- return strtoll(nptr, endptr, base); -+ return std::strtoll(nptr, endptr, base); - } - - inline uint64 strtou64(const char *nptr, char **endptr, int base) { - GOOGLE_COMPILE_ASSERT(sizeof(uint64) == sizeof(unsigned long long), - sizeof_uint64_is_not_sizeof_long_long); -- return strtoull(nptr, endptr, base); -+ return std::strtoull(nptr, endptr, base); - } - - // ---------------------------------------------------------------------- diff --git a/www/iridium/files/patch-third__party_ruy_BUILD.gn b/www/iridium/files/patch-third__party_ruy_BUILD.gn new file mode 100644 index 000000000000..536bbfe43ccc --- /dev/null +++ b/www/iridium/files/patch-third__party_ruy_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/ruy/BUILD.gn.orig 2022-10-05 07:34:01 UTC ++++ third_party/ruy/BUILD.gn +@@ -9,7 +9,7 @@ use_cpuinfo = + current_cpu != "ppc64" && current_cpu != "ppc64le" && + current_cpu != "s390" && current_cpu != "s390x" && + # cpuinfo is not supported on fuchsia. +- !is_fuchsia && ++ !is_fuchsia && !is_bsd && + # There's a few arm architectures that are not supported by cpuinfo, + # especially amongst ChromeOS devices. + # See //third_party/cpuinfo/src/src/arm/linux/cp.h. diff --git a/www/iridium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h b/www/iridium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h deleted file mode 100644 index 01ecea33689b..000000000000 --- a/www/iridium/files/patch-third__party_skia_src_gpu_GrAutoLocaleSetter.h +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/skia/src/gpu/GrAutoLocaleSetter.h.orig 2022-03-28 18:11:04 UTC -+++ third_party/skia/src/gpu/GrAutoLocaleSetter.h -@@ -27,7 +27,7 @@ - #define HAVE_XLOCALE 0 - #endif - --#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION) -+#if defined(SK_BUILD_FOR_ANDROID) || defined(__UCLIBC__) || defined(_NEWLIB_VERSION) || defined(__OpenBSD__) - #define HAVE_LOCALE_T 0 - #else - #define HAVE_LOCALE_T 1 diff --git a/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c b/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c index 05892556b78c..dfa6da49bb2d 100644 --- a/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c +++ b/www/iridium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c @@ -1,6 +1,6 @@ ---- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2022-03-28 18:11:04 UTC +--- third_party/sqlite/src/amalgamation/sqlite3.c.orig 2022-10-05 07:34:01 UTC +++ third_party/sqlite/src/amalgamation/sqlite3.c -@@ -40896,7 +40896,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -42109,7 +42109,12 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB memset(zBuf, 0, nBuf); randomnessPid = osGetpid(0); #if !defined(SQLITE_TEST) && !defined(SQLITE_OMIT_RANDOMNESS) @@ -13,7 +13,7 @@ int fd, got; fd = robust_open("/dev/urandom", O_RDONLY, 0); if( fd<0 ){ -@@ -40911,6 +40916,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB +@@ -42124,6 +42129,7 @@ static int unixRandomness(sqlite3_vfs *NotUsed, int nB robust_close(0, fd, __LINE__); } } diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp b/www/iridium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp deleted file mode 100644 index e340a235db5a..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp +++ /dev/null @@ -1,13 +0,0 @@ ---- third_party/swiftshader/src/Common/Configurator.cpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/Common/Configurator.cpp -@@ -42,6 +42,10 @@ namespace sw - - bool Configurator::readFile() - { -+#if defined(__OpenBSD__) || defined(__FreeBSD__) -+ return false; -+#endif -+ - #if defined(__unix__) - if(access(path.c_str(), R_OK) != 0) - { diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp b/www/iridium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp deleted file mode 100644 index f8e7faeef281..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/Common/MutexLock.hpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/Common/MutexLock.hpp -@@ -17,7 +17,7 @@ - - #include "Thread.hpp" - --#if defined(__linux__) -+#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) - // Use a pthread mutex on Linux. Since many processes may use SwiftShader - // at the same time it's best to just have the scheduler overhead. - #include <pthread.h> diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp b/www/iridium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp deleted file mode 100644 index 4531edb05d5d..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/Common/SharedLibrary.hpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/Common/SharedLibrary.hpp -@@ -97,7 +97,7 @@ void *loadLibrary(const std::string &libraryDirectory, - - inline void *getLibraryHandle(const char *path) - { -- #ifdef __ANDROID__ -+ #if defined(__ANDROID__) || defined(__OpenBSD__) || defined(__FreeBSD__) - // bionic doesn't support RTLD_NOLOAD before L - return dlopen(path, RTLD_NOW | RTLD_LOCAL); - #else diff --git a/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp b/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp deleted file mode 100644 index bd2d659f9ffc..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/swiftshader/src/Main/SwiftConfig.cpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/Main/SwiftConfig.cpp -@@ -764,7 +764,11 @@ namespace sw - struct stat status; - int lastModified = ini.getInteger("LastModified", "Time", 0); - -+#if !defined(__OpenBSD__) && !defined(__FreeBSD__) - bool noConfig = stat("SwiftShader.ini", &status) != 0; -+#else -+ bool noConfig = false; -+#endif - newConfig = !noConfig && abs((int)status.st_mtime - lastModified) > 1; - - if(disableServerOverride) diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp deleted file mode 100644 index 0a0586c1a4a5..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Display.cpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/OpenGL/libEGL/Display.cpp -@@ -677,7 +677,7 @@ bool Display::isValidWindow(EGLNativeWindowType window - return status != 0; - } - return false; -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) - return false; // Non X11 linux is headless only - #elif defined(__APPLE__) - return sw::OSX::IsValidWindow(window); -@@ -855,7 +855,7 @@ sw::Format Display::getDisplayFormat() const - { - return sw::FORMAT_X8R8G8B8; - } -- #elif defined(__linux__) // Non X11 linux is headless only -+ #elif defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) // Non X11 linux is headless only - return sw::FORMAT_A8B8G8R8; - #elif defined(__APPLE__) - return sw::FORMAT_A8B8G8R8; diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp deleted file mode 100644 index ead53e3d5de2..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/OpenGL/libEGL/Surface.cpp -@@ -349,7 +349,7 @@ bool WindowSurface::checkForResize() - - int windowWidth = windowAttributes.width; - int windowHeight = windowAttributes.height; -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) - // Non X11 linux is headless only - int windowWidth = 100; - int windowHeight = 100; diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp deleted file mode 100644 index 7a6f76053dad..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp +++ /dev/null @@ -1,29 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.cpp -@@ -153,7 +153,7 @@ EGLDisplay EGLAPIENTRY GetDisplay(EGLNativeDisplayType - // FIXME: Check if display_id is the default display - } - -- #if defined(__linux__) && !defined(__ANDROID__) -+ #if (defined(__OpenBSD__) || defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - #if defined(SWIFTSHADER_USE_X11) - if(!libX11) - #endif // Non X11 linux is headless only -@@ -216,7 +216,7 @@ const char *EGLAPIENTRY QueryString(EGLDisplay dpy, EG - { - return success( - "EGL_KHR_client_get_all_proc_addresses " --#if defined(__linux__) && !defined(__ANDROID__) -+#if (defined(__OpenBSD__) || defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - "EGL_KHR_platform_gbm " - #endif - #if defined(SWIFTSHADER_USE_X11) -@@ -1307,7 +1307,7 @@ EGLDisplay EGLAPIENTRY GetPlatformDisplay(EGLenum plat - { - TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLAttrib *attrib_list = %p)", platform, native_display, attrib_list); - -- #if defined(__linux__) && !defined(__ANDROID__) -+ #if (defined(__OpenBSD__) || defined(__linux__) || defined(__FreeBSD__)) && !defined(__ANDROID__) - switch(platform) - { - #if defined(SWIFTSHADER_USE_X11) diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp deleted file mode 100644 index 7fe9c2048408..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/OpenGL/libEGL/libEGL.hpp -@@ -100,7 +100,7 @@ class LibEGL (private) - #endif - #elif defined(__ANDROID__) - const char *libEGL_lib[] = {"libEGL_swiftshader.so", "libEGL_swiftshader.so"}; -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) - #if defined(__LP64__) - const char *libEGL_lib[] = {"lib64EGL_translator.so", "libEGL.so.1", "libEGL.so", "libEGL_deprecated.so.1", "libEGL_deprecated.so"}; - #else diff --git a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp b/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp deleted file mode 100644 index 91d02529aef8..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/OpenGL/libGLESv2/libGLESv2.hpp -@@ -286,7 +286,7 @@ class LibGLESv2 (private) - #endif - #elif defined(__ANDROID__) - const char *libGLESv2_lib[] = {"libGLESv2_swiftshader.so", "libGLESv2_swiftshader.so"}; -- #elif defined(__linux__) -+ #elif defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__) - #if defined(__LP64__) - const char *libGLESv2_lib[] = {"lib64GLES_V2_translator.so", "libGLESv2.so.2", "libGLESv2.so", "libGLESv2_deprecated.so.2", "libGLESv2_deprecated.so"}; - #else diff --git a/www/iridium/files/patch-third__party_swiftshader_src_System_Configurator.cpp b/www/iridium/files/patch-third__party_swiftshader_src_System_Configurator.cpp new file mode 100644 index 000000000000..485ddcf65bb4 --- /dev/null +++ b/www/iridium/files/patch-third__party_swiftshader_src_System_Configurator.cpp @@ -0,0 +1,12 @@ +--- third_party/swiftshader/src/System/Configurator.cpp.orig 2022-10-05 07:34:01 UTC ++++ third_party/swiftshader/src/System/Configurator.cpp +@@ -38,6 +38,9 @@ namespace sw { + + Configurator::Configurator(const std::string &filePath) + { ++#if defined(__OpenBSD__) || defined(__FreeBSD__) ++ return; ++#endif + std::fstream file(filePath, std::ios::in); + if(file.fail()) + { diff --git a/www/iridium/files/patch-third__party_swiftshader_src_System_SharedLibrary.hpp b/www/iridium/files/patch-third__party_swiftshader_src_System_SharedLibrary.hpp deleted file mode 100644 index 876c4784915d..000000000000 --- a/www/iridium/files/patch-third__party_swiftshader_src_System_SharedLibrary.hpp +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/swiftshader/src/System/SharedLibrary.hpp.orig 2022-03-28 18:11:04 UTC -+++ third_party/swiftshader/src/System/SharedLibrary.hpp -@@ -96,7 +96,7 @@ inline void *loadLibrary(const char *path) - - inline void *getLibraryHandle(const char *path) - { --# ifdef __ANDROID__ -+# if defined(__ANDROID__) || defined(__OpenBSD__) || defined(__FreeBSD__) - // bionic doesn't support RTLD_NOLOAD before L - return dlopen(path, RTLD_NOW | RTLD_LOCAL); - # else diff --git a/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn b/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn new file mode 100644 index 000000000000..09c910ef971b --- /dev/null +++ b/www/iridium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn @@ -0,0 +1,11 @@ +--- third_party/swiftshader/src/WSI/BUILD.gn.orig 2022-10-05 07:34:01 UTC ++++ third_party/swiftshader/src/WSI/BUILD.gn +@@ -84,7 +84,7 @@ swiftshader_source_set("WSI") { + "../Vulkan:swiftshader_libvulkan_headers", + ] + +- if (is_linux && !use_system_libwayland) { ++ if (is_linux && !use_system_libwayland && !is_openbsd) { + # Use third-party targets + deps += [ "$wayland_gn_dir:wayland_client" ] + } diff --git a/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp b/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp index 53122a8f7f30..2f01f621d4da 100644 --- a/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp +++ b/www/iridium/files/patch-third__party_swiftshader_src_WSI_libXCB.cpp @@ -1,11 +1,20 @@ ---- third_party/swiftshader/src/WSI/libXCB.cpp.orig 2022-04-01 07:48:30 UTC +--- third_party/swiftshader/src/WSI/libXCB.cpp.orig 2022-10-05 07:34:01 UTC +++ third_party/swiftshader/src/WSI/libXCB.cpp @@ -55,7 +55,7 @@ LibXcbExports *LibXCB::loadExports() } else - { + { - libxcb = loadLibrary("libxcb.so.1"); + libxcb = loadLibrary("libxcb.so"); } if(getProcAddress(RTLD_DEFAULT, "xcb_shm_query_version")) // Search the global scope for pre-loaded XCB library. +@@ -64,7 +64,7 @@ LibXcbExports *LibXCB::loadExports() + } + else + { +- libshm = loadLibrary("libxcb-shm.so.0"); ++ libshm = loadLibrary("libxcb-shm.so"); + } + + return LibXcbExports(libxcb, libshm); diff --git a/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h index 3929b6d0ffec..a25fe5194a2f 100644 --- a/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h +++ b/www/iridium/files/patch-third__party_swiftshader_third__party_llvm-10.0_configs_linux_include_llvm_Config_config.h @@ -1,39 +1,6 @@ ---- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2022-03-28 18:11:04 UTC +--- third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h.orig 2022-10-05 07:34:01 UTC +++ third_party/swiftshader/third_party/llvm-10.0/configs/linux/include/llvm/Config/config.h -@@ -1,20 +1,19 @@ -+/* include/llvm/Config/config.h.cmake corresponding to config.h.in. */ -+ - #ifndef CONFIG_H - #define CONFIG_H - - /* Exported configuration */ - #include "llvm/Config/llvm-config.h" - --/* For detecting __GLIBC__ usage */ --#include <features.h> -- - /* Bug report URL. */ - #define BUG_REPORT_URL "https://bugs.llvm.org/" - - /* Define to 1 to enable backtraces, and to 0 otherwise. */ --/* #undef ENABLE_BACKTRACES */ -+#define ENABLE_BACKTRACES 1 - - /* Define to 1 to enable crash overrides, and to 0 otherwise. */ --/* #undef ENABLE_CRASH_OVERRIDES */ -+#define ENABLE_CRASH_OVERRIDES 1 - - /* Define to 1 to enable crash memory dumps, and to 0 otherwise. */ - #define LLVM_ENABLE_CRASH_DUMPS 0 -@@ -25,14 +24,14 @@ - /* #undef BACKTRACE_HEADER */ - - /* Define to 1 if you have the <CrashReporterClient.h> header file. */ --/* #undef HAVE_CRASHREPORTERCLIENT_H */ -+#undef HAVE_CRASHREPORTERCLIENT_H - - /* can use __crashreporter_info__ */ - #define HAVE_CRASHREPORTER_INFO 0 +@@ -29,7 +29,7 @@ /* Define to 1 if you have the declaration of `arc4random', and to 0 if you don't. */ @@ -42,7 +9,7 @@ /* Define to 1 if you have the declaration of `FE_ALL_EXCEPT', and to 0 if you don't. */ -@@ -56,7 +55,7 @@ +@@ -53,7 +53,7 @@ #define HAVE_DLOPEN 1 /* Define if dladdr() is available on this platform. */ @@ -51,7 +18,7 @@ /* Define to 1 if you have the <errno.h> header file. */ #define HAVE_ERRNO_H 1 -@@ -95,7 +94,7 @@ +@@ -92,7 +92,7 @@ #define HAVE_ISATTY 1 /* Define to 1 if you have the `edit' library (-ledit). */ @@ -60,7 +27,7 @@ /* Define to 1 if you have the `pfm' library (-lpfm). */ /* #undef HAVE_LIBPFM */ -@@ -113,13 +112,13 @@ +@@ -110,13 +110,13 @@ /* #undef HAVE_PTHREAD_SETNAME_NP */ /* Define to 1 if you have the `z' library (-lz). */ @@ -77,25 +44,16 @@ /* Define to 1 if you have the <mach/mach.h> header file. */ /* #undef HAVE_MACH_MACH_H */ -@@ -127,15 +126,9 @@ - /* Define to 1 if you have the `mallctl' function. */ +@@ -125,7 +125,7 @@ /* #undef HAVE_MALLCTL */ --/* Define to 1 if you have the `mallinfo' function. */ + /* Define to 1 if you have the `mallinfo' function. */ -#define HAVE_MALLINFO 1 -+/* Define if mallinfo() is available on this platform. */ +/* #undef HAVE_MALLINFO */ --/* Some projects using SwiftShader bypass cmake (eg Chromium via gn) */ --/* so we need to check glibc version for the new API to be safe */ --#if defined(__GLIBC__) && __GLIBC_MINOR__ >= 33 --#define HAVE_MALLINFO2 1 --#endif -- /* Define to 1 if you have the <malloc/malloc.h> header file. */ /* #undef HAVE_MALLOC_MALLOC_H */ - -@@ -143,10 +136,10 @@ +@@ -134,10 +134,10 @@ /* #undef HAVE_MALLOC_ZONE_STATISTICS */ /* Define to 1 if you have the `posix_fallocate' function. */ @@ -108,7 +66,7 @@ /* Define to 1 if you have the `pread' function. */ #define HAVE_PREAD 1 -@@ -170,10 +163,10 @@ +@@ -161,10 +161,10 @@ #define HAVE_SETENV 1 /* Define to 1 if you have the `sched_getaffinity' function. */ @@ -121,7 +79,7 @@ /* Define to 1 if you have the `setrlimit' function. */ #define HAVE_SETRLIMIT 1 -@@ -191,7 +184,7 @@ +@@ -182,7 +182,7 @@ #define HAVE_STRERROR_R 1 /* Define to 1 if you have the `sysconf' function. */ @@ -130,7 +88,7 @@ /* Define to 1 if you have the <sys/ioctl.h> header file. */ #define HAVE_SYS_IOCTL_H 1 -@@ -218,7 +211,7 @@ +@@ -209,7 +209,7 @@ #define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1 /* Define to 1 if you have the <sys/types.h> header file. */ @@ -139,7 +97,7 @@ /* Define if the setupterm() function is supported this platform. */ /* #undef HAVE_TERMINFO */ -@@ -227,16 +220,16 @@ +@@ -218,16 +218,16 @@ /* #undef HAVE_LIBXAR */ /* Define to 1 if you have the <termios.h> header file. */ @@ -159,10 +117,12 @@ /* Have host's _alloca */ /* #undef HAVE__ALLOCA */ -@@ -303,26 +296,10 @@ +@@ -292,30 +292,8 @@ + /* Linker version detected at compile time. */ + /* #undef HOST_LINK_VERSION */ - /* Target triple LLVM will generate code for by default */ - /* Doesn't use `cmakedefine` because it is allowed to be empty. */ +-/* Target triple LLVM will generate code for by default */ +-/* Doesn't use `cmakedefine` because it is allowed to be empty. */ -#if defined(__x86_64__) -#define LLVM_DEFAULT_TARGET_TRIPLE "x86_64-unknown-linux-gnu" -#elif defined(__i386__) @@ -177,18 +137,19 @@ -#define LLVM_DEFAULT_TARGET_TRIPLE "mips64el-linux-gnuabi64" -#elif defined(__powerpc64__) -#define LLVM_DEFAULT_TARGET_TRIPLE "powerpc64le-unknown-linux-gnu" +-#elif defined(__riscv) && __riscv_xlen == 64 +-#define LLVM_DEFAULT_TARGET_TRIPLE "riscv64-unknown-linux-gnu" -#else -#error "unknown architecture" -#endif -+/* #define LLVM_DEFAULT_TARGET_TRIPLE "amd64-unknown-openbsd6.8" */ - +- /* Define if zlib compression is available */ -#define LLVM_ENABLE_ZLIB 0 +/* #define LLVM_ENABLE_ZLIB 1 */ /* Define if overriding target triple is enabled */ /* #undef LLVM_TARGET_TRIPLE_ENV */ -@@ -346,10 +323,10 @@ +@@ -339,10 +317,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ @@ -201,7 +162,7 @@ /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ -@@ -368,9 +345,6 @@ +@@ -361,9 +339,6 @@ /* Whether GlobalISel rule coverage is being collected */ #define LLVM_GISEL_COV_ENABLED 0 diff --git a/www/iridium/files/patch-third__party_tflite_features.gni b/www/iridium/files/patch-third__party_tflite_features.gni new file mode 100644 index 000000000000..a57d24d80a5e --- /dev/null +++ b/www/iridium/files/patch-third__party_tflite_features.gni @@ -0,0 +1,11 @@ +--- third_party/tflite/features.gni.orig 2022-10-05 07:34:01 UTC ++++ third_party/tflite/features.gni +@@ -7,7 +7,7 @@ import("//build/config/chrome_build.gni") + declare_args() { + # This enables building TFLite with XNNPACK. Currently only available for + # Linux x64. +- build_tflite_with_xnnpack = is_linux && current_cpu == "x64" ++ build_tflite_with_xnnpack = (is_linux && target_cpu == "x64") && !is_bsd + + # Turns on TFLITE_WITH_RUY, using ruy as the gemm backend instead of gemmlowp. + build_tflite_with_ruy = true diff --git a/www/iridium/files/patch-third__party_usrsctp_BUILD.gn b/www/iridium/files/patch-third__party_usrsctp_BUILD.gn deleted file mode 100644 index 26038f86f7ed..000000000000 --- a/www/iridium/files/patch-third__party_usrsctp_BUILD.gn +++ /dev/null @@ -1,11 +0,0 @@ ---- third_party/usrsctp/BUILD.gn.orig 2022-03-28 18:11:04 UTC -+++ third_party/usrsctp/BUILD.gn -@@ -13,7 +13,7 @@ config("usrsctp_public_config") { - - # This is part of the public config because it's used both by usrsctp and - # the client (WebRTC), to determine if the length field needs populating. -- if (is_mac || is_ios || target_os == "freebsd") { -+ if (is_mac || is_ios || target_os == "freebsd" || target_os == "openbsd") { - defines = [ "HAVE_SCONN_LEN" ] - } - } diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn index 094adf88ea07..e9561a254bb2 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/vulkan-deps/vulkan-loader/src/BUILD.gn -@@ -61,7 +61,7 @@ config("vulkan_internal_config") { +@@ -60,7 +60,7 @@ config("vulkan_internal_config") { defines += [ "SYSCONFDIR=\"/etc\"", "FALLBACK_CONFIG_DIRS=\"/etc/xdg\"", diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_allocation.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_allocation.h deleted file mode 100644 index ba34cfc701e4..000000000000 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_allocation.h +++ /dev/null @@ -1,14 +0,0 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/allocation.h.orig 2022-03-28 18:11:04 UTC -+++ third_party/vulkan-deps/vulkan-loader/src/loader/allocation.h -@@ -39,8 +39,8 @@ void loader_device_heap_free(const struct loader_devic - void *loader_device_heap_realloc(const struct loader_device *device, void *pMemory, size_t orig_size, size_t size, - VkSystemAllocationScope alloc_scope); - --#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) -+#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) - #define loader_stack_alloc(size) alloca(size) - #elif defined(_WIN32) - #define loader_stack_alloc(size) _alloca(size) --#endif // defined(_WIN32) -\ No newline at end of file -+#endif // defined(_WIN32) diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c index b11caf6fd5fc..80e0ccbd0a60 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c @@ -1,7 +1,7 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/get_environment.c.orig 2022-03-28 18:11:04 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/get_environment.c.orig 2022-10-05 07:34:01 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/get_environment.c -@@ -37,7 +37,7 @@ - #endif // !defined(VULKAN_NON_CMAKE_BUILD) +@@ -32,7 +32,7 @@ + #include "log.h" // Environment variables -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) @@ -9,7 +9,7 @@ bool is_high_integrity() { return geteuid() != getuid() || getegid() != getgid(); } -@@ -49,7 +49,7 @@ char *loader_getenv(const char *name, const struct loa +@@ -44,7 +44,7 @@ char *loader_getenv(const char *name, const struct loa } char *loader_secure_getenv(const char *name, const struct loader_instance *inst) { @@ -18,10 +18,3 @@ // Apple does not appear to have a secure getenv implementation. // The main difference between secure getenv and getenv is that secure getenv // returns NULL if the process is being run with elevated privileges by a normal user. -@@ -169,4 +169,4 @@ void loader_free_getenv(char *val, const struct loader - (void)inst; - } - --#endif -\ No newline at end of file -+#endif diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h new file mode 100644 index 000000000000..9a1dd2b60d52 --- /dev/null +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_stack__allocation.h @@ -0,0 +1,16 @@ +--- third_party/vulkan-deps/vulkan-loader/src/loader/stack_allocation.h.orig 2022-10-05 07:34:01 UTC ++++ third_party/vulkan-deps/vulkan-loader/src/loader/stack_allocation.h +@@ -30,11 +30,11 @@ + + #if defined(_WIN32) + #include <malloc.h> +-#else ++#elif !defined(__OpenBSD__) && !defined(__FreeBSD__) + #include <alloca.h> + #endif + +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) + #define loader_stack_alloc(size) alloca(size) + #elif defined(_WIN32) + #define loader_stack_alloc(size) _alloca(size) diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h index 1372af288b99..a099f3a28b33 100644 --- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h +++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h @@ -1,6 +1,6 @@ ---- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2022-03-28 18:11:04 UTC +--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2022-10-05 07:34:01 UTC +++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h -@@ -42,7 +42,7 @@ +@@ -43,7 +43,7 @@ #include "dlopen_fuchsia.h" #endif // defined(__Fuchsia__) @@ -9,19 +9,28 @@ #include <unistd.h> // Note: The following file is for dynamic loading: #include <dlfcn.h> -@@ -102,7 +102,7 @@ - // Override layer information - #define VK_OVERRIDE_LAYER_NAME "VK_LAYER_LUNARG_override" +@@ -98,7 +98,7 @@ + #define LAYERS_PATH_ENV "VK_LAYER_PATH" + #define ENABLED_LAYERS_ENV "VK_INSTANCE_LAYERS" -#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) +#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) /* Linux-specific common code: */ // VK Library Filenames, Paths, etc.: -@@ -192,6 +192,15 @@ static inline char *loader_platform_executable_path(ch - }; - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buffer, &size, NULL, 0) < 0) +@@ -219,7 +219,7 @@ static inline void loader_platform_thread_once_fn(pthr + + #endif + +-#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) ++#if defined(__linux__) || defined(__APPLE__) || defined(__Fuchsia__) || defined(__QNXNTO__) || defined(__FreeBSD__) || defined(__OpenBSD__) + + // File IO + static inline bool loader_platform_file_exists(const char *path) { +@@ -277,6 +277,15 @@ static inline char *loader_platform_executable_path(ch + if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), buffer, &size, NULL, 0) < 0) { return NULL; + } + + return buffer; +} diff --git a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h index 75d4cb07bfa5..9faee003ae78 100644 --- a/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h +++ b/www/iridium/files/patch-third__party_vulkan__memory__allocator_include_vk__mem__alloc.h @@ -1,11 +1,11 @@ ---- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2022-04-01 07:48:30 UTC +--- third_party/vulkan_memory_allocator/include/vk_mem_alloc.h.orig 2022-02-28 16:54:41 UTC +++ third_party/vulkan_memory_allocator/include/vk_mem_alloc.h @@ -2503,7 +2503,7 @@ void *vma_aligned_alloc(size_t alignment, size_t size) - - return memalign(alignment, size); - } --#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) -+#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__) - #include <cstdlib> - - #if defined(__APPLE__) +
+ return memalign(alignment, size);
+ }
+-#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC))
++#elif defined(__APPLE__) || defined(__ANDROID__) || (defined(__linux__) && defined(__GLIBCXX__) && !defined(_GLIBCXX_HAVE_ALIGNED_ALLOC)) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ #include <cstdlib>
+
+ #if defined(__APPLE__)
diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn index af8e430bb296..dc574285135e 100644 --- a/www/iridium/files/patch-third__party_webrtc_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- third_party/webrtc/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/webrtc/BUILD.gn -@@ -196,6 +196,9 @@ config("common_inherited_config") { +@@ -205,6 +205,9 @@ config("common_inherited_config") { if (is_linux || is_chromeos) { defines += [ "WEBRTC_LINUX" ] } diff --git a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn index 5ff90f8e7541..2452ba520ced 100644 --- a/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/webrtc/modules/audio_device/BUILD.gn -@@ -264,7 +264,7 @@ rtc_library("audio_device_impl") { +@@ -299,7 +299,7 @@ rtc_library("audio_device_impl") { if (rtc_use_dummy_audio_file_devices) { defines += [ "WEBRTC_DUMMY_FILE_DEVICES" ] } else { diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn index 465903a70173..03d6aaf0ec8e 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- third_party/webrtc/rtc_base/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/webrtc/rtc_base/BUILD.gn -@@ -1087,7 +1087,7 @@ rtc_library("rtc_base") { +@@ -1250,7 +1250,7 @@ rtc_library("rtc_base") { sources += [ "mac_ifaddrs_converter.cc" ] } diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_ip__address.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_ip__address.cc index 7da58149b8be..e128bfaf73cb 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_ip__address.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_ip__address.cc @@ -1,9 +1,9 @@ ---- third_party/webrtc/rtc_base/ip_address.cc.orig 2022-03-28 18:11:04 UTC +--- third_party/webrtc/rtc_base/ip_address.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/webrtc/rtc_base/ip_address.cc -@@ -11,7 +11,8 @@ - #if defined(WEBRTC_POSIX) - #include <netinet/in.h> +@@ -13,7 +13,8 @@ #include <sys/socket.h> + + #include "absl/strings/string_view.h" -#ifdef OPENBSD +#if defined(WEBRTC_BSD) +#include <sys/types.h> diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc index bb9d6c5db1a5..08d621cd9b29 100644 --- a/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc +++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc @@ -1,6 +1,6 @@ ---- third_party/webrtc/rtc_base/network.cc.orig 2022-04-01 07:48:30 UTC +--- third_party/webrtc/rtc_base/network.cc.orig 2022-10-05 07:34:01 UTC +++ third_party/webrtc/rtc_base/network.cc -@@ -258,7 +258,12 @@ AdapterType GetAdapterTypeFromName(const char* network +@@ -269,7 +269,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n } #endif @@ -12,4 +12,4 @@ +#endif } - NetworkManager::NetworkManager() {} + NetworkManager::EnumerationPermission NetworkManager::enumeration_permission() diff --git a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn index 144be78bc352..f1696d6bc0fc 100644 --- a/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn +++ b/www/iridium/files/patch-third__party_webrtc_system__wrappers_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/webrtc/system_wrappers/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/webrtc/system_wrappers/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/webrtc/system_wrappers/BUILD.gn -@@ -61,8 +61,6 @@ rtc_library("system_wrappers") { +@@ -64,8 +64,6 @@ rtc_library("system_wrappers") { if (!build_with_chromium) { sources += [ "source/cpu_features_linux.cc" ] } diff --git a/www/iridium/files/patch-third__party_zlib_BUILD.gn b/www/iridium/files/patch-third__party_zlib_BUILD.gn index 5853f1689e80..dc68b0d89fac 100644 --- a/www/iridium/files/patch-third__party_zlib_BUILD.gn +++ b/www/iridium/files/patch-third__party_zlib_BUILD.gn @@ -1,6 +1,6 @@ ---- third_party/zlib/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- third_party/zlib/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ third_party/zlib/BUILD.gn -@@ -115,7 +115,7 @@ if (use_arm_neon_optimizations) { +@@ -117,7 +117,7 @@ if (use_arm_neon_optimizations) { # Disabled for iPhone, as described in DDI0487C_a_armv8_arm: # "All implementations of the ARMv8.1 architecture are required to # implement the CRC32* instructions. These are optional in ARMv8.0." @@ -9,7 +9,7 @@ defines = [ "CRC32_ARMV8_CRC32" ] if (is_android) { defines += [ "ARMV8_OS_ANDROID" ] -@@ -136,7 +136,7 @@ if (use_arm_neon_optimizations) { +@@ -138,7 +138,7 @@ if (use_arm_neon_optimizations) { source_set("zlib_arm_crc32") { visibility = [ ":*" ] @@ -18,7 +18,7 @@ include_dirs = [ "." ] if (!is_win && !is_clang) { -@@ -396,7 +396,7 @@ static_library("minizip") { +@@ -401,7 +401,7 @@ static_library("minizip") { ] } diff --git a/www/iridium/files/patch-tools_generate__stubs_rules.gni b/www/iridium/files/patch-tools_generate__stubs_rules.gni index 46a8c203dc70..62f9ff55777e 100644 --- a/www/iridium/files/patch-tools_generate__stubs_rules.gni +++ b/www/iridium/files/patch-tools_generate__stubs_rules.gni @@ -1,6 +1,6 @@ ---- tools/generate_stubs/rules.gni.orig 2022-03-28 18:11:04 UTC +--- tools/generate_stubs/rules.gni.orig 2022-10-05 07:34:01 UTC +++ tools/generate_stubs/rules.gni -@@ -96,7 +96,6 @@ template("generate_stubs") { +@@ -110,7 +110,6 @@ template("generate_stubs") { "${target_gen_dir}/${invoker.output_name}.cc", "${target_gen_dir}/${invoker.output_name}.h", ] diff --git a/www/iridium/files/patch-tools_gn_build_gen.py b/www/iridium/files/patch-tools_gn_build_gen.py index 47c075514398..9a80226ed476 100644 --- a/www/iridium/files/patch-tools_gn_build_gen.py +++ b/www/iridium/files/patch-tools_gn_build_gen.py @@ -1,4 +1,4 @@ ---- tools/gn/build/gen.py.orig 2022-03-28 18:11:04 UTC +--- tools/gn/build/gen.py.orig 2022-10-05 07:34:01 UTC +++ tools/gn/build/gen.py @@ -92,6 +92,12 @@ class Platform(object): def is_solaris(self): @@ -13,7 +13,7 @@ def is_posix(self): return self._platform in ['linux', 'freebsd', 'darwin', 'aix', 'openbsd', 'haiku', 'solaris', 'msys', 'netbsd'] -@@ -276,7 +282,7 @@ def WriteGenericNinja(path, static_libraries, executab +@@ -279,7 +285,7 @@ def WriteGenericNinja(path, static_libraries, executab 'linux': 'build_linux.ninja.template', 'freebsd': 'build_linux.ninja.template', 'aix': 'build_aix.ninja.template', @@ -22,7 +22,7 @@ 'haiku': 'build_haiku.ninja.template', 'solaris': 'build_linux.ninja.template', 'netbsd': 'build_linux.ninja.template', -@@ -480,6 +486,9 @@ def WriteGNNinja(path, platform, host, options, args_l +@@ -494,6 +500,9 @@ def WriteGNNinja(path, platform, host, options, args_l if platform.is_posix() and not platform.is_haiku(): ldflags.append('-pthread') diff --git a/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc b/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc index 2db723bbb6d2..462a915d650c 100644 --- a/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc +++ b/www/iridium/files/patch-tools_gn_src_base_files_file__posix.cc @@ -1,6 +1,6 @@ ---- tools/gn/src/base/files/file_posix.cc.orig 2022-03-28 18:11:04 UTC +--- tools/gn/src/base/files/file_posix.cc.orig 2022-10-05 07:34:01 UTC +++ tools/gn/src/base/files/file_posix.cc -@@ -369,7 +369,7 @@ void File::DoInitialize(const FilePath& path, uint32_t +@@ -371,7 +371,7 @@ void File::DoInitialize(const FilePath& path, uint32_t bool File::Flush() { DCHECK(IsValid()); diff --git a/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py b/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py index 5f9ed66cf6aa..3d1f38cd3eb3 100644 --- a/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py +++ b/www/iridium/files/patch-tools_json__schema__compiler_cpp__bundle__generator.py @@ -1,6 +1,6 @@ ---- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2022-04-01 07:48:30 UTC +--- tools/json_schema_compiler/cpp_bundle_generator.py.orig 2022-10-05 07:34:01 UTC +++ tools/json_schema_compiler/cpp_bundle_generator.py -@@ -154,7 +154,7 @@ class CppBundleGenerator(object): +@@ -153,7 +153,7 @@ class CppBundleGenerator(object): # BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(IS_CHROMEOS_LACROS). ifdefs.append('BUILDFLAG(IS_CHROMEOS_LACROS)') elif platform == Platforms.LINUX: diff --git a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py index 03262576602e..05a9a5a35a8d 100644 --- a/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py +++ b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py @@ -1,10 +1,11 @@ ---- tools/json_schema_compiler/feature_compiler.py.orig 2022-04-01 07:48:30 UTC +--- tools/json_schema_compiler/feature_compiler.py.orig 2022-10-05 07:34:01 UTC +++ tools/json_schema_compiler/feature_compiler.py -@@ -267,6 +267,7 @@ FEATURE_GRAMMAR = ({ +@@ -268,6 +268,8 @@ FEATURE_GRAMMAR = ({ 'mac': 'Feature::MACOSX_PLATFORM', 'win': 'Feature::WIN_PLATFORM', 'fuchsia': 'Feature::FUCHSIA_PLATFORM', + 'openbsd': 'Feature::LINUX_PLATFORM', ++ 'freebsd': 'Feature::LINUX_PLATFORM', } } }, diff --git a/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h b/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h new file mode 100644 index 000000000000..d092423aa14b --- /dev/null +++ b/www/iridium/files/patch-tools_memory_partition__allocator_inspect__utils.h @@ -0,0 +1,11 @@ +--- tools/memory/partition_allocator/inspect_utils.h.orig 2022-10-05 07:34:01 UTC ++++ tools/memory/partition_allocator/inspect_utils.h +@@ -60,7 +60,7 @@ class RemoteProcessMemoryReader { + const pid_t pid_; + bool is_valid_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::ScopedFD mem_fd_; + #elif BUILDFLAG(IS_MAC) + task_t task_; diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.cc b/www/iridium/files/patch-ui_aura_screen__ozone.cc new file mode 100644 index 000000000000..25bec6781d87 --- /dev/null +++ b/www/iridium/files/patch-ui_aura_screen__ozone.cc @@ -0,0 +1,11 @@ +--- ui/aura/screen_ozone.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/aura/screen_ozone.cc +@@ -109,7 +109,7 @@ display::Display ScreenOzone::GetPrimaryDisplay() cons + return platform_screen_->GetPrimaryDisplay(); + } + +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + ScreenOzone::ScreenSaverSuspenderOzone::ScreenSaverSuspenderOzone( + std::unique_ptr<ui::PlatformScreen::PlatformScreenSaverSuspender> suspender) + : suspender_(std::move(suspender)) {} diff --git a/www/iridium/files/patch-ui_aura_screen__ozone.h b/www/iridium/files/patch-ui_aura_screen__ozone.h new file mode 100644 index 000000000000..dc07ca283aec --- /dev/null +++ b/www/iridium/files/patch-ui_aura_screen__ozone.h @@ -0,0 +1,20 @@ +--- ui/aura/screen_ozone.h.orig 2022-10-05 07:34:01 UTC ++++ ui/aura/screen_ozone.h +@@ -46,7 +46,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen + display::Display GetDisplayMatching( + const gfx::Rect& match_rect) const override; + display::Display GetPrimaryDisplay() const override; +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::unique_ptr<display::Screen::ScreenSaverSuspender> SuspendScreenSaver() + override; + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) +@@ -68,7 +68,7 @@ class AURA_EXPORT ScreenOzone : public display::Screen + ui::PlatformScreen* platform_screen() { return platform_screen_.get(); } + + private: +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + class ScreenSaverSuspenderOzone + : public display::Screen::ScreenSaverSuspender { + public: diff --git a/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc b/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc index 186054d8dbea..75a46cffa1c2 100644 --- a/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc +++ b/www/iridium/files/patch-ui_base_cursor_cursor__factory.cc @@ -1,6 +1,6 @@ ---- ui/base/cursor/cursor_factory.cc.orig 2022-04-01 07:48:30 UTC +--- ui/base/cursor/cursor_factory.cc.orig 2022-10-05 07:34:01 UTC +++ ui/base/cursor/cursor_factory.cc -@@ -82,7 +82,7 @@ void CursorFactory::ObserveThemeChanges() { +@@ -83,7 +83,7 @@ void CursorFactory::ObserveThemeChanges() { void CursorFactory::SetDeviceScaleFactor(float scale) {} diff --git a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc index 54c8654d0a5c..5f4473e3b4ef 100644 --- a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc +++ b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/dummy_text_input_client.cc.orig 2022-03-28 18:11:04 UTC +--- ui/base/ime/dummy_text_input_client.cc.orig 2022-10-05 07:34:01 UTC +++ ui/base/ime/dummy_text_input_client.cc -@@ -151,7 +151,7 @@ bool DummyTextInputClient::ShouldDoLearning() { +@@ -158,7 +158,7 @@ bool DummyTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h index ec37986dddf5..deb3b2f260bb 100644 --- a/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h +++ b/www/iridium/files/patch-ui_base_ime_dummy__text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/dummy_text_input_client.h.orig 2022-03-28 18:11:04 UTC +--- ui/base/ime/dummy_text_input_client.h.orig 2022-10-05 07:34:01 UTC +++ ui/base/ime/dummy_text_input_client.h -@@ -63,7 +63,7 @@ class DummyTextInputClient : public TextInputClient { +@@ -65,7 +65,7 @@ class DummyTextInputClient : public TextInputClient { ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc index f94f35e9b91f..1bd8fb7eebd8 100644 --- a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc +++ b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.cc.orig 2022-03-28 18:11:04 UTC +--- ui/base/ime/fake_text_input_client.cc.orig 2022-10-05 07:34:01 UTC +++ ui/base/ime/fake_text_input_client.cc -@@ -161,7 +161,7 @@ bool FakeTextInputClient::ShouldDoLearning() { +@@ -163,7 +163,7 @@ bool FakeTextInputClient::ShouldDoLearning() { return false; } diff --git a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h index cb534c0917cf..8f715790b4dc 100644 --- a/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h +++ b/www/iridium/files/patch-ui_base_ime_fake__text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/fake_text_input_client.h.orig 2022-03-28 18:11:04 UTC +--- ui/base/ime/fake_text_input_client.h.orig 2022-10-05 07:34:01 UTC +++ ui/base/ime/fake_text_input_client.h -@@ -69,7 +69,7 @@ class FakeTextInputClient : public TextInputClient { +@@ -71,7 +71,7 @@ class FakeTextInputClient : public TextInputClient { void SetTextEditCommandForNextKeyEvent(TextEditCommand command) override; ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc b/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc deleted file mode 100644 index 0fd8a98b82ef..000000000000 --- a/www/iridium/files/patch-ui_base_ime_init_input__method__initializer.cc +++ /dev/null @@ -1,38 +0,0 @@ ---- ui/base/ime/init/input_method_initializer.cc.orig 2022-03-28 18:11:04 UTC -+++ ui/base/ime/init/input_method_initializer.cc -@@ -10,7 +10,7 @@ - #include "build/chromeos_buildflags.h" - - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "base/check.h" - #include "ui/base/ime/linux/fake_input_method_context_factory.h" - #elif BUILDFLAG(IS_WIN) -@@ -20,7 +20,7 @@ - - namespace { - --#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - const ui::LinuxInputMethodContextFactory* - g_linux_input_method_context_factory_for_testing; - #endif -@@ -43,7 +43,7 @@ void ShutdownInputMethod() { - - void InitializeInputMethodForTesting() { - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - if (!g_linux_input_method_context_factory_for_testing) - g_linux_input_method_context_factory_for_testing = - new FakeInputMethodContextFactory(); -@@ -61,7 +61,7 @@ void InitializeInputMethodForTesting() { - - void ShutdownInputMethodForTesting() { - #if !BUILDFLAG(IS_CHROMEOS_ASH) && defined(USE_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - const LinuxInputMethodContextFactory* factory = - LinuxInputMethodContextFactory::instance(); - CHECK(!factory || factory == g_linux_input_method_context_factory_for_testing) diff --git a/www/iridium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc b/www/iridium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc new file mode 100644 index 000000000000..5aa8569844b0 --- /dev/null +++ b/www/iridium/files/patch-ui_base_ime_linux_linux__input__method__context__factory.cc @@ -0,0 +1,20 @@ +--- ui/base/ime/linux/linux_input_method_context_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/base/ime/linux/linux_input_method_context_factory.cc +@@ -9,7 +9,7 @@ + #include "build/build_config.h" + #include "ui/base/ime/linux/fake_input_method_context.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #include "ui/linux/linux_ui_delegate.h" + #endif +@@ -32,7 +32,7 @@ std::unique_ptr<LinuxInputMethodContext> CreateLinuxIn + if (auto factory = GetInputMethodContextFactoryForTest()) + return factory.Run(delegate); + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Give the toolkit a chance to create the context. + if (auto* linux_ui = LinuxUi::instance()) { + if (auto context = linux_ui->CreateInputMethodContext(delegate)) diff --git a/www/iridium/files/patch-ui_base_ime_text__input__client.h b/www/iridium/files/patch-ui_base_ime_text__input__client.h index 20f827aa13b7..240e75ae3854 100644 --- a/www/iridium/files/patch-ui_base_ime_text__input__client.h +++ b/www/iridium/files/patch-ui_base_ime_text__input__client.h @@ -1,6 +1,6 @@ ---- ui/base/ime/text_input_client.h.orig 2022-03-28 18:11:04 UTC +--- ui/base/ime/text_input_client.h.orig 2022-10-05 07:34:01 UTC +++ ui/base/ime/text_input_client.h -@@ -237,7 +237,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { +@@ -240,7 +240,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient { // fields that are considered 'private' (e.g. in incognito tabs). virtual bool ShouldDoLearning() = 0; diff --git a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc index 572eeba6307b..92ab79a7134f 100644 --- a/www/iridium/files/patch-ui_base_resource_resource__bundle.cc +++ b/www/iridium/files/patch-ui_base_resource_resource__bundle.cc @@ -1,6 +1,6 @@ ---- ui/base/resource/resource_bundle.cc.orig 2022-04-01 07:48:30 UTC +--- ui/base/resource/resource_bundle.cc.orig 2022-10-05 07:34:01 UTC +++ ui/base/resource/resource_bundle.cc -@@ -878,7 +878,7 @@ void ResourceBundle::ReloadFonts() { +@@ -884,7 +884,7 @@ void ResourceBundle::ReloadFonts() { } ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const { diff --git a/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc b/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc index 4f4881ddfc3c..100e4fa72c43 100644 --- a/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc +++ b/www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc @@ -1,11 +1,11 @@ ---- ui/base/test/skia_gold_pixel_diff.cc.orig 2022-03-28 18:11:04 UTC +--- ui/base/test/skia_gold_pixel_diff.cc.orig 2022-10-05 07:34:01 UTC +++ ui/base/test/skia_gold_pixel_diff.cc @@ -150,7 +150,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() { return "macOS"; // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. --#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#elif BUILDFLAG(IS_LINUX) ++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) return "linux"; - #endif - } + #elif BUILDFLAG(IS_CHROMEOS_LACROS) + return "lacros"; diff --git a/www/iridium/files/patch-ui_base_ui__base__features.cc b/www/iridium/files/patch-ui_base_ui__base__features.cc index d23ca4a8ca6f..e6f979de84bf 100644 --- a/www/iridium/files/patch-ui_base_ui__base__features.cc +++ b/www/iridium/files/patch-ui_base_ui__base__features.cc @@ -1,6 +1,6 @@ ---- ui/base/ui_base_features.cc.orig 2022-04-01 07:48:30 UTC +--- ui/base/ui_base_features.cc.orig 2022-10-05 07:34:01 UTC +++ ui/base/ui_base_features.cc -@@ -159,7 +159,7 @@ const base::Feature kExperimentalFlingAnimation { +@@ -185,7 +185,7 @@ const base::Feature kExperimentalFlingAnimation { // of lacros-chrome is complete. #if BUILDFLAG(IS_WIN) || \ (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \ @@ -9,7 +9,7 @@ base::FEATURE_ENABLED_BY_DEFAULT #else base::FEATURE_DISABLED_BY_DEFAULT -@@ -255,7 +255,7 @@ bool IsForcedColorsEnabled() { +@@ -283,7 +283,7 @@ bool IsForcedColorsEnabled() { // milestones. const base::Feature kEyeDropper { "EyeDropper", diff --git a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc index 8698b9327f8a..84bdb71bc095 100644 --- a/www/iridium/files/patch-ui_base_webui_web__ui__util.cc +++ b/www/iridium/files/patch-ui_base_webui_web__ui__util.cc @@ -1,6 +1,6 @@ ---- ui/base/webui/web_ui_util.cc.orig 2022-03-28 18:11:04 UTC +--- ui/base/webui/web_ui_util.cc.orig 2022-10-05 07:34:01 UTC +++ ui/base/webui/web_ui_util.cc -@@ -221,7 +221,7 @@ std::string GetFontFamily() { +@@ -225,7 +225,7 @@ std::string GetFontFamily() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc new file mode 100644 index 000000000000..4be37c769842 --- /dev/null +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.cc @@ -0,0 +1,11 @@ +--- ui/base/x/x11_cursor_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/base/x/x11_cursor_factory.cc +@@ -56,7 +56,7 @@ scoped_refptr<PlatformCursor> X11CursorFactory::Create + } + + void X11CursorFactory::ObserveThemeChanges() { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* linux_ui = LinuxUi::instance(); + DCHECK(linux_ui); + cursor_theme_observation_.Observe(linux_ui); diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h new file mode 100644 index 000000000000..a9952606fd0e --- /dev/null +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__factory.h @@ -0,0 +1,20 @@ +--- ui/base/x/x11_cursor_factory.h.orig 2022-10-05 07:34:01 UTC ++++ ui/base/x/x11_cursor_factory.h +@@ -16,7 +16,7 @@ + #include "ui/base/cursor/mojom/cursor_type.mojom-shared.h" + #include "ui/linux/cursor_theme_manager_observer.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -59,7 +59,7 @@ class COMPONENT_EXPORT(UI_BASE_X) X11CursorFactory + + std::map<mojom::CursorType, scoped_refptr<X11Cursor>> default_cursors_; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + base::ScopedObservation<LinuxUi, + CursorThemeManagerObserver, + &LinuxUi::AddCursorThemeObserver, diff --git a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc index 9209c5d79fff..d816f9249d33 100644 --- a/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc +++ b/www/iridium/files/patch-ui_base_x_x11__cursor__loader.cc @@ -1,6 +1,15 @@ ---- ui/base/x/x11_cursor_loader.cc.orig 2022-03-28 18:11:04 UTC +--- ui/base/x/x11_cursor_loader.cc.orig 2022-10-05 07:34:01 UTC +++ ui/base/x/x11_cursor_loader.cc -@@ -138,7 +138,11 @@ std::string CursorPathFromLibXcursor() { +@@ -33,7 +33,7 @@ + #include "ui/gfx/x/xproto.h" + #include "ui/gfx/x/xproto_util.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -139,7 +139,11 @@ std::string CursorPathFromLibXcursor() { void operator()(void* ptr) const { dlclose(ptr); } }; @@ -12,3 +21,21 @@ if (!lib) return ""; +@@ -250,7 +254,7 @@ scoped_refptr<base::RefCountedMemory> ReadCursorFile( + const std::string& rm_xcursor_theme) { + constexpr const char kDefaultTheme[] = "default"; + std::string themes[] = { +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The toolkit theme has the highest priority. + LinuxUi::instance() ? LinuxUi::instance()->GetCursorThemeName() + : std::string(), +@@ -444,7 +448,7 @@ uint32_t XCursorLoader::GetPreferredCursorSize() const + if (base::StringToInt(GetEnv(kXcursorSizeEnv), &size) && size > 0) + return size; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Let the toolkit have the next say. + auto* linux_ui = LinuxUi::instance(); + size = linux_ui ? linux_ui->GetCursorThemeSize() : 0; diff --git a/www/iridium/files/patch-ui_color_color__id.h b/www/iridium/files/patch-ui_color_color__id.h index f677e76381fb..bb8e373df5cc 100644 --- a/www/iridium/files/patch-ui_color_color__id.h +++ b/www/iridium/files/patch-ui_color_color__id.h @@ -1,11 +1,11 @@ ---- ui/color/color_id.h.orig 2022-04-01 07:48:30 UTC +--- ui/color/color_id.h.orig 2022-10-05 07:34:01 UTC +++ ui/color/color_id.h -@@ -191,7 +191,7 @@ +@@ -240,7 +240,7 @@ E_CPONLY(kColorNativeColor6) \ E_CPONLY(kColorNativeBaseColor) \ E_CPONLY(kColorNativeSecondaryColor) -#elif BUILDFLAG(IS_LINUX) +#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #define PLATFORM_SPECIFIC_COLOR_IDS \ - E_CPONLY(kColorNativeButtonBackground) \ - E_CPONLY(kColorNativeButtonBackgroundDisabled) \ + E_CPONLY(kColorNativeButtonBorder)\ + E_CPONLY(kColorNativeHeaderButtonBorderActive) \ diff --git a/www/iridium/files/patch-ui_color_native__color__mixers.cc b/www/iridium/files/patch-ui_color_native__color__mixers.cc deleted file mode 100644 index 58a5e185d918..000000000000 --- a/www/iridium/files/patch-ui_color_native__color__mixers.cc +++ /dev/null @@ -1,17 +0,0 @@ ---- ui/color/native_color_mixers.cc.orig 2022-04-01 07:48:30 UTC -+++ ui/color/native_color_mixers.cc -@@ -10,12 +10,12 @@ - namespace ui { - - #if !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && \ -- !BUILDFLAG(IS_WIN) -+ !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) - void AddNativeCoreColorMixer(ColorProvider* provider, - const ColorProviderManager::Key& key) {} - #endif - --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_BSD) - void AddNativeUiColorMixer(ColorProvider* provider, - const ColorProviderManager::Key& key) {} - #endif diff --git a/www/iridium/files/patch-ui_compositor_compositor.cc b/www/iridium/files/patch-ui_compositor_compositor.cc index a04c60945b09..860488b64eca 100644 --- a/www/iridium/files/patch-ui_compositor_compositor.cc +++ b/www/iridium/files/patch-ui_compositor_compositor.cc @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.cc.orig 2022-04-01 07:48:30 UTC +--- ui/compositor/compositor.cc.orig 2022-10-05 07:34:01 UTC +++ ui/compositor/compositor.cc -@@ -860,7 +860,7 @@ void Compositor::OnResume() { +@@ -850,7 +850,7 @@ void Compositor::OnResume() { // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_compositor_compositor.h b/www/iridium/files/patch-ui_compositor_compositor.h index f75bad91d685..5c9bbfe15017 100644 --- a/www/iridium/files/patch-ui_compositor_compositor.h +++ b/www/iridium/files/patch-ui_compositor_compositor.h @@ -1,6 +1,6 @@ ---- ui/compositor/compositor.h.orig 2022-04-01 07:48:30 UTC +--- ui/compositor/compositor.h.orig 2022-10-05 07:34:01 UTC +++ ui/compositor/compositor.h -@@ -402,7 +402,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe +@@ -414,7 +414,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_display_screen.cc b/www/iridium/files/patch-ui_display_screen.cc new file mode 100644 index 000000000000..34704c4dbcca --- /dev/null +++ b/www/iridium/files/patch-ui_display_screen.cc @@ -0,0 +1,11 @@ +--- ui/display/screen.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/display/screen.cc +@@ -84,7 +84,7 @@ void Screen::SetDisplayForNewWindows(int64_t display_i + display_id_for_new_windows_ = display_id; + } + +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + Screen::ScreenSaverSuspender::~ScreenSaverSuspender() = default; + + std::unique_ptr<Screen::ScreenSaverSuspender> Screen::SuspendScreenSaver() { diff --git a/www/iridium/files/patch-ui_display_screen.h b/www/iridium/files/patch-ui_display_screen.h new file mode 100644 index 000000000000..901fc1e127bf --- /dev/null +++ b/www/iridium/files/patch-ui_display_screen.h @@ -0,0 +1,20 @@ +--- ui/display/screen.h.orig 2022-10-05 07:34:01 UTC ++++ ui/display/screen.h +@@ -129,7 +129,7 @@ class DISPLAY_EXPORT Screen { + // (both of which may or may not be `nearest_id`). + display::ScreenInfos GetScreenInfosNearestDisplay(int64_t nearest_id) const; + +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // Object which suspends the platform-specific screensaver for the duration of + // its existence. + class ScreenSaverSuspender { +@@ -213,7 +213,7 @@ class DISPLAY_EXPORT Screen { + int64_t display_id_for_new_windows_; + int64_t scoped_display_id_for_new_windows_ = display::kInvalidDisplayId; + +-#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + uint32_t screen_saver_suspension_count_ = 0; + #endif // BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) + }; diff --git a/www/iridium/files/patch-ui_events_event.cc b/www/iridium/files/patch-ui_events_event.cc index a8e344821b05..4473f2b0291b 100644 --- a/www/iridium/files/patch-ui_events_event.cc +++ b/www/iridium/files/patch-ui_events_event.cc @@ -1,6 +1,6 @@ ---- ui/events/event.cc.orig 2022-04-01 07:48:30 UTC +--- ui/events/event.cc.orig 2022-10-05 07:34:01 UTC +++ ui/events/event.cc -@@ -453,7 +453,7 @@ std::string LocatedEvent::ToString() const { +@@ -425,7 +425,7 @@ std::string LocatedEvent::ToString() const { MouseEvent::MouseEvent(const PlatformEvent& native_event) : LocatedEvent(native_event), changed_button_flags_(GetChangedMouseButtonFlagsFromNative(native_event)), @@ -9,7 +9,7 @@ movement_(GetMouseMovementFromNative(native_event)), #endif pointer_details_(GetMousePointerDetailsFromNative(native_event)) { -@@ -935,7 +935,7 @@ void KeyEvent::InitializeNative() { +@@ -919,7 +919,7 @@ void KeyEvent::InitializeNative() { if (synthesize_key_repeat_enabled_ && IsRepeated(GetLastKeyEvent())) set_flags(flags() | EF_IS_REPEAT); diff --git a/www/iridium/files/patch-ui_events_event__switches.cc b/www/iridium/files/patch-ui_events_event__switches.cc index be364ae0c84f..2f7c3d3592b7 100644 --- a/www/iridium/files/patch-ui_events_event__switches.cc +++ b/www/iridium/files/patch-ui_events_event__switches.cc @@ -1,8 +1,8 @@ ---- ui/events/event_switches.cc.orig 2022-03-28 18:11:04 UTC +--- ui/events/event_switches.cc.orig 2022-10-05 07:34:01 UTC +++ ui/events/event_switches.cc -@@ -14,7 +14,7 @@ namespace switches { - const char kCompensateForUnstablePinchZoom[] = - "compensate-for-unstable-pinch-zoom"; +@@ -21,7 +21,7 @@ const char kCompensateForUnstablePinchZoom[] = + // value is a floating point number that is interpreted as a distance in pixels. + const char kTouchSlopDistance[] = "touch-slop-distance"; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_events_event__switches.h b/www/iridium/files/patch-ui_events_event__switches.h index 22d88edc5df7..aa6b0e76c228 100644 --- a/www/iridium/files/patch-ui_events_event__switches.h +++ b/www/iridium/files/patch-ui_events_event__switches.h @@ -1,8 +1,8 @@ ---- ui/events/event_switches.h.orig 2022-03-28 18:11:04 UTC +--- ui/events/event_switches.h.orig 2022-10-05 07:34:01 UTC +++ ui/events/event_switches.h -@@ -12,7 +12,7 @@ namespace switches { - +@@ -13,7 +13,7 @@ namespace switches { EVENTS_BASE_EXPORT extern const char kCompensateForUnstablePinchZoom[]; + EVENTS_BASE_EXPORT extern const char kTouchSlopDistance[]; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) diff --git a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h index 28ab75435bc5..a336e9ddfa47 100644 --- a/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h +++ b/www/iridium/files/patch-ui_events_keycodes_dom_keycode__converter.h @@ -1,6 +1,6 @@ ---- ui/events/keycodes/dom/keycode_converter.h.orig 2022-03-31 09:38:28 UTC +--- ui/events/keycodes/dom/keycode_converter.h.orig 2022-10-05 07:34:01 UTC +++ ui/events/keycodes/dom/keycode_converter.h -@@ -63,7 +63,7 @@ class KeycodeConverter { +@@ -64,7 +64,7 @@ class KeycodeConverter { // Convert a DomCode into a native keycode. static int DomCodeToNativeKeycode(DomCode code); diff --git a/www/iridium/files/patch-ui_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn index 8e16b6576ccf..c7919615d215 100644 --- a/www/iridium/files/patch-ui_gfx_BUILD.gn +++ b/www/iridium/files/patch-ui_gfx_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gfx/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- ui/gfx/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ ui/gfx/BUILD.gn -@@ -583,7 +583,7 @@ source_set("memory_buffer_sources") { +@@ -588,7 +588,7 @@ source_set("memory_buffer_sources") { deps += [ "//build/config/linux/libdrm" ] } diff --git a/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc b/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc index 34e77fa39e35..687c43fae386 100644 --- a/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc +++ b/www/iridium/files/patch-ui_gfx_font__fallback__linux.cc @@ -1,6 +1,6 @@ ---- ui/gfx/font_fallback_linux.cc.orig 2022-04-01 07:48:30 UTC +--- ui/gfx/font_fallback_linux.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gfx/font_fallback_linux.cc -@@ -25,6 +25,8 @@ +@@ -26,6 +26,8 @@ #include "ui/gfx/linux/fontconfig_util.h" #include "ui/gfx/platform_font.h" diff --git a/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc b/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc new file mode 100644 index 000000000000..fa025a95dd3b --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_font__render__params__linux.cc @@ -0,0 +1,20 @@ +--- ui/gfx/font_render_params_linux.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/gfx/font_render_params_linux.cc +@@ -25,7 +25,7 @@ + #include "ui/gfx/linux/fontconfig_util.h" + #include "ui/gfx/switches.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -212,7 +212,7 @@ FontRenderParams GetFontRenderParams(const FontRenderP + + // Start with the delegate's settings, but let Fontconfig have the final say. + FontRenderParams params; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (const auto* linux_ui = ui::LinuxUi::instance()) + params = linux_ui->GetDefaultFontRenderParams(); + #endif diff --git a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h index 3e7c7cba5d9e..a4e94eda10ce 100644 --- a/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h +++ b/www/iridium/files/patch-ui_gfx_gpu__memory__buffer.h @@ -1,18 +1,18 @@ ---- ui/gfx/gpu_memory_buffer.h.orig 2022-04-01 07:48:30 UTC +--- ui/gfx/gpu_memory_buffer.h.orig 2022-10-05 07:34:01 UTC +++ ui/gfx/gpu_memory_buffer.h -@@ -16,7 +16,7 @@ +@@ -15,7 +15,7 @@ + #include "ui/gfx/geometry/rect.h" #include "ui/gfx/gfx_export.h" - #include "ui/gfx/hdr_metadata.h" -#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if defined(USE_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) #include "ui/gfx/native_pixmap_handle.h" #elif BUILDFLAG(IS_MAC) #include "ui/gfx/mac/io_surface.h" -@@ -78,7 +78,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { +@@ -75,7 +75,7 @@ struct GFX_EXPORT GpuMemoryBufferHandle { base::UnsafeSharedMemoryRegion region; uint32_t offset = 0; - int32_t stride = 0; + uint32_t stride = 0; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) NativePixmapHandle native_pixmap_handle; diff --git a/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc b/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc index 86a52d6a8d88..e1713fb2f6ee 100644 --- a/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc +++ b/www/iridium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc @@ -1,4 +1,4 @@ ---- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/mojom/buffer_types_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gfx/mojom/buffer_types_mojom_traits.cc @@ -33,7 +33,7 @@ gfx::mojom::GpuMemoryBufferPlatformHandlePtr StructTra return gfx::mojom::GpuMemoryBufferPlatformHandle::NewSharedMemoryHandle( @@ -16,5 +16,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || defined(USE_OZONE) || BUILDFLAG(IS_BSD) case gfx::mojom::GpuMemoryBufferPlatformHandleDataView::Tag:: - NATIVE_PIXMAP_HANDLE: + kNativePixmapHandle: out->type = gfx::NATIVE_PIXMAP; diff --git a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc index 4e0bcdfd18de..6e37eece2594 100644 --- a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc +++ b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.cc @@ -1,4 +1,4 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.cc @@ -8,11 +8,11 @@ @@ -30,5 +30,5 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) out->modifier = data.modifier(); - #endif - + out->supports_zero_copy_webgpu_import = + data.supports_zero_copy_webgpu_import(); diff --git a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h index 5445bece83bb..91f01e782cd6 100644 --- a/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h +++ b/www/iridium/files/patch-ui_gfx_mojom_native__handle__types__mojom__traits.h @@ -1,4 +1,4 @@ ---- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/mojom/native_handle_types_mojom_traits.h.orig 2022-10-05 07:34:01 UTC +++ ui/gfx/mojom/native_handle_types_mojom_traits.h @@ -15,7 +15,7 @@ #include "third_party/abseil-cpp/absl/types/optional.h" @@ -18,7 +18,7 @@ template <> struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED_MOJOM_TRAITS) StructTraits<gfx::mojom::NativePixmapPlaneDataView, -@@ -53,7 +53,7 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED +@@ -53,13 +53,13 @@ struct COMPONENT_EXPORT(GFX_NATIVE_HANDLE_TYPES_SHARED return pixmap_handle.planes; } @@ -27,3 +27,10 @@ static uint64_t modifier(const gfx::NativePixmapHandle& pixmap_handle) { return pixmap_handle.modifier; } + #endif + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + static bool supports_zero_copy_webgpu_import( + const gfx::NativePixmapHandle& pixmap_handle) { + return pixmap_handle.supports_zero_copy_webgpu_import; diff --git a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc index 3de70fb91ad6..83abd0661b7f 100644 --- a/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc +++ b/www/iridium/files/patch-ui_gfx_native__pixmap__handle.cc @@ -1,4 +1,4 @@ ---- ui/gfx/native_pixmap_handle.cc.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/native_pixmap_handle.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gfx/native_pixmap_handle.cc @@ -9,7 +9,7 @@ #include "base/logging.h" @@ -49,14 +49,14 @@ -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) DCHECK(plane.fd.is_valid()); - base::ScopedFD fd_dup(HANDLE_EINTR(dup(plane.fd.get()))); - if (!fd_dup.is_valid()) { -@@ -99,7 +103,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma + // Combining the HANDLE_EINTR and ScopedFD's constructor causes the compiler + // to emit some very strange assembly that tends to cause FD ownership +@@ -103,7 +107,7 @@ NativePixmapHandle CloneHandleForIPC(const NativePixma #endif } -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) clone.modifier = handle.modifier; - #endif - + clone.supports_zero_copy_webgpu_import = + handle.supports_zero_copy_webgpu_import; diff --git a/www/iridium/files/patch-ui_gfx_platform__font__skia.cc b/www/iridium/files/patch-ui_gfx_platform__font__skia.cc new file mode 100644 index 000000000000..1a479098e972 --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_platform__font__skia.cc @@ -0,0 +1,20 @@ +--- ui/gfx/platform_font_skia.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/gfx/platform_font_skia.cc +@@ -28,7 +28,7 @@ + #include "ui/gfx/system_fonts_win.h" + #endif + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/linux/linux_ui.h" + #endif + +@@ -166,7 +166,7 @@ void PlatformFontSkia::EnsuresDefaultFontIsInitialized + weight = system_font.GetWeight(); + #endif // BUILDFLAG(IS_WIN) + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // On Linux, LinuxUi is used to query the native toolkit (e.g. + // GTK) for the default UI font. + if (const auto* linux_ui = ui::LinuxUi::instance()) { diff --git a/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc b/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc index 0377d6b69575..a07c1f7b6c40 100644 --- a/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc +++ b/www/iridium/files/patch-ui_gfx_render__text__api__fuzzer.cc @@ -1,29 +1,20 @@ ---- ui/gfx/render_text_api_fuzzer.cc.orig 2022-03-28 18:11:04 UTC +--- ui/gfx/render_text_api_fuzzer.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gfx/render_text_api_fuzzer.cc -@@ -21,7 +21,7 @@ - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_ANDROID) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - #include "base/test/test_discardable_memory_allocator.h" - #endif +@@ -20,7 +20,7 @@ + #include "ui/gfx/font_util.h" + #include "ui/gfx/render_text.h" -@@ -44,7 +44,7 @@ struct Environment { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_ANDROID) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - // Some platforms require discardable memory to use bitmap fonts. - base::DiscardableMemoryAllocator::SetInstance( - &discardable_memory_allocator); -@@ -56,7 +56,7 @@ struct Environment { - // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is - // complete. - #if BUILDFLAG(IS_ANDROID) || \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) - base::TestDiscardableMemoryAllocator discardable_memory_allocator; +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" #endif +@@ -47,7 +47,7 @@ struct Environment { + + CHECK(base::i18n::InitializeICU()); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + test_fonts::SetUpFontconfig(); + #endif + gfx::InitializeFonts(); diff --git a/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc b/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc new file mode 100644 index 000000000000..050aaa6895fc --- /dev/null +++ b/www/iridium/files/patch-ui_gfx_render__text__fuzzer.cc @@ -0,0 +1,20 @@ +--- ui/gfx/render_text_fuzzer.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/gfx/render_text_fuzzer.cc +@@ -14,7 +14,7 @@ + #include "ui/gfx/font_util.h" + #include "ui/gfx/render_text.h" + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include "third_party/test_fonts/fontconfig/fontconfig_util_linux.h" + #endif + +@@ -37,7 +37,7 @@ struct Environment { + + CHECK(base::i18n::InitializeICU()); + +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + test_fonts::SetUpFontconfig(); + #endif + gfx::InitializeFonts(); diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn index 12be9cfec96c..ad08f847c119 100644 --- a/www/iridium/files/patch-ui_gl_BUILD.gn +++ b/www/iridium/files/patch-ui_gl_BUILD.gn @@ -1,6 +1,6 @@ ---- ui/gl/BUILD.gn.orig 2022-03-28 18:11:04 UTC +--- ui/gl/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ ui/gl/BUILD.gn -@@ -162,8 +162,6 @@ component("gl") { +@@ -166,8 +166,6 @@ component("gl") { defines += [ "GPU_ENABLE_SERVICE_LOGGING" ] } @@ -9,7 +9,7 @@ all_dependent_configs = [ ":gl_config" ] public_configs = [ "//third_party/khronos:khronos_headers" ] -@@ -180,7 +178,6 @@ component("gl") { +@@ -184,7 +182,6 @@ component("gl") { ] public_deps = [ "//base", @@ -17,15 +17,15 @@ "//ui/events/platform", "//ui/gfx", "//ui/gfx/geometry", -@@ -409,7 +406,6 @@ component("gl") { +@@ -422,7 +419,6 @@ component("gl") { data_deps += [ "//third_party/angle:libEGL", "//third_party/angle:libGLESv2", - "//third_party/mesa_headers", ] if (enable_swiftshader) { - data_deps += [ "//third_party/swiftshader" ] -@@ -639,7 +635,6 @@ test("gl_unittests") { + data_deps += [ +@@ -641,7 +637,6 @@ test("gl_unittests") { data_deps = [ "//testing/buildbot/filters:gl_unittests_filters", diff --git a/www/iridium/files/patch-ui_gl_generate__bindings.py b/www/iridium/files/patch-ui_gl_generate__bindings.py index ea8d12ea6291..9c239b0d5266 100644 --- a/www/iridium/files/patch-ui_gl_generate__bindings.py +++ b/www/iridium/files/patch-ui_gl_generate__bindings.py @@ -1,6 +1,6 @@ ---- ui/gl/generate_bindings.py.orig 2022-03-28 18:11:04 UTC +--- ui/gl/generate_bindings.py.orig 2022-10-05 07:34:01 UTC +++ ui/gl/generate_bindings.py -@@ -2868,6 +2868,9 @@ GLX_FUNCTIONS = [ +@@ -2933,6 +2933,9 @@ GLX_FUNCTIONS = [ 'arguments': 'Display* dpy, GLXDrawable drawable, int32_t* numerator, ' 'int32_t* denominator' }, diff --git a/www/iridium/files/patch-ui_gl_gl__context.cc b/www/iridium/files/patch-ui_gl_gl__context.cc index 1b1af18b8342..c5bda3ab734b 100644 --- a/www/iridium/files/patch-ui_gl_gl__context.cc +++ b/www/iridium/files/patch-ui_gl_gl__context.cc @@ -1,6 +1,6 @@ ---- ui/gl/gl_context.cc.orig 2022-04-01 07:48:30 UTC +--- ui/gl/gl_context.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gl/gl_context.cc -@@ -416,7 +416,7 @@ bool GLContext::MakeVirtuallyCurrent( +@@ -419,7 +419,7 @@ bool GLContext::MakeVirtuallyCurrent( DCHECK(virtual_context->IsCurrent(surface)); if (switched_real_contexts || virtual_context != current_virtual_context_) { diff --git a/www/iridium/files/patch-ui_gl_gl__features.cc b/www/iridium/files/patch-ui_gl_gl__features.cc index 33472218c9cc..389ccf2f6590 100644 --- a/www/iridium/files/patch-ui_gl_gl__features.cc +++ b/www/iridium/files/patch-ui_gl_gl__features.cc @@ -1,11 +1,11 @@ ---- ui/gl/gl_features.cc.orig 2022-04-01 07:48:30 UTC +--- ui/gl/gl_features.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gl/gl_features.cc -@@ -76,7 +76,7 @@ bool IsDeviceBlocked(const char* field, const std::str - const base::Feature kDefaultPassthroughCommandDecoder { +@@ -85,7 +85,7 @@ const base::Feature kDefaultPassthroughCommandDecoder "DefaultPassthroughCommandDecoder", - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ -- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \ -+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) && \ - !defined(CHROMECAST_BUILD)) || \ - BUILDFLAG(IS_MAC) + #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || \ + (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || \ +- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) ++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) base::FEATURE_ENABLED_BY_DEFAULT + #else + base::FEATURE_DISABLED_BY_DEFAULT diff --git a/www/iridium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc b/www/iridium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc index b7cbeafc5035..42e907b01d4f 100644 --- a/www/iridium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc +++ b/www/iridium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc @@ -1,11 +1,11 @@ ---- ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-03-28 18:11:04 UTC +--- ui/gl/gl_image_glx_native_pixmap.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gl/gl_image_glx_native_pixmap.cc -@@ -16,6 +16,8 @@ +@@ -12,6 +12,8 @@ #include "ui/gl/buffer_format_utils.h" - #include "ui/gl/gl_bindings.h" + #include "ui/gl/glx_util.h" +#include <unistd.h> + namespace gl { - namespace { + GLImageGLXNativePixmap::GLImageGLXNativePixmap(const gfx::Size& size, diff --git a/www/iridium/files/patch-ui_gl_gl__implementation.cc b/www/iridium/files/patch-ui_gl_gl__implementation.cc deleted file mode 100644 index aee2e664ceae..000000000000 --- a/www/iridium/files/patch-ui_gl_gl__implementation.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/gl/gl_implementation.cc.orig 2022-04-01 07:48:30 UTC -+++ ui/gl/gl_implementation.cc -@@ -271,7 +271,7 @@ GLImplementationParts GetSoftwareGLImplementation() { - - GLImplementationParts GetSoftwareGLImplementationForPlatform() { - #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \ -- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) -+ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) - return GetSoftwareGLImplementation(); - #else - return GetLegacySoftwareGLImplementation(); diff --git a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h index e65caae58d83..0874997432b8 100644 --- a/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h +++ b/www/iridium/files/patch-ui_gl_sync__control__vsync__provider.h @@ -1,6 +1,6 @@ ---- ui/gl/sync_control_vsync_provider.h.orig 2022-03-28 18:11:04 UTC +--- ui/gl/sync_control_vsync_provider.h.orig 2022-10-05 07:34:01 UTC +++ ui/gl/sync_control_vsync_provider.h -@@ -30,7 +30,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv +@@ -31,7 +31,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv bool SupportGetVSyncParametersIfAvailable() const override; static constexpr bool IsSupported() { @@ -9,7 +9,7 @@ return true; #else return false; -@@ -45,7 +45,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv +@@ -46,7 +46,7 @@ class SyncControlVSyncProvider : public gfx::VSyncProv virtual bool GetMscRate(int32_t* numerator, int32_t* denominator) = 0; private: diff --git a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc index 7d48f219854c..b8251591d20b 100644 --- a/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc +++ b/www/iridium/files/patch-ui_gtk_printing_print__dialog__gtk.cc @@ -1,6 +1,6 @@ ---- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-03-28 18:11:04 UTC +--- ui/gtk/printing/print_dialog_gtk.cc.orig 2022-10-05 07:34:01 UTC +++ ui/gtk/printing/print_dialog_gtk.cc -@@ -395,7 +395,7 @@ void PrintDialogGtk::ShowDialog( +@@ -398,7 +398,7 @@ void PrintDialogGtk::ShowDialog( GtkPrintCapabilities cap = static_cast<GtkPrintCapabilities>( GTK_PRINT_CAPABILITY_GENERATE_PDF | GTK_PRINT_CAPABILITY_PAGE_SET | GTK_PRINT_CAPABILITY_COPIES | GTK_PRINT_CAPABILITY_COLLATE | diff --git a/www/iridium/files/patch-ui_ozone_common_egl__util.cc b/www/iridium/files/patch-ui_ozone_common_egl__util.cc index 4039eb61d2d5..2e687c092ff9 100644 --- a/www/iridium/files/patch-ui_ozone_common_egl__util.cc +++ b/www/iridium/files/patch-ui_ozone_common_egl__util.cc @@ -1,6 +1,6 @@ ---- ui/ozone/common/egl_util.cc.orig 2022-03-28 18:11:04 UTC +--- ui/ozone/common/egl_util.cc.orig 2022-10-05 07:34:01 UTC +++ ui/ozone/common/egl_util.cc -@@ -36,9 +36,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] = +@@ -26,9 +26,9 @@ const base::FilePath::CharType kDefaultGlesSoname[] = FILE_PATH_LITERAL("libGLESv2.so"); #else // BUILDFLAG(IS_FUCHSIA) const base::FilePath::CharType kDefaultEglSoname[] = diff --git a/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc b/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc new file mode 100644 index 000000000000..c59de19a3de7 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc @@ -0,0 +1,20 @@ +--- ui/ozone/platform/headless/headless_surface_factory.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/ozone/platform/headless/headless_surface_factory.cc +@@ -34,7 +34,7 @@ + #include "ui/ozone/platform/headless/headless_window_manager.h" + #include "ui/ozone/public/surface_ozone_canvas.h" + +-#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA)) ++#if BUILDFLAG(ENABLE_VULKAN) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)) + #include "ui/ozone/platform/headless/vulkan_implementation_headless.h" + #endif + +@@ -282,7 +282,7 @@ std::unique_ptr<gpu::VulkanImplementation> + HeadlessSurfaceFactory::CreateVulkanImplementation( + bool use_swiftshader, + bool allow_protected_memory) { +-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) + return std::make_unique<VulkanImplementationHeadless>(use_swiftshader); + #else + return nullptr; diff --git a/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc b/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc new file mode 100644 index 000000000000..7b4084de0769 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/headless/ozone_platform_headless.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/ozone/platform/headless/ozone_platform_headless.cc +@@ -102,7 +102,7 @@ class OzonePlatformHeadless : public OzonePlatform { + } + + // Desktop Linux, not CastOS. +-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS) ++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS) + const PlatformProperties& GetPlatformProperties() override { + static base::NoDestructor<OzonePlatform::PlatformProperties> properties; + static bool initialized = false; diff --git a/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc b/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc new file mode 100644 index 000000000000..9fde7c405631 --- /dev/null +++ b/www/iridium/files/patch-ui_ozone_platform_headless_vulkan__implementation__headless.cc @@ -0,0 +1,11 @@ +--- ui/ozone/platform/headless/vulkan_implementation_headless.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/ozone/platform/headless/vulkan_implementation_headless.cc +@@ -154,7 +154,7 @@ VulkanImplementationHeadless::CreateImageFromGpuMemory + VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_SAMPLED_BIT | + VK_IMAGE_USAGE_TRANSFER_DST_BIT | VK_IMAGE_USAGE_TRANSFER_SRC_BIT; + auto tiling = VK_IMAGE_TILING_OPTIMAL; +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + if (gmb_handle.native_pixmap_handle.modifier != + gfx::NativePixmapHandle::kNoModifier) { + tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT; diff --git a/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc b/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc index 09f4cc8919ed..52ad655c7d4f 100644 --- a/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc +++ b/www/iridium/files/patch-ui_ozone_platform_x11_ozone__platform__x11.cc @@ -1,6 +1,6 @@ ---- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-03-28 18:11:04 UTC +--- ui/ozone/platform/x11/ozone_platform_x11.cc.orig 2022-10-05 07:34:01 UTC +++ ui/ozone/platform/x11/ozone_platform_x11.cc -@@ -204,7 +204,7 @@ class OzonePlatformX11 : public OzonePlatform, +@@ -196,7 +196,7 @@ class OzonePlatformX11 : public OzonePlatform, properties->supports_global_application_menus = true; properties->app_modal_dialogs_use_event_blocker = true; properties->fetch_buffer_formats_for_gmb_on_gpu = true; diff --git a/www/iridium/files/patch-ui_ozone_public_ozone__platform.h b/www/iridium/files/patch-ui_ozone_public_ozone__platform.h index 129cdcf58711..11aaf56b3e01 100644 --- a/www/iridium/files/patch-ui_ozone_public_ozone__platform.h +++ b/www/iridium/files/patch-ui_ozone_public_ozone__platform.h @@ -1,6 +1,6 @@ ---- ui/ozone/public/ozone_platform.h.orig 2022-03-28 18:11:04 UTC +--- ui/ozone/public/ozone_platform.h.orig 2022-10-05 07:34:01 UTC +++ ui/ozone/public/ozone_platform.h -@@ -151,7 +151,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { +@@ -148,7 +148,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform { // back via gpu extra info. bool fetch_buffer_formats_for_gmb_on_gpu = false; diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h b/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h index f36e94147a67..8acc31e98d2b 100644 --- a/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h +++ b/www/iridium/files/patch-ui_platform__window_platform__window__init__properties.h @@ -1,6 +1,6 @@ ---- ui/platform_window/platform_window_init_properties.h.orig 2022-04-01 07:48:30 UTC +--- ui/platform_window/platform_window_init_properties.h.orig 2022-10-05 07:34:01 UTC +++ ui/platform_window/platform_window_init_properties.h -@@ -54,7 +54,7 @@ class WorkspaceExtensionDelegate; +@@ -56,7 +56,7 @@ class WorkspaceExtensionDelegate; class ScenicWindowDelegate; #endif @@ -9,12 +9,12 @@ class X11ExtensionDelegate; #endif -@@ -116,7 +116,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo +@@ -118,7 +118,7 @@ struct COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindo PlatformWindowShadowType shadow_type = PlatformWindowShadowType::kDefault; -#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) bool prefer_dark_theme = false; - gfx::ImageSkia* icon = nullptr; - absl::optional<int> background_color; + raw_ptr<gfx::ImageSkia> icon = nullptr; + absl::optional<SkColor> background_color; diff --git a/www/iridium/files/patch-ui_strings_app__locale__settings.grd b/www/iridium/files/patch-ui_strings_app__locale__settings.grd index b149833ea419..803b6644655d 100644 --- a/www/iridium/files/patch-ui_strings_app__locale__settings.grd +++ b/www/iridium/files/patch-ui_strings_app__locale__settings.grd @@ -1,11 +1,11 @@ ---- ui/strings/app_locale_settings.grd.orig 2022-03-28 18:11:04 UTC +--- ui/strings/app_locale_settings.grd.orig 2022-10-05 07:34:01 UTC +++ ui/strings/app_locale_settings.grd -@@ -225,7 +225,7 @@ +@@ -218,7 +218,7 @@ 75% </message> </if> -- <if expr="(is_linux or is_android or is_bsd or is_fuchsia) and not (chromeos_ash or chromeos_lacros)"> -+ <if expr="(is_posix or is_android or is_bsd or is_fuchsia) and not (chromeos_ash or chromeos_lacros)"> +- <if expr="is_linux or is_android or is_bsd or is_fuchsia"> ++ <if expr="is_posix or is_android or is_bsd or is_fuchsia"> <!-- The font used in Web UI (e.g. History). Note that these are only backups. We try to use the system font if possible. --> <message name="IDS_WEB_FONT_FAMILY" use_name_for_id="true"> diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb new file mode 100644 index 000000000000..e43d310e2bbe --- /dev/null +++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb @@ -0,0 +1,11 @@ +--- ui/strings/translations/app_locale_settings_bn.xtb.orig 2022-10-05 07:34:01 UTC ++++ ui/strings/translations/app_locale_settings_bn.xtb +@@ -10,7 +10,7 @@ + <translation id="IDS_WEB_FONT_FAMILY">Vrinda</translation> + <translation id="IDS_WEB_FONT_FAMILY_XP">Vrinda</translation> + </if> +-<if expr="is_linux"> ++<if expr="is_posix"> + <translation id="IDS_WEB_FONT_FAMILY">Lohit Bengali</translation> + </if> + <if expr="is_chromeos"> diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb new file mode 100644 index 000000000000..5138cc96d472 --- /dev/null +++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb @@ -0,0 +1,11 @@ +--- ui/strings/translations/app_locale_settings_ja.xtb.orig 2022-10-05 07:34:01 UTC ++++ ui/strings/translations/app_locale_settings_ja.xtb +@@ -12,7 +12,7 @@ + <if expr="is_ios"> + <translation id="IDS_WEB_FONT_FAMILY">Helvetica,Hiragino Kaku Gothic ProN,sans-serif</translation> + </if> +-<if expr="is_linux"> ++<if expr="is_posix"> + <translation id="IDS_WEB_FONT_FAMILY">VL PGothic,Sazanami Gothic,Kochi Gothic,sans-serif</translation> + </if> + <if expr="is_chromeos"> diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb new file mode 100644 index 000000000000..9d828da0cc26 --- /dev/null +++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb @@ -0,0 +1,11 @@ +--- ui/strings/translations/app_locale_settings_ko.xtb.orig 2022-10-05 07:34:01 UTC ++++ ui/strings/translations/app_locale_settings_ko.xtb +@@ -12,7 +12,7 @@ + <if expr="is_ios"> + <translation id="IDS_WEB_FONT_FAMILY">Helvetica,Apple SD Gothic Neo,AppleGothic,sans-serif</translation> + </if> +-<if expr="is_linux"> ++<if expr="is_posix"> + <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK KR,NanumGothic,UnDotum,Baekmuk Gulim,sans-serif</translation> + </if> + <if expr="is_chromeos"> diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb new file mode 100644 index 000000000000..3ce40a565bd2 --- /dev/null +++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb @@ -0,0 +1,11 @@ +--- ui/strings/translations/app_locale_settings_ml.xtb.orig 2022-10-05 07:34:01 UTC ++++ ui/strings/translations/app_locale_settings_ml.xtb +@@ -9,7 +9,7 @@ + <translation id="IDS_WEB_FONT_FAMILY">'Segoe UI',Arial,AnjaliOldLipi,Rachana,Kartika</translation> + <translation id="IDS_WEB_FONT_FAMILY_XP">Arial,AnjaliOldLipi,Rachana,Kartika</translation> + </if> +-<if expr="is_linux"> ++<if expr="is_posix"> + <translation id="IDS_WEB_FONT_FAMILY">Arial,AnjaliOldLipi,Rachana,Kartika,sans-serif</translation> + </if> + <if expr="is_chromeos"> diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__th.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__th.xtb new file mode 100644 index 000000000000..add8ff5f8936 --- /dev/null +++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__th.xtb @@ -0,0 +1,11 @@ +--- ui/strings/translations/app_locale_settings_th.xtb.orig 2022-10-05 07:34:01 UTC ++++ ui/strings/translations/app_locale_settings_th.xtb +@@ -6,7 +6,7 @@ + <translation id="IDS_WEB_FONT_FAMILY">Tahoma,sans-serif</translation> + <translation id="IDS_WEB_FONT_FAMILY_XP">Tahoma,sans-serif</translation> + </if> +-<if expr="is_linux"> ++<if expr="is_posix"> + <translation id="IDS_WEB_FONT_FAMILY">Norasi,Waree,Garuda,Loma,sans-serif</translation> + </if> + <if expr="is_chromeos"> diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb new file mode 100644 index 000000000000..d7daf341c2cd --- /dev/null +++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb @@ -0,0 +1,11 @@ +--- ui/strings/translations/app_locale_settings_zh-CN.xtb.orig 2022-10-05 07:34:01 UTC ++++ ui/strings/translations/app_locale_settings_zh-CN.xtb +@@ -12,7 +12,7 @@ + <if expr="is_ios"> + <translation id="IDS_WEB_FONT_FAMILY">Helvetica,PingFang SC,STHeiti,sans-serif</translation> + </if> +-<if expr="is_linux"> ++<if expr="is_posix"> + <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation> + </if> + <if expr="is_chromeos"> diff --git a/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb new file mode 100644 index 000000000000..5929fcd530fd --- /dev/null +++ b/www/iridium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb @@ -0,0 +1,11 @@ +--- ui/strings/translations/app_locale_settings_zh-TW.xtb.orig 2022-10-05 07:34:01 UTC ++++ ui/strings/translations/app_locale_settings_zh-TW.xtb +@@ -12,7 +12,7 @@ + <if expr="is_ios"> + <translation id="IDS_WEB_FONT_FAMILY">Helvetica,PingFang TC,Heiti TC,sans-serif</translation> + </if> +-<if expr="is_linux"> ++<if expr="is_posix"> + <translation id="IDS_WEB_FONT_FAMILY">Noto Sans CJK SC, WenQuanYi Zen Hei, sans-serif</translation> + </if> + <if expr="is_chromeos"> diff --git a/www/iridium/files/patch-ui_views_controls_prefix__selector.cc b/www/iridium/files/patch-ui_views_controls_prefix__selector.cc index 89378f85e2da..cb36ed1d7e85 100644 --- a/www/iridium/files/patch-ui_views_controls_prefix__selector.cc +++ b/www/iridium/files/patch-ui_views_controls_prefix__selector.cc @@ -1,6 +1,6 @@ ---- ui/views/controls/prefix_selector.cc.orig 2022-03-28 18:11:04 UTC +--- ui/views/controls/prefix_selector.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/controls/prefix_selector.cc -@@ -171,7 +171,7 @@ bool PrefixSelector::ShouldDoLearning() { +@@ -174,7 +174,7 @@ bool PrefixSelector::ShouldDoLearning() { return false; } diff --git a/www/iridium/files/patch-ui_views_controls_prefix__selector.h b/www/iridium/files/patch-ui_views_controls_prefix__selector.h index a2191bbf8200..2d3e4076d8dd 100644 --- a/www/iridium/files/patch-ui_views_controls_prefix__selector.h +++ b/www/iridium/files/patch-ui_views_controls_prefix__selector.h @@ -1,6 +1,6 @@ ---- ui/views/controls/prefix_selector.h.orig 2022-03-28 18:11:04 UTC +--- ui/views/controls/prefix_selector.h.orig 2022-10-05 07:34:01 UTC +++ ui/views/controls/prefix_selector.h -@@ -81,7 +81,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp +@@ -83,7 +83,7 @@ class VIEWS_EXPORT PrefixSelector : public ui::TextInp ukm::SourceId GetClientSourceForMetrics() const override; bool ShouldDoLearning() override; diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc index cfa0d63d7c3c..834f1d0019ed 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc @@ -1,15 +1,15 @@ ---- ui/views/controls/textfield/textfield.cc.orig 2022-04-01 07:48:30 UTC +--- ui/views/controls/textfield/textfield.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/controls/textfield/textfield.cc -@@ -73,7 +73,7 @@ +@@ -70,7 +70,7 @@ + #include "base/win/win_util.h" + #endif - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) #include "ui/base/ime/linux/text_edit_command_auralinux.h" - #include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h" + #include "ui/linux/linux_ui.h" #endif -@@ -166,7 +166,7 @@ bool IsControlKeyModifier(int flags) { +@@ -163,7 +163,7 @@ bool IsControlKeyModifier(int flags) { // Control-modified key combination, but we cannot extend it to other platforms // as Control has different meanings and behaviors. // https://crrev.com/2580483002/#msg46 @@ -18,25 +18,25 @@ return flags & ui::EF_CONTROL_DOWN; #else return false; -@@ -715,7 +715,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event +@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event + if (!textfield) + return handled; - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) - ui::TextEditKeyBindingsDelegateAuraLinux* delegate = - ui::GetTextEditKeyBindingsDelegate(); +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + auto* linux_ui = ui::LinuxUi::instance(); std::vector<ui::TextEditCommandAuraLinux> commands; -@@ -861,7 +861,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo + if (!handled && linux_ui && +@@ -850,7 +850,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo + } + bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) { - // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch - // of lacros-chrome is complete. --#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) -+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD) +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) // Skip any accelerator handling that conflicts with custom keybindings. - ui::TextEditKeyBindingsDelegateAuraLinux* delegate = - ui::GetTextEditKeyBindingsDelegate(); -@@ -1721,7 +1721,7 @@ bool Textfield::ShouldDoLearning() { + auto* linux_ui = ui::LinuxUi::instance(); + std::vector<ui::TextEditCommandAuraLinux> commands; +@@ -1720,7 +1720,7 @@ bool Textfield::ShouldDoLearning() { return false; } @@ -45,7 +45,7 @@ // TODO(https://crbug.com/952355): Implement this method to support Korean IME // reconversion feature on native text fields (e.g. find bar). bool Textfield::SetCompositionFromExistingText( -@@ -2220,14 +2220,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( +@@ -2219,14 +2219,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent( #endif return ui::TextEditCommand::DELETE_BACKWARD; } diff --git a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h index 609c97c6f2f3..726c7bf0b0da 100644 --- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.h +++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.h @@ -1,6 +1,15 @@ ---- ui/views/controls/textfield/textfield.h.orig 2022-04-01 07:48:30 UTC +--- ui/views/controls/textfield/textfield.h.orig 2022-10-05 07:34:01 UTC +++ ui/views/controls/textfield/textfield.h -@@ -443,7 +443,7 @@ class VIEWS_EXPORT Textfield : public View, +@@ -42,7 +42,7 @@ + #include "ui/views/view.h" + #include "ui/views/word_lookup_client.h" + +-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD) + #include <vector> + #endif + +@@ -449,7 +449,7 @@ class VIEWS_EXPORT Textfield : public View, // Set whether the text should be used to improve typing suggestions. void SetShouldDoLearning(bool value) { should_do_learning_ = value; } diff --git a/www/iridium/files/patch-ui_views_examples_widget__example.cc b/www/iridium/files/patch-ui_views_examples_widget__example.cc index f4f664a774ec..7dbd15dbfb32 100644 --- a/www/iridium/files/patch-ui_views_examples_widget__example.cc +++ b/www/iridium/files/patch-ui_views_examples_widget__example.cc @@ -1,6 +1,6 @@ ---- ui/views/examples/widget_example.cc.orig 2022-03-28 18:11:04 UTC +--- ui/views/examples/widget_example.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/examples/widget_example.cc -@@ -49,7 +49,7 @@ void WidgetExample::CreateExampleView(View* container) +@@ -50,7 +50,7 @@ void WidgetExample::CreateExampleView(View* container) modal_button->SetCallback( base::BindRepeating(&WidgetExample::CreateDialogWidget, base::Unretained(this), modal_button, true)); diff --git a/www/iridium/files/patch-ui_views_focus_focus__manager.cc b/www/iridium/files/patch-ui_views_focus_focus__manager.cc index b930f3c43f1a..1fb00fa670cd 100644 --- a/www/iridium/files/patch-ui_views_focus_focus__manager.cc +++ b/www/iridium/files/patch-ui_views_focus_focus__manager.cc @@ -1,6 +1,6 @@ ---- ui/views/focus/focus_manager.cc.orig 2022-03-28 18:11:04 UTC +--- ui/views/focus/focus_manager.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/focus/focus_manager.cc -@@ -634,7 +634,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -623,7 +623,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. @@ -9,7 +9,7 @@ // Processing an accelerator can delete things. Because we // need these objects afterwards on Linux, save widget_ as weak pointer and // save the close_on_deactivate property value of widget_delegate in a -@@ -651,7 +651,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi +@@ -640,7 +640,7 @@ bool FocusManager::RedirectAcceleratorToBubbleAnchorWi // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch // of lacros-chrome is complete. diff --git a/www/iridium/files/patch-ui_views_linux__ui_linux__ui.cc b/www/iridium/files/patch-ui_views_linux__ui_linux__ui.cc deleted file mode 100644 index d855e10aabce..000000000000 --- a/www/iridium/files/patch-ui_views_linux__ui_linux__ui.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- ui/views/linux_ui/linux_ui.cc.orig 2022-04-01 07:48:30 UTC -+++ ui/views/linux_ui/linux_ui.cc -@@ -21,7 +21,7 @@ void LinuxUI::SetInstance(std::unique_ptr<LinuxUI> ins - g_linux_ui = instance.release(); - - SkiaFontDelegate::SetInstance(g_linux_ui); --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) - ShellDialogLinux::SetInstance(g_linux_ui); - #endif - ui::SetTextEditKeyBindingsDelegate(g_linux_ui); diff --git a/www/iridium/files/patch-ui_views_linux__ui_linux__ui.h b/www/iridium/files/patch-ui_views_linux__ui_linux__ui.h deleted file mode 100644 index 249f94580ad5..000000000000 --- a/www/iridium/files/patch-ui_views_linux__ui_linux__ui.h +++ /dev/null @@ -1,20 +0,0 @@ ---- ui/views/linux_ui/linux_ui.h.orig 2022-04-01 07:48:30 UTC -+++ ui/views/linux_ui/linux_ui.h -@@ -21,7 +21,7 @@ - #include "ui/views/controls/button/button.h" - #include "ui/views/views_export.h" - --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) - #include "ui/shell_dialogs/shell_dialog_linux.h" - #endif - -@@ -57,7 +57,7 @@ class WindowFrameProvider; - // project that wants to do linux desktop native rendering. - class VIEWS_EXPORT LinuxUI : public ui::LinuxInputMethodContextFactory, - public gfx::SkiaFontDelegate, --#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST) -+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST) - public ui::ShellDialogLinux, - #endif - public ui::TextEditKeyBindingsDelegateAuraLinux, diff --git a/www/iridium/files/patch-ui_views_style_platform__style.cc b/www/iridium/files/patch-ui_views_style_platform__style.cc index 1665843017e7..ceb30a2afc00 100644 --- a/www/iridium/files/patch-ui_views_style_platform__style.cc +++ b/www/iridium/files/patch-ui_views_style_platform__style.cc @@ -1,5 +1,14 @@ ---- ui/views/style/platform_style.cc.orig 2022-03-28 18:11:04 UTC +--- ui/views/style/platform_style.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/style/platform_style.cc +@@ -17,7 +17,7 @@ + #include "ui/views/controls/focusable_border.h" + #include "ui/views/controls/scrollbar/scroll_bar_views.h" + +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/views/controls/scrollbar/overlay_scroll_bar.h" + #endif + @@ -52,7 +52,7 @@ const View::FocusBehavior PlatformStyle::kDefaultFocus const bool PlatformStyle::kAdjustBubbleIfOffscreen = // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch @@ -9,12 +18,12 @@ false; #else true; -@@ -82,7 +82,7 @@ gfx::Range PlatformStyle::RangeToDeleteBackwards(const - #endif // !BUILDFLAG(IS_MAC) +@@ -60,7 +60,7 @@ const bool PlatformStyle::kAdjustBubbleIfOffscreen = - #if !BUILDFLAG(ENABLE_DESKTOP_AURA) || \ -- (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) -+ (!BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)) // static - std::unique_ptr<Border> PlatformStyle::CreateThemedLabelButtonBorder( - LabelButton* button) { + std::unique_ptr<ScrollBar> PlatformStyle::CreateScrollBar(bool is_horizontal) { +-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + return std::make_unique<OverlayScrollBar>(is_horizontal); + #else + return std::make_unique<ScrollBarViews>(is_horizontal); diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h new file mode 100644 index 000000000000..b19287b75514 --- /dev/null +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h @@ -0,0 +1,11 @@ +--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h.orig 2022-10-05 07:34:01 UTC ++++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.h +@@ -68,7 +68,7 @@ class VIEWS_EXPORT DesktopDragDropClientOzone + // The offset of |drag_widget_| relative to the mouse position. + gfx::Vector2d offset; + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + // The last received drag location. The drag widget is moved asynchronously + // so its position is updated when the UI thread has time for that. When + // the first change to the location happens, a call to UpdateDragWidget() diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc index b31d9d0a2d88..dcdf3cfcb662 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc @@ -1,11 +1,11 @@ ---- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2022-03-28 18:11:04 UTC +--- ui/views/widget/desktop_aura/desktop_screen_ozone.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/widget/desktop_aura/desktop_screen_ozone.cc @@ -25,7 +25,7 @@ gfx::NativeWindow DesktopScreenOzone::GetNativeWindowF widget); } --#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) -+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) +-#if !BUILDFLAG(IS_LINUX) ++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) std::unique_ptr<display::Screen> CreateDesktopScreen() { - auto screen = std::make_unique<aura::ScreenOzone>(); + auto screen = std::make_unique<DesktopScreenOzone>(); screen->Initialize(); diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc index 62b936ac891a..ead2da1af1dc 100644 --- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc @@ -1,6 +1,33 @@ ---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-03-28 18:11:04 UTC +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc -@@ -915,7 +915,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis +@@ -40,7 +40,7 @@ + #include "ui/wm/core/window_util.h" + #include "ui/wm/public/window_move_client.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h" + #endif + +@@ -256,7 +256,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget: + if (params.type == Widget::InitParams::TYPE_WINDOW) + GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true); + +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + const bool requires_accelerated_widget = params.requires_accelerated_widget; + #else + const bool requires_accelerated_widget = false; +@@ -328,7 +328,7 @@ std::unique_ptr<aura::client::DragDropClient> + DesktopWindowTreeHostPlatform::CreateDragDropClient() { + ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window())); + std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client = +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + std::make_unique<DesktopDragDropClientOzoneLinux>(window(), drag_handler); + #else + std::make_unique<DesktopDragDropClientOzone>(window(), drag_handler); +@@ -1006,7 +1006,7 @@ display::Display DesktopWindowTreeHostPlatform::GetDis // DesktopWindowTreeHost: // Linux subclasses this host and adds some Linux specific bits. diff --git a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc new file mode 100644 index 000000000000..fea64165f6de --- /dev/null +++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc @@ -0,0 +1,11 @@ +--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc.orig 2022-10-05 07:34:01 UTC ++++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform_impl_interactive_uitest.cc +@@ -22,7 +22,7 @@ + #include "ui/views/widget/widget_delegate.h" + #include "ui/views/window/native_frame_view.h" + +-#if BUILDFLAG(IS_LINUX) ++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) + #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" + #include "ui/views/widget/desktop_aura/window_event_filter_linux.h" + using DesktopWindowTreeHostPlatformImpl = views::DesktopWindowTreeHostLinux; diff --git a/www/iridium/files/patch-ui_views_widget_native__widget__aura.cc b/www/iridium/files/patch-ui_views_widget_native__widget__aura.cc deleted file mode 100644 index 3631a509c1c1..000000000000 --- a/www/iridium/files/patch-ui_views_widget_native__widget__aura.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- ui/views/widget/native_widget_aura.cc.orig 2022-03-28 18:11:04 UTC -+++ ui/views/widget/native_widget_aura.cc -@@ -69,7 +69,7 @@ - #endif - - #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - #include "ui/views/widget/desktop_aura/desktop_window_tree_host_linux.h" - #endif - -@@ -1151,7 +1151,7 @@ void NativeWidgetAura::SetInitialFocus(ui::WindowShowS - - namespace { - #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - void CloseWindow(aura::Window* window) { - if (window) { - Widget* widget = Widget::GetWidgetForNativeView(window); -@@ -1182,7 +1182,7 @@ void Widget::CloseAllSecondaryWidgets() { - #endif - - #if BUILDFLAG(ENABLE_DESKTOP_AURA) && \ -- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) -+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) - DesktopWindowTreeHostLinux::CleanUpWindowList(CloseWindow); - #endif - } diff --git a/www/iridium/files/patch-ui_views_widget_widget.cc b/www/iridium/files/patch-ui_views_widget_widget.cc index cca983858479..8af04ac9cd92 100644 --- a/www/iridium/files/patch-ui_views_widget_widget.cc +++ b/www/iridium/files/patch-ui_views_widget_widget.cc @@ -1,4 +1,4 @@ ---- ui/views/widget/widget.cc.orig 2022-04-01 07:48:30 UTC +--- ui/views/widget/widget.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/widget/widget.cc @@ -48,7 +48,7 @@ #include "ui/views/window/custom_frame_view.h" @@ -6,15 +6,15 @@ -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - #include "ui/views/linux_ui/linux_ui.h" + #include "ui/linux/linux_ui.h" #endif -@@ -1791,7 +1791,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const +@@ -1819,7 +1819,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const if (parent_) return parent_->GetNativeTheme(); -#if BUILDFLAG(IS_LINUX) +#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) - if (const views::LinuxUI* linux_ui = views::LinuxUI::instance()) { + if (const ui::LinuxUi* linux_ui = ui::LinuxUi::instance()) { if (auto* native_theme = linux_ui->GetNativeTheme(GetNativeWindow())) return native_theme; diff --git a/www/iridium/files/patch-ui_views_widget_widget.h b/www/iridium/files/patch-ui_views_widget_widget.h new file mode 100644 index 000000000000..7b6d14a7419d --- /dev/null +++ b/www/iridium/files/patch-ui_views_widget_widget.h @@ -0,0 +1,11 @@ +--- ui/views/widget/widget.h.orig 2022-10-05 07:34:01 UTC ++++ ui/views/widget/widget.h +@@ -394,7 +394,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid + // If set, the widget was created in headless mode. + bool headless_mode = false; + +-#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) ++#if defined(USE_AURA) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)) + // Indicates whether the desktop native widget is required for the widget. + // This may enforce changing the type of the underlying platform window. + // See crbug.com/1280332 diff --git a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc index 4cc3ae4755ed..ba38f781755b 100644 --- a/www/iridium/files/patch-ui_views_window_dialog__delegate.cc +++ b/www/iridium/files/patch-ui_views_window_dialog__delegate.cc @@ -1,6 +1,6 @@ ---- ui/views/window/dialog_delegate.cc.orig 2022-03-28 18:11:04 UTC +--- ui/views/window/dialog_delegate.cc.orig 2022-10-05 07:34:01 UTC +++ ui/views/window/dialog_delegate.cc -@@ -78,7 +78,7 @@ Widget* DialogDelegate::CreateDialogWidget( +@@ -79,7 +79,7 @@ Widget* DialogDelegate::CreateDialogWidget( // static bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) { diff --git a/www/iridium/files/patch-ui_webui_resources_js_cr.js b/www/iridium/files/patch-ui_webui_resources_js_cr.js index 9e4238ac97f9..d25790d009fc 100644 --- a/www/iridium/files/patch-ui_webui_resources_js_cr.js +++ b/www/iridium/files/patch-ui_webui_resources_js_cr.js @@ -1,6 +1,6 @@ ---- ui/webui/resources/js/cr.js.orig 2022-03-28 18:11:04 UTC +--- ui/webui/resources/js/cr.js.orig 2022-10-05 07:34:01 UTC +++ ui/webui/resources/js/cr.js -@@ -441,6 +441,11 @@ var cr = cr || function(global) { +@@ -438,6 +438,11 @@ var cr = cr || function(global) { return returnValue; }, diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn index 5daa14e6555c..7220f2734ca8 100644 --- a/www/iridium/files/patch-v8_BUILD.gn +++ b/www/iridium/files/patch-v8_BUILD.gn @@ -1,6 +1,6 @@ ---- v8/BUILD.gn.orig 2022-04-01 07:48:30 UTC +--- v8/BUILD.gn.orig 2022-10-05 07:34:01 UTC +++ v8/BUILD.gn -@@ -1217,6 +1217,14 @@ config("toolchain") { +@@ -1327,6 +1327,14 @@ config("toolchain") { } else if (target_os == "win") { defines += [ "V8_HAVE_TARGET_OS" ] defines += [ "V8_TARGET_OS_WIN" ] @@ -15,7 +15,7 @@ } # TODO(infra): Support v8_enable_prof on Windows. -@@ -5156,7 +5164,7 @@ v8_component("v8_libbase") { +@@ -5571,7 +5579,7 @@ v8_component("v8_libbase") { } } @@ -24,7 +24,7 @@ sources += [ "src/base/debug/stack_trace_posix.cc", "src/base/platform/platform-linux.cc", -@@ -5166,6 +5174,18 @@ v8_component("v8_libbase") { +@@ -5582,6 +5590,18 @@ v8_component("v8_libbase") { "dl", "rt", ] diff --git a/www/iridium/files/patch-v8_include_v8-internal.h b/www/iridium/files/patch-v8_include_v8-internal.h new file mode 100644 index 000000000000..6e12835e73c4 --- /dev/null +++ b/www/iridium/files/patch-v8_include_v8-internal.h @@ -0,0 +1,11 @@ +--- v8/include/v8-internal.h.orig 2022-10-05 07:34:01 UTC ++++ v8/include/v8-internal.h +@@ -179,7 +179,7 @@ using SandboxedPointer_t = Address; + #ifdef V8_ENABLE_SANDBOX + + // Size of the sandbox, excluding the guard regions surrounding it. +-#ifdef V8_TARGET_OS_ANDROID ++#if defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD) + // On Android, most 64-bit devices seem to be configured with only 39 bits of + // virtual address space for userspace. As such, limit the sandbox to 128GB (a + // quarter of the total available address space). diff --git a/www/iridium/files/patch-v8_include_v8config.h b/www/iridium/files/patch-v8_include_v8config.h index afca7c8a2373..1fbdf5604eab 100644 --- a/www/iridium/files/patch-v8_include_v8config.h +++ b/www/iridium/files/patch-v8_include_v8config.h @@ -1,24 +1,24 @@ ---- v8/include/v8config.h.orig 2022-03-28 18:11:04 UTC +--- v8/include/v8config.h.orig 2022-10-05 07:34:01 UTC +++ v8/include/v8config.h -@@ -181,6 +181,8 @@ path. Add it with -I<path> to the command line +@@ -183,6 +183,8 @@ path. Add it with -I<path> to the command line && !defined(V8_TARGET_OS_FUCHSIA) \ && !defined(V8_TARGET_OS_IOS) \ && !defined(V8_TARGET_OS_LINUX) \ + && !defined(V8_TARGET_OS_OPENBSD) \ + && !defined(V8_TARGET_OS_FREEBSD) \ - && !defined(V8_TARGET_OS_MACOSX) \ + && !defined(V8_TARGET_OS_MACOS) \ && !defined(V8_TARGET_OS_WIN) # error No known target OS defined. -@@ -192,6 +194,8 @@ path. Add it with -I<path> to the command line +@@ -194,6 +196,8 @@ path. Add it with -I<path> to the command line || defined(V8_TARGET_OS_FUCHSIA) \ || defined(V8_TARGET_OS_IOS) \ || defined(V8_TARGET_OS_LINUX) \ + || defined(V8_TARGET_OS_OPENBSD) \ + || defined(V8_TARGET_OS_FREEBSD) \ - || defined(V8_TARGET_OS_MACOSX) \ + || defined(V8_TARGET_OS_MACOS) \ || defined(V8_TARGET_OS_WIN) # error A target OS is defined but V8_HAVE_TARGET_OS is unset. -@@ -212,6 +216,16 @@ path. Add it with -I<path> to the command line +@@ -214,6 +218,16 @@ path. Add it with -I<path> to the command line #ifdef V8_OS_LINUX # define V8_TARGET_OS_LINUX @@ -34,4 +34,4 @@ +# define V8_TARGET_OS_BSD #endif - #ifdef V8_OS_MACOSX + #ifdef V8_OS_MACOS diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc index 4e6f89a8e63c..ed6fe2d6d40d 100644 --- a/www/iridium/files/patch-v8_src_api_api.cc +++ b/www/iridium/files/patch-v8_src_api_api.cc @@ -1,20 +1,20 @@ ---- v8/src/api/api.cc.orig 2022-04-01 07:48:30 UTC +--- v8/src/api/api.cc.orig 2022-10-05 07:34:01 UTC +++ v8/src/api/api.cc -@@ -139,7 +139,7 @@ +@@ -138,7 +138,7 @@ #include "src/wasm/wasm-serialization.h" #endif // V8_ENABLE_WEBASSEMBLY --#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_FREEBSD -+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_FREEBSD || V8_OS_OPENBSD +-#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD ++#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD #include <signal.h> - #include "include/v8-wasm-trap-handler-posix.h" - #include "src/trap-handler/handler-inside-posix.h" -@@ -6060,7 +6060,7 @@ bool v8::V8::Initialize(const int build_config) { + + #if V8_ENABLE_WEBASSEMBLY +@@ -6113,7 +6113,7 @@ bool v8::V8::Initialize(const int build_config) { return true; } --#if V8_OS_LINUX || V8_OS_MACOSX -+#if V8_OS_LINUX || V8_OS_MACOSX || V8_OS_FREEBSD || V8_OS_OPENBSD +-#if V8_OS_LINUX || V8_OS_DARWIN ++#if V8_OS_LINUX || V8_OS_DARWIN || V8_OS_FREEBSD || V8_OS_OPENBSD bool TryHandleWebAssemblyTrapPosix(int sig_code, siginfo_t* info, void* context) { #if V8_ENABLE_WEBASSEMBLY && V8_TRAP_HANDLER_SUPPORTED diff --git a/www/iridium/files/patch-v8_src_base_atomicops.h b/www/iridium/files/patch-v8_src_base_atomicops.h index 02ac69ddefdf..2c6439870f8a 100644 --- a/www/iridium/files/patch-v8_src_base_atomicops.h +++ b/www/iridium/files/patch-v8_src_base_atomicops.h @@ -1,4 +1,4 @@ ---- v8/src/base/atomicops.h.orig 2022-03-28 18:11:04 UTC +--- v8/src/base/atomicops.h.orig 2022-10-05 07:34:01 UTC +++ v8/src/base/atomicops.h @@ -57,10 +57,10 @@ using Atomic64 = SbAtomic64; using Atomic8 = char; @@ -13,8 +13,8 @@ using Atomic64 = int64_t; #else using Atomic64 = intptr_t; -@@ -241,7 +241,7 @@ inline Atomic32 Acquire_Load(volatile const Atomic32* - std::memory_order_acquire); +@@ -258,7 +258,7 @@ inline Atomic32 SeqCst_Load(volatile const Atomic32* p + std::memory_order_seq_cst); } -#if defined(V8_HOST_ARCH_64_BIT) @@ -22,12 +22,3 @@ inline Atomic64 Relaxed_CompareAndSwap(volatile Atomic64* ptr, Atomic64 old_value, Atomic64 new_value) { -@@ -441,7 +441,7 @@ inline int Relaxed_Memcmp(volatile const Atomic8* s1, - - // On some platforms we need additional declarations to make - // AtomicWord compatible with our other Atomic* types. --#if defined(V8_OS_MACOSX) || defined(V8_OS_OPENBSD) || defined(V8_OS_AIX) -+#if defined(V8_OS_MACOSX) || defined(V8_OS_AIX) - #include "src/base/atomicops_internals_atomicword_compat.h" - #endif - diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc index 983e6d467fed..266f3ebe8cdb 100644 --- a/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc +++ b/www/iridium/files/patch-v8_src_base_platform_platform-posix.cc @@ -1,20 +1,20 @@ ---- v8/src/base/platform/platform-posix.cc.orig 2022-04-01 07:48:30 UTC +--- v8/src/base/platform/platform-posix.cc.orig 2022-10-05 07:34:01 UTC +++ v8/src/base/platform/platform-posix.cc -@@ -65,7 +65,7 @@ +@@ -68,7 +68,7 @@ #include <sys/syscall.h> #endif --#if V8_OS_FREEBSD || V8_OS_MACOSX || V8_OS_OPENBSD || V8_OS_SOLARIS -+#if V8_OS_FREEBSD || V8_OS_MACOSX || V8_OS_BSD || V8_OS_SOLARIS +-#if V8_OS_FREEBSD || V8_OS_DARWIN || V8_OS_OPENBSD || V8_OS_SOLARIS ++#if V8_OS_FREEBSD || V8_OS_DARWIN || V8_OS_BSD || V8_OS_SOLARIS #define MAP_ANONYMOUS MAP_ANON #endif -@@ -291,8 +291,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { +@@ -294,8 +294,15 @@ void OS::SetRandomMmapSeed(int64_t seed) { } } +#if V8_OS_OPENBSD -+// Allow OpenBSD's mmap to select a random address on OpenBSD ++// Allow OpenBSD's mmap to select a random address on OpenBSD // static void* OS::GetRandomMmapAddr() { + return nullptr; @@ -25,7 +25,7 @@ uintptr_t raw_addr; { MutexGuard guard(rng_mutex.Pointer()); -@@ -383,6 +390,7 @@ void* OS::GetRandomMmapAddr() { +@@ -390,6 +397,7 @@ void* OS::GetRandomMmapAddr() { #endif return reinterpret_cast<void*>(raw_addr); } @@ -33,19 +33,19 @@ // TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files. #if !V8_OS_CYGWIN && !V8_OS_FUCHSIA -@@ -598,7 +606,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor +@@ -647,7 +655,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor // static bool OS::HasLazyCommits() { --#if V8_OS_AIX || V8_OS_LINUX || V8_OS_MACOSX -+#if V8_OS_AIX || V8_OS_LINUX || V8_OS_MACOSX || V8_OS_BSD +-#if V8_OS_AIX || V8_OS_LINUX || V8_OS_DARWIN ++#if V8_OS_AIX || V8_OS_LINUX || V8_OS_DARWIN || V8_OS_BSD return true; #else // TODO(bbudge) Return true for all POSIX platforms. -@@ -1217,7 +1225,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* +@@ -1224,7 +1232,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void* // keep this version in POSIX as most Linux-compatible derivatives will // support it. MacOS and FreeBSD are different here. - #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_MACOSX) && !defined(_AIX) && \ + #if !defined(V8_OS_FREEBSD) && !defined(V8_OS_DARWIN) && !defined(_AIX) && \ - !defined(V8_OS_SOLARIS) + !defined(V8_OS_SOLARIS) && !defined(V8_OS_OPENBSD) diff --git a/www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc b/www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc index b3b0f9cfa0ca..3e3e11418827 100644 --- a/www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc +++ b/www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc @@ -1,6 +1,6 @@ ---- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2022-03-28 18:11:04 UTC +--- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2022-10-05 07:34:01 UTC +++ v8/src/compiler/backend/ia32/instruction-selector-ia32.cc -@@ -3019,6 +3019,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node +@@ -3026,6 +3026,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node Emit(opcode, 1, &dst, input_count, inputs, temp_count, temps); } @@ -8,7 +8,7 @@ void InstructionSelector::VisitI8x16Swizzle(Node* node) { InstructionCode op = kIA32I8x16Swizzle; -@@ -3072,6 +3073,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node +@@ -3079,6 +3080,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node void InstructionSelector::VisitF32x4Pmin(Node* node) { VisitMinOrMax(this, node, kIA32Minps, true); } diff --git a/www/iridium/files/patch-v8_src_diagnostics_perf-jit.cc b/www/iridium/files/patch-v8_src_diagnostics_perf-jit.cc index cf4e0d5eb397..dc52321f0bc4 100644 --- a/www/iridium/files/patch-v8_src_diagnostics_perf-jit.cc +++ b/www/iridium/files/patch-v8_src_diagnostics_perf-jit.cc @@ -1,9 +1,9 @@ ---- v8/src/diagnostics/perf-jit.cc.orig 2022-03-28 18:11:04 UTC +--- v8/src/diagnostics/perf-jit.cc.orig 2022-10-05 07:34:01 UTC +++ v8/src/diagnostics/perf-jit.cc @@ -30,7 +30,7 @@ #include "src/common/assert-scope.h" - // Only compile the {PerfJitLogger} on Linux. + // Only compile the {LinuxPerfJitLogger} on Linux. -#if V8_OS_LINUX +#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) diff --git a/www/iridium/files/patch-v8_src_diagnostics_perf-jit.h b/www/iridium/files/patch-v8_src_diagnostics_perf-jit.h index c6f0e051afb2..1504da917937 100644 --- a/www/iridium/files/patch-v8_src_diagnostics_perf-jit.h +++ b/www/iridium/files/patch-v8_src_diagnostics_perf-jit.h @@ -1,9 +1,9 @@ ---- v8/src/diagnostics/perf-jit.h.orig 2022-03-28 18:11:04 UTC +--- v8/src/diagnostics/perf-jit.h.orig 2022-10-05 07:34:01 UTC +++ v8/src/diagnostics/perf-jit.h @@ -31,7 +31,7 @@ #include "include/v8config.h" - // {PerfJitLogger} is only implemented on Linux. + // {LinuxPerfJitLogger} is only implemented on Linux. -#if V8_OS_LINUX +#if defined(V8_OS_LINUX) || defined(V8_OS_BSD) diff --git a/www/iridium/files/patch-v8_src_sandbox_sandbox.cc b/www/iridium/files/patch-v8_src_sandbox_sandbox.cc new file mode 100644 index 000000000000..1a33b2904aa0 --- /dev/null +++ b/www/iridium/files/patch-v8_src_sandbox_sandbox.cc @@ -0,0 +1,11 @@ +--- v8/src/sandbox/sandbox.cc.orig 2022-10-05 07:34:01 UTC ++++ v8/src/sandbox/sandbox.cc +@@ -49,7 +49,7 @@ static Address DetermineAddressSpaceLimit() { + } + #endif // V8_TARGET_ARCH_X64 + +-#if defined(V8_TARGET_ARCH_ARM64) && defined(V8_TARGET_OS_ANDROID) ++#if defined(V8_TARGET_ARCH_ARM64) && (defined(V8_TARGET_OS_ANDROID) || defined(V8_TARGET_OS_OPENBSD)) + // On Arm64 Android assume a 40-bit virtual address space (39 bits for + // userspace and kernel each) as that appears to be the most common + // configuration and there seems to be no easy way to retrieve the actual diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h index a7f9e90559e4..13945e9718e5 100644 --- a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h +++ b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.h @@ -1,4 +1,4 @@ ---- v8/src/trap-handler/handler-inside-posix.h.orig 2022-03-28 18:11:04 UTC +--- v8/src/trap-handler/handler-inside-posix.h.orig 2022-10-05 07:34:01 UTC +++ v8/src/trap-handler/handler-inside-posix.h @@ -13,7 +13,7 @@ namespace v8 { namespace internal { @@ -7,5 +7,5 @@ -#if V8_OS_LINUX || V8_OS_FREEBSD +#if V8_OS_LINUX || V8_OS_FREEBSD || V8_OS_OPENBSD constexpr int kOobSignal = SIGSEGV; - #elif V8_OS_MACOSX + #elif V8_OS_DARWIN constexpr int kOobSignal = SIGBUS; diff --git a/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h b/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h index 20f9caba88e9..75dfcdd81414 100644 --- a/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h +++ b/www/iridium/files/patch-v8_src_trap-handler_trap-handler.h @@ -1,11 +1,11 @@ ---- v8/src/trap-handler/trap-handler.h.orig 2022-03-28 18:11:04 UTC +--- v8/src/trap-handler/trap-handler.h.orig 2022-10-05 07:34:01 UTC +++ v8/src/trap-handler/trap-handler.h @@ -20,7 +20,7 @@ namespace trap_handler { // X64 on Linux, Windows, MacOS, FreeBSD. #if V8_HOST_ARCH_X64 && V8_TARGET_ARCH_X64 && \ - ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_MACOSX || \ + ((V8_OS_LINUX && !V8_OS_ANDROID) || V8_OS_WIN || V8_OS_DARWIN || \ - V8_OS_FREEBSD) + V8_OS_FREEBSD || V8_OS_OPENBSD) #define V8_TRAP_HANDLER_SUPPORTED true // Arm64 (non-simulator) on Mac. - #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_MACOSX + #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && V8_OS_DARWIN diff --git a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h index f71ea17c7d38..6c868842b1ea 100644 --- a/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h +++ b/www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h @@ -1,33 +1,33 @@ ---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-04-01 07:48:30 UTC +--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2022-10-05 07:34:01 UTC +++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h -@@ -434,7 +434,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst +@@ -432,7 +432,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst } void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr, - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, - LoadType type, LiftoffRegList pinned, - uint32_t* protected_load_pc, bool is_load_mem, - bool i64_offset) { -@@ -511,7 +511,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis + LoadType type, uint32_t* protected_load_pc, + bool /* is_load_mem */, bool i64_offset) { + // Offsets >=2GB are statically OOB on 32-bit systems. +@@ -508,7 +508,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis } void LiftoffAssembler::Store(Register dst_addr, Register offset_reg, - uint32_t offset_imm, LiftoffRegister src, + uintptr_t offset_imm, LiftoffRegister src, StoreType type, LiftoffRegList pinned, - uint32_t* protected_store_pc, bool is_store_mem) { - DCHECK_EQ(type.value_type() == kWasmI64, src.is_gp_pair()); -@@ -579,7 +579,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist + uint32_t* protected_store_pc, + bool /* is_store_mem */, bool /* i64_offset */) { +@@ -577,7 +577,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist } void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr, - Register offset_reg, uint32_t offset_imm, + Register offset_reg, uintptr_t offset_imm, - LoadType type, LiftoffRegList pinned) { + LoadType type, LiftoffRegList /* pinned */) { if (type.value() != LoadType::kI64Load) { - Load(dst, src_addr, offset_reg, offset_imm, type, pinned, nullptr, true); -@@ -598,7 +598,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, + Load(dst, src_addr, offset_reg, offset_imm, type, nullptr, true); +@@ -596,7 +596,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, } void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg, @@ -36,7 +36,7 @@ StoreType type, LiftoffRegList pinned) { DCHECK_NE(offset_reg, no_reg); DCHECK_LE(offset_imm, std::numeric_limits<int32_t>::max()); -@@ -940,7 +940,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino +@@ -936,7 +936,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino } // namespace liftoff void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg, @@ -45,7 +45,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAdd, dst_addr, offset_reg, -@@ -953,7 +953,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re +@@ -949,7 +949,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re } void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg, @@ -54,7 +54,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kSub, dst_addr, offset_reg, -@@ -965,7 +965,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re +@@ -961,7 +961,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re } void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg, @@ -63,7 +63,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kAnd, dst_addr, offset_reg, -@@ -978,7 +978,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re +@@ -974,7 +974,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re } void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg, @@ -72,7 +72,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kOr, dst_addr, offset_reg, offset_imm, -@@ -991,7 +991,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg +@@ -987,7 +987,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg } void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg, @@ -81,7 +81,7 @@ LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { liftoff::AtomicBinop64(this, liftoff::kXor, dst_addr, offset_reg, -@@ -1004,7 +1004,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re +@@ -1000,7 +1000,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re } void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg, @@ -90,7 +90,7 @@ LiftoffRegister value, LiftoffRegister result, StoreType type) { if (type.value() == StoreType::kI64Store) { -@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add +@@ -1014,7 +1014,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add } void LiftoffAssembler::AtomicCompareExchange( diff --git a/www/iridium/files/patch-v8_tools_run.py b/www/iridium/files/patch-v8_tools_run.py index 44e49b76dadd..ae5d2f657e6c 100644 --- a/www/iridium/files/patch-v8_tools_run.py +++ b/www/iridium/files/patch-v8_tools_run.py @@ -1,6 +1,6 @@ ---- v8/tools/run.py.orig 2022-03-28 18:11:04 UTC +--- v8/tools/run.py.orig 2022-10-05 07:34:01 UTC +++ v8/tools/run.py -@@ -11,7 +11,7 @@ from __future__ import print_function +@@ -9,7 +9,7 @@ scripts.""" import subprocess import sys diff --git a/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc b/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc index 7d911de75214..ddd56c0f7eef 100644 --- a/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc +++ b/www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/browser_main_parts_impl.cc.orig 2022-04-01 07:48:30 UTC +--- weblayer/browser/browser_main_parts_impl.cc.orig 2022-10-05 07:34:01 UTC +++ weblayer/browser/browser_main_parts_impl.cc -@@ -78,7 +78,7 @@ +@@ -79,7 +79,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. @@ -9,7 +9,7 @@ #include "ui/base/ime/init/input_method_initializer.h" #endif -@@ -196,7 +196,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { +@@ -195,7 +195,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() { // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. diff --git a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc index ebaec6de462f..bad09e654521 100644 --- a/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc +++ b/www/iridium/files/patch-weblayer_browser_content__browser__client__impl.cc @@ -1,6 +1,6 @@ ---- weblayer/browser/content_browser_client_impl.cc.orig 2022-04-01 07:48:30 UTC +--- weblayer/browser/content_browser_client_impl.cc.orig 2022-10-05 07:34:01 UTC +++ weblayer/browser/content_browser_client_impl.cc -@@ -153,7 +153,7 @@ +@@ -156,7 +156,7 @@ // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ @@ -9,7 +9,7 @@ #include "content/public/common/content_descriptors.h" #endif -@@ -1000,7 +1000,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe +@@ -1010,7 +1010,7 @@ SafeBrowsingService* ContentBrowserClientImpl::GetSafe // TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is // complete. #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \ diff --git a/www/iridium/pkg-plist b/www/iridium/pkg-plist index d881331f19ee..48c1c36bb8a0 100644 --- a/www/iridium/pkg-plist +++ b/www/iridium/pkg-plist @@ -4,7 +4,6 @@ bin/iridium %%DATADIR%%/chrome_200_percent.pak %%DATADIR%%/headless_lib_data.pak %%DATADIR%%/headless_lib_strings.pak -%%DATADIR%%/icudtl.dat %%DATADIR%%/libEGL.so %%DATADIR%%/libGLESv2.so %%DATADIR%%/libVkICD_mock_icd.so @@ -15,6 +14,8 @@ bin/iridium %%DATADIR%%/locales/ar.pak.info %%DEBUG%%%%DATADIR%%/locales/ar-XB.pak %%DEBUG%%%%DATADIR%%/locales/ar-XB.pak.info +%%DATADIR%%/locales/af.pak +%%DATADIR%%/locales/af.pak.info %%DATADIR%%/locales/bg.pak %%DATADIR%%/locales/bg.pak.info %%DATADIR%%/locales/bn.pak @@ -113,6 +114,8 @@ bin/iridium %%DATADIR%%/locales/tr.pak.info %%DATADIR%%/locales/uk.pak %%DATADIR%%/locales/uk.pak.info +%%DATADIR%%/locales/ur.pak +%%DATADIR%%/locales/ur.pak.info %%DATADIR%%/locales/vi.pak %%DATADIR%%/locales/vi.pak.info %%DATADIR%%/locales/zh-CN.pak @@ -127,8 +130,6 @@ bin/iridium %%DATADIR%%/resources/inspector_overlay/main.js %%DATADIR%%/snapshot_blob.bin %%NOT_AARCH64%%%%DATADIR%%/libvk_swiftshader.so -%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libEGL.so -%%NOT_AARCH64%%%%DATADIR%%/swiftshader/libGLESv2.so %%DATADIR%%/v8_context_snapshot.bin %%DEBUG%%%%DATADIR%%/character_data_generator %%DEBUG%%%%DATADIR%%/libVkLayer_khronos_validation.so |