summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <rnagy@FreeBSD.org>2023-07-25 08:32:19 +0200
committerRobert Nagy <rnagy@FreeBSD.org>2023-07-25 12:39:06 +0200
commit2f85e0aed6882f5be23adf89be70ce5f327d3373 (patch)
tree3ef44960af9cc5ef7a05ed9dc3378cd2540ea68c
parentemulators/wine: fix packaging with ALSA enabled (diff)
www/iridium: update to 2023.07.115.1
-rw-r--r--www/iridium/Makefile58
-rw-r--r--www/iridium/distinfo10
-rw-r--r--www/iridium/files/patch-BUILD.gn82
-rw-r--r--www/iridium/files/patch-ash_display_mirror__window__controller.cc4
-rw-r--r--www/iridium/files/patch-base_BUILD.gn22
-rw-r--r--www/iridium/files/patch-base_allocator_dispatcher_tls.h4
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_page__allocator.h4
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__constants.h4
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h4
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_partition__address__space.cc4
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni14
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h32
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h8
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h13
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_partition__page.h4
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc10
-rw-r--r--www/iridium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc6
-rw-r--r--www/iridium/files/patch-base_base__switches.cc4
-rw-r--r--www/iridium/files/patch-base_base__switches.h4
-rw-r--r--www/iridium/files/patch-base_compiler__specific.h35
-rw-r--r--www/iridium/files/patch-base_debug_stack__trace__posix.cc6
-rw-r--r--www/iridium/files/patch-base_files_file__path__watcher__unittest.cc8
-rw-r--r--www/iridium/files/patch-base_files_file__util__posix.cc4
-rw-r--r--www/iridium/files/patch-base_files_file__util__unittest.cc6
-rw-r--r--www/iridium/files/patch-base_memory_madv__free__discardable__memory__posix.cc6
-rw-r--r--www/iridium/files/patch-base_memory_platform__shared__memory__region.h4
-rw-r--r--www/iridium/files/patch-base_process_launch.h4
-rw-r--r--www/iridium/files/patch-base_process_process__metrics.cc8
-rw-r--r--www/iridium/files/patch-base_process_process__metrics.h32
-rw-r--r--www/iridium/files/patch-base_process_process__metrics__posix.cc6
-rw-r--r--www/iridium/files/patch-base_process_process__unittest.cc4
-rw-r--r--www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc4
-rw-r--r--www/iridium/files/patch-base_rand__util.h4
-rw-r--r--www/iridium/files/patch-base_system_sys__info.cc4
-rw-r--r--www/iridium/files/patch-base_system_sys__info.h8
-rw-r--r--www/iridium/files/patch-base_test_launcher_test__launcher.cc4
-rw-r--r--www/iridium/files/patch-base_threading_platform__thread__unittest.cc8
-rw-r--r--www/iridium/files/patch-build_config_compiler_BUILD.gn53
-rw-r--r--www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn19
-rw-r--r--www/iridium/files/patch-build_config_rust.gni11
-rw-r--r--www/iridium/files/patch-build_linux_unbundle_replace__gn__files.py10
-rw-r--r--www/iridium/files/patch-build_toolchain_gcc__toolchain.gni4
-rw-r--r--www/iridium/files/patch-cc_BUILD.gn8
-rw-r--r--www/iridium/files/patch-chrome_app_app__management__strings.grdp4
-rw-r--r--www/iridium/files/patch-chrome_app_chrome__command__ids.h12
-rw-r--r--www/iridium/files/patch-chrome_app_chrome__main.cc20
-rw-r--r--www/iridium/files/patch-chrome_app_chrome__main__delegate.cc27
-rw-r--r--www/iridium/files/patch-chrome_app_chromium__strings.grd22
-rw-r--r--www/iridium/files/patch-chrome_app_generated__resources.grd34
-rw-r--r--www/iridium/files/patch-chrome_app_google__chrome__strings.grd20
-rw-r--r--www/iridium/files/patch-chrome_app_profiles__strings.grdp4
-rw-r--r--www/iridium/files/patch-chrome_app_settings__strings.grdp6
-rw-r--r--www/iridium/files/patch-chrome_app_theme_chrome__unscaled__resources.grd6
-rw-r--r--www/iridium/files/patch-chrome_browser_about__flags.cc72
-rw-r--r--www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc11
-rw-r--r--www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h10
-rw-r--r--www/iridium/files/patch-chrome_browser_background_background__mode__manager.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_browser__features.cc10
-rw-r--r--www/iridium/files/patch-chrome_browser_browser__process__impl.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_browser__process__impl.h4
-rw-r--r--www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc16
-rw-r--r--www/iridium/files/patch-chrome_browser_chrome__browser__main.cc27
-rw-r--r--www/iridium/files/patch-chrome_browser_chrome__browser__main__linux.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_chrome__content__browser__client.cc42
-rw-r--r--www/iridium/files/patch-chrome_browser_chrome__content__browser__client.h4
-rw-r--r--www/iridium/files/patch-chrome_browser_defaults.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_dev__ui__browser__resources.grd4
-rw-r--r--www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc11
-rw-r--r--www/iridium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_download_download__item__model.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_download_download__prefs.cc24
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc20
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc82
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h56
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__prefs.cc11
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__connector__service__factory.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_device__trust__service__factory.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_device__trust_signals_signals__service__factory.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_browser__crash__event__router.cc18
-rw-r--r--www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.h29
-rw-r--r--www/iridium/files/patch-chrome_browser_extensions_BUILD.gn4
-rw-r--r--www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc14
-rw-r--r--www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc16
-rw-r--r--www/iridium/files/patch-chrome_browser_flag__descriptions.cc49
-rw-r--r--www/iridium/files/patch-chrome_browser_flag__descriptions.h49
-rw-r--r--www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc10
-rw-r--r--www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc18
-rw-r--r--www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc16
-rw-r--r--www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__log__uploader.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.cc10
-rw-r--r--www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h10
-rw-r--r--www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc30
-rw-r--r--www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h6
-rw-r--r--www/iridium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc30
-rw-r--r--www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc16
-rw-r--r--www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h6
-rw-r--r--www/iridium/files/patch-chrome_browser_password__manager_password__reuse__manager__factory.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc85
-rw-r--r--www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc20
-rw-r--r--www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc37
-rw-r--r--www/iridium/files/patch-chrome_browser_prefs_pref__service__incognito__allowlist.cc12
-rw-r--r--www/iridium/files/patch-chrome_browser_printing_print__backend__service__manager.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_printing_printer__query.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc34
-rw-r--r--www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc19
-rw-r--r--www/iridium/files/patch-chrome_browser_profiles_profiles__state.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html10
-rw-r--r--www/iridium/files/patch-chrome_browser_resources_settings_route.ts4
-rw-r--r--www/iridium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html56
-rw-r--r--www/iridium/files/patch-chrome_browser_safe__browsing_cloud__content__scanning_binary__upload__service.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc20
-rw-r--r--www/iridium/files/patch-chrome_browser_sync_chrome__sync__client.cc14
-rw-r--r--www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h10
-rw-r--r--www/iridium/files/patch-chrome_browser_task__manager_sampling_task__manager__impl.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_themes_theme__service.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_themes_theme__service__factory.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_browser__command__controller.cc27
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc22
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_chrome__pages.h4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_managed__ui.cc11
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc11
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_signin__view__controller.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc20
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc20
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_ui__features.cc11
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_ui__features.h11
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_accelerator__table.cc10
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc12
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h6
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_browser__non__client__frame__view__factory__views.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_browser__view.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_opaque__browser__frame__view.cc10
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc28
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h6
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc24
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc14
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc11
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc42
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_webui_about__ui.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc16
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc18
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc8
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc20
-rw-r--r--www/iridium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc20
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_extension__status__utils.h4
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_extensions_extension__status__utils.cc6
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc92
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h34
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc11
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h8
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.h4
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut__manager.cc4
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc128
-rw-r--r--www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h38
-rw-r--r--www/iridium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc4
-rw-r--r--www/iridium/files/patch-chrome_common_channel__info.h11
-rw-r--r--www/iridium/files/patch-chrome_common_channel__info__posix.cc13
-rw-r--r--www/iridium/files/patch-chrome_common_chrome__features.cc16
-rw-r--r--www/iridium/files/patch-chrome_common_chrome__features.h8
-rw-r--r--www/iridium/files/patch-chrome_common_chrome__paths.cc26
-rw-r--r--www/iridium/files/patch-chrome_common_chrome__paths__internal.h4
-rw-r--r--www/iridium/files/patch-chrome_common_chrome__switches.cc4
-rw-r--r--www/iridium/files/patch-chrome_common_chrome__switches.h4
-rw-r--r--www/iridium/files/patch-chrome_common_pref__names.cc24
-rw-r--r--www/iridium/files/patch-chrome_common_pref__names.h26
-rw-r--r--www/iridium/files/patch-chrome_common_url__constants.cc4
-rw-r--r--www/iridium/files/patch-chrome_common_url__constants.h4
-rw-r--r--www/iridium/files/patch-chrome_common_webui__url__constants.cc12
-rw-r--r--www/iridium/files/patch-chrome_common_webui__url__constants.h8
-rw-r--r--www/iridium/files/patch-chrome_renderer_chrome__render__frame__observer.cc4
-rw-r--r--www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc10
-rw-r--r--www/iridium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc4
-rw-r--r--www/iridium/files/patch-chrome_test_BUILD.gn10
-rw-r--r--www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc4
-rw-r--r--www/iridium/files/patch-chrome_test_chromedriver_chrome_client__hints.h10
-rw-r--r--www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc11
-rw-r--r--www/iridium/files/patch-chrome_updater_configurator.cc10
-rw-r--r--www/iridium/files/patch-chrome_updater_util_posix__util.cc4
-rw-r--r--www/iridium/files/patch-chrome_utility_services.cc6
-rw-r--r--www/iridium/files/patch-chromecast_browser_cast__browser__main__parts.cc8
-rw-r--r--www/iridium/files/patch-chromecast_browser_cast__content__browser__client.cc4
-rw-r--r--www/iridium/files/patch-components_autofill_core_browser_personal__data__manager.cc4
-rw-r--r--www/iridium/files/patch-components_autofill_core_common_autofill__payments__features.cc4
-rw-r--r--www/iridium/files/patch-components_crash_core_app_BUILD.gn10
-rw-r--r--www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc12
-rw-r--r--www/iridium/files/patch-components_crash_core_common_BUILD.gn4
-rw-r--r--www/iridium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h11
-rw-r--r--www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator.h11
-rw-r--r--www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc11
-rw-r--r--www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h11
-rw-r--r--www/iridium/files/patch-components_device__signals_core_browser_user__permission__service.h11
-rw-r--r--www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc11
-rw-r--r--www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h11
-rw-r--r--www/iridium/files/patch-components_device__signals_test_signals__contract.cc4
-rw-r--r--www/iridium/files/patch-components_embedder__support_user__agent__utils__unittest.cc6
-rw-r--r--www/iridium/files/patch-components_feature__engagement_public_feature__configurations.cc12
-rw-r--r--www/iridium/files/patch-components_feature__engagement_public_feature__constants.cc14
-rw-r--r--www/iridium/files/patch-components_feature__engagement_public_feature__constants.h10
-rw-r--r--www/iridium/files/patch-components_feature__engagement_public_feature__list.cc14
-rw-r--r--www/iridium/files/patch-components_feature__engagement_public_feature__list.h28
-rw-r--r--www/iridium/files/patch-components_feed_core_v2_feed__network__impl__unittest.cc4
-rw-r--r--www/iridium/files/patch-components_feed_core_v2_proto__util.cc6
-rw-r--r--www/iridium/files/patch-components_feed_core_v2_test_proto__printer.cc4
-rw-r--r--www/iridium/files/patch-components_flags__ui_flags__state.cc4
-rw-r--r--www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc6
-rw-r--r--www/iridium/files/patch-components_live__caption_caption__util.cc13
-rw-r--r--www/iridium/files/patch-components_live__caption_caption__util.h11
-rw-r--r--www/iridium/files/patch-components_metrics_metrics__log.cc10
-rw-r--r--www/iridium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc4
-rw-r--r--www/iridium/files/patch-components_omnibox_browser_omnibox__edit__model.cc10
-rw-r--r--www/iridium/files/patch-components_os__crypt_keyring__util__linux.cc17
-rw-r--r--www/iridium/files/patch-components_os__crypt_sync_keyring__util__linux.cc26
-rw-r--r--www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc (renamed from www/iridium/files/patch-components_os__crypt_libsecret__util__linux.cc)19
-rw-r--r--www/iridium/files/patch-components_os__crypt_sync_os__crypt.h (renamed from www/iridium/files/patch-components_os__crypt_os__crypt.h)4
-rw-r--r--www/iridium/files/patch-components_password__manager_core_browser_login__database.cc8
-rw-r--r--www/iridium/files/patch-components_password__manager_core_browser_login__database__unittest.cc8
-rw-r--r--www/iridium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc6
-rw-r--r--www/iridium/files/patch-components_password__manager_core_common_password__manager__features.cc8
-rw-r--r--www/iridium/files/patch-components_password__manager_core_common_password__manager__features.h10
-rw-r--r--www/iridium/files/patch-components_performance__manager_public_features.h4
-rw-r--r--www/iridium/files/patch-components_policy_core_browser_policy__pref__mapping__test.cc4
-rw-r--r--www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc4
-rw-r--r--www/iridium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc4
-rw-r--r--www/iridium/files/patch-components_policy_tools_template__writers_writer__configuration.py11
-rw-r--r--www/iridium/files/patch-components_power__metrics_BUILD.gn11
-rw-r--r--www/iridium/files/patch-components_power__metrics_energy__metrics__provider.cc21
-rw-r--r--www/iridium/files/patch-components_safe__browsing_core_browser_db_v4__protocol__manager__util.cc4
-rw-r--r--www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc6
-rw-r--r--www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h20
-rw-r--r--www/iridium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.h4
-rw-r--r--www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc29
-rw-r--r--www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc11
-rw-r--r--www/iridium/files/patch-components_translate_core_browser_translate__ui__languages__manager.h10
-rw-r--r--www/iridium/files/patch-components_update__client_update__query__params.cc4
-rw-r--r--www/iridium/files/patch-components_user__education_views_help__bubble__view.cc11
-rw-r--r--www/iridium/files/patch-components_viz_common_gpu_dawn__context__provider.cc10
-rw-r--r--www/iridium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc4
-rw-r--r--www/iridium/files/patch-components_viz_service_display_skia__renderer.cc4
-rw-r--r--www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc6
-rw-r--r--www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h4
-rw-r--r--www/iridium/files/patch-content_app_content__main__runner__impl.cc64
-rw-r--r--www/iridium/files/patch-content_browser_BUILD.gn6
-rw-r--r--www/iridium/files/patch-content_browser_browser__child__process__host__impl.cc4
-rw-r--r--www/iridium/files/patch-content_browser_browser__main__loop.cc6
-rw-r--r--www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc11
-rw-r--r--www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h11
-rw-r--r--www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc11
-rw-r--r--www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h20
-rw-r--r--www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc20
-rw-r--r--www/iridium/files/patch-content_browser_gpu_gpu__process__host.cc6
-rw-r--r--www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.cc20
-rw-r--r--www/iridium/files/patch-content_browser_media_media__interface__proxy.cc20
-rw-r--r--www/iridium/files/patch-content_browser_network__service__instance__impl.cc6
-rw-r--r--www/iridium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc4
-rw-r--r--www/iridium/files/patch-content_browser_renderer__host_delegated__frame__host.cc4
-rw-r--r--www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc32
-rw-r--r--www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.h31
-rw-r--r--www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc4
-rw-r--r--www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc12
-rw-r--r--www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.h4
-rw-r--r--www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc4
-rw-r--r--www/iridium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc14
-rw-r--r--www/iridium/files/patch-content_browser_utility__process__host.cc56
-rw-r--r--www/iridium/files/patch-content_browser_utility__process__host.h20
-rw-r--r--www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc19
-rw-r--r--www/iridium/files/patch-content_browser_utility__sandbox__delegate.cc6
-rw-r--r--www/iridium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc4
-rw-r--r--www/iridium/files/patch-content_child_child__process.cc14
-rw-r--r--www/iridium/files/patch-content_common_BUILD.gn4
-rw-r--r--www/iridium/files/patch-content_gpu_BUILD.gn20
-rw-r--r--www/iridium/files/patch-content_gpu_gpu__main.cc12
-rw-r--r--www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.cc72
-rw-r--r--www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.h19
-rw-r--r--www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc70
-rw-r--r--www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc4
-rw-r--r--www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h18
-rw-r--r--www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc6
-rw-r--r--www/iridium/files/patch-content_public_browser_render__process__host.h20
-rw-r--r--www/iridium/files/patch-content_public_common_content__features.cc12
-rw-r--r--www/iridium/files/patch-content_public_common_content__features.h8
-rw-r--r--www/iridium/files/patch-content_public_common_content__switches.cc6
-rw-r--r--www/iridium/files/patch-content_public_common_content__switches.h8
-rw-r--r--www/iridium/files/patch-content_public_test_mock__render__process__host.h11
-rw-r--r--www/iridium/files/patch-content_renderer_BUILD.gn6
-rw-r--r--www/iridium/files/patch-content_renderer_render__process__impl.cc10
-rw-r--r--www/iridium/files/patch-content_renderer_render__thread__impl.cc10
-rw-r--r--www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.cc17
-rw-r--r--www/iridium/files/patch-content_renderer_renderer__blink__platform__impl.h22
-rw-r--r--www/iridium/files/patch-content_shell_BUILD.gn4
-rw-r--r--www/iridium/files/patch-content_shell_app_shell__main__delegate.cc4
-rw-r--r--www/iridium/files/patch-content_shell_browser_shell__browser__main__parts.cc6
-rw-r--r--www/iridium/files/patch-content_test_BUILD.gn6
-rw-r--r--www/iridium/files/patch-content_utility_services.cc32
-rw-r--r--www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h4
-rw-r--r--www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc4
-rw-r--r--www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h17
-rw-r--r--www/iridium/files/patch-content_utility_utility__main.cc34
-rw-r--r--www/iridium/files/patch-content_zygote_zygote__main__linux.cc20
-rw-r--r--www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc12
-rw-r--r--www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc4
-rw-r--r--www/iridium/files/patch-extensions_browser_api_messaging_message__service.cc6
-rw-r--r--www/iridium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc4
-rw-r--r--www/iridium/files/patch-extensions_browser_extension__prefs.cc11
-rw-r--r--www/iridium/files/patch-extensions_browser_pref__names.cc11
-rw-r--r--www/iridium/files/patch-extensions_browser_pref__names.h11
-rw-r--r--www/iridium/files/patch-extensions_common_api___permission__features.json12
-rw-r--r--www/iridium/files/patch-extensions_common_api_runtime.json4
-rw-r--r--www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc6
-rw-r--r--www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc8
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc6
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc4
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc4
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing.cc6
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc14
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc4
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc10
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc6
-rw-r--r--www/iridium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc8
-rw-r--r--www/iridium/files/patch-gpu_config_gpu__finch__features.cc6
-rw-r--r--www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc4
-rw-r--r--www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.h6
-rw-r--r--www/iridium/files/patch-gpu_ipc_service_gpu__init.cc33
-rw-r--r--www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.cc6
-rw-r--r--www/iridium/files/patch-gpu_vulkan_vulkan__device__queue.h4
-rw-r--r--www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc11
-rw-r--r--www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h8
-rw-r--r--www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc14
-rw-r--r--www/iridium/files/patch-headless_lib_browser_headless__web__contents__impl.cc4
-rw-r--r--www/iridium/files/patch-headless_lib_browser_policy_headless__browser__policy__connector.cc4
-rw-r--r--www/iridium/files/patch-headless_lib_headless__content__main__delegate.cc4
-rw-r--r--www/iridium/files/patch-ipc_ipc__message__utils.cc4
-rw-r--r--www/iridium/files/patch-media_BUILD.gn4
-rw-r--r--www/iridium/files/patch-media_audio_BUILD.gn4
-rw-r--r--www/iridium/files/patch-media_audio_audio__input__device.cc4
-rw-r--r--www/iridium/files/patch-media_audio_sndio_sndio__input.cc4
-rw-r--r--www/iridium/files/patch-media_base_media__switches.cc33
-rw-r--r--www/iridium/files/patch-media_base_media__switches.h13
-rw-r--r--www/iridium/files/patch-media_base_video__frame.cc14
-rw-r--r--www/iridium/files/patch-media_base_video__frame.h8
-rw-r--r--www/iridium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc4
-rw-r--r--www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.cc27
-rw-r--r--www/iridium/files/patch-media_capture_video_linux_v4l2__capture__delegate.h13
-rw-r--r--www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc8
-rw-r--r--www/iridium/files/patch-media_capture_video_video__capture__device__client.cc20
-rw-r--r--www/iridium/files/patch-media_gpu_buffer__validation.cc4
-rw-r--r--www/iridium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc15
-rw-r--r--www/iridium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc4
-rw-r--r--www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.cc10
-rw-r--r--www/iridium/files/patch-media_gpu_sandbox_hardware__video__decoding__sandbox__hook__linux.h4
-rw-r--r--www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc7
-rw-r--r--www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h4
-rw-r--r--www/iridium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc4
-rw-r--r--www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc8
-rw-r--r--www/iridium/files/patch-media_media__options.gni6
-rw-r--r--www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.cc15
-rw-r--r--www/iridium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h4
-rw-r--r--www/iridium/files/patch-media_video_gpu__memory__buffer__video__frame__pool.cc8
-rw-r--r--www/iridium/files/patch-media_video_video__encode__accelerator__adapter.cc4
-rw-r--r--www/iridium/files/patch-media_video_video__encode__accelerator__adapter__test.cc4
-rw-r--r--www/iridium/files/patch-mojo_core_BUILD.gn4
-rw-r--r--www/iridium/files/patch-mojo_core_embedder_features.h8
-rw-r--r--www/iridium/files/patch-mojo_public_tools_bindings_mojom.gni4
-rw-r--r--www/iridium/files/patch-net_BUILD.gn31
-rw-r--r--www/iridium/files/patch-net_base_network__change__notifier.cc6
-rw-r--r--www/iridium/files/patch-net_base_network__change__notifier__passive.cc (renamed from www/iridium/files/patch-net_base_network__change__notifier__posix.cc)8
-rw-r--r--www/iridium/files/patch-net_cert_cert__verifier.cc18
-rw-r--r--www/iridium/files/patch-net_cert_cert__verify__proc.cc10
-rw-r--r--www/iridium/files/patch-net_cert_cert__verify__proc.h10
-rw-r--r--www/iridium/files/patch-net_cert_cert__verify__proc__unittest.cc23
-rw-r--r--www/iridium/files/patch-net_cert_test__root__certs__unittest.cc18
-rw-r--r--www/iridium/files/patch-net_dns_address__sorter__posix.cc12
-rw-r--r--www/iridium/files/patch-net_http_http__auth__gssapi__posix.cc4
-rw-r--r--www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc12
-rw-r--r--www/iridium/files/patch-net_socket_tcp__socket__posix.cc4
-rw-r--r--www/iridium/files/patch-net_socket_udp__socket__posix.cc8
-rw-r--r--www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc10
-rw-r--r--www/iridium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc20
-rw-r--r--www/iridium/files/patch-net_url__request_url__request__context__builder.cc4
-rw-r--r--www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc4
-rw-r--r--www/iridium/files/patch-printing_backend_cups__ipp__helper.cc4
-rw-r--r--www/iridium/files/patch-printing_print__settings.cc24
-rw-r--r--www/iridium/files/patch-printing_print__settings.h6
-rw-r--r--www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc11
-rw-r--r--www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h4
-rw-r--r--www/iridium/files/patch-remoting_base_mojo__util.cc11
-rw-r--r--www/iridium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc4
-rw-r--r--www/iridium/files/patch-remoting_host_basic__desktop__environment.cc4
-rw-r--r--www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc6
-rw-r--r--www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc13
-rw-r--r--www/iridium/files/patch-remoting_host_host__attributes.cc6
-rw-r--r--www/iridium/files/patch-remoting_host_it2me_it2me__host.cc8
-rw-r--r--www/iridium/files/patch-remoting_host_policy__watcher.cc10
-rw-r--r--www/iridium/files/patch-sandbox_linux_BUILD.gn4
-rw-r--r--www/iridium/files/patch-sandbox_policy_features.cc8
-rw-r--r--www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc74
-rw-r--r--www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom8
-rw-r--r--www/iridium/files/patch-sandbox_policy_openbsd_sandbox__openbsd.cc157
-rw-r--r--www/iridium/files/patch-sandbox_policy_sandbox.cc4
-rw-r--r--www/iridium/files/patch-sandbox_policy_sandbox.h12
-rw-r--r--www/iridium/files/patch-sandbox_policy_sandbox__type.cc26
-rw-r--r--www/iridium/files/patch-sandbox_policy_switches.cc6
-rw-r--r--www/iridium/files/patch-sandbox_policy_switches.h6
-rw-r--r--www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.h4
-rw-r--r--www/iridium/files/patch-services_cert__verifier_cert__verifier__creation.cc14
-rw-r--r--www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc6
-rw-r--r--www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc4
-rw-r--r--www/iridium/files/patch-services_device_hid_BUILD.gn4
-rw-r--r--www/iridium/files/patch-services_device_public_mojom_BUILD.gn6
-rw-r--r--www/iridium/files/patch-services_network_BUILD.gn4
-rw-r--r--www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc45
-rw-r--r--www/iridium/files/patch-services_network_network__sandbox__hook__linux.h12
-rw-r--r--www/iridium/files/patch-services_network_network__service.cc6
-rw-r--r--www/iridium/files/patch-services_network_public_cpp_BUILD.gn11
-rw-r--r--www/iridium/files/patch-services_network_public_mojom_BUILD.gn25
-rw-r--r--www/iridium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h11
-rw-r--r--www/iridium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc16
-rw-r--r--www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn4
-rw-r--r--www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc38
-rw-r--r--www/iridium/files/patch-services_video__capture_video__capture__service__impl.h29
-rw-r--r--www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp4
-rw-r--r--www/iridium/files/patch-skia_ext_skcolorspace__trfn.cc11
-rw-r--r--www/iridium/files/patch-third__party_abseil-cpp_absl_base_config.h6
-rw-r--r--www/iridium/files/patch-third__party_angle_BUILD.gn8
-rw-r--r--www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h4
-rw-r--r--www/iridium/files/patch-third__party_angle_src_libANGLE_Display.cpp20
-rw-r--r--www/iridium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp4
-rw-r--r--www/iridium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h4
-rw-r--r--www/iridium/files/patch-third__party_angle_util_BUILD.gn4
-rw-r--r--www/iridium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc11
-rw-r--r--www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h4
-rw-r--r--www/iridium/files/patch-third__party_blink_public_platform_platform.h4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc22
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc6
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_core_layout_layout__view.cc10
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_core_paint_paint__layer.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni12
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_modules_peerconnection_webrtc__audio__renderer__test.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_BUILD.gn4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h12
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc15
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json529
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_scheduler_common_thread.cc4
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc11
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc11
-rw-r--r--www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc11
-rw-r--r--www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni18
-rw-r--r--www/iridium/files/patch-third__party_boringssl_BUILD.gn4
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl24
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl147
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl32
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c7
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl86
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl58
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl50
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl10
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl58
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl114
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl10
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl10
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl48
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl32
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl64
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86__64.pl18
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h12
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl26
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl36
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_perlasm_x86__64-xlate.pl24
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c36
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c12
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl58
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h14
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_include_openssl_thread.h10
-rw-r--r--www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py6
-rw-r--r--www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni (renamed from www/iridium/files/patch-third__party_ruy_BUILD.gn)10
-rw-r--r--www/iridium/files/patch-third__party_crc32c_BUILD.gn4
-rw-r--r--www/iridium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h4
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h752
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h2149
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm735
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h752
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h2149
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm735
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h752
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h2149
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py121
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm108
-rw-r--r--www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm23
-rw-r--r--www/iridium/files/patch-third__party_ipcz_src_reference__drivers_random.cc4
-rw-r--r--www/iridium/files/patch-third__party_libevent_event.h14
-rw-r--r--www/iridium/files/patch-third__party_opus_BUILD.gn10
-rw-r--r--www/iridium/files/patch-third__party_pdfium_core_fxge_cfx__fontmapper.cpp4
-rw-r--r--www/iridium/files/patch-third__party_pdfium_pdfium.gni4
-rw-r--r--www/iridium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h11
-rw-r--r--www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h (renamed from www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_track__event__legacy.h)6
-rw-r--r--www/iridium/files/patch-third__party_perfetto_src_tracing_core_tracing__service__impl.cc4
-rw-r--r--www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc11
-rw-r--r--www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_BUILD.gn4
-rw-r--r--www/iridium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h4
-rw-r--r--www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h (renamed from www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h)12
-rw-r--r--www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp17
-rw-r--r--www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h11
-rw-r--r--www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h15
-rw-r--r--www/iridium/files/patch-third__party_webrtc_BUILD.gn4
-rw-r--r--www/iridium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn4
-rw-r--r--www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc4
-rw-r--r--www/iridium/files/patch-third__party_webrtc_rtc__base_network.cc4
-rw-r--r--www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc16
-rw-r--r--www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h14
-rw-r--r--www/iridium/files/patch-third__party_zlib_BUILD.gn8
-rw-r--r--www/iridium/files/patch-tools_generate__shim__headers_generate__shim__headers.py21
-rw-r--r--www/iridium/files/patch-tools_gn_build_gen.py6
-rw-r--r--www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py4
-rw-r--r--www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn6
-rw-r--r--www/iridium/files/patch-ui_base_ime_fake__text__input__client.cc4
-rw-r--r--www/iridium/files/patch-ui_base_ime_fake__text__input__client.h4
-rw-r--r--www/iridium/files/patch-ui_base_ime_text__input__client.h4
-rw-r--r--www/iridium/files/patch-ui_base_resource_resource__bundle.cc6
-rw-r--r--www/iridium/files/patch-ui_base_test_skia__gold__pixel__diff.cc4
-rw-r--r--www/iridium/files/patch-ui_base_ui__base__features.cc15
-rw-r--r--www/iridium/files/patch-ui_base_ui__base__features.h11
-rw-r--r--www/iridium/files/patch-ui_base_webui_web__ui__util.cc13
-rw-r--r--www/iridium/files/patch-ui_color_color__id.h4
-rw-r--r--www/iridium/files/patch-ui_compositor_compositor.cc4
-rw-r--r--www/iridium/files/patch-ui_compositor_compositor.h4
-rw-r--r--www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc6
-rw-r--r--www/iridium/files/patch-ui_events_event.cc8
-rw-r--r--www/iridium/files/patch-ui_gfx_BUILD.gn4
-rw-r--r--www/iridium/files/patch-ui_gfx_codec_png__codec.cc6
-rw-r--r--www/iridium/files/patch-ui_gfx_font__list.cc11
-rw-r--r--www/iridium/files/patch-ui_gfx_native__widget__types.h12
-rw-r--r--www/iridium/files/patch-ui_gfx_switches.cc4
-rw-r--r--www/iridium/files/patch-ui_gfx_switches.h4
-rw-r--r--www/iridium/files/patch-ui_gl_BUILD.gn10
-rw-r--r--www/iridium/files/patch-ui_gl_gl__bindings.h4
-rw-r--r--www/iridium/files/patch-ui_gl_gl__context.cc4
-rw-r--r--www/iridium/files/patch-ui_gl_gl__implementation.cc4
-rw-r--r--www/iridium/files/patch-ui_gl_gl__switches.cc4
-rw-r--r--www/iridium/files/patch-ui_native__theme_native__theme.h4
-rw-r--r--www/iridium/files/patch-ui_ozone_common_features.cc11
-rw-r--r--www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc4
-rw-r--r--www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h4
-rw-r--r--www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h4
-rw-r--r--www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc4
-rw-r--r--www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc4
-rw-r--r--www/iridium/files/patch-ui_ozone_public_ozone__platform.h4
-rw-r--r--www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc4
-rw-r--r--www/iridium/files/patch-ui_platform__window_platform__window__delegate.h4
-rw-r--r--www/iridium/files/patch-ui_views_controls_textfield_textfield.cc14
-rw-r--r--www/iridium/files/patch-ui_views_controls_textfield_textfield.h6
-rw-r--r--www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc4
-rw-r--r--www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc4
-rw-r--r--www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc8
-rw-r--r--www/iridium/files/patch-ui_views_widget_widget.cc6
-rw-r--r--www/iridium/files/patch-ui_views_widget_widget.h4
-rw-r--r--www/iridium/files/patch-ui_views_window_dialog__delegate.cc4
-rw-r--r--www/iridium/files/patch-v8_BUILD.gn8
-rw-r--r--www/iridium/files/patch-v8_include_v8-internal.h4
-rw-r--r--www/iridium/files/patch-v8_src_api_api.cc8
-rw-r--r--www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc4
-rw-r--r--www/iridium/files/patch-v8_src_base_platform_platform-posix.cc8
-rw-r--r--www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h13
-rw-r--r--www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc45
-rw-r--r--www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.cc42
-rw-r--r--www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h21
-rw-r--r--www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc20
-rw-r--r--www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h20
-rw-r--r--www/iridium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc6
-rw-r--r--www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc11
-rw-r--r--www/iridium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc11
-rw-r--r--www/iridium/files/patch-v8_src_execution_isolate.cc6
-rw-r--r--www/iridium/files/patch-v8_src_flags_flags.cc36
-rw-r--r--www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h14
-rw-r--r--www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc14
-rw-r--r--www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc22
-rw-r--r--www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h12
-rw-r--r--www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc16
-rw-r--r--www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc6
-rw-r--r--www/iridium/files/patch-v8_src_trap-handler_trap-handler.h6
-rw-r--r--www/iridium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h30
-rw-r--r--www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc51
-rw-r--r--www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h16
-rw-r--r--www/iridium/files/patch-weblayer_browser_browser__main__parts__impl.cc6
612 files changed, 5273 insertions, 13235 deletions
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index afe6cb7b3570..d8a689a79fb8 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -1,6 +1,5 @@
PORTNAME= iridium
-PORTVERSION= 2023.04.112.2
-PORTREVISION= 2
+PORTVERSION= 2023.07.115.1
CATEGORIES= www wayland
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX= -browser
@@ -16,7 +15,7 @@ LICENSE_COMB= multi
ONLY_FOR_ARCHS= aarch64 amd64 i386
PATCH_SITES= https://nerd.hu/distfiles/
-PATCHFILES+= disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch:-p1
+PATCHFILES+= disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch:-p1
BUILD_DEPENDS= bash:shells/bash \
${PYTHON_PKGNAMEPREFIX}Jinja2>0:devel/py-Jinja2@${PY_FLAVOR} \
@@ -55,6 +54,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
libexif.so:graphics/libexif \
libpng.so:graphics/png \
libwebp.so:graphics/webp \
+ libdav1d.so:multimedia/dav1d \
libopenh264.so:multimedia/openh264 \
libfreetype.so:print/freetype2 \
libharfbuzz.so:print/harfbuzz \
@@ -71,9 +71,9 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-core \
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 iconv:wchar_t jpeg \
- localbase:ldflags ninja perl5 pkgconfig python:build qt:5 shebangfix \
- tar:xz xorg
+USES= bison compiler:c++17-lang cpe desktop-file-utils gl gmake gnome \
+ iconv:wchar_t jpeg localbase:ldflags ninja perl5 pkgconfig \
+ python:build qt:5 shebangfix tar:xz xorg
CPE_VENDOR= google
CPE_PRODUCT= chrome
@@ -104,6 +104,7 @@ GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
enable_nacl=false \
enable_remoting=false \
+ enable_rust=false \
fatal_linker_warnings=false \
icu_use_data_file=false \
is_clang=true \
@@ -123,7 +124,8 @@ GN_ARGS+= clang_use_chrome_plugins=false \
use_system_libjpeg=true \
use_udev=false \
extra_cxxflags="${CXXFLAGS}" \
- extra_ldflags="${LDFLAGS}"
+ extra_ldflags="${LDFLAGS}" \
+ ffmpeg_branding="${FFMPEG_BRAND}"
# TODO: investigate building with these options:
# use_system_minigbm
@@ -151,10 +153,10 @@ ALSA_RUN_DEPENDS= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/al
ALSA_VARS= GN_ARGS+=use_alsa=true
ALSA_VARS_OFF= GN_ARGS+=use_alsa=false
-CODECS_VARS= GN_ARGS+=ffmpeg_branding="Chrome" \
- GN_ARGS+=proprietary_codecs=true
-CODECS_VARS_OFF= GN_ARGS+=ffmpeg_branding="Chromium" \
- GN_ARGS+=proprietary_codecs=false
+CODECS_VARS= GN_ARGS+=proprietary_codecs=true \
+ FFMPEG_BRAND="Chrome"
+CODECS_VARS_OFF= GN_ARGS+=proprietary_codecs=false \
+ FFMPEG_BRAND="Chromium"
CUPS_LIB_DEPENDS= libcups.so:print/cups
CUPS_VARS= GN_ARGS+=use_cups=true
@@ -202,8 +204,8 @@ 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} < 150
-LLVM_DEFAULT= 15
+.if ${COMPILER_VERSION} < 160
+LLVM_DEFAULT= 16
BUILD_DEPENDS+= clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
BINARY_ALIAS+= cpp=${LOCALBASE}/bin/clang-cpp${LLVM_DEFAULT} \
cc=${LOCALBASE}/bin/clang${LLVM_DEFAULT} \
@@ -216,13 +218,24 @@ BINARY_ALIAS+= ar=/usr/bin/llvm-ar \
nm=/usr/bin/llvm-nm
.endif
-# swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - swiftshader/lib/{libEGL.so,libGLESv2.so} is x86 only
+# - map ffmpeg target to ${ARCH}
.if ${ARCH} == aarch64
PLIST_SUB+= NOT_AARCH64="@comment "
-.else
+FFMPEG_TARGET= arm64
+.elif ${ARCH} == amd64
+BUILD_DEPENDS+= nasm:devel/nasm
+PLIST_SUB+= NOT_AARCH64=""
+FFMPEG_TARGET= x64
+.elif ${ARCH} == i386
+BUILD_DEPENDS+= nasm:devel/nasm
PLIST_SUB+= NOT_AARCH64=""
+FFMPEG_TARGET= ia32
.endif
+FFMPEG_BDIR= ${WRKSRC}/third_party/ffmpeg/build.${FFMPEG_TARGET}.freebsd/${FFMPEG_BRAND}
+FFMPEG_CDIR= ${WRKSRC}/third_party/ffmpeg/chromium/config/${FFMPEG_BRAND}/freebsd/${FFMPEG_TARGET}
+
# Allow relocations against read-only segments (override lld default)
LDFLAGS_i386= -Wl,-znotext
@@ -244,13 +257,16 @@ 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 icu libdrm libevent libpng \
- libusb libwebp libxml libxslt openh264 opus snappy || ${FALSE}
+ dav1d flac fontconfig freetype harfbuzz-ng icu libdrm libevent libpng \
+ libwebp libxml libxslt openh264 opus snappy || ${FALSE}
# Iridium uses an unreleased version of FFmpeg, so configure it
-.for brand in Chrome Chromium
- ${CP} -R \
- ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/linux/ \
- ${WRKSRC}/third_party/ffmpeg/chromium/config/${brand}/freebsd
+ cd ${WRKSRC}/third_party/ffmpeg && \
+ ${PYTHON_CMD} chromium/scripts/build_ffmpeg.py freebsd ${FFMPEG_TARGET} \
+ --config-only --branding=${FFMPEG_BRAND}
+ cd ${FFMPEG_BDIR} && ${GMAKE} ffversion.h
+ ${MKDIR} ${FFMPEG_CDIR}
+.for _e in config.h config.asm config_components.h libavcodec libavformat libavutil
+ -${CP} -pR ${FFMPEG_BDIR}/${_e} ${FFMPEG_CDIR}
.endfor
do-configure:
diff --git a/www/iridium/distinfo b/www/iridium/distinfo
index 9416812ec993..15abff8120f3 100644
--- a/www/iridium/distinfo
+++ b/www/iridium/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1682369682
-SHA256 (iridium-browser-2023.04.112.2.tar.xz) = 7d1baae65e0087045d3da89bd5e2e4967d733e202707b4abfdab02ad5f87c722
-SIZE (iridium-browser-2023.04.112.2.tar.xz) = 1427167196
-SHA256 (disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch) = c8cc1c6a6f735adfe807da0109349ebab87e0eff77f593925757da34bb31f38c
-SIZE (disable-privacy-sandbox-ce036275d9d21a8408ef48ee9839b3c21b8448ca.patch) = 4177
+TIMESTAMP = 1690214890
+SHA256 (iridium-browser-2023.07.115.1.tar.xz) = 3498f2018ad4d68ddce4f12224923b6eb5ae9b83fa4e912283c6e486b8a887d3
+SIZE (iridium-browser-2023.07.115.1.tar.xz) = 1416249736
+SHA256 (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = ea4bfcac8636c65d8933236b89429699a51c77837fa04863cb40f8c7add833b4
+SIZE (disable-privacy-sandbox-891b80bbfcdb15e8292143efd1715fa3f30662c4.patch) = 3559
diff --git a/www/iridium/files/patch-BUILD.gn b/www/iridium/files/patch-BUILD.gn
index a6ea8a6be61d..4cec7a58940d 100644
--- a/www/iridium/files/patch-BUILD.gn
+++ b/www/iridium/files/patch-BUILD.gn
@@ -1,6 +1,6 @@
---- BUILD.gn.orig 2023-04-22 17:45:15 UTC
+--- BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ BUILD.gn
-@@ -60,7 +60,7 @@ declare_args() {
+@@ -61,7 +61,7 @@ declare_args() {
root_extra_deps = []
}
@@ -9,49 +9,49 @@
# An official (maximally optimized!) component (optimized for build times)
# build doesn't make sense and usually doesn't work.
assert(!is_component_build)
-@@ -90,7 +90,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",
-@@ -423,7 +422,7 @@ group("gn_all") {
+@@ -95,7 +95,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",
+@@ -419,7 +418,7 @@ group("gn_all") {
+ }
}
- }
-- if (is_linux || is_chromeos || is_android) {
-+ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
- deps += [
- "//third_party/breakpad:breakpad_unittests",
- "//third_party/breakpad:core-2-minidump",
-@@ -622,6 +621,15 @@ group("gn_all") {
+- if (is_linux || is_chromeos || is_android) {
++ if ((is_linux && !is_bsd) || is_chromeos || is_android) {
+ deps += [
+ "//third_party/breakpad:breakpad_unittests",
+ "//third_party/breakpad:core-2-minidump",
+@@ -619,6 +618,15 @@ group("gn_all") {
+ }
}
- }
-+ if (is_bsd) {
-+ deps -= [
-+ "//third_party/breakpad:dump_syms($host_toolchain)",
-+ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
-+ "//third_party/breakpad:minidump_dump($host_toolchain)",
-+ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
-+ ]
-+ }
++ if (is_bsd) {
++ deps -= [
++ "//third_party/breakpad:dump_syms($host_toolchain)",
++ "//third_party/breakpad:microdump_stackwalk($host_toolchain)",
++ "//third_party/breakpad:minidump_dump($host_toolchain)",
++ "//third_party/breakpad:minidump_stackwalk($host_toolchain)",
++ ]
++ }
+
- if (is_mac) {
- deps += [
- "//third_party/breakpad:crash_inspector",
-@@ -670,7 +678,7 @@ group("gn_all") {
- host_os == "win") {
- deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+ if (is_mac) {
+ deps += [
+ "//third_party/breakpad:dump_syms",
+@@ -665,7 +673,7 @@ group("gn_all") {
+ host_os == "win") {
+ deps += [ "//chrome/test/mini_installer:mini_installer_tests" ]
+ }
+- } else if (!is_android && !is_ios && !is_fuchsia) {
++ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
+ deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-- } else if (!is_android && !is_ios && !is_fuchsia) {
-+ } else if (!is_android && !is_ios && !is_fuchsia && !is_bsd) {
- deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
- }
-@@ -1093,7 +1101,7 @@ if (!is_ios) {
+@@ -1094,7 +1102,7 @@ if (!is_ios && !is_cronet_build) {
]
}
@@ -60,7 +60,7 @@
# WPT Webdriver tests runner
# chrome/test/chromedriver/test/run_webdriver_tests.py
script_test("webdriver_wpt_tests") {
-@@ -1193,7 +1201,7 @@ if (!is_ios) {
+@@ -1194,7 +1202,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -69,7 +69,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1202,7 +1210,7 @@ if (!is_ios) {
+@@ -1203,7 +1211,7 @@ if (!is_ios && !is_cronet_build) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -78,7 +78,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1670,7 +1678,7 @@ group("chromium_builder_perf") {
+@@ -1671,7 +1679,7 @@ group("chromium_builder_perf") {
data_deps += [ "//chrome/test:performance_browser_tests" ]
}
diff --git a/www/iridium/files/patch-ash_display_mirror__window__controller.cc b/www/iridium/files/patch-ash_display_mirror__window__controller.cc
index 2496639afee7..f02f867a39c6 100644
--- a/www/iridium/files/patch-ash_display_mirror__window__controller.cc
+++ b/www/iridium/files/patch-ash_display_mirror__window__controller.cc
@@ -1,6 +1,6 @@
---- ash/display/mirror_window_controller.cc.orig 2022-12-01 10:35:46 UTC
+--- ash/display/mirror_window_controller.cc.orig 2023-07-24 14:27:53 UTC
+++ ash/display/mirror_window_controller.cc
-@@ -295,7 +295,11 @@ void MirrorWindowController::UpdateWindow(
+@@ -296,7 +296,11 @@ void MirrorWindowController::UpdateWindow(
if (!base::Contains(display_info_list, iter->first,
&display::ManagedDisplayInfo::id)) {
CloseAndDeleteHost(iter->second, true);
diff --git a/www/iridium/files/patch-base_BUILD.gn b/www/iridium/files/patch-base_BUILD.gn
index 2b260a2cac53..7499a556e825 100644
--- a/www/iridium/files/patch-base_BUILD.gn
+++ b/www/iridium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+--- base/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ base/BUILD.gn
-@@ -188,7 +188,7 @@ buildflag_header("ios_cronet_buildflags") {
+@@ -198,7 +198,7 @@ buildflag_header("ios_cronet_buildflags") {
flags = [ "CRONET_BUILD=$is_cronet_build" ]
}
@@ -9,7 +9,7 @@
buildflag_header("message_pump_buildflags") {
header = "message_pump_buildflags.h"
header_dir = "base/message_loop"
-@@ -1093,11 +1093,23 @@ component("base") {
+@@ -1099,11 +1099,23 @@ 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.
@@ -34,7 +34,7 @@
if (use_allocator_shim) {
sources += [
"allocator/partition_allocator/shim/allocator_shim.cc",
-@@ -1125,7 +1137,7 @@ component("base") {
+@@ -1131,7 +1143,7 @@ component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -43,7 +43,7 @@
sources += [
"allocator/partition_allocator/shim/allocator_shim_override_cpp_symbols.h",
"allocator/partition_allocator/shim/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1166,7 +1178,7 @@ component("base") {
+@@ -1172,7 +1184,7 @@ component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -52,7 +52,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2107,6 +2119,43 @@ component("base") {
+@@ -2130,6 +2142,43 @@ component("base") {
}
}
@@ -96,7 +96,7 @@
# iOS
if (is_ios) {
sources += [
-@@ -2202,7 +2251,7 @@ component("base") {
+@@ -2238,7 +2287,7 @@ component("base") {
}
if (dep_libevent) {
@@ -105,7 +105,7 @@
}
if (use_libevent) {
-@@ -3470,7 +3519,7 @@ test("base_unittests") {
+@@ -3552,7 +3601,7 @@ test("base_unittests") {
]
}
@@ -114,7 +114,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3519,7 +3568,7 @@ test("base_unittests") {
+@@ -3601,7 +3650,7 @@ test("base_unittests") {
"posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
]
@@ -123,7 +123,7 @@
sources += [
"profiler/stack_base_address_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3530,7 +3579,7 @@ test("base_unittests") {
+@@ -3612,7 +3661,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -132,7 +132,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3751,7 +3800,7 @@ test("base_unittests") {
+@@ -3837,7 +3886,7 @@ test("base_unittests") {
}
}
diff --git a/www/iridium/files/patch-base_allocator_dispatcher_tls.h b/www/iridium/files/patch-base_allocator_dispatcher_tls.h
index f2d8b63ecc1a..9b04ab4b38ee 100644
--- a/www/iridium/files/patch-base_allocator_dispatcher_tls.h
+++ b/www/iridium/files/patch-base_allocator_dispatcher_tls.h
@@ -1,6 +1,6 @@
---- base/allocator/dispatcher/tls.h.orig 2023-03-13 07:33:08 UTC
+--- base/allocator/dispatcher/tls.h.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/dispatcher/tls.h
-@@ -51,7 +51,7 @@ struct BASE_EXPORT MMapAllocator {
+@@ -50,7 +50,7 @@ struct BASE_EXPORT MMapAllocator {
partition_alloc::PartitionPageSize();
#elif BUILDFLAG(IS_APPLE)
constexpr static size_t AllocationChunkSize = 16384;
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 5305a3c68753..3f348d2d66b4 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,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator.h.orig 2022-12-06 08:09:13 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/page_allocator.h
-@@ -231,7 +231,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
+@@ -241,7 +241,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
// recommitted. Do not assume that this will not change over time.
constexpr PA_COMPONENT_EXPORT(
PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
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
index 6b5bc2f5fecf..fd832373b052 100644
--- 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
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/page_allocator_constants.h.orig 2022-10-05 07:34:01 UTC
+--- base/allocator/partition_allocator/page_allocator_constants.h.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/page_allocator_constants.h
@@ -25,7 +25,7 @@
// elimination.
@@ -28,7 +28,7 @@
// 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
+ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
SystemPageSize() {
#if (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
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 705907f8087d..1bcf5be797cf 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 2023-04-22 17:45:15 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -380,8 +380,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -394,8 +394,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
index dd6868bfbf8c..821948cf990a 100644
--- 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
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-04-22 17:45:15 UTC
+--- base/allocator/partition_allocator/partition_address_space.cc.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
-@@ -417,7 +417,7 @@ void PartitionAddressSpace::UninitPkeyPoolForTesting()
+@@ -420,7 +420,7 @@ void PartitionAddressSpace::UninitThreadIsolatedPoolFo
}
#endif
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
index dd6348188276..266b615ca92a 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc.gni
@@ -1,11 +1,11 @@
---- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-04-22 17:45:15 UTC
+--- base/allocator/partition_allocator/partition_alloc.gni.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/partition_alloc.gni
-@@ -276,7 +276,7 @@ assert(!use_asan_backup_ref_ptr || use_hookable_raw_pt
- "AsanBackupRefPtr requires RawPtrHookableImpl")
-
- declare_args() {
-- enable_pkeys = is_linux && target_cpu == "x64"
-+ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64"
+@@ -291,7 +291,7 @@ declare_args() {
+ # pkeys support is explicitly disabled in all Cronet builds, as some test dependencies that
+ # use partition_allocator are compiled in AOSP against a version of glibc that does not
+ # include pkeys syscall numbers.
+- enable_pkeys = is_linux && target_cpu == "x64" && !is_cronet_build
++ enable_pkeys = (is_linux && !is_bsd) && target_cpu == "x64" && !is_cronet_build
}
assert(!enable_pkeys || (is_linux && target_cpu == "x64"),
"Pkeys are only supported on x64 linux")
diff --git a/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h
new file mode 100644
index 000000000000..a3661cf83045
--- /dev/null
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__alloc__base_compiler__specific.h
@@ -0,0 +1,32 @@
+--- base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h.orig 2023-07-24 14:27:53 UTC
++++ base/allocator/partition_allocator/partition_alloc_base/compiler_specific.h
+@@ -24,9 +24,9 @@
+ // Annotate a function indicating it should not be inlined.
+ // Use like:
+ // NOINLINE void DoStuff() { ... }
+-#if defined(__clang__) && PA_HAS_ATTRIBUTE(noinline)
++#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(noinline)
+ #define PA_NOINLINE [[clang::noinline]]
+-#elif defined(COMPILER_GCC) && PA_HAS_ATTRIBUTE(noinline)
++#elif (defined(COMPILER_GCC) || defined(__clang__)) && PA_HAS_ATTRIBUTE(noinline)
+ #define PA_NOINLINE __attribute__((noinline))
+ #elif defined(COMPILER_MSVC)
+ #define PA_NOINLINE __declspec(noinline)
+@@ -34,7 +34,7 @@
+ #define PA_NOINLINE
+ #endif
+
+-#if defined(__clang__) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
++#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && PA_HAS_ATTRIBUTE(always_inline)
+ #define PA_ALWAYS_INLINE [[clang::always_inline]] inline
+ #elif defined(COMPILER_GCC) && defined(NDEBUG) && \
+ PA_HAS_ATTRIBUTE(always_inline)
+@@ -53,7 +53,7 @@
+ // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
+ // Use like:
+ // void NOT_TAIL_CALLED FooBar();
+-#if defined(__clang__) && PA_HAS_ATTRIBUTE(not_tail_called)
++#if defined(__clang__) && (__clang_major__ >= 15) && PA_HAS_ATTRIBUTE(not_tail_called)
+ #define PA_NOT_TAIL_CALLED [[clang::not_tail_called]]
+ #else
+ #define PA_NOT_TAIL_CALLED
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 d2ce29487c08..f170dbfdcacb 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 2023-04-22 17:45:15 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
-@@ -104,7 +104,7 @@ static_assert(sizeof(void*) != 8, "");
+@@ -94,7 +94,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).
#define PA_CONFIG_HAS_LINUX_KERNEL() \
@@ -9,7 +9,7 @@
// On some platforms, we implement locking by spinning in userspace, then going
// into the kernel only if there is contention. This requires platform support,
-@@ -251,7 +251,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -234,7 +234,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.
#define PA_CONFIG_HAS_ATFORK_HANDLER() \
@@ -18,7 +18,7 @@
// PartitionAlloc uses PartitionRootEnumerator to acquire all
// PartitionRoots at BeforeFork and to release at AfterFork.
-@@ -296,7 +296,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -279,7 +279,7 @@ constexpr bool kUseLazyCommit = false;
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
#define PA_CONFIG_PREFER_SMALLER_SLOT_SPANS() \
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
index 539ee9c1bbf3..623533378829 100644
--- 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
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-04-22 17:45:15 UTC
+--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
@@ -92,7 +92,7 @@ PartitionPageShift() {
return 18; // 256 KiB
@@ -6,15 +6,16 @@
#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
+ PA_ALWAYS_INLINE PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
-@@ -296,7 +296,7 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
- // When pointer compression is enabled, we cannot use large pools (at most
+@@ -294,7 +294,8 @@ constexpr size_t kNumPools = kMaxPoolHandle - 1;
// 8GB for each of the glued pools).
#if BUILDFLAG(HAS_64_BIT_POINTERS)
--#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION)
-+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || PA_CONFIG(POINTER_COMPRESSION) || BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_IOS) || \
+- BUILDFLAG(ENABLE_POINTER_COMPRESSION)
++ BUILDFLAG(ENABLE_POINTER_COMPRESSION) || \
++ 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 eaa466cdc02a..03074ce2ddac 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 2023-04-22 17:45:15 UTC
+--- base/allocator/partition_allocator/partition_page.h.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/partition_page.h
-@@ -143,7 +143,7 @@ struct SlotSpanMetadata {
+@@ -141,7 +141,7 @@ struct SlotSpanMetadata {
// PartitionPageSize() is 4 times the OS page size.
static constexpr size_t kMaxSlotsPerSlotSpan =
4 * (1 << 14) / kSmallestBucket;
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
index 1b80a63f732f..82be5654229a 100644
--- a/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc
+++ b/www/iridium/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2023-04-22 17:45:15 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/partition_root.cc
-@@ -42,7 +42,7 @@
+@@ -46,7 +46,7 @@
#include "wow64apiset.h"
#endif
@@ -9,7 +9,7 @@
#include <pthread.h>
#endif
-@@ -245,7 +245,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -286,7 +286,7 @@ void PartitionAllocMallocInitOnce() {
return;
}
@@ -18,7 +18,7 @@
// 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.
-@@ -339,7 +339,7 @@ static size_t PartitionPurgeSlotSpan(
+@@ -380,7 +380,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
MinPurgeableSlotSize();
@@ -27,7 +27,7 @@
// 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
-@@ -811,7 +811,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -880,7 +880,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
// apple OSes.
PA_CHECK((internal::SystemPageSize() == (size_t{1} << 12)) ||
(internal::SystemPageSize() == (size_t{1} << 14)));
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 bc29b3eef37b..a3ee4925d919 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,4 +1,4 @@
---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-03-13 07:33:08 UTC
+--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2023-07-24 14:27:53 UTC
+++ base/allocator/partition_allocator/spinning_mutex.cc
@@ -18,7 +18,16 @@
@@ -17,7 +17,7 @@
#include <sys/syscall.h>
#include <unistd.h>
#endif // PA_CONFIG(HAS_LINUX_KERNEL)
-@@ -107,8 +116,16 @@ void SpinningMutex::FutexWait() {
+@@ -108,8 +117,16 @@ 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.
@@ -34,7 +34,7 @@
if (err) {
// These are programming error, check them.
-@@ -120,8 +137,16 @@ void SpinningMutex::FutexWait() {
+@@ -121,8 +138,16 @@ void SpinningMutex::FutexWait() {
void SpinningMutex::FutexWake() {
int saved_errno = errno;
diff --git a/www/iridium/files/patch-base_base__switches.cc b/www/iridium/files/patch-base_base__switches.cc
index a1d655c5e642..8eda3e00bfa1 100644
--- a/www/iridium/files/patch-base_base__switches.cc
+++ b/www/iridium/files/patch-base_base__switches.cc
@@ -1,6 +1,6 @@
---- base/base_switches.cc.orig 2022-10-05 07:34:01 UTC
+--- base/base_switches.cc.orig 2023-07-24 14:27:53 UTC
+++ base/base_switches.cc
-@@ -170,7 +170,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
+@@ -167,7 +167,7 @@ const char kForceFieldTrialParams[] = "force-fieldtria
#endif
diff --git a/www/iridium/files/patch-base_base__switches.h b/www/iridium/files/patch-base_base__switches.h
index 044813bf69bc..f92035ba7524 100644
--- a/www/iridium/files/patch-base_base__switches.h
+++ b/www/iridium/files/patch-base_base__switches.h
@@ -1,6 +1,6 @@
---- base/base_switches.h.orig 2022-10-05 07:34:01 UTC
+--- base/base_switches.h.orig 2023-07-24 14:27:53 UTC
+++ base/base_switches.h
-@@ -60,7 +60,7 @@ extern const char kEnableIdleTracing[];
+@@ -57,7 +57,7 @@ extern const char kEnableIdleTracing[];
extern const char kForceFieldTrialParams[];
#endif
diff --git a/www/iridium/files/patch-base_compiler__specific.h b/www/iridium/files/patch-base_compiler__specific.h
new file mode 100644
index 000000000000..68ec17479a8a
--- /dev/null
+++ b/www/iridium/files/patch-base_compiler__specific.h
@@ -0,0 +1,35 @@
+--- base/compiler_specific.h.orig 2023-07-24 14:27:53 UTC
++++ base/compiler_specific.h
+@@ -41,9 +41,9 @@
+ // Annotate a function indicating it should not be inlined.
+ // Use like:
+ // NOINLINE void DoStuff() { ... }
+-#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
++#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline)
+ #define NOINLINE [[clang::noinline]]
+-#elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
++#elif (defined(COMPILER_GCC) || defined(__clang__)) && HAS_ATTRIBUTE(noinline)
+ #define NOINLINE __attribute__((noinline))
+ #elif defined(COMPILER_MSVC)
+ #define NOINLINE __declspec(noinline)
+@@ -51,9 +51,9 @@
+ #define NOINLINE
+ #endif
+
+-#if defined(__clang__) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
++#if defined(__clang__) && (__clang_major__ >= 15) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
+ #define ALWAYS_INLINE [[clang::always_inline]] inline
+-#elif defined(COMPILER_GCC) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
++#elif (defined(COMPILER_GCC) || defined(__clang__)) && defined(NDEBUG) && HAS_ATTRIBUTE(always_inline)
+ #define ALWAYS_INLINE inline __attribute__((__always_inline__))
+ #elif defined(COMPILER_MSVC) && defined(NDEBUG)
+ #define ALWAYS_INLINE __forceinline
+@@ -69,7 +69,7 @@
+ // prevent code folding, see NO_CODE_FOLDING() in base/debug/alias.h.
+ // Use like:
+ // NOT_TAIL_CALLED void FooBar();
+-#if defined(__clang__) && HAS_ATTRIBUTE(not_tail_called)
++#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(not_tail_called)
+ #define NOT_TAIL_CALLED [[clang::not_tail_called]]
+ #else
+ #define NOT_TAIL_CALLED
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 1a737fb68af3..4ed4c935f2f5 100644
--- a/www/iridium/files/patch-base_debug_stack__trace__posix.cc
+++ b/www/iridium/files/patch-base_debug_stack__trace__posix.cc
@@ -1,4 +1,4 @@
---- base/debug/stack_trace_posix.cc.orig 2023-04-22 17:45:15 UTC
+--- base/debug/stack_trace_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ base/debug/stack_trace_posix.cc
@@ -41,7 +41,7 @@
// execinfo.h and backtrace(3) are really only present in glibc and in macOS
@@ -18,7 +18,7 @@
#include "base/debug/proc_maps_linux.h"
#endif
-@@ -799,6 +799,9 @@ class SandboxSymbolizeHelper {
+@@ -798,6 +798,9 @@ class SandboxSymbolizeHelper {
// for the modules that are loaded in the current process.
// Returns true on success.
bool CacheMemoryRegions() {
@@ -28,7 +28,7 @@
// Reads /proc/self/maps.
std::string contents;
if (!ReadProcMaps(&contents)) {
-@@ -816,6 +819,7 @@ class SandboxSymbolizeHelper {
+@@ -815,6 +818,7 @@ class SandboxSymbolizeHelper {
is_initialized_ = true;
return true;
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 0b1ea63389a9..e83ece449b72 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 2023-03-13 07:33:08 UTC
+--- base/files/file_path_watcher_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ base/files/file_path_watcher_unittest.cc
-@@ -521,7 +521,7 @@ TEST_F(FilePathWatcherTest, MAYBE_WatchDirectory) {
+@@ -479,7 +479,7 @@ TEST_F(FilePathWatcherTest, WatchDirectory) {
VLOG(1) << "Waiting for file1 creation";
ASSERT_TRUE(WaitForEvent());
@@ -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";
-@@ -1345,7 +1345,7 @@ enum Permission {
+@@ -1281,7 +1281,7 @@ enum Permission {
Execute
};
@@ -18,7 +18,7 @@
bool ChangeFilePermissions(const FilePath& path, Permission perm, bool allow) {
struct stat stat_buf;
-@@ -1376,7 +1376,7 @@ bool ChangeFilePermissions(const FilePath& path, Permi
+@@ -1312,7 +1312,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 45679a464d08..9ee141cee36e 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-10-05 07:34:01 UTC
+--- base/files/file_util_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ base/files/file_util_posix.cc
-@@ -700,32 +700,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -756,32 +756,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
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 36907a74a84a..bf6025128396 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 2023-03-13 07:33:08 UTC
+--- base/files/file_util_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ base/files/file_util_unittest.cc
-@@ -3749,7 +3749,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+@@ -3871,7 +3871,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";
-@@ -4472,7 +4472,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4594,7 +4594,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
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 efa72b318679..a75f4adc4748 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-10-05 07:34:01 UTC
+--- base/memory/madv_free_discardable_memory_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ base/memory/madv_free_discardable_memory_posix.cc
-@@ -295,6 +295,10 @@ void MadvFreeDiscardableMemoryPosix::SetKeepMemoryForT
+@@ -306,6 +306,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
-@@ -310,6 +314,7 @@ bool MadvFreeDiscardableMemoryPosix::IsResident() cons
+@@ -321,6 +325,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 5cfb8d4a0d78..653ffad33990 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,4 +1,4 @@
---- base/memory/platform_shared_memory_region.h.orig 2022-10-05 07:34:01 UTC
+--- base/memory/platform_shared_memory_region.h.orig 2023-07-24 14:27:53 UTC
+++ base/memory/platform_shared_memory_region.h
@@ -16,7 +16,7 @@
@@ -18,7 +18,7 @@
// Structure to limit access to executable region creation.
struct ExecutableRegion {
private:
-@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -215,7 +215,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
CheckPlatformHandlePermissionsCorrespondToMode);
static PlatformSharedMemoryRegion Create(Mode mode,
size_t size
diff --git a/www/iridium/files/patch-base_process_launch.h b/www/iridium/files/patch-base_process_launch.h
index 0edde543cab6..70155bd09fd9 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-10-05 07:34:01 UTC
+--- base/process/launch.h.orig 2023-07-24 14:27:53 UTC
+++ base/process/launch.h
-@@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -200,7 +200,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_process__metrics.cc b/www/iridium/files/patch-base_process_process__metrics.cc
index 3f47355d36c8..e275cb8d7587 100644
--- a/www/iridium/files/patch-base_process_process__metrics.cc
+++ b/www/iridium/files/patch-base_process_process__metrics.cc
@@ -1,4 +1,4 @@
---- base/process/process_metrics.cc.orig 2023-03-13 07:33:08 UTC
+--- base/process/process_metrics.cc.orig 2023-07-24 14:27:53 UTC
+++ base/process/process_metrics.cc
@@ -17,7 +17,7 @@ namespace base {
namespace {
@@ -27,7 +27,7 @@
Value::Dict meminfo = memory_info_.ToDict();
meminfo.Merge(vmstat_info_.ToDict());
res.Set("meminfo", std::move(meminfo));
-@@ -98,7 +98,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+@@ -100,7 +100,6 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
#endif // !BUILDFLAG(IS_MAC)
}
@@ -35,7 +35,7 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage(
TimeDelta cumulative_cpu) {
TimeTicks time = TimeTicks::Now();
-@@ -124,7 +123,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
+@@ -126,7 +125,6 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage(
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
return GetPlatformIndependentCPUUsage(GetCumulativeCPUUsage());
}
@@ -43,7 +43,7 @@
#if BUILDFLAG(IS_WIN)
double ProcessMetrics::GetPreciseCPUUsage(TimeDelta cumulative_cpu) {
-@@ -155,7 +153,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
+@@ -157,7 +155,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/iridium/files/patch-base_process_process__metrics.h b/www/iridium/files/patch-base_process_process__metrics.h
index a51ed2380534..258adb21a14d 100644
--- a/www/iridium/files/patch-base_process_process__metrics.h
+++ b/www/iridium/files/patch-base_process_process__metrics.h
@@ -1,6 +1,6 @@
---- base/process/process_metrics.h.orig 2023-03-13 07:33:08 UTC
+--- base/process/process_metrics.h.orig 2023-07-24 14:27:53 UTC
+++ base/process/process_metrics.h
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -9,16 +9,16 @@
#include <string>
#include <utility>
#include <vector>
-@@ -50,7 +50,7 @@ namespace base {
- // Full declaration is in process_metrics_iocounters.h.
- struct IoCounters;
+@@ -53,7 +53,7 @@ struct IoCounters;
+
+ class ProcessMetricsAppleInternal;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
-@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -108,7 +108,7 @@ class BASE_EXPORT ProcessMetrics {
// convenience wrapper for CreateProcessMetrics().
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
@@ -27,7 +27,7 @@
// 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;
-@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -166,7 +166,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -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
-@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -226,7 +226,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;
-@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -247,7 +247,7 @@ class BASE_EXPORT ProcessMetrics {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -54,7 +54,7 @@
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
#endif
#if BUILDFLAG(IS_APPLE)
-@@ -263,9 +263,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -266,9 +266,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_;
@@ -64,7 +64,7 @@
#if BUILDFLAG(IS_WIN)
TimeTicks last_cpu_time_for_precise_cpu_usage_;
-@@ -273,7 +271,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -73,7 +73,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
-@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -313,7 +311,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) || \
@@ -82,7 +82,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -348,7 +346,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -91,7 +91,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
-@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -363,7 +361,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -100,7 +100,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
-@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+@@ -400,7 +398,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -109,7 +109,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 +589,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -588,7 +586,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__posix.cc b/www/iridium/files/patch-base_process_process__metrics__posix.cc
index 265511141d4e..e8d8812b6afd 100644
--- a/www/iridium/files/patch-base_process_process__metrics__posix.cc
+++ b/www/iridium/files/patch-base_process_process__metrics__posix.cc
@@ -1,6 +1,6 @@
---- base/process/process_metrics_posix.cc.orig 2022-10-05 07:34:01 UTC
+--- base/process/process_metrics_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ base/process/process_metrics_posix.cc
-@@ -20,6 +20,8 @@
+@@ -21,6 +21,8 @@
#if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -135,7 +137,7 @@ size_t ProcessMetrics::GetMallocUsage() {
+@@ -134,7 +136,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__unittest.cc b/www/iridium/files/patch-base_process_process__unittest.cc
index 574488941ef8..1ae2a46d8e52 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 2023-03-13 07:33:08 UTC
+--- base/process/process_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ base/process/process_unittest.cc
-@@ -194,7 +194,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
+@@ -195,7 +195,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_stack__sampling__profiler__test__util.cc b/www/iridium/files/patch-base_profiler_stack__sampling__profiler__test__util.cc
index 5b67f7ff1684..569610282815 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 2023-03-13 07:33:08 UTC
+--- base/profiler/stack_sampling_profiler_test_util.cc.orig 2023-07-24 14:27:53 UTC
+++ base/profiler/stack_sampling_profiler_test_util.cc
-@@ -33,7 +33,7 @@
+@@ -36,7 +36,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 d353d8ebf91e..4f37e571a258 100644
--- a/www/iridium/files/patch-base_rand__util.h
+++ b/www/iridium/files/patch-base_rand__util.h
@@ -1,6 +1,6 @@
---- base/rand_util.h.orig 2022-12-06 08:09:13 UTC
+--- base/rand_util.h.orig 2023-07-24 14:27:53 UTC
+++ base/rand_util.h
-@@ -117,7 +117,7 @@ void RandomShuffle(Itr first, Itr last) {
+@@ -121,7 +121,7 @@ void RandomShuffle(Itr first, Itr last) {
std::shuffle(first, last, RandomBitGenerator());
}
diff --git a/www/iridium/files/patch-base_system_sys__info.cc b/www/iridium/files/patch-base_system_sys__info.cc
index 3d3ab0ad35f6..30db53f9c282 100644
--- a/www/iridium/files/patch-base_system_sys__info.cc
+++ b/www/iridium/files/patch-base_system_sys__info.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info.cc.orig 2023-03-13 07:33:08 UTC
+--- base/system/sys_info.cc.orig 2023-07-24 14:27:53 UTC
+++ base/system/sys_info.cc
-@@ -106,7 +106,7 @@ std::string SysInfo::HardwareModelName() {
+@@ -155,7 +155,7 @@ std::string SysInfo::HardwareModelName() {
#endif
void SysInfo::GetHardwareInfo(base::OnceCallback<void(HardwareInfo)> callback) {
diff --git a/www/iridium/files/patch-base_system_sys__info.h b/www/iridium/files/patch-base_system_sys__info.h
index 6227b678f526..419163c249ba 100644
--- a/www/iridium/files/patch-base_system_sys__info.h
+++ b/www/iridium/files/patch-base_system_sys__info.h
@@ -1,15 +1,15 @@
---- base/system/sys_info.h.orig 2023-03-13 07:33:08 UTC
+--- base/system/sys_info.h.orig 2023-07-24 14:27:53 UTC
+++ base/system/sys_info.h
-@@ -246,6 +246,8 @@ class BASE_EXPORT SysInfo {
+@@ -258,6 +258,8 @@ class BASE_EXPORT SysInfo {
static void SetIsCpuSecurityMitigationsEnabled(bool is_enabled);
#endif
+ static uint64_t MaxSharedMemorySize();
+
private:
+ friend class test::ScopedAmountOfPhysicalMemoryOverride;
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
- FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
-@@ -257,7 +259,7 @@ class BASE_EXPORT SysInfo {
+@@ -270,7 +272,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
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 044f50973517..b2d2aff2105a 100644
--- a/www/iridium/files/patch-base_test_launcher_test__launcher.cc
+++ b/www/iridium/files/patch-base_test_launcher_test__launcher.cc
@@ -1,6 +1,6 @@
---- base/test/launcher/test_launcher.cc.orig 2023-01-17 19:19:00 UTC
+--- base/test/launcher/test_launcher.cc.orig 2023-07-24 14:27:53 UTC
+++ base/test/launcher/test_launcher.cc
-@@ -67,6 +67,7 @@
+@@ -69,6 +69,7 @@
#include "third_party/libxml/chromium/libxml_utils.h"
#if BUILDFLAG(IS_POSIX)
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 65d98611cfea..259cd49512f0 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 2023-03-13 07:33:08 UTC
+--- base/threading/platform_thread_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ base/threading/platform_thread_unittest.cc
-@@ -31,7 +31,7 @@
+@@ -32,7 +32,7 @@
#include "base/time/time.h"
#endif
@@ -9,7 +9,7 @@
#include <pthread.h>
#include <sys/syscall.h>
#include <sys/types.h>
-@@ -422,7 +422,7 @@ TEST(PlatformThreadTest,
+@@ -423,7 +423,7 @@ TEST(PlatformThreadTest,
// and hardcodes what we know. Please inform scheduler-dev@chromium.org if this
// proprerty changes for a given platform.
TEST(PlatformThreadTest, CanChangeThreadType) {
@@ -18,7 +18,7 @@
// 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;
-@@ -701,12 +701,16 @@ INSTANTIATE_TEST_SUITE_P(
+@@ -698,12 +698,16 @@ INSTANTIATE_TEST_SUITE_P(
#endif // BUILDFLAG(IS_APPLE)
diff --git a/www/iridium/files/patch-build_config_compiler_BUILD.gn b/www/iridium/files/patch-build_config_compiler_BUILD.gn
index 57a9745cac4b..1bf36cffe69b 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 2023-04-22 17:45:15 UTC
+--- build/config/compiler/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ build/config/compiler/BUILD.gn
-@@ -237,13 +237,16 @@ config("default_include_dirs") {
+@@ -249,13 +249,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 ---------------------------------------------------------------------
-@@ -289,7 +292,9 @@ config("compiler") {
+@@ -302,7 +305,9 @@ config("compiler") {
configs += [
# See the definitions below.
@@ -28,7 +28,7 @@
":compiler_codegen",
":compiler_deterministic",
]
-@@ -465,6 +470,10 @@ config("compiler") {
+@@ -495,6 +500,10 @@ config("compiler") {
}
}
@@ -39,7 +39,16 @@
# Linux-specific compiler flags setup.
# ------------------------------------
if (use_gold) {
-@@ -964,7 +973,7 @@ config("compiler_cpu_abi") {
+@@ -818,7 +827,7 @@ config("compiler") {
+ # * Apple platforms (e.g. MacOS, iPhone, iPad) aren't supported because xcode
+ # lldb doesn't have the needed changes yet.
+ # TODO(crbug.com/1379070): Remove if the upstream default ever changes.
+- if (is_clang && !is_nacl && !is_win && !is_apple) {
++ if (is_clang && !is_nacl && !is_win && !is_apple && !is_bsd) {
+ cflags_cc += [ "-gsimple-template-names" ]
+ }
+
+@@ -1053,7 +1062,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -48,7 +57,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
-@@ -979,7 +988,7 @@ config("compiler_cpu_abi") {
+@@ -1068,7 +1077,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -57,7 +66,7 @@
!(is_chromeos_lacros && is_chromeos_device)) {
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
-@@ -1325,6 +1334,27 @@ config("compiler_deterministic") {
+@@ -1414,6 +1423,27 @@ config("compiler_deterministic") {
}
}
@@ -85,7 +94,7 @@
config("rustc_revision") {
if (rustc_revision != "") {
# Similar to the above config, this is here so that all files get recompiled
-@@ -1543,7 +1573,7 @@ config("default_warnings") {
+@@ -1632,7 +1662,7 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -94,7 +103,7 @@
cflags += [
# TODO(crbug.com/1343975) Evaluate and possibly enable.
"-Wno-deprecated-builtins",
-@@ -1711,7 +1741,7 @@ config("no_chromium_code") {
+@@ -1809,7 +1839,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -103,7 +112,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -1995,8 +2025,7 @@ config("default_stack_frames") {
+@@ -2093,8 +2123,7 @@ config("default_stack_frames") {
}
# Default "optimization on" config.
@@ -113,7 +122,7 @@
if (is_win) {
if (chrome_pgo_phase != 2) {
# Favor size over speed, /O1 must be before the common flags.
-@@ -2055,8 +2084,7 @@ config("xoptimize") {
+@@ -2153,8 +2182,7 @@ config("xoptimize") {
}
# Turn off optimizations.
@@ -123,7 +132,7 @@
if (is_win) {
cflags = [
"/Od", # Disable optimization.
-@@ -2096,8 +2124,7 @@ config("xno_optimize") {
+@@ -2194,8 +2222,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.
@@ -133,7 +142,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2130,8 +2157,7 @@ config("xoptimize_max") {
+@@ -2228,8 +2255,7 @@ config("xoptimize_max") {
#
# TODO(crbug.com/621335) - rework how all of these configs are related
# so that we don't need this disclaimer.
@@ -143,7 +152,7 @@
if (is_nacl && is_nacl_irt) {
# The NaCl IRT is a special case and always wants its own config.
# Various components do:
-@@ -2157,8 +2183,7 @@ config("xoptimize_speed") {
+@@ -2255,8 +2281,7 @@ config("xoptimize_speed") {
}
}
@@ -153,7 +162,7 @@
cflags = [ "-O1" ] + common_optimize_on_cflags
rustflags = [ "-Copt-level=1" ]
ldflags = common_optimize_on_ldflags
-@@ -2224,7 +2249,7 @@ config("afdo_optimize_size") {
+@@ -2324,7 +2349,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") {
@@ -162,7 +171,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2243,7 +2268,7 @@ config("afdo") {
+@@ -2343,7 +2368,7 @@ config("afdo") {
}
inputs = [ _clang_sample_profile ]
}
@@ -171,17 +180,17 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2281,8 +2306,7 @@ config("win_pdbaltpath") {
+@@ -2381,8 +2406,7 @@ config("win_pdbaltpath") {
}
# Full symbols.
-config("symbols") { }
-config("xsymbols") {
+config("symbols") {
+ rustflags = []
if (is_win) {
if (is_clang) {
- cflags = [
-@@ -2399,7 +2423,8 @@ config("xsymbols") {
+@@ -2502,7 +2526,8 @@ config("xsymbols") {
configs += [ "//build/config:compress_debug_sections" ]
}
@@ -191,17 +200,17 @@
if (is_apple) {
# TODO(https://crbug.com/1050118): Investigate missing debug info on mac.
# Make sure we don't use constructor homing on mac.
-@@ -2422,8 +2447,7 @@ config("xsymbols") {
+@@ -2525,8 +2550,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.
-config("minimal_symbols") { }
-config("xminimal_symbols") {
+config("minimal_symbols") {
+ rustflags = []
if (is_win) {
# Functions, files, and line tables only.
- cflags = []
-@@ -2497,8 +2521,7 @@ config("xminimal_symbols") {
+@@ -2611,8 +2635,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_BUILD.gn b/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn
new file mode 100644
index 000000000000..e3b1f14fa1af
--- /dev/null
+++ b/www/iridium/files/patch-build_config_compiler_pgo_BUILD.gn
@@ -0,0 +1,19 @@
+--- build/config/compiler/pgo/BUILD.gn.orig 2023-07-24 14:27:53 UTC
++++ build/config/compiler/pgo/BUILD.gn
+@@ -121,13 +121,14 @@ config("pgo_optimization_flags") {
+
+ # Enable basic block layout based on the extended TSP problem. This aims to
+ # improve icache utilization and reduce the binary size.
+- if (use_thin_lto) {
++ # __clang_major__ >= 15
++ if (use_thin_lto && !is_bsd) {
+ if (is_win) {
+ ldflags = [ "-mllvm:-enable-ext-tsp-block-placement=1" ]
+ } else {
+ ldflags = [ "-Wl,-mllvm,-enable-ext-tsp-block-placement=1" ]
+ }
+- } else {
++ } else if (!is_bsd) {
+ cflags += [
+ "-mllvm",
+ "-enable-ext-tsp-block-placement=1",
diff --git a/www/iridium/files/patch-build_config_rust.gni b/www/iridium/files/patch-build_config_rust.gni
deleted file mode 100644
index a76afb4b6e7d..000000000000
--- a/www/iridium/files/patch-build_config_rust.gni
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/config/rust.gni.orig 2023-04-22 17:45:15 UTC
-+++ build/config/rust.gni
-@@ -135,7 +135,7 @@ if (enable_rust) {
- rust_sysroot = "//third_party/rust-toolchain"
- use_unverified_rust_toolchain = false
- } else {
-- if (host_os != "linux") {
-+ if (host_os != "linux" && host_os != "openbsd" && host_os != "freebsd") {
- assert(false,
- "Attempt to use Android Rust toolchain on an unsupported platform")
- }
diff --git a/www/iridium/files/patch-build_linux_unbundle_replace__gn__files.py b/www/iridium/files/patch-build_linux_unbundle_replace__gn__files.py
new file mode 100644
index 000000000000..dbf7c40af099
--- /dev/null
+++ b/www/iridium/files/patch-build_linux_unbundle_replace__gn__files.py
@@ -0,0 +1,10 @@
+--- build/linux/unbundle/replace_gn_files.py.orig 2023-07-24 14:27:53 UTC
++++ build/linux/unbundle/replace_gn_files.py
+@@ -54,7 +54,6 @@ REPLACEMENTS = {
+ 'libevent': 'third_party/libevent/BUILD.gn',
+ 'libjpeg': 'third_party/libjpeg.gni',
+ 'libpng': 'third_party/libpng/BUILD.gn',
+- 'libusb': 'third_party/libusb/BUILD.gn',
+ 'libvpx': 'third_party/libvpx/BUILD.gn',
+ 'libwebp': 'third_party/libwebp/BUILD.gn',
+ 'libxml': 'third_party/libxml/BUILD.gn',
diff --git a/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni b/www/iridium/files/patch-build_toolchain_gcc__toolchain.gni
index 7871cc34f0a0..d6bb2afa781b 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 2023-04-22 17:45:15 UTC
+--- build/toolchain/gcc_toolchain.gni.orig 2023-07-24 14:27:53 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,7 +14,7 @@
# This template defines a toolchain for something that works like gcc
# (including clang).
#
-@@ -825,22 +832,12 @@ template("gcc_toolchain") {
+@@ -869,22 +876,12 @@ template("gcc_toolchain") {
# use_gold too.
template("clang_toolchain") {
gcc_toolchain(target_name) {
diff --git a/www/iridium/files/patch-cc_BUILD.gn b/www/iridium/files/patch-cc_BUILD.gn
index f9b95555049a..9a6b9b44d41e 100644
--- a/www/iridium/files/patch-cc_BUILD.gn
+++ b/www/iridium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+--- cc/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ cc/BUILD.gn
-@@ -668,7 +668,7 @@ cc_test_static_library("test_support") {
+@@ -672,7 +672,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,8 +9,8 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
-@@ -913,7 +913,6 @@ cc_test("cc_unittests") {
- data = [ "//components/viz/test/data/" ]
+@@ -922,7 +922,6 @@ cc_test("cc_unittests") {
+ data = [ "//components/test/data/viz/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",
- "//third_party/mesa_headers",
diff --git a/www/iridium/files/patch-chrome_app_app__management__strings.grdp b/www/iridium/files/patch-chrome_app_app__management__strings.grdp
index c2eda39438ec..dcebba600041 100644
--- a/www/iridium/files/patch-chrome_app_app__management__strings.grdp
+++ b/www/iridium/files/patch-chrome_app_app__management__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/app_management_strings.grdp.orig 2022-10-05 07:34:01 UTC
+--- chrome/app/app_management_strings.grdp.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/app_management_strings.grdp
-@@ -173,7 +173,7 @@
+@@ -188,7 +188,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">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
</if>
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 5476da3aa0d2..e43ae7a1fa6f 100644
--- a/www/iridium/files/patch-chrome_app_chrome__command__ids.h
+++ b/www/iridium/files/patch-chrome_app_chrome__command__ids.h
@@ -1,11 +1,17 @@
---- chrome/app/chrome_command_ids.h.orig 2023-03-13 07:33:08 UTC
+--- chrome/app/chrome_command_ids.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/chrome_command_ids.h
-@@ -70,7 +70,7 @@
+@@ -70,12 +70,12 @@
+ #define IDC_TOGGLE_MULTITASK_MENU 34050
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #define IDC_USE_SYSTEM_TITLE_BAR 34051
#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)
- #define IDC_USE_SYSTEM_TITLE_BAR 34051
#define IDC_RESTORE_WINDOW 34052
#endif
+
diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc
index fa4f5f70f8e4..7356c70dafb2 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 2023-04-22 17:45:15 UTC
+--- chrome/app/chrome_main.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/chrome_main.cc
-@@ -28,7 +28,7 @@
+@@ -27,11 +27,11 @@
#include "chrome/app/notification_metrics.h"
#endif
@@ -9,7 +9,21 @@
#include "base/base_switches.h"
#endif
-@@ -167,7 +167,7 @@ int ChromeMain(int argc, const char** argv) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/app/chrome_main_linux.h"
+ #endif
+
+@@ -136,7 +136,7 @@ int ChromeMain(int argc, const char** argv) {
+ SetUpBundleOverrides();
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ AppendExtraArgumentsToCommandLine(command_line);
+ #endif
+
+@@ -164,7 +164,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 378be698e378..9ebeac602c6e 100644
--- a/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/iridium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/chrome_main_delegate.cc
-@@ -136,7 +136,7 @@
+@@ -138,7 +138,7 @@
#include "components/about_ui/credit_utils.h"
#endif
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -180,16 +180,16 @@
+@@ -183,16 +183,16 @@
#include "v8/include/v8.h"
#endif
@@ -65,25 +65,16 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -915,6 +915,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
- // not always enabled on ChromeOS.
- #if BUILDFLAG(IS_CHROMEOS)
- bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
-+#elif BUILDFLAG(IS_BSD)
-+ bool enable_gwp_asan = false;
- #else
- bool enable_gwp_asan = true;
- #endif
-@@ -970,7 +972,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
- base::internal::TimerBase::InitializeFeatures();
+@@ -958,7 +958,7 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
base::InitializeCpuReductionExperiment();
base::sequence_manager::internal::SequenceManagerImpl::InitializeFeatures();
+ base::sequence_manager::internal::ThreadController::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::InitFeaturesPostFieldTrial();
-@@ -1102,7 +1104,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1096,7 +1096,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
@@ -92,7 +83,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -1132,7 +1134,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
+@@ -1126,7 +1126,7 @@ absl::optional<int> ChromeMainDelegate::BasicStartupCo
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@@ -101,7 +92,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -1514,7 +1516,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1500,7 +1500,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
CHECK(!loaded_locale.empty()) << "Locale could not be found for " << locale;
}
@@ -110,7 +101,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
-@@ -1616,7 +1618,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1602,7 +1602,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.
diff --git a/www/iridium/files/patch-chrome_app_chromium__strings.grd b/www/iridium/files/patch-chrome_app_chromium__strings.grd
index 7743aa635a41..674569f6f632 100644
--- a/www/iridium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/iridium/files/patch-chrome_app_chromium__strings.grd
@@ -1,4 +1,4 @@
---- chrome/app/chromium_strings.grd.orig 2022-12-06 08:09:13 UTC
+--- chrome/app/chromium_strings.grd.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/chromium_strings.grd
@@ -296,7 +296,7 @@ If you update this file, be sure also to update google
Welcome to Iridium; new browser window opened
@@ -9,7 +9,7 @@
<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>
-@@ -425,7 +425,7 @@ If you update this file, be sure also to update google
+@@ -437,7 +437,7 @@ If you update this file, be sure also to update google
To get future Chromium updates, you'll need Windows 10 or later. This computer is using Windows 8.1.
</message>
</if>
@@ -18,3 +18,21 @@
<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>
+@@ -812,7 +812,7 @@ Permissions you've already given to websites and apps
+ </message>
+ </if>
+
+- <if expr="is_win or is_macosx or is_linux">
++ <if expr="is_win or is_macosx or is_posix">
+ <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item" translateable="false">
+ Not used in Chromium. Placeholder to keep resource maps in sync.
+ </message>
+@@ -1162,7 +1162,7 @@ Permissions you've already given to websites and apps
+ </message>
+ </if>
+
+- <if expr="is_win or is_macosx or is_linux">
++ <if expr="is_win or is_macosx or is_posix">
+ <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog." translateable="false">
+ Not used in Chromium. Placeholder to keep resource maps in sync.
+ </message>
diff --git a/www/iridium/files/patch-chrome_app_generated__resources.grd b/www/iridium/files/patch-chrome_app_generated__resources.grd
index ff7baf628a08..db310ca94d20 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 2023-04-22 17:45:15 UTC
+--- chrome/app/generated_resources.grd.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@@ -9,7 +9,7 @@
for making strings OS specific. Other platform defines such as use_titlecase
are declared in tools/grit/grit_rule.gni.
-->
-@@ -3187,7 +3187,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -3304,7 +3304,7 @@ You can send it to Google to check if it's unsafe. Sca
</if>
<!-- Bluetooth Device Credentials (i.e. PIN/Passkey) dialog -->
@@ -18,7 +18,7 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
-@@ -4942,7 +4942,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -5036,7 +5036,7 @@ You can send it to Google to check if it's unsafe. Sca
Read information about your browser, OS, device, installed software, registry values and files
</message>
</if>
@@ -27,7 +27,7 @@
<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>
-@@ -5612,7 +5612,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5691,7 +5691,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>
@@ -36,7 +36,7 @@
<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>
-@@ -5658,7 +5658,7 @@ Keep your key file in a safe place. You will need it t
+@@ -5737,7 +5737,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>
@@ -45,7 +45,16 @@
<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>
-@@ -9551,7 +9551,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -9560,7 +9560,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+ <message name="IDS_APP_MENU_BUTTON_UPDATE" desc="Short label next to app-menu button when an update is available.">
+ Update
+ </message>
+- <if expr="is_win or is_macosx or is_linux">
++ <if expr="is_win or is_macosx or is_posix">
+ <message name="IDS_APP_MENU_BUTTON_UPDATE_ALT1" desc="Alternate short label next to app-menu button when an update is available.">
+ Finish update
+ </message>
+@@ -9891,7 +9891,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@@ -54,7 +63,16 @@
<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>
-@@ -10892,7 +10892,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -10856,7 +10856,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+ </message>
+
+ <!-- Device Trust Consent dialog -->
+- <if expr="is_win or is_macosx or is_linux">
++ <if expr="is_win or is_macosx or is_posix">
+ <message name="IDS_DEVICE_SIGNALS_CONSENT_DIALOG_TITLE" desc="Title of the dialog shown when user consent is required to share device signals.">
+ Share device signals?
+ </message>
+@@ -11246,7 +11246,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
@@ -63,7 +81,7 @@
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
-@@ -13004,7 +13004,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -13426,7 +13426,7 @@ Please help our engineers fix this problem. Tell us wh
Open Anyway
</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 90c6310ead37..13f802e72360 100644
--- a/www/iridium/files/patch-chrome_app_google__chrome__strings.grd
+++ b/www/iridium/files/patch-chrome_app_google__chrome__strings.grd
@@ -1,4 +1,4 @@
---- chrome/app/google_chrome_strings.grd.orig 2022-12-06 08:09:13 UTC
+--- chrome/app/google_chrome_strings.grd.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/google_chrome_strings.grd
@@ -301,7 +301,7 @@ chromium_strings.grd. -->
Welcome to Chrome; new browser window opened
@@ -18,3 +18,21 @@
<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>
+@@ -844,7 +844,7 @@ Permissions you've already given to websites and apps
+ </if>
+ </if>
+
+- <if expr="is_win or is_macosx or is_linux">
++ <if expr="is_win or is_macosx or is_posix">
+ <if expr="use_titlecase">
+ <message name="IDS_RELAUNCH_TO_UPDATE_ALT" desc="Alternate text label of the relaunch to update Chrome menu item">
+ Relaunch to Update - Your tabs will reopen
+@@ -1249,7 +1249,7 @@ Permissions you've already given to websites and apps
+ </message>
+ </if>
+
+- <if expr="is_win or is_macosx or is_linux">
++ <if expr="is_win or is_macosx or is_posix">
+ <message name="IDS_UPDATE_RECOMMENDED_DIALOG_TITLE_ALT" desc="Alternate window title for the Update Recommended dialog.">
+ Relaunch to finish Chrome update
+ </message>
diff --git a/www/iridium/files/patch-chrome_app_profiles__strings.grdp b/www/iridium/files/patch-chrome_app_profiles__strings.grdp
index 2533bd0f79b4..b03c8287ed14 100644
--- a/www/iridium/files/patch-chrome_app_profiles__strings.grdp
+++ b/www/iridium/files/patch-chrome_app_profiles__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/profiles_strings.grdp.orig 2022-03-28 18:11:04 UTC
+--- chrome/app/profiles_strings.grdp.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/profiles_strings.grdp
-@@ -66,7 +66,7 @@
+@@ -60,7 +60,7 @@
Add Profile...
</message>
</if>
diff --git a/www/iridium/files/patch-chrome_app_settings__strings.grdp b/www/iridium/files/patch-chrome_app_settings__strings.grdp
index a73b2b497947..471cdde34d3a 100644
--- a/www/iridium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/iridium/files/patch-chrome_app_settings__strings.grdp
@@ -1,6 +1,6 @@
---- chrome/app/settings_strings.grdp.orig 2023-04-22 17:45:15 UTC
+--- chrome/app/settings_strings.grdp.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/settings_strings.grdp
-@@ -166,7 +166,7 @@
+@@ -202,7 +202,7 @@
Theme
</message>
</if>
@@ -9,7 +9,7 @@
<message name="IDS_SETTINGS_GTK_THEME" desc="Text of the label describing the system (GTK) browser theme on Linux">
GTK
</message>
-@@ -186,7 +186,7 @@
+@@ -222,7 +222,7 @@
Use Classic
</message>
</if>
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 bd1b0aaff3c6..4b386be46f69 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 2023-04-22 17:45:15 UTC
+--- chrome/app/theme/chrome_unscaled_resources.grd.orig 2023-07-24 14:27:53 UTC
+++ chrome/app/theme/chrome_unscaled_resources.grd
@@ -16,7 +16,7 @@
<includes>
@@ -9,7 +9,7 @@
<then>
<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" />
-@@ -63,7 +63,7 @@
+@@ -61,7 +61,7 @@
<else> <!-- not _google_chrome -->
<if expr="_is_chrome_for_testing_branded">
<then>
@@ -18,7 +18,7 @@
<then>
<include name="IDR_PRODUCT_LOGO_64" file="google_chrome/google_chrome_for_testing/linux/product_logo_64.png" type="BINDATA" />
<include name="IDR_PRODUCT_LOGO_128" file="google_chrome/google_chrome_for_testing/linux/product_logo_128.png" type="BINDATA" />
-@@ -77,7 +77,7 @@
+@@ -75,7 +75,7 @@
</if>
</then>
<else> <!-- not _is_chrome_for_testing_branded -->
diff --git a/www/iridium/files/patch-chrome_browser_about__flags.cc b/www/iridium/files/patch-chrome_browser_about__flags.cc
index 9f8e5f22cc6b..e67ada6dd15d 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/about_flags.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/about_flags.cc
-@@ -216,7 +216,7 @@
+@@ -222,7 +222,7 @@
#include "ui/ui_features.h"
#include "url/url_features.h"
@@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -303,7 +303,7 @@
+@@ -316,7 +316,7 @@
#include "device/vr/public/cpp/features.h"
#endif
@@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -409,7 +409,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
+@@ -422,7 +422,7 @@ const FeatureEntry::FeatureVariation kDXGIWaitableSwap
{"Max 3 Frames", &kDXGIWaitableSwapChain3Frames, 1, nullptr}};
#endif
@@ -27,16 +27,16 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1350,7 +1350,7 @@ const FeatureEntry::FeatureVariation kLocalWebApproval
- #endif
+@@ -1478,7 +1478,7 @@ const FeatureEntry::FeatureVariation kChromeRefresh202
+ std::size(kChromeRefresh2023Level1), nullptr}};
#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)
- const FeatureEntry::FeatureParam
- kOmniboxDocumentProviderCapLowQualitySuggestionsTo1[] = {
- {"DocumentProviderMaxLowQualitySuggestions", "1"},
-@@ -4397,13 +4397,13 @@ const FeatureEntry kFeatureEntries[] = {
+ const FeatureEntry::FeatureParam kShortcutBoostSearchAndUrl1414[] = {
+ {"ShortcutBoostSearchScore", "1414"},
+ {"ShortcutBoostUrlScore", "1414"}};
+@@ -4974,13 +4974,13 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -52,8 +52,8 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -4667,7 +4667,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(feed::kDiscoFeedEndpoint)},
+@@ -5265,7 +5265,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(feed::kFeedDynamicColors)},
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
@@ -61,25 +61,25 @@
{"following-feed-sidepanel", flag_descriptions::kFollowingFeedSidepanelName,
flag_descriptions::kFollowingFeedSidepanelDescription, kOsDesktop,
FEATURE_VALUE_TYPE(feed::kWebUiFeed)},
-@@ -5271,7 +5271,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(omnibox::kZeroSuggestInMemoryCaching)},
+@@ -5911,7 +5911,7 @@ const FeatureEntry kFeatureEntries[] = {
+ kOsAll, FEATURE_VALUE_TYPE(omnibox::kUseExistingAutocompleteClient)},
#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)
- {"omnibox-experimental-keyword-mode",
- flag_descriptions::kOmniboxExperimentalKeywordModeName,
- flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -5915,7 +5915,7 @@ const FeatureEntry kFeatureEntries[] = {
- flag_descriptions::kPointerLockOptionsDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kPointerLockOptions)},
+ {"omnibox-domain-suggestions",
+ flag_descriptions::kOmniboxDomainSuggestionsName,
+ flag_descriptions::kOmniboxDomainSuggestionsDescription, kOsDesktop,
+@@ -6674,7 +6674,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kParallelDownloadingDescription, kOsAll,
+ FEATURE_VALUE_TYPE(download::features::kParallelDownloading)},
-#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)},
-@@ -6838,7 +6838,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7566,7 +7566,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif // BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -88,7 +88,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
-@@ -7573,7 +7573,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8345,7 +8345,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -97,16 +97,16 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -7789,7 +7789,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8600,7 +8600,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(ash::features::kWallpaperPerDesk)},
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- {"enable-get-display-media-set", flag_descriptions::kGetDisplayMediaSetName,
- flag_descriptions::kGetDisplayMediaSetDescription,
+ {"enable-get-all-screens-media", flag_descriptions::kGetAllScreensMediaName,
+ flag_descriptions::kGetAllScreensMediaDescription,
kOsCrOS | kOsLacros | kOsLinux,
-@@ -7848,7 +7848,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -8661,7 +8661,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -115,7 +115,7 @@
{
"ui-debug-tools",
flag_descriptions::kUIDebugToolsName,
-@@ -8381,7 +8381,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -9243,7 +9243,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -124,3 +124,21 @@
{"document-picture-in-picture-api",
flag_descriptions::kDocumentPictureInPictureApiName,
flag_descriptions::kDocumentPictureInPictureApiDescription,
+@@ -9942,7 +9942,7 @@ const FeatureEntry kFeatureEntries[] = {
+ flag_descriptions::kWebUIOmniboxPopupDescription, kOsDesktop,
+ FEATURE_VALUE_TYPE(omnibox::kWebUIOmniboxPopup)},
+
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ {"webui-system-font", flag_descriptions::kWebUiSystemFontName,
+ flag_descriptions::kWebUiSystemFontDescription, kOsAll,
+ FEATURE_VALUE_TYPE(features::kWebUiSystemFont)},
+@@ -10134,7 +10134,7 @@ const FeatureEntry kFeatureEntries[] = {
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ {"data-retention-policies-disable-sync-types-needed",
+ flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededName,
+ flag_descriptions::kDataRetentionPoliciesDisableSyncTypesNeededDescription,
diff --git a/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc b/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
new file mode 100644
index 000000000000..aa80b2a967cd
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_apps_app__service_publishers_extension__apps.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/apps/app_service/publishers/extension_apps.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/apps/app_service/publishers/extension_apps.cc
+@@ -25,7 +25,7 @@ ExtensionApps::~ExtensionApps() = default;
+
+ bool ExtensionApps::Accepts(const extensions::Extension* extension) {
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ if (extensions::IsExtensionUnsupportedDeprecatedApp(profile(),
+ extension->id())) {
+ return false;
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 27d9c6172e70..c76e215b2039 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,4 +1,4 @@
---- 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.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.cc
@@ -20,7 +20,7 @@
#include "extensions/common/extension.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/browser_window.h"
-@@ -124,7 +124,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
+@@ -138,7 +138,7 @@ bool OpenExtensionApplicationTab(Profile* profile, con
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
index 93acde37179f..1690620972dd 100644
--- a/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
+++ b/www/iridium/files/patch-chrome_browser_apps_platform__apps_platform__app__launch.h
@@ -1,11 +1,11 @@
---- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2022-03-28 18:11:04 UTC
+--- chrome/browser/apps/platform_apps/platform_app_launch.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/apps/platform_apps/platform_app_launch.h
-@@ -36,7 +36,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
- // and false otherwise.
+@@ -37,7 +37,7 @@ bool OpenExtensionApplicationWindow(Profile* profile,
bool OpenExtensionApplicationTab(Profile* profile, const std::string& app_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)
// Opens the deprecated Chrome Apps flow if |app_id| refers to a Chrome App and
// Chrome Apps are deprecated on the |profile|. Returns true if that was the
// case, or false otherwise.
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 f51b9df4224f..ca3973edcbf9 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,6 +1,6 @@
---- chrome/browser/background/background_mode_manager.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/background/background_mode_manager.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/background/background_mode_manager.cc
-@@ -889,7 +889,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
+@@ -874,7 +874,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();
diff --git a/www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc b/www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc
index 2482cca382d1..6b53b5dad712 100644
--- a/www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc
+++ b/www/iridium/files/patch-chrome_browser_background_background__mode__optimizer.cc
@@ -1,11 +1,11 @@
---- chrome/browser/background/background_mode_optimizer.cc.orig 2022-03-28 18:11:04 UTC
+--- chrome/browser/background/background_mode_optimizer.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/background/background_mode_optimizer.cc
@@ -31,7 +31,7 @@ std::unique_ptr<BackgroundModeOptimizer> BackgroundMod
- switches::kKeepAliveForTest))
return nullptr;
+ }
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart))
+ if (base::FeatureList::IsEnabled(features::kBackgroundModeAllowRestart)) {
return base::WrapUnique(new BackgroundModeOptimizer());
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ }
diff --git a/www/iridium/files/patch-chrome_browser_browser__features.cc b/www/iridium/files/patch-chrome_browser_browser__features.cc
index da5e09d8d1d8..ec6a1e1d445c 100644
--- a/www/iridium/files/patch-chrome_browser_browser__features.cc
+++ b/www/iridium/files/patch-chrome_browser_browser__features.cc
@@ -1,11 +1,11 @@
---- chrome/browser/browser_features.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/browser_features.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/browser_features.cc
-@@ -24,7 +24,7 @@ BASE_FEATURE(kClosedTabCache,
- // the browser exits.
+@@ -27,7 +27,7 @@ BASE_FEATURE(kClosedTabCache,
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)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_CHROMEOS_LACROS)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
base::FEATURE_ENABLED_BY_DEFAULT);
#else
base::FEATURE_DISABLED_BY_DEFAULT);
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 f3975caec36a..6b24fcb08b46 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 2023-03-13 07:33:08 UTC
+--- chrome/browser/browser_process_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/browser_process_impl.cc
-@@ -212,7 +212,7 @@
+@@ -215,7 +215,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
-@@ -1190,7 +1190,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1207,7 +1207,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
-@@ -1450,7 +1450,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1464,7 +1464,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 09fa73902491..7bcb5043e4de 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 2023-03-13 07:33:08 UTC
+--- chrome/browser/browser_process_impl.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/browser_process_impl.h
-@@ -364,7 +364,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -378,7 +378,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_chrome__browser__interface__binders.cc b/www/iridium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index 081d524ebadf..e9fa50b5fea5 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -114,13 +114,13 @@
+@@ -119,13 +119,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
-@@ -194,7 +194,7 @@
+@@ -199,7 +199,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,7 +25,7 @@
#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"
-@@ -859,7 +859,7 @@ void PopulateChromeFrameBinders(
+@@ -886,7 +886,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -867,7 +867,7 @@ void PopulateChromeFrameBinders(
+@@ -894,7 +894,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -43,8 +43,8 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
!render_frame_host->GetParentOrOuterDocument()) {
// The service binder will reject non-primary main frames, but we still need
-@@ -932,14 +932,14 @@ void PopulateChromeWebUIFrameBinders(
- SegmentationInternalsUI>(map);
+@@ -963,14 +963,14 @@ void PopulateChromeWebUIFrameBinders(
+ commerce::CommerceInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
@@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
-@@ -1375,7 +1375,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1428,7 +1428,7 @@ void PopulateChromeWebUIFrameBinders(
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
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 5aff7b1c1799..5db05b2c3ae8 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -239,11 +239,11 @@
+@@ -244,11 +244,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -14,7 +14,7 @@
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -278,7 +278,7 @@
+@@ -283,14 +283,14 @@
// 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) || \
@@ -23,7 +23,15 @@
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
#include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
-@@ -988,7 +988,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+ #include "ui/base/pointer/touch_ui_controller.h"
+ #endif
+
+-#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/headless/headless_mode_metrics.h" // nogncheck
+ #include "chrome/browser/headless/headless_mode_util.h" // nogncheck
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+@@ -1005,7 +1005,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@@ -32,7 +40,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 .
-@@ -1044,7 +1044,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1061,7 +1061,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) || BUILDFLAG(IS_LINUX) || \
@@ -41,3 +49,12 @@
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
TouchModeStatsTracker::Initialize(
+@@ -1295,7 +1295,7 @@ void ChromeBrowserMainParts::PostProfileInit(Profile*
+ *UrlLanguageHistogramFactory::GetForBrowserContext(profile));
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ if (headless::IsHeadlessMode()) {
+ headless::ReportHeadlessActionMetrics();
+ }
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 639795f4c9fb..bae4baf4f9ad 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,6 +1,6 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig 2022-10-05 07:34:01 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
-@@ -57,13 +57,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
+@@ -54,13 +54,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
}
void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
@@ -17,7 +17,7 @@
// 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() {
+@@ -120,7 +122,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
#endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
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 b979eff2ce50..aff32c2511fc 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -417,7 +417,7 @@
+@@ -427,7 +427,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 "ui/display/screen.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"
-@@ -503,12 +503,12 @@
+@@ -516,12 +516,12 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -24,13 +24,14 @@
#include "components/crash/core/app/crash_switches.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -517,13 +517,13 @@
+@@ -530,14 +530,14 @@
#include "components/crash/content/browser/crash_handler_host_linux.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/enterprise/chrome_browser_main_extra_parts_enterprise.h"
+ #include "chrome/browser/enterprise/profile_management/profile_management_navigation_throttle.h"
#include "chrome/browser/ui/webui/app_settings/web_app_settings_navigation_throttle.h"
#endif
@@ -40,7 +41,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)
-@@ -552,11 +552,11 @@
+@@ -566,11 +566,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -54,16 +55,16 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif BUILDFLAG(IS_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -1571,7 +1571,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
- policy::policy_prefs::kPPAPISharedImagesSwapChainAllowed, true);
- registry->RegisterBooleanPref(
- policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI, false);
+@@ -1583,7 +1583,7 @@ void ChromeContentBrowserClient::RegisterLocalStatePre
+ prefs::kThrottleNonVisibleCrossOriginIframesAllowed, true);
+ registry->RegisterBooleanPref(prefs::kNewBaseUrlInheritanceBehaviorAllowed,
+ true);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kOutOfProcessSystemDnsResolutionEnabled,
true);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_ANDROID)
-@@ -1678,7 +1678,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1697,7 +1697,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@@ -72,7 +73,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1717,7 +1717,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1736,7 +1736,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.
@@ -81,7 +82,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1738,7 +1738,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@@ -90,7 +91,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif BUILDFLAG(IS_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -1757,7 +1757,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1776,7 +1776,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
chrome::AddMetricsExtraParts(main_parts.get());
@@ -99,7 +100,7 @@
main_parts->AddParts(
std::make_unique<
chrome::enterprise_util::ChromeBrowserMainExtraPartsEnterprise>());
-@@ -2576,6 +2576,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2599,6 +2599,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@@ -108,7 +109,7 @@
#elif BUILDFLAG(IS_CHROMEOS)
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2957,7 +2959,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2996,7 +2998,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@@ -117,7 +118,7 @@
// Opt into a hardened stack canary mitigation if it hasn't already been
// force-disabled.
if (!browser_command_line.HasSwitch(switches::kChangeStackGuardOnFork)) {
-@@ -4475,7 +4477,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -4468,7 +4470,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -126,7 +127,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4997,14 +4999,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4989,7 +4991,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -135,6 +136,7 @@
MaybeAddThrottle(
WebAppSettingsNavigationThrottle::MaybeCreateThrottleFor(handle),
&throttles);
+@@ -4999,7 +5001,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || \
@@ -143,7 +145,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -5043,7 +5045,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -5038,7 +5040,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
handle));
}
@@ -152,7 +154,7 @@
MaybeAddThrottle(browser_switcher::BrowserSwitcherNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -6670,7 +6672,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
+@@ -6755,7 +6757,7 @@ bool ChromeContentBrowserClient::ShouldSandboxNetworkS
}
bool ChromeContentBrowserClient::ShouldRunOutOfProcessSystemDnsResolution() {
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 a5a4d86dc80f..85053b9ddeec 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 2023-03-13 07:33:08 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -444,7 +444,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -459,7 +459,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_defaults.cc b/www/iridium/files/patch-chrome_browser_defaults.cc
index 209dcd00c766..ace3e2479c00 100644
--- a/www/iridium/files/patch-chrome_browser_defaults.cc
+++ b/www/iridium/files/patch-chrome_browser_defaults.cc
@@ -1,8 +1,8 @@
---- chrome/browser/defaults.cc.orig 2022-10-05 07:34:01 UTC
+--- chrome/browser/defaults.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/defaults.cc
-@@ -52,7 +52,7 @@ const bool kSyncAutoStarts = true;
- const bool kSyncAutoStarts = false;
- #endif
+@@ -46,7 +46,7 @@ const bool kShowHelpMenuItemIcon = false;
+
+ const bool kDownloadPageHasShowInFolder = true;
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
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 dd239847cf28..800bd075e772 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,6 +1,6 @@
---- chrome/browser/dev_ui_browser_resources.grd.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
-@@ -33,7 +33,7 @@ This file specifies browser resources for developer-fa
+@@ -35,7 +35,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" />
diff --git a/www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc b/www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
deleted file mode 100644
index 21f4fa9a5036..000000000000
--- a/www/iridium/files/patch-chrome_browser_devtools_devtools__eye__dropper.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/devtools/devtools_eye_dropper.cc.orig 2023-04-22 17:45:15 UTC
-+++ chrome/browser/devtools/devtools_eye_dropper.cc
-@@ -185,7 +185,7 @@ void DevToolsEyeDropper::UpdateCursor() {
- // magnified projection only with centered hotspot.
- // Mac Retina requires cursor to be > 120px in order to render smoothly.
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- const float kCursorSize = 63;
- const float kDiameter = 63;
- const float kHotspotOffset = 32;
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 5ddb95239fb7..a7a4e1585ff1 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,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1561,7 +1561,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1567,7 +1567,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
-@@ -1675,7 +1675,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1686,7 +1686,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) || \
@@ -18,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()) {
-@@ -1721,7 +1721,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
+@@ -1732,7 +1732,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
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 51a9e4866e20..64dab347bbe3 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/download/download_item_model.cc
-@@ -765,7 +765,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -766,7 +766,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();
-@@ -808,7 +808,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -809,7 +809,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
base::UmaHistogramBoolean("Download.SetAlwaysOpenTo", !is_checked);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
if (download_commands->CanOpenPdfInSystemViewer()) {
prefs->SetShouldOpenPdfInSystemReader(!is_checked);
SetShouldPreferOpeningInBrowser(is_checked);
-@@ -1220,7 +1220,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
+@@ -1232,7 +1232,7 @@ void DownloadItemModel::DetermineAndSetShouldPreferOpe
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 2199245975be..bffd0c25adfa 100644
--- a/www/iridium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,25 +1,25 @@
---- chrome/browser/download/download_prefs.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -11,6 +11,7 @@
+ #include <vector>
#include "base/check.h"
- #include "base/cxx17_backports.h"
+#include "base/command_line.h"
#include "base/feature_list.h"
#include "base/files/file_util.h"
#include "base/functional/bind.h"
-@@ -64,6 +65,10 @@
+@@ -63,6 +64,10 @@
#include "chrome/browser/download/bubble/download_bubble_prefs.h"
#endif
-+#if BUILDFLAG(IS_OPENBSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
+#endif
+
using content::BrowserContext;
using content::BrowserThread;
using content::DownloadManager;
-@@ -74,7 +79,7 @@ namespace {
+@@ -73,7 +78,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;
-@@ -185,7 +190,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
+@@ -181,7 +186,7 @@ DownloadPrefs::DownloadPrefs(Profile* profile) : profi
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -37,7 +37,7 @@
should_open_pdf_in_system_reader_ =
prefs->GetBoolean(prefs::kOpenPdfDownloadInSystemReader);
#endif
-@@ -312,7 +317,7 @@ void DownloadPrefs::RegisterProfilePrefs(
+@@ -311,7 +316,7 @@ void DownloadPrefs::RegisterProfilePrefs(
registry->RegisterTimePref(prefs::kDownloadLastCompleteTime,
/*default_value=*/base::Time());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -485,7 +490,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -484,7 +489,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -55,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
-@@ -517,7 +522,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -516,7 +521,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -64,7 +64,7 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
-@@ -548,7 +553,7 @@ void DownloadPrefs::SaveAutoOpenState() {
+@@ -547,7 +552,7 @@ void DownloadPrefs::SaveAutoOpenState() {
bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
#if BUILDFLAG(IS_CHROMEOS)
return false; // There is no UI for auto-open on ChromeOS.
@@ -73,7 +73,7 @@
return ShouldOpenPdfInSystemReader();
#else
return false;
-@@ -672,7 +677,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -671,7 +676,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_enterprise_connectors_analysis_content__analysis__delegate.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc
new file mode 100644
index 000000000000..937fe698e884
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_analysis_content__analysis__delegate.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/enterprise/connectors/analysis/content_analysis_delegate.cc
+@@ -52,7 +52,7 @@
+ #include "ui/base/l10n/l10n_util.h"
+ #include "ui/base/ui_base_types.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/content_analysis_sdk_manager.h" // nogncheck
+ #endif
+
+@@ -555,7 +555,7 @@ void ContentAnalysisDelegate::PageRequestCallback(
+ bool ContentAnalysisDelegate::UploadData() {
+ upload_start_time_ = base::TimeTicks::Now();
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // If this is a local content analysis, check if the local agent is ready.
+ // If not, abort early. This is to prevent doing a lot of work, like reading
+ // files into memory or calcuating SHA256 hashes and prevent a flash of the
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc
new file mode 100644
index 000000000000..bbc53c78acf9
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.cc
@@ -0,0 +1,82 @@
+--- chrome/browser/enterprise/connectors/connectors_manager.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/enterprise/connectors/connectors_manager.cc
+@@ -16,7 +16,7 @@
+ #include "components/prefs/pref_service.h"
+ #include "url/gurl.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/content_analysis_sdk_manager.h" // nogncheck
+ #include "chrome/browser/ui/browser.h"
+ #include "chrome/browser/ui/browser_list.h"
+@@ -25,7 +25,7 @@
+
+ namespace enterprise_connectors {
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ namespace {
+
+ static constexpr enterprise_connectors::AnalysisConnector
+@@ -51,7 +51,7 @@ ConnectorsManager::ConnectorsManager(
+ DCHECK(browser_crash_event_router_) << "Crash event router is null";
+ DCHECK(extension_install_event_router_) << "Extension event router is null";
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Start observing tab strip models for all browsers.
+ BrowserList* browser_list = BrowserList::GetInstance();
+ for (Browser* browser : *browser_list) {
+@@ -62,14 +62,14 @@ ConnectorsManager::ConnectorsManager(
+
+ if (observe_prefs) {
+ StartObservingPrefs(pref_service);
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ MaybeCloseLocalContentAnalysisAgentConnection();
+ #endif
+ }
+ extension_install_event_router_->StartObserving();
+ }
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ConnectorsManager::~ConnectorsManager() {
+ BrowserList* browser_list = BrowserList::GetInstance();
+ browser_list->RemoveObserver(this);
+@@ -99,7 +99,7 @@ bool ConnectorsManager::IsConnectorEnabled(AnalysisCon
+ base::FeatureList::IsEnabled(kLocalContentAnalysisEnabled);
+ }
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool ConnectorsManager::IsConnectorEnabledForLocalAgent(
+ AnalysisConnector connector) const {
+ if (!IsConnectorEnabled(connector)) {
+@@ -178,7 +178,7 @@ absl::optional<AnalysisSettings> ConnectorsManager::Ge
+ }
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void ConnectorsManager::OnBrowserAdded(Browser* browser) {
+ browser->tab_strip_model()->AddObserver(this);
+ }
+@@ -241,7 +241,7 @@ void ConnectorsManager::CacheAnalysisConnectorPolicy(
+ service_settings, *service_provider_config_);
+ }
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void ConnectorsManager::MaybeCloseLocalContentAnalysisAgentConnection() {
+ for (auto connector : kLocalAnalysisConnectors) {
+ if (IsConnectorEnabledForLocalAgent(connector)) {
+@@ -257,7 +257,7 @@ void ConnectorsManager::MaybeCloseLocalContentAnalysis
+
+ void ConnectorsManager::OnPrefChanged(AnalysisConnector connector) {
+ CacheAnalysisConnectorPolicy(connector);
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ MaybeCloseLocalContentAnalysisAgentConnection();
+ #endif
+ }
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h
new file mode 100644
index 000000000000..c34d432f334d
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__manager.h
@@ -0,0 +1,56 @@
+--- chrome/browser/enterprise/connectors/connectors_manager.h.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/enterprise/connectors/connectors_manager.h
+@@ -16,7 +16,7 @@
+ #include "third_party/abseil-cpp/absl/types/optional.h"
+ #include "url/gurl.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/ui/browser_list_observer.h"
+ #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+@@ -31,7 +31,7 @@ class BrowserCrashEventRouter;
+ // Manages access to Connector policies for a given profile. This class is
+ // responsible for caching the Connector policies, validate them against
+ // approved service providers and provide a simple interface to them.
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ class ConnectorsManager : public BrowserListObserver,
+ public TabStripModelObserver {
+ #else
+@@ -51,7 +51,7 @@ class ConnectorsManager {
+ PrefService* pref_service,
+ const ServiceProviderConfig* config,
+ bool observe_prefs = true);
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ~ConnectorsManager() override;
+ #else
+ ~ConnectorsManager();
+@@ -81,7 +81,7 @@ class ConnectorsManager {
+ bool IsConnectorEnabled(AnalysisConnector connector) const;
+ bool IsConnectorEnabled(ReportingConnector connector) const;
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Check if the corresponding connector is enabled for any local agent.
+ bool IsConnectorEnabledForLocalAgent(AnalysisConnector connector) const;
+ #endif
+@@ -109,7 +109,7 @@ class ConnectorsManager {
+ const;
+
+ private:
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // BrowserListObserver overrides:
+ void OnBrowserAdded(Browser* browser) override;
+ void OnBrowserRemoved(Browser* browser) override;
+@@ -132,7 +132,7 @@ class ConnectorsManager {
+ void CacheAnalysisConnectorPolicy(AnalysisConnector connector) const;
+ void CacheReportingConnectorPolicy(ReportingConnector connector);
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Close connection with local agent if all the relevant connectors are turned
+ // off for it.
+ void MaybeCloseLocalContentAnalysisAgentConnection();
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__prefs.cc b/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__prefs.cc
deleted file mode 100644
index ab4bdf9fb86d..000000000000
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_connectors__prefs.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/enterprise/connectors/connectors_prefs.cc.orig 2023-04-22 17:45:15 UTC
-+++ chrome/browser/enterprise/connectors/connectors_prefs.cc
-@@ -69,7 +69,7 @@ void RegisterProfilePrefs(PrefRegistrySimple* registry
- }
-
- void RegisterLocalStatePrefs(PrefRegistrySimple* registry) {
--#if !BUILDFLAG(IS_FUCHSIA)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_BSD)
- registry->RegisterInt64Pref(kLatestCrashReportCreationTime, 0);
- #endif
- }
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 7ec5956b4913..5f4a6f5e6c5d 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,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.cc
@@ -11,7 +11,7 @@
#include "chrome/browser/profiles/profile.h"
@@ -7,7 +7,7 @@
-#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"
- #include "chrome/browser/enterprise/connectors/device_trust/browser/browser_device_trust_connector_service.h"
+ #include "chrome/browser/enterprise/connectors/device_trust/browser/signing_key_policy_observer.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
@@ -41,7 +41,7 @@ DeviceTrustConnectorService* DeviceTrustConnectorServi
@@ -20,7 +20,7 @@
return false;
@@ -77,7 +77,7 @@ KeyedService* DeviceTrustConnectorServiceFactory::Buil
- DeviceTrustConnectorService* service = nullptr;
+ auto* service = new DeviceTrustConnectorService(profile->GetPrefs());
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
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 eed7ee8b3858..0f2d66f41245 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,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.cc
@@ -21,7 +21,7 @@
#include "components/policy/core/common/management/management_service.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/enterprise/connectors/device_trust/attestation/desktop/desktop_attestation_service.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
-@@ -75,7 +75,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
+@@ -78,7 +78,7 @@ DeviceTrustServiceFactory::DeviceTrustServiceFactory()
DependsOn(DeviceTrustConnectorServiceFactory::GetInstance());
DependsOn(policy::ManagementServiceFactory::GetInstance());
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 87fc1e4b6979..46b7ca342539 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,4 +1,4 @@
---- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/enterprise/connectors/device_trust/signals/signals_service_factory.cc
@@ -18,7 +18,7 @@
#include "chrome/browser/profiles/profile.h"
@@ -9,12 +9,12 @@
#include "base/check.h"
#include "chrome/browser/enterprise/connectors/device_trust/signals/decorators/browser/browser_signals_decorator.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
-@@ -55,7 +55,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
+@@ -56,7 +56,7 @@ std::unique_ptr<SignalsService> CreateSignalsService(P
enterprise_signals::ContextInfoFetcher::CreateInstance(
profile, ConnectorsServiceFactory::GetForBrowserContext(profile))));
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- policy::CloudPolicyStore* store = nullptr;
- // Managed device.
+ policy::CloudPolicyStore* browser_cloud_policy_store = nullptr;
+ if (management_service->HasManagementAuthority(
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
index 938eb9c915a2..0291767e0e0c 100644
--- 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
@@ -1,18 +1,18 @@
---- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.cc
-@@ -14,7 +14,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter(
- if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) {
- return;
- }
+@@ -11,7 +11,7 @@ namespace enterprise_connectors {
+
+ BrowserCrashEventRouter::BrowserCrashEventRouter(
+ content::BrowserContext* context) {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
CrashReportingContext::GetInstance();
Profile* profile = Profile::FromBrowserContext(context);
-@@ -27,7 +27,7 @@ BrowserCrashEventRouter::~BrowserCrashEventRouter() {
- if (!base::FeatureList::IsEnabled(kBrowserCrashEventsEnabled)) {
- return;
- }
+@@ -21,7 +21,7 @@ BrowserCrashEventRouter::BrowserCrashEventRouter(
+ }
+
+ BrowserCrashEventRouter::~BrowserCrashEventRouter() {
-#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
CrashReportingContext* crash_reporting_context =
diff --git a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.h b/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.h
deleted file mode 100644
index 65be761b20f5..000000000000
--- a/www/iridium/files/patch-chrome_browser_enterprise_connectors_reporting_crash__reporting__context.h
+++ /dev/null
@@ -1,29 +0,0 @@
---- chrome/browser/enterprise/connectors/reporting/crash_reporting_context.h.orig 2023-04-22 17:45:15 UTC
-+++ chrome/browser/enterprise/connectors/reporting/crash_reporting_context.h
-@@ -10,7 +10,7 @@
- #include "chrome/browser/enterprise/connectors/reporting/browser_crash_event_router.h"
- #include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
- #include "third_party/crashpad/crashpad/client/crash_report_database.h"
- #endif
-
-@@ -29,7 +29,7 @@ class CrashReportingContext
- CrashReportingContext operator=(CrashReportingContext&&) = delete;
- ~CrashReportingContext() override;
-
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
- static CrashReportingContext* GetInstance();
-
- void AddProfile(BrowserCrashEventRouter* router, Profile* profile);
-@@ -51,7 +51,7 @@ class CrashReportingContext
- #endif
- };
-
--#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH)
-+#if !BUILDFLAG(IS_FUCHSIA) && !BUILDFLAG(IS_CHROMEOS_ASH) && !BUILDFLAG(IS_BSD)
-
- // Utility function to parse reports from a crash database that were
- // created past a given timestamp. Included in header for testing.
diff --git a/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn b/www/iridium/files/patch-chrome_browser_extensions_BUILD.gn
index ca75d956e31b..cfa2635898f1 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1340,6 +1340,10 @@ static_library("extensions") {
+@@ -1350,6 +1350,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc b/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
index 726dcd4510d7..9355de497358 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_api__browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/extensions/api/api_browser_context_keyed_service_factories.cc
-@@ -41,7 +41,7 @@
+@@ -42,7 +42,7 @@
#include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
-@@ -100,7 +100,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+@@ -102,7 +102,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
extensions::SidePanelService::GetFactoryInstance();
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 87d22d6cfe3d..de984b876b1c 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,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
@@ -32,7 +32,7 @@
#include "components/reporting/util/statusor.h"
@@ -9,7 +9,7 @@
#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"
-@@ -150,7 +150,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
+@@ -149,7 +149,7 @@ api::enterprise_reporting_private::ContextInfo ToConte
return info;
}
@@ -18,7 +18,7 @@
device_signals::SignalsAggregationRequest CreateAggregationRequest(
device_signals::SignalName signal_name) {
-@@ -211,7 +211,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -210,7 +210,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
@@ -27,7 +27,7 @@
EnterpriseReportingPrivateGetPersistentSecretFunction::
EnterpriseReportingPrivateGetPersistentSecretFunction() = default;
-@@ -638,7 +638,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
+@@ -637,7 +637,7 @@ void EnterpriseReportingPrivateEnqueueRecordFunction::
}
#endif
diff --git a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
index 0be3f412e370..dc88316a6e62 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_api_passwords__private_passwords__private__delegate__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/extensions/api/passwords_private/passwords_private_delegate_impl.cc
-@@ -523,7 +523,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
+@@ -534,7 +534,7 @@ void PasswordsPrivateDelegateImpl::OsReauthCall(
}
void PasswordsPrivateDelegateImpl::OsReauthTimeoutCall() {
@@ -8,4 +8,4 @@
+#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
PasswordsPrivateEventRouter* router =
PasswordsPrivateEventRouterFactory::GetForProfile(profile_);
- if (router)
+ if (router) {
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 cfed602a4c5d..52266961dc78 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,15 +1,15 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -191,7 +191,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -194,7 +194,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+ (*s_allowlist)[::prefs::kSidePanelHorizontalAlignment] =
+ settings_api::PrefType::PREF_TYPE_BOOLEAN;
- // 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)
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
-@@ -203,7 +203,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -206,7 +206,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_STRING;
(*s_allowlist)[::prefs::kPolicyThemeColor] =
settings_api::PrefType::PREF_TYPE_NUMBER;
diff --git a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index 0679ec5222a9..81b904d1e586 100644
--- a/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
-@@ -819,7 +819,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -829,7 +829,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
-@@ -847,7 +847,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -857,7 +857,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.
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 860a206e64d4..a603dada5414 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,7 +1,7 @@
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -313,7 +313,7 @@ const struct {
- {base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
+@@ -317,7 +317,7 @@ const struct {
+ FILE_PATH_LITERAL("Library/Mobile Documents/com~apple~CloudDocs"),
kDontBlockChildren},
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc
index 03352757575e..eab51c9ad7d2 100644
--- a/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc
+++ b/www/iridium/files/patch-chrome_browser_first__run_first__run__internal__linux.cc
@@ -1,16 +1,16 @@
---- chrome/browser/first_run/first_run_internal_linux.cc.orig 2022-04-03 12:23:22 UTC
+--- chrome/browser/first_run/first_run_internal_linux.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/first_run/first_run_internal_linux.cc
@@ -21,7 +21,13 @@ bool IsOrganicFirstRun() {
base::FilePath InitialPrefsPath() {
// The standard location of the initial prefs is next to the chrome binary.
- base::FilePath initial_prefs;
+ base::FilePath dir_exe;
+#if BUILDFLAG(IS_OPENBSD)
-+ initial_prefs = base::FilePath("/etc/iridium");
++ dir_exe = base::FilePath("/etc/iridium");
+#elif BUILDFLAG(IS_FREEBSD)
-+ initial_prefs = base::FilePath("/usr/local/etc/iridium");
++ dir_exe = base::FilePath("/usr/local/etc/iridium");
+#else
- initial_prefs = base::FilePath("/etc/iridium-browser");
+ dir_exe = base::FilePath("/etc/iridium-browser");
+#endif
- base::FilePath new_path = initial_prefs.AppendASCII(installer::kInitialPrefs);
- if (base::PathIsReadable(new_path))
- return new_path;
+ return installer::InitialPreferences::Path(dir_exe);
+ }
+
diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc
index 1afffb3ec71f..d5ab00e2ab25 100644
--- a/www/iridium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,15 +1,24 @@
---- chrome/browser/flag_descriptions.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -6166,7 +6166,7 @@ const char kLibAssistantV2MigrationDescription[] =
+@@ -2423,7 +2423,7 @@ const char kWebUIOmniboxPopupName[] = "WebUI Omnibox P
+ const char kWebUIOmniboxPopupDescription[] =
+ "If enabled, shows the omnibox suggestions popup in WebUI.";
+
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ const char kWebUiSystemFontName[] = "WebUI System font";
+ const char kWebUiSystemFontDescription[] =
+ "If enabled, all WebUI surfaces will use the default UI font of the "
+@@ -6695,7 +6695,7 @@ const char kLibAssistantV2MigrationDescription[] =
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- const char kGetDisplayMediaSetName[] = "GetDisplayMediaSet API";
- const char kGetDisplayMediaSetDescription[] =
- "When enabled, the getDisplayMediaSet API for capturing multiple surfaces "
-@@ -6402,7 +6402,7 @@ const char kSearchWebInSidePanelDescription[] =
+ const char kGetAllScreensMediaName[] = "GetAllScreensMedia API";
+ const char kGetAllScreensMediaDescription[] =
+ "When enabled, the getAllScreensMedia API for capturing multiple screens "
+@@ -6926,7 +6926,7 @@ const char kSearchWebInSidePanelDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +27,7 @@
const char kQuickCommandsName[] = "Quick Commands";
const char kQuickCommandsDescription[] =
"Enable a text interface to browser features. Invoke with Ctrl-Space.";
-@@ -6411,7 +6411,7 @@ const char kQuickCommandsDescription[] =
+@@ -6935,7 +6935,7 @@ const char kQuickCommandsDescription[] =
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +36,16 @@
const char kFollowingFeedSidepanelName[] = "Following feed in the sidepanel";
const char kFollowingFeedSidepanelDescription[] =
"Enables the following feed in the sidepanel.";
-@@ -6432,7 +6432,7 @@ const char kWebShareDescription[] =
+@@ -6957,7 +6957,7 @@ const char kEnableProtoApiForClassifyUrlDescription[]
+ "instead of JSON.";
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ const char kUseOutOfProcessVideoDecodingName[] =
+ "Use out-of-process video decoding (OOP-VD)";
+ const char kUseOutOfProcessVideoDecodingDescription[] =
+@@ -6975,7 +6975,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -36,7 +54,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -6452,7 +6452,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
+@@ -6995,7 +6995,7 @@ const char kWebBluetoothConfirmPairingSupportDescripti
"Bluetooth";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -45,7 +63,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -6466,7 +6466,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
+@@ -7009,7 +7009,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -54,7 +72,7 @@
const char kAsyncDnsName[] = "Async DNS resolver";
const char kAsyncDnsDescription[] = "Enables the built-in DNS resolver.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
-@@ -6567,7 +6567,7 @@ const char kElasticOverscrollDescription[] =
+@@ -7110,7 +7110,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -63,3 +81,12 @@
const char kUIDebugToolsName[] = "Debugging tools for UI";
const char kUIDebugToolsDescription[] =
"Enables additional keyboard shortcuts to help debugging.";
+@@ -7139,7 +7139,7 @@ const char kSigninInterceptBubbleV2Description[] =
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ const char kDataRetentionPoliciesDisableSyncTypesNeededName[] =
+ "Data Retention Policies Disable Sync Types";
+ const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[] =
diff --git a/www/iridium/files/patch-chrome_browser_flag__descriptions.h b/www/iridium/files/patch-chrome_browser_flag__descriptions.h
index c535111bc7e4..18a38d432525 100644
--- a/www/iridium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/iridium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,15 +1,24 @@
---- chrome/browser/flag_descriptions.h.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/flag_descriptions.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -3568,7 +3568,7 @@ extern const char kLacrosScreenCoordinatesEnabledName[
- extern const char kLacrosScreenCoordinatesEnabledDescription[];
+@@ -1360,7 +1360,7 @@ extern const char kOmniboxUpdatedConnectionSecurityInd
+ extern const char kWebUIOmniboxPopupName[];
+ extern const char kWebUIOmniboxPopupDescription[];
+
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ extern const char kWebUiSystemFontName[];
+ extern const char kWebUiSystemFontDescription[];
+ #endif
+@@ -3856,7 +3856,7 @@ extern const char kLacrosMergeIcuDataFileName[];
+ extern const char kLacrosMergeIcuDataFileDescription[];
#endif // #if BUILDFLAG(IS_CHROMEOS_LACROS)
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- extern const char kGetDisplayMediaSetName[];
- extern const char kGetDisplayMediaSetDescription[];
-
-@@ -3690,14 +3690,14 @@ extern const char kSearchWebInSidePanelDescription[];
+ extern const char kGetAllScreensMediaName[];
+ extern const char kGetAllScreensMediaDescription[];
+ #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+@@ -3980,14 +3980,14 @@ extern const char kSearchWebInSidePanelDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -26,7 +35,7 @@
extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -3707,7 +3707,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
+@@ -3997,7 +3997,7 @@ extern const char kWebBluetoothConfirmPairingSupportNa
extern const char kWebBluetoothConfirmPairingSupportDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
@@ -35,7 +44,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3717,7 +3717,7 @@ extern const char kOzonePlatformHintName[];
+@@ -4007,7 +4007,7 @@ extern const char kOzonePlatformHintName[];
extern const char kOzonePlatformHintDescription[];
#endif // BUILDFLAG(IS_LINUX)
@@ -44,7 +53,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
-@@ -3725,13 +3725,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
+@@ -4015,13 +4015,13 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
@@ -60,7 +69,16 @@
extern const char kFollowingFeedSidepanelName[];
extern const char kFollowingFeedSidepanelDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -3811,7 +3811,7 @@ extern const char kElasticOverscrollDescription[];
+@@ -4037,7 +4037,7 @@ extern const char kEnableProtoApiForClassifyUrlName[];
+ extern const char kEnableProtoApiForClassifyUrlDescription[];
+ #endif // BUILDFLAG(ENABLE_SUPERVISED_USERS)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ extern const char kUseOutOfProcessVideoDecodingName[];
+ extern const char kUseOutOfProcessVideoDecodingDescription[];
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -4111,7 +4111,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
@@ -69,3 +87,12 @@
extern const char kUIDebugToolsName[];
extern const char kUIDebugToolsDescription[];
+@@ -4129,7 +4129,7 @@ extern const char kSigninInterceptBubbleV2Description[
+ #endif
+
+ #if BUILDFLAG(IS_WIN) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || \
+- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ extern const char kDataRetentionPoliciesDisableSyncTypesNeededName[];
+ extern const char kDataRetentionPoliciesDisableSyncTypesNeededDescription[];
+ #endif
diff --git a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc
index bfd9efa026c3..f8905f9f5e24 100644
--- a/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc
+++ b/www/iridium/files/patch-chrome_browser_headless_headless__mode__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/headless/headless_mode_util.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/headless/headless_mode_util.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/headless/headless_mode_util.cc
@@ -10,12 +10,12 @@
// New headless mode is available on Linux, Windows and Mac platforms.
@@ -15,10 +15,10 @@
#include "ui/gl/gl_switches.h" // nogncheck
#include "ui/ozone/public/ozone_switches.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX)
-@@ -72,7 +72,7 @@ void SetUpCommandLine(const base::CommandLine* command
- base::CommandLine::ForCurrentProcess()->AppendSwitch(
- ::switches::kNoErrorDialogs);
- }
+@@ -78,7 +78,7 @@ void SetUpCommandLine(const base::CommandLine* command
+ base::CommandLine::ForCurrentProcess()->AppendSwitch(
+ switches::kDisableLazyLoading);
+
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Headless mode on Linux relies on ozone/headless platform.
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc
index 1d8645eb670a..d4f1e0532f60 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_capture__policy__utils.cc
@@ -1,20 +1,20 @@
---- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/media/webrtc/capture_policy_utils.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/media/webrtc/capture_policy_utils.cc
-@@ -118,7 +118,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
+@@ -124,7 +124,7 @@ AllowedScreenCaptureLevel GetAllowedCaptureLevel(const
+ }
- bool IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite(
- content::BrowserContext* context) {
+ bool IsGetAllScreensMediaAllowedForAnySite(content::BrowserContext* context) {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
Profile* profile = Profile::FromBrowserContext(context);
if (!profile) {
return false;
-@@ -145,7 +145,7 @@ bool IsGetDisplayMediaSetSelectAllScreensAllowedForAny
- bool IsGetDisplayMediaSetSelectAllScreensAllowed(
- content::BrowserContext* context,
- const GURL& url) {
+@@ -160,7 +160,7 @@ bool IsGetAllScreensMediaAllowedForAnySite(content::Br
+
+ bool IsGetAllScreensMediaAllowed(content::BrowserContext* context,
+ const GURL& url) {
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
Profile* profile = Profile::FromBrowserContext(context);
- if (!profile)
+ if (!profile) {
return false;
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
index 8dfc95378e72..3f34a6fc3b4d 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_chrome__screen__enumerator.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/media/webrtc/chrome_screen_enumerator.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/media/webrtc/chrome_screen_enumerator.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/shell.h"
#include "ui/aura/window.h"
@@ -9,7 +9,7 @@
#include "base/functional/callback.h"
#include "content/public/browser/desktop_capture.h"
#endif
-@@ -31,7 +31,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
+@@ -32,7 +32,7 @@ base::LazyInstance<std::vector<aura::Window*>>::Destru
root_windows_for_testing_ = LAZY_INSTANCE_INITIALIZER;
} // namespace
@@ -18,7 +18,7 @@
namespace {
base::LazyInstance<std::unique_ptr<webrtc::DesktopCapturer>>::DestructorAtExit
g_desktop_capturer_for_testing = LAZY_INSTANCE_INITIALIZER;
-@@ -77,7 +77,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
+@@ -78,7 +78,7 @@ blink::mojom::StreamDevicesSetPtr EnumerateScreens(
return stream_devices_set;
}
@@ -27,7 +27,7 @@
blink::mojom::StreamDevicesSetPtr EnumerateScreens(
blink::mojom::MediaStreamType stream_type) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
-@@ -128,7 +128,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
+@@ -129,7 +129,7 @@ void ChromeScreenEnumerator::SetRootWindowsForTesting(
root_windows_for_testing_.Get() = std::move(root_windows);
}
@@ -36,9 +36,9 @@
void ChromeScreenEnumerator::SetDesktopCapturerForTesting(
std::unique_ptr<webrtc::DesktopCapturer> capturer) {
g_desktop_capturer_for_testing.Get() = std::move(capturer);
-@@ -144,7 +144,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
- DCHECK(base::FeatureList::IsEnabled(
- features::kGetDisplayMediaSetAutoSelectAllScreens));
+@@ -143,7 +143,7 @@ void ChromeScreenEnumerator::EnumerateScreens(
+ DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
+ DCHECK(base::FeatureList::IsEnabled(blink::features::kGetAllScreensMedia));
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
index c63090263589..547bd04114df 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__event__log__uploader.cc
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/media/webrtc/webrtc_event_log_uploader.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/media/webrtc/webrtc_event_log_uploader.cc
-@@ -41,7 +41,7 @@ const char kProduct[] = "Chrome";
+@@ -42,7 +42,7 @@ const char kProduct[] = "Chrome";
const char kProduct[] = "Chrome_Mac";
#elif BUILDFLAG(IS_CHROMEOS_ASH)
const char kProduct[] = "Chrome_ChromeOS";
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 a1c5a7ef3233..379fe00221fd 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/media/webrtc/webrtc_log_uploader.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/media/webrtc/webrtc_log_uploader.cc
-@@ -363,6 +363,10 @@ void WebRtcLogUploader::SetupMultipart(
+@@ -372,6 +372,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 03ca3609fe1a..fba01b2bc6fb 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,7 +1,7 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.cc
-@@ -23,10 +23,10 @@
- #include "content/public/browser/browser_context.h"
+@@ -25,10 +25,10 @@
+ #include "components/webrtc_logging/browser/text_log_list.h"
#include "content/public/browser/render_process_host.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -13,7 +13,7 @@
using webrtc_event_logging::WebRtcEventLogManager;
-@@ -277,7 +277,7 @@ void WebRtcLoggingController::StartEventLogging(
+@@ -284,7 +284,7 @@ void WebRtcLoggingController::StartEventLogging(
web_app_id, callback);
}
@@ -22,7 +22,7 @@
void WebRtcLoggingController::GetLogsDirectory(
LogsDirectoryCallback callback,
LogsDirectoryErrorCallback error_callback) {
-@@ -322,7 +322,7 @@ void WebRtcLoggingController::GrantLogsDirectoryAccess
+@@ -329,7 +329,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_media_webrtc_webrtc__logging__controller.h b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
index 70285dc5e31f..2227982ab37c 100644
--- a/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
+++ b/www/iridium/files/patch-chrome_browser_media_webrtc_webrtc__logging__controller.h
@@ -1,6 +1,6 @@
---- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2022-12-01 10:35:46 UTC
+--- chrome/browser/media/webrtc/webrtc_logging_controller.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/media/webrtc/webrtc_logging_controller.h
-@@ -133,7 +133,7 @@ class WebRtcLoggingController
+@@ -134,7 +134,7 @@ class WebRtcLoggingController
size_t web_app_id,
const StartEventLoggingCallback& callback);
@@ -9,9 +9,9 @@
// Ensures that the WebRTC Logs directory exists and then grants render
// process access to the 'WebRTC Logs' directory, and invokes |callback| with
// the ids necessary to create a DirectoryEntry object.
-@@ -192,7 +192,7 @@ class WebRtcLoggingController
- bool success,
- const std::string& error_message);
+@@ -199,7 +199,7 @@ class WebRtcLoggingController
+
+ content::BrowserContext* GetBrowserContext() const;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
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 c1e82df0bb74..851b83485bfe 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -61,8 +61,10 @@
+@@ -67,8 +67,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -12,16 +12,25 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
-@@ -92,7 +94,7 @@
- #include "chromeos/crosapi/cpp/crosapi_constants.h"
- #endif // BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -102,7 +104,7 @@
+ #include "chromeos/startup/startup_switches.h"
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/pressure/pressure_metrics_reporter.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -495,7 +497,7 @@ void RecordStartupMetrics() {
+@@ -111,7 +113,7 @@
+ #include "components/user_manager/user_manager.h"
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/power_metrics/system_power_monitor.h"
+ #endif
+
+@@ -533,7 +535,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
@@ -30,7 +39,7 @@
shell_integration::DefaultWebClientState default_state =
shell_integration::GetDefaultBrowser();
base::UmaHistogramEnumeration("DefaultBrowser.State", default_state,
-@@ -685,7 +687,7 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
+@@ -742,11 +744,11 @@ void ChromeBrowserMainExtraPartsMetrics::PostBrowserSt
}
#endif // !BUILDFLAG(IS_ANDROID)
@@ -38,4 +47,9 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
pressure_metrics_reporter_ = std::make_unique<PressureMetricsReporter>();
#endif // BUILDFLAG(IS_LINUX)
- }
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::trace_event::TraceLog::GetInstance()->AddEnabledStateObserver(
+ power_metrics::SystemPowerMonitor::GetInstance());
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
index 281ad0ca404c..5f989fad5d27 100644
--- a/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
+++ b/www/iridium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.h
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.h
-@@ -22,7 +22,7 @@ class PowerMetricsReporter;
+@@ -32,7 +32,7 @@ class PowerMetricsReporter;
class ProcessMonitor;
#endif
@@ -9,7 +9,7 @@
class PressureMetricsReporter;
#endif // BUILDFLAG(IS_LINUX)
-@@ -88,7 +88,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
+@@ -133,7 +133,7 @@ class ChromeBrowserMainExtraPartsMetrics : public Chro
std::unique_ptr<BatteryDischargeReporter> battery_discharge_reporter_;
#endif // !BUILDFLAG(IS_ANDROID)
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 9c74e273240c..064f41541f98 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,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -176,7 +176,7 @@
+@@ -183,7 +183,7 @@
#include "chrome/notification_helper/notification_helper_constants.h"
#endif
@@ -9,7 +9,16 @@
#include "components/metrics/motherboard_metrics_provider.h"
#endif
-@@ -738,7 +738,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -209,7 +209,7 @@
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/metrics/family_link_user_metrics_provider.h"
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) ||
+ // BUILDFLAG(IS_CHROMEOS_LACROS))||BUILDFLAG(IS_ANDROID))
+@@ -795,7 +795,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::CPUMetricsProvider>());
@@ -18,7 +27,7 @@
metrics_service_->RegisterMetricsProvider(
std::make_unique<metrics::MotherboardMetricsProvider>());
#endif
-@@ -819,7 +819,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -877,7 +877,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +36,16 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
-@@ -919,7 +919,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -886,7 +886,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+
+ #if BUILDFLAG(ENABLE_SUPERVISED_USERS) && \
+ (BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_LACROS))
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
+ if (base::FeatureList::IsEnabled(
+ kExtendFamilyLinkUserLogSegmentToAllPlatforms)) {
+ metrics_service_->RegisterMetricsProvider(
+@@ -1002,7 +1002,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@@ -36,7 +54,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX)
-@@ -1103,7 +1103,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -1201,7 +1201,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_net_system__network__context__manager.cc b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.cc
index 327e6890b388..43f06e5d9679 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,4 +1,4 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/net/system_network_context_manager.cc
@@ -93,7 +93,7 @@
@@ -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)
-@@ -456,7 +456,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -445,7 +445,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@@ -27,8 +27,8 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -489,7 +489,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
- base::Unretained(this)));
+@@ -492,7 +492,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+ #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
@@ -36,7 +36,7 @@
pref_change_registrar_.Add(
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::BindRepeating(&SystemNetworkContextManager::
-@@ -539,7 +539,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kKerberosEnabled, false);
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
@@ -45,7 +45,7 @@
registry->RegisterBooleanPref(prefs::kAuthNegotiateDelegateByKdcPolicy,
false);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -568,7 +568,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -570,7 +570,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterBooleanPref(prefs::kChromeRootStoreEnabled, false);
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,8 +54,8 @@
// Note that the default value is not relevant because the pref is only
// evaluated when it is managed.
registry->RegisterBooleanPref(prefs::kEnforceLocalAnchorConstraintsEnabled,
-@@ -944,7 +944,7 @@ void SystemNetworkContextManager::UpdateExplicitlyAllo
- }
+@@ -992,7 +992,7 @@ void SystemNetworkContextManager::UpdateChromeRootStor
+ #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
diff --git a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h
index 22ba644ca500..a81a0dbcb340 100644
--- a/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h
+++ b/www/iridium/files/patch-chrome_browser_net_system__network__context__manager.h
@@ -1,7 +1,7 @@
---- chrome/browser/net/system_network_context_manager.h.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/net/system_network_context_manager.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/net/system_network_context_manager.h
-@@ -194,7 +194,7 @@ class SystemNetworkContextManager {
- void UpdateExplicitlyAllowedNetworkPorts();
+@@ -207,7 +207,7 @@ class SystemNetworkContextManager {
+ #endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
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 c6dad08cbb34..15c899ffe98f 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 2023-03-13 07:33:08 UTC
+--- chrome/browser/password_manager/password_reuse_manager_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/password_manager/password_reuse_manager_factory.cc
-@@ -101,7 +101,7 @@ KeyedService* PasswordReuseManagerFactory::BuildServic
+@@ -106,7 +106,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_policy_configuration__policy__handler__list__factory.cc b/www/iridium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index fb6e655fbb3c..41545b96de55 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,27 +1,21 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -202,17 +202,17 @@
+@@ -210,12 +210,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 "chrome/browser/enterprise/idle/action.h"
- #include "components/device_signals/core/browser/pref_names.h"
+ #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897
#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
-
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_ANDROID)
#include "chrome/browser/privacy_sandbox/privacy_sandbox_policy_handler.h"
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -755,14 +755,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -780,14 +780,14 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kManagedDefaultGeolocationSetting,
base::Value::Type::INTEGER },
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) \
@@ -38,8 +32,8 @@
{ key::kFullscreenAllowed,
prefs::kFullscreenAllowed,
base::Value::Type::BOOLEAN },
-@@ -1399,7 +1399,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
-
+@@ -1444,7 +1444,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX)
@@ -47,7 +41,7 @@
{ key::kGSSAPILibraryName,
prefs::kGSSAPILibraryName,
base::Value::Type::STRING },
-@@ -1469,18 +1469,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1514,18 +1514,18 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
prefs::kTotalMemoryLimitMb,
base::Value::Type::INTEGER },
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -69,7 +63,7 @@
{ key::kDefaultBrowserSettingEnabled,
prefs::kDefaultBrowserSettingEnabled,
base::Value::Type::BOOLEAN },
-@@ -1493,7 +1493,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1538,7 +1538,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) \
@@ -78,7 +72,7 @@
{ key::kAutoplayAllowed,
prefs::kAutoplayAllowed,
base::Value::Type::BOOLEAN },
-@@ -1597,7 +1597,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1642,7 +1642,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS)
@@ -87,7 +81,7 @@
{ key::kAlternativeBrowserPath,
browser_switcher::prefs::kAlternativeBrowserPath,
base::Value::Type::STRING },
-@@ -1684,13 +1684,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1738,13 +1738,13 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -103,7 +97,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
-@@ -1721,7 +1721,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1775,7 +1775,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
#endif // BUILDFLAG(CHROME_ROOT_STORE_POLICY_SUPPORTED)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -112,34 +106,34 @@
{ key::kEnforceLocalAnchorConstraintsEnabled,
prefs::kEnforceLocalAnchorConstraintsEnabled,
base::Value::Type::BOOLEAN },
-@@ -1750,7 +1750,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
- #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 },
-@@ -1810,7 +1810,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1857,7 +1857,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
ash::prefs::kUrlParameterToAutofillSAMLUsername,
base::Value::Type::STRING },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
- { key::kHighEfficiencyModeEnabled,
- performance_manager::user_tuning::prefs::kHighEfficiencyModeEnabled,
- base::Value::Type::BOOLEAN },
-@@ -1855,7 +1855,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
- policy::policy_prefs::kForceEnablePepperVideoDecoderDevAPI,
- base::Value::Type::BOOLEAN },
- #endif // BUILDFLAG(ENABLE_PPAPI)
+ { key::kBatterySaverModeAvailability,
+ performance_manager::user_tuning::prefs::kBatterySaverModeState,
+ base::Value::Type::INTEGER },
+@@ -1888,7 +1888,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+ prefs::kCloudApAuthEnabled,
+ base::Value::Type::INTEGER },
+ #endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ key::kOutOfProcessSystemDnsResolutionEnabled,
prefs::kOutOfProcessSystemDnsResolutionEnabled,
base::Value::Type::BOOLEAN },
-@@ -2119,7 +2119,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -1978,7 +1978,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ // Policies for all platforms - End
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ handlers->AddHandler(
+ std::make_unique<performance_manager::HighEfficiencyPolicyHandler>());
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+@@ -2177,7 +2177,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -148,7 +142,7 @@
handlers->AddHandler(
std::make_unique<enterprise_idle::IdleTimeoutPolicyHandler>());
handlers->AddHandler(
-@@ -2177,7 +2177,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2234,7 +2234,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@@ -156,8 +150,8 @@
+#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)
-@@ -2212,7 +2212,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+ handlers->AddHandler(
+@@ -2275,7 +2275,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) || \
@@ -166,16 +160,7 @@
signin_legacy_policies.push_back(std::make_unique<SimplePolicyHandler>(
key::kForceBrowserSignin, prefs::kForceBrowserSignin,
base::Value::Type::BOOLEAN));
-@@ -2559,7 +2559,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
- extensions::pref_names::kManifestV2Availability, /*min=*/0, /*max=*/3,
- /*clamp=*/false));
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- handlers->AddHandler(
- std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -2572,7 +2572,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2633,7 +2633,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif
#if BUILDFLAG(ENABLE_SPELLCHECK)
@@ -184,7 +169,7 @@
handlers->AddHandler(std::make_unique<SpellcheckLanguagePolicyHandler>());
handlers->AddHandler(
std::make_unique<SpellcheckLanguageBlocklistPolicyHandler>(
-@@ -2580,7 +2580,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2641,7 +2641,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
@@ -193,7 +178,7 @@
handlers->AddHandler(std::make_unique<SimplePolicyHandler>(
key::kAllowSystemNotifications, prefs::kAllowSystemNotifications,
base::Value::Type::BOOLEAN));
-@@ -2593,7 +2593,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2654,7 +2654,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
handlers->AddHandler(
std::make_unique<first_party_sets::FirstPartySetsOverridesPolicyHandler>(
chrome_schema));
diff --git a/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc b/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
index caaa54f0cde0..6a5b761ed10c 100644
--- a/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
+++ b/www/iridium/files/patch-chrome_browser_policy_device__management__service__configuration.cc
@@ -1,6 +1,6 @@
---- chrome/browser/policy/device_management_service_configuration.cc.orig 2022-03-28 18:11:04 UTC
+--- chrome/browser/policy/device_management_service_configuration.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/policy/device_management_service_configuration.cc
-@@ -21,7 +21,7 @@
+@@ -22,7 +22,7 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
diff --git a/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc b/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
new file mode 100644
index 000000000000..1cccf5e75d9a
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_policy_policy__value__and__status__aggregator.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/policy/policy_value_and_status_aggregator.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/policy/policy_value_and_status_aggregator.cc
+@@ -52,7 +52,7 @@
+ #include "chrome/browser/policy/value_provider/extension_policies_value_provider.h"
+ #endif // BUILDFLAG(ENABLE_EXTENSIONS)
+
+-#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/policy/core/common/cloud/profile_cloud_policy_manager.h"
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+
+@@ -98,7 +98,7 @@ std::unique_ptr<policy::PolicyStatusProvider> GetUserP
+ #else // BUILDFLAG(IS_CHROMEOS_ASH)
+ policy::CloudPolicyManager* cloud_policy_manager =
+ profile->GetUserCloudPolicyManager();
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (!cloud_policy_manager) {
+ cloud_policy_manager = profile->GetProfileCloudPolicyManager();
+ }
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 b60c85ef04de..9a70ea192d3c 100644
--- a/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,12 +1,12 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -458,13 +458,13 @@
- #include "components/os_crypt/os_crypt.h"
+@@ -464,13 +464,13 @@
#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 "components/device_signals/core/browser/pref_names.h"
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ #include "components/device_signals/core/browser/pref_names.h" // nogncheck due to crbug.com/1125897
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
@@ -16,7 +16,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -497,7 +497,7 @@
+@@ -503,7 +503,7 @@
#include "chrome/browser/sessions/session_service_log.h"
#endif
@@ -25,7 +25,7 @@
#include "ui/color/system_theme.h"
#endif
-@@ -790,7 +790,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
+@@ -708,7 +708,7 @@ const char kPluginsPluginsList[] = "plugins.plugins_li
const char kPluginsShowDetails[] = "plugins.show_details";
// Deprecated 02/2023.
@@ -34,7 +34,7 @@
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -872,7 +872,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
+@@ -902,7 +902,7 @@ void RegisterLocalStatePrefsForMigration(PrefRegistryS
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Deprecated 02/2023.
@@ -42,8 +42,8 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterDictionaryPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
- }
-@@ -985,7 +985,7 @@ void RegisterProfilePrefsForMigration(
+
+@@ -1027,7 +1027,7 @@ void RegisterProfilePrefsForMigration(
registry->RegisterIntegerPref(kProfileAvatarTutorialShown, 0);
#endif
@@ -52,21 +52,22 @@
// Deprecated 08/2022.
registry->RegisterBooleanPref(prefs::kUsesSystemThemeDeprecated, false);
#endif
-@@ -1623,11 +1623,11 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
- safe_browsing::PostCleanupSettingsResetter::RegisterProfilePrefs(registry);
+@@ -1762,12 +1762,12 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
#endif
--#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_CHROMEOS_ASH)
++ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
device_signals::RegisterProfilePrefs(registry);
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
+ // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
browser_switcher::BrowserSwitcherPrefs::RegisterProfilePrefs(registry);
#endif
-@@ -1824,7 +1824,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
+@@ -1920,7 +1920,7 @@ void MigrateObsoleteLocalStatePrefs(PrefService* local
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
// Added 02/2023
@@ -75,7 +76,7 @@
local_state->ClearPref(kWebAppsUrlHandlerInfo);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -1969,7 +1969,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
+@@ -2060,7 +2060,7 @@ void MigrateObsoleteProfilePrefs(Profile* profile) {
profile_prefs->ClearPref(kProfileAvatarTutorialShown);
#endif
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 80824a9232e7..2f199ed51029 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,11 +1,11 @@
---- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/prefs/pref_service_incognito_allowlist.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/prefs/pref_service_incognito_allowlist.cc
-@@ -167,7 +167,7 @@ const char* const kPersistentPrefNames[] = {
+@@ -165,7 +165,7 @@ const char* const kPersistentPrefNames[] = {
+ prefs::kShowFullscreenToolbar,
+ #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)
// Toggleing custom frames affects all open windows in the profile, hence
// should be written to the regular profile when changed in incognito mode.
prefs::kUseCustomChromeFrame,
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
index b431233e13c2..e25bfd887ee8 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/printing/print_backend_service_manager.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
-@@ -547,7 +547,7 @@ PrintBackendServiceManager::RegisterClient(
+@@ -687,7 +687,7 @@ PrintBackendServiceManager::RegisterClient(
query_clients_.insert(client_id);
break;
case ClientType::kQueryWithUi:
@@ -9,7 +9,7 @@
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
-@@ -813,7 +813,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -960,7 +960,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
break;
case ClientType::kQueryWithUi:
@@ -18,7 +18,7 @@
// No need to update if there were other query with UI clients.
if (query_with_ui_clients_.size() > 1)
return absl::nullopt;
-@@ -870,7 +870,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -1017,7 +1017,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:
diff --git a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc
index 84a6a39dcd19..b703bc115477 100644
--- a/www/iridium/files/patch-chrome_browser_printing_printer__query.cc
+++ b/www/iridium/files/patch-chrome_browser_printing_printer__query.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/printer_query.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/printing/printer_query.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/printing/printer_query.cc
-@@ -284,7 +284,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
+@@ -341,7 +341,7 @@ void PrinterQuery::UpdatePrintSettings(base::Value::Di
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));
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 4d9106b640df..295a6884f726 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,6 @@
---- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -338,17 +338,17 @@
+@@ -364,18 +364,18 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -8,6 +8,7 @@
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_connector_service_factory.h"
#include "chrome/browser/enterprise/connectors/device_trust/device_trust_service_factory.h"
+ #include "chrome/browser/enterprise/signals/user_permission_service_factory.h"
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -19,9 +20,9 @@
-#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/browser_switcher/browser_switcher_service_factory.h"
+ #include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#include "chrome/browser/enterprise/signals/signals_aggregator_factory.h"
- #endif
-@@ -495,7 +495,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -545,7 +545,7 @@ void ChromeBrowserMainExtraPartsProfiles::
BreadcrumbManagerKeyedServiceFactory::GetInstance();
}
browser_sync::UserEventServiceFactory::GetInstance();
@@ -30,10 +31,10 @@
browser_switcher::BrowserSwitcherServiceFactory::GetInstance();
#endif
BrowsingDataHistoryObserverService::Factory::GetInstance();
-@@ -557,12 +557,12 @@ void ChromeBrowserMainExtraPartsProfiles::
- DomainDiversityReporterFactory::GetInstance();
- dom_distiller::DomDistillerServiceFactory::GetInstance();
- DownloadCoreServiceFactory::GetInstance();
+@@ -616,17 +616,17 @@ void ChromeBrowserMainExtraPartsProfiles::
+ #if !BUILDFLAG(IS_ANDROID)
+ DriveServiceFactory::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_signals::SignalsAggregatorFactory::GetInstance();
@@ -42,10 +43,16 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS_ASH)
+ BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
+ enterprise_signals::UserPermissionServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustServiceFactory::GetInstance();
enterprise_connectors::DeviceTrustConnectorServiceFactory::GetInstance();
#endif
-@@ -660,12 +660,12 @@ void ChromeBrowserMainExtraPartsProfiles::
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ enterprise_connectors::LocalBinaryUploadServiceFactory::GetInstance();
+ #endif
+ #if BUILDFLAG(ENABLE_SESSION_SERVICE)
+@@ -732,12 +732,12 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -60,3 +67,12 @@
enterprise_idle::IdleServiceFactory::GetInstance();
#endif
ModelTypeStoreServiceFactory::GetInstance();
+@@ -805,7 +805,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+ PredictionServiceFactory::GetInstance();
+
+ PrimaryAccountPolicyManagerFactory::GetInstance();
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ ProfileTokenWebSigninInterceptorFactory::GetInstance();
+ policy::ProfileTokenPolicyWebSigninServiceFactory::GetInstance();
+ #endif
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 23caabeaf3e8..7f392943316a 100644
--- a/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/iridium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,17 +1,26 @@
---- chrome/browser/profiles/profile_impl.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/profiles/profile_impl.cc
-@@ -261,6 +261,10 @@
+@@ -262,6 +262,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
-+#if BUILDFLAG(IS_OPENBSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
+#endif
+
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
-@@ -868,7 +872,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
+@@ -606,7 +610,7 @@ void ProfileImpl::LoadPrefsForNormalStartup(bool async
+ #else
+ {
+ #endif // 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)
+ ProfileManager* profile_manager = g_browser_process->profile_manager();
+ ProfileAttributesEntry* entry =
+ profile_manager->GetProfileAttributesStorage()
+@@ -881,7 +885,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 fc540d87a49f..ab4ea49e183a 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-10-05 07:34:01 UTC
+--- chrome/browser/profiles/profiles_state.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/profiles/profiles_state.cc
-@@ -181,7 +181,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
+@@ -182,7 +182,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 d847d20cb54d..7326de80e063 100644
--- a/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
+++ b/www/iridium/files/patch-chrome_browser_renderer__preferences__util.cc
@@ -1,4 +1,4 @@
---- chrome/browser/renderer_preferences_util.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/renderer_preferences_util.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/renderer_preferences_util.cc
@@ -36,7 +36,7 @@
#include "ui/views/controls/textfield/textfield.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/themes/theme_service.h"
#include "chrome/browser/themes/theme_service_factory.h"
#include "ui/linux/linux_ui.h"
-@@ -155,7 +155,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -149,7 +149,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
prefs->caret_blink_interval = views::Textfield::GetCaretBlinkInterval();
#endif
@@ -18,7 +18,7 @@
auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
if (linux_ui_theme) {
if (ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme()) {
-@@ -178,7 +178,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
+@@ -172,7 +172,7 @@ void UpdateFromSystemSettings(blink::RendererPreferenc
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
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 3785575ae317..a8c78e1a0afb 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,15 +1,15 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
-@@ -28,7 +28,7 @@
+@@ -27,7 +27,7 @@
+ <cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]"
- button-aria-description="$i18n{opensInNewTab}"
on-click="openThemeUrl_" external></cr-link-row>
-<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="onUseDefaultClick_">
-@@ -36,7 +36,7 @@
+@@ -35,7 +35,7 @@
</cr-button>
</template>
</if>
@@ -18,7 +18,7 @@
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, systemTheme_)]]"
-@@ -143,7 +143,7 @@
+@@ -142,7 +142,7 @@
</div>
</template>
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 09c3c3a8fa57..af5e389e8194 100644
--- a/www/iridium/files/patch-chrome_browser_resources_settings_route.ts
+++ b/www/iridium/files/patch-chrome_browser_resources_settings_route.ts
@@ -1,6 +1,6 @@
---- chrome/browser/resources/settings/route.ts.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/resources/settings/route.ts.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/resources/settings/route.ts
-@@ -223,7 +223,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
+@@ -232,7 +232,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection(
'/accessibility', 'a11y', loadTimeData.getString('a11yPageTitle'));
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
index 78bf6f669200..fc8d7c08c778 100644
--- 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
@@ -1,38 +1,20 @@
---- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
-@@ -556,7 +556,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}
-@@ -566,7 +566,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}
-@@ -609,7 +609,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}
-@@ -619,7 +619,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}
+@@ -290,7 +290,7 @@
+ autofocus="[[isModalDialog_]]">
+ $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}
+@@ -300,7 +300,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
index ef4f5e42a218..0b4ac3730207 100644
--- 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
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-01-17 19:19:00 UTC
+--- chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/safe_browsing/cloud_content_scanning/binary_upload_service.cc
@@ -18,7 +18,7 @@
#include "net/base/url_util.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/enterprise/connectors/analysis/local_binary_upload_service_factory.h"
#endif
-@@ -364,7 +364,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
+@@ -383,7 +383,7 @@ BinaryUploadService* BinaryUploadService::GetForProfil
Profile* profile,
const enterprise_connectors::AnalysisSettings& settings) {
// Local content analysis is supported only on desktop platforms.
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 f65e58c335f3..727e9958b924 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,6 +1,6 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
-@@ -20,7 +20,7 @@
+@@ -21,7 +21,7 @@
#include "content/public/browser/browser_thread.h"
#include "url/gurl.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/safe_browsing/download_protection/document_analysis_service.h"
#endif
-@@ -100,7 +100,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
+@@ -81,7 +81,7 @@ void FileAnalyzer::Start(const base::FilePath& target_
} else if (inspection_type == DownloadFileType::DMG) {
StartExtractDmgFeatures();
#endif
@@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
-@@ -325,7 +325,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
+@@ -306,7 +306,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)
diff --git a/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
new file mode 100644
index 000000000000..3820b3f82a8a
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_supervised__user_supervised__user__navigation__observer.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/supervised_user/supervised_user_navigation_observer.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/supervised_user/supervised_user_navigation_observer.cc
+@@ -44,7 +44,7 @@
+ #include "chrome/browser/supervised_user/android/supervised_user_web_content_handler_impl.h"
+ #elif BUILDFLAG(IS_CHROMEOS)
+ #include "chrome/browser/supervised_user/chromeos/supervised_user_web_content_handler_impl.h"
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/supervised_user/linux_mac_windows/supervised_user_web_content_handler_impl.h"
+ #endif
+
+@@ -64,7 +64,7 @@ std::unique_ptr<supervised_user::WebContentHandler> Cr
+ #elif BUILDFLAG(IS_ANDROID)
+ return std::make_unique<SupervisedUserWebContentHandlerImpl>(
+ web_contents, frame_id, navigation_id);
+-#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#elif BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ return std::make_unique<SupervisedUserWebContentHandlerImpl>(
+ web_contents, frame_id, navigation_id);
+ #endif
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 f42a2344e7c8..cf2b674a811f 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,4 +1,4 @@
---- chrome/browser/sync/chrome_sync_client.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/sync/chrome_sync_client.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/sync/chrome_sync_client.cc
@@ -127,7 +127,7 @@
#endif // BUILDFLAG(IS_ANDROID)
@@ -9,16 +9,16 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_keyed_service.h"
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
-@@ -469,7 +469,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -475,7 +475,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- if (features::kTabGroupsSaveSyncIntegration.Get()) {
+ if (base::FeatureList::IsEnabled(features::kTabGroupsSaveSyncIntegration)) {
controllers.push_back(std::make_unique<syncer::ModelTypeController>(
syncer::SAVED_TAB_GROUP,
-@@ -482,7 +482,7 @@ ChromeSyncClient::CreateDataTypeControllers(syncer::Sy
+@@ -488,7 +488,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.
@@ -27,12 +27,12 @@
// Dictionary sync is enabled by default.
if (GetPrefService()->GetBoolean(spellcheck::prefs::kSpellCheckEnable)) {
controllers.push_back(
-@@ -641,7 +641,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
+@@ -655,7 +655,7 @@ base::WeakPtr<syncer::ModelTypeControllerDelegate>
ChromeSyncClient::GetControllerDelegateForModelType(syncer::ModelType type) {
switch (type) {
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
- BUILDFLAG(IS_WIN)
+ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
case syncer::SAVED_TAB_GROUP: {
- DCHECK(features::kTabGroupsSaveSyncIntegration.Get());
- return SavedTabGroupServiceFactory::GetForProfile(profile_)
+ DCHECK(base::FeatureList::IsEnabled(
+ features::kTabGroupsSaveSyncIntegration));
diff --git a/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc
index 1d31c5da1129..524b3db78005 100644
--- a/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc
+++ b/www/iridium/files/patch-chrome_browser_sync_sync__service__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/sync_service_factory.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/sync/sync_service_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/sync/sync_service_factory.cc
-@@ -76,7 +76,7 @@
+@@ -74,7 +74,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/tabs/saved_tab_groups/saved_tab_group_service_factory.h"
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) ||
// BUILDFLAG(IS_WIN)
-@@ -117,7 +117,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
+@@ -119,7 +119,7 @@ std::unique_ptr<KeyedService> BuildSyncService(
// TODO(crbug.com/1052397): Reassess whether the following block needs to be
// included in lacros-chrome once build flag switch of lacros-chrome is
// complete.
@@ -18,7 +18,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
syncer::SyncPrefs prefs(profile->GetPrefs());
local_sync_backend_enabled = prefs.IsLocalSyncEnabled();
-@@ -251,7 +251,7 @@ SyncServiceFactory::SyncServiceFactory()
+@@ -244,7 +244,7 @@ SyncServiceFactory::SyncServiceFactory()
DependsOn(ThemeServiceFactory::GetInstance());
#endif // !BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
diff --git a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
index ae27af8becc2..a740622057ef 100644
--- a/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
+++ b/www/iridium/files/patch-chrome_browser_task__manager_sampling_task__group.h
@@ -1,6 +1,6 @@
---- chrome/browser/task_manager/sampling/task_group.h.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/task_manager/sampling/task_group.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/task_manager/sampling/task_group.h
-@@ -43,7 +43,7 @@ constexpr int kUnsupportedVMRefreshFlags =
+@@ -44,7 +44,7 @@ constexpr int kUnsupportedVMRefreshFlags =
REFRESH_TYPE_WEBCACHE_STATS | REFRESH_TYPE_NETWORK_USAGE |
REFRESH_TYPE_NACL | REFRESH_TYPE_IDLE_WAKEUPS | REFRESH_TYPE_HANDLES |
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME | REFRESH_TYPE_PRIORITY |
@@ -9,7 +9,7 @@
REFRESH_TYPE_FD_COUNT |
#endif
REFRESH_TYPE_HARD_FAULTS;
-@@ -149,7 +149,7 @@ class TaskGroup {
+@@ -150,7 +150,7 @@ class TaskGroup {
}
#endif // BUILDFLAG(ENABLE_NACL)
@@ -18,7 +18,7 @@
int open_fd_count() const { return open_fd_count_; }
void set_open_fd_count(int open_fd_count) { open_fd_count_ = open_fd_count; }
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -169,7 +169,7 @@ class TaskGroup {
+@@ -170,7 +170,7 @@ class TaskGroup {
void RefreshNaClDebugStubPort(int child_process_unique_id);
void OnRefreshNaClDebugStubPortDone(int port);
#endif
@@ -27,7 +27,7 @@
void OnOpenFdCountRefreshDone(int open_fd_count);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
-@@ -241,7 +241,7 @@ class TaskGroup {
+@@ -243,7 +243,7 @@ class TaskGroup {
#if BUILDFLAG(ENABLE_NACL)
int nacl_debug_stub_port_;
#endif // BUILDFLAG(ENABLE_NACL)
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 ab5a95910d2f..dbb47575bbd4 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-10-05 07:34:01 UTC
+--- chrome/browser/task_manager/sampling/task_manager_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/task_manager/sampling/task_manager_impl.cc
-@@ -216,7 +216,7 @@ void TaskManagerImpl::GetUSERHandles(TaskId task_id,
+@@ -217,7 +217,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__service.cc b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc
index c9925b0f5ae1..c5fb52fef321 100644
--- a/www/iridium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/iridium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,6 +1,6 @@
---- chrome/browser/themes/theme_service.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/themes/theme_service.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/themes/theme_service.cc
-@@ -71,7 +71,7 @@
+@@ -73,7 +73,7 @@
#include "extensions/browser/extension_registry_observer.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -313,7 +313,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
+@@ -315,7 +315,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseCustomFrame() const {
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 2a0a19ba9773..f55edca5afa2 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,4 +1,4 @@
---- chrome/browser/themes/theme_service_factory.cc.orig 2022-12-01 10:35:46 UTC
+--- chrome/browser/themes/theme_service_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/themes/theme_service_factory.cc
@@ -23,11 +23,11 @@
@@ -14,7 +14,7 @@
#include "ui/linux/linux_ui_factory.h"
#endif
-@@ -81,7 +81,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
+@@ -86,7 +86,7 @@ ThemeServiceFactory::~ThemeServiceFactory() = default;
KeyedService* ThemeServiceFactory::BuildServiceInstanceFor(
content::BrowserContext* profile) const {
@@ -23,7 +23,7 @@
using ThemeService = ThemeServiceAuraLinux;
#endif
-@@ -95,9 +95,9 @@ void ThemeServiceFactory::RegisterProfilePrefs(
+@@ -100,9 +100,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.
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 21534d6288a0..9f224b5c8293 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,7 +1,7 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -104,7 +104,7 @@
- #include "components/user_manager/user_manager.h"
+@@ -119,7 +119,7 @@
+ #define ENABLED_VLOG_LEVEL 1
#endif
-#if BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#endif
-@@ -293,7 +293,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -310,7 +310,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
#endif
}
@@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
auto* linux_ui = ui::LinuxUi::instance();
-@@ -545,7 +545,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -561,7 +561,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +27,16 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -1104,7 +1104,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -573,7 +573,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+ break;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ case IDC_USE_SYSTEM_TITLE_BAR: {
+ PrefService* prefs = profile()->GetPrefs();
+ prefs->SetBoolean(prefs::kUseCustomChromeFrame,
+@@ -1175,12 +1175,12 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,3 +45,9 @@
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool use_system_title_bar = true;
+ #if BUILDFLAG(IS_OZONE)
+ use_system_title_bar = ui::OzonePlatform::GetInstance()
diff --git a/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc b/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc
index d51ef839434a..3c035e968383 100644
--- a/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_browser__view__prefs.cc
@@ -1,20 +1,20 @@
---- chrome/browser/ui/browser_view_prefs.cc.orig 2023-01-17 19:19:00 UTC
+--- chrome/browser/ui/browser_view_prefs.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/browser_view_prefs.cc
-@@ -17,7 +17,7 @@ namespace {
+@@ -15,7 +15,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)
+ namespace {
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool GetCustomFramePrefDefault() {
#if BUILDFLAG(IS_OZONE)
return ui::OzonePlatform::GetInstance()
-@@ -35,7 +35,7 @@ void RegisterBrowserViewProfilePrefs(
+@@ -31,7 +31,7 @@ bool GetCustomFramePrefDefault() {
+
+ void RegisterBrowserViewProfilePrefs(
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)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
registry->RegisterBooleanPref(prefs::kUseCustomChromeFrame,
GetCustomFramePrefDefault());
#endif
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 03e205f615b2..7dc7b58fb92c 100644
--- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/chrome_pages.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/chrome_pages.cc
@@ -69,7 +69,7 @@
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
-@@ -651,7 +651,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -662,7 +662,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 03b11cb85955..84f3187f1b4d 100644
--- a/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h
+++ b/www/iridium/files/patch-chrome_browser_ui_chrome__pages.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/chrome_pages.h.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/chrome_pages.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/chrome_pages.h
@@ -34,7 +34,7 @@ enum class ConsentLevel;
} // namespace signin
@@ -9,7 +9,7 @@
namespace web_app {
enum class AppSettingsPageEntryPoint;
} // namespace web_app
-@@ -241,7 +241,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -245,7 +245,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_managed__ui.cc b/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc
new file mode 100644
index 000000000000..18a727d91c12
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_managed__ui.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/managed_ui.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/ui/managed_ui.cc
+@@ -92,7 +92,7 @@ bool ShouldDisplayManagedByParentUi(Profile* profile)
+ return false;
+ #else
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // The EnableManagedByParentUiOnDesktop flag depends on
+ // EnableSupervisionOnDesktopAndIOS.
+ CHECK(
diff --git a/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc b/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
new file mode 100644
index 000000000000..06fde3ed2ea4
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_omnibox_omnibox__pedal__implementations.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/ui/omnibox/omnibox_pedal_implementations.cc
+@@ -1954,7 +1954,7 @@ const gfx::VectorIcon& GetSharingHubVectorIcon() {
+ return OmniboxFieldTrial::IsChromeRefreshIconsEnabled()
+ ? omnibox::kShareWinChromeRefreshIcon
+ : omnibox::kShareWinIcon;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return OmniboxFieldTrial::IsChromeRefreshIconsEnabled()
+ ? omnibox::kShareLinuxChromeRefreshIcon
+ : omnibox::kShareIcon;
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 d8ea5a10b6b5..ec8a694c30df 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,6 +1,6 @@
---- chrome/browser/ui/signin_view_controller.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/ui/signin_view_controller.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/signin_view_controller.cc
-@@ -275,7 +275,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+@@ -276,7 +276,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
SkColor profile_color,
signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
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 3b043dcd0a40..c35c6f8da3f4 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 2023-03-13 07:33:08 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -94,7 +94,7 @@ static const char* kBadFlags[] = {
+@@ -95,7 +95,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 de6caf264710..eb5fa088a8eb 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,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -132,7 +132,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/headless/headless_mode_util.h"
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#include "components/headless/policy/headless_mode_policy.h"
-@@ -918,7 +918,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -917,7 +917,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
TRACE_EVENT0("startup", "StartupBrowserCreator::ProcessCmdLineImpl");
ComputeAndRecordLaunchMode(command_line);
@@ -18,7 +18,7 @@
if (headless::IsHeadlessMode() &&
headless::HeadlessModePolicy::IsHeadlessModeDisabled(
g_browser_process->local_state())) {
-@@ -1022,7 +1022,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1021,7 +1021,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@@ -27,7 +27,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) &&
-@@ -1214,7 +1214,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1232,7 +1232,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);
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 11e2049cbc43..41a431f8181c 100644
--- a/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -203,7 +203,7 @@
+@@ -211,7 +211,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
#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"
-@@ -542,12 +542,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -560,12 +560,12 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression 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_ui_test_popup__browsertest.cc b/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc
new file mode 100644
index 000000000000..ca7b950e8e40
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_test_popup__browsertest.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/test/popup_browsertest.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/ui/test/popup_browsertest.cc
+@@ -74,7 +74,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenLeftAndTopZeroCo
+ const display::Display display = GetDisplayNearestBrowser(popup);
+ gfx::Rect expected(popup->window()->GetBounds().size());
+ expected.AdjustToFit(display.work_area());
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // TODO(crbug.com/1286870) Desktop Linux window bounds are inaccurate.
+ expected.Outset(50);
+ EXPECT_TRUE(expected.Contains(popup->window()->GetBounds()))
+@@ -106,7 +106,7 @@ IN_PROC_BROWSER_TEST_F(PopupTest, OpenClampedToCurrent
+ // The popup should be constrained to the opener's available display space.
+ EXPECT_EQ(display, GetDisplayNearestBrowser(popup));
+ gfx::Rect work_area(display.work_area());
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // TODO(crbug.com/1286870) Desktop Linux bounds flakily extend outside the
+ // work area on trybots, when opening with excessive width and height, e.g.:
+ // width=${screen.availWidth+300},height=${screen.availHeight+300} yields:
diff --git a/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc b/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
new file mode 100644
index 000000000000..94c31f2f8821
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_test_test__browser__ui.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/test/test_browser_ui.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/ui/test/test_browser_ui.cc
+@@ -22,7 +22,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))
+ #include "ui/base/test/skia_gold_matching_algorithm.h"
+ #include "ui/compositor/compositor.h"
+@@ -34,7 +34,7 @@
+ // TODO(https://crbug.com/958242) support Mac for pixel tests.
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
+ // of lacros-chrome is complete.
+-#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_TEST
+ #endif
+
diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.cc b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc
new file mode 100644
index 000000000000..6ffc40acd6d7
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/ui_features.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/ui/ui_features.cc
+@@ -298,7 +298,7 @@ BASE_FEATURE(kTopChromeWebUIUsesSpareRenderer,
+ "TopChromeWebUIUsesSpareRenderer",
+ 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)
+ // Enables alternate update-related text to be displayed in browser app menu
+ // button, menu item and confirmation dialog.
+ BASE_FEATURE(kUpdateTextOptions,
diff --git a/www/iridium/files/patch-chrome_browser_ui_ui__features.h b/www/iridium/files/patch-chrome_browser_ui_ui__features.h
new file mode 100644
index 000000000000..17f2fc6541ef
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_ui__features.h
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/ui_features.h.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/ui/ui_features.h
+@@ -201,7 +201,7 @@ BASE_DECLARE_FEATURE(kToolbarUseHardwareBitmapDraw);
+
+ BASE_DECLARE_FEATURE(kTopChromeWebUIUsesSpareRenderer);
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kUpdateTextOptions);
+ extern const base::FeatureParam<int> kUpdateTextOptionNumber;
+ #endif
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 402dfd2b66a1..a2a4c48aaf9a 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,6 +1,6 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
-@@ -65,11 +65,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -69,11 +69,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},
@@ -14,7 +14,7 @@
{ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
{ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
IDC_MOVE_TAB_PREVIOUS},
-@@ -97,7 +97,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -101,7 +101,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},
@@ -23,7 +23,7 @@
{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},
-@@ -142,7 +142,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -146,7 +146,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
IDC_SHOW_AVATAR_MENU},
// Platform-specific key maps.
@@ -32,7 +32,7 @@
{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},
-@@ -243,7 +243,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -247,7 +247,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
#endif // !BUILDFLAG(IS_CHROMEOS)
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
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 818bcf31d04e..fa438f91f4ff 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,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
-@@ -47,7 +47,7 @@
+@@ -51,7 +51,7 @@
#include "components/user_manager/user_manager.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/display/screen.h"
#include "ui/linux/linux_ui.h"
#endif
-@@ -55,7 +55,7 @@
+@@ -63,7 +63,7 @@
namespace {
bool IsUsingLinuxSystemTheme(Profile* profile) {
@@ -18,7 +18,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
-@@ -290,7 +290,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -303,7 +303,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
chrome::SaveWindowWorkspace(browser_view_->browser(), GetWorkspace());
chrome::SaveWindowVisibleOnAllWorkspaces(browser_view_->browser(),
IsVisibleOnAllWorkspaces());
@@ -27,7 +27,7 @@
// 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()
-@@ -413,7 +413,7 @@ void BrowserFrame::SelectNativeTheme() {
+@@ -490,7 +490,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@@ -36,7 +36,7 @@
const auto* linux_ui_theme =
ui::LinuxUiTheme::GetForWindow(GetNativeWindow());
// Ignore the system theme for web apps with window-controls-overlay as the
-@@ -430,7 +430,7 @@ void BrowserFrame::SelectNativeTheme() {
+@@ -507,7 +507,7 @@ void BrowserFrame::SelectNativeTheme() {
bool BrowserFrame::RegenerateFrameOnThemeChange(
BrowserThemeChangeType theme_change_type) {
bool need_regenerate = false;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
index 13bda074e5a5..b9919501b1e6 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_browser__frame.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/views/frame/browser_frame.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/frame/browser_frame.h
@@ -12,7 +12,7 @@
#include "ui/views/context_menu_controller.h"
@@ -9,7 +9,7 @@
#include "ui/base/ui_base_types.h"
#endif
-@@ -64,7 +64,7 @@ class BrowserFrame : public views::Widget, public view
+@@ -68,7 +68,7 @@ class BrowserFrame : public views::Widget, public view
~BrowserFrame() override;
@@ -18,7 +18,7 @@
// Returns which edges of the frame are tiled.
const ui::WindowTiledEdges& tiled_edges() const { return tiled_edges_; }
void set_tiled_edges(ui::WindowTiledEdges tiled_edges) {
-@@ -223,7 +223,7 @@ class BrowserFrame : public views::Widget, public view
+@@ -233,7 +233,7 @@ class BrowserFrame : public views::Widget, public view
// contents for smoother dragging.
TabDragKind tab_drag_kind_ = TabDragKind::kNone;
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 fcfc4ea6f76d..143e23cd4048 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,7 +1,7 @@
---- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -16,7 +16,7 @@
- #include "chrome/browser/ui/views/frame/glass_browser_frame_view.h"
+ #include "chrome/browser/ui/views/frame/browser_frame_view_win.h"
#endif
-#if BUILDFLAG(IS_LINUX)
@@ -18,7 +18,7 @@
auto* profile = browser_view->browser()->profile();
auto* linux_ui_theme = ui::LinuxUiTheme::GetForProfile(profile);
auto* theme_service_factory = ThemeServiceFactory::GetForProfile(profile);
-@@ -75,7 +75,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows
+@@ -81,7 +81,7 @@ std::unique_ptr<BrowserNonClientFrameView> CreateBrows
if (browser_view->browser()->is_type_picture_in_picture()) {
auto view =
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 16b424ff5ff7..207f1e290e29 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -2092,7 +2092,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -2004,7 +2004,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 4bf0f4d7e7c8..15890fd72ef2 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/views/frame/opaque_browser_frame_view.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
-@@ -56,7 +56,7 @@
+@@ -54,7 +54,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
-@@ -585,7 +585,7 @@ OpaqueBrowserFrameView::FrameButtonStyle
+@@ -572,7 +572,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;
-@@ -608,7 +608,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
+@@ -595,7 +595,7 @@ bool OpaqueBrowserFrameView::ShouldDrawRestoredFrameSh
return false;
}
@@ -27,7 +27,7 @@
ui::WindowTiledEdges OpaqueBrowserFrameView::GetTiledEdges() const {
return frame()->tiled_edges();
}
-@@ -810,7 +810,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
+@@ -796,7 +796,7 @@ gfx::Rect OpaqueBrowserFrameView::GetIconBounds() cons
}
void OpaqueBrowserFrameView::WindowIconPressed() {
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
index 1d61b4bd33dc..cea934fe7de9 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.cc
-@@ -40,7 +40,7 @@
+@@ -45,7 +45,7 @@
#include "ui/aura/window.h"
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_view_paint_utils_linux.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura_linux.h"
#endif
-@@ -61,7 +61,7 @@ constexpr int kBackToTabImageSize = 16;
+@@ -67,7 +67,7 @@ constexpr int kBackToTabImageSize = 16;
// The height of the controls bar at the top of the window.
constexpr int kTopControlsHeight = 30;
@@ -18,7 +18,7 @@
// Frame border when window shadow is not drawn.
constexpr int kFrameBorderThickness = 4;
#endif
-@@ -151,7 +151,7 @@ class WindowEventObserver : public ui::EventObserver {
+@@ -159,7 +159,7 @@ class WindowEventObserver : public ui::EventObserver {
gfx::Rect input_bounds = pip_browser_frame_view_->GetLocalBounds();
@@ -27,7 +27,7 @@
// Calculate input bounds for Linux. This is needed because the input bounds
// is not necessary the same as the local bounds on Linux.
if (pip_browser_frame_view_->ShouldDrawFrameShadow()) {
-@@ -341,7 +341,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
+@@ -358,7 +358,7 @@ PictureInPictureBrowserFrameView::PictureInPictureBrow
hide_close_button_animation_.set_continuous(false);
hide_close_button_animation_.set_delegate(this);
@@ -36,7 +36,7 @@
frame_background_ = std::make_unique<views::FrameBackground>();
#endif
-@@ -469,7 +469,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
+@@ -491,7 +491,7 @@ void PictureInPictureBrowserFrameView::OnThemeChanged(
for (ContentSettingImageView* view : content_setting_views_)
view->SetIconColor(color_provider->GetColor(kColorPipWindowForeground));
@@ -45,7 +45,7 @@
// On Linux the top bar background will be drawn in OnPaint().
top_bar_container_view_->SetBackground(views::CreateSolidBackground(
color_provider->GetColor(kColorPipWindowTopBarBackground)));
-@@ -514,7 +514,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
+@@ -536,7 +536,7 @@ void PictureInPictureBrowserFrameView::RemovedFromWidg
BrowserNonClientFrameView::RemovedFromWidget();
}
@@ -54,7 +54,7 @@
gfx::Insets PictureInPictureBrowserFrameView::MirroredFrameBorderInsets()
const {
auto border = FrameBorderInsets();
-@@ -719,7 +719,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
+@@ -743,7 +743,7 @@ void PictureInPictureBrowserFrameView::AnimationProgre
// views::View implementations:
void PictureInPictureBrowserFrameView::OnPaint(gfx::Canvas* canvas) {
@@ -63,7 +63,7 @@
// Draw the PiP window frame borders and shadows, including the top bar
// background.
if (window_frame_provider_) {
-@@ -842,7 +842,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
+@@ -866,7 +866,7 @@ void PictureInPictureBrowserFrameView::UpdateTopBarVie
}
gfx::Insets PictureInPictureBrowserFrameView::FrameBorderInsets() const {
@@ -72,17 +72,17 @@
if (window_frame_provider_) {
const auto insets = window_frame_provider_->GetFrameThicknessDip();
const auto tiled_edges = frame()->tiled_edges();
-@@ -863,7 +863,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
+@@ -887,7 +887,7 @@ gfx::Insets PictureInPictureBrowserFrameView::FrameBor
}
gfx::Insets PictureInPictureBrowserFrameView::ResizeBorderInsets() const {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return FrameBorderInsets();
- #else
- return gfx::Insets(kResizeBorder);
-@@ -874,7 +874,7 @@ int PictureInPictureBrowserFrameView::GetTopAreaHeight
- return FrameBorderInsets().top() + kTopControlsHeight;
+ #elif BUILDFLAG(IS_CHROMEOS_ASH)
+ return gfx::Insets(chromeos::kResizeInsideBoundsSize);
+@@ -908,7 +908,7 @@ gfx::Size PictureInPictureBrowserFrameView::GetNonClie
+ top_height + border_thickness.bottom());
}
-#if BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
index 5b2e42a4c7c8..0f91f192820f 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_picture__in__picture__browser__frame__view.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/frame/picture_in_picture_browser_frame_view.h
@@ -20,7 +20,7 @@
#include "ui/views/controls/image_view.h"
@@ -18,7 +18,7 @@
gfx::Insets MirroredFrameBorderInsets() const override;
gfx::Insets GetInputInsets() const override;
SkRRect GetRestoredClipRegion() const override;
-@@ -159,7 +159,7 @@ class PictureInPictureBrowserFrameView
+@@ -164,7 +164,7 @@ class PictureInPictureBrowserFrameView
// Called when mouse entered or exited the pip window.
void OnMouseEnteredOrExitedWindow(bool entered);
@@ -27,7 +27,7 @@
// Sets the window frame provider so that it will be used for drawing.
void SetWindowFrameProvider(ui::WindowFrameProvider* window_frame_provider);
-@@ -222,7 +222,7 @@ class PictureInPictureBrowserFrameView
+@@ -239,7 +239,7 @@ class PictureInPictureBrowserFrameView
gfx::MultiAnimation show_close_button_animation_;
gfx::MultiAnimation hide_close_button_animation_;
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
index e194be6614ed..3da5a5738247 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_frame_system__menu__model__delegate.cc
@@ -1,24 +1,24 @@
---- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2022-03-28 18:11:04 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_delegate.cc
-@@ -23,7 +23,7 @@
+@@ -21,7 +21,7 @@
+ #include "chromeos/ui/frame/desks/move_to_desks_menu_model.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 "chrome/common/pref_names.h"
#include "components/prefs/pref_service.h"
#endif
-@@ -40,7 +40,7 @@ SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
+@@ -36,7 +36,7 @@ SystemMenuModelDelegate::SystemMenuModelDelegate(
+ SystemMenuModelDelegate::~SystemMenuModelDelegate() {}
+
bool SystemMenuModelDelegate::IsCommandIdChecked(int command_id) const {
- // 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 (command_id == IDC_USE_SYSTEM_TITLE_BAR) {
PrefService* prefs = browser_->profile()->GetPrefs();
return !prefs->GetBoolean(prefs::kUseCustomChromeFrame);
-@@ -62,7 +62,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
+@@ -58,7 +58,7 @@ bool SystemMenuModelDelegate::IsCommandIdEnabled(int c
bool SystemMenuModelDelegate::IsCommandIdVisible(int command_id) const {
// 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_profiles_profile__menu__view__base.cc b/www/iridium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
index 7a2d1cfcf72d..02266ce00fbb 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 2023-01-17 19:19:00 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -571,7 +571,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
+@@ -605,7 +605,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 8955616f1c8f..87c7d5e77135 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,4 +1,4 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
@@ -50,7 +50,7 @@ namespace {
@@ -18,7 +18,7 @@
// static
std::unique_ptr<views::WebView>
SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
-@@ -447,7 +447,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
+@@ -448,7 +448,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT) || BUILDFLAG(IS_CHROMEOS_LACROS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
index 23ae2b7e9ae1..89eb2dcfe735 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_new__tab__button.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/ui/views/tabs/new_tab_button.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/tabs/new_tab_button.cc
-@@ -61,7 +61,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse
+@@ -62,7 +62,7 @@ NewTabButton::NewTabButton(TabStrip* tab_strip, Presse
SetAnimateOnStateChange(true);
// 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.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab.cc
index ae5a8e0b1e19..f5b494f58493 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-12-06 08:09:13 UTC
+--- chrome/browser/ui/views/tabs/tab.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/tabs/tab.cc
-@@ -581,7 +581,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 fddf8a33938b..120e0f9fe6e5 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
-@@ -82,7 +82,7 @@
+@@ -81,7 +81,7 @@
#include "components/remote_cocoa/browser/window.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/aura/client/drag_drop_client.h"
#endif
-@@ -260,7 +260,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
+@@ -189,7 +189,7 @@ bool IsWindowDragUsingSystemDragDropAllowed() {
void UpdateSystemDnDDragImage(TabDragContext* attached_context,
const gfx::ImageSkia& image) {
@@ -18,7 +18,7 @@
aura::Window* root_window =
attached_context->GetWidget()->GetNativeWindow()->GetRootWindow();
if (aura::client::GetDragDropClient(root_window)) {
-@@ -512,7 +512,7 @@ void TabDragController::Init(TabDragContext* source_co
+@@ -363,7 +363,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
// - ChromeOS Ash
// Releasing capture on Ash cancels gestures so avoid it.
@@ -27,7 +27,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -1151,7 +1151,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+@@ -952,7 +952,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,7 +36,7 @@
// 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.
-@@ -2202,7 +2202,7 @@ void TabDragController::CompleteDrag() {
+@@ -1978,7 +1978,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
@@ -45,7 +45,7 @@
// 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
-@@ -2596,7 +2596,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2361,7 +2361,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__bubble__view.cc b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
new file mode 100644
index 000000000000..16c497364a20
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_views_tabs_tab__hover__card__bubble__view.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/ui/views/tabs/tab_hover_card_bubble_view.cc
+@@ -387,7 +387,7 @@ TabHoverCardBubbleView::TabHoverCardBubbleView(Tab* ta
+ // not become active. Setting this to false creates the need to explicitly
+ // hide the hovercard on press, touch, and keyboard events.
+ SetCanActivate(false);
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ set_accept_events(false);
+ #endif
+
diff --git a/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
index eeddf16959fc..f4f610a90944 100644
--- a/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_views_web__apps_web__app__integration__test__driver.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/views/web_apps/web_app_integration_test_driver.cc
-@@ -401,7 +401,7 @@ std::string GetFileExtension(FileExtension file_extens
+@@ -406,7 +406,7 @@ std::string GetFileExtension(FileExtension file_extens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,16 +9,7 @@
SiteConfig GetSiteConfigurationFromAppName(const std::string& app_name) {
SiteConfig config;
bool is_app_found = false;
-@@ -582,7 +582,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
- }
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- bool IconManagerCheckIconTopLeftColor(WebAppIconManager& icon_manager,
- const AppId& app_id,
- std::vector<int> sizes_px,
-@@ -917,7 +917,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
+@@ -889,7 +889,7 @@ void WebAppIntegrationTestDriver::TearDownOnMainThread
LOG(INFO) << "TearDownOnMainThread: Deleting dangling shortcuts.";
// TODO(crbug.com/1273568): Investigate the true source of flakiness instead
// of papering over it here.
@@ -27,7 +18,7 @@
ASSERT_TRUE(override_registration_->test_override->ForceDeleteAllShortcuts());
#endif
LOG(INFO)
-@@ -1715,7 +1715,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
+@@ -1829,7 +1829,7 @@ void WebAppIntegrationTestDriver::DeletePlatformShortc
if (app_name.empty()) {
app_name = GetSiteConfiguration(site).app_name;
}
@@ -36,7 +27,7 @@
ASSERT_TRUE(override_registration_->test_override->IsShortcutCreated(
profile(), app_id, app_name));
ASSERT_TRUE(
-@@ -2749,7 +2749,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
+@@ -3009,7 +3009,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginEna
app_state->id, app_state->name);
ASSERT_TRUE(icon_color.has_value());
ASSERT_THAT(site_config.icon_color, testing::Eq(icon_color.value()));
@@ -45,7 +36,7 @@
ASSERT_TRUE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
-@@ -2764,7 +2764,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3024,7 +3024,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
GetAppBySiteMode(after_state_change_action_state_.get(), profile(), site);
ASSERT_TRUE(app_state);
base::ScopedAllowBlockingForTesting allow_blocking;
@@ -54,7 +45,7 @@
ASSERT_FALSE(override_registration_->test_override->IsRunOnOsLoginEnabled(
profile(), app_state->id, app_state->name));
#endif
-@@ -2774,7 +2774,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
+@@ -3034,7 +3034,7 @@ void WebAppIntegrationTestDriver::CheckRunOnOsLoginDis
void WebAppIntegrationTestDriver::CheckSiteHandlesFile(
Site site,
FileExtension file_extension) {
@@ -63,7 +54,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
-@@ -2786,7 +2786,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
+@@ -3050,7 +3050,7 @@ void WebAppIntegrationTestDriver::CheckSiteHandlesFile
void WebAppIntegrationTestDriver::CheckSiteNotHandlesFile(
Site site,
FileExtension file_extension) {
@@ -72,7 +63,7 @@
if (!BeforeStateCheckAction(__FUNCTION__)) {
return;
}
-@@ -3362,7 +3362,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
+@@ -3799,7 +3799,7 @@ base::FilePath WebAppIntegrationTestDriver::GetShortcu
base::FilePath shortcut_dir,
const std::string& app_name,
const AppId& app_id) {
@@ -81,7 +72,7 @@
return override_registration_->test_override->GetShortcutPath(
profile(), shortcut_dir, app_id, app_name);
#else
-@@ -3537,7 +3537,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
+@@ -3982,7 +3982,7 @@ bool WebAppIntegrationTestDriver::IsShortcutAndIconCre
const AppId& id) {
base::ScopedAllowBlockingForTesting allow_blocking;
bool is_shortcut_and_icon_correct = false;
@@ -90,7 +81,7 @@
bool is_shortcut_correct =
override_registration_->test_override->IsShortcutCreated(profile, id,
name);
-@@ -3581,7 +3581,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
+@@ -4026,7 +4026,7 @@ bool WebAppIntegrationTestDriver::DoIconColorsMatch(Pr
do_icon_colors_match =
(expected_icon_pixel_color == shortcut_pixel_color_apps_folder.value());
}
@@ -98,13 +89,4 @@
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
SkColor expected_icon_pixel_color =
GetSiteConfigurationFromAppName(name).icon_color;
- do_icon_colors_match = IconManagerCheckIconTopLeftColor(
-@@ -3634,7 +3634,7 @@ bool WebAppIntegrationTestDriver::IsFileHandledBySite(
- app_id);
- is_file_handled =
- shell_integration::CanApplicationHandleURL(app_path, test_file_url);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- AppId app_id = GetAppIdBySiteMode(site);
- for (const LinuxFileRegistration& command :
- override_registration_->test_override->linux_file_registration()) {
+ absl::optional<SkColor> actual_color_install_icon_size =
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 3628aa4ecb34..6aec558afc29 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/webui/about_ui.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/webui/about_ui.cc
-@@ -602,7 +602,7 @@ std::string ChromeURLs() {
+@@ -635,7 +635,7 @@ std::string ChromeURLs() {
return html;
}
@@ -9,7 +9,7 @@
std::string AboutLinuxProxyConfig() {
std::string data;
AppendHeader(&data,
-@@ -656,7 +656,7 @@ void AboutUIHTMLSource::StartDataRequest(
+@@ -689,7 +689,7 @@ void AboutUIHTMLSource::StartDataRequest(
response =
ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(idr);
}
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
index dbb1e14fd19c..2aaa0b5c1ce0 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_app__home_app__home__page__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/webui/app_home/app_home_page_handler.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/webui/app_home/app_home_page_handler.cc
-@@ -353,7 +353,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
+@@ -416,7 +416,7 @@ app_home::mojom::AppInfoPtr AppHomePageHandler::Create
bool deprecated_app = false;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,12 +9,12 @@
auto* context = extension_system_->extension_service()->GetBrowserContext();
deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
-@@ -419,7 +419,7 @@ void AppHomePageHandler::FillExtensionInfoList(
- bool is_deprecated_app = false;
- auto* context = extension_system_->extension_service()->GetBrowserContext();
+@@ -479,7 +479,7 @@ void AppHomePageHandler::FillExtensionInfoList(
+ }
+
#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
+ auto* context = extension_system_->extension_service()->GetBrowserContext();
+ const bool is_deprecated_app =
+ extensions::IsExtensionUnsupportedDeprecatedApp(context,
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 b8605d67cd5a..b95a0799d916 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -329,7 +329,7 @@
+@@ -209,7 +209,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
-@@ -355,17 +355,17 @@
+@@ -235,17 +235,17 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -30,7 +30,7 @@
#include "chrome/browser/ui/webui/connectors_internals/connectors_internals_ui.h"
#endif
-@@ -735,7 +735,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -391,7 +391,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@@ -39,16 +39,16 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1037,7 +1037,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
- return &NewWebUI<ash::personalization_app::PersonalizationAppUI>;
- }
+@@ -651,7 +651,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+ if (url.host_piece() == chrome::kChromeUIMobileSetupHost)
+ return &NewWebUI<ash::cellular_setup::MobileSetupUI>;
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
-@@ -1092,7 +1092,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -706,7 +706,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
if (url.host_piece() == chrome::kChromeUINaClHost)
return &NewWebUI<NaClUI>;
#endif
@@ -57,7 +57,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
if (url.host_piece() == chrome::kChromeUITabModalConfirmDialogHost)
-@@ -1159,27 +1159,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -774,27 +774,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
index 6eb587b686e9..81b1ac98ad1d 100644
--- a/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_management_management__ui__handler.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/ui/webui/management/management_ui_handler.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/webui/management/management_ui_handler.cc
-@@ -171,7 +171,7 @@ enum class ReportingType {
+@@ -172,7 +172,7 @@ enum class ReportingType {
kUserActivity
};
@@ -15,6 +15,6 @@
-#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- if (capture_policy::IsGetDisplayMediaSetSelectAllScreensAllowedForAnySite(
- profile)) {
+ if (capture_policy::IsGetAllScreensMediaAllowedForAnySite(profile)) {
AddThreatProtectionPermission(kManagementScreenCaptureEvent,
+ kManagementScreenCaptureData, &info);
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 08eeda5a5ad6..0b47ccd933ef 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,6 +1,6 @@
---- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
-@@ -323,7 +323,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
+@@ -321,7 +321,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
bool is_deprecated_app = false;
auto* context = extension_service_->GetBrowserContext();
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc b/www/iridium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc
new file mode 100644
index 000000000000..b983f2cbebf1
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_ui_webui_realbox_realbox__handler.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/webui/realbox/realbox_handler.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/ui/webui/realbox/realbox_handler.cc
+@@ -141,7 +141,7 @@ constexpr char kMacShareIconResourceName[] =
+ #elif BUILDFLAG(IS_WIN)
+ constexpr char kWinShareIconResourceName[] =
+ "//resources/cr_components/omnibox/icons/win_share.svg";
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ constexpr char kLinuxShareIconResourceName[] =
+ "//resources/cr_components/omnibox/icons/share.svg";
+ #else
+@@ -688,7 +688,7 @@ std::string RealboxHandler::PedalVectorIconToResourceN
+ icon.name == omnibox::kShareWinChromeRefreshIcon.name) {
+ return kWinShareIconResourceName;
+ }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (icon.name == omnibox::kShareIcon.name ||
+ icon.name == omnibox::kShareLinuxChromeRefreshIcon.name) {
+ return kLinuxShareIconResourceName;
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 b249f42debe3..fa6f14527ab4 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
-@@ -125,7 +125,7 @@
+@@ -131,7 +131,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/display/screen.h"
#endif
-@@ -145,7 +145,7 @@
+@@ -151,7 +151,7 @@
#include "chrome/browser/ui/webui/certificate_manager_localized_strings_provider.h"
#endif
@@ -18,16 +18,16 @@
#include "ui/linux/linux_ui_factory.h"
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -234,7 +234,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
- #endif
-
- html_source->AddBoolean("isChildAccount", profile->IsChild());
+@@ -243,7 +243,7 @@ void AddCommonStrings(content::WebUIDataSource* html_s
+ html_source->AddBoolean(
+ "allowDeletingBrowserHistory",
+ profile->GetPrefs()->GetBoolean(prefs::kAllowDeletingBrowserHistory));
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
bool allow_qt_theme = base::FeatureList::IsEnabled(ui::kAllowQt);
#else
bool allow_qt_theme = false;
-@@ -380,7 +380,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -389,7 +389,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
{"sidePanelAlignLeft", IDS_SETTINGS_SIDE_PANEL_ALIGN_LEFT},
{"sidePanelAlignRight", IDS_SETTINGS_SIDE_PANEL_ALIGN_RIGHT},
@@ -36,7 +36,7 @@
{"gtkTheme", IDS_SETTINGS_GTK_THEME},
{"useGtkTheme", IDS_SETTINGS_USE_GTK_THEME},
{"qtTheme", IDS_SETTINGS_QT_THEME},
-@@ -390,7 +390,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -399,7 +399,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@@ -45,7 +45,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
-@@ -412,7 +412,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -421,7 +421,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_web__applications_commands_install__app__locally__command.cc b/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
index 57f46e54ffea..e699a5004254 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_commands_install__app__locally__command.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/web_applications/commands/install_app_locally_command.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/web_applications/commands/install_app_locally_command.cc
-@@ -71,7 +71,7 @@ void InstallAppLocallyCommand::StartWithLock(
+@@ -81,7 +81,7 @@ void InstallAppLocallyCommand::StartWithLock(
options.os_hooks[OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();
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 6d000eb1946c..b798602d27bd 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,6 +1,6 @@
---- chrome/browser/web_applications/extension_status_utils.h.orig 2023-01-17 19:19:00 UTC
+--- chrome/browser/web_applications/extension_status_utils.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/web_applications/extension_status_utils.h
-@@ -48,7 +48,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
+@@ -56,7 +56,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
const std::string& extension_id);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
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 30d3656a2eb5..781fe137b49e 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,4 +1,4 @@
---- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/browser/web_applications/extensions/extension_status_utils.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/web_applications/extensions/extension_status_utils.cc
@@ -26,7 +26,7 @@ namespace {
const char* g_preinstalled_app_for_testing = nullptr;
@@ -9,7 +9,7 @@
// TODO(b/268221237): Remove this allow-list.
const char kDefaultAllowedExtensionIds[] =
"alhngdkjgnedakdlnamimgfihgkmenbh,"
-@@ -113,7 +113,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
+@@ -116,7 +116,7 @@ bool ClearExternalExtensionUninstalled(content::Browse
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -17,4 +17,4 @@
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
bool IsExtensionUnsupportedDeprecatedApp(content::BrowserContext* context,
const std::string& extension_id) {
- if (!base::FeatureList::IsEnabled(features::kChromeAppsDeprecation))
+ if (testing::g_enable_chrome_apps_for_testing) {
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc
deleted file mode 100644
index 3d8f4b5721fe..000000000000
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.cc
+++ /dev/null
@@ -1,92 +0,0 @@
---- chrome/browser/web_applications/os_integration/os_integration_test_override.cc.orig 2023-04-22 17:45:15 UTC
-+++ chrome/browser/web_applications/os_integration/os_integration_test_override.cc
-@@ -179,7 +179,7 @@ bool OsIntegrationTestOverride::IsRunOnOsLoginEnabled(
- Profile* profile,
- const AppId& app_id,
- const std::string& app_name) {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::string shortcut_filename =
- "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
- return base::PathExists(startup().Append(shortcut_filename));
-@@ -349,7 +349,7 @@ base::FilePath OsIntegrationTestOverride::GetShortcutP
- app_installed_profiles.end()) {
- return shortcut_path;
- }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- std::string shortcut_filename =
- "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
- base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
-@@ -374,7 +374,7 @@ bool OsIntegrationTestOverride::IsShortcutCreated(Prof
- base::FilePath app_shortcut_path =
- GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
- return base::PathExists(app_shortcut_path);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- base::FilePath desktop_shortcut_path =
- GetShortcutPath(profile, desktop(), app_id, app_name);
- return base::PathExists(desktop_shortcut_path);
-@@ -402,7 +402,7 @@ bool OsIntegrationTestOverride::SimulateDeleteShortcut
- GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
- DCHECK(base::PathExists(app_folder_shortcut_path));
- return base::DeletePathRecursively(app_folder_shortcut_path);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- base::FilePath desktop_shortcut_path =
- GetShortcutPath(profile, desktop(), app_id, app_name);
- LOG(INFO) << desktop_shortcut_path;
-@@ -419,7 +419,7 @@ bool OsIntegrationTestOverride::ForceDeleteAllShortcut
- return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin();
- #elif BUILDFLAG(IS_MAC)
- return DeleteChromeAppsDir();
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return DeleteDesktopDirOnLinux();
- #else
- NOTREACHED() << "Not implemented on ChromeOS/Fuchsia ";
-@@ -459,7 +459,7 @@ void OsIntegrationTestOverride::EnableOrDisablePathOnL
- startup_enabled_[file_path] = enable_on_login;
- }
-
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool OsIntegrationTestOverride::DeleteDesktopDirOnLinux() {
- if (desktop_.IsValid()) {
- return desktop_.Delete();
-@@ -492,7 +492,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
- #elif BUILDFLAG(IS_MAC)
- bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path);
- DCHECK(success);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool success = desktop_.CreateUniqueTempDirUnderPath(base_path);
- DCHECK(success);
- success = startup_.CreateUniqueTempDirUnderPath(base_path);
-@@ -511,7 +511,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
- #elif BUILDFLAG(IS_MAC)
- bool success = chrome_apps_folder_.CreateUniqueTempDir();
- DCHECK(success);
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool success = desktop_.CreateUniqueTempDir();
- DCHECK(success);
- success = startup_.CreateUniqueTempDir();
-@@ -519,7 +519,7 @@ OsIntegrationTestOverride::OsIntegrationTestOverride(
- #endif
- }
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- auto callback =
- base::BindRepeating([](base::FilePath filename, std::string xdg_command,
- std::string file_contents) {
-@@ -553,7 +553,7 @@ OsIntegrationTestOverride::~OsIntegrationTestOverride(
- }
- }
- }
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Reset the file handling callback.
- SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting(
- UpdateMimeInfoDatabaseOnLinuxCallback());
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
index e7db25dd3b6e..19f84c86e750 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_os__integration__test__override.h
@@ -1,29 +1,11 @@
---- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/web_applications/os_integration/os_integration_test_override.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/web_applications/os_integration/os_integration_test_override.h
-@@ -33,7 +33,7 @@ class ShellLinkItem;
-
- namespace web_app {
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- struct LinuxFileRegistration {
- std::string xdg_command;
- std::string file_contents;
-@@ -183,7 +183,7 @@ class OsIntegrationTestOverride
- }
- void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
- bool enable_on_login);
+@@ -92,7 +92,7 @@ class OsIntegrationTestOverride
+ virtual const base::FilePath& chrome_apps_folder() = 0;
+ virtual void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
+ bool enable_on_login) = 0;
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- bool DeleteDesktopDirOnLinux();
- const base::FilePath& desktop() { return desktop_.GetPath(); }
- const base::FilePath& startup() { return startup_.GetPath(); }
-@@ -230,7 +230,7 @@ class OsIntegrationTestOverride
- #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_;
- base::ScopedTempDir startup_;
- std::vector<LinuxFileRegistration> linux_file_registration_;
+ virtual const base::FilePath& desktop() = 0;
+ virtual const base::FilePath& startup() = 0;
+ virtual const base::FilePath& applications_dir() = 0;
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
new file mode 100644
index 000000000000..85c0135a11cc
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_run__on__os__login__sub__manager.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/web_applications/os_integration/run_on_os_login_sub_manager.cc
+@@ -53,7 +53,7 @@ proto::RunOnOsLoginMode ConvertWebAppRunOnOsLoginModeT
+ // different from other platforms, see web_app_run_on_os_login_manager.h for
+ // more info.
+ bool DoesRunOnOsLoginRequireExecution() {
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return base::FeatureList::IsEnabled(features::kDesktopPWAsRunOnOsLogin);
+ #else
+ return false;
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
index daa93bf3a38e..58803df2e0b9 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_shortcut__sub__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/web_applications/os_integration/shortcut_sub_manager.cc
-@@ -170,7 +170,7 @@ void ShortcutSubManager::Execute(
+@@ -166,7 +166,7 @@ void ShortcutSubManager::Execute(
return;
}
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
index f6cd021e2799..98610a45534c 100644
--- a/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
+++ b/www/iridium/files/patch-chrome_browser_web__applications_os__integration_web__app__file__handler__registration.h
@@ -1,11 +1,11 @@
---- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2022-12-06 08:09:13 UTC
+--- chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/web_applications/os_integration/web_app_file_handler_registration.h
-@@ -45,7 +45,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id,
- Profile* profile,
+@@ -43,7 +43,7 @@ void UnregisterFileHandlersWithOs(const AppId& app_id,
+ const base::FilePath& profile_path,
ResultCallback callback);
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Exposed for testing purposes. Register the set of
// MIME-type-to-file-extensions mappings corresponding to |file_handlers|. File
- // I/O and a a callout to the Linux shell are performed asynchronously.
+ // I/O and callouts to the Linux shell are performed asynchronously.
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 1cc3feb8a3cd..c303f0cf027d 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 2023-04-22 17:45:15 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/web_applications/os_integration/web_app_shortcut.h
@@ -21,7 +21,7 @@
#include "ui/gfx/image/image_family.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/os_integration/web_app_shortcut_linux.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -70,7 +70,7 @@ struct ShortcutInfo {
+@@ -69,7 +69,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 90044b3eef0c..e7b8cffcb6b9 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,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/web_applications/os_integration/web_app_shortcut_manager.cc
-@@ -439,7 +439,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
+@@ -436,7 +436,7 @@ std::unique_ptr<ShortcutInfo> WebAppShortcutManager::B
}
}
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
new file mode 100644
index 000000000000..96f00b4fbc76
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.cc
@@ -0,0 +1,128 @@
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.cc.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/web_applications/test/os_integration_test_override_impl.cc
+@@ -127,7 +127,7 @@ std::vector<std::wstring> GetFileExtensionsForProgId(
+ }
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Performs a blocking read of app icons from the disk.
+ SkColor IconManagerReadIconTopLeftColorForSize(WebAppIconManager& icon_manager,
+ const AppId& app_id,
+@@ -224,7 +224,7 @@ bool OsIntegrationTestOverrideImpl::SimulateDeleteShor
+ GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
+ CHECK(base::PathExists(app_folder_shortcut_path));
+ return base::DeletePathRecursively(app_folder_shortcut_path);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FilePath desktop_shortcut_path =
+ GetShortcutPath(profile, desktop(), app_id, app_name);
+ LOG(INFO) << desktop_shortcut_path;
+@@ -241,7 +241,7 @@ bool OsIntegrationTestOverrideImpl::ForceDeleteAllShor
+ return DeleteDesktopDirOnWin() && DeleteApplicationMenuDirOnWin();
+ #elif BUILDFLAG(IS_MAC)
+ return DeleteChromeAppsDir();
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return DeleteDesktopDirOnLinux();
+ #else
+ NOTREACHED() << "Not implemented on ChromeOS/Fuchsia ";
+@@ -277,7 +277,7 @@ bool OsIntegrationTestOverrideImpl::DeleteApplicationM
+ }
+ #endif // BUILDFLAG(IS_WIN)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool OsIntegrationTestOverrideImpl::DeleteDesktopDirOnLinux() {
+ if (desktop_.IsValid()) {
+ return desktop_.Delete();
+@@ -291,7 +291,7 @@ bool OsIntegrationTestOverrideImpl::IsRunOnOsLoginEnab
+ Profile* profile,
+ const AppId& app_id,
+ const std::string& app_name) {
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string shortcut_filename =
+ "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
+ return base::PathExists(startup().Append(shortcut_filename));
+@@ -347,7 +347,7 @@ bool OsIntegrationTestOverrideImpl::IsFileExtensionHan
+ is_file_handled =
+ shell_integration::CanApplicationHandleURL(app_path, test_file_url);
+ base::DeleteFile(test_file_path);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FilePath user_applications_dir =
+ applications_dir().Append("applications");
+ bool database_update_called = false;
+@@ -391,7 +391,7 @@ OsIntegrationTestOverrideImpl::GetShortcutIconTopLeftC
+ return absl::nullopt;
+ }
+ return GetIconTopLeftColorFromShortcutFile(shortcut_path);
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ WebAppProvider* provider = WebAppProvider::GetForLocalAppsUnchecked(profile);
+ if (!provider) {
+ return absl::nullopt;
+@@ -441,7 +441,7 @@ base::FilePath OsIntegrationTestOverrideImpl::GetShort
+ app_installed_profiles.end()) {
+ return shortcut_path;
+ }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string shortcut_filename =
+ "chrome-" + app_id + "-" + profile->GetBaseName().value() + ".desktop";
+ base::FilePath shortcut_path = shortcut_dir.Append(shortcut_filename);
+@@ -467,7 +467,7 @@ bool OsIntegrationTestOverrideImpl::IsShortcutCreated(
+ base::FilePath app_shortcut_path =
+ GetShortcutPath(profile, chrome_apps_folder(), app_id, app_name);
+ return base::PathExists(app_shortcut_path);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FilePath desktop_shortcut_path =
+ GetShortcutPath(profile, desktop(), app_id, app_name);
+ return base::PathExists(desktop_shortcut_path);
+@@ -656,7 +656,7 @@ void OsIntegrationTestOverrideImpl::EnableOrDisablePat
+ }
+ #endif // BUILDFLAG(IS_MAC)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const base::FilePath& OsIntegrationTestOverrideImpl::desktop() {
+ return desktop_.GetPath();
+ }
+@@ -691,7 +691,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+ #elif BUILDFLAG(IS_MAC)
+ bool success = chrome_apps_folder_.CreateUniqueTempDirUnderPath(base_path);
+ CHECK(success);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool success = desktop_.CreateUniqueTempDirUnderPath(base_path);
+ CHECK(success);
+ success = startup_.CreateUniqueTempDirUnderPath(base_path);
+@@ -712,7 +712,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+ #elif BUILDFLAG(IS_MAC)
+ bool success = chrome_apps_folder_.CreateUniqueTempDir();
+ CHECK(success);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool success = desktop_.CreateUniqueTempDir();
+ CHECK(success);
+ success = startup_.CreateUniqueTempDir();
+@@ -722,7 +722,7 @@ OsIntegrationTestOverrideImpl::OsIntegrationTestOverri
+ #endif
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ auto callback = base::BindRepeating([](base::FilePath filename_in,
+ std::string xdg_command,
+ std::string file_contents) {
+@@ -767,7 +767,7 @@ OsIntegrationTestOverrideImpl::~OsIntegrationTestOverr
+ }
+ }
+ }
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Reset the file handling callback.
+ SetUpdateMimeInfoDatabaseOnLinuxCallbackForTesting(
+ UpdateMimeInfoDatabaseOnLinuxCallback());
diff --git a/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
new file mode 100644
index 000000000000..5c388100fbd0
--- /dev/null
+++ b/www/iridium/files/patch-chrome_browser_web__applications_test_os__integration__test__override__impl.h
@@ -0,0 +1,38 @@
+--- chrome/browser/web_applications/test/os_integration_test_override_impl.h.orig 2023-07-24 14:27:53 UTC
++++ chrome/browser/web_applications/test/os_integration_test_override_impl.h
+@@ -38,7 +38,7 @@ class ShellLinkItem;
+
+ namespace web_app {
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ struct LinuxFileRegistration {
+ base::FilePath file_name;
+ std::string xdg_command;
+@@ -116,7 +116,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+ bool DeleteApplicationMenuDirOnWin();
+ #endif // BUILDFLAG(IS_WIN)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool DeleteDesktopDirOnLinux();
+ #endif // BUILDFLAG(IS_LINUX)
+
+@@ -235,7 +235,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+ const base::FilePath& chrome_apps_folder() override;
+ void EnableOrDisablePathOnLogin(const base::FilePath& file_path,
+ bool enable_on_login) override;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ const base::FilePath& desktop() override;
+ const base::FilePath& startup() override;
+ const base::FilePath& applications_dir() override;
+@@ -282,7 +282,7 @@ class OsIntegrationTestOverrideImpl : public OsIntegra
+ 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_;
+ base::ScopedTempDir startup_;
+ base::ScopedTempDir applications_dir_;
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 2e3cd3c60b3e..1836b345d542 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,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -587,7 +587,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
+@@ -561,7 +561,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
g_observer->ConfiguringCable(request_type);
}
diff --git a/www/iridium/files/patch-chrome_common_channel__info.h b/www/iridium/files/patch-chrome_common_channel__info.h
index c00d1ea16649..3d5e0bb93b68 100644
--- a/www/iridium/files/patch-chrome_common_channel__info.h
+++ b/www/iridium/files/patch-chrome_common_channel__info.h
@@ -1,6 +1,13 @@
---- chrome/common/channel_info.h.orig 2022-10-05 07:34:01 UTC
+--- chrome/common/channel_info.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/channel_info.h
-@@ -106,7 +106,7 @@ std::string GetChannelSuffixForDataDir();
+@@ -104,13 +104,13 @@ void ClearChannelForTesting();
+ std::string GetChannelSuffixForDataDir();
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string GetChannelSuffixForExtraFlagsEnvVarName();
+ #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_common_channel__info__posix.cc b/www/iridium/files/patch-chrome_common_channel__info__posix.cc
index 9bd02354d8c8..41209129405f 100644
--- a/www/iridium/files/patch-chrome_common_channel__info__posix.cc
+++ b/www/iridium/files/patch-chrome_common_channel__info__posix.cc
@@ -1,6 +1,15 @@
---- chrome/common/channel_info_posix.cc.orig 2022-03-28 18:11:04 UTC
+--- chrome/common/channel_info_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/channel_info_posix.cc
-@@ -93,7 +93,7 @@ std::string GetChannelSuffixForDataDir() {
+@@ -92,7 +92,7 @@ std::string GetChannelSuffixForDataDir() {
+ }
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::string GetChannelSuffixForExtraFlagsEnvVarName() {
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ const auto channel_state = GetChannelImpl();
+@@ -118,7 +118,7 @@ std::string GetChannelSuffixForExtraFlagsEnvVarName()
// 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 cfff1fdef858..a50233578bd1 100644
--- a/www/iridium/files/patch-chrome_common_chrome__features.cc
+++ b/www/iridium/files/patch-chrome_common_chrome__features.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/common/chrome_features.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/chrome_features.cc
@@ -82,7 +82,7 @@ BASE_FEATURE(kAsyncDns,
);
@@ -18,7 +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.
-@@ -284,7 +284,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
+@@ -291,7 +291,7 @@ BASE_FEATURE(kDesktopPWAsEnforceWebAppSettingsPolicy,
// Enables or disables Desktop PWAs to be auto-started on OS login.
BASE_FEATURE(kDesktopPWAsRunOnOsLogin,
"DesktopPWAsRunOnOsLogin",
@@ -27,7 +27,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -308,7 +308,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
+@@ -326,7 +326,7 @@ BASE_FEATURE(kDesktopPWAsWebBundles,
base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
// 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.
-@@ -335,7 +335,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
+@@ -353,7 +353,7 @@ BASE_FEATURE(kDisruptiveNotificationPermissionRevocati
BASE_FEATURE(kDnsOverHttps,
"DnsOverHttps",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -45,7 +45,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -351,7 +351,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -369,7 +369,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -54,16 +54,16 @@
true
#else
false
-@@ -745,7 +745,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
+@@ -793,7 +793,7 @@ BASE_FEATURE(kKAnonymityServiceStorage,
"KAnonymityServiceStorage",
- base::FEATURE_DISABLED_BY_DEFAULT);
+ base::FEATURE_ENABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
BASE_FEATURE(kLinuxLowMemoryMonitor,
"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -758,7 +758,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -806,7 +806,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 7df9aec3f899..5e0399a1f57e 100644
--- a/www/iridium/files/patch-chrome_common_chrome__features.h
+++ b/www/iridium/files/patch-chrome_common_chrome__features.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.h.orig 2023-04-22 17:45:15 UTC
+--- chrome/common/chrome_features.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/chrome_features.h
@@ -64,13 +64,13 @@ BASE_DECLARE_FEATURE(kAppShimNewCloseBehavior);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kAsyncDns);
@@ -16,7 +16,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kBackgroundModeAllowRestart);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -192,7 +192,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
+@@ -202,7 +202,7 @@ BASE_DECLARE_FEATURE(kDesktopPWAsTabStripSettings);
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kDesktopPWAsWebBundles);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,7 +25,7 @@
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kChromeAppsDeprecation);
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kKeepForceInstalledPreinstalledApps);
-@@ -439,7 +439,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
+@@ -465,7 +465,7 @@ BASE_DECLARE_FEATURE(kKAnonymityServiceOHTTPRequests);
COMPONENT_EXPORT(CHROME_FEATURES)
BASE_DECLARE_FEATURE(kKAnonymityServiceStorage);
@@ -34,7 +34,7 @@
COMPONENT_EXPORT(CHROME_FEATURES) BASE_DECLARE_FEATURE(kLinuxLowMemoryMonitor);
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorModerateLevel;
-@@ -447,7 +447,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -473,7 +473,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 bc6742422830..783eb9b51e49 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-10-05 07:34:01 UTC
+--- chrome/common/chrome_paths.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/chrome_paths.cc
-@@ -49,14 +49,14 @@
+@@ -48,14 +48,14 @@
namespace {
@@ -14,11 +14,11 @@
+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
#else
- FILE_PATH_LITERAL("/usr/share/chromium/extensions");
-+ FILE_PATH_LITERAL("/usr/local/share/chromium/extensions");
++ FILE_PATH_LITERAL("/usr/local/share/iridium/extensions");
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -178,7 +178,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -176,7 +176,7 @@ bool PathProvider(int key, base::FilePath* result) {
return false;
break;
case chrome::DIR_DEFAULT_DOWNLOADS_SAFE:
@@ -27,7 +27,7 @@
if (!GetUserDownloadsDirectorySafe(&cur))
return false;
break;
-@@ -421,12 +421,14 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -418,12 +418,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;
}
-@@ -436,7 +438,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -433,7 +435,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;
-@@ -444,7 +446,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -441,7 +443,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;
-@@ -488,7 +490,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -485,7 +487,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
#endif
@@ -71,13 +71,17 @@
case chrome::DIR_NATIVE_MESSAGING:
#if BUILDFLAG(IS_MAC)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -502,6 +504,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -499,9 +501,12 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
+#elif BUILDFLAG(IS_FREEBSD)
+ cur = base::FilePath(FILE_PATH_LITERAL(
-+ "/usr/local/etc/chromium/native-messaging-hosts"));
++ "/usr/local/etc/iridium/native-messaging-hosts"));
#else
cur = base::FilePath(FILE_PATH_LITERAL(
- "/etc/iridium-browser/native-messaging-hosts"));
+- "/etc/iridium-browser/native-messaging-hosts"));
++ "/etc/iridium/native-messaging-hosts"));
+ #endif
+ #endif // !BUILDFLAG(IS_MAC)
+ break;
diff --git a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
index 0e3097b54bb9..00fe703a2371 100644
--- a/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
+++ b/www/iridium/files/patch-chrome_common_chrome__paths__internal.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths_internal.h.orig 2022-03-28 18:11:04 UTC
+--- chrome/common/chrome_paths_internal.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/chrome_paths_internal.h
-@@ -45,7 +45,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
+@@ -43,7 +43,7 @@ void GetUserCacheDirectory(const base::FilePath& profi
// Get the path to the user's documents directory.
bool GetUserDocumentsDirectory(base::FilePath* result);
diff --git a/www/iridium/files/patch-chrome_common_chrome__switches.cc b/www/iridium/files/patch-chrome_common_chrome__switches.cc
index 280cd4cd91cd..1cefad714341 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 2023-04-22 17:45:15 UTC
+--- chrome/common/chrome_switches.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/chrome_switches.cc
-@@ -860,14 +860,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
+@@ -862,14 +862,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 36155a51b724..606719859330 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 2023-04-22 17:45:15 UTC
+--- chrome/common/chrome_switches.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/chrome_switches.h
-@@ -266,12 +266,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -269,12 +269,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_pref__names.cc b/www/iridium/files/patch-chrome_common_pref__names.cc
index 0923b81b465b..2e998d92a2c5 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 2023-04-22 17:45:15 UTC
+--- chrome/common/pref_names.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/pref_names.cc
-@@ -1213,7 +1213,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
+@@ -1193,7 +1193,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,16 +9,16 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemThemeDeprecated[] = "extensions.theme.use_system";
const char kSystemTheme[] = "extensions.theme.system_theme";
-@@ -1317,7 +1317,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1298,7 +1298,7 @@ const char kShowUpdatePromotionInfoBar[] =
+ "browser.show_update_promotion_info_bar";
+ #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)
// 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";
-@@ -1828,7 +1828,7 @@ const char kDownloadDirUpgraded[] = "download.director
+@@ -1811,7 +1811,7 @@ const char kDownloadDirUpgraded[] = "download.director
const char kDownloadLastCompleteTime[] = "download.last_complete_time";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
const char kOpenPdfDownloadInSystemReader[] =
"download.open_pdf_in_system_reader";
#endif
-@@ -2244,7 +2244,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
+@@ -2259,7 +2259,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
// requests.
const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled";
@@ -36,7 +36,7 @@
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
// along with kAuthNegotiateDelegateAllowlist.
const char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3274,7 +3274,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
+@@ -3272,7 +3272,7 @@ const char kFileOrDirectoryPickerWithoutGestureAllowed
const char kSandboxExternalProtocolBlocked[] =
"profile.sandbox_external_protocol_blocked";
@@ -45,7 +45,7 @@
// Boolean that indicates if system notifications are allowed to be used in
// place of Chrome notifications.
const char kAllowSystemNotifications[] = "system_notifications.allowed";
-@@ -3327,7 +3327,7 @@ const char kCACertificateManagementAllowed[] =
+@@ -3325,7 +3325,7 @@ const char kCACertificateManagementAllowed[] =
const char kChromeRootStoreEnabled[] = "chrome_root_store_enabled";
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -54,7 +54,7 @@
const char kEnforceLocalAnchorConstraintsEnabled[] =
"enforce_local_anchor_constraints_enabled";
#endif
-@@ -3650,7 +3650,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe
+@@ -3642,7 +3642,7 @@ const char kThrottleNonVisibleCrossOriginIframesAllowe
const char kNewBaseUrlInheritanceBehaviorAllowed[] =
"new_base_url_inheritance_behavior_allowed";
diff --git a/www/iridium/files/patch-chrome_common_pref__names.h b/www/iridium/files/patch-chrome_common_pref__names.h
index c8f54d0f0d61..2db2ee876064 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 2023-04-22 17:45:15 UTC
+--- chrome/common/pref_names.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/pref_names.h
-@@ -388,7 +388,7 @@ extern const char kUseAshProxy[];
+@@ -378,7 +378,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,16 +9,16 @@
// TODO(https://crbug.com/1317782): Remove in M110.
extern const char kUsesSystemThemeDeprecated[];
extern const char kSystemTheme[];
-@@ -409,7 +409,7 @@ extern const char kShowUpdatePromotionInfoBar[];
+@@ -398,7 +398,7 @@ extern const char kDefaultBrowserSettingEnabled[];
+ #if BUILDFLAG(IS_MAC)
+ extern const char kShowUpdatePromotionInfoBar[];
#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)
extern const char kUseCustomChromeFrame[];
#endif
extern const char kPartitionDefaultZoomLevel[];
-@@ -599,7 +599,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
+@@ -586,7 +586,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
extern const char kDownloadDirUpgraded[];
extern const char kDownloadLastCompleteTime[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,7 @@
extern const char kOpenPdfDownloadInSystemReader[];
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -716,7 +716,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
+@@ -709,7 +709,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
-@@ -845,7 +845,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
+@@ -836,7 +836,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
extern const char kAmbientAuthenticationInPrivateModesEnabled[];
extern const char kBasicAuthOverHttpEnabled[];
@@ -45,7 +45,7 @@
extern const char kAuthNegotiateDelegateByKdcPolicy[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -1124,7 +1124,7 @@ extern const char kBlockAutoplayEnabled[];
+@@ -1110,7 +1110,7 @@ extern const char kFileOrDirectoryPickerWithoutGesture
#endif
extern const char kSandboxExternalProtocolBlocked[];
@@ -54,7 +54,7 @@
extern const char kAllowSystemNotifications[];
#endif
-@@ -1150,7 +1150,7 @@ extern const char kCACertificateManagementAllowed[];
+@@ -1136,7 +1136,7 @@ extern const char kCACertificateManagementAllowed[];
extern const char kChromeRootStoreEnabled[];
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -63,7 +63,7 @@
// TODO(https://crbug.com/1406103): delete this after a few milestones.
extern const char kEnforceLocalAnchorConstraintsEnabled[];
#endif
-@@ -1299,7 +1299,7 @@ extern const char kDIPSTimerLastUpdate[];
+@@ -1287,7 +1287,7 @@ extern const char kDIPSTimerLastUpdate[];
extern const char kThrottleNonVisibleCrossOriginIframesAllowed[];
extern const char kNewBaseUrlInheritanceBehaviorAllowed[];
diff --git a/www/iridium/files/patch-chrome_common_url__constants.cc b/www/iridium/files/patch-chrome_common_url__constants.cc
index b4a7ef6a11f4..e4ec5073acfc 100644
--- a/www/iridium/files/patch-chrome_common_url__constants.cc
+++ b/www/iridium/files/patch-chrome_common_url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/common/url_constants.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/url_constants.cc
-@@ -513,7 +513,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
+@@ -534,7 +534,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
"https://support.google.com/chromebook/?p=multidevice";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/iridium/files/patch-chrome_common_url__constants.h b/www/iridium/files/patch-chrome_common_url__constants.h
index f6fdf0d133a6..8453373c7d7c 100644
--- a/www/iridium/files/patch-chrome_common_url__constants.h
+++ b/www/iridium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig 2023-03-13 07:33:08 UTC
+--- chrome/common/url_constants.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/url_constants.h
-@@ -488,7 +488,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
+@@ -512,7 +512,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
extern const char kPhoneHubPermissionLearnMoreURL[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
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 54711a2dd968..92606ab4b183 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 2023-04-22 17:45:15 UTC
+--- chrome/common/webui_url_constants.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -510,18 +510,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os://
+@@ -514,18 +514,18 @@ const char kOsUIShortcutCustomizationAppURL[] = "os://
const char kOsUIVersionURL[] = "os://version";
#endif
@@ -22,7 +22,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
-@@ -536,14 +536,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -540,14 +540,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[] =
-@@ -560,7 +560,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -564,7 +564,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";
-@@ -638,7 +638,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
+@@ -643,7 +643,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -57,7 +57,7 @@
const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
const char kChromeUIWebAppSettingsHost[] = "app-settings";
#endif
-@@ -859,7 +859,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -869,7 +869,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 ff49545730e5..108c3ec0ec1b 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 2023-04-22 17:45:15 UTC
+--- chrome/common/webui_url_constants.h.orig 2023-07-24 14:27:53 UTC
+++ chrome/common/webui_url_constants.h
-@@ -432,24 +432,24 @@ extern const char kOsUIShortcutCustomizationAppURL[];
+@@ -437,24 +437,24 @@ extern const char kOsUIShortcutCustomizationAppURL[];
extern const char kOsUIVersionURL[];
#endif
@@ -29,7 +29,7 @@
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
-@@ -464,14 +464,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -469,14 +469,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -46,7 +46,7 @@
extern const char kChromeUIBrowserSwitchHost[];
extern const char kChromeUIBrowserSwitchURL[];
extern const char kChromeUIEnterpriseProfileWelcomeHost[];
-@@ -485,7 +485,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -490,7 +490,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 2ec2736d57b3..14fb1327b93e 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 2023-03-13 07:33:08 UTC
+--- chrome/renderer/chrome_render_frame_observer.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/renderer/chrome_render_frame_observer.cc
-@@ -345,7 +345,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
+@@ -346,7 +346,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_services_printing_print__backend__service__impl.cc b/www/iridium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index 43c07bd8cff2..a849eab0d57a 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,6 +1,6 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig 2023-04-22 17:45:15 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/services/printing/print_backend_service_impl.cc
-@@ -43,7 +43,7 @@
+@@ -45,7 +45,7 @@
#include "printing/backend/cups_connection_pool.h"
#endif
@@ -9,7 +9,7 @@
#include "base/no_destructor.h"
#include "ui/linux/linux_ui.h"
#include "ui/linux/linux_ui_delegate_stub.h"
-@@ -70,7 +70,7 @@ namespace printing {
+@@ -72,7 +72,7 @@ namespace printing {
namespace {
@@ -18,7 +18,7 @@
void InstantiateLinuxUiDelegate() {
// TODO(crbug.com/809738) Until a real UI can be used in a utility process,
// need to use the stub version.
-@@ -490,7 +490,7 @@ void PrintBackendServiceImpl::Init(
+@@ -456,7 +456,7 @@ void PrintBackendServiceImpl::Init(
// `InitCommon()`.
InitializeProcessForPrinting();
print_backend_ = PrintBackend::CreateInstance(locale);
@@ -27,7 +27,7 @@
// Test framework already initializes the UI, so this should not go in
// `InitCommon()`. Additionally, low-level Linux UI is not needed when tests
// are using `TestPrintingContext`.
-@@ -679,7 +679,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -677,7 +677,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend_->GetPrinterDriverInfo(*printer_name));
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 0b814d329f35..f70c1b748a7c 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 2023-01-17 19:19:00 UTC
+--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/services/speech/audio_source_fetcher_impl.cc
-@@ -121,7 +121,7 @@ void AudioSourceFetcherImpl::Start(
+@@ -132,7 +132,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 ebcafe25c870..3f976db0d935 100644
--- a/www/iridium/files/patch-chrome_test_BUILD.gn
+++ b/www/iridium/files/patch-chrome_test_BUILD.gn
@@ -1,11 +1,11 @@
---- chrome/test/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+--- chrome/test/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ chrome/test/BUILD.gn
-@@ -10152,7 +10152,7 @@ test("chrome_app_unittests") {
+@@ -10596,7 +10596,7 @@ test("chrome_app_unittests") {
"//components/heap_profiling/in_process",
"//components/safe_browsing:buildflags",
]
-- if (!is_fuchsia) {
-+ if (!is_fuchsia && !is_bsd) {
+- if (!is_fuchsia && !is_mac) {
++ if (!is_fuchsia && !is_mac && !is_bsd) {
deps += [ "//third_party/breakpad:client" ]
}
- if (enable_gwp_asan) {
+ if (is_android) {
diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc b/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
index 5a5efe8f25cf..dcb7754b94eb 100644
--- a/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
+++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome__launcher.cc
@@ -1,6 +1,6 @@
---- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/test/chromedriver/chrome_launcher.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/test/chromedriver/chrome_launcher.cc
-@@ -64,6 +64,7 @@
+@@ -66,6 +66,7 @@
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/types.h>
diff --git a/www/iridium/files/patch-chrome_test_chromedriver_chrome_client__hints.h b/www/iridium/files/patch-chrome_test_chromedriver_chrome_client__hints.h
new file mode 100644
index 000000000000..101d88428939
--- /dev/null
+++ b/www/iridium/files/patch-chrome_test_chromedriver_chrome_client__hints.h
@@ -0,0 +1,10 @@
+--- chrome/test/chromedriver/chrome/client_hints.h.orig 2023-07-24 14:27:53 UTC
++++ chrome/test/chromedriver/chrome/client_hints.h
+@@ -7,6 +7,7 @@
+
+ #include <third_party/abseil-cpp/absl/types/optional.h>
+ #include <string>
++#include <vector>
+
+ struct BrandVersion {
+ // Browser brand.
diff --git a/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc b/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc
deleted file mode 100644
index 5e8d07f4789b..000000000000
--- a/www/iridium/files/patch-chrome_test_interaction_interaction__test__util__browser.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/test/interaction/interaction_test_util_browser.cc.orig 2023-03-13 07:33:08 UTC
-+++ chrome/test/interaction/interaction_test_util_browser.cc
-@@ -35,7 +35,7 @@
- #include "ui/base/interaction/interaction_test_util_mac.h"
- #endif
-
--#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
- #include "base/command_line.h"
- #include "chrome/browser/ui/test/test_browser_ui.h"
diff --git a/www/iridium/files/patch-chrome_updater_configurator.cc b/www/iridium/files/patch-chrome_updater_configurator.cc
index 03311ec13ac9..04544170802e 100644
--- a/www/iridium/files/patch-chrome_updater_configurator.cc
+++ b/www/iridium/files/patch-chrome_updater_configurator.cc
@@ -1,9 +1,9 @@
---- chrome/updater/configurator.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/updater/configurator.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/updater/configurator.cc
-@@ -57,7 +57,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs>
- base::MakeRefCounted<update_client::InProcessUnzipperFactory>()),
- patch_factory_(
- base::MakeRefCounted<update_client::InProcessPatcherFactory>()) {
+@@ -63,7 +63,7 @@ Configurator::Configurator(scoped_refptr<UpdaterPrefs>
+ return absl::nullopt;
+ #endif
+ }()) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// On Linux creating the NetworkFetcherFactory requires performing blocking IO
diff --git a/www/iridium/files/patch-chrome_updater_util_posix__util.cc b/www/iridium/files/patch-chrome_updater_util_posix__util.cc
index 7dbf3dc3ef4a..d70923a9c542 100644
--- a/www/iridium/files/patch-chrome_updater_util_posix__util.cc
+++ b/www/iridium/files/patch-chrome_updater_util_posix__util.cc
@@ -1,6 +1,6 @@
---- chrome/updater/util/posix_util.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/updater/util/posix_util.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/updater/util/posix_util.cc
-@@ -10,7 +10,7 @@
+@@ -16,7 +16,7 @@
#include "chrome/updater/updater_branding.h"
#include "chrome/updater/util/util.h"
diff --git a/www/iridium/files/patch-chrome_utility_services.cc b/www/iridium/files/patch-chrome_utility_services.cc
index 364e316f1747..0ff48d46fc12 100644
--- a/www/iridium/files/patch-chrome_utility_services.cc
+++ b/www/iridium/files/patch-chrome_utility_services.cc
@@ -1,4 +1,4 @@
---- chrome/utility/services.cc.orig 2023-03-13 07:33:08 UTC
+--- chrome/utility/services.cc.orig 2023-07-24 14:27:53 UTC
+++ chrome/utility/services.cc
@@ -56,7 +56,7 @@
#include "chrome/services/system_signals/mac/mac_system_signals_service.h"
@@ -36,7 +36,7 @@
auto RunDocumentAnalysis(
mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) {
return std::make_unique<DocumentAnalysisService>(std::move(receiver));
-@@ -465,7 +465,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -462,7 +462,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
services.Add(RunWindowsIconReader);
#endif // BUILDFLAG(IS_WIN)
@@ -45,7 +45,7 @@
services.Add(RunSystemSignalsService);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-@@ -481,7 +481,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -478,7 +478,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 d6861ad26a25..771060ce6872 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 2023-03-13 07:33:08 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig 2023-07-24 14:27:53 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
-@@ -89,7 +89,7 @@
+@@ -90,7 +90,7 @@
#include "ui/base/ui_base_switches.h"
#include "ui/gl/gl_switches.h"
@@ -9,7 +9,7 @@
#include <fontconfig/fontconfig.h>
#include <signal.h>
#include <sys/prctl.h>
-@@ -262,7 +262,7 @@ class CastViewsDelegate : public views::ViewsDelegate
+@@ -263,7 +263,7 @@ class CastViewsDelegate : public views::ViewsDelegate
#endif // defined(USE_AURA)
@@ -18,7 +18,7 @@
base::FilePath GetApplicationFontsDir() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -308,7 +308,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -309,7 +309,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
{cc::switches::kDisableThreadedAnimation, ""},
#endif // BUILDFLAG(IS_ANDROID)
#endif // BUILDFLAG(IS_CAST_AUDIO_ONLY)
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 f0cc4c4795cd..4366ec38e46d 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,6 +1,6 @@
---- chromecast/browser/cast_content_browser_client.cc.orig 2023-03-13 07:33:08 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig 2023-07-24 14:27:53 UTC
+++ chromecast/browser/cast_content_browser_client.cc
-@@ -427,7 +427,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -446,7 +446,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
switches::kAudioOutputChannels));
}
} else if (process_type == switches::kGpuProcess) {
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 c5615213d58e..dab25b885e59 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 2023-04-22 17:45:15 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2023-07-24 14:27:53 UTC
+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -2253,7 +2253,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -2311,7 +2311,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 7b8144f12f66..07615c35ef5b 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 2023-04-22 17:45:15 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2023-07-24 14:27:53 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -270,7 +270,7 @@ const base::FeatureParam<int>
+@@ -281,7 +281,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_crash_core_app_BUILD.gn b/www/iridium/files/patch-components_crash_core_app_BUILD.gn
index 06715e82407e..e735ef232b16 100644
--- a/www/iridium/files/patch-components_crash_core_app_BUILD.gn
+++ b/www/iridium/files/patch-components_crash_core_app_BUILD.gn
@@ -1,6 +1,6 @@
---- components/crash/core/app/BUILD.gn.orig 2022-12-06 08:09:13 UTC
+--- components/crash/core/app/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ components/crash/core/app/BUILD.gn
-@@ -52,7 +52,7 @@ static_library("app") {
+@@ -60,7 +60,7 @@ static_library("app") {
"crashpad.h",
]
@@ -9,7 +9,7 @@
sources += [ "crashpad_linux.cc" ]
}
-@@ -65,6 +65,10 @@ static_library("app") {
+@@ -73,6 +73,10 @@ static_library("app") {
]
}
@@ -20,7 +20,7 @@
defines = [ "CRASH_IMPLEMENTATION" ]
public_deps = [ ":lib" ]
-@@ -96,7 +100,7 @@ static_library("app") {
+@@ -101,7 +105,7 @@ static_library("app") {
libs = [ "log" ]
}
@@ -29,7 +29,7 @@
deps += [
"//base:base_static",
"//components/crash/core/common",
-@@ -224,11 +228,6 @@ if (is_mac || is_android || is_linux || is_chromeos) {
+@@ -233,11 +237,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_crash_core_browser_crash__upload__list__crashpad.cc b/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
index 94b9507866d6..4919b77a7688 100644
--- a/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
+++ b/www/iridium/files/patch-components_crash_core_browser_crash__upload__list__crashpad.cc
@@ -1,16 +1,16 @@
---- components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2022-12-06 08:09:13 UTC
+--- components/crash/core/browser/crash_upload_list_crashpad.cc.orig 2023-07-24 14:27:53 UTC
+++ components/crash/core/browser/crash_upload_list_crashpad.cc
-@@ -37,7 +37,9 @@ CrashUploadListCrashpad::~CrashUploadListCrashpad() =
-
- std::vector<UploadList::UploadInfo> CrashUploadListCrashpad::LoadUploadList() {
+@@ -38,7 +38,9 @@ CrashUploadListCrashpad::~CrashUploadListCrashpad() =
+ std::vector<std::unique_ptr<UploadList::UploadInfo>>
+ CrashUploadListCrashpad::LoadUploadList() {
std::vector<crash_reporter::Report> reports;
+#if !defined(OS_BSD)
crash_reporter::GetReports(&reports);
+#endif
- std::vector<UploadInfo> uploads;
+ std::vector<std::unique_ptr<UploadInfo>> uploads;
for (const crash_reporter::Report& report : reports) {
-@@ -51,9 +53,13 @@ std::vector<UploadList::UploadInfo> CrashUploadListCra
+@@ -52,9 +54,13 @@ CrashUploadListCrashpad::LoadUploadList() {
void CrashUploadListCrashpad::ClearUploadList(const base::Time& begin,
const base::Time& end) {
diff --git a/www/iridium/files/patch-components_crash_core_common_BUILD.gn b/www/iridium/files/patch-components_crash_core_common_BUILD.gn
index 9d4dbecfe375..2eb8ded90053 100644
--- a/www/iridium/files/patch-components_crash_core_common_BUILD.gn
+++ b/www/iridium/files/patch-components_crash_core_common_BUILD.gn
@@ -1,6 +1,6 @@
---- components/crash/core/common/BUILD.gn.orig 2022-12-06 08:09:13 UTC
+--- components/crash/core/common/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ components/crash/core/common/BUILD.gn
-@@ -8,7 +8,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
+@@ -9,7 +9,7 @@ import("//components/gwp_asan/buildflags/buildflags.gn
declare_args() {
# If set to true, this will stub out and disable the entire crash key system.
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h b/www/iridium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h
new file mode 100644
index 000000000000..2a32fc1e61a5
--- /dev/null
+++ b/www/iridium/files/patch-components_device__signals_core_browser_mock__signals__aggregator.h
@@ -0,0 +1,11 @@
+--- components/device_signals/core/browser/mock_signals_aggregator.h.orig 2023-07-24 14:27:53 UTC
++++ components/device_signals/core/browser/mock_signals_aggregator.h
+@@ -17,7 +17,7 @@ class MockSignalsAggregator : public SignalsAggregator
+ MockSignalsAggregator();
+ ~MockSignalsAggregator() override;
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ MOCK_METHOD(void,
+ GetSignalsForUser,
+ (const UserContext&,
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator.h b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator.h
new file mode 100644
index 000000000000..b004f058e724
--- /dev/null
+++ b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator.h
@@ -0,0 +1,11 @@
+--- components/device_signals/core/browser/signals_aggregator.h.orig 2023-07-24 14:27:53 UTC
++++ components/device_signals/core/browser/signals_aggregator.h
+@@ -22,7 +22,7 @@ class SignalsAggregator : public KeyedService {
+
+ ~SignalsAggregator() override = default;
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Will asynchronously collect signals whose names are specified in the
+ // `request` object, and will also use a `user_context` to validate that the
+ // user has permissions to the device's signals. Invokes `callback` with the
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
new file mode 100644
index 000000000000..5575b4e23379
--- /dev/null
+++ b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.cc
@@ -0,0 +1,11 @@
+--- components/device_signals/core/browser/signals_aggregator_impl.cc.orig 2023-07-24 14:27:53 UTC
++++ components/device_signals/core/browser/signals_aggregator_impl.cc
+@@ -65,7 +65,7 @@ SignalsAggregatorImpl::SignalsAggregatorImpl(
+
+ SignalsAggregatorImpl::~SignalsAggregatorImpl() = default;
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void SignalsAggregatorImpl::GetSignalsForUser(
+ const UserContext& user_context,
+ const SignalsAggregationRequest& request,
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h
new file mode 100644
index 000000000000..05ae4dc3948f
--- /dev/null
+++ b/www/iridium/files/patch-components_device__signals_core_browser_signals__aggregator__impl.h
@@ -0,0 +1,11 @@
+--- components/device_signals/core/browser/signals_aggregator_impl.h.orig 2023-07-24 14:27:53 UTC
++++ components/device_signals/core/browser/signals_aggregator_impl.h
+@@ -29,7 +29,7 @@ class SignalsAggregatorImpl : public SignalsAggregator
+ ~SignalsAggregatorImpl() override;
+
+ // SignalsAggregator:
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void GetSignalsForUser(const UserContext& user_context,
+ const SignalsAggregationRequest& request,
+ GetSignalsCallback callback) override;
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service.h b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service.h
new file mode 100644
index 000000000000..007da4b37caa
--- /dev/null
+++ b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service.h
@@ -0,0 +1,11 @@
+--- components/device_signals/core/browser/user_permission_service.h.orig 2023-07-24 14:27:53 UTC
++++ components/device_signals/core/browser/user_permission_service.h
+@@ -57,7 +57,7 @@ class UserPermissionService : public KeyedService {
+ // missing.
+ virtual bool ShouldCollectConsent() const = 0;
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Will verify whether context-aware signals can be collected
+ // on behalf of the user represented by `user_context`. Returns `kGranted` if
+ // collection is allowed.
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc
new file mode 100644
index 000000000000..e965a7ca32c1
--- /dev/null
+++ b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.cc
@@ -0,0 +1,11 @@
+--- components/device_signals/core/browser/user_permission_service_impl.cc.orig 2023-07-24 14:27:53 UTC
++++ components/device_signals/core/browser/user_permission_service_impl.cc
+@@ -74,7 +74,7 @@ bool UserPermissionServiceImpl::ShouldCollectConsent()
+ consent_required_by_dependent_policy;
+ }
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ UserPermission UserPermissionServiceImpl::CanUserCollectSignals(
+ const UserContext& user_context) const {
+ // Return "unknown user" if no user ID was given.
diff --git a/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h
new file mode 100644
index 000000000000..7f9b093228bf
--- /dev/null
+++ b/www/iridium/files/patch-components_device__signals_core_browser_user__permission__service__impl.h
@@ -0,0 +1,11 @@
+--- components/device_signals/core/browser/user_permission_service_impl.h.orig 2023-07-24 14:27:53 UTC
++++ components/device_signals/core/browser/user_permission_service_impl.h
+@@ -39,7 +39,7 @@ class UserPermissionServiceImpl : public UserPermissio
+
+ // UserPermissionService:
+ bool ShouldCollectConsent() const override;
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ UserPermission CanUserCollectSignals(
+ const UserContext& user_context) const override;
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX
diff --git a/www/iridium/files/patch-components_device__signals_test_signals__contract.cc b/www/iridium/files/patch-components_device__signals_test_signals__contract.cc
index cdf38baaa2d4..5e7054712ee9 100644
--- a/www/iridium/files/patch-components_device__signals_test_signals__contract.cc
+++ b/www/iridium/files/patch-components_device__signals_test_signals__contract.cc
@@ -1,6 +1,6 @@
---- components/device_signals/test/signals_contract.cc.orig 2023-01-17 19:19:00 UTC
+--- components/device_signals/test/signals_contract.cc.orig 2023-07-24 14:27:53 UTC
+++ components/device_signals/test/signals_contract.cc
-@@ -190,7 +190,7 @@ GetSignalsContract() {
+@@ -186,7 +186,7 @@ GetSignalsContract() {
base::BindRepeating(VerifyUnset, names::kCrowdStrike);
#endif
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 c558f2dbf63e..3260e65d88dc 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,6 +1,6 @@
---- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-03-13 07:33:08 UTC
+--- components/embedder_support/user_agent_utils_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -81,7 +81,7 @@ const char kDesktop[] =
+@@ -83,7 +83,7 @@ const char kDesktop[] =
"Safari/537.36";
#endif // BUILDFLAG(IS_ANDROID)
@@ -9,7 +9,7 @@
std::string GetMachine() {
struct utsname unixinfo;
uname(&unixinfo);
-@@ -189,7 +189,7 @@ void CheckUserAgentStringOrdering(bool mobile_device)
+@@ -191,7 +191,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 70b4b8c6948a..4aa338aa5f59 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,6 +1,6 @@
---- components/feature_engagement/public/feature_configurations.cc.orig 2023-04-22 17:45:15 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig 2023-07-24 14:27:53 UTC
+++ components/feature_engagement/public/feature_configurations.cc
-@@ -39,7 +39,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
+@@ -40,7 +40,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
absl::optional<FeatureConfig> GetClientSideFeatureConfig(
const base::Feature* feature) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,13 +9,13 @@
if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
absl::optional<FeatureConfig> config = FeatureConfig();
config->valid = true;
-@@ -1070,7 +1070,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+@@ -1197,7 +1197,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
- if (kIPHAutofillVirtualCardSuggestionFeature.name == feature->name) {
- // A config that allows the virtual card credit card suggestion IPH to be
- // shown when:
+
+ if (kIPHAutofillExternalAccountProfileSuggestionFeature.name ==
+ feature->name) {
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 14fea7a5e917..bb1ad69a8068 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,21 +1,21 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2023-04-22 17:45:15 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2023-07-24 14:27:53 UTC
+++ components/feature_engagement/public/feature_constants.cc
-@@ -19,7 +19,7 @@ BASE_FEATURE(kUseClientConfigIPH,
+@@ -20,7 +20,7 @@ BASE_FEATURE(kUseClientConfigIPH,
BASE_FEATURE(kIPHDummyFeature, "IPH_Dummy", base::FEATURE_DISABLED_BY_DEFAULT);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIPHBatterySaverModeFeature,
- "IPH_BatterySaverMode",
+ BASE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature,
+ "IPH_AutofillFeedbackNewBadge",
base::FEATURE_DISABLED_BY_DEFAULT);
-@@ -437,7 +437,8 @@ BASE_FEATURE(kIPHiOSAppStorePromoFeature,
+@@ -498,7 +498,8 @@ BASE_FEATURE(kIPHiOSDefaultBrowserVideoPromoTriggerFea
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
- BASE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature,
- "IPH_AutofillVirtualCardSuggestion",
+ BASE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature,
+ "IPH_AutofillExternalAccountProfileSuggestion",
base::FEATURE_ENABLED_BY_DEFAULT);
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 f5b4bbfe4449..afd570efe822 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,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig 2023-04-22 17:45:15 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2023-07-24 14:27:53 UTC
+++ components/feature_engagement/public/feature_constants.h
@@ -22,7 +22,7 @@ BASE_DECLARE_FEATURE(kUseClientConfigIPH);
BASE_DECLARE_FEATURE(kIPHDummyFeature);
@@ -6,16 +6,16 @@
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIPHAutofillFeedbackNewBadgeFeature);
BASE_DECLARE_FEATURE(kIPHBatterySaverModeFeature);
- BASE_DECLARE_FEATURE(kIPHDesktopSharedHighlightingFeature);
- BASE_DECLARE_FEATURE(kIPHDesktopTabGroupsNewGroupFeature);
-@@ -181,7 +181,8 @@ BASE_DECLARE_FEATURE(kIPHiOSAppStorePromoFeature);
+ BASE_DECLARE_FEATURE(kIPHCompanionSidePanelFeature);
+@@ -202,7 +202,8 @@ BASE_DECLARE_FEATURE(kIPHiOSDefaultBrowserVideoPromoTr
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
+ BASE_DECLARE_FEATURE(kIPHAutofillExternalAccountProfileSuggestionFeature);
BASE_DECLARE_FEATURE(kIPHAutofillVirtualCardSuggestionFeature);
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ||
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 e2aaa8c49098..821ce4413455 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,21 +1,21 @@
---- components/feature_engagement/public/feature_list.cc.orig 2023-04-22 17:45:15 UTC
+--- components/feature_engagement/public/feature_list.cc.orig 2023-07-24 14:27:53 UTC
+++ components/feature_engagement/public/feature_list.cc
-@@ -128,7 +128,7 @@ const base::Feature* const kAllFeatures[] = {
- &kIPHiOSAppStorePromoFeature,
+@@ -138,7 +138,7 @@ const base::Feature* const kAllFeatures[] = {
+ &kIPHiOSDefaultBrowserVideoPromoTriggerFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ &kIPHAutofillFeedbackNewBadgeFeature,
&kIPHBatterySaverModeFeature,
- &kIPHDesktopTabGroupsNewGroupFeature,
- &kIPHExtensionsMenuFeature,
-@@ -160,7 +160,8 @@ const base::Feature* const kAllFeatures[] = {
+ &kIPHCompanionSidePanelFeature,
+@@ -179,7 +179,8 @@ const base::Feature* const kAllFeatures[] = {
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
+ &kIPHAutofillExternalAccountProfileSuggestionFeature,
&kIPHAutofillVirtualCardSuggestionFeature,
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ||
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 4e62dae69df3..def1d28a3576 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,40 +1,40 @@
---- components/feature_engagement/public/feature_list.h.orig 2023-04-22 17:45:15 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2023-07-24 14:27:53 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -233,7 +233,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSAppStorePromoFeature, "I
+@@ -255,7 +255,7 @@ DEFINE_VARIATION_PARAM(kIPHiOSDefaultBrowserVideoPromo
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kIPHAutofillFeedbackNewBadgeFeature,
+ "IPH_AutofillFeedbackNewBadge");
DEFINE_VARIATION_PARAM(kIPHBatterySaverModeFeature, "IPH_BatterySaverMode");
- DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature,
- "IPH_DesktopTabGroupsNewGroup");
-@@ -279,7 +279,8 @@ DEFINE_VARIATION_PARAM(kIPHPriceTrackingInSidePanelFea
+@@ -319,7 +319,8 @@ DEFINE_VARIATION_PARAM(kIPHBackNavigationMenuFeature,
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
+ DEFINE_VARIATION_PARAM(kIPHAutofillExternalAccountProfileSuggestionFeature,
+ "IPH_AutofillExternalAccountProfileSuggestion");
DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature,
- "IPH_AutofillVirtualCardSuggestion");
- #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
-@@ -398,7 +399,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
- VARIATION_ENTRY(kIPHiOSDefaultBrowserSettingsBadgeFeature),
- VARIATION_ENTRY(kIPHiOSAppStorePromoFeature),
+@@ -453,7 +454,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+ VARIATION_ENTRY(kIPHiOSHistoryOnOverflowMenuFeature),
+ VARIATION_ENTRY(kIPHiOSShareToolbarItemFeature),
#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(kIPHAutofillFeedbackNewBadgeFeature),
VARIATION_ENTRY(kIPHBatterySaverModeFeature),
- VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature),
- VARIATION_ENTRY(kIPHExtensionsMenuFeature),
-@@ -431,7 +432,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+ VARIATION_ENTRY(kIPHCompanionSidePanelFeature),
+@@ -495,7 +496,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
+ BUILDFLAG(IS_BSD)
+ VARIATION_ENTRY(kIPHAutofillExternalAccountProfileSuggestionFeature),
VARIATION_ENTRY(kIPHAutofillVirtualCardSuggestionFeature),
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) ||
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 d6f860441511..74b611583483 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-10-30 08:34:47 UTC
+--- components/feed/core/v2/feed_network_impl_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ components/feed/core/v2/feed_network_impl_unittest.cc
-@@ -799,8 +799,8 @@ TEST_F(FeedNetworkTest, SendApiRequest_DecodesClientIn
+@@ -801,8 +801,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 0c47d46017d5..5d025834a8a7 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 2023-03-13 07:33:08 UTC
+--- components/feed/core/v2/proto_util.cc.orig 2023-07-24 14:27:53 UTC
+++ components/feed/core/v2/proto_util.cc
-@@ -92,8 +92,8 @@ feedwire::Version GetPlatformVersionMessage() {
+@@ -93,8 +93,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());
-@@ -108,8 +108,8 @@ feedwire::Version GetAppVersionMessage(const ChromeInf
+@@ -109,8 +109,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_test_proto__printer.cc b/www/iridium/files/patch-components_feed_core_v2_test_proto__printer.cc
index af369af4886e..59a5fedc25fa 100644
--- a/www/iridium/files/patch-components_feed_core_v2_test_proto__printer.cc
+++ b/www/iridium/files/patch-components_feed_core_v2_test_proto__printer.cc
@@ -1,6 +1,6 @@
---- components/feed/core/v2/test/proto_printer.cc.orig 2022-04-01 07:48:30 UTC
+--- components/feed/core/v2/test/proto_printer.cc.orig 2023-07-24 14:27:53 UTC
+++ components/feed/core/v2/test/proto_printer.cc
-@@ -157,8 +157,8 @@ class TextProtoPrinter {
+@@ -158,8 +158,8 @@ class TextProtoPrinter {
}
TextProtoPrinter& operator<<(const feedwire::Version& v) {
BeginMessage();
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 362f70f67e57..5980e8f7c913 100644
--- a/www/iridium/files/patch-components_flags__ui_flags__state.cc
+++ b/www/iridium/files/patch-components_flags__ui_flags__state.cc
@@ -1,6 +1,6 @@
---- components/flags_ui/flags_state.cc.orig 2022-10-05 07:34:01 UTC
+--- components/flags_ui/flags_state.cc.orig 2023-07-24 14:27:53 UTC
+++ components/flags_ui/flags_state.cc
-@@ -672,7 +672,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
+@@ -673,7 +673,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
return kOsCrOS;
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
return kOsLacros;
diff --git a/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc b/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
index 8e2c6e4d3815..2033d1d170c0 100644
--- a/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
+++ b/www/iridium/files/patch-components_gwp__asan_crash__handler_crash__analyzer.cc
@@ -1,6 +1,6 @@
---- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2022-03-28 18:11:04 UTC
+--- components/gwp_asan/crash_handler/crash_analyzer.cc.orig 2023-07-24 14:27:53 UTC
+++ components/gwp_asan/crash_handler/crash_analyzer.cc
-@@ -26,7 +26,7 @@
+@@ -30,7 +30,7 @@
#include "third_party/crashpad/crashpad/snapshot/process_snapshot.h"
#include "third_party/crashpad/crashpad/util/process/process_memory.h"
@@ -9,7 +9,7 @@
#include <signal.h>
#elif BUILDFLAG(IS_APPLE)
#include <mach/exception_types.h>
-@@ -81,7 +81,7 @@ bool CrashAnalyzer::GetExceptionInfo(
+@@ -90,7 +90,7 @@ bool CrashAnalyzer::GetExceptionInfo(
crashpad::VMAddress CrashAnalyzer::GetAccessAddress(
const crashpad::ExceptionSnapshot& exception) {
diff --git a/www/iridium/files/patch-components_live__caption_caption__util.cc b/www/iridium/files/patch-components_live__caption_caption__util.cc
index 239e09016ad1..07f55de0d362 100644
--- a/www/iridium/files/patch-components_live__caption_caption__util.cc
+++ b/www/iridium/files/patch-components_live__caption_caption__util.cc
@@ -1,6 +1,6 @@
---- components/live_caption/caption_util.cc.orig 2022-10-05 07:34:01 UTC
+--- components/live_caption/caption_util.cc.orig 2023-07-24 14:27:53 UTC
+++ components/live_caption/caption_util.cc
-@@ -140,7 +140,7 @@ bool IsLiveCaptionFeatureSupported() {
+@@ -145,7 +145,7 @@ bool IsLiveCaptionFeatureSupported() {
return false;
#endif
@@ -9,3 +9,12 @@
// 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();
+@@ -167,7 +167,7 @@ std::string GetCaptionSettingsUrl() {
+ return "chrome://os-settings/audioAndCaptions";
+ #endif // BUILDFLAG(IS_CHROMEOS)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ return "chrome://settings/captions";
+ #endif // BUILDFLAG(IS_LINUX)
+
diff --git a/www/iridium/files/patch-components_live__caption_caption__util.h b/www/iridium/files/patch-components_live__caption_caption__util.h
new file mode 100644
index 000000000000..b2d0cfbdd5b2
--- /dev/null
+++ b/www/iridium/files/patch-components_live__caption_caption__util.h
@@ -0,0 +1,11 @@
+--- components/live_caption/caption_util.h.orig 2023-07-24 14:27:53 UTC
++++ components/live_caption/caption_util.h
+@@ -14,7 +14,7 @@ class PrefService;
+ namespace captions {
+
+ #if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || \
+- BUILDFLAG(IS_MAC)
++ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ extern const char kCaptionSettingsUrl[];
+ #endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) ||
+ // BUILDFLAG(IS_MAC)
diff --git a/www/iridium/files/patch-components_metrics_metrics__log.cc b/www/iridium/files/patch-components_metrics_metrics__log.cc
index f6302d1fb9b3..1396c1643a20 100644
--- a/www/iridium/files/patch-components_metrics_metrics__log.cc
+++ b/www/iridium/files/patch-components_metrics_metrics__log.cc
@@ -1,6 +1,6 @@
---- components/metrics/metrics_log.cc.orig 2023-01-17 19:19:00 UTC
+--- components/metrics/metrics_log.cc.orig 2023-07-24 14:27:53 UTC
+++ components/metrics/metrics_log.cc
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
#include "base/win/current_module.h"
#endif
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#endif
-@@ -123,7 +123,7 @@ void RecordCurrentTime(
+@@ -130,7 +130,7 @@ void RecordCurrentTime(
}
}
@@ -18,7 +18,7 @@
metrics::SystemProfileProto::OS::XdgSessionType ToProtoSessionType(
base::nix::SessionType session_type) {
switch (session_type) {
-@@ -375,7 +375,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -390,7 +390,7 @@ void MetricsLog::RecordCoreSystemProfile(
// OperatingSystemVersion refers to the ChromeOS release version.
#if BUILDFLAG(IS_CHROMEOS_ASH)
os->set_kernel_version(base::SysInfo::KernelVersion());
@@ -27,7 +27,7 @@
// Linux operating system version is copied over into kernel version to be
// consistent.
os->set_kernel_version(base::SysInfo::OperatingSystemVersion());
-@@ -392,7 +392,7 @@ void MetricsLog::RecordCoreSystemProfile(
+@@ -407,7 +407,7 @@ void MetricsLog::RecordCoreSystemProfile(
os->set_build_number(base::SysInfo::GetIOSBuildNumber());
#endif
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 bb4558956548..3e33767b3194 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 2023-04-22 17:45:15 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2023-07-24 14:27:53 UTC
+++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -807,7 +807,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -808,7 +808,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
}
#endif // #if !BUILDFLAG(IS_ANDROID)
diff --git a/www/iridium/files/patch-components_omnibox_browser_omnibox__edit__model.cc b/www/iridium/files/patch-components_omnibox_browser_omnibox__edit__model.cc
new file mode 100644
index 000000000000..e356a7b084b3
--- /dev/null
+++ b/www/iridium/files/patch-components_omnibox_browser_omnibox__edit__model.cc
@@ -0,0 +1,10 @@
+--- components/omnibox/browser/omnibox_edit_model.cc.orig 2023-07-24 14:27:53 UTC
++++ components/omnibox/browser/omnibox_edit_model.cc
+@@ -23,6 +23,7 @@
+ #include "base/trace_event/trace_event.h"
+ #include "base/trace_event/typed_macros.h"
+ #include "build/build_config.h"
++#include "build/branding_buildflags.h"
+ #include "components/bookmarks/browser/bookmark_model.h"
+ #include "components/dom_distiller/core/url_constants.h"
+ #include "components/dom_distiller/core/url_utils.h"
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
deleted file mode 100644
index e3d91a6af64d..000000000000
--- a/www/iridium/files/patch-components_os__crypt_keyring__util__linux.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- components/os_crypt/keyring_util_linux.cc.orig 2022-10-05 07:34:01 UTC
-+++ components/os_crypt/keyring_util_linux.cc
-@@ -68,12 +68,12 @@ bool GnomeKeyringLoader::LoadGnomeKeyring() {
- if (keyring_loaded)
- return true;
-
-- void* handle = dlopen("libgnome-keyring.so.0", RTLD_NOW | RTLD_GLOBAL);
-+ void* handle = dlopen("libgnome-keyring.so", RTLD_NOW | RTLD_GLOBAL);
- if (!handle) {
- // We wanted to use GNOME Keyring, but we couldn't load it. Warn, because
- // either the user asked for this, or we autodetected it incorrectly. (Or
- // the system has broken libraries, which is also good to warn about.)
-- LOG(WARNING) << "Could not load libgnome-keyring.so.0: " << dlerror();
-+ LOG(WARNING) << "Could not load libgnome-keyring.so: " << dlerror();
- return false;
- }
-
diff --git a/www/iridium/files/patch-components_os__crypt_sync_keyring__util__linux.cc b/www/iridium/files/patch-components_os__crypt_sync_keyring__util__linux.cc
new file mode 100644
index 000000000000..d6882a67be0f
--- /dev/null
+++ b/www/iridium/files/patch-components_os__crypt_sync_keyring__util__linux.cc
@@ -0,0 +1,26 @@
+--- components/os_crypt/sync/keyring_util_linux.cc.orig 2023-07-24 14:27:53 UTC
++++ components/os_crypt/sync/keyring_util_linux.cc
+@@ -65,15 +65,21 @@ const GnomeKeyringLoader::FunctionInfo GnomeKeyringLoa
+
+ /* Load the library and initialize the function pointers. */
+ bool GnomeKeyringLoader::LoadGnomeKeyring() {
++#if BUILDFLAG(IS_BSD)
++ const char* kGkr = "libgnome-keyring.so";
++#else
++ const char* kGkr = "libgnome-keyring.so.0";
++#endif
++
+ if (keyring_loaded)
+ return true;
+
+- void* handle = dlopen("libgnome-keyring.so.0", RTLD_NOW | RTLD_GLOBAL);
++ void* handle = dlopen(kGkr, RTLD_NOW | RTLD_GLOBAL);
+ if (!handle) {
+ // We wanted to use GNOME Keyring, but we couldn't load it. Warn, because
+ // either the user asked for this, or we autodetected it incorrectly. (Or
+ // the system has broken libraries, which is also good to warn about.)
+- LOG(WARNING) << "Could not load libgnome-keyring.so.0: " << dlerror();
++ LOG(WARNING) << "Could not load " << kGkr << ": " << dlerror();
+ return false;
+ }
+
diff --git a/www/iridium/files/patch-components_os__crypt_libsecret__util__linux.cc b/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc
index 7ca468863670..1e2e752c8a8e 100644
--- a/www/iridium/files/patch-components_os__crypt_libsecret__util__linux.cc
+++ b/www/iridium/files/patch-components_os__crypt_sync_libsecret__util__linux.cc
@@ -1,18 +1,27 @@
---- components/os_crypt/libsecret_util_linux.cc.orig 2022-10-05 07:34:01 UTC
-+++ components/os_crypt/libsecret_util_linux.cc
-@@ -102,13 +102,13 @@ bool LibsecretLoader::LoadLibsecret() {
+--- components/os_crypt/sync/libsecret_util_linux.cc.orig 2023-07-24 14:27:53 UTC
++++ components/os_crypt/sync/libsecret_util_linux.cc
+@@ -99,16 +99,22 @@ bool LibsecretLoader::EnsureLibsecretLoaded() {
+
+ // static
+ bool LibsecretLoader::LoadLibsecret() {
++#if BUILDFLAG(IS_BSD)
++ const char* kSecretLib = "libsecret-1.so";
++#else
++ const char* kSecretLib = "libsecret-1.so.0";
++#endif
++
if (libsecret_loaded_)
return true;
- static void* handle = dlopen("libsecret-1.so.0", RTLD_NOW | RTLD_GLOBAL);
-+ static void* handle = dlopen("libsecret-1.so", RTLD_NOW | RTLD_GLOBAL);
++ static void* handle = dlopen(kSecretLib, RTLD_NOW | RTLD_GLOBAL);
if (!handle) {
// We wanted to use libsecret, but we couldn't load it. Warn, because
// either the user asked for this, or we autodetected it incorrectly. (Or
// the system has broken libraries, which is also good to warn about.)
// TODO(crbug.com/607435): Channel this message to the user-facing log
- VLOG(1) << "Could not load libsecret-1.so.0: " << dlerror();
-+ VLOG(1) << "Could not load libsecret-1.so: " << dlerror();
++ VLOG(1) << "Could not load << " << kSecretLib << ": " << dlerror();
return false;
}
diff --git a/www/iridium/files/patch-components_os__crypt_os__crypt.h b/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h
index 6b1b9c5f12b8..521998c269b0 100644
--- a/www/iridium/files/patch-components_os__crypt_os__crypt.h
+++ b/www/iridium/files/patch-components_os__crypt_sync_os__crypt.h
@@ -1,5 +1,5 @@
---- components/os_crypt/os_crypt.h.orig 2023-01-17 19:19:00 UTC
-+++ components/os_crypt/os_crypt.h
+--- components/os_crypt/sync/os_crypt.h.orig 2023-07-24 14:27:53 UTC
++++ components/os_crypt/sync/os_crypt.h
@@ -14,7 +14,7 @@
#include "build/build_config.h"
#include "build/chromecast_buildflags.h"
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 25d59025d7a8..b2c4ca40c377 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 2023-04-22 17:45:15 UTC
+--- components/password_manager/core/browser/login_database.cc.orig 2023-07-24 14:27:53 UTC
+++ components/password_manager/core/browser/login_database.cc
-@@ -757,7 +757,7 @@ std::string GeneratePlaceholders(size_t count) {
+@@ -842,7 +842,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) {
-@@ -774,7 +774,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
+@@ -859,7 +859,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;
-@@ -1602,7 +1602,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
+@@ -1716,7 +1716,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 c24a059915a9..7685dcbde9bd 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,6 +1,6 @@
---- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-03-13 07:33:08 UTC
+--- components/password_manager/core/browser/login_database_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ components/password_manager/core/browser/login_database_unittest.cc
-@@ -2108,7 +2108,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
+@@ -2170,7 +2170,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
base::HistogramTester histogram_tester;
ASSERT_TRUE(db.Init());
@@ -9,7 +9,7 @@
// 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;
-@@ -2135,7 +2135,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
+@@ -2197,7 +2197,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
#endif
// Check histograms.
@@ -18,7 +18,7 @@
histogram_tester.ExpectUniqueSample(
"PasswordManager.DeleteUndecryptableLoginsReturnValue",
metrics_util::DeleteCorruptedPasswordsResult::kSuccessPasswordsDeleted,
-@@ -2178,7 +2178,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, KeychainL
+@@ -2240,7 +2240,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 f2fb7fdace7d..ae19d915da62 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 2023-03-13 07:33:08 UTC
+--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2023-07-24 14:27:53 UTC
+++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -185,7 +185,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif
+@@ -186,7 +186,7 @@ bool IsCredentialPhished(const sync_pb::PasswordSpecif
// merge.
bool ShouldRecoverPasswordsDuringMerge() {
// Delete the local undecryptable copy when this is MacOS or Linux only.
@@ -9,7 +9,7 @@
return true;
#else
return false;
-@@ -193,7 +193,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -194,7 +194,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 8eb997e12990..dbd65d6d4ce1 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,7 +1,7 @@
---- components/password_manager/core/common/password_manager_features.cc.orig 2023-04-22 17:45:15 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2023-07-24 14:27:53 UTC
+++ components/password_manager/core/common/password_manager_features.cc
-@@ -76,7 +76,7 @@ BASE_FEATURE(kFillOnAccountSelect,
- "fill-on-account-select",
+@@ -96,7 +96,7 @@ BASE_FEATURE(kPasswordManagerLogToTerminal,
+ "PasswordManagerLogToTerminal",
base::FEATURE_DISABLED_BY_DEFAULT);
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
// When enabled, initial sync will be forced during startup if the password
// store has encryption service failures.
BASE_FEATURE(kForceInitialSyncWhenDecryptionFails,
-@@ -197,7 +197,7 @@ BASE_FEATURE(kPasswordStrengthIndicator,
+@@ -216,7 +216,7 @@ BASE_FEATURE(kPasswordStrengthIndicator,
"PasswordStrengthIndicator",
base::FEATURE_DISABLED_BY_DEFAULT);
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 07b4c594c5bd..ca2c0d61ecfa 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,15 +1,15 @@
---- components/password_manager/core/common/password_manager_features.h.orig 2023-04-22 17:45:15 UTC
+--- components/password_manager/core/common/password_manager_features.h.orig 2023-07-24 14:27:53 UTC
+++ components/password_manager/core/common/password_manager_features.h
-@@ -35,7 +35,7 @@ BASE_DECLARE_FEATURE(kEnablePasswordGenerationForClear
- BASE_DECLARE_FEATURE(kEnablePasswordManagerWithinFencedFrame);
- BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites);
+@@ -44,7 +44,7 @@ BASE_DECLARE_FEATURE(kFillingAcrossAffiliatedWebsites)
+ BASE_DECLARE_FEATURE(kFillingAcrossGroupedSites);
BASE_DECLARE_FEATURE(kFillOnAccountSelect);
+ BASE_DECLARE_FEATURE(kPasswordManagerLogToTerminal);
-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
BASE_DECLARE_FEATURE(kForceInitialSyncWhenDecryptionFails);
#endif
BASE_DECLARE_FEATURE(kInferConfirmationPasswordField);
-@@ -67,7 +67,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
+@@ -74,7 +74,7 @@ BASE_DECLARE_FEATURE(kRecoverFromNeverSaveAndroid);
#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_IOS) // Desktop
BASE_DECLARE_FEATURE(kRevampedPasswordManagementBubble);
#endif
diff --git a/www/iridium/files/patch-components_performance__manager_public_features.h b/www/iridium/files/patch-components_performance__manager_public_features.h
index b6c56fa9c683..b779352f41dc 100644
--- a/www/iridium/files/patch-components_performance__manager_public_features.h
+++ b/www/iridium/files/patch-components_performance__manager_public_features.h
@@ -1,6 +1,6 @@
---- components/performance_manager/public/features.h.orig 2022-12-06 08:09:13 UTC
+--- components/performance_manager/public/features.h.orig 2023-07-24 14:27:53 UTC
+++ components/performance_manager/public/features.h
-@@ -20,7 +20,7 @@ BASE_DECLARE_FEATURE(kRunOnMainThread);
+@@ -28,7 +28,7 @@ BASE_DECLARE_FEATURE(kRunOnDedicatedThreadPoolThread);
#if !BUILDFLAG(IS_ANDROID)
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 bf778d30d462..fdefcc7f194a 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 2023-03-13 07:33:08 UTC
+--- components/policy/core/browser/policy_pref_mapping_test.cc.orig 2023-07-24 14:27:53 UTC
+++ components/policy/core/browser/policy_pref_mapping_test.cc
-@@ -326,7 +326,7 @@ class PolicyTestCase {
+@@ -327,7 +327,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 564907858da0..6c12786d2141 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 2023-04-22 17:45:15 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2023-07-24 14:27:53 UTC
+++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -453,7 +453,7 @@ void CloudPolicyClient::FetchPolicy() {
+@@ -455,7 +455,7 @@ void CloudPolicyClient::FetchPolicy() {
fetch_request->set_invalidation_payload(invalidation_payload_);
}
}
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 099d130dc7cc..113002f7c823 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,4 +1,4 @@
---- 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.orig 2023-07-24 14:27:53 UTC
+++ components/policy/core/common/cloud/cloud_policy_util.cc
@@ -20,7 +20,7 @@
#endif
@@ -23,9 +23,9 @@
+#define HOST_NAME_MAX MAXHOSTNAMELEN
+#endif
+
+ #include <algorithm>
#include <utility>
- #include "base/check.h"
@@ -82,7 +87,7 @@ namespace em = enterprise_management;
std::string GetMachineName() {
diff --git a/www/iridium/files/patch-components_policy_tools_template__writers_writer__configuration.py b/www/iridium/files/patch-components_policy_tools_template__writers_writer__configuration.py
new file mode 100644
index 000000000000..b0c9bd9c9380
--- /dev/null
+++ b/www/iridium/files/patch-components_policy_tools_template__writers_writer__configuration.py
@@ -0,0 +1,11 @@
+--- components/policy/tools/template_writers/writer_configuration.py.orig 2023-07-24 14:27:53 UTC
++++ components/policy/tools/template_writers/writer_configuration.py
+@@ -59,7 +59,7 @@ def GetConfigurationForBuild(defines):
+ },
+ },
+ 'admx_prefix': 'chromium',
+- 'linux_policy_path': '/etc/iridium-browser/policies/',
++ 'linux_policy_path': '/etc/iridium/policies/',
+ 'bundle_id': 'org.chromium',
+ }
+ elif '_google_chrome' in defines:
diff --git a/www/iridium/files/patch-components_power__metrics_BUILD.gn b/www/iridium/files/patch-components_power__metrics_BUILD.gn
new file mode 100644
index 000000000000..a96cedfbb27c
--- /dev/null
+++ b/www/iridium/files/patch-components_power__metrics_BUILD.gn
@@ -0,0 +1,11 @@
+--- components/power_metrics/BUILD.gn.orig 2023-07-24 14:27:53 UTC
++++ components/power_metrics/BUILD.gn
+@@ -42,7 +42,7 @@ static_library("power_metrics") {
+ ldflags = [ "/DELAYLOAD:setupapi.dll" ]
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ sources += [
+ "energy_metrics_provider_linux.cc",
+ "energy_metrics_provider_linux.h",
diff --git a/www/iridium/files/patch-components_power__metrics_energy__metrics__provider.cc b/www/iridium/files/patch-components_power__metrics_energy__metrics__provider.cc
new file mode 100644
index 000000000000..e3d970f16020
--- /dev/null
+++ b/www/iridium/files/patch-components_power__metrics_energy__metrics__provider.cc
@@ -0,0 +1,21 @@
+--- components/power_metrics/energy_metrics_provider.cc.orig 2023-07-24 14:27:53 UTC
++++ components/power_metrics/energy_metrics_provider.cc
+@@ -9,6 +9,8 @@
+ #include "components/power_metrics/energy_metrics_provider_win.h"
+ #elif BUILDFLAG(IS_LINUX)
+ #include "components/power_metrics/energy_metrics_provider_linux.h"
++#elif BUILDFLAG(IS_BSD)
++#include "base/notreached.h"
+ #endif // BUILDFLAG(IS_WIN)
+
+ namespace power_metrics {
+@@ -22,6 +24,9 @@ std::unique_ptr<EnergyMetricsProvider> EnergyMetricsPr
+ return EnergyMetricsProviderWin::Create();
+ #elif BUILDFLAG(IS_LINUX)
+ return EnergyMetricsProviderLinux::Create();
++#elif BUILDFLAG(IS_BSD)
++ NOTIMPLEMENTED();
++ return nullptr;
+ #else
+ return nullptr;
+ #endif // BUILDFLAG(IS_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 7d96b47a08f2..e392438be5d6 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-10-05 07:34:01 UTC
+--- components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc.orig 2023-07-24 14:27:53 UTC
+++ components/safe_browsing/core/browser/db/v4_protocol_manager_util.cc
-@@ -116,7 +116,7 @@ std::ostream& operator<<(std::ostream& os, const ListI
+@@ -117,7 +117,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_paint__preview__compositor_paint__preview__compositor__collection__impl.cc b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
index dd10dc2986fa..caffc03789dc 100644
--- a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
+++ b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.cc
@@ -1,4 +1,4 @@
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-03-13 07:33:08 UTC
+--- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.cc
@@ -20,7 +20,7 @@
@@ -9,7 +9,7 @@
#include "components/services/font/public/cpp/font_loader.h"
#endif
-@@ -65,7 +65,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
+@@ -66,7 +66,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
// Initialize font access for Skia.
#if BUILDFLAG(IS_WIN)
content::InitializeDWriteFontProxy();
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
content::UtilityThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -88,7 +88,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
+@@ -89,7 +89,7 @@ PaintPreviewCompositorCollectionImpl::PaintPreviewComp
base::BindOnce([] { SkFontMgr::RefDefault(); }));
// Sanity check that fonts are working.
diff --git a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h b/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
deleted file mode 100644
index 46e983777c3b..000000000000
--- a/www/iridium/files/patch-components_services_paint__preview__compositor_paint__preview__compositor__collection__impl.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h.orig 2022-03-28 18:11:04 UTC
-+++ components/services/paint_preview_compositor/paint_preview_compositor_collection_impl.h
-@@ -21,7 +21,7 @@
- #include "mojo/public/cpp/bindings/pending_receiver.h"
- #include "mojo/public/cpp/bindings/receiver.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"
- #include "third_party/skia/include/core/SkRefCnt.h"
- #endif
-@@ -73,7 +73,7 @@ class PaintPreviewCompositorCollectionImpl
- std::unique_ptr<PaintPreviewCompositorImpl>>
- compositors_;
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
-
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
index b234a261a73e..f60166216b66 100644
--- 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
@@ -1,4 +1,4 @@
---- 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.orig 2023-07-24 14:27:53 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_
@@ -7,7 +7,7 @@
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#else
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
diff --git a/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc b/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc
new file mode 100644
index 000000000000..ccfa01a522da
--- /dev/null
+++ b/www/iridium/files/patch-components_services_screen__ai_screen__ai__library__wrapper.cc
@@ -0,0 +1,29 @@
+--- components/services/screen_ai/screen_ai_library_wrapper.cc.orig 2023-07-24 14:27:53 UTC
++++ components/services/screen_ai/screen_ai_library_wrapper.cc
+@@ -187,7 +187,7 @@ ScreenAILibraryWrapper::PerformOcr(const SkBitmap& ima
+
+ // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux
+ // official.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ free_library_allocated_char_array_(library_buffer.release());
+ #endif
+
+@@ -219,7 +219,7 @@ ScreenAILibraryWrapper::ExtractLayout(const SkBitmap&
+
+ // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux
+ // official.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ free_library_allocated_char_array_(library_buffer.release());
+ #endif
+
+@@ -253,7 +253,7 @@ absl::optional<std::vector<int32_t>> ScreenAILibraryWr
+
+ // TODO(crbug.com/1278245): Remove this after fixing the crash issue on Linux
+ // official.
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ free_library_allocated_int32_array_(library_buffer.release());
+ #endif
+
diff --git a/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc
new file mode 100644
index 000000000000..01e0195e3afe
--- /dev/null
+++ b/www/iridium/files/patch-components_supervised__user_core_browser_supervised__user__service.cc
@@ -0,0 +1,11 @@
+--- components/supervised_user/core/browser/supervised_user_service.cc.orig 2023-07-24 14:27:53 UTC
++++ components/supervised_user/core/browser/supervised_user_service.cc
+@@ -69,7 +69,7 @@ void SupervisedUserService::Init() {
+ supervised_user::FirstTimeInterstitialBannerState banner_state =
+ static_cast<supervised_user::FirstTimeInterstitialBannerState>(
+ user_prefs_->GetInteger(prefs::kFirstTimeInterstitialBannerState));
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (supervised_user::CanDisplayFirstTimeInterstitialBanner()) {
+ if (banner_state ==
+ supervised_user::FirstTimeInterstitialBannerState::kUnknown &&
diff --git a/www/iridium/files/patch-components_translate_core_browser_translate__ui__languages__manager.h b/www/iridium/files/patch-components_translate_core_browser_translate__ui__languages__manager.h
new file mode 100644
index 000000000000..81f66370883f
--- /dev/null
+++ b/www/iridium/files/patch-components_translate_core_browser_translate__ui__languages__manager.h
@@ -0,0 +1,10 @@
+--- components/translate/core/browser/translate_ui_languages_manager.h.orig 2023-07-24 14:27:53 UTC
++++ components/translate/core/browser/translate_ui_languages_manager.h
+@@ -8,6 +8,7 @@
+ #include <stddef.h>
+
+ #include <string>
++#include <vector>
+
+ #include "base/memory/weak_ptr.h"
+ #include "third_party/icu/source/i18n/unicode/coll.h"
diff --git a/www/iridium/files/patch-components_update__client_update__query__params.cc b/www/iridium/files/patch-components_update__client_update__query__params.cc
index 34bbeb60998c..3bb3e6ce62e9 100644
--- a/www/iridium/files/patch-components_update__client_update__query__params.cc
+++ b/www/iridium/files/patch-components_update__client_update__query__params.cc
@@ -1,6 +1,6 @@
---- components/update_client/update_query_params.cc.orig 2022-03-28 18:11:04 UTC
+--- components/update_client/update_query_params.cc.orig 2023-07-24 14:27:53 UTC
+++ components/update_client/update_query_params.cc
-@@ -40,6 +40,8 @@ const char kOs[] =
+@@ -42,6 +42,8 @@ const char kOs[] =
"fuchsia";
#elif BUILDFLAG(IS_OPENBSD)
"openbsd";
diff --git a/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc
new file mode 100644
index 000000000000..643de727c9a5
--- /dev/null
+++ b/www/iridium/files/patch-components_user__education_views_help__bubble__view.cc
@@ -0,0 +1,11 @@
+--- components/user_education/views/help_bubble_view.cc.orig 2023-07-24 14:27:53 UTC
++++ components/user_education/views/help_bubble_view.cc
+@@ -766,7 +766,7 @@ gfx::Rect HelpBubbleView::GetAnchorRect() const {
+ void HelpBubbleView::OnBeforeBubbleWidgetInit(views::Widget::InitParams* params,
+ views::Widget* widget) const {
+ BubbleDialogDelegateView::OnBeforeBubbleWidgetInit(params, widget);
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Help bubbles anchored to menus may be clipped to their anchors' bounds,
+ // resulting in visual errors, unless they use accelerated rendering. See
+ // crbug.com/1445770 for details.
diff --git a/www/iridium/files/patch-components_viz_common_gpu_dawn__context__provider.cc b/www/iridium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
index f2d25db51a55..6cc361ebb36b 100644
--- a/www/iridium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
+++ b/www/iridium/files/patch-components_viz_common_gpu_dawn__context__provider.cc
@@ -1,11 +1,11 @@
---- components/viz/common/gpu/dawn_context_provider.cc.orig 2022-03-28 18:11:04 UTC
+--- components/viz/common/gpu/dawn_context_provider.cc.orig 2023-07-24 14:27:53 UTC
+++ components/viz/common/gpu/dawn_context_provider.cc
-@@ -20,7 +20,7 @@ namespace {
+@@ -38,7 +38,7 @@ void LogFatal(WGPUDeviceLostReason reason,
wgpu::BackendType GetDefaultBackendType() {
#if BUILDFLAG(IS_WIN)
- return wgpu::BackendType::D3D12;
+ return wgpu::BackendType::D3D11;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return wgpu::BackendType::Vulkan;
- #else
- NOTREACHED();
+ #elif BUILDFLAG(IS_MAC)
+ return wgpu::BackendType::Metal;
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 86d1f8c18a40..704a6c6923b5 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 2023-03-13 07:33:08 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1259,7 +1259,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1433,7 +1433,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
->GetDeviceQueue()
->GetVulkanPhysicalDevice(),
VK_IMAGE_TILING_OPTIMAL, ycbcr_info);
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
index 7de4f478b17a..9e917b62e6b5 100644
--- a/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc
+++ b/www/iridium/files/patch-components_viz_service_display_skia__renderer.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display/skia_renderer.cc.orig 2023-03-13 07:33:08 UTC
+--- components/viz/service/display/skia_renderer.cc.orig 2023-07-24 14:27:53 UTC
+++ components/viz/service/display/skia_renderer.cc
-@@ -1149,7 +1149,7 @@ void SkiaRenderer::ClearFramebuffer() {
+@@ -1174,7 +1174,7 @@ void SkiaRenderer::ClearFramebuffer() {
if (current_frame()->current_render_pass->has_transparent_background) {
ClearCanvas(SkColors::kTransparent);
} else {
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 329177070e4d..1c1b7e000bd2 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,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-03-13 07:33:08 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
-@@ -98,7 +98,7 @@ RootCompositorFrameSinkImpl::Create(
+@@ -107,7 +107,7 @@ RootCompositorFrameSinkImpl::Create(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -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);
-@@ -585,7 +585,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -628,7 +628,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-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
index 0d72ee84e2ff..f0e73482c639 100644
--- a/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
+++ b/www/iridium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.h
@@ -1,6 +1,6 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-03-13 07:33:08 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h.orig 2023-07-24 14:27:53 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.h
-@@ -200,7 +200,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
+@@ -204,7 +204,7 @@ class VIZ_SERVICE_EXPORT RootCompositorFrameSinkImpl
// 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__runner__impl.cc b/www/iridium/files/patch-content_app_content__main__runner__impl.cc
index af374c5522d7..33b26c34ea85 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,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig 2023-04-22 17:45:15 UTC
+--- content/app/content_main_runner_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/app/content_main_runner_impl.cc
-@@ -139,13 +139,13 @@
+@@ -144,13 +144,13 @@
#include "content/browser/posix_file_descriptor_info_impl.h"
#include "content/public/common/content_descriptors.h"
@@ -16,8 +16,8 @@
#include "base/files/file_path_watcher_inotify.h"
#include "base/native_library.h"
#include "base/rand_util.h"
-@@ -186,6 +186,10 @@
- #include "media/base/media_switches.h"
+@@ -193,6 +193,10 @@
+ #include "chromeos/startup/startup_switches.h"
#endif
+#if BUILDFLAG(IS_BSD)
@@ -27,7 +27,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "base/system/sys_info.h"
#include "content/browser/android/battery_metrics.h"
-@@ -371,7 +375,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -394,7 +398,7 @@ void InitializeZygoteSandboxForBrowserProcess(
}
#endif // BUILDFLAG(USE_ZYGOTE)
@@ -36,17 +36,26 @@
#if BUILDFLAG(ENABLE_PPAPI)
// Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -407,15 +411,17 @@ void PreloadLibraryCdms() {
- }
- #endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
+@@ -432,7 +436,10 @@ void PreloadLibraryCdms() {
--#if BUILDFLAG(USE_ZYGOTE)
-+#if BUILDFLAG(USE_ZYGOTE) || BUILDFLAG(IS_BSD)
void PreSandboxInit() {
- // Pre-acquire resources needed by BoringSSL. See
+ // Ensure the /dev/urandom is opened.
++ // we use arc4random
++#if !BUILDFLAG(IS_BSD)
+ base::GetUrandomFD();
++#endif
+
+ // May use sysinfo(), sched_getaffinity(), and open various /sys/ and /proc/
+ // files.
+@@ -443,9 +450,16 @@ void PreSandboxInit() {
// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
CRYPTO_pre_sandbox_init();
++#if BUILDFLAG(IS_BSD)
++ // "cache" the amount of physical memory before pledge(2)
++ base::SysInfo::AmountOfPhysicalMemoryMB();
++#endif
++
+#if !BUILDFLAG(IS_BSD)
// Pre-read /proc/sys/fs/inotify/max_user_watches so it doesn't have to be
// allowed by the sandbox.
@@ -55,28 +64,7 @@
#if BUILDFLAG(ENABLE_PPAPI)
// Ensure access to the Pepper plugins before the sandbox is turned on.
-@@ -434,6 +440,11 @@ void PreSandboxInit() {
- }
- #endif
-
-+#if BUILDFLAG(IS_BSD)
-+ // "cache" the amount of physical memory before pledge(2)
-+ base::SysInfo::AmountOfPhysicalMemoryMB();
-+#endif
-+
- // 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.
-@@ -621,7 +632,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
- delegate->ZygoteStarting(&zygote_fork_delegates);
- media::InitializeMediaLibrary();
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- PreSandboxInit();
- #endif
-
-@@ -824,11 +835,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -830,11 +844,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -90,8 +78,12 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -1023,6 +1033,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -1029,8 +1042,20 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+ process_type == switches::kZygoteProcess) {
+ PreSandboxInit();
}
++#elif BUILDFLAG(IS_BSD)
++ PreSandboxInit();
#endif
+#if BUILDFLAG(IS_BSD)
@@ -107,7 +99,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE)
-@@ -1090,7 +1110,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1098,7 +1123,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
->ReconfigureAfterFeatureListInit(process_type);
}
@@ -116,7 +108,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
-@@ -1128,6 +1148,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1133,6 +1158,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 d426454332c6..19f7a78c95fc 100644
--- a/www/iridium/files/patch-content_browser_BUILD.gn
+++ b/www/iridium/files/patch-content_browser_BUILD.gn
@@ -1,7 +1,7 @@
---- content/browser/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+--- content/browser/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ content/browser/BUILD.gn
-@@ -2360,6 +2360,13 @@ source_set("browser") {
- ]
+@@ -2414,6 +2414,13 @@ source_set("browser") {
+ deps += [ "//media/mojo/mojom/stable:stable_video_decoder" ]
}
+ if (is_bsd) {
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 99ee6d13915b..823208843bc8 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-12-06 08:09:13 UTC
+--- content/browser/browser_child_process_host_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/browser_child_process_host_impl.cc
-@@ -316,6 +316,8 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
+@@ -321,6 +321,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 814e87862bcf..28360a830cd0 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 2023-03-13 07:33:08 UTC
+--- content/browser/browser_main_loop.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/browser_main_loop.cc
@@ -245,6 +245,12 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
@@ -29,9 +29,9 @@
@@ -575,7 +587,7 @@ int BrowserMainLoop::EarlyInitialization() {
base::PlatformThread::SetCurrentThreadType(base::ThreadType::kCompositing);
- #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+ #if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_ANDROID)
+ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// We use quite a few file descriptors for our IPC as well as disk the disk
- // cache,and the default limit on the Mac is low (256), so bump it up.
+ // cache, and the default limit on Apple is low (256), so bump it up.
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
new file mode 100644
index 000000000000..a895e3b847a5
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.cc
@@ -0,0 +1,11 @@
+--- content/browser/gpu/gpu_data_manager_impl.cc.orig 2023-07-24 14:27:53 UTC
++++ content/browser/gpu/gpu_data_manager_impl.cc
+@@ -405,7 +405,7 @@ void GpuDataManagerImpl::OnDisplayMetricsChanged(
+ private_->OnDisplayMetricsChanged(display, changed_metrics);
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool GpuDataManagerImpl::IsGpuMemoryBufferNV12Supported() {
+ base::AutoLock auto_lock(lock_);
+ return private_->IsGpuMemoryBufferNV12Supported();
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
new file mode 100644
index 000000000000..4179216277ac
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl.h
@@ -0,0 +1,11 @@
+--- content/browser/gpu/gpu_data_manager_impl.h.orig 2023-07-24 14:27:53 UTC
++++ content/browser/gpu/gpu_data_manager_impl.h
+@@ -221,7 +221,7 @@ class CONTENT_EXPORT GpuDataManagerImpl : public GpuDa
+ void OnDisplayMetricsChanged(const display::Display& display,
+ uint32_t changed_metrics) override;
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool IsGpuMemoryBufferNV12Supported();
+ void SetGpuMemoryBufferNV12Supported(bool supported);
+ #endif // BUILDFLAG(IS_LINUX)
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
new file mode 100644
index 000000000000..b6aefc6166b5
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.cc
@@ -0,0 +1,11 @@
+--- content/browser/gpu/gpu_data_manager_impl_private.cc.orig 2023-07-24 14:27:53 UTC
++++ content/browser/gpu/gpu_data_manager_impl_private.cc
+@@ -1713,7 +1713,7 @@ void GpuDataManagerImplPrivate::RecordCompositingMode(
+ UMA_HISTOGRAM_ENUMERATION("GPU.CompositingMode", compositing_mode);
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool GpuDataManagerImplPrivate::IsGpuMemoryBufferNV12Supported() {
+ return is_gpu_memory_buffer_NV12_supported_;
+ }
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
new file mode 100644
index 000000000000..ffd5ffbd86ef
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__data__manager__impl__private.h
@@ -0,0 +1,20 @@
+--- content/browser/gpu/gpu_data_manager_impl_private.h.orig 2023-07-24 14:27:53 UTC
++++ content/browser/gpu/gpu_data_manager_impl_private.h
+@@ -151,7 +151,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+ void OnDisplayMetricsChanged(const display::Display& display,
+ uint32_t changed_metrics);
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool IsGpuMemoryBufferNV12Supported();
+ void SetGpuMemoryBufferNV12Supported(bool supported);
+ #endif // BUILDFLAG(IS_LINUX)
+@@ -307,7 +307,7 @@ class CONTENT_EXPORT GpuDataManagerImplPrivate {
+ bool application_is_visible_ = true;
+
+ bool disable_gpu_compositing_ = false;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool is_gpu_memory_buffer_NV12_supported_ = false;
+ #endif // BUILDFLAG(IS_LINUX)
+ };
diff --git a/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc b/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
new file mode 100644
index 000000000000..4a75da317f74
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_gpu_gpu__memory__buffer__manager__singleton.cc
@@ -0,0 +1,20 @@
+--- content/browser/gpu/gpu_memory_buffer_manager_singleton.cc.orig 2023-07-24 14:27:53 UTC
++++ content/browser/gpu/gpu_memory_buffer_manager_singleton.cc
+@@ -53,7 +53,7 @@ scoped_refptr<base::SingleThreadTaskRunner> GetTaskRun
+ #endif
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ bool IsGpuMemoryBufferNV12Supported() {
+ static bool is_computed = false;
+ static bool supported = false;
+@@ -116,7 +116,7 @@ void GpuMemoryBufferManagerSingleton::OnGpuExtraInfoUp
+ SetNativeConfigurations(std::move(configs));
+ }
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Dynamic check whether the NV12 format is supported as it may be
+ // inconsistent between the system GBM (Generic Buffer Management) and
+ // chromium miniGBM.
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 c93f3d42f1b9..9c425fcb3b61 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 2023-04-22 17:45:15 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/gpu/gpu_process_host.cc
-@@ -250,6 +250,7 @@ static const char* const kSwitchNames[] = {
+@@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = {
switches::kEnableBackgroundThreadPool,
switches::kEnableGpuRasterization,
switches::kEnableLogging,
@@ -8,7 +8,7 @@
switches::kDoubleBufferCompositing,
switches::kHeadless,
switches::kLoggingLevel,
-@@ -281,7 +282,7 @@ static const char* const kSwitchNames[] = {
+@@ -284,7 +285,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
deleted file mode 100644
index 88e94c570aa3..000000000000
--- a/www/iridium/files/patch-content_browser_media_frameless__media__interface__proxy.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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_media__interface__proxy.cc b/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc
deleted file mode 100644
index 44c212b2a058..000000000000
--- a/www/iridium/files/patch-content_browser_media_media__interface__proxy.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/media/media_interface_proxy.cc.orig 2022-12-01 10:35:46 UTC
-+++ content/browser/media/media_interface_proxy.cc
-@@ -73,7 +73,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)
-@@ -286,7 +286,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_network__service__instance__impl.cc b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc
index 0789c7420c14..ee1e9c4dd806 100644
--- a/www/iridium/files/patch-content_browser_network__service__instance__impl.cc
+++ b/www/iridium/files/patch-content_browser_network__service__instance__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/network_service_instance_impl.cc.orig 2023-03-13 07:33:08 UTC
+--- content/browser/network_service_instance_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/network_service_instance_impl.cc
-@@ -76,7 +76,7 @@
+@@ -78,7 +78,7 @@
#include "content/browser/network/network_service_process_tracker_win.h"
#endif
@@ -9,7 +9,7 @@
#include "content/browser/system_dns_resolution/system_dns_resolver.h"
#include "services/network/public/mojom/system_dns_resolution.mojom-forward.h"
#endif
-@@ -404,7 +404,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
+@@ -458,7 +458,7 @@ network::mojom::NetworkServiceParamsPtr CreateNetworkS
}
#endif // BUILDFLAG(IS_POSIX)
diff --git a/www/iridium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc
index 3e57a96f3e71..ada4fa01261e 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_back__forward__cache__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-03-13 07:33:08 UTC
+--- content/browser/renderer_host/back_forward_cache_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/renderer_host/back_forward_cache_impl.cc
-@@ -56,7 +56,7 @@ BASE_FEATURE(kBackForwardCacheSize,
+@@ -58,7 +58,7 @@ BASE_FEATURE(kBackForwardCacheSize,
// Sets the BackForwardCache size for desktop.
// See crbug.com/1291435.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
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 3dcbce4fc68c..33f10a32b891 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 2023-03-13 07:33:08 UTC
+--- content/browser/renderer_host/delegated_frame_host.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -295,7 +295,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -296,7 +296,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_render__process__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index 4a7e2a0415e9..31ad9d165656 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 2023-04-22 17:45:15 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -214,7 +214,7 @@
+@@ -219,7 +219,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
-@@ -1144,7 +1144,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1217,7 +1217,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;
-@@ -1236,7 +1236,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1309,7 +1309,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
return;
}
@@ -27,7 +27,7 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
-@@ -1325,7 +1325,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1398,7 +1398,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
std::unique_ptr<service_manager::BinderRegistry> binders_;
mojo::Receiver<mojom::ChildProcessHost> receiver_{this};
@@ -36,30 +36,12 @@
mojo::Remote<media::mojom::VideoEncodeAcceleratorProviderFactory>
video_encode_accelerator_factory_remote_;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -2154,7 +2154,7 @@ void RenderProcessHostImpl::ReinitializeLogging(
- }
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
-
--#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) {
- DCHECK_CURRENTLY_ON(BrowserThread::UI);
-@@ -3330,6 +3330,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3461,6 +3461,8 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
+ switches::kDisableUnveil,
+ switches::kTrk,
- switches::kDisableUseMojoVideoDecoderForPepper,
switches::kDisableV8IdleTasks,
switches::kDisableVideoCaptureUseGpuMemoryBuffer,
-@@ -4810,7 +4812,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)
-
+ switches::kDisableWebGLImageChromium,
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 f54b46e0a924..4b933cb4a4dd 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,15 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig 2023-03-13 07:33:08 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2023-07-24 14:27:53 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -85,7 +85,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)
-
-@@ -490,7 +490,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -502,7 +502,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Sets this RenderProcessHost to be guest only. For Testing only.
void SetForGuestsOnlyForTesting();
@@ -18,21 +9,3 @@
// Launch the zygote early in the browser startup.
static void EarlyZygoteLaunch();
#endif // BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_MAC)
-@@ -699,7 +699,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;
-@@ -1171,7 +1171,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__view__host__impl.cc b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
index bee2c711885b..d0b45f169712 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__view__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-03-13 07:33:08 UTC
+--- content/browser/renderer_host/render_view_host_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/renderer_host/render_view_host_impl.cc
-@@ -250,7 +250,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
+@@ -273,7 +273,7 @@ void RenderViewHostImpl::GetPlatformSpecificPrefs(
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CYVSCROLL);
prefs->arrow_bitmap_width_horizontal_scroll_bar_in_dips =
display::win::ScreenWin::GetSystemMetricsInDIP(SM_CXHSCROLL);
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 aa77d4e487cb..1aa72891e747 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,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-04-22 17:45:15 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
-@@ -119,7 +119,7 @@
+@@ -121,7 +121,7 @@
#include "ui/gfx/gdi_util.h"
#endif
@@ -9,7 +9,7 @@
#include "content/browser/accessibility/browser_accessibility_auralinux.h"
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/linux/linux_ui.h"
-@@ -452,7 +452,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
+@@ -454,7 +454,7 @@ gfx::NativeViewAccessible RenderWidgetHostViewAura::Ge
return ToBrowserAccessibilityWin(manager->GetBrowserAccessibilityRoot())
->GetCOM();
@@ -18,7 +18,7 @@
BrowserAccessibilityManager* manager =
host()->GetOrCreateRootBrowserAccessibilityManager();
if (manager && manager->GetBrowserAccessibilityRoot())
-@@ -1588,7 +1588,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1634,7 +1634,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) {
-@@ -2420,7 +2420,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2466,7 +2466,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
return NeedsInputGrab();
#else
return false;
-@@ -2597,7 +2597,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2642,7 +2642,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
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 df3daa2695b1..1c87f520d932 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 2023-01-17 19:19:00 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.h.orig 2023-07-24 14:27:53 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.h
-@@ -244,7 +244,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
+@@ -251,7 +251,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
ukm::SourceId GetClientSourceForMetrics() const override;
bool ShouldDoLearning() override;
diff --git a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
index 3e8c30f7063d..e58090d81bb3 100644
--- a/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
+++ b/www/iridium/files/patch-content_browser_renderer__host_render__widget__host__view__event__handler.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2022-03-28 18:11:04 UTC
+--- content/browser/renderer_host/render_widget_host_view_event_handler.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/renderer_host/render_widget_host_view_event_handler.cc
-@@ -596,7 +596,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
+@@ -597,7 +597,7 @@ bool RenderWidgetHostViewEventHandler::CanRendererHand
if (event->type() == ui::ET_MOUSE_EXITED) {
if (mouse_locked || selection_popup)
return false;
diff --git a/www/iridium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc b/www/iridium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc
new file mode 100644
index 000000000000..000d5d588218
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_service__worker_service__worker__context__wrapper.cc
@@ -0,0 +1,14 @@
+--- content/browser/service_worker/service_worker_context_wrapper.cc.orig 2023-07-24 14:27:53 UTC
++++ content/browser/service_worker/service_worker_context_wrapper.cc
+@@ -1397,9 +1397,11 @@ void ServiceWorkerContextWrapper::MaybeProcessPendingW
+ auto document_url = d_u;
+
+ DCHECK(document_url.is_valid());
++#if defined(__clang__) && (__clang_major__ >= 16)
+ TRACE_EVENT1("ServiceWorker",
+ "ServiceWorkerContextWrapper::MaybeProcessPendingWarmUpRequest",
+ "document_url", document_url.spec());
++#endif
+
+ context_core_->registry()->FindRegistrationForClientUrl(
+ ServiceWorkerRegistry::Purpose::kNotForNavigation,
diff --git a/www/iridium/files/patch-content_browser_utility__process__host.cc b/www/iridium/files/patch-content_browser_utility__process__host.cc
new file mode 100644
index 000000000000..85cd2fb30f34
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_utility__process__host.cc
@@ -0,0 +1,56 @@
+--- content/browser/utility_process_host.cc.orig 2023-07-24 14:27:53 UTC
++++ content/browser/utility_process_host.cc
+@@ -59,7 +59,7 @@
+ #include "content/browser/v8_snapshot_files.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/files/file_util.h"
+ #include "base/files/scoped_file.h"
+ #include "base/pickle.h"
+@@ -69,7 +69,7 @@
+ #include "media/capture/capture_switches.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/task/sequenced_task_runner.h"
+ #include "components/viz/host/gpu_client.h"
+ #include "media/capture/capture_switches.h"
+@@ -80,7 +80,7 @@ namespace content {
+
+ namespace {
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ base::ScopedFD PassNetworkContextParentDirs(
+ std::vector<base::FilePath> network_context_parent_dirs) {
+ base::Pickle pickle;
+@@ -129,7 +129,7 @@ UtilityProcessHost::UtilityProcessHost(std::unique_ptr
+ started_(false),
+ name_(u"utility process"),
+ file_data_(std::make_unique<ChildProcessLauncherFileData>()),
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ gpu_client_(nullptr, base::OnTaskRunnerDeleter(nullptr)),
+ #endif
+ client_(std::move(client)) {
+@@ -420,7 +420,7 @@ bool UtilityProcessHost::StartProcess() {
+ file_data_->files_to_preload.merge(GetV8SnapshotFilesToPreload());
+ #endif // BUILDFLAG(IS_POSIX)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // The network service should have access to the parent directories
+ // necessary for its usage.
+ if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork) {
+@@ -431,7 +431,7 @@ bool UtilityProcessHost::StartProcess() {
+ }
+ #endif // BUILDFLAG(IS_LINUX)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (metrics_name_ == video_capture::mojom::VideoCaptureService::Name_) {
+ if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
+ switches::kDisableVideoCaptureUseGpuMemoryBuffer) &&
diff --git a/www/iridium/files/patch-content_browser_utility__process__host.h b/www/iridium/files/patch-content_browser_utility__process__host.h
new file mode 100644
index 000000000000..6901e2f3fa12
--- /dev/null
+++ b/www/iridium/files/patch-content_browser_utility__process__host.h
@@ -0,0 +1,20 @@
+--- content/browser/utility_process_host.h.orig 2023-07-24 14:27:53 UTC
++++ content/browser/utility_process_host.h
+@@ -39,7 +39,7 @@ namespace base {
+ class Thread;
+ } // namespace base
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ namespace viz {
+ class GpuClient;
+ } // namespace viz
+@@ -225,7 +225,7 @@ class CONTENT_EXPORT UtilityProcessHost
+ std::vector<RunServiceDeprecatedCallback> pending_run_service_callbacks_;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ std::unique_ptr<viz::GpuClient, base::OnTaskRunnerDeleter> gpu_client_;
+ #endif
+
diff --git a/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc b/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
index 73c784068e55..6bfacb49fd4f 100644
--- a/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
+++ b/www/iridium/files/patch-content_browser_utility__process__host__receiver__bindings.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_process_host_receiver_bindings.cc.orig 2022-03-28 18:11:04 UTC
+--- content/browser/utility_process_host_receiver_bindings.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/utility_process_host_receiver_bindings.cc
-@@ -10,7 +10,7 @@
+@@ -10,12 +10,12 @@
#include "content/public/browser/content_browser_client.h"
#include "content/public/common/content_client.h"
@@ -9,7 +9,13 @@
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
#include "content/browser/font_service.h" // nogncheck
#endif
-@@ -19,7 +19,7 @@ namespace content {
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "components/viz/host/gpu_client.h"
+ #include "content/public/browser/gpu_client.h"
+ #endif
+@@ -24,13 +24,13 @@ namespace content {
void UtilityProcessHost::BindHostReceiver(
mojo::GenericPendingReceiver receiver) {
@@ -18,3 +24,10 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
+ }
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (auto gpu_receiver = receiver.As<viz::mojom::Gpu>()) {
+ gpu_client_ =
+ content::CreateGpuClient(std::move(gpu_receiver), base::DoNothing());
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 51c2a662976d..67705ac383fe 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 2023-03-13 07:33:08 UTC
+--- content/browser/utility_sandbox_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/utility_sandbox_delegate.cc
-@@ -64,13 +64,13 @@ UtilitySandboxedProcessLauncherDelegate::
+@@ -63,13 +63,13 @@ UtilitySandboxedProcessLauncherDelegate::
#if BUILDFLAG(ENABLE_PPAPI)
sandbox_type_ == sandbox::mojom::Sandbox::kPpapi ||
#endif
@@ -17,7 +17,7 @@
sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoEncoding ||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -117,10 +117,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe
+@@ -124,10 +124,10 @@ ZygoteCommunication* UtilitySandboxedProcessLauncherDe
// unsandboxed zygote and then apply their actual sandboxes in the forked
// process upon startup.
if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
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 99e783347692..e85022690e8c 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,4 +1,4 @@
---- content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-03-13 07:33:08 UTC
+--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2023-07-24 14:27:53 UTC
+++ content/browser/webui/web_ui_main_frame_observer.cc
@@ -13,7 +13,7 @@
#include "content/public/browser/navigation_handle.h"
@@ -27,7 +27,7 @@
void WebUIMainFrameObserver::OnDidAddMessageToConsole(
RenderFrameHost* source_frame,
blink::mojom::ConsoleMessageLevel log_level,
-@@ -163,7 +163,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation(
+@@ -167,7 +167,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_child_child__process.cc b/www/iridium/files/patch-content_child_child__process.cc
index 4703d9250736..a742c54ebdbb 100644
--- a/www/iridium/files/patch-content_child_child__process.cc
+++ b/www/iridium/files/patch-content_child_child__process.cc
@@ -1,11 +1,11 @@
---- content/child/child_process.cc.orig 2022-10-05 07:34:01 UTC
+--- content/child/child_process.cc.orig 2023-07-24 14:27:53 UTC
+++ content/child/child_process.cc
-@@ -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);
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadType io_thread_
+ io_thread_(std::make_unique<ChildIOThread>()) {
const base::CommandLine& command_line =
*base::CommandLine::ForCurrentProcess();
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
const bool is_embedded_in_browser_process =
+ !command_line.HasSwitch(switches::kProcessType);
+ if (IsMojoCoreSharedLibraryEnabled() && !is_embedded_in_browser_process) {
diff --git a/www/iridium/files/patch-content_common_BUILD.gn b/www/iridium/files/patch-content_common_BUILD.gn
index 6bc63bd4f317..45c9152471e3 100644
--- a/www/iridium/files/patch-content_common_BUILD.gn
+++ b/www/iridium/files/patch-content_common_BUILD.gn
@@ -1,4 +1,4 @@
---- content/common/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+--- content/common/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ content/common/BUILD.gn
@@ -432,6 +432,9 @@ if (is_linux || is_chromeos) {
public = [ "set_process_title_linux.h" ]
@@ -10,7 +10,7 @@
}
}
-@@ -480,7 +483,7 @@ mojom("mojo_bindings") {
+@@ -477,7 +480,7 @@ mojom("mojo_bindings") {
if (enable_ipc_logging) {
enabled_features += [ "ipc_logging" ]
}
diff --git a/www/iridium/files/patch-content_gpu_BUILD.gn b/www/iridium/files/patch-content_gpu_BUILD.gn
new file mode 100644
index 000000000000..72f3919d7b7a
--- /dev/null
+++ b/www/iridium/files/patch-content_gpu_BUILD.gn
@@ -0,0 +1,20 @@
+--- content/gpu/BUILD.gn.orig 2023-07-24 14:27:53 UTC
++++ content/gpu/BUILD.gn
+@@ -104,6 +104,17 @@ target(link_target_type, "gpu_sources") {
+ }
+ }
+
++ if (is_bsd) {
++ sources -= [
++ "gpu_sandbox_hook_linux.cc",
++ "gpu_sandbox_hook_linux.h",
++ ]
++ sources += [
++ "gpu_sandbox_hook_bsd.cc",
++ "gpu_sandbox_hook_bsd.h",
++ ]
++ }
++
+ if (is_chromeos_ash) {
+ deps += [
+ "//components/services/font/public/cpp",
diff --git a/www/iridium/files/patch-content_gpu_gpu__main.cc b/www/iridium/files/patch-content_gpu_gpu__main.cc
index d2654f284d65..50815859b144 100644
--- a/www/iridium/files/patch-content_gpu_gpu__main.cc
+++ b/www/iridium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig 2023-04-22 17:45:15 UTC
+--- content/gpu/gpu_main.cc.orig 2023-07-24 14:27:53 UTC
+++ content/gpu/gpu_main.cc
-@@ -89,7 +89,7 @@
+@@ -90,7 +90,7 @@
#include "sandbox/win/src/sandbox.h"
#endif
@@ -9,7 +9,7 @@
#include "content/gpu/gpu_sandbox_hook_linux.h"
#include "sandbox/policy/linux/sandbox_linux.h"
#include "sandbox/policy/sandbox_type.h"
-@@ -110,7 +110,7 @@ namespace content {
+@@ -112,7 +112,7 @@ namespace content {
namespace {
@@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -175,7 +175,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
bool EnsureSandboxInitialized(gpu::GpuWatchdogThread* watchdog_thread,
const gpu::GPUInfo* gpu_info,
const gpu::GpuPreferences& gpu_prefs) override {
@@ -27,7 +27,7 @@
return StartSandboxLinux(watchdog_thread, gpu_info, gpu_prefs);
#elif BUILDFLAG(IS_WIN)
return StartSandboxWindows(sandbox_info_);
-@@ -270,7 +270,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -285,7 +285,7 @@ int GpuMain(MainFunctionParams parameters) {
std::make_unique<base::SingleThreadTaskExecutor>(
gpu_preferences.message_pump_type);
}
@@ -36,7 +36,7 @@
#error "Unsupported Linux platform."
#elif BUILDFLAG(IS_MAC)
// Cross-process CoreAnimation requires a CFRunLoop to function at all, and
-@@ -405,7 +405,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -420,7 +420,7 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
diff --git a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.cc b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.cc
new file mode 100644
index 000000000000..380d61491a4e
--- /dev/null
+++ b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.cc
@@ -0,0 +1,72 @@
+--- content/gpu/gpu_sandbox_hook_bsd.cc.orig 2023-07-24 14:27:53 UTC
++++ content/gpu/gpu_sandbox_hook_bsd.cc
+@@ -0,0 +1,69 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#include "content/gpu/gpu_sandbox_hook_bsd.h"
++
++#include <dlfcn.h>
++#include <errno.h>
++#include <sys/stat.h>
++
++#include <memory>
++#include <sstream>
++#include <utility>
++#include <vector>
++
++#include "base/base_paths.h"
++#include "base/files/file_enumerator.h"
++#include "base/files/file_path.h"
++#include "base/files/scoped_file.h"
++#include "base/functional/bind.h"
++#include "base/logging.h"
++#include "base/path_service.h"
++#include "base/strings/stringprintf.h"
++#include "build/build_config.h"
++#include "build/buildflag.h"
++#include "build/chromeos_buildflags.h"
++#include "content/common/set_process_title.h"
++#include "content/public/common/content_switches.h"
++#include "media/gpu/buildflags.h"
++
++namespace content {
++namespace {
++
++constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
++
++void LoadVulkanLibraries() {
++ // Try to preload Vulkan libraries. Failure is not an error as not all may be
++ // present.
++ const char* kLibraries[] = {
++ "libvulkan.so",
++ "libvulkan_intel.so",
++ "libvulkan_intel_hasvk.so",
++ "libvulkan_radeon.so",
++ };
++ for (const auto* library : kLibraries) {
++ dlopen(library, dlopen_flag);
++ }
++}
++
++bool LoadLibrariesForGpu(
++ const sandbox::policy::SandboxSeccompBPF::Options& options) {
++ LoadVulkanLibraries();
++
++ return true;
++}
++
++} // namespace
++
++bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
++ if (!LoadLibrariesForGpu(options))
++ return false;
++
++ // TODO(tsepez): enable namspace sandbox here once crashes are understood.
++
++ errno = 0;
++ return true;
++}
++
++} // namespace content
diff --git a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.h b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.h
new file mode 100644
index 000000000000..e6fcc5563920
--- /dev/null
+++ b/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__bsd.h
@@ -0,0 +1,19 @@
+--- content/gpu/gpu_sandbox_hook_bsd.h.orig 2023-07-24 14:27:53 UTC
++++ content/gpu/gpu_sandbox_hook_bsd.h
+@@ -0,0 +1,16 @@
++// Copyright 2023 The Chromium Authors
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++
++#ifndef CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
++#define CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
++
++#include "sandbox/policy/sandbox.h"
++
++namespace content {
++
++bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options);
++
++} // namespace content
++
++#endif // CONTENT_GPU_GPU_SANDBOX_HOOK_BSD_H_
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
deleted file mode 100644
index bd2360be0c7b..000000000000
--- a/www/iridium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
+++ /dev/null
@@ -1,70 +0,0 @@
---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2023-04-22 17:45:15 UTC
-+++ content/gpu/gpu_sandbox_hook_linux.cc
-@@ -126,6 +126,7 @@ void AddStandardChromeOsPermissions(
- }
- }
-
-+#if !defined(OS_BSD)
- void AddV4L2GpuPermissions(
- std::vector<BrokerFilePermission>* permissions,
- const sandbox::policy::SandboxSeccompBPF::Options& options) {
-@@ -484,8 +485,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
- AddStandardGpuPermissions(&permissions);
- return permissions;
- }
-+#endif
-
- void LoadArmGpuLibraries() {
-+#if !defined(OS_BSD)
- // Preload the Mali library.
- if (UseChromecastSandboxAllowlist()) {
- for (const char* path : kAllowedChromecastPaths) {
-@@ -530,6 +533,7 @@ void LoadArmGpuLibraries() {
- dlopen(driver_paths[i], dlopen_flag);
- }
- }
-+#endif
- }
-
- bool LoadAmdGpuLibraries() {
-@@ -597,12 +601,14 @@ void LoadV4L2Libraries(
- }
-
- void LoadChromecastV4L2Libraries() {
-+#if !defined(OS_BSD)
- for (const char* path : kAllowedChromecastPaths) {
- const std::string library_path(std::string(path) +
- std::string("libvpcodec.so"));
- if (dlopen(library_path.c_str(), dlopen_flag))
- break;
- }
-+#endif
- }
-
- bool LoadLibrariesForGpu(
-@@ -629,6 +635,7 @@ bool LoadLibrariesForGpu(
- return true;
- }
-
-+#if !defined(OS_BSD)
- sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
- const sandbox::policy::SandboxLinux::Options& options) {
- sandbox::syscall_broker::BrokerCommandSet command_set;
-@@ -652,13 +659,17 @@ bool BrokerProcessPreSandboxHook(
- SetProcessTitleFromCommandLine(nullptr);
- return true;
- }
-+#endif
-
- } // namespace
-
- bool GpuProcessPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
-+ NOTIMPLEMENTED();
-+#if !defined(OS_BSD)
- sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess(
- CommandSetForGPU(options), FilePermissionsForGpu(options),
- base::BindOnce(BrokerProcessPreSandboxHook), options);
-+#endif
-
- if (!LoadLibrariesForGpu(options))
- return false;
diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
index 62e75f66cb4c..99fa9507db17 100644
--- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
+++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.cc
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2022-03-28 18:11:04 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.cc
@@ -20,7 +20,7 @@
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
ChildThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -53,7 +53,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
+@@ -54,7 +54,7 @@ PpapiBlinkPlatformImpl::~PpapiBlinkPlatformImpl() {
void PpapiBlinkPlatformImpl::Shutdown() {}
blink::WebSandboxSupport* PpapiBlinkPlatformImpl::GetSandboxSupport() {
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 dd72577c720e..4fe687212480 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,15 +1,6 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-10-05 07:34:01 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2023-07-24 14:27:53 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
-@@ -12,7 +12,7 @@
- #include "build/build_config.h"
- #include "content/child/blink_platform_impl.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"
- #include "third_party/skia/include/core/SkRefCnt.h"
- #endif
-@@ -38,11 +38,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
+@@ -33,7 +33,7 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
blink::WebString DefaultLocale() override;
private:
@@ -17,9 +8,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
};
diff --git a/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc b/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc
index b3f5ced48cd6..0e1449f77848 100644
--- a/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc
+++ b/www/iridium/files/patch-content_ppapi__plugin_ppapi__plugin__main.cc
@@ -1,11 +1,11 @@
---- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-03-13 07:33:08 UTC
+--- content/ppapi_plugin/ppapi_plugin_main.cc.orig 2023-07-24 14:27:53 UTC
+++ content/ppapi_plugin/ppapi_plugin_main.cc
@@ -54,6 +54,11 @@
#include "gin/v8_initializer.h"
#endif
-+#if BUILDFLAG(IS_OPENBSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#if BUILDFLAG(IS_BSD)
++#include "sandbox/policy/sandbox.h"
+#include "sandbox/policy/sandbox_type.h"
+#endif
+
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
deleted file mode 100644
index c02eba2674a1..000000000000
--- a/www/iridium/files/patch-content_public_browser_render__process__host.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/public/browser/render_process_host.h.orig 2023-03-13 07:33:08 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)
-
-@@ -641,7 +641,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 963d13270dbf..baa11170be3a 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 2023-04-22 17:45:15 UTC
+--- content/public/common/content_features.cc.orig 2023-07-24 14:27:53 UTC
+++ content/public/common/content_features.cc
-@@ -39,7 +39,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
+@@ -52,7 +52,7 @@ 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
-@@ -51,7 +51,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
+@@ -64,7 +64,7 @@ BASE_FEATURE(kAudioServiceOutOfProcess,
// kAudioServiceOutOfProcess feature is enabled.
BASE_FEATURE(kAudioServiceSandbox,
"AudioServiceSandbox",
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -547,7 +547,7 @@ BASE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens,
+@@ -539,7 +539,7 @@ BASE_FEATURE(kNetworkQualityEstimatorWebHoldback,
// (activated by kUserAgentClientHint)
BASE_FEATURE(kGreaseUACH, "GreaseUACH", base::FEATURE_ENABLED_BY_DEFAULT);
@@ -27,7 +27,7 @@
// Supports proxying thread type changes of renderer processes to browser
// process and having browser process handle adjusting thread properties (nice
// value, c-group, latency sensitivity...) for renderers which have sandbox
-@@ -1367,7 +1367,7 @@ BASE_FEATURE(kWebAssemblyTiering,
+@@ -1420,7 +1420,7 @@ BASE_FEATURE(kWebAssemblyTiering,
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
-@@ -1425,7 +1425,11 @@ BASE_FEATURE(kWebUICodeCache,
+@@ -1483,7 +1483,11 @@ BASE_FEATURE(kWebUICodeCache,
// 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 39cefbfbc71e..192be1058cc9 100644
--- a/www/iridium/files/patch-content_public_common_content__features.h
+++ b/www/iridium/files/patch-content_public_common_content__features.h
@@ -1,8 +1,8 @@
---- content/public/common/content_features.h.orig 2023-04-22 17:45:15 UTC
+--- content/public/common/content_features.h.orig 2023-07-24 14:27:53 UTC
+++ content/public/common/content_features.h
-@@ -115,7 +115,7 @@ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollO
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSet);
- CONTENT_EXPORT BASE_DECLARE_FEATURE(kGetDisplayMediaSetAutoSelectAllScreens);
+@@ -115,7 +115,7 @@ CONTENT_EXPORT extern const base::FeatureParam<int>
+ kFledgeLimitNumAuctionsParam;
+ CONTENT_EXPORT BASE_DECLARE_FEATURE(kFractionalScrollOffsets);
CONTENT_EXPORT BASE_DECLARE_FEATURE(kGreaseUACH);
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
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 081b75b2bfbf..19874825632e 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 2023-04-22 17:45:15 UTC
+--- content/public/common/content_switches.cc.orig 2023-07-24 14:27:53 UTC
+++ content/public/common/content_switches.cc
-@@ -368,6 +368,10 @@ const char kEnableIsolatedWebAppsInRenderer[] =
+@@ -367,6 +367,10 @@ const char kEnableIsolatedWebAppsInRenderer[] =
// 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.
-@@ -995,7 +999,7 @@ const char kEnableAutomation[] = "enable-automation";
+@@ -993,7 +997,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 41e79a406fbc..be2459284d1f 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 2023-04-22 17:45:15 UTC
+--- content/public/common/content_switches.h.orig 2023-07-24 14:27:53 UTC
+++ content/public/common/content_switches.h
-@@ -117,6 +117,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
+@@ -116,6 +116,8 @@ CONTENT_EXPORT extern const char kEnableGpuMemoryBuffe
CONTENT_EXPORT extern const char kEnableIsolatedWebAppsInRenderer[];
CONTENT_EXPORT extern const char kEnableLCDText[];
CONTENT_EXPORT extern const char kEnableLogging[];
@@ -9,12 +9,12 @@
CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -267,7 +269,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -265,7 +267,7 @@ CONTENT_EXPORT extern const char kUserLevelMemoryPress
// 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)
CONTENT_EXPORT extern const char kEnableSpeechDispatcher[];
+ CONTENT_EXPORT extern const char kLLVMProfileFile[];
#endif
-
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
deleted file mode 100644
index 3504ca2c93be..000000000000
--- a/www/iridium/files/patch-content_public_test_mock__render__process__host.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- content/public/test/mock_render_process_host.h.orig 2023-03-13 07:33:08 UTC
-+++ content/public/test/mock_render_process_host.h
-@@ -276,7 +276,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_renderer_BUILD.gn b/www/iridium/files/patch-content_renderer_BUILD.gn
index 880992270e0c..1b1e0de72d07 100644
--- a/www/iridium/files/patch-content_renderer_BUILD.gn
+++ b/www/iridium/files/patch-content_renderer_BUILD.gn
@@ -1,7 +1,7 @@
---- content/renderer/BUILD.gn.orig 2023-03-13 07:33:08 UTC
+--- content/renderer/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ content/renderer/BUILD.gn
-@@ -200,6 +200,13 @@ target(link_target_type, "renderer") {
- ]
+@@ -204,6 +204,13 @@ target(link_target_type, "renderer") {
+ configs += [ "//build/config/compiler:enable_arc" ]
}
+ if (is_bsd) {
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 5bd4eaa69ae0..07d82a41d41f 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 2023-03-13 07:33:08 UTC
+--- content/renderer/render_process_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/renderer/render_process_impl.cc
-@@ -46,7 +46,7 @@
+@@ -45,7 +45,7 @@
#if BUILDFLAG(IS_WIN)
#include "base/win/win_util.h"
#endif
@@ -9,9 +9,9 @@
#include "v8/include/v8-wasm-trap-handler-posix.h"
#endif
-@@ -223,7 +223,7 @@ RenderProcessImpl::RenderProcessImpl()
- SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,
- "--no-wasm-dynamic-tiering");
+@@ -221,7 +221,7 @@ RenderProcessImpl::RenderProcessImpl()
+ v8::V8::SetFlagsFromString(kSABPerContextFlag, sizeof(kSABPerContextFlag));
+ }
-#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 4c4a66edc542..f27f9477bd68 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 2023-04-22 17:45:15 UTC
+--- content/renderer/render_thread_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -201,6 +201,8 @@
+@@ -204,6 +204,8 @@
#if BUILDFLAG(IS_APPLE)
#include <malloc/malloc.h>
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -1069,7 +1071,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1070,7 +1072,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
kGpuStreamPriorityMedia);
const bool enable_video_decode_accelerator =
@@ -18,7 +18,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
#endif // BUILDFLAG(IS_LINUX)
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1078,7 +1080,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1079,7 +1081,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
gpu::kGpuFeatureStatusEnabled);
const bool enable_video_encode_accelerator =
@@ -27,7 +27,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoEncodeLinux) &&
#else
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoEncode) &&
-@@ -1863,7 +1865,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
+@@ -1868,7 +1870,7 @@ std::unique_ptr<CodecFactory> RenderThreadImpl::Create
bool enable_video_encode_accelerator) {
mojo::PendingRemote<media::mojom::VideoEncodeAcceleratorProvider>
vea_provider;
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 e95d3c2df19b..b11e6ea87d72 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 2023-04-22 17:45:15 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -111,7 +111,7 @@
+@@ -114,7 +114,7 @@
#if BUILDFLAG(IS_MAC)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,8 +9,15 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#endif
-@@ -177,7 +177,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -178,13 +178,13 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+ sudden_termination_disables_(0),
+ is_locked_to_site_(false),
main_thread_scheduler_(main_thread_scheduler) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ sk_sp<font_service::FontLoader> font_loader;
+ #endif
+
// RenderThread may not exist in some tests.
if (RenderThreadImpl::current()) {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -18,7 +25,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -187,7 +187,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -193,7 +193,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
}
@@ -27,7 +34,7 @@
if (sandboxEnabled()) {
#if BUILDFLAG(IS_MAC)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -245,7 +245,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
+@@ -251,7 +251,7 @@ void RendererBlinkPlatformImpl::SetThreadType(base::Pl
#endif
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
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 fc7ffb77a590..6fead10ea938 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,6 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2023-04-22 17:45:15 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2023-07-24 14:27:53 UTC
+++ content/renderer/renderer_blink_platform_impl.h
-@@ -31,7 +31,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"
-
--#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
-@@ -241,7 +241,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -238,7 +238,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
const gpu::GPUInfo& gpu_info) const;
@@ -18,12 +9,3 @@
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -261,7 +261,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
- mutable base::WaitableEvent io_thread_id_ready_event_;
- base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
-
diff --git a/www/iridium/files/patch-content_shell_BUILD.gn b/www/iridium/files/patch-content_shell_BUILD.gn
index f434491b71f6..8dbc87022140 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 2023-04-22 17:45:15 UTC
+--- content/shell/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ content/shell/BUILD.gn
-@@ -966,7 +966,7 @@ group("content_shell_crash_test") {
+@@ -1017,7 +1017,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 92c08f060f3e..319747fa57a2 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 2023-04-22 17:45:15 UTC
+--- content/shell/app/shell_main_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ content/shell/app/shell_main_delegate.cc
-@@ -221,7 +221,7 @@ void ShellMainDelegate::PreSandboxStartup() {
+@@ -223,7 +223,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 2f339dff499a..accb24746777 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,4 +1,4 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig 2023-04-22 17:45:15 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig 2023-07-24 14:27:53 UTC
+++ content/shell/browser/shell_browser_main_parts.cc
@@ -50,7 +50,7 @@
#include "net/base/network_change_notifier.h"
@@ -18,7 +18,7 @@
#include "ui/linux/linux_ui.h" // nogncheck
#include "ui/linux/linux_ui_factory.h" // nogncheck
#endif
-@@ -136,7 +136,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
+@@ -138,7 +138,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
}
int ShellBrowserMainParts::PreEarlyInitialization() {
@@ -36,7 +36,7 @@
ui::LinuxUi::SetInstance(ui::GetDefaultLinuxUi());
#endif
}
-@@ -210,7 +210,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
+@@ -214,7 +214,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
ShellDevToolsManagerDelegate::StopHttpHandler();
browser_context_.reset();
off_the_record_browser_context_.reset();
diff --git a/www/iridium/files/patch-content_test_BUILD.gn b/www/iridium/files/patch-content_test_BUILD.gn
index dd0837795c3e..a10c08ef247c 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 2023-04-22 17:45:15 UTC
+--- content/test/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ content/test/BUILD.gn
-@@ -2119,7 +2119,7 @@ static_library("run_all_unittests") {
+@@ -2181,7 +2181,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
@@ -9,7 +9,7 @@
deps += [ "//content/common:set_process_title_linux" ]
}
}
-@@ -3159,7 +3159,7 @@ test("content_unittests") {
+@@ -3234,7 +3234,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 5366e420e651..ec3fdac527fa 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 2023-04-22 17:45:15 UTC
+--- content/utility/services.cc.orig 2023-07-24 14:27:53 UTC
+++ content/utility/services.cc
-@@ -64,7 +64,7 @@
+@@ -65,7 +65,7 @@
extern sandbox::TargetServices* g_utility_target_services;
#endif // BUILDFLAG(IS_WIN)
@@ -9,7 +9,7 @@
#include "media/mojo/services/mojo_video_encode_accelerator_provider_factory.h"
#include "sandbox/linux/services/libc_interceptor.h"
#include "sandbox/policy/mojom/sandbox.mojom.h"
-@@ -87,7 +87,7 @@ extern sandbox::TargetServices* g_utility_target_servi
+@@ -88,7 +88,7 @@ extern sandbox::TargetServices* g_utility_target_servi
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
@@ -18,7 +18,16 @@
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
#include "media/mojo/services/stable_video_decoder_factory_process_service.h" // nogncheck
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
-@@ -215,7 +215,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
+@@ -110,7 +110,7 @@ extern sandbox::TargetServices* g_utility_target_servi
+ #include "ui/accessibility/accessibility_features.h"
+ #endif // BUILDFLAG(ENABLE_ACCESSIBILITY_SERVICE)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "media/capture/capture_switches.h"
+ #include "services/viz/public/cpp/gpu/gpu.h"
+ #endif // BUILDFLAG(IS_LINUX)
+@@ -227,7 +227,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
<< "task_policy_set TASK_QOS_POLICY";
#endif
@@ -27,7 +36,16 @@
auto* command_line = base::CommandLine::ForCurrentProcess();
if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
sandbox::mojom::Sandbox::kNoSandbox) {
-@@ -319,7 +319,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
+@@ -311,7 +311,7 @@ auto RunVideoCapture(
+ mojo::PendingReceiver<video_capture::mojom::VideoCaptureService> receiver) {
+ auto service = std::make_unique<UtilityThreadVideoCaptureServiceImpl>(
+ std::move(receiver), base::SingleThreadTaskRunner::GetCurrentDefault());
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
+ mojo::PendingRemote<viz::mojom::Gpu> remote_gpu;
+ content::UtilityThread::Get()->BindHostReceiver(
+@@ -343,7 +343,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
@@ -36,7 +54,7 @@
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
auto RunStableVideoDecoderFactoryProcessService(
mojo::PendingReceiver<
-@@ -330,7 +330,7 @@ auto RunStableVideoDecoderFactoryProcessService(
+@@ -354,7 +354,7 @@ auto RunStableVideoDecoderFactoryProcessService(
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
// (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
@@ -45,7 +63,7 @@
auto RunVideoEncodeAcceleratorProviderFactory(
mojo::PendingReceiver<media::mojom::VideoEncodeAcceleratorProviderFactory>
receiver) {
-@@ -388,13 +388,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -419,13 +419,13 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
diff --git a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
index 754af55836f6..a3b67a4c5c2b 100644
--- a/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-content_utility_speech_speech__recognition__sandbox__hook__linux.h
@@ -1,11 +1,11 @@
---- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig 2022-03-28 18:11:04 UTC
+--- content/utility/speech/speech_recognition_sandbox_hook_linux.h.orig 2023-07-24 14:27:53 UTC
+++ content/utility/speech/speech_recognition_sandbox_hook_linux.h
@@ -5,7 +5,11 @@
#ifndef CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_
#define CONTENT_UTILITY_SPEECH_SPEECH_RECOGNITION_SANDBOX_HOOK_LINUX_H_
+#if defined(OS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#else
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
diff --git a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
index c5ac64e49954..379b7b45154d 100644
--- a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
+++ b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2022-03-28 18:11:04 UTC
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ content/utility/utility_blink_platform_with_sandbox_support_impl.cc
@@ -9,7 +9,7 @@
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
UtilityThread::Get()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -34,7 +34,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
+@@ -35,7 +35,7 @@ UtilityBlinkPlatformWithSandboxSupportImpl::
blink::WebSandboxSupport*
UtilityBlinkPlatformWithSandboxSupportImpl::GetSandboxSupport() {
diff --git a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
index b381b43a740d..df095c59179f 100644
--- a/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
+++ b/www/iridium/files/patch-content_utility_utility__blink__platform__with__sandbox__support__impl.h
@@ -1,15 +1,6 @@
---- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2022-03-28 18:11:04 UTC
+--- content/utility/utility_blink_platform_with_sandbox_support_impl.h.orig 2023-07-24 14:27:53 UTC
+++ content/utility/utility_blink_platform_with_sandbox_support_impl.h
-@@ -10,7 +10,7 @@
- #include "build/build_config.h"
- #include "third_party/blink/public/platform/platform.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
-@@ -38,10 +38,10 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub
+@@ -33,7 +33,7 @@ class UtilityBlinkPlatformWithSandboxSupportImpl : pub
blink::WebSandboxSupport* GetSandboxSupport() override;
private:
@@ -17,8 +8,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sk_sp<font_service::FontLoader> font_loader_;
- #endif
};
diff --git a/www/iridium/files/patch-content_utility_utility__main.cc b/www/iridium/files/patch-content_utility_utility__main.cc
index 905c8485ec64..e66993dfeb8b 100644
--- a/www/iridium/files/patch-content_utility_utility__main.cc
+++ b/www/iridium/files/patch-content_utility_utility__main.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_main.cc.orig 2023-03-13 07:33:08 UTC
+--- content/utility/utility_main.cc.orig 2023-07-24 14:27:53 UTC
+++ content/utility/utility_main.cc
@@ -31,7 +31,7 @@
#include "third_party/icu/source/common/unicode/unistr.h"
@@ -6,18 +6,21 @@
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include "base/file_descriptor_store.h"
+ #include "base/files/file_util.h"
+ #include "base/pickle.h"
+@@ -39,7 +39,9 @@
#include "content/utility/speech/speech_recognition_sandbox_hook_linux.h"
#include "gpu/config/gpu_info_collector.h"
#include "media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h"
-@@ -42,15 +42,21 @@
- #if BUILDFLAG(ENABLE_PRINTING)
- #include "printing/sandbox/print_backend_sandbox_hook_linux.h"
- #endif
+#if !BUILDFLAG(IS_BSD)
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
#include "services/audio/audio_sandbox_hook_linux.h"
#include "services/network/network_sandbox_hook_linux.h"
+ // gn check is not smart enough to realize that this include only applies to
+@@ -51,10 +53,14 @@
+ #endif
#endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -26,13 +29,13 @@
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#endif
+
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "chromeos/ash/components/assistant/buildflags.h"
#include "chromeos/ash/services/ime/ime_sandbox_hook.h"
-@@ -62,7 +68,7 @@
+@@ -66,7 +72,7 @@
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
#if (BUILDFLAG(ENABLE_SCREEN_AI_SERVICE) && \
@@ -41,12 +44,17 @@
#include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h" // nogncheck
#endif
-@@ -83,10 +89,10 @@ namespace content {
+@@ -91,7 +97,7 @@ namespace content {
namespace {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ std::vector<std::string> GetNetworkContextsParentDirectories() {
+ base::MemoryMappedFile::Region region;
+ base::ScopedFD read_pipe_fd = base::FileDescriptorStore::GetInstance().TakeFD(
+@@ -119,7 +125,7 @@ std::vector<std::string> GetNetworkContextsParentDirec
+
bool ShouldUseAmdGpuPolicy(sandbox::mojom::Sandbox sandbox_type) {
const bool obtain_gpu_info =
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -54,7 +62,7 @@
sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoEncoding;
-@@ -168,7 +174,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -235,7 +241,7 @@ int UtilityMain(MainFunctionParams parameters) {
}
}
@@ -63,7 +71,7 @@
// Initializes the sandbox before any threads are created.
// TODO(jorgelo): move this after GTK initialization when we enable a strict
// Seccomp-BPF policy.
-@@ -196,7 +202,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -264,7 +270,7 @@ int UtilityMain(MainFunctionParams parameters) {
pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook);
break;
#endif
@@ -72,7 +80,7 @@
case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
pre_sandbox_hook =
base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -223,6 +229,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -291,6 +297,7 @@ int UtilityMain(MainFunctionParams parameters) {
default:
break;
}
@@ -80,7 +88,7 @@
if (!sandbox::policy::IsUnsandboxedSandboxType(sandbox_type) &&
(parameters.zygote_child || !pre_sandbox_hook.is_null())) {
sandbox::policy::SandboxLinux::Options sandbox_options;
-@@ -231,6 +238,11 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -299,6 +306,11 @@ int UtilityMain(MainFunctionParams parameters) {
sandbox::policy::Sandbox::Initialize(
sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
}
@@ -91,4 +99,4 @@
+#endif
#elif BUILDFLAG(IS_WIN)
g_utility_target_services = parameters.sandbox_info->target_services;
- #endif
+
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 7f446d07dba5..e86d9785b02c 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-10-05 07:34:01 UTC
+--- content/zygote/zygote_main_linux.cc.orig 2023-07-24 14:27:53 UTC
+++ content/zygote/zygote_main_linux.cc
@@ -11,7 +11,9 @@
#include <stddef.h>
@@ -20,7 +20,7 @@
#include "sandbox/policy/sandbox.h"
#include "sandbox/policy/switches.h"
#include "third_party/icu/source/i18n/unicode/timezone.h"
-@@ -50,6 +54,7 @@ namespace content {
+@@ -50,11 +54,13 @@ namespace content {
namespace {
@@ -28,19 +28,13 @@
void CloseFds(const std::vector<int>& fds) {
for (const auto& it : fds) {
PCHECK(0 == IGNORE_EINTR(close(it)));
-@@ -67,9 +72,11 @@ base::OnceClosure ClosureFromTwoClosures(base::OnceClo
- },
- std::move(one), std::move(two));
+ }
}
+#endif
- } // namespace
-
-+#if !defined(OS_BSD)
- // This function triggers the static and lazy construction of objects that need
- // to be created before imposing the sandbox.
- static void ZygotePreSandboxInit() {
-@@ -174,9 +181,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand
+ base::OnceClosure ClosureFromTwoClosures(base::OnceClosure one,
+ base::OnceClosure two) {
+@@ -157,9 +163,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand
CHECK(!using_layer1_sandbox);
}
}
@@ -52,7 +46,7 @@
sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance();
-@@ -241,6 +250,9 @@ bool ZygoteMain(
+@@ -224,6 +232,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
index 28ff033ab846..bcd5493669f4 100644
--- a/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc
+++ b/www/iridium/files/patch-device_bluetooth_bluetooth__adapter.cc
@@ -1,11 +1,11 @@
---- device/bluetooth/bluetooth_adapter.cc.orig 2022-10-05 07:34:01 UTC
+--- device/bluetooth/bluetooth_adapter.cc.orig 2023-07-24 14:27:53 UTC
+++ device/bluetooth/bluetooth_adapter.cc
-@@ -32,7 +32,7 @@ BluetoothAdapter::ServiceOptions::ServiceOptions() = d
+@@ -31,7 +31,7 @@ namespace device {
+ BluetoothAdapter::ServiceOptions::ServiceOptions() = default;
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)
+-#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && \
++#if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD) && \
+ !BUILDFLAG(IS_APPLE) && !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
// static
scoped_refptr<BluetoothAdapter> BluetoothAdapter::CreateAdapter() {
- return nullptr;
diff --git a/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
index 628de58f6825..af257e7904c8 100644
--- a/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
+++ b/www/iridium/files/patch-extensions_browser_api_api__browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-04-22 17:45:15 UTC
+--- extensions/browser/api/api_browser_context_keyed_service_factories.cc.orig 2023-07-24 14:27:53 UTC
+++ extensions/browser/api/api_browser_context_keyed_service_factories.cc
-@@ -94,7 +94,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
+@@ -104,7 +104,7 @@ void EnsureApiBrowserContextKeyedServiceFactoriesBuilt
MessageService::GetFactoryInstance();
MessagingAPIMessageFilter::EnsureAssociatedFactoryBuilt();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
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 a2578932ffca..14dbc5bf39e2 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,6 +1,6 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2023-04-22 17:45:15 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig 2023-07-24 14:27:53 UTC
+++ extensions/browser/api/messaging/message_service.cc
-@@ -70,7 +70,7 @@ namespace {
+@@ -71,7 +71,7 @@ namespace {
const char kReceivingEndDoesntExistError[] =
"Could not establish connection. Receiving end does not exist.";
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
const char kMissingPermissionError[] =
"Access to native messaging requires nativeMessaging permission.";
const char kProhibitedByPoliciesError[] =
-@@ -464,7 +464,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -484,7 +484,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 73631b9fb434..1b3e4a1efdf4 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,4 +1,4 @@
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-04-22 17:45:15 UTC
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
@@ -14,7 +14,7 @@
#include "extensions/browser/api/networking_private/networking_private_chromeos.h"
@@ -9,7 +9,7 @@
#include "extensions/browser/api/networking_private/networking_private_linux.h"
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
#include "components/wifi/wifi_service.h"
-@@ -68,7 +68,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
+@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
delegate = new NetworkingPrivateChromeOS(browser_context);
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
delegate = new NetworkingPrivateLacros(browser_context);
diff --git a/www/iridium/files/patch-extensions_browser_extension__prefs.cc b/www/iridium/files/patch-extensions_browser_extension__prefs.cc
deleted file mode 100644
index d736a833e511..000000000000
--- a/www/iridium/files/patch-extensions_browser_extension__prefs.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/browser/extension_prefs.cc.orig 2023-04-22 17:45:15 UTC
-+++ extensions/browser/extension_prefs.cc
-@@ -2228,7 +2228,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
- registry->RegisterListPref(
- pref_names::kExtendedBackgroundLifetimeForPortConnectionsToUrls);
- #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(
diff --git a/www/iridium/files/patch-extensions_browser_pref__names.cc b/www/iridium/files/patch-extensions_browser_pref__names.cc
deleted file mode 100644
index e74ef8e210b9..000000000000
--- a/www/iridium/files/patch-extensions_browser_pref__names.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/browser/pref_names.cc.orig 2023-04-22 17:45:15 UTC
-+++ extensions/browser/pref_names.cc
-@@ -53,7 +53,7 @@ const char kManifestV2Availability[] = "extensions.man
- const char kPinnedExtensions[] = "extensions.pinned_extensions";
- const char kStorageGarbageCollect[] = "extensions.storage.garbagecollect";
- #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 kChromeAppsWebViewPermissiveBehaviorAllowed[] =
diff --git a/www/iridium/files/patch-extensions_browser_pref__names.h b/www/iridium/files/patch-extensions_browser_pref__names.h
deleted file mode 100644
index 98797c76a195..000000000000
--- a/www/iridium/files/patch-extensions_browser_pref__names.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- extensions/browser/pref_names.h.orig 2023-04-22 17:45:15 UTC
-+++ extensions/browser/pref_names.h
-@@ -114,7 +114,7 @@ extern const char kPinnedExtensions[];
- extern const char kStorageGarbageCollect[];
-
- #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 524eb387d0b3..c2394cd7b059 100644
--- a/www/iridium/files/patch-extensions_common_api___permission__features.json
+++ b/www/iridium/files/patch-extensions_common_api___permission__features.json
@@ -1,15 +1,15 @@
---- extensions/common/api/_permission_features.json.orig 2023-03-13 07:33:08 UTC
+--- extensions/common/api/_permission_features.json.orig 2023-07-24 14:27:53 UTC
+++ extensions/common/api/_permission_features.json
-@@ -134,7 +134,7 @@
+@@ -138,7 +138,7 @@
{
"channel": "stable",
"extension_types": ["platform_app"],
-- "platforms": ["chromeos", "win", "mac", "linux"],
-+ "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd"],
+- "platforms": ["chromeos", "lacros", "win", "mac", "linux"],
++ "platforms": ["chromeos", "lacros", "win", "mac", "linux", "openbsd", "freebsd"],
"allowlist": [
"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169
"A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169
-@@ -427,7 +427,7 @@
+@@ -432,7 +432,7 @@
}, {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
@@ -18,7 +18,7 @@
"allowlist": [
"0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651
"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683
-@@ -469,7 +469,7 @@
+@@ -474,7 +474,7 @@
"networkingPrivate": {
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
diff --git a/www/iridium/files/patch-extensions_common_api_runtime.json b/www/iridium/files/patch-extensions_common_api_runtime.json
index b67c7d48f3f2..b901dd2557d4 100644
--- a/www/iridium/files/patch-extensions_common_api_runtime.json
+++ b/www/iridium/files/patch-extensions_common_api_runtime.json
@@ -1,6 +1,6 @@
---- extensions/common/api/runtime.json.orig 2022-10-05 07:34:01 UTC
+--- extensions/common/api/runtime.json.orig 2023-07-24 14:27:53 UTC
+++ extensions/common/api/runtime.json
-@@ -86,7 +86,8 @@
+@@ -89,7 +89,8 @@
"cros",
"linux",
"openbsd",
diff --git a/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc b/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
index b5fecbcaa349..1fd77de43428 100644
--- a/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
+++ b/www/iridium/files/patch-extensions_shell_browser_api_runtime_shell__runtime__api__delegate.cc
@@ -1,11 +1,11 @@
---- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-04-22 17:45:15 UTC
+--- extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ extensions/shell/browser/api/runtime/shell_runtime_api_delegate.cc
@@ -44,7 +44,7 @@ void ShellRuntimeAPIDelegate::OpenURL(const GURL& unin
bool ShellRuntimeAPIDelegate::GetPlatformInfo(PlatformInfo* info) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
- info->os = api::runtime::PLATFORM_OS_CROS;
+ info->os = api::runtime::PlatformOs::kCros;
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- info->os = api::runtime::PLATFORM_OS_LINUX;
+ info->os = api::runtime::PlatformOs::kLinux;
#endif
return true;
diff --git a/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc b/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
index fe295baf5ae6..cb7ee5a28885 100644
--- a/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
+++ b/www/iridium/files/patch-google__apis_gcm_engine_heartbeat__manager.cc
@@ -1,6 +1,6 @@
---- google_apis/gcm/engine/heartbeat_manager.cc.orig 2023-03-13 07:33:08 UTC
+--- google_apis/gcm/engine/heartbeat_manager.cc.orig 2023-07-24 14:27:53 UTC
+++ google_apis/gcm/engine/heartbeat_manager.cc
-@@ -33,7 +33,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;
+@@ -32,7 +32,7 @@ const int kMinClientHeartbeatIntervalMs = 1000 * 30;
// Minimum time spent sleeping before we force a new heartbeat.
const int kMinSuspendTimeMs = 1000 * 10; // 10 seconds.
@@ -9,7 +9,7 @@
// The period at which to check if the heartbeat time has passed. Used to
// protect against platforms where the timer is delayed by the system being
// suspended. Only needed on linux because the other OSes provide a standard
-@@ -193,7 +193,7 @@ void HeartbeatManager::RestartTimer() {
+@@ -191,7 +191,7 @@ void HeartbeatManager::RestartTimer() {
base::BindRepeating(&HeartbeatManager::OnHeartbeatTriggered,
weak_ptr_factory_.GetWeakPtr()));
@@ -18,7 +18,7 @@
// Windows, Mac, Android, iOS, and Chrome OS all provide a way to be notified
// when the system is suspending or resuming. The only one that does not is
// Linux so we need to poll to check for missed heartbeats.
-@@ -218,7 +218,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
+@@ -214,7 +214,7 @@ void HeartbeatManager::CheckForMissedHeartbeat() {
return;
}
diff --git a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
index 9ea2d8286f96..e67e729cdee2 100644
--- a/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_common_gpu__memory__buffer__support.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/common/gpu_memory_buffer_support.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/common/gpu_memory_buffer_support.cc
-@@ -173,7 +173,7 @@ uint32_t GetPlatformSpecificTextureTarget() {
+@@ -174,7 +174,7 @@ uint32_t GetPlatformSpecificTextureTarget() {
#if BUILDFLAG(IS_MAC)
return macos_specific_texture_target;
#elif BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
return GL_TEXTURE_EXTERNAL_OES;
#elif BUILDFLAG(IS_IOS)
return GL_TEXTURE_2D;
-@@ -208,7 +208,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu
+@@ -209,7 +209,7 @@ GPU_EXPORT bool NativeBufferNeedsPlatformSpecificTextu
gfx::BufferFormat format,
gfx::BufferPlane plane) {
#if BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc b/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
index 6b3557a3c2d5..05049a4770d7 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_gles2__cmd__decoder.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/service/gles2_cmd_decoder.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/service/gles2_cmd_decoder.cc
-@@ -3460,7 +3460,7 @@ GLES2Decoder* GLES2Decoder::Create(
+@@ -3492,7 +3492,7 @@ GLES2Decoder* GLES2Decoder::Create(
}
// Allow linux to run fuzzers.
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.cc
index 69f6457d4c72..c76ba373f384 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_angle__vulkan__image__backing__factory.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/angle_vulkan_image_backing_factory.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/service/shared_image/angle_vulkan_image_backing_factory.cc
-@@ -20,7 +20,7 @@ namespace {
+@@ -21,7 +21,7 @@ namespace {
// TODO(penghuang): verify the scanout is the right usage for video playback.
// crbug.com/1280798
constexpr uint32_t kSupportedUsage =
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
index 8e90ff5252ea..2e099b872344 100644
--- 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
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/service/shared_image/external_vk_image_backing.cc
-@@ -36,7 +36,7 @@
+@@ -43,7 +43,7 @@
#include "ui/gl/gl_version_info.h"
#include "ui/gl/scoped_binders.h"
@@ -9,7 +9,7 @@
#include "gpu/command_buffer/service/shared_image/external_vk_image_dawn_representation.h"
#endif
-@@ -534,7 +534,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
+@@ -591,7 +591,7 @@ std::unique_ptr<DawnImageRepresentation> ExternalVkIma
WGPUDevice wgpuDevice,
WGPUBackendType backend_type,
std::vector<WGPUTextureFormat> view_formats) {
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
index 84ddb0f19cbc..21652b5bcf60 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_external__vk__image__backing__factory.cc
@@ -1,11 +1,11 @@
---- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/service/shared_image/external_vk_image_backing_factory.cc
-@@ -191,7 +191,7 @@ bool ExternalVkImageBackingFactory::IsSupported(
+@@ -209,7 +209,7 @@ bool ExternalVkImageBackingFactory::IsSupported(
+ return false;
+ }
- // TODO: remove it when below formats are converted to multi plane shared
- // image formats.
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- switch (format.resource_format()) {
- case viz::YUV_420_BIPLANAR:
- case viz::YUVA_420_TRIPLANAR:
+ if (format.IsLegacyMultiplanar()) {
+ // ExternalVkImageBacking doesn't work properly with external sampler
+ // multi-planar formats on Linux, see https://crbug.com/1394888.
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
index 0018ded84cac..dacf05c4e89c 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_shared__image__manager.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/service/shared_image/shared_image_manager.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/service/shared_image/shared_image_manager.cc
-@@ -481,7 +481,7 @@ bool SharedImageManager::SupportsScanoutImages() {
+@@ -499,7 +499,7 @@ bool SharedImageManager::SupportsScanoutImages() {
return true;
#elif BUILDFLAG(IS_ANDROID)
return base::AndroidHardwareBufferCompat::IsSupportAvailable();
diff --git a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
index 4015992dd433..03caf0188377 100644
--- a/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
+++ b/www/iridium/files/patch-gpu_command__buffer_service_shared__image_wrapped__sk__image__backing.cc
@@ -1,9 +1,9 @@
---- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/service/shared_image/wrapped_sk_image_backing.cc
-@@ -181,7 +181,7 @@ bool WrappedSkImageBacking::Initialize() {
- for (int plane = 0; plane < num_planes; ++plane) {
- auto& texture = textures_[plane];
- gfx::Size plane_size = format().GetPlaneSize(plane, size());
+@@ -210,7 +210,7 @@ bool WrappedSkImageBacking::Initialize(const std::stri
+
+ constexpr GrRenderable is_renderable = GrRenderable::kYes;
+ constexpr GrProtected is_protected = GrProtected::kNo;
-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX)
+#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
// Blue for single-planar and magenta-ish for multi-planar.
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 44e7ec5da442..c923c9b1f792 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,9 +1,9 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1225,7 +1225,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
+@@ -1245,7 +1245,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
if (gr_context_type_ != GrContextType::kVulkan &&
- use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
+ use_webgpu_adapter_ != WebGPUAdapterName::kOpenGLES) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
callback(WGPURequestAdapterStatus_Unavailable, nullptr,
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 67d8a50bd070..defced14644e 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,7 +1,7 @@
---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
-@@ -28,7 +28,7 @@
- #include "ui/gl/gl_image.h"
+@@ -27,7 +27,7 @@
+ #include "ui/gfx/half_float.h"
#include "ui/gl/test/gl_test_support.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -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
-@@ -71,7 +71,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa
+@@ -70,7 +70,7 @@ class GpuMemoryBufferTest : public testing::TestWithPa
GLManager gl_;
};
diff --git a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc
index 41213a69eab0..acc22a16d75c 100644
--- a/www/iridium/files/patch-gpu_config_gpu__finch__features.cc
+++ b/www/iridium/files/patch-gpu_config_gpu__finch__features.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_finch_features.cc.orig 2023-04-22 17:45:15 UTC
+--- gpu/config/gpu_finch_features.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/config/gpu_finch_features.cc
-@@ -57,7 +57,7 @@ bool IsDeviceBlocked(const char* field, const std::str
+@@ -58,7 +58,7 @@ bool IsDeviceBlocked(const char* field, const std::str
BASE_FEATURE(kUseGles2ForOopR,
"UseGles2ForOopR",
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -9,7 +9,7 @@
base::FEATURE_DISABLED_BY_DEFAULT
#else
base::FEATURE_ENABLED_BY_DEFAULT
-@@ -135,7 +135,8 @@ const base::FeatureParam<std::string>
+@@ -136,7 +136,8 @@ const base::FeatureParam<std::string>
BASE_FEATURE(kDefaultEnableGpuRasterization,
"DefaultEnableGpuRasterization",
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
index dd063441ee2d..3d13243af2d2 100644
--- a/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
+++ b/www/iridium/files/patch-gpu_ipc_common_gpu__memory__buffer__support.cc
@@ -1,4 +1,4 @@
---- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-01-17 19:19:00 UTC
+--- gpu/ipc/common/gpu_memory_buffer_support.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/ipc/common/gpu_memory_buffer_support.cc
@@ -21,7 +21,7 @@
#include "ui/ozone/public/ozone_platform.h"
@@ -9,7 +9,7 @@
#include "gpu/ipc/common/gpu_memory_buffer_impl_native_pixmap.h"
#endif
-@@ -50,7 +50,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
+@@ -51,7 +51,7 @@ GpuMemoryBufferSupport::GetNativeGpuMemoryBufferType()
return gfx::IO_SURFACE_BUFFER;
#elif BUILDFLAG(IS_ANDROID)
return gfx::ANDROID_HARDWARE_BUFFER;
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 6fbcf6e23e88..ef58608a5a50 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 2023-01-17 19:19:00 UTC
+--- gpu/ipc/common/gpu_memory_buffer_support.h.orig 2023-07-24 14:27:53 UTC
+++ gpu/ipc/common/gpu_memory_buffer_support.h
-@@ -18,7 +18,7 @@
+@@ -20,7 +20,7 @@
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/gpu_memory_buffer.h"
@@ -8,4 +8,4 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_OZONE) || BUILDFLAG(IS_BSD)
namespace gfx {
class ClientNativePixmapFactory;
- }
+ } // namespace gfx
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 092480cfe301..29efcfafb583 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 2023-04-22 17:45:15 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -353,7 +353,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -334,7 +334,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
-@@ -389,7 +389,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -371,7 +371,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
bool attempted_startsandbox = false;
@@ -18,16 +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.
-@@ -438,7 +438,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
-
- if (gl_initialized && gl_use_swiftshader_ &&
- !gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
- << "on Linux";
- return false;
-@@ -489,7 +489,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -442,7 +442,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
}
@@ -36,7 +27,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
-@@ -575,7 +575,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -528,7 +528,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
command_line, gpu_feature_info_,
gpu_preferences_.disable_software_rasterizer, false);
if (gl_use_swiftshader_) {
@@ -45,7 +36,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -703,7 +703,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -672,7 +672,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
@@ -54,8 +45,8 @@
// 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.
-@@ -755,7 +755,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
- gl_use_swiftshader_ = true;
+@@ -726,7 +726,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+ }
}
}
-#if BUILDFLAG(IS_LINUX) || \
@@ -63,7 +54,7 @@
(BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
// https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -899,7 +899,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -867,7 +867,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
}
bool gl_disabled = gl::GetGLImplementation() == gl::kGLImplementationDisabled;
@@ -72,9 +63,9 @@
(BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_CHROMEOS_DEVICE))
if (!gl_disabled && !gl_use_swiftshader_ && std::getenv("RUNNING_UNDER_RR")) {
// https://rr-project.org/ is a Linux-only record-and-replay debugger that
-@@ -963,7 +963,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
-
- InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
+@@ -937,7 +937,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+ }
+ }
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
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 c8978c1e09f5..8e5699a4ed80 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-12-06 08:09:13 UTC
+--- gpu/vulkan/vulkan_device_queue.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/vulkan/vulkan_device_queue.cc
-@@ -89,7 +89,7 @@ bool VulkanDeviceQueue::Initialize(
+@@ -93,7 +93,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(
+@@ -233,7 +233,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 c8a55d604cd4..056922669f13 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-10-05 07:34:01 UTC
+--- gpu/vulkan/vulkan_device_queue.h.orig 2023-07-24 14:27:53 UTC
+++ gpu/vulkan/vulkan_device_queue.h
-@@ -158,7 +158,7 @@ class COMPONENT_EXPORT(VULKAN) VulkanDeviceQueue {
+@@ -165,7 +165,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 6c1142483cad..8e319599998a 100644
--- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
+++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.cc
@@ -1,4 +1,4 @@
---- gpu/vulkan/vulkan_function_pointers.cc.orig 2022-10-05 07:34:01 UTC
+--- gpu/vulkan/vulkan_function_pointers.cc.orig 2023-07-24 14:27:53 UTC
+++ gpu/vulkan/vulkan_function_pointers.cc
@@ -1151,7 +1151,7 @@ bool VulkanFunctionPointers::BindDeviceFunctionPointer
}
@@ -9,3 +9,12 @@
if (gfx::HasExtension(enabled_extensions,
VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME)) {
vkGetImageDrmFormatModifierPropertiesEXT =
+@@ -1339,7 +1339,7 @@ void VulkanFunctionPointers::ResetForTesting() {
+ vkGetSwapchainImagesKHR = nullptr;
+ vkQueuePresentKHR = nullptr;
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ vkGetImageDrmFormatModifierPropertiesEXT = nullptr;
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ }
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 f9574e12adc7..f7aa05bc7e52 100644
--- a/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h
+++ b/www/iridium/files/patch-gpu_vulkan_vulkan__function__pointers.h
@@ -1,6 +1,6 @@
---- gpu/vulkan/vulkan_function_pointers.h.orig 2022-10-05 07:34:01 UTC
+--- gpu/vulkan/vulkan_function_pointers.h.orig 2023-07-24 14:27:53 UTC
+++ gpu/vulkan/vulkan_function_pointers.h
-@@ -305,7 +305,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
+@@ -307,7 +307,7 @@ struct COMPONENT_EXPORT(VULKAN) VulkanFunctionPointers
VulkanFunction<PFN_vkGetSwapchainImagesKHR> vkGetSwapchainImagesKHR;
VulkanFunction<PFN_vkQueuePresentKHR> vkQueuePresentKHR;
@@ -9,7 +9,7 @@
VulkanFunction<PFN_vkGetImageDrmFormatModifierPropertiesEXT>
vkGetImageDrmFormatModifierPropertiesEXT;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -1212,7 +1212,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
+@@ -1214,7 +1214,7 @@ ALWAYS_INLINE VkResult vkQueuePresentKHR(VkQueue queue
pPresentInfo);
}
@@ -18,7 +18,7 @@
ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierPropertiesEXT(
VkDevice device,
VkImage image,
-@@ -1222,4 +1222,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
+@@ -1224,4 +1224,4 @@ ALWAYS_INLINE VkResult vkGetImageDrmFormatModifierProp
}
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc b/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
index 2ec11fa07741..723a0ad57317 100644
--- a/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
+++ b/www/iridium/files/patch-headless_lib_browser_headless__browser__main__parts__posix.cc
@@ -1,4 +1,4 @@
---- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2023-04-22 17:45:15 UTC
+--- headless/lib/browser/headless_browser_main_parts_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ headless/lib/browser/headless_browser_main_parts_posix.cc
@@ -19,13 +19,13 @@
#include "content/public/browser/browser_thread.h"
@@ -7,8 +7,8 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "base/command_line.h"
- #include "components/os_crypt/key_storage_config_linux.h"
- #include "components/os_crypt/os_crypt.h"
+ #include "components/os_crypt/sync/key_storage_config_linux.h"
+ #include "components/os_crypt/sync/os_crypt.h"
#include "headless/public/switches.h"
-#if defined(USE_DBUS)
@@ -16,7 +16,7 @@
#include "device/bluetooth/dbus/bluez_dbus_manager.h"
#endif
-@@ -120,7 +120,7 @@ class BrowserShutdownHandler {
+@@ -123,7 +123,7 @@ class BrowserShutdownHandler {
} // namespace
@@ -25,9 +25,9 @@
constexpr char kProductName[] = "HeadlessChrome";
#endif
-@@ -128,9 +128,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo
- BrowserShutdownHandler::Install(
- base::BindOnce(&HeadlessBrowserImpl::Shutdown, browser_->GetWeakPtr()));
+@@ -131,9 +131,9 @@ void HeadlessBrowserMainParts::PostCreateMainMessageLo
+ BrowserShutdownHandler::Install(base::BindOnce(
+ &HeadlessBrowserImpl::ShutdownWithExitCode, browser_->GetWeakPtr()));
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
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 503869e2f4b7..3e7c917cf5f0 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 2023-03-13 07:33:08 UTC
+--- headless/lib/browser/headless_web_contents_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ headless/lib/browser/headless_web_contents_impl.cc
-@@ -61,7 +61,7 @@ namespace headless {
+@@ -60,7 +60,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 7767b84c25bb..852bb25fe048 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-10-05 07:34:01 UTC
+--- headless/lib/browser/policy/headless_browser_policy_connector.cc.orig 2023-07-24 14:27:53 UTC
+++ headless/lib/browser/policy/headless_browser_policy_connector.cc
-@@ -150,8 +150,10 @@ HeadlessBrowserPolicyConnector::CreatePlatformProvider
+@@ -155,8 +155,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 3cda241c017e..69d39faba21b 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 2023-04-22 17:45:15 UTC
+--- headless/lib/headless_content_main_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ headless/lib/headless_content_main_delegate.cc
-@@ -327,7 +327,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(
command_line.GetSwitchValuePath(switches::kCrashDumpsDir));
diff --git a/www/iridium/files/patch-ipc_ipc__message__utils.cc b/www/iridium/files/patch-ipc_ipc__message__utils.cc
index 6bf264f19ffe..97a87f8377b4 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-10-05 07:34:01 UTC
+--- ipc/ipc_message_utils.cc.orig 2023-07-24 14:27:53 UTC
+++ ipc/ipc_message_utils.cc
-@@ -359,7 +359,7 @@ void ParamTraits<unsigned int>::Log(const param_type&
+@@ -360,7 +360,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 85ec005c6867..ffc16e17242b 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 2023-04-22 17:45:15 UTC
+--- media/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ media/BUILD.gn
-@@ -88,6 +88,9 @@ config("media_config") {
+@@ -87,6 +87,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 aaa5e7572142..c83ee65d0834 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 2023-04-22 17:45:15 UTC
+--- media/audio/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ media/audio/BUILD.gn
-@@ -266,9 +266,20 @@ source_set("audio") {
+@@ -279,9 +279,20 @@ source_set("audio") {
]
}
diff --git a/www/iridium/files/patch-media_audio_audio__input__device.cc b/www/iridium/files/patch-media_audio_audio__input__device.cc
index b383cbb4d3ad..bc1baee9b121 100644
--- a/www/iridium/files/patch-media_audio_audio__input__device.cc
+++ b/www/iridium/files/patch-media_audio_audio__input__device.cc
@@ -1,6 +1,6 @@
---- media/audio/audio_input_device.cc.orig 2022-03-28 18:11:04 UTC
+--- media/audio/audio_input_device.cc.orig 2023-07-24 14:27:53 UTC
+++ media/audio/audio_input_device.cc
-@@ -259,7 +259,7 @@ void AudioInputDevice::OnStreamCreated(
+@@ -262,7 +262,7 @@ void AudioInputDevice::OnStreamCreated(
// here. See comments in AliveChecker and PowerObserverHelper for details and
// todos.
if (detect_dead_stream_ == DeadStreamDetection::kEnabled) {
diff --git a/www/iridium/files/patch-media_audio_sndio_sndio__input.cc b/www/iridium/files/patch-media_audio_sndio_sndio__input.cc
index 3cae690b0c41..e99b1c8a19bf 100644
--- a/www/iridium/files/patch-media_audio_sndio_sndio__input.cc
+++ b/www/iridium/files/patch-media_audio_sndio_sndio__input.cc
@@ -1,4 +1,4 @@
---- media/audio/sndio/sndio_input.cc.orig 2023-03-13 07:33:08 UTC
+--- media/audio/sndio/sndio_input.cc.orig 2023-07-24 14:27:53 UTC
+++ media/audio/sndio/sndio_input.cc
@@ -0,0 +1,200 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
@@ -196,7 +196,7 @@
+
+
+ // invoke callback
-+ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1.);
++ callback->OnData(audio_bus.get(), base::TimeTicks::Now() - delay, 1., {});
+ }
+}
+
diff --git a/www/iridium/files/patch-media_base_media__switches.cc b/www/iridium/files/patch-media_base_media__switches.cc
index d68b4fba4442..6b421eb525b7 100644
--- a/www/iridium/files/patch-media_base_media__switches.cc
+++ b/www/iridium/files/patch-media_base_media__switches.cc
@@ -1,7 +1,7 @@
---- media/base/media_switches.cc.orig 2023-04-22 17:45:15 UTC
+--- media/base/media_switches.cc.orig 2023-07-24 14:27:53 UTC
+++ media/base/media_switches.cc
-@@ -12,7 +12,7 @@
- #include "components/system_media_controls/linux/buildflags/buildflags.h"
+@@ -15,7 +15,7 @@
+ #include "gpu/config/gpu_finch_features.h"
#include "media/media_buildflags.h"
-#if BUILDFLAG(IS_LINUX)
@@ -9,7 +9,7 @@
#include "base/cpu.h"
#endif
-@@ -586,7 +586,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
+@@ -636,7 +636,7 @@ BASE_FEATURE(kFallbackAfterDecodeError,
// Show toolbar button that opens dialog for controlling media sessions.
BASE_FEATURE(kGlobalMediaControls,
"GlobalMediaControls",
@@ -18,7 +18,16 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -634,7 +634,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
+@@ -659,7 +659,7 @@ BASE_FEATURE(kGlobalMediaControlsCrOSUpdatedUI,
+ // If enabled, users can request Media Remoting without fullscreen-in-tab.
+ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
+ "MediaRemotingWithoutFullscreen",
+-#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
+@@ -671,7 +671,7 @@ BASE_FEATURE(kMediaRemotingWithoutFullscreen,
BASE_FEATURE(kGlobalMediaControlsPictureInPicture,
"GlobalMediaControlsPictureInPicture",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +36,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -678,7 +678,7 @@ BASE_FEATURE(kUnifiedAutoplay,
+@@ -715,7 +715,7 @@ BASE_FEATURE(kUnifiedAutoplay,
"UnifiedAutoplay",
base::FEATURE_ENABLED_BY_DEFAULT);
@@ -36,17 +45,9 @@
// Enable vaapi video decoding on linux. This is already enabled by default on
// chromeos, but needs an experiment on linux.
BASE_FEATURE(kVaapiVideoDecodeLinux,
-@@ -1198,14 +1198,14 @@ BASE_FEATURE(kAllowClearDolbyVisionInMseWhenPlatformEn
- base::FEATURE_DISABLED_BY_DEFAULT);
- #endif
-
--#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{
+@@ -1269,7 +1269,7 @@ const base::Feature MEDIA_EXPORT kUseOutOfProcessVideo
"UseOutOfProcessVideoDecoding", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
-#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_base_media__switches.h b/www/iridium/files/patch-media_base_media__switches.h
index 930f087e7d33..092bd9913fe9 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 2023-04-22 17:45:15 UTC
+--- media/base/media_switches.h.orig 2023-07-24 14:27:53 UTC
+++ media/base/media_switches.h
-@@ -277,7 +277,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor
+@@ -290,7 +290,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseDecoderStreamFor
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseFakeDeviceForMediaStream);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseMediaHistoryStore);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseR16Texture);
@@ -9,14 +9,9 @@
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinux);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoDecodeLinuxGL);
MEDIA_EXPORT BASE_DECLARE_FEATURE(kVaapiVideoEncodeLinux);
-@@ -396,11 +396,11 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(
- kAllowClearDolbyVisionInMseWhenPlatformEncryptedDvEnabled);
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -423,7 +423,7 @@ MEDIA_EXPORT BASE_DECLARE_FEATURE(kExposeOutOfProcessV
MEDIA_EXPORT BASE_DECLARE_FEATURE(kUseOutOfProcessVideoDecoding);
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ #endif // BUILDFLAG(ALLOW_OOP_VIDEO_DECODER)
-#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_base_video__frame.cc b/www/iridium/files/patch-media_base_video__frame.cc
index 4a0d3219008c..0a0100ef7f3a 100644
--- a/www/iridium/files/patch-media_base_video__frame.cc
+++ b/www/iridium/files/patch-media_base_video__frame.cc
@@ -1,4 +1,4 @@
---- media/base/video_frame.cc.orig 2023-04-22 17:45:15 UTC
+--- media/base/video_frame.cc.orig 2023-07-24 14:27:53 UTC
+++ media/base/video_frame.cc
@@ -80,7 +80,7 @@ std::string VideoFrame::StorageTypeToString(
return "OWNED_MEMORY";
@@ -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 &&
-@@ -307,7 +307,7 @@ static absl::optional<VideoFrameLayout> GetDefaultLayo
+@@ -306,7 +306,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
-@@ -636,7 +636,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -635,7 +635,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() ||
-@@ -682,7 +682,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
+@@ -681,7 +681,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalGpuM
return frame;
}
@@ -45,7 +45,7 @@
// static
scoped_refptr<VideoFrame> VideoFrame::WrapExternalDmabufs(
const VideoFrameLayout& layout,
-@@ -902,7 +902,7 @@ scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame(
+@@ -901,7 +901,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_;
-@@ -1302,7 +1302,7 @@ const gpu::MailboxHolder& VideoFrame::mailbox_holder(
+@@ -1303,7 +1303,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);
-@@ -1415,7 +1415,7 @@ VideoFrame::VideoFrame(const VideoFrameLayout& layout,
+@@ -1416,7 +1416,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 77af08971178..4a3d5149dbc5 100644
--- a/www/iridium/files/patch-media_base_video__frame.h
+++ b/www/iridium/files/patch-media_base_video__frame.h
@@ -1,8 +1,8 @@
---- media/base/video_frame.h.orig 2023-04-22 17:45:15 UTC
+--- media/base/video_frame.h.orig 2023-07-24 14:27:53 UTC
+++ media/base/video_frame.h
@@ -44,7 +44,7 @@
#include "base/mac/scoped_cftyperef.h"
- #endif // BUILDFLAG(IS_MAC)
+ #endif // BUILDFLAG(IS_APPLE)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
@@ -18,7 +18,7 @@
// TODO(mcasas): Consider turning this type into STORAGE_NATIVE
// based on the idea of using this same enum value for both DMA
// buffers on Linux and CVPixelBuffers on Mac (which currently use
-@@ -308,7 +308,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -316,7 +316,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
ReleaseMailboxAndGpuMemoryBufferCB mailbox_holder_and_gmb_release_cb,
base::TimeDelta timestamp);
@@ -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
-@@ -809,7 +809,7 @@ class MEDIA_EXPORT VideoFrame : public base::RefCounte
+@@ -814,7 +814,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 8040a66c02a0..7406259ce41f 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 2023-04-22 17:45:15 UTC
+--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ media/capture/video/linux/fake_v4l2_impl.cc
-@@ -486,7 +486,7 @@ int FakeV4L2Impl::close(int fd) {
+@@ -487,7 +487,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 f9dc32801d67..0e360cd01f2c 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 2023-05-20 17:39:08 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.cc.orig 2023-07-24 14:27:53 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>
-@@ -29,10 +31,12 @@
+@@ -28,10 +30,12 @@
using media::mojom::MeteringMode;
@@ -24,7 +24,16 @@
// TODO(aleksandar.stojiljkovic): Wrap this with kernel version check once the
// format is introduced to kernel.
-@@ -728,7 +732,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate
+@@ -255,7 +259,7 @@ bool V4L2CaptureDelegate::IsBlockedControl(int control
+ // static
+ bool V4L2CaptureDelegate::IsControllableControl(
+ int control_id,
+- const base::RepeatingCallback<int(int, void*)>& do_ioctl) {
++ const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl) {
+ const int special_control_id = GetControllingSpecialControl(control_id);
+ if (!special_control_id) {
+ // The control is not controlled by a special control thus the control is
+@@ -772,7 +776,7 @@ base::WeakPtr<V4L2CaptureDelegate> V4L2CaptureDelegate
V4L2CaptureDelegate::~V4L2CaptureDelegate() = default;
@@ -33,7 +42,7 @@
int num_retries = 0;
for (; DoIoctl(request, argp) < 0 && num_retries < kMaxIOCtrlRetries;
++num_retries) {
-@@ -738,7 +742,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
+@@ -782,7 +786,7 @@ bool V4L2CaptureDelegate::RunIoctl(int request, void*
return num_retries != kMaxIOCtrlRetries;
}
@@ -42,7 +51,7 @@
return HANDLE_EINTR(v4l2_->ioctl(device_fd_.get(), request, argp));
}
-@@ -778,6 +782,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
+@@ -793,6 +797,7 @@ bool V4L2CaptureDelegate::IsControllableControl(int co
}
void V4L2CaptureDelegate::ReplaceControlEventSubscriptions() {
@@ -50,7 +59,7 @@
constexpr uint32_t kControlIds[] = {V4L2_CID_AUTO_EXPOSURE_BIAS,
V4L2_CID_AUTO_WHITE_BALANCE,
V4L2_CID_BRIGHTNESS,
-@@ -805,6 +810,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
+@@ -820,6 +825,7 @@ void V4L2CaptureDelegate::ReplaceControlEventSubscript
<< ", {type = V4L2_EVENT_CTRL, id = " << control_id << "}";
}
}
@@ -58,7 +67,7 @@
}
mojom::RangePtr V4L2CaptureDelegate::RetrieveUserControlRange(int control_id) {
-@@ -985,7 +991,11 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1000,7 +1006,11 @@ void V4L2CaptureDelegate::DoCapture() {
pollfd device_pfd = {};
device_pfd.fd = device_fd_.get();
@@ -70,7 +79,7 @@
const int result =
HANDLE_EINTR(v4l2_->poll(&device_pfd, 1, kCaptureTimeoutMs));
-@@ -1023,6 +1033,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1038,6 +1048,7 @@ void V4L2CaptureDelegate::DoCapture() {
timeout_count_ = 0;
}
@@ -78,7 +87,7 @@
// Dequeue events if the driver has filled in some.
if (device_pfd.revents & POLLPRI) {
bool controls_changed = false;
-@@ -1057,6 +1068,7 @@ void V4L2CaptureDelegate::DoCapture() {
+@@ -1072,6 +1083,7 @@ void V4L2CaptureDelegate::DoCapture() {
client_->OnCaptureConfigurationChanged();
}
}
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 17eae3eb5647..54a07e8b9acb 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,15 @@
---- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-04-22 17:45:15 UTC
+--- media/capture/video/linux/v4l2_capture_delegate.h.orig 2023-07-24 14:27:53 UTC
+++ media/capture/video/linux/v4l2_capture_delegate.h
-@@ -87,10 +87,10 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+@@ -81,7 +81,7 @@ class CAPTURE_EXPORT V4L2CaptureDelegate final {
+ static bool IsBlockedControl(int control_id);
+ static bool IsControllableControl(
+ int control_id,
+- const base::RepeatingCallback<int(int, void*)>& do_ioctl);
++ const base::RepeatingCallback<int(unsigned int, void*)>& do_ioctl);
+
+ private:
+ friend class V4L2CaptureDelegateTest;
+@@ -92,10 +92,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_linux_video__capture__device__factory__v4l2.cc b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
index 843744079951..ca77175e971c 100644
--- a/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
+++ b/www/iridium/files/patch-media_capture_video_linux_video__capture__device__factory__v4l2.cc
@@ -1,10 +1,10 @@
---- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2023-04-22 17:45:15 UTC
+--- media/capture/video/linux/video_capture_device_factory_v4l2.cc.orig 2023-07-24 14:27:53 UTC
+++ media/capture/video/linux/video_capture_device_factory_v4l2.cc
@@ -75,6 +75,9 @@ class DevVideoFilePathsDeviceProvider
: public VideoCaptureDeviceFactoryV4L2::DeviceProvider {
public:
void GetDeviceIds(std::vector<std::string>* target_container) override {
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
+ target_container->emplace_back("/dev/video");
+#else
const base::FilePath path("/dev/");
@@ -18,7 +18,7 @@
}
std::string GetDeviceModelId(const std::string& device_id) override {
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
+ return std::string();
+#endif
const std::string file_name = ExtractFileNameFromDeviceId(device_id);
@@ -28,7 +28,7 @@
}
std::string GetDeviceDisplayName(const std::string& device_id) override {
-+#if defined(OS_OPENBSD)
++#if BUILDFLAG(IS_OPENBSD)
+ return std::string();
+#endif
const std::string file_name = ExtractFileNameFromDeviceId(device_id);
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 da31c0a6ba3b..930e1d0b3061 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,11 +1,11 @@
---- media/capture/video/video_capture_device_client.cc.orig 2023-04-22 17:45:15 UTC
+--- media/capture/video/video_capture_device_client.cc.orig 2023-07-24 14:27:53 UTC
+++ media/capture/video/video_capture_device_client.cc
-@@ -322,7 +322,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
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- fourcc_format = libyuv::FOURCC_RAW;
- #elif BUILDFLAG(IS_WIN)
- fourcc_format = libyuv::FOURCC_24BG;
+@@ -149,7 +149,7 @@ FourccAndFlip GetFourccAndFlipFromPixelFormat(
+ CHECK(!is_width_odd && !is_height_odd);
+ return {libyuv::FOURCC_UYVY};
+ case media::PIXEL_FORMAT_RGB24:
+- if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) {
++ if constexpr (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) {
+ // Linux RGB24 defines red at lowest byte address,
+ // see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
+ return {libyuv::FOURCC_RAW};
diff --git a/www/iridium/files/patch-media_gpu_buffer__validation.cc b/www/iridium/files/patch-media_gpu_buffer__validation.cc
index 6fb16d0add9d..29d1698211ce 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-10-05 07:34:01 UTC
+--- media/gpu/buffer_validation.cc.orig 2023-07-24 14:27:53 UTC
+++ media/gpu/buffer_validation.cc
@@ -15,7 +15,7 @@
#include "ui/gfx/geometry/size.h"
@@ -18,7 +18,7 @@
if (fd < 0) {
VLOG(1) << "Invalid file descriptor";
return false;
-@@ -73,7 +73,7 @@ bool VerifyGpuMemoryBufferHandle(
+@@ -76,7 +76,7 @@ bool VerifyGpuMemoryBufferHandle(
VLOG(1) << "Unsupported: " << pixel_format;
return false;
}
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 5cabfa04d81f..5eeb95a48fc4 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,15 +1,6 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-04-22 17:45:15 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2023-07-24 14:27:53 UTC
+++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -213,7 +213,7 @@ std::unique_ptr<VideoDecoder> VideoDecoderPipeline::Cr
- #if BUILDFLAG(USE_VAAPI)
- create_decoder_function_cb = base::BindOnce(&VaapiVideoDecoder::Create);
- #elif BUILDFLAG(USE_V4L2_CODEC) && \
-- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH))
-+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD))
- create_decoder_function_cb = base::BindOnce(&V4L2VideoDecoder::Create);
- #else
- return nullptr;
-@@ -860,14 +860,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -979,14 +979,14 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
}
}
@@ -26,7 +17,7 @@
// Linux w/ V4L2 should not use a custom allocator
// Only tested with video_decode_accelerator_tests
// TODO(wenst@) Test with full Chromium Browser
-@@ -997,7 +997,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -1117,7 +1117,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
<< " VideoFrames";
auxiliary_frame_pool_->set_parent_task_runner(decoder_task_runner_);
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 d366f41da4f9..8806ce3f61f1 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 2023-03-13 07:33:08 UTC
+--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2023-07-24 14:27:53 UTC
+++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -121,7 +121,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+@@ -122,7 +122,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
index 040dd117c0f5..c9aa0777c55e 100644
--- 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
@@ -1,4 +1,4 @@
---- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-03-13 07:33:08 UTC
+--- media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc.orig 2023-07-24 14:27:53 UTC
+++ media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.cc
@@ -15,7 +15,9 @@
#include "media/gpu/vaapi/vaapi_wrapper.h"
@@ -18,15 +18,15 @@
void AllowAccessToRenderNodes(std::vector<BrokerFilePermission>& permissions,
bool include_sys_dev_char,
bool read_write) {
-@@ -160,6 +163,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
- return false;
+@@ -165,6 +168,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
+ NOTREACHED_NORETURN();
#endif // BUILDFLAG(USE_V4L2_CODEC)
}
+#endif
} // namespace
-@@ -175,6 +179,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
+@@ -180,6 +184,7 @@ bool HardwareVideoDecodingPreSandboxHookForV4L2(
// (at least).
bool HardwareVideoDecodingPreSandboxHook(
sandbox::policy::SandboxLinux::Options options) {
@@ -34,7 +34,7 @@
using HardwareVideoDecodingProcessPolicy =
sandbox::policy::HardwareVideoDecodingProcessPolicy;
using PolicyType =
-@@ -212,6 +217,7 @@ bool HardwareVideoDecodingPreSandboxHook(
+@@ -217,6 +222,7 @@ bool HardwareVideoDecodingPreSandboxHook(
sandbox::policy::SandboxLinux::GetInstance()->StartBrokerProcess(
command_set, permissions, sandbox::policy::SandboxLinux::PreSandboxHook(),
options);
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
index 1ad46033c602..32d4cb373f76 100644
--- 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
@@ -1,4 +1,4 @@
---- 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.orig 2023-07-24 14:27:53 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_
@@ -7,7 +7,7 @@
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#else
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
index e74ba7f9e93c..5c67cb74ec07 100644
--- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.cc
@@ -1,4 +1,4 @@
---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-01-17 19:19:00 UTC
+--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc.orig 2023-07-24 14:27:53 UTC
+++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.cc
@@ -18,12 +18,15 @@
#include "media/gpu/v4l2/v4l2_device.h"
@@ -16,7 +16,7 @@
sandbox::syscall_broker::BrokerCommandSet command_set;
std::vector<BrokerFilePermission> permissions;
-@@ -125,8 +128,8 @@ bool HardwareVideoEncodingPreSandboxHook(
+@@ -134,7 +137,7 @@ bool HardwareVideoEncodingPreSandboxHook(
#endif // defined(__aarch64__)
}
#endif
@@ -25,6 +25,3 @@
return true;
}
--} // namespace media
-\ No newline at end of file
-+} // namespace media
diff --git a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
index 6c975cf27eed..a2a6fa501157 100644
--- a/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-media_gpu_sandbox_hardware__video__encoding__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig 2023-01-17 19:19:00 UTC
+--- media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h.orig 2023-07-24 14:27:53 UTC
+++ media/gpu/sandbox/hardware_video_encoding_sandbox_hook_linux.h
@@ -5,7 +5,13 @@
#ifndef MEDIA_GPU_SANDBOX_HARDWARE_VIDEO_ENCODING_SANDBOX_HOOK_LINUX_H_
@@ -7,7 +7,7 @@
+#include "build/build_config.h"
+
+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#else
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
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 1e8de3acf2e6..2038a6847c35 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 2023-04-22 17:45:15 UTC
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2023-07-24 14:27:53 UTC
+++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -769,7 +769,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -776,7 +776,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 ace03a49dda4..0eb83bdd8ac0 100644
--- a/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/iridium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,8 +1,8 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-03-13 07:33:08 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2023-07-24 14:27:53 UTC
+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -755,7 +755,7 @@ VADisplayState::VADisplayState()
- bool VADisplayState::Initialize() {
- base::AutoLock auto_lock(va_lock_);
+@@ -1609,7 +1609,7 @@ VADisplayStateHandle VADisplayStateSingleton::GetHandl
+ return {};
+ }
-#if BUILDFLAG(IS_OZONE) && BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
diff --git a/www/iridium/files/patch-media_media__options.gni b/www/iridium/files/patch-media_media__options.gni
index 221da209c855..7f055860fc31 100644
--- a/www/iridium/files/patch-media_media__options.gni
+++ b/www/iridium/files/patch-media_media__options.gni
@@ -1,6 +1,6 @@
---- media/media_options.gni.orig 2023-04-22 17:45:15 UTC
+--- media/media_options.gni.orig 2023-07-24 14:27:53 UTC
+++ media/media_options.gni
-@@ -188,12 +188,15 @@ declare_args() {
+@@ -177,12 +177,15 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
use_alsa = false
@@ -17,7 +17,7 @@
(!is_castos || (target_cpu == "x86" || target_cpu == "x64") ||
is_cast_audio_only)) {
use_alsa = true
-@@ -209,6 +212,10 @@ declare_args() {
+@@ -198,6 +201,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
index 0b3758bdaa82..30966e9b2837 100644
--- 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
@@ -1,15 +1,6 @@
---- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-04-22 17:45:15 UTC
+--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc.orig 2023-07-24 14:27:53 UTC
+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.cc
-@@ -39,7 +39,7 @@ gfx::GpuMemoryBufferHandle GetVideoFrameGpuMemoryBuffe
- 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
-@@ -751,7 +751,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
+@@ -724,7 +724,7 @@ const gfx::GpuMemoryBufferId& StructTraits<
return input.id;
}
@@ -18,7 +9,7 @@
// static
gfx::NativePixmapHandle StructTraits<
media::stable::mojom::NativeGpuMemoryBufferHandleDataView,
-@@ -772,7 +772,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
+@@ -745,7 +745,7 @@ bool StructTraits<media::stable::mojom::NativeGpuMemor
output->type = gfx::NATIVE_PIXMAP;
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
index 50418d82938a..74618aa0f8cb 100644
--- 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
@@ -1,6 +1,6 @@
---- 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.orig 2023-07-24 14:27:53 UTC
+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -695,7 +695,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
+@@ -678,7 +678,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
static const gfx::GpuMemoryBufferId& id(
const gfx::GpuMemoryBufferHandle& input);
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 8e8020e9628a..c41aff3e010a 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 2023-03-13 07:33:08 UTC
+--- media/video/gpu_memory_buffer_video_frame_pool.cc.orig 2023-07-24 14:27:53 UTC
+++ media/video/gpu_memory_buffer_video_frame_pool.cc
-@@ -727,7 +727,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
+@@ -728,7 +728,7 @@ void GpuMemoryBufferVideoFramePool::PoolImpl::CreateHa
}
bool is_software_backed_video_frame = !video_frame->HasTextures();
@@ -9,7 +9,7 @@
is_software_backed_video_frame &= !video_frame->HasDmaBufs();
#endif
-@@ -1158,7 +1158,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1181,7 +1181,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
is_webgpu_compatible = (gpu_memory_buffer != nullptr);
#endif
@@ -18,7 +18,7 @@
is_webgpu_compatible = (gpu_memory_buffer != nullptr);
if (is_webgpu_compatible) {
is_webgpu_compatible &=
-@@ -1177,7 +1177,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
+@@ -1200,7 +1200,7 @@ scoped_refptr<VideoFrame> GpuMemoryBufferVideoFramePoo
gpu::SHARED_IMAGE_USAGE_DISPLAY_READ |
gpu::SHARED_IMAGE_USAGE_SCANOUT;
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 3f08dd2d7e29..6fff09ce65cc 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,4 +1,4 @@
---- media/video/video_encode_accelerator_adapter.cc.orig 2023-04-22 17:45:15 UTC
+--- media/video/video_encode_accelerator_adapter.cc.orig 2023-07-24 14:27:53 UTC
+++ media/video/video_encode_accelerator_adapter.cc
@@ -140,7 +140,7 @@ VideoEncodeAccelerator::Config SetUpVeaConfig(
if (is_rgb)
@@ -9,7 +9,7 @@
if (format != PIXEL_FORMAT_I420 ||
!VideoFrame::IsStorageTypeMappable(storage_type)) {
// ChromeOS/Linux hardware video encoders supports I420 on-memory
-@@ -465,7 +465,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
+@@ -473,7 +473,7 @@ void VideoEncodeAcceleratorAdapter::InitializeInternal
SetUpVeaConfig(profile_, options_, format, first_frame->storage_type(),
supported_rc_modes_, required_encoder_type_);
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 909def1cb191..b1d2f58f3c4a 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 2023-03-13 07:33:08 UTC
+--- media/video/video_encode_accelerator_adapter_test.cc.orig 2023-07-24 14:27:53 UTC
+++ media/video/video_encode_accelerator_adapter_test.cc
-@@ -449,7 +449,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
+@@ -458,7 +458,7 @@ TEST_P(VideoEncodeAcceleratorAdapterTest, TwoFramesRes
CreateGreenFrame(large_size, pixel_format, base::Milliseconds(2));
VideoPixelFormat expected_input_format = PIXEL_FORMAT_I420;
diff --git a/www/iridium/files/patch-mojo_core_BUILD.gn b/www/iridium/files/patch-mojo_core_BUILD.gn
index f573a876be4d..59ff648b3685 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 2023-03-13 07:33:08 UTC
+--- mojo/core/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ mojo/core/BUILD.gn
-@@ -164,7 +164,7 @@ template("core_impl_source_set") {
+@@ -166,7 +166,7 @@ template("core_impl_source_set") {
]
}
diff --git a/www/iridium/files/patch-mojo_core_embedder_features.h b/www/iridium/files/patch-mojo_core_embedder_features.h
index 36dec2fd3010..a87a5a809ca9 100644
--- a/www/iridium/files/patch-mojo_core_embedder_features.h
+++ b/www/iridium/files/patch-mojo_core_embedder_features.h
@@ -1,9 +1,9 @@
---- mojo/core/embedder/features.h.orig 2022-12-06 08:09:13 UTC
+--- mojo/core/embedder/features.h.orig 2023-07-24 14:27:53 UTC
+++ mojo/core/embedder/features.h
-@@ -14,7 +14,7 @@ namespace mojo {
- namespace core {
+@@ -16,7 +16,7 @@ namespace core {
- #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_MAC)
+ #if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_NACL) && \
+ !BUILDFLAG(MOJO_USE_APPLE_CHANNEL)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
COMPONENT_EXPORT(MOJO_CORE_EMBEDDER_FEATURES)
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 58e7798b5436..16faae2c83ac 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 2023-04-22 17:45:15 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig 2023-07-24 14:27:53 UTC
+++ mojo/public/tools/bindings/mojom.gni
-@@ -723,6 +723,16 @@ template("mojom") {
+@@ -744,6 +744,16 @@ template("mojom") {
enabled_features += [ "is_apple" ]
}
diff --git a/www/iridium/files/patch-net_BUILD.gn b/www/iridium/files/patch-net_BUILD.gn
index abfdd6d8e293..5cbac0eddd92 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 2023-04-22 17:45:15 UTC
+--- net/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ net/BUILD.gn
-@@ -104,7 +104,7 @@ net_configs = [
+@@ -107,7 +107,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
]
@@ -9,12 +9,16 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1217,6 +1217,15 @@ component("net") {
+@@ -1231,6 +1231,19 @@ component("net") {
deps += [ "//third_party/xdg_shared_mime_info" ]
}
+ if (is_bsd) {
+ sources -= [
++ "base/address_map_cache_linux.cc",
++ "base/address_map_cache_linux.h",
++ "base/address_map_linux.cc",
++ "base/address_map_linux.h",
+ "base/address_tracker_linux.cc",
+ "base/address_tracker_linux.h",
+ "base/network_change_notifier_linux.cc",
@@ -25,16 +29,7 @@
if (is_mac) {
sources += [
"base/network_notification_thread_mac.cc",
-@@ -1349,7 +1358,7 @@ component("net") {
- }
- }
-
-- 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",
-@@ -1382,7 +1391,7 @@ component("net") {
+@@ -1387,7 +1400,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
@@ -43,8 +38,8 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -2826,7 +2835,7 @@ test("net_unittests") {
- sources += [ "proxy_resolution/proxy_config_service_linux_unittest.cc" ]
+@@ -2856,7 +2869,7 @@ test("net_unittests") {
+ ]
}
- if (is_linux || is_chromeos) {
@@ -52,7 +47,7 @@
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
-@@ -2898,6 +2907,10 @@ test("net_unittests") {
+@@ -2924,6 +2937,10 @@ test("net_unittests") {
"//url:buildflags",
]
@@ -63,7 +58,7 @@
if (enable_websockets) {
deps += [ "//net/server:tests" ]
}
-@@ -2965,7 +2978,7 @@ test("net_unittests") {
+@@ -3006,7 +3023,7 @@ test("net_unittests") {
]
}
@@ -72,7 +67,7 @@
sources += [ "tools/quic/quic_simple_server_test.cc" ]
}
-@@ -3090,7 +3103,7 @@ test("net_unittests") {
+@@ -3142,7 +3159,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 8ad5e75000fc..7f4f176adda6 100644
--- a/www/iridium/files/patch-net_base_network__change__notifier.cc
+++ b/www/iridium/files/patch-net_base_network__change__notifier.cc
@@ -1,4 +1,4 @@
---- net/base/network_change_notifier.cc.orig 2023-03-13 07:33:08 UTC
+--- net/base/network_change_notifier.cc.orig 2023-07-24 14:27:53 UTC
+++ net/base/network_change_notifier.cc
@@ -37,7 +37,7 @@
#include "net/base/network_change_notifier_linux.h"
@@ -6,10 +6,10 @@
#include "net/base/network_change_notifier_mac.h"
-#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"
+ #include "net/base/network_change_notifier_passive.h"
#elif BUILDFLAG(IS_FUCHSIA)
#include "net/base/network_change_notifier_fuchsia.h"
-@@ -327,6 +327,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+@@ -329,6 +329,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
#elif BUILDFLAG(IS_FUCHSIA)
return std::make_unique<NetworkChangeNotifierFuchsia>(
/*require_wlan=*/false);
diff --git a/www/iridium/files/patch-net_base_network__change__notifier__posix.cc b/www/iridium/files/patch-net_base_network__change__notifier__passive.cc
index dbc5944ffe9e..208742f00ff2 100644
--- a/www/iridium/files/patch-net_base_network__change__notifier__posix.cc
+++ b/www/iridium/files/patch-net_base_network__change__notifier__passive.cc
@@ -1,8 +1,8 @@
---- net/base/network_change_notifier_posix.cc.orig 2022-10-05 07:34:01 UTC
-+++ net/base/network_change_notifier_posix.cc
-@@ -92,7 +92,7 @@ void NetworkChangeNotifierPosix::GetCurrentMaxBandwidt
+--- net/base/network_change_notifier_passive.cc.orig 2023-07-24 14:27:53 UTC
++++ net/base/network_change_notifier_passive.cc
+@@ -107,7 +107,7 @@ NetworkChangeNotifierPassive::GetAddressMapOwnerIntern
NetworkChangeNotifier::NetworkChangeCalculatorParams
- NetworkChangeNotifierPosix::NetworkChangeCalculatorParamsPosix() {
+ NetworkChangeNotifierPassive::NetworkChangeCalculatorParamsPassive() {
NetworkChangeCalculatorParams params;
-#if BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
diff --git a/www/iridium/files/patch-net_cert_cert__verifier.cc b/www/iridium/files/patch-net_cert_cert__verifier.cc
index 9bf266da41ca..c27fbc65a1a4 100644
--- a/www/iridium/files/patch-net_cert_cert__verifier.cc
+++ b/www/iridium/files/patch-net_cert_cert__verifier.cc
@@ -1,11 +1,11 @@
---- net/cert/cert_verifier.cc.orig 2022-12-06 08:09:13 UTC
+--- net/cert/cert_verifier.cc.orig 2023-07-24 14:27:53 UTC
+++ net/cert/cert_verifier.cc
-@@ -87,7 +87,7 @@ std::unique_ptr<CertVerifier> CertVerifier::CreateDefa
- }
- #endif
- if (!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 =
- CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher));
+@@ -40,7 +40,7 @@ class DefaultCertVerifyProcFactory : public net::CertV
+ return CertVerifyProc::CreateBuiltinWithChromeRootStore(
+ std::move(cert_net_fetcher), impl_params.crl_set,
+ base::OptionalToPtr(impl_params.root_store_data));
+-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ return CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher),
+ impl_params.crl_set);
#else
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 d6a251d450a2..e38b2879e272 100644
--- a/www/iridium/files/patch-net_cert_cert__verify__proc.cc
+++ b/www/iridium/files/patch-net_cert_cert__verify__proc.cc
@@ -1,11 +1,11 @@
---- net/cert/cert_verify_proc.cc.orig 2023-04-22 17:45:15 UTC
+--- net/cert/cert_verify_proc.cc.orig 2023-07-24 14:27:53 UTC
+++ net/cert/cert_verify_proc.cc
-@@ -414,7 +414,7 @@ base::Value CertVerifyParams(X509Certificate* cert,
+@@ -409,7 +409,7 @@ base::Value::Dict CertVerifyParams(
} // namespace
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
// static
scoped_refptr<CertVerifyProc> CertVerifyProc::CreateSystemVerifyProc(
- scoped_refptr<CertNetFetcher> cert_net_fetcher) {
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 d45ffc852842..4c294c6e10f2 100644
--- a/www/iridium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/iridium/files/patch-net_cert_cert__verify__proc.h
@@ -1,11 +1,11 @@
---- net/cert/cert_verify_proc.h.orig 2023-04-22 17:45:15 UTC
+--- net/cert/cert_verify_proc.h.orig 2023-07-24 14:27:53 UTC
+++ net/cert/cert_verify_proc.h
-@@ -68,7 +68,7 @@ class NET_EXPORT CertVerifyProc
+@@ -75,7 +75,7 @@ class NET_EXPORT CertVerifyProc
kMaxValue = kChainLengthOne
};
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
// Creates and returns a CertVerifyProc that uses the system verifier.
// |cert_net_fetcher| may not be used, depending on the implementation.
- static scoped_refptr<CertVerifyProc> CreateSystemVerifyProc(
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 cec933612389..9658aae247bf 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,11 +1,20 @@
---- net/cert/cert_verify_proc_unittest.cc.orig 2023-03-13 07:33:08 UTC
+--- net/cert/cert_verify_proc_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ net/cert/cert_verify_proc_unittest.cc
-@@ -270,7 +270,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier
- #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED)
- CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS
+@@ -214,7 +214,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc(
+ case CERT_VERIFY_PROC_IOS:
+ return base::MakeRefCounted<CertVerifyProcIOS>(std::move(crl_set));
#endif
+-#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ case CERT_VERIFY_PROC_BUILTIN:
+ return CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher),
+ std::move(crl_set),
+@@ -243,7 +243,7 @@ constexpr CertVerifyProcType kAllCertVerifiers[] = {
+ CERT_VERIFY_PROC_ANDROID,
+ #elif BUILDFLAG(IS_IOS)
+ CERT_VERIFY_PROC_IOS,
-#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
- #else
- #error Unsupported platform
+ CERT_VERIFY_PROC_BUILTIN,
+ #endif
+ #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED)
diff --git a/www/iridium/files/patch-net_cert_test__root__certs__unittest.cc b/www/iridium/files/patch-net_cert_test__root__certs__unittest.cc
index c46a0fd9902e..2f80743dd644 100644
--- a/www/iridium/files/patch-net_cert_test__root__certs__unittest.cc
+++ b/www/iridium/files/patch-net_cert_test__root__certs__unittest.cc
@@ -1,11 +1,11 @@
---- net/cert/test_root_certs_unittest.cc.orig 2022-12-06 08:09:13 UTC
+--- net/cert/test_root_certs_unittest.cc.orig 2023-07-24 14:27:53 UTC
+++ net/cert/test_root_certs_unittest.cc
-@@ -39,7 +39,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc() {
- /*cert_net_fetcher=*/nullptr);
- }
- #endif
--#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- return CertVerifyProc::CreateBuiltinVerifyProc(/*cert_net_fetcher=*/nullptr);
+@@ -46,7 +46,7 @@ scoped_refptr<CertVerifyProc> CreateCertVerifyProc() {
+ return CertVerifyProc::CreateBuiltinWithChromeRootStore(
+ /*cert_net_fetcher=*/nullptr, CRLSet::BuiltinCRLSet().get(),
+ /*root_store_data=*/nullptr);
+-#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#elif BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ return CertVerifyProc::CreateBuiltinVerifyProc(/*cert_net_fetcher=*/nullptr,
+ CRLSet::BuiltinCRLSet().get());
#else
- return CertVerifyProc::CreateSystemVerifyProc(/*cert_net_fetcher=*/nullptr);
diff --git a/www/iridium/files/patch-net_dns_address__sorter__posix.cc b/www/iridium/files/patch-net_dns_address__sorter__posix.cc
index 962477539236..4416a63d9bee 100644
--- a/www/iridium/files/patch-net_dns_address__sorter__posix.cc
+++ b/www/iridium/files/patch-net_dns_address__sorter__posix.cc
@@ -1,10 +1,10 @@
---- net/dns/address_sorter_posix.cc.orig 2022-04-01 07:48:30 UTC
+--- net/dns/address_sorter_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ net/dns/address_sorter_posix.cc
-@@ -18,6 +18,7 @@
- #include <ifaddrs.h>
- #include <net/if.h>
+@@ -27,6 +27,7 @@
+ #include "net/dns/netinet_in_var_ios.h"
+ #else
#include <netinet/in_var.h>
+#include <netinet6/in6_var.h>
- #include <string.h>
- #include <sys/ioctl.h>
+ #endif // BUILDFLAG(IS_IOS)
#endif
+
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 04a9ea1d2dfd..b4a3a657e6e3 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-10-05 07:34:01 UTC
+--- net/http/http_auth_gssapi_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ net/http/http_auth_gssapi_posix.cc
-@@ -368,8 +368,9 @@ base::NativeLibrary GSSAPISharedLibrary::LoadSharedLib
+@@ -370,8 +370,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_proxy__resolution_proxy__config__service__linux.cc b/www/iridium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 01657b2266fe..5f6739c44e93 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,10 +1,10 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-01-17 19:19:00 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2023-07-24 14:27:53 UTC
+++ net/proxy_resolution/proxy_config_service_linux.cc
@@ -6,7 +6,9 @@
#include <errno.h>
#include <limits.h>
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
#include <sys/inotify.h>
+#endif
#include <unistd.h>
@@ -14,7 +14,7 @@
}
#endif // defined(USE_GIO)
-+#if !defined(OS_BSD)
++#if !BUILDFLAG(IS_BSD)
// 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) {
@@ -26,11 +26,11 @@
} // namespace
-@@ -1248,9 +1252,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
- case base::nix::DESKTOP_ENVIRONMENT_KDE3:
+@@ -1249,9 +1253,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
case base::nix::DESKTOP_ENVIRONMENT_KDE4:
case base::nix::DESKTOP_ENVIRONMENT_KDE5:
-+#if !defined(OS_BSD)
+ case base::nix::DESKTOP_ENVIRONMENT_KDE6:
++#if !BUILDFLAG(IS_BSD)
setting_getter_ =
std::make_unique<SettingGetterImplKDE>(env_var_getter_.get());
break;
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 39437443af31..89076610c68e 100644
--- a/www/iridium/files/patch-net_socket_tcp__socket__posix.cc
+++ b/www/iridium/files/patch-net_socket_tcp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/tcp_socket_posix.cc.orig 2023-04-22 17:45:15 UTC
+--- net/socket/tcp_socket_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ net/socket/tcp_socket_posix.cc
-@@ -99,6 +99,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
+@@ -98,6 +98,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
return false;
}
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 87add5451236..398900c1e175 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 2023-04-22 17:45:15 UTC
+--- net/socket/udp_socket_posix.cc.orig 2023-07-24 14:27:53 UTC
+++ net/socket/udp_socket_posix.cc
-@@ -577,7 +577,7 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -591,7 +591,7 @@ int UDPSocketPosix::SetDoNotFragment() {
}
void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -9,7 +9,7 @@
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
-@@ -598,7 +598,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -612,7 +612,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
int value = broadcast ? 1 : 0;
int rv;
@@ -18,7 +18,7 @@
// SO_REUSEPORT on OSX permits multiple processes to each receive
// UDP multicast or broadcast datagrams destined for the bound
// port.
-@@ -911,7 +911,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
+@@ -925,7 +925,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
#if BUILDFLAG(IS_CHROMEOS_ASH)
if (last_error == EINVAL)
return ERR_ADDRESS_IN_USE;
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 be1c6e637332..9ae338f0c187 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-10-05 07:34:01 UTC
+--- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2023-07-24 14:27:53 UTC
+++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
@@ -35,7 +35,7 @@
#include "net/url_request/url_request_context_builder.h"
@@ -18,12 +18,12 @@
// On Linux, use a fixed ProxyConfigService, since the default one
// depends on glib.
//
-@@ -127,7 +127,7 @@ class CertVerifyImpl {
+@@ -126,7 +126,7 @@ class CertVerifyImpl {
std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName(
base::StringPiece impl_name,
scoped_refptr<net::CertNetFetcher> cert_net_fetcher) {
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD))
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
if (impl_name == "platform") {
return std::make_unique<CertVerifyImpl>(
- "CertVerifyProc (system)", net::CertVerifyProc::CreateSystemVerifyProc(
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 d318732cbd29..4fe9cdf99b92 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 2023-03-13 07:33:08 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2023-07-24 14:27:53 UTC
+++ net/tools/cert_verify_tool/cert_verify_tool.cc
@@ -31,7 +31,7 @@
#include "net/url_request/url_request_context_builder.h"
@@ -18,21 +18,21 @@
// On Linux, use a fixed ProxyConfigService, since the default one
// depends on glib.
//
-@@ -222,7 +222,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
- base::StringPiece impl_name,
+@@ -223,7 +223,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
scoped_refptr<net::CertNetFetcher> cert_net_fetcher,
+ scoped_refptr<net::CRLSet> crl_set,
RootStoreType root_store_type) {
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
if (impl_name == "platform") {
if (root_store_type != RootStoreType::kSystem) {
- std::cerr << "WARNING: platform verifier not supported with "
-@@ -534,7 +534,7 @@ int main(int argc, char** argv) {
+@@ -537,7 +537,7 @@ int main(int argc, char** argv) {
std::string impls_str = command_line.GetSwitchValueASCII("impls");
if (impls_str.empty()) {
// Default value.
--#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
-+#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
+-#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || \
++#if !(BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(CHROME_ROOT_STORE_ONLY))
impls_str = "platform,";
#endif
- impls_str += "builtin,pathbuilder";
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 6d337fe241f8..073f6d28c224 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,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig 2022-12-01 10:35:46 UTC
+--- net/url_request/url_request_context_builder.cc.orig 2023-07-24 14:27:53 UTC
+++ net/url_request/url_request_context_builder.cc
-@@ -443,7 +443,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -444,7 +444,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
}
if (!proxy_resolution_service_) {
diff --git a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
index 2679c594cec5..05311dc00953 100644
--- a/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
+++ b/www/iridium/files/patch-pdf_pdfium_pdfium__engine.cc
@@ -1,4 +1,4 @@
---- pdf/pdfium/pdfium_engine.cc.orig 2023-03-13 07:33:08 UTC
+--- pdf/pdfium/pdfium_engine.cc.orig 2023-07-24 14:27:53 UTC
+++ pdf/pdfium/pdfium_engine.cc
@@ -84,7 +84,7 @@
#include "gin/public/cppgc.h"
@@ -9,7 +9,7 @@
#include "pdf/pdfium/pdfium_font_linux.h"
#endif
-@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8, FontMappingMode fon
+@@ -526,7 +526,7 @@ void InitializeSDK(bool enable_v8,
FPDF_InitLibraryWithConfig(&config);
diff --git a/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc b/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc
index 2f26a7cf5dd1..fc5986a2291a 100644
--- a/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc
+++ b/www/iridium/files/patch-printing_backend_cups__ipp__helper.cc
@@ -1,6 +1,6 @@
---- printing/backend/cups_ipp_helper.cc.orig 2023-04-22 17:45:15 UTC
+--- printing/backend/cups_ipp_helper.cc.orig 2023-07-24 14:27:53 UTC
+++ printing/backend/cups_ipp_helper.cc
-@@ -210,7 +210,7 @@ void ExtractResolutions(const CupsOptionProvider& prin
+@@ -213,7 +213,7 @@ void ExtractResolutions(const CupsOptionProvider& prin
// Provide a default DPI if no valid DPI is found.
#if BUILDFLAG(IS_MAC)
constexpr gfx::Size kDefaultMissingDpi(kDefaultMacDpi, kDefaultMacDpi);
diff --git a/www/iridium/files/patch-printing_print__settings.cc b/www/iridium/files/patch-printing_print__settings.cc
index f1b26b51e39d..938d05778327 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 2023-04-24 20:55:01 UTC
+--- printing/print_settings.cc.orig 2023-07-24 14:27:53 UTC
+++ printing/print_settings.cc
-@@ -306,7 +306,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
+@@ -314,7 +314,7 @@ PrintSettings& PrintSettings::operator=(const PrintSet
#endif
is_modifiable_ = settings.is_modifiable_;
pages_per_sheet_ = settings.pages_per_sheet_;
@@ -9,7 +9,25 @@
for (const auto& item : settings.advanced_settings_)
advanced_settings_.emplace(item.first, item.second.Clone());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -348,7 +348,7 @@ void PrintSettings::Clear() {
+@@ -341,7 +341,7 @@ bool PrintSettings::operator==(const PrintSettings& ot
+ #endif
+ is_modifiable_, requested_custom_margins_in_points_,
+ pages_per_sheet_
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ ,
+ advanced_settings_
+ #endif
+@@ -366,7 +366,7 @@ bool PrintSettings::operator==(const PrintSettings& ot
+ other.is_modifiable_,
+ other.requested_custom_margins_in_points_,
+ other.pages_per_sheet_
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ ,
+ other.advanced_settings_
+ #endif
+@@ -405,7 +405,7 @@ void PrintSettings::Clear() {
#endif
is_modifiable_ = true;
pages_per_sheet_ = 1;
diff --git a/www/iridium/files/patch-printing_print__settings.h b/www/iridium/files/patch-printing_print__settings.h
index 1b677a577621..b678ca78a8fd 100644
--- a/www/iridium/files/patch-printing_print__settings.h
+++ b/www/iridium/files/patch-printing_print__settings.h
@@ -1,4 +1,4 @@
---- printing/print_settings.h.orig 2023-04-22 17:45:15 UTC
+--- printing/print_settings.h.orig 2023-07-24 14:27:53 UTC
+++ printing/print_settings.h
@@ -21,7 +21,7 @@
#include "ui/gfx/geometry/rect.h"
@@ -18,7 +18,7 @@
using AdvancedSettings = std::map<std::string, base::Value>;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -241,7 +241,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -246,7 +246,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
pages_per_sheet_ = pages_per_sheet;
}
@@ -27,7 +27,7 @@
AdvancedSettings& advanced_settings() { return advanced_settings_; }
const AdvancedSettings& advanced_settings() const {
return advanced_settings_;
-@@ -372,7 +372,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
+@@ -377,7 +377,7 @@ class COMPONENT_EXPORT(PRINTING) PrintSettings {
// Number of pages per sheet.
int pages_per_sheet_;
diff --git a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
index 907ed504611c..cc8b0c6fb09c 100644
--- a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.cc
@@ -1,6 +1,6 @@
---- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2023-03-13 07:33:08 UTC
+--- printing/sandbox/print_backend_sandbox_hook_linux.cc.orig 2023-07-24 14:27:53 UTC
+++ printing/sandbox/print_backend_sandbox_hook_linux.cc
-@@ -10,21 +10,28 @@
+@@ -10,20 +10,27 @@
#include "base/path_service.h"
#include "build/build_config.h"
#include "printing/buildflags/buildflags.h"
@@ -9,9 +9,8 @@
#include "sandbox/linux/syscall_broker/broker_file_permission.h"
#include "sandbox/policy/export.h"
#include "sandbox/policy/linux/sandbox_linux.h"
- #include "services/network/network_sandbox_hook_linux.h"
+#else
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#endif
#if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS)
@@ -29,7 +28,7 @@
namespace {
sandbox::syscall_broker::BrokerCommandSet GetPrintBackendBrokerCommandSet() {
-@@ -85,9 +92,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP
+@@ -76,9 +83,11 @@ std::vector<BrokerFilePermission> GetPrintBackendFileP
}
} // namespace
@@ -41,7 +40,7 @@
#if BUILDFLAG(IS_CHROMEOS) && BUILDFLAG(USE_CUPS)
// Create the socket connections to the CUPS server before engaging the
// sandbox, since new connections cannot be made after that.
-@@ -101,6 +110,7 @@ bool PrintBackendPreSandboxHook(
+@@ -92,6 +101,7 @@ bool PrintBackendPreSandboxHook(
sandbox::policy::SandboxLinux::PreSandboxHook(), options);
instance->EngageNamespaceSandboxIfPossible();
diff --git a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
index d2a95cfc11ff..5b1613fc92c8 100644
--- a/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-printing_sandbox_print__backend__sandbox__hook__linux.h
@@ -1,4 +1,4 @@
---- printing/sandbox/print_backend_sandbox_hook_linux.h.orig 2022-03-28 18:11:04 UTC
+--- printing/sandbox/print_backend_sandbox_hook_linux.h.orig 2023-07-24 14:27:53 UTC
+++ printing/sandbox/print_backend_sandbox_hook_linux.h
@@ -5,8 +5,13 @@
#ifndef PRINTING_SANDBOX_PRINT_BACKEND_SANDBOX_HOOK_LINUX_H_
@@ -7,7 +7,7 @@
+#include "build/build_config.h"
#include "base/component_export.h"
+#if defined(OS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#else
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
diff --git a/www/iridium/files/patch-remoting_base_mojo__util.cc b/www/iridium/files/patch-remoting_base_mojo__util.cc
new file mode 100644
index 000000000000..32150731f3fe
--- /dev/null
+++ b/www/iridium/files/patch-remoting_base_mojo__util.cc
@@ -0,0 +1,11 @@
+--- remoting/base/mojo_util.cc.orig 2023-07-24 14:27:53 UTC
++++ remoting/base/mojo_util.cc
+@@ -12,7 +12,7 @@ namespace remoting {
+
+ void InitializeMojo(const mojo::core::Configuration& config) {
+ mojo::core::Configuration new_config = config;
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ // MojoIpcz has only been tested and verified on Linux. The Windows
+ // multi-process architecture doesn't support MojoIpcz yet.
+ new_config.disable_ipcz = true;
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 4c59206204a3..6511b8aa82c9 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-10-05 07:34:01 UTC
+--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2023-07-24 14:27:53 UTC
+++ remoting/codec/webrtc_video_encoder_vpx.cc
-@@ -89,7 +89,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
+@@ -88,7 +88,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
const webrtc::DesktopSize& size) {
SetCommonCodecParameters(config, size);
diff --git a/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc b/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc
index ed8f57e89032..8049eeee0af6 100644
--- a/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc
+++ b/www/iridium/files/patch-remoting_host_basic__desktop__environment.cc
@@ -1,6 +1,6 @@
---- remoting/host/basic_desktop_environment.cc.orig 2023-03-13 07:33:08 UTC
+--- remoting/host/basic_desktop_environment.cc.orig 2023-07-24 14:27:53 UTC
+++ remoting/host/basic_desktop_environment.cc
-@@ -182,7 +182,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() {
+@@ -188,7 +188,7 @@ BasicDesktopEnvironment::CreateVideoCapturer() {
scoped_refptr<base::SingleThreadTaskRunner> capture_task_runner;
#if BUILDFLAG(IS_CHROMEOS_ASH)
capture_task_runner = ui_task_runner_;
diff --git a/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc b/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc
index 2bb61f94a16a..8c2029718d75 100644
--- a/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc
+++ b/www/iridium/files/patch-remoting_host_chromoting__host__services__client.cc
@@ -1,6 +1,6 @@
---- remoting/host/chromoting_host_services_client.cc.orig 2023-03-13 07:33:08 UTC
+--- remoting/host/chromoting_host_services_client.cc.orig 2023-07-24 14:27:53 UTC
+++ remoting/host/chromoting_host_services_client.cc
-@@ -51,7 +51,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con
+@@ -65,7 +65,7 @@ mojo::PendingRemote<mojom::ChromotingHostServices> Con
} // namespace
@@ -9,7 +9,7 @@
// static
constexpr char
-@@ -129,7 +129,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic
+@@ -144,7 +144,7 @@ bool ChromotingHostServicesClient::EnsureSessionServic
if (session_services_remote_.is_bound()) {
return true;
}
diff --git a/www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc b/www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc
index 33d64124ed9d..6a0fb1de70ca 100644
--- a/www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc
+++ b/www/iridium/files/patch-remoting_host_desktop__capturer__wrapper.cc
@@ -1,4 +1,4 @@
---- remoting/host/desktop_capturer_wrapper.cc.orig 2023-04-22 17:45:15 UTC
+--- remoting/host/desktop_capturer_wrapper.cc.orig 2023-07-24 14:27:53 UTC
+++ remoting/host/desktop_capturer_wrapper.cc
@@ -13,7 +13,7 @@
#include "third_party/webrtc/modules/desktop_capture/desktop_capturer.h"
@@ -6,10 +6,19 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "remoting/host/linux/wayland_desktop_capturer.h"
#include "remoting/host/linux/wayland_utils.h"
#endif
+@@ -32,7 +32,7 @@ void DesktopCapturerWrapper::CreateCapturer(
+ const webrtc::DesktopCaptureOptions& options) {
+ DCHECK(!capturer_);
-@@ -100,7 +100,7 @@ void DesktopCapturerWrapper::OnCaptureResult(
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (IsRunningWayland()) {
+ capturer_ = std::make_unique<WaylandDesktopCapturer>(options);
+ } else {
+@@ -109,7 +109,7 @@ void DesktopCapturerWrapper::OnCaptureResult(
bool DesktopCapturerWrapper::SupportsFrameCallbacks() {
DCHECK_CALLED_ON_VALID_THREAD(thread_checker_);
diff --git a/www/iridium/files/patch-remoting_host_host__attributes.cc b/www/iridium/files/patch-remoting_host_host__attributes.cc
index e46fd5ab75ce..ffddc137f5ac 100644
--- a/www/iridium/files/patch-remoting_host_host__attributes.cc
+++ b/www/iridium/files/patch-remoting_host_host__attributes.cc
@@ -1,7 +1,7 @@
---- remoting/host/host_attributes.cc.orig 2023-03-13 07:33:08 UTC
+--- remoting/host/host_attributes.cc.orig 2023-07-24 14:27:53 UTC
+++ remoting/host/host_attributes.cc
-@@ -108,7 +108,7 @@ std::string GetHostAttributes() {
- media::InitializeMediaFoundation()) {
+@@ -105,7 +105,7 @@ std::string GetHostAttributes() {
+ if (media::InitializeMediaFoundation()) {
result.push_back("HWEncoder");
}
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
diff --git a/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc b/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc
index 1044537975da..48ad9115d988 100644
--- a/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc
+++ b/www/iridium/files/patch-remoting_host_it2me_it2me__host.cc
@@ -1,6 +1,6 @@
---- remoting/host/it2me/it2me_host.cc.orig 2023-03-13 07:33:08 UTC
+--- remoting/host/it2me/it2me_host.cc.orig 2023-07-24 14:27:53 UTC
+++ remoting/host/it2me/it2me_host.cc
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
#include "remoting/signaling/signaling_id_util.h"
#include "services/network/public/cpp/shared_url_loader_factory.h"
@@ -9,7 +9,7 @@
#include "remoting/host/linux/wayland_manager.h"
#include "remoting/host/linux/wayland_utils.h"
#endif // BUILDFLAG(IS_LINUX)
-@@ -144,7 +144,7 @@ void It2MeHost::Connect(
+@@ -111,7 +111,7 @@ void It2MeHost::Connect(
OnPolicyUpdate(std::move(policies));
@@ -18,7 +18,7 @@
if (IsRunningWayland()) {
WaylandManager::Get()->Init(host_context_->ui_task_runner());
}
-@@ -283,7 +283,7 @@ void It2MeHost::ConnectOnNetworkThread(
+@@ -251,7 +251,7 @@ void It2MeHost::ConnectOnNetworkThread(
// Set up the desktop environment options.
DesktopEnvironmentOptions options(DesktopEnvironmentOptions::CreateDefault());
diff --git a/www/iridium/files/patch-remoting_host_policy__watcher.cc b/www/iridium/files/patch-remoting_host_policy__watcher.cc
index 02f9e7521d49..b4c22be30c8d 100644
--- a/www/iridium/files/patch-remoting_host_policy__watcher.cc
+++ b/www/iridium/files/patch-remoting_host_policy__watcher.cc
@@ -1,9 +1,9 @@
---- remoting/host/policy_watcher.cc.orig 2022-12-01 10:35:46 UTC
+--- remoting/host/policy_watcher.cc.orig 2023-07-24 14:27:53 UTC
+++ remoting/host/policy_watcher.cc
-@@ -179,7 +179,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies()
- result.Set(key::kRemoteAccessHostUdpPortRange, "");
- result.Set(key::kRemoteAccessHostClipboardSizeBytes, -1);
- result.Set(key::kRemoteAccessHostAllowRemoteSupportConnections, true);
+@@ -183,7 +183,7 @@ base::Value::Dict PolicyWatcher::GetDefaultPolicies()
+ result.Set(key::kRemoteAccessHostAllowEnterpriseRemoteSupportConnections,
+ true);
+ #endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
result.Set(key::kRemoteAccessHostMatchUsername, false);
diff --git a/www/iridium/files/patch-sandbox_linux_BUILD.gn b/www/iridium/files/patch-sandbox_linux_BUILD.gn
index e9e825f590b0..c32fb03bba57 100644
--- a/www/iridium/files/patch-sandbox_linux_BUILD.gn
+++ b/www/iridium/files/patch-sandbox_linux_BUILD.gn
@@ -1,4 +1,4 @@
---- sandbox/linux/BUILD.gn.orig 2023-03-13 07:33:08 UTC
+--- sandbox/linux/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ sandbox/linux/BUILD.gn
@@ -12,11 +12,11 @@ if (is_android) {
}
@@ -15,7 +15,7 @@
# On Android, use plain GTest.
use_base_test_suite = is_linux || is_chromeos
-@@ -379,6 +379,17 @@ component("sandbox_services") {
+@@ -380,6 +380,17 @@ component("sandbox_services") {
"services/libc_interceptor.h",
]
}
diff --git a/www/iridium/files/patch-sandbox_policy_features.cc b/www/iridium/files/patch-sandbox_policy_features.cc
index 600c63d80cab..5f2525789e8a 100644
--- a/www/iridium/files/patch-sandbox_policy_features.cc
+++ b/www/iridium/files/patch-sandbox_policy_features.cc
@@ -1,7 +1,7 @@
---- sandbox/policy/features.cc.orig 2022-12-06 08:09:13 UTC
+--- sandbox/policy/features.cc.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/features.cc
@@ -15,7 +15,11 @@ namespace sandbox::policy::features {
- // (Only causes an effect when feature kNetworkService is enabled.)
+ // (Only causes an effect when feature kNetworkServiceInProcess is disabled.)
BASE_FEATURE(kNetworkServiceSandbox,
"NetworkServiceSandbox",
+#if BUILDFLAG(IS_BSD)
@@ -9,6 +9,6 @@
+#else
base::FEATURE_DISABLED_BY_DEFAULT);
+#endif
- #endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_FUCHSIA)
- #if BUILDFLAG(IS_WIN)
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ // Enables a fine-grained seccomp-BPF syscall filter for the network service.
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 e0d4f59859f3..98d46b8a5a62 100644
--- a/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
+++ b/www/iridium/files/patch-sandbox_policy_freebsd_sandbox__freebsd.cc
@@ -1,11 +1,11 @@
---- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2023-03-13 07:33:08 UTC
+--- sandbox/policy/freebsd/sandbox_freebsd.cc.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/freebsd/sandbox_freebsd.cc
-@@ -0,0 +1,239 @@
+@@ -0,0 +1,245 @@
+// 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.
+
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/freebsd/sandbox_freebsd.h"
+
+#include <dirent.h>
+#include <fcntl.h>
@@ -36,6 +36,8 @@
+#include "base/threading/thread.h"
+#include "base/time/time.h"
+#include "build/build_config.h"
++#include "crypto/crypto_buildflags.h"
++#include "ppapi/buildflags/buildflags.h"
+#include "sandbox/constants.h"
+#include "sandbox/linux/services/credentials.h"
+#include "sandbox/linux/services/namespace_sandbox.h"
@@ -54,22 +56,13 @@
+#include <sanitizer/common_interface_defs.h>
+#endif
+
-+#if defined(USE_NSS_CERTS)
++#if BUILDFLAG(USE_NSS_CERTS)
+#include "crypto/nss_util.h"
+#endif
+
-+#include "ui/gfx/font_util.h"
-+
-+#define MAXTOKENS 3
++#include "third_party/boringssl/src/include/openssl/crypto.h"
+
-+#define _UNVEIL_MAIN "/etc/iridium/unveil.main";
-+#define _UNVEIL_RENDERER "/etc/iridium/unveil.renderer";
-+#define _UNVEIL_GPU "/etc/iridium/unveil.gpu";
-+#define _UNVEIL_PLUGIN "/etc/iridium/unveil.plugin";
-+#define _UNVEIL_UTILITY "/etc/iridium/unveil.utility";
-+#define _UNVEIL_UTILITY_NETWORK "/etc/iridium/unveil.utility_network";
-+#define _UNVEIL_UTILITY_AUDIO "/etc/iridium/unveil.utility_audio";
-+#define _UNVEIL_UTILITY_VIDEO "/etc/iridium/unveil.utility_video";
++#include "ui/gfx/font_util.h"
+
+namespace sandbox {
+namespace policy {
@@ -112,35 +105,43 @@
+
+ base::SysInfo::AmountOfPhysicalMemory();
+ base::SysInfo::NumberOfProcessors();
++ base::SysInfo::CPUModelName();
+
-+#if defined(USE_NSS_CERTS)
-+ // The main process has to initialize the ~/.pki dir which won't work
-+ // after unveil(2).
-+ if (process_type.empty())
-+ crypto::EnsureNSSInit();
++ switch (sandbox_type) {
++ case sandbox::mojom::Sandbox::kNoSandbox:
++ {
++#if BUILDFLAG(USE_NSS_CERTS)
++ // The main process has to initialize the ~/.pki dir which won't work
++ // after unveil(2).
++ crypto::EnsureNSSInit();
+#endif
++ CRYPTO_pre_sandbox_init();
+
-+ if (process_type.empty()) {
-+ base::FilePath cache_directory, local_directory;
++ base::FilePath cache_directory, local_directory;
+
-+ base::PathService::Get(base::DIR_CACHE, &cache_directory);
-+ base::PathService::Get(base::DIR_HOME, &local_directory);
++ base::PathService::Get(base::DIR_CACHE, &cache_directory);
++ base::PathService::Get(base::DIR_HOME, &local_directory);
+
-+ cache_directory = cache_directory.AppendASCII("iridium");
-+ local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
++ cache_directory = cache_directory.AppendASCII("iridium");
++ local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
+
-+ if (!base::CreateDirectory(cache_directory)) {
-+ LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
-+ }
++ if (!base::CreateDirectory(cache_directory)) {
++ LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
++ }
+
-+ if (!base::CreateDirectory(local_directory)) {
-+ LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
++ if (!base::CreateDirectory(local_directory)) {
++ LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
++ }
++
++ break;
+ }
++ case sandbox::mojom::Sandbox::kRenderer:
++ gfx::InitializeFonts();
++ break;
++ default:
++ break;
+ }
+
-+ if (process_type == switches::kRendererProcess)
-+ gfx::InitializeFonts();
-+
+ pre_initialized_ = true;
+}
+
@@ -174,6 +175,9 @@
+ PCHECK(limited_as);
+ }
+
++ if (hook)
++ CHECK(std::move(hook).Run(options));
++
+ return true;
+}
+
@@ -217,8 +221,10 @@
+ return "Utility";
+ case sandbox::mojom::Sandbox::kGpu:
+ return "GPU";
++#if BUILDFLAG(ENABLE_PPAPI)
+ case sandbox::mojom::Sandbox::kPpapi:
+ return "PPAPI";
++#endif
+ case sandbox::mojom::Sandbox::kNetwork:
+ return "Network";
+ case sandbox::mojom::Sandbox::kCdm:
diff --git a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom
index 2af7c61356f0..c011d8ecc5c8 100644
--- a/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom
+++ b/www/iridium/files/patch-sandbox_policy_mojom_sandbox.mojom
@@ -1,8 +1,8 @@
---- sandbox/policy/mojom/sandbox.mojom.orig 2023-03-13 07:33:08 UTC
+--- sandbox/policy/mojom/sandbox.mojom.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/mojom/sandbox.mojom
-@@ -76,6 +76,12 @@ enum Sandbox {
- [EnableIf=is_win]
- kFileUtil,
+@@ -72,6 +72,12 @@ enum Sandbox {
+ [EnableIf=is_fuchsia]
+ kVideoCapture,
+ [EnableIf=is_openbsd]
+ 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 5bc9dadb682a..35912488c671 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 2023-03-13 07:33:08 UTC
+--- sandbox/policy/openbsd/sandbox_openbsd.cc.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/openbsd/sandbox_openbsd.cc
-@@ -0,0 +1,399 @@
+@@ -0,0 +1,420 @@
+// 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.
@@ -37,6 +37,8 @@
+#include "base/threading/thread.h"
+#include "base/time/time.h"
+#include "build/build_config.h"
++#include "crypto/crypto_buildflags.h"
++#include "ppapi/buildflags/buildflags.h"
+#include "sandbox/constants.h"
+#include "sandbox/linux/services/credentials.h"
+#include "sandbox/linux/services/namespace_sandbox.h"
@@ -55,7 +57,7 @@
+#include <sanitizer/common_interface_defs.h>
+#endif
+
-+#if defined(USE_NSS_CERTS)
++#if BUILDFLAG(USE_NSS_CERTS)
+#include "crypto/nss_util.h"
+#endif
+
@@ -66,10 +68,7 @@
+#define MAXTOKENS 3
+
+#define _UNVEIL_MAIN "/etc/iridium/unveil.main";
-+#define _UNVEIL_RENDERER "/etc/iridium/unveil.renderer";
+#define _UNVEIL_GPU "/etc/iridium/unveil.gpu";
-+#define _UNVEIL_PLUGIN "/etc/iridium/unveil.plugin";
-+#define _UNVEIL_UTILITY "/etc/iridium/unveil.utility";
+#define _UNVEIL_UTILITY_NETWORK "/etc/iridium/unveil.utility_network";
+#define _UNVEIL_UTILITY_AUDIO "/etc/iridium/unveil.utility_audio";
+#define _UNVEIL_UTILITY_VIDEO "/etc/iridium/unveil.utility_video";
@@ -118,40 +117,41 @@
+ base::SysInfo::NumberOfProcessors();
+ base::SysInfo::CPUModelName();
+
-+#if defined(USE_NSS_CERTS)
-+ // The main process has to initialize the ~/.pki dir which won't work
-+ // after unveil(2).
-+ if (process_type.empty())
-+ crypto::EnsureNSSInit();
++ switch (sandbox_type) {
++ case sandbox::mojom::Sandbox::kNoSandbox:
++ {
++#if BUILDFLAG(USE_NSS_CERTS)
++ // The main process has to initialize the ~/.pki dir which won't work
++ // after unveil(2).
++ crypto::EnsureNSSInit();
+#endif
++ CRYPTO_pre_sandbox_init();
+
-+ if (process_type.empty())
-+ CRYPTO_pre_sandbox_init();
++ base::FilePath cache_directory, local_directory;
+
-+ if (process_type.empty()) {
-+ base::FilePath cache_directory, local_directory;
++ base::PathService::Get(base::DIR_CACHE, &cache_directory);
++ base::PathService::Get(base::DIR_HOME, &local_directory);
+
-+ base::PathService::Get(base::DIR_CACHE, &cache_directory);
-+ base::PathService::Get(base::DIR_HOME, &local_directory);
++ cache_directory = cache_directory.AppendASCII("iridium");
++ local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
+
-+ cache_directory = cache_directory.AppendASCII("iridium");
-+ local_directory = local_directory.AppendASCII(".local").AppendASCII("share").AppendASCII("applications");
++ if (!base::CreateDirectory(cache_directory)) {
++ LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
++ }
+
-+ if (!base::CreateDirectory(cache_directory)) {
-+ LOG(ERROR) << "Failed to create " << cache_directory.value() << " directory.";
-+ }
++ if (!base::CreateDirectory(local_directory)) {
++ LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
++ }
+
-+ if (!base::CreateDirectory(local_directory)) {
-+ LOG(ERROR) << "Failed to create " << local_directory.value() << " directory.";
++ break;
+ }
++ case sandbox::mojom::Sandbox::kRenderer:
++ gfx::InitializeFonts();
++ break;
++ default:
++ break;
+ }
+
-+ if (process_type == switches::kRendererProcess)
-+ gfx::InitializeFonts();
-+
-+ if (!command_line->HasSwitch(switches::kDisableUnveil))
-+ SetUnveil(process_type, sandbox_type);
-+
+ pre_initialized_ = true;
+}
+
@@ -164,6 +164,7 @@
+ if (pstring != NULL) {
+ if (pledge(pstring, NULL) == -1)
+ goto err;
++ VLOG(5) << "pledge " << pstring;
+ } else if (ppath != NULL) {
+ fp = fopen(ppath, "r");
+ if (fp != NULL) {
@@ -172,10 +173,11 @@
+ s[strlen(s)-1] = '\0';
+ if (pledge(s, NULL) == -1)
+ goto err;
++ VLOG(5) << "pledge " << s;
+ }
+ fclose(fp);
+ } else {
-+ LOG(ERROR) << "fopen() failed, errno: " << errno;
++ LOG(ERROR) << "fopen(" << ppath << ") failed, errno: " << errno;
+ return false;
+ }
+ }
@@ -192,24 +194,25 @@
+ const char *ufile;
+ size_t len = 0, lineno = 0;
+
-+ if (process_type.empty()) {
-+ ufile = _UNVEIL_MAIN;
-+ } else if (process_type == switches::kRendererProcess) {
-+ ufile = _UNVEIL_RENDERER;
-+ } else if (process_type == switches::kGpuProcess) {
-+ ufile = _UNVEIL_GPU;
-+ } else if (process_type == switches::kPpapiPluginProcess) {
-+ ufile = _UNVEIL_PLUGIN;
-+ } else if (process_type == switches::kUtilityProcess) {
-+ if (sandbox_type == sandbox::mojom::Sandbox::kNetwork) {
++ switch (sandbox_type) {
++ case sandbox::mojom::Sandbox::kNoSandbox:
++ ufile = _UNVEIL_MAIN;
++ break;
++ case sandbox::mojom::Sandbox::kGpu:
++ ufile = _UNVEIL_GPU;
++ break;
++ case sandbox::mojom::Sandbox::kNetwork:
+ ufile = _UNVEIL_UTILITY_NETWORK;
-+ } else if (sandbox_type == sandbox::mojom::Sandbox::kAudio) {
++ break;
++ case sandbox::mojom::Sandbox::kAudio:
+ ufile = _UNVEIL_UTILITY_AUDIO;
-+ } else if (sandbox_type == sandbox::mojom::Sandbox::kVideoCapture) {
++ break;
++ case sandbox::mojom::Sandbox::kVideoCapture:
+ ufile = _UNVEIL_UTILITY_VIDEO;
-+ } else {
-+ ufile = _UNVEIL_UTILITY;
-+ }
++ break;
++ default:
++ unveil("/dev/null", "r");
++ goto done;
+ }
+
+ fp = fopen(ufile, "r");
@@ -259,7 +262,7 @@
+ LOG(ERROR) << "failed unveiling " << path << " with permissions " << tokens[1];
+ _exit(1);
+ } else {
-+ VLOG(1) << "unveiling " << path << " with permissions " << tokens[1];
++ VLOG(5) << "unveiling " << path << " with permissions " << tokens[1];
+ }
+ }
+ fclose(fp);
@@ -268,6 +271,7 @@
+ _exit(1);
+ }
+
++done:
+ unveil_initialized_ = true;
+
+ return true;
@@ -307,31 +311,46 @@
+ PCHECK(limited_as);
+ }
+
-+ if (process_type.empty()) {
-+ // XXX use a file for listing pledges of the main process for now
-+ // XXX not having the file is not a fatal error
-+ SetPledge(NULL, "/etc/iridium/pledge.main");
-+ } else if (process_type == switches::kRendererProcess) {
-+ // prot_exec needed by v8
-+ // flock needed by sqlite3 locking
-+ SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL);
-+ } else if (process_type == switches::kGpuProcess) {
-+ SetPledge("stdio rpath flock cpath wpath getpw drm prot_exec recvfd sendfd tmppath", NULL);
-+ } else if (process_type == switches::kPpapiPluginProcess) {
-+ // prot_exec needed by v8
-+ SetPledge("stdio rpath prot_exec recvfd sendfd", NULL);
-+ } else if (process_type == switches::kUtilityProcess) {
-+ if (sandbox_type == sandbox::mojom::Sandbox::kAudio)
++ if (hook)
++ CHECK(std::move(hook).Run(options));
++
++ if (!command_line->HasSwitch(switches::kDisableUnveil))
++ SetUnveil(process_type, sandbox_type);
++
++ switch(sandbox_type) {
++ case sandbox::mojom::Sandbox::kNoSandbox:
++ SetPledge(NULL, "/etc/iridium/pledge.main");
++ break;
++ case sandbox::mojom::Sandbox::kRenderer:
++ // prot_exec needed by v8
++ // flock needed by sqlite3 locking
++ SetPledge("stdio rpath flock prot_exec recvfd sendfd ps", NULL);
++ break;
++ case sandbox::mojom::Sandbox::kGpu:
++ SetPledge("stdio drm rpath flock cpath wpath prot_exec recvfd sendfd tmppath", NULL);
++ break;
++#if BUILDFLAG(ENABLE_PPAPI)
++ case sandbox::mojom::Sandbox::kPpapi:
++ // prot_exec needed by v8
++ SetPledge("stdio rpath prot_exec recvfd sendfd", NULL);
++ break;
++#endif
++ case sandbox::mojom::Sandbox::kAudio:
+ SetPledge(NULL, "/etc/iridium/pledge.utility_audio");
-+ else if (sandbox_type == sandbox::mojom::Sandbox::kNetwork)
++ break;
++ case sandbox::mojom::Sandbox::kNetwork:
+ SetPledge(NULL, "/etc/iridium/pledge.utility_network");
-+ else if (sandbox_type == sandbox::mojom::Sandbox::kVideoCapture)
++ break;
++ case sandbox::mojom::Sandbox::kVideoCapture:
+ SetPledge(NULL, "/etc/iridium/pledge.utility_video");
-+ else
++ break;
++ case sandbox::mojom::Sandbox::kUtility:
++ case sandbox::mojom::Sandbox::kService:
+ SetPledge("stdio rpath cpath wpath fattr flock sendfd recvfd prot_exec", NULL);
-+ } else {
-+ LOG(ERROR) << "non-pledge()'d process: " << process_type;
-+ return false;
++ break;
++ default:
++ LOG(ERROR) << "non-pledge()'d process: " << GetSandboxTypeInEnglish(sandbox_type);
++ break;
+ }
+
+ return true;
@@ -377,8 +396,10 @@
+ return "Utility";
+ case sandbox::mojom::Sandbox::kGpu:
+ return "GPU";
++#if BUILDFLAG(ENABLE_PPAPI)
+ case sandbox::mojom::Sandbox::kPpapi:
+ return "PPAPI";
++#endif
+ case sandbox::mojom::Sandbox::kNetwork:
+ return "Network";
+ case sandbox::mojom::Sandbox::kCdm:
diff --git a/www/iridium/files/patch-sandbox_policy_sandbox.cc b/www/iridium/files/patch-sandbox_policy_sandbox.cc
index a776021ae2de..9bf0081f297a 100644
--- a/www/iridium/files/patch-sandbox_policy_sandbox.cc
+++ b/www/iridium/files/patch-sandbox_policy_sandbox.cc
@@ -1,11 +1,11 @@
---- sandbox/policy/sandbox.cc.orig 2022-12-06 08:09:13 UTC
+--- sandbox/policy/sandbox.cc.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/sandbox.cc
@@ -18,6 +18,10 @@
#include "sandbox/policy/linux/sandbox_linux.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#endif // BUILDFLAG(IS_BSD)
+
#if BUILDFLAG(IS_MAC)
diff --git a/www/iridium/files/patch-sandbox_policy_sandbox.h b/www/iridium/files/patch-sandbox_policy_sandbox.h
index 0cd20c977346..de22b8126668 100644
--- a/www/iridium/files/patch-sandbox_policy_sandbox.h
+++ b/www/iridium/files/patch-sandbox_policy_sandbox.h
@@ -1,17 +1,19 @@
---- sandbox/policy/sandbox.h.orig 2022-03-28 18:11:04 UTC
+--- sandbox/policy/sandbox.h.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/sandbox.h
-@@ -12,6 +12,10 @@
+@@ -12,6 +12,12 @@
#include "sandbox/policy/linux/sandbox_linux.h"
#endif
-+#if BUILDFLAG(IS_BSD)
++#if BUILDFLAG(IS_OPENBSD)
+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
-+#endif
++#elif BUILDFLAG(IS_FREEBSD)
++#include "sandbox/policy/freebsd/sandbox_freebsd.h"
++#endif
+
namespace sandbox {
namespace mojom {
enum class Sandbox;
-@@ -32,7 +36,7 @@ namespace policy {
+@@ -32,7 +38,7 @@ namespace policy {
class SANDBOX_POLICY_EXPORT Sandbox {
public:
diff --git a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc
index 8d8a543a8e40..8576b0992e4a 100644
--- a/www/iridium/files/patch-sandbox_policy_sandbox__type.cc
+++ b/www/iridium/files/patch-sandbox_policy_sandbox__type.cc
@@ -1,6 +1,6 @@
---- sandbox/policy/sandbox_type.cc.orig 2023-03-13 07:33:08 UTC
+--- sandbox/policy/sandbox_type.cc.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/sandbox_type.cc
-@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -38,7 +38,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
#endif
case Sandbox::kAudio:
return false;
@@ -9,7 +9,7 @@
case Sandbox::kVideoCapture:
return false;
#endif
-@@ -62,7 +62,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -61,7 +61,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
case Sandbox::kMirroring:
case Sandbox::kNaClLoader:
#endif
@@ -18,7 +18,7 @@
case Sandbox::kHardwareVideoDecoding:
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -72,7 +72,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
+@@ -71,7 +71,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
case Sandbox::kLibassistant:
#endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
#endif // // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -27,7 +27,7 @@
case Sandbox::kZygoteIntermediateSandbox:
case Sandbox::kHardwareVideoEncoding:
#endif
-@@ -128,7 +128,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
#endif
case Sandbox::kPrintCompositor:
case Sandbox::kAudio:
@@ -36,9 +36,9 @@
case Sandbox::kVideoCapture:
#endif
#if BUILDFLAG(IS_WIN)
-@@ -140,10 +140,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -138,10 +138,10 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+ case Sandbox::kMediaFoundationCdm:
case Sandbox::kWindowsSystemProxyResolver:
- case Sandbox::kFileUtil:
#endif // BUILDFLAG(IS_WIN)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
@@ -49,7 +49,7 @@
case Sandbox::kHardwareVideoEncoding:
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -171,7 +171,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -169,7 +169,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
case Sandbox::kNaClLoader:
break;
#endif // BUILDFLAG(IS_MAC)
@@ -58,7 +58,7 @@
case Sandbox::kZygoteIntermediateSandbox:
break;
#endif
-@@ -218,7 +218,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine(
+@@ -216,7 +216,7 @@ sandbox::mojom::Sandbox SandboxTypeFromCommandLine(
if (process_type == switches::kNaClBrokerProcess)
return Sandbox::kNoSandbox;
@@ -67,7 +67,7 @@
// Intermediate process gains a sandbox later.
if (process_type == switches::kZygoteProcessType)
return Sandbox::kZygoteIntermediateSandbox;
-@@ -262,7 +262,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -260,7 +260,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
return switches::kUtilitySandbox;
case Sandbox::kAudio:
return switches::kAudioSandbox;
@@ -76,7 +76,7 @@
case Sandbox::kVideoCapture:
return switches::kVideoCaptureSandbox;
#endif
-@@ -292,11 +292,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -290,11 +290,11 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
case Sandbox::kMirroring:
return switches::kMirroringSandbox;
#endif
@@ -90,7 +90,7 @@
case Sandbox::kHardwareVideoEncoding:
return switches::kHardwareVideoEncodingSandbox;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -320,7 +320,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -314,7 +314,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
#if BUILDFLAG(IS_MAC)
case Sandbox::kNaClLoader:
#endif // BUILDFLAG(IS_MAC)
@@ -99,7 +99,7 @@
case Sandbox::kZygoteIntermediateSandbox:
#endif
NOTREACHED();
-@@ -391,11 +391,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
+@@ -382,11 +382,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
if (sandbox_string == switches::kScreenAISandbox)
return Sandbox::kScreenAI;
#endif
diff --git a/www/iridium/files/patch-sandbox_policy_switches.cc b/www/iridium/files/patch-sandbox_policy_switches.cc
index 8a0cadb3b54a..74e2b41e66df 100644
--- a/www/iridium/files/patch-sandbox_policy_switches.cc
+++ b/www/iridium/files/patch-sandbox_policy_switches.cc
@@ -1,6 +1,6 @@
---- sandbox/policy/switches.cc.orig 2023-03-13 07:33:08 UTC
+--- sandbox/policy/switches.cc.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/switches.cc
-@@ -54,10 +54,10 @@ const char kFileUtilSandbox[] = "file_util";
+@@ -53,10 +53,10 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro
const char kMirroringSandbox[] = "mirroring";
#endif // BUILDFLAG(IS_MAC)
@@ -13,7 +13,7 @@
const char kHardwareVideoEncodingSandbox[] = "hardware_video_encoding";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -104,7 +104,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
+@@ -95,7 +95,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 dba28a46aba9..37adc6432ae0 100644
--- a/www/iridium/files/patch-sandbox_policy_switches.h
+++ b/www/iridium/files/patch-sandbox_policy_switches.h
@@ -1,6 +1,6 @@
---- sandbox/policy/switches.h.orig 2023-03-13 07:33:08 UTC
+--- sandbox/policy/switches.h.orig 2023-07-24 14:27:53 UTC
+++ sandbox/policy/switches.h
-@@ -57,10 +57,10 @@ SANDBOX_POLICY_EXPORT extern const char kFileUtilSandb
+@@ -56,10 +56,10 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem
SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[];
#endif // BUILDFLAG(IS_MAC)
@@ -13,7 +13,7 @@
SANDBOX_POLICY_EXPORT extern const char kHardwareVideoEncodingSandbox[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -82,7 +82,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
+@@ -80,7 +80,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_audio_audio__sandbox__hook__linux.h b/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.h
index 5253c6a72f74..9ba7b18628c2 100644
--- a/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-services_audio_audio__sandbox__hook__linux.h
@@ -1,11 +1,11 @@
---- services/audio/audio_sandbox_hook_linux.h.orig 2022-03-28 18:11:04 UTC
+--- services/audio/audio_sandbox_hook_linux.h.orig 2023-07-24 14:27:53 UTC
+++ services/audio/audio_sandbox_hook_linux.h
@@ -5,7 +5,11 @@
#ifndef SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_
#define SERVICES_AUDIO_AUDIO_SANDBOX_HOOK_LINUX_H_
+#if defined(OS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#include "sandbox/policy/sandbox.h"
+#else
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
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 3747a9415afa..14dc3d0e3a14 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,6 +1,6 @@
---- services/cert_verifier/cert_verifier_creation.cc.orig 2023-04-22 17:45:15 UTC
+--- services/cert_verifier/cert_verifier_creation.cc.orig 2023-07-24 14:27:53 UTC
+++ services/cert_verifier/cert_verifier_creation.cc
-@@ -12,7 +12,7 @@
+@@ -14,7 +14,7 @@
#include "net/cert_net/cert_net_fetcher_url_request.h"
#include "net/net_buildflags.h"
@@ -9,16 +9,16 @@
#include "net/cert/cert_verify_proc_builtin.h"
#include "net/cert/internal/system_trust_store.h"
#endif
-@@ -89,7 +89,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce
+@@ -113,7 +113,7 @@ class CertVerifyProcFactoryImpl : public net::CertVeri
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
-@@ -226,6 +226,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
+ return net::CreateCertVerifyProcBuiltin(std::move(cert_net_fetcher),
+ std::move(crl_set),
+ net::CreateSslSystemTrustStore());
+@@ -213,6 +213,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
bool IsUsingCertNetFetcher() {
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
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
index 294c56c9b941..ef70ec0f83cc 100644
--- a/www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc
+++ b/www/iridium/files/patch-services_device_compute__pressure_cpu__probe.cc
@@ -1,8 +1,8 @@
---- services/device/compute_pressure/cpu_probe.cc.orig 2022-12-06 08:09:13 UTC
+--- services/device/compute_pressure/cpu_probe.cc.orig 2023-07-24 14:27:53 UTC
+++ services/device/compute_pressure/cpu_probe.cc
-@@ -29,6 +29,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create() {
+@@ -44,6 +44,7 @@ std::unique_ptr<CpuProbe> CpuProbe::Create(
#elif BUILDFLAG(IS_MAC)
- return CpuProbeMac::Create();
+ return CpuProbeMac::Create(sampling_interval, std::move(sampling_callback));
#else
+ NOTIMPLEMENTED();
return nullptr;
diff --git a/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc b/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc
index 1ecb2c80167c..723169f1ba16 100644
--- a/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc
+++ b/www/iridium/files/patch-services_device_geolocation_location__arbitrator.cc
@@ -1,6 +1,6 @@
---- services/device/geolocation/location_arbitrator.cc.orig 2023-03-13 07:33:08 UTC
+--- services/device/geolocation/location_arbitrator.cc.orig 2023-07-24 14:27:53 UTC
+++ services/device/geolocation/location_arbitrator.cc
-@@ -159,7 +159,7 @@ LocationArbitrator::NewNetworkLocationProvider(
+@@ -162,7 +162,7 @@ LocationArbitrator::NewNetworkLocationProvider(
std::unique_ptr<LocationProvider>
LocationArbitrator::NewSystemLocationProvider() {
diff --git a/www/iridium/files/patch-services_device_hid_BUILD.gn b/www/iridium/files/patch-services_device_hid_BUILD.gn
index d145bb408443..783069789850 100644
--- a/www/iridium/files/patch-services_device_hid_BUILD.gn
+++ b/www/iridium/files/patch-services_device_hid_BUILD.gn
@@ -1,6 +1,6 @@
---- services/device/hid/BUILD.gn.orig 2022-12-01 10:35:46 UTC
+--- services/device/hid/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ services/device/hid/BUILD.gn
-@@ -35,7 +35,26 @@ source_set("hid") {
+@@ -34,7 +34,26 @@ source_set("hid") {
"//services/device/public/mojom",
]
diff --git a/www/iridium/files/patch-services_device_public_mojom_BUILD.gn b/www/iridium/files/patch-services_device_public_mojom_BUILD.gn
index 0e4c4463165f..54bc412e77a2 100644
--- a/www/iridium/files/patch-services_device_public_mojom_BUILD.gn
+++ b/www/iridium/files/patch-services_device_public_mojom_BUILD.gn
@@ -1,7 +1,7 @@
---- services/device/public/mojom/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+--- services/device/public/mojom/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ services/device/public/mojom/BUILD.gn
-@@ -90,7 +90,7 @@ mojom("device_service") {
- cpp_only = true
+@@ -94,7 +94,7 @@ mojom("device_service") {
+ enable_js_fuzzing = false
enabled_features = []
- if ((is_linux || is_chromeos) && use_udev) {
diff --git a/www/iridium/files/patch-services_network_BUILD.gn b/www/iridium/files/patch-services_network_BUILD.gn
index 072f22896d5a..123ef3174c87 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 2023-04-22 17:45:15 UTC
+--- services/network/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ services/network/BUILD.gn
-@@ -338,7 +338,6 @@ if (is_linux || is_chromeos) {
+@@ -374,7 +374,6 @@ if (is_linux || is_chromeos) {
]
deps = [
"//base:base",
diff --git a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc
index e0ce7bd57ff8..a3f549ad274b 100644
--- a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc
+++ b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.cc
@@ -1,26 +1,37 @@
---- services/network/network_sandbox_hook_linux.cc.orig 2022-04-01 07:48:30 UTC
+--- services/network/network_sandbox_hook_linux.cc.orig 2023-07-24 14:27:53 UTC
+++ services/network/network_sandbox_hook_linux.cc
-@@ -26,12 +26,15 @@ sandbox::syscall_broker::BrokerCommandSet GetNetworkBr
- });
- }
+@@ -14,11 +14,14 @@
+ #include "sandbox/policy/features.h"
+ #include "third_party/abseil-cpp/absl/types/optional.h"
-+#if !defined(OS_BSD)
- std::vector<BrokerFilePermission> GetNetworkFilePermissions() {
- // TODO(tsepez): remove universal permission under filesystem root.
- return {BrokerFilePermission::ReadWriteCreateRecursive("/")};
- }
++#if !BUILDFLAG(IS_BSD)
+ using sandbox::syscall_broker::BrokerFilePermission;
+ using sandbox::syscall_broker::MakeBrokerCommandSet;
+#endif
- bool NetworkPreSandboxHook(sandbox::policy::SandboxLinux::Options options) {
-+#if !defined(OS_BSD)
- auto* instance = sandbox::policy::SandboxLinux::GetInstance();
+ namespace network {
- instance->StartBrokerProcess(
-@@ -39,6 +42,7 @@ bool NetworkPreSandboxHook(sandbox::policy::SandboxLin
- sandbox::policy::SandboxLinux::PreSandboxHook(), options);
++#if !BUILDFLAG(IS_BSD)
+ sandbox::syscall_broker::BrokerCommandSet GetNetworkBrokerCommandSet() {
+ return MakeBrokerCommandSet({
+ sandbox::syscall_broker::COMMAND_ACCESS,
+@@ -102,9 +105,11 @@ void LoadNetworkLibraries() {
+ }
+ }
+ #endif // BUILDFLAG(IS_CHROMEOS)
++#endif
- instance->EngageNamespaceSandboxIfPossible();
+ bool NetworkPreSandboxHook(std::vector<std::string> network_context_parent_dirs,
+ sandbox::policy::SandboxLinux::Options options) {
++#if !BUILDFLAG(IS_BSD)
+ #if BUILDFLAG(IS_CHROMEOS)
+ LoadNetworkLibraries();
+ #endif
+@@ -117,6 +122,7 @@ bool NetworkPreSandboxHook(std::vector<std::string> ne
+ GetNetworkBrokerCommandSet(),
+ GetNetworkFilePermissions(std::move(network_context_parent_dirs)),
+ sandbox::policy::SandboxLinux::PreSandboxHook(), options);
+#endif
+
return true;
}
-
diff --git a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.h b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.h
index b439041e4f58..11bc86da4291 100644
--- a/www/iridium/files/patch-services_network_network__sandbox__hook__linux.h
+++ b/www/iridium/files/patch-services_network_network__sandbox__hook__linux.h
@@ -1,11 +1,11 @@
---- services/network/network_sandbox_hook_linux.h.orig 2022-03-28 18:11:04 UTC
+--- services/network/network_sandbox_hook_linux.h.orig 2023-07-24 14:27:53 UTC
+++ services/network/network_sandbox_hook_linux.h
-@@ -10,7 +10,11 @@
+@@ -6,7 +6,11 @@
+ #define SERVICES_NETWORK_NETWORK_SANDBOX_HOOK_LINUX_H_
+
#include "base/component_export.h"
- #include "sandbox/linux/syscall_broker/broker_command.h"
- #include "sandbox/linux/syscall_broker/broker_file_permission.h"
-+#if defined(OS_BSD)
-+#include "sandbox/policy/openbsd/sandbox_openbsd.h"
++#if defined(__OpenBSD__) || defined(__FreeBSD__)
++#include "sandbox/policy/sandbox.h"
+#else
#include "sandbox/policy/linux/sandbox_linux.h"
+#endif
diff --git a/www/iridium/files/patch-services_network_network__service.cc b/www/iridium/files/patch-services_network_network__service.cc
index bdc0bdfbcc9a..58b919cd76a9 100644
--- a/www/iridium/files/patch-services_network_network__service.cc
+++ b/www/iridium/files/patch-services_network_network__service.cc
@@ -1,6 +1,6 @@
---- services/network/network_service.cc.orig 2023-04-22 17:45:15 UTC
+--- services/network/network_service.cc.orig 2023-07-24 14:27:53 UTC
+++ services/network/network_service.cc
-@@ -89,7 +89,7 @@
+@@ -88,7 +88,7 @@
#include "third_party/boringssl/src/include/openssl/cpu.h"
#endif
@@ -8,4 +8,4 @@
+#if ((BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)) || \
BUILDFLAG(IS_CHROMEOS_LACROS)
- #include "components/os_crypt/key_storage_config_linux.h"
+ #include "components/os_crypt/sync/key_storage_config_linux.h"
diff --git a/www/iridium/files/patch-services_network_public_cpp_BUILD.gn b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn
new file mode 100644
index 000000000000..80882de51357
--- /dev/null
+++ b/www/iridium/files/patch-services_network_public_cpp_BUILD.gn
@@ -0,0 +1,11 @@
+--- services/network/public/cpp/BUILD.gn.orig 2023-07-24 14:27:53 UTC
++++ services/network/public/cpp/BUILD.gn
+@@ -474,7 +474,7 @@ component("cpp_base") {
+ sources += [ "transferable_directory_fuchsia.cc" ]
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ sources += [
+ "network_interface_change_listener_mojom_traits.cc",
+ "network_interface_change_listener_mojom_traits.h",
diff --git a/www/iridium/files/patch-services_network_public_mojom_BUILD.gn b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn
new file mode 100644
index 000000000000..0935d1188e1d
--- /dev/null
+++ b/www/iridium/files/patch-services_network_public_mojom_BUILD.gn
@@ -0,0 +1,25 @@
+--- services/network/public/mojom/BUILD.gn.orig 2023-07-24 14:27:53 UTC
++++ services/network/public/mojom/BUILD.gn
+@@ -464,11 +464,11 @@ mojom("url_loader_base") {
+ }
+
+ enabled_features = []
+- if (is_android || is_chromeos || is_linux) {
++ if (!is_bsd && (is_android || is_chromeos || is_linux)) {
+ enabled_features += [ "network_change_notifier_in_browser" ]
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
+ # not include lacros.
+ enabled_features += [ "use_network_interface_change_listener" ]
+@@ -1386,7 +1386,7 @@ mojom("mojom") {
+ }
+ }
+
+- if (is_linux) {
++ if (is_linux && !is_bsd) {
+ # TODO(crbug.com/1431866): Remove this once is_linux in the mojom IDL does
+ # not include lacros.
+ enabled_features += [ "use_network_interface_change_listener" ]
diff --git a/www/iridium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h b/www/iridium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
new file mode 100644
index 000000000000..b7b4ad4bff2c
--- /dev/null
+++ b/www/iridium/files/patch-services_network_shared__dictionary_shared__dictionary__writer__in__memory.h
@@ -0,0 +1,11 @@
+--- services/network/shared_dictionary/shared_dictionary_writer_in_memory.h.orig 2023-07-24 14:27:53 UTC
++++ services/network/shared_dictionary/shared_dictionary_writer_in_memory.h
+@@ -5,6 +5,8 @@
+ #ifndef SERVICES_NETWORK_SHARED_DICTIONARY_SHARED_DICTIONARY_WRITER_IN_MEMORY_H_
+ #define SERVICES_NETWORK_SHARED_DICTIONARY_SHARED_DICTIONARY_WRITER_IN_MEMORY_H_
+
++#include <vector>
++
+ #include "base/component_export.h"
+ #include "base/functional/callback.h"
+ #include "crypto/secure_hash.h"
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 a388cbe2ebb0..0de1734d4b5c 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,6 +1,6 @@
---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-12-06 08:09:13 UTC
+--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2023-07-24 14:27:53 UTC
+++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
-@@ -54,7 +54,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
+@@ -53,7 +53,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
uint32_t shared_resident_kb) {
DCHECK(os_dump.platform_private_footprint);
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -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;
-@@ -82,7 +82,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
+@@ -81,7 +81,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
-@@ -261,7 +261,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -220,7 +220,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},
-@@ -276,7 +276,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -235,7 +235,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;
-@@ -322,7 +322,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
+@@ -281,7 +281,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) {
-@@ -372,7 +372,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
+@@ -331,7 +331,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());
-@@ -434,7 +434,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest*
+@@ -392,7 +392,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_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
index a23c55123564..e23b9217d9e4 100644
--- a/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
+++ b/www/iridium/files/patch-services_resource__coordinator_public_cpp_memory__instrumentation_BUILD.gn
@@ -1,6 +1,6 @@
---- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2023-04-22 17:45:15 UTC
+--- services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ services/resource_coordinator/public/cpp/memory_instrumentation/BUILD.gn
-@@ -33,8 +33,12 @@ component("memory_instrumentation") {
+@@ -29,8 +29,12 @@ component("memory_instrumentation") {
sources += [ "os_metrics_win.cc" ]
}
diff --git a/www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc b/www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc
new file mode 100644
index 000000000000..420c9f7bd4c0
--- /dev/null
+++ b/www/iridium/files/patch-services_video__capture_video__capture__service__impl.cc
@@ -0,0 +1,38 @@
+--- services/video_capture/video_capture_service_impl.cc.orig 2023-07-24 14:27:53 UTC
++++ services/video_capture/video_capture_service_impl.cc
+@@ -43,7 +43,7 @@
+ #include "services/video_capture/lacros/device_factory_adapter_lacros.h"
+ #endif // BUILDFLAG(IS_CHROMEOS_LACROS)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "media/capture/capture_switches.h"
+ #include "services/viz/public/cpp/gpu/context_provider_command_buffer.h"
+ #endif // BUILDFLAG(IS_LINUX)
+@@ -109,7 +109,7 @@ class VideoCaptureServiceImpl::GpuDependenciesContext
+ this};
+ };
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Intended usage of this class is to create viz::Gpu in utility process and
+ // connect to viz::GpuClient of browser process, which will call to Gpu service.
+ // Also, this class holds the viz::ContextProvider to listen and monitor Gpu
+@@ -256,7 +256,7 @@ void VideoCaptureServiceImpl::LazyInitializeGpuDepende
+ if (!gpu_dependencies_context_)
+ gpu_dependencies_context_ = std::make_unique<GpuDependenciesContext>();
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (switches::IsVideoCaptureUseGpuMemoryBufferEnabled()) {
+ if (!viz_gpu_context_provider_) {
+ viz_gpu_context_provider_ =
+@@ -345,7 +345,7 @@ void VideoCaptureServiceImpl::OnGpuInfoUpdate(const CH
+ }
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void VideoCaptureServiceImpl::SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu) {
+ viz_gpu_ = std::move(viz_gpu);
+ }
diff --git a/www/iridium/files/patch-services_video__capture_video__capture__service__impl.h b/www/iridium/files/patch-services_video__capture_video__capture__service__impl.h
new file mode 100644
index 000000000000..245672cf370d
--- /dev/null
+++ b/www/iridium/files/patch-services_video__capture_video__capture__service__impl.h
@@ -0,0 +1,29 @@
+--- services/video_capture/video_capture_service_impl.h.orig 2023-07-24 14:27:53 UTC
++++ services/video_capture/video_capture_service_impl.h
+@@ -24,7 +24,7 @@
+ #include "services/video_capture/ash/video_capture_device_factory_ash.h"
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "services/viz/public/cpp/gpu/gpu.h"
+ #endif // BUILDFLAG(IS_LINUX)
+
+@@ -62,7 +62,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+ #if BUILDFLAG(IS_WIN)
+ void OnGpuInfoUpdate(const CHROME_LUID& luid) override;
+ #endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ void SetVizGpu(std::unique_ptr<viz::Gpu> viz_gpu);
+ #endif // BUILDFLAG(IS_LINUX)
+ private:
+@@ -87,7 +87,7 @@ class VideoCaptureServiceImpl : public mojom::VideoCap
+ factory_receivers_ash_;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ class VizGpuContextProvider;
+ std::unique_ptr<VizGpuContextProvider> viz_gpu_context_provider_;
+ std::unique_ptr<viz::Gpu> viz_gpu_;
diff --git a/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp b/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
index 50204f41131a..ce69b85cbf53 100644
--- a/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
+++ b/www/iridium/files/patch-skia_ext_SkMemory__new__handler.cpp
@@ -1,6 +1,6 @@
---- skia/ext/SkMemory_new_handler.cpp.orig 2022-04-01 07:48:30 UTC
+--- skia/ext/SkMemory_new_handler.cpp.orig 2023-07-24 14:27:53 UTC
+++ skia/ext/SkMemory_new_handler.cpp
-@@ -79,7 +79,7 @@ static void* malloc_nothrow(size_t size) {
+@@ -86,7 +86,7 @@ static void* malloc_nothrow(size_t size) {
// TODO(b.kelemen): we should always use UncheckedMalloc but currently it
// doesn't work as intended everywhere.
void* result;
diff --git a/www/iridium/files/patch-skia_ext_skcolorspace__trfn.cc b/www/iridium/files/patch-skia_ext_skcolorspace__trfn.cc
new file mode 100644
index 000000000000..40f73fbb35f9
--- /dev/null
+++ b/www/iridium/files/patch-skia_ext_skcolorspace__trfn.cc
@@ -0,0 +1,11 @@
+--- skia/ext/skcolorspace_trfn.cc.orig 2023-07-24 14:27:53 UTC
++++ skia/ext/skcolorspace_trfn.cc
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
++#include <cmath>
++
+ #include "skia/ext/skcolorspace_trfn.h"
+ #include <cmath>
+
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 d8f5883b4488..09683895a5a0 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,6 +1,6 @@
---- third_party/abseil-cpp/absl/base/config.h.orig 2022-12-06 08:09:13 UTC
+--- third_party/abseil-cpp/absl/base/config.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/abseil-cpp/absl/base/config.h
-@@ -460,7 +460,8 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -443,7 +443,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
@@ -10,7 +10,7 @@
#define ABSL_HAVE_SCHED_YIELD 1
#endif
-@@ -475,7 +476,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
+@@ -458,7 +459,7 @@ static_assert(ABSL_INTERNAL_INLINE_NAMESPACE_STR[0] !=
// platforms.
#ifdef ABSL_HAVE_SEMAPHORE_H
#error ABSL_HAVE_SEMAPHORE_H cannot be directly set
diff --git a/www/iridium/files/patch-third__party_angle_BUILD.gn b/www/iridium/files/patch-third__party_angle_BUILD.gn
index 3865fa814a3e..008795c6b355 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 2023-04-22 17:45:15 UTC
+--- third_party/angle/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/angle/BUILD.gn
-@@ -280,7 +280,6 @@ config("extra_warnings") {
+@@ -298,7 +298,6 @@ config("extra_warnings") {
"-Wtautological-type-limit-compare",
"-Wundefined-reinterpret-cast",
"-Wunneeded-internal-declaration",
@@ -8,7 +8,7 @@
"-Wsuggest-destructor-override",
"-Wsuggest-override",
-@@ -451,7 +450,7 @@ template("angle_common_lib") {
+@@ -469,7 +468,7 @@ template("angle_common_lib") {
all_dependent_configs = [ ":angle_disable_pool_alloc" ]
}
@@ -17,7 +17,7 @@
libs = [ "dl" ]
}
-@@ -606,6 +605,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -624,6 +623,9 @@ angle_static_library("angle_gpu_info_util") {
"Xi",
"Xext",
]
diff --git a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
index ab57c111fdf4..fde782ac639d 100644
--- a/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
+++ b/www/iridium/files/patch-third__party_angle_src_gpu__info__util_SystemInfo__internal.h
@@ -1,6 +1,6 @@
---- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2022-03-28 18:11:04 UTC
+--- third_party/angle/src/gpu_info_util/SystemInfo_internal.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/angle/src/gpu_info_util/SystemInfo_internal.h
-@@ -14,6 +14,13 @@
+@@ -15,6 +15,13 @@
namespace angle
{
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 a554862b916c..724c9cf84286 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,16 +1,16 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig 2023-04-22 17:45:15 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2023-07-24 14:27:53 UTC
+++ third_party/angle/src/libANGLE/Display.cpp
-@@ -55,7 +55,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"
+@@ -62,7 +62,7 @@
+ # include "libANGLE/renderer/gl/cgl/DisplayCGL.h"
+ # elif ANGLE_ENABLE_EAGL
+ # include "libANGLE/renderer/gl/eagl/DisplayEAGL.h"
-# elif defined(ANGLE_PLATFORM_LINUX)
+# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
# include "libANGLE/renderer/gl/egl/DisplayEGL.h"
# if defined(ANGLE_USE_X11)
# include "libANGLE/renderer/gl/glx/DisplayGLX.h"
-@@ -346,7 +346,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
- impl = rx::CreateDisplayCGLOrEAGL(state);
+@@ -392,7 +392,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+ impl = new rx::DisplayEAGL(state);
break;
-# elif defined(ANGLE_PLATFORM_LINUX)
@@ -18,7 +18,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0)
{
-@@ -387,7 +387,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -433,7 +433,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
#if defined(ANGLE_ENABLE_OPENGL)
# if defined(ANGLE_PLATFORM_WINDOWS)
impl = new rx::DisplayWGL(state);
@@ -27,7 +27,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0 ||
platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE)
-@@ -436,7 +436,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -482,7 +482,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
impl = rx::CreateVulkanWin32Display(state);
}
break;
@@ -36,7 +36,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
{
-@@ -2046,7 +2046,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -2093,7 +2093,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 2454d6bf0885..5f66c1ecf507 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 2023-04-24 20:55:01 UTC
+--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2023-07-24 14:27:53 UTC
+++ third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1486,7 +1486,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
+@@ -1473,7 +1473,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 faa81489b018..495fe1652437 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 2023-03-13 07:33:08 UTC
+--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/angle/src/libANGLE/renderer/driver_utils.h
-@@ -206,7 +206,7 @@ inline bool IsWindows()
+@@ -212,7 +212,7 @@ inline bool IsWindows()
inline bool IsLinux()
{
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 9a0d11ac51cc..63b2d504427f 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 2023-03-13 07:33:08 UTC
+--- third_party/angle/util/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/angle/util/BUILD.gn
-@@ -292,7 +292,7 @@ foreach(is_shared_library,
+@@ -309,7 +309,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
deleted file mode 100644
index 398d3bd8b616..000000000000
--- a/www/iridium/files/patch-third__party_blink_common_privacy__budget_active__sampling.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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_common_renderer__preferences_renderer__preferences.h b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
index e8bb8efbfddb..c953dec284c9 100644
--- a/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
+++ b/www/iridium/files/patch-third__party_blink_public_common_renderer__preferences_renderer__preferences.h
@@ -1,6 +1,6 @@
---- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2022-04-01 07:48:30 UTC
+--- third_party/blink/public/common/renderer_preferences/renderer_preferences.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/public/common/renderer_preferences/renderer_preferences.h
-@@ -50,7 +50,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences {
+@@ -63,7 +63,7 @@ struct BLINK_COMMON_EXPORT RendererPreferences {
bool webrtc_allow_legacy_tls_protocols{false};
UserAgentOverride user_agent_override;
std::string accept_languages;
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
index a44d9256dd99..7e8580ed0067 100644
--- a/www/iridium/files/patch-third__party_blink_public_platform_platform.h
+++ b/www/iridium/files/patch-third__party_blink_public_platform_platform.h
@@ -1,6 +1,6 @@
---- third_party/blink/public/platform/platform.h.orig 2023-04-22 17:45:15 UTC
+--- third_party/blink/public/platform/platform.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/public/platform/platform.h
-@@ -349,7 +349,7 @@ class BLINK_PLATFORM_EXPORT Platform {
+@@ -344,7 +344,7 @@ class BLINK_PLATFORM_EXPORT Platform {
return nullptr;
}
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 d60e63969050..71f9c39e47b6 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 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -74,12 +74,12 @@
+@@ -78,12 +78,12 @@
#include "third_party/blink/renderer/controller/private_memory_footprint_provider.h"
#endif
@@ -10,12 +10,12 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
-- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+- BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
#include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
#include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
#endif
-@@ -222,7 +222,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+@@ -231,7 +231,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
main_thread_task_runner);
#endif
@@ -24,12 +24,12 @@
binders.Add<mojom::blink::MemoryUsageMonitorLinux>(
ConvertToBaseRepeatingCallback(
CrossThreadBindRepeating(&MemoryUsageMonitorPosix::Bind)),
-@@ -255,7 +255,7 @@ void BlinkInitializer::RegisterMemoryWatchers() {
+@@ -270,7 +270,7 @@ void BlinkInitializer::RegisterMemoryWatchers(Platform
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
-- BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring.
- UserLevelMemoryPressureSignalGenerator::Initialize(main_thread_task_runner);
-
+- BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN)
++ BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ // Start reporting the highest private memory footprint after the first
+ // navigation.
+ HighestPmfReporter::Initialize(main_thread_task_runner);
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 ec50563a96d5..16b1d114cb8c 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 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -408,7 +408,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'
-@@ -3344,7 +3344,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3286,7 +3286,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 892a52fffad8..71463cd94346 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,6 +1,6 @@
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6439,7 +6439,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+@@ -6455,7 +6455,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
}
#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// TODO(crbug.com/1090246): Fix these tests on Fuchsia and re-enable.
// TODO(crbug.com/1317375): Build these tests on all platforms.
#define MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved \
-@@ -6847,7 +6847,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
+@@ -6864,7 +6864,7 @@ TEST_F(CompositedSelectionBoundsTest, LargeSelectionSc
TEST_F(CompositedSelectionBoundsTest, LargeSelectionNoScroll) {
RunTest("composited_selection_bounds_large_selection_noscroll.html");
}
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 d04752a49d52..6905c88c5a37 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-10-05 07:34:01 UTC
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
-@@ -190,7 +190,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t
+@@ -189,7 +189,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 a15c7a352340..2a1a62f6dd74 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 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/core/layout/layout_view.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/core/layout/layout_view.cc
-@@ -67,7 +67,7 @@
+@@ -68,7 +68,7 @@
#include "ui/display/screen_info.h"
#include "ui/gfx/geometry/quad_f.h"
@@ -9,9 +9,9 @@
#include "third_party/blink/renderer/platform/fonts/font_cache.h"
#endif
-@@ -365,7 +365,7 @@ void LayoutView::UpdateLayout() {
- DCHECK(!layout_state_);
- LayoutState root_layout_state(*this);
+@@ -323,7 +323,7 @@ void LayoutView::UpdateLayout() {
+ fragmentation_context_.Clear();
+ }
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
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 aa8feab8d2d8..648a4e088c98 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 2023-03-13 07:33:08 UTC
+--- third_party/blink/renderer/core/paint/paint_layer.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/core/paint/paint_layer.cc
-@@ -114,7 +114,7 @@ namespace blink {
+@@ -116,7 +116,7 @@ namespace blink {
namespace {
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
index 9f7d2ae4dcdd..67e0c8c2d381 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_media_audio_audio__renderer__mixer__manager__test.cc
@@ -1,9 +1,9 @@
---- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2022-12-06 08:09:13 UTC
+--- third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/modules/media/audio/audio_renderer_mixer_manager_test.cc
@@ -722,7 +722,7 @@ TEST_F(AudioRendererMixerManagerTest, MixerParamsLaten
mixer->get_output_params_for_testing().sample_rate());
- #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
// Use 10 ms buffer (441 frames per buffer).
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
index 222041c8c5fb..b202a1683f45 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_features.gni
@@ -1,9 +1,11 @@
---- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/modules/ml/webnn/features.gni.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/modules/ml/webnn/features.gni
-@@ -7,5 +7,5 @@ declare_args() {
+@@ -7,7 +7,7 @@ declare_args() {
# This enables building WebNN with XNNPACK. Currently only available for
- # Windows on x64 or x86.
+ # Windows and Linux on x64 or x86.
build_webnn_with_xnnpack =
-- is_win && (current_cpu == "x64" || current_cpu == "x86")
+- (is_linux || is_win) && (current_cpu == "x64" || current_cpu == "x86")
+ !is_bsd && (is_win && (current_cpu == "x64" || current_cpu == "x86"))
- }
+
+ # This build flag enables WebNN on ChromeOS platform to access hardware
+ # acceleration by using ModelLoader mojo interface.
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
index bbadeab0b1eb..b74a591eab57 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_ml_webnn_ml__graph__xnnpack.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/modules/ml/webnn/ml_graph_xnnpack.cc
-@@ -177,7 +177,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
+@@ -185,7 +185,7 @@ class SharedXnnpackContext : public ThreadSafeRefCount
~SharedXnnpackContext() {
base::AutoLock auto_lock(SharedXnnpackContextLock());
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 1cb2a37d3f24..d61f4ddddb34 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 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/modules/peerconnection/webrtc_audio_renderer_test.cc
-@@ -290,7 +290,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
+@@ -297,7 +297,7 @@ TEST_F(WebRtcAudioRendererTest, DISABLED_VerifySinkPar
SetupRenderer(kDefaultOutputDeviceId);
renderer_proxy_->Start();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
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 7b593b84277e..7399a467ca8d 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 2023-03-13 07:33:08 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6231,7 +6231,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6219,7 +6219,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
constexpr bool kAllowZeroCopyImages = true;
#endif
diff --git a/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
index 17de59f1a993..e9c36ab193db 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_modules_webgpu_gpu__queue.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/modules/webgpu/gpu_queue.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/modules/webgpu/gpu_queue.cc
-@@ -707,7 +707,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
+@@ -679,7 +679,7 @@ bool GPUQueue::CopyFromCanvasSourceImage(
// platform requires interop supported. According to the bug, this change will
// be a long time task. So disable using webgpu mailbox texture uploading path
// on linux platform.
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 39465cad33b8..b27704e51d7a 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 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1932,7 +1932,7 @@ static_library("test_support") {
+@@ -1928,7 +1928,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.h b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_font__cache.h
index d2c36534623d..618f5a0e7edb 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 2023-03-13 07:33:08 UTC
+--- third_party/blink/renderer/platform/fonts/font_cache.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/platform/fonts/font_cache.h
-@@ -57,7 +57,7 @@
+@@ -58,7 +58,7 @@
#include "third_party/skia/include/core/SkFontMgr.h"
#include "third_party/skia/include/core/SkRefCnt.h"
@@ -9,7 +9,7 @@
#include "ui/gfx/font_fallback_linux.h"
#endif
-@@ -180,7 +180,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -193,7 +193,7 @@ class PLATFORM_EXPORT FontCache final {
static void PrewarmFamily(const AtomicString& family_name) {}
#endif
@@ -18,7 +18,7 @@
// These are needed for calling QueryRenderStyleForStrike, since
// gfx::GetFontRenderParams makes distinctions based on DSF.
static float DeviceScaleFactor() { return device_scale_factor_; }
-@@ -264,7 +264,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -276,7 +276,7 @@ class PLATFORM_EXPORT FontCache final {
const char* locale_family_name);
#endif // BUILDFLAG(IS_ANDROID)
@@ -27,7 +27,7 @@
static bool GetFontForCharacter(UChar32,
const char* preferred_locale,
gfx::FallbackFontData*);
-@@ -344,7 +344,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -357,7 +357,7 @@ class PLATFORM_EXPORT FontCache final {
const FontFaceCreationParams&,
std::string& name);
@@ -36,7 +36,7 @@
static AtomicString GetFamilyNameForCharacter(SkFontMgr*,
UChar32,
const FontDescription&,
-@@ -387,7 +387,7 @@ class PLATFORM_EXPORT FontCache final {
+@@ -398,7 +398,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_skia_font__cache__skia.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
index bcd04e5c63c2..f1460938ecd2 100644
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_fonts_skia_font__cache__skia.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2023-03-13 07:33:08 UTC
+--- third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/platform/fonts/skia/font_cache_skia.cc
-@@ -60,7 +60,7 @@ AtomicString ToAtomicString(const SkString& str) {
+@@ -64,7 +64,7 @@ AtomicString ToAtomicString(const SkString& str) {
return AtomicString::FromUTF8(str.c_str(), str.size());
}
@@ -9,16 +9,7 @@
// This function is called on android or when we are emulating android fonts on
// linux and the embedder has overriden the default fontManager with
// WebFontRendering::setSkiaFontMgr.
-@@ -235,7 +235,7 @@ sk_sp<SkTypeface> FontCache::CreateTypeface(
- }
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
- // On linux if the fontManager has been overridden then we should be calling
- // the embedder provided font Manager rather than calling
- // SkTypeface::CreateFromName which may redirect the call to the default font
-@@ -262,7 +262,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
+@@ -246,7 +246,7 @@ std::unique_ptr<FontPlatformData> FontCache::CreateFon
std::string name;
sk_sp<SkTypeface> typeface;
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 bb118c849374..092cdc65c593 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 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -358,7 +358,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -363,7 +363,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
index 16f3b5ed4bea..3fd8efb1ebd2 100644
--- 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
@@ -1,15 +1,24 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-04-22 17:45:15 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
-@@ -1531,7 +1531,7 @@
- depends_on: ["FileSystemAccessLocal"],
- status: {"Android": "test", "default": "stable"},
- origin_trial_feature_name: "FileHandling",
+@@ -1418,7 +1418,7 @@
+ {
+ name: "DocumentPictureInPictureAPI",
+ origin_trial_feature_name: "DocumentPictureInPictureAPI",
+- origin_trial_os: ["win", "mac", "linux", "chromeos"],
++ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+ status: {
+ "Android": "",
+ "ChromeOS_Lacros": "",
+@@ -2647,7 +2647,7 @@
+ name: "PaymentHandlerMinimalHeaderUX",
+ origin_trial_feature_name: "PaymentHandlerMinimalHeaderUX",
+ origin_trial_allows_third_party: true,
- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
+ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
- base_feature: "FileHandlingAPI",
},
{
-@@ -3358,7 +3358,7 @@
+ name: "PaymentInstruments",
+@@ -3607,7 +3607,7 @@
name: "UnrestrictedSharedArrayBuffer",
base_feature: "none",
origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -17,8 +26,8 @@
+ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
},
{
- name: "URLPatternCompareComponent",
-@@ -3379,7 +3379,7 @@
+ // A kill switch for crbug.com/1410332.
+@@ -3638,7 +3638,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.
@@ -27,7 +36,7 @@
base_feature: "ReduceUserAgent",
},
{
-@@ -3553,12 +3553,12 @@
+@@ -3794,12 +3794,12 @@
status: "experimental",
base_feature: "none",
origin_trial_feature_name: "WebAppUrlHandling",
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 e76305e30fcf..726c6f86401d 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,6 +1,6 @@
---- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2022-12-01 10:35:46 UTC
+--- third_party/blink/renderer/platform/scheduler/common/thread.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/blink/renderer/platform/scheduler/common/thread.cc
-@@ -87,7 +87,7 @@ void Thread::CreateAndSetCompositorThread() {
+@@ -82,7 +82,7 @@ void Thread::CreateAndSetCompositorThread() {
std::make_unique<scheduler::CompositorThread>(params);
compositor_thread->Init();
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
new file mode 100644
index 000000000000..e39680325006
--- /dev/null
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_video__capture_video__capture__impl.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/video_capture/video_capture_impl.cc.orig 2023-07-24 14:27:53 UTC
++++ third_party/blink/renderer/platform/video_capture/video_capture_impl.cc
+@@ -572,7 +572,7 @@ bool VideoCaptureImpl::VideoFrameBufferPreparer::BindV
+ }
+
+ const unsigned texture_target =
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Explicitly set GL_TEXTURE_EXTERNAL_OES as the
+ // `media::VideoFrame::RequiresExternalSampler()` requires it for NV12
+ // format, while the `ImageTextureTarget()` will return GL_TEXTURE_2D.
diff --git a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
new file mode 100644
index 000000000000..d954d8f77d32
--- /dev/null
+++ b/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_blink__categorized__worker__pool__delegate.cc
@@ -0,0 +1,11 @@
+--- third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc.orig 2023-07-24 14:27:53 UTC
++++ third_party/blink/renderer/platform/widget/compositing/blink_categorized_worker_pool_delegate.cc
+@@ -27,7 +27,7 @@ BlinkCategorizedWorkerPoolDelegate& BlinkCategorizedWo
+
+ void BlinkCategorizedWorkerPoolDelegate::NotifyThreadWillRun(
+ base::PlatformThreadId tid) {
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ scoped_refptr<base::TaskRunner> task_runner =
+ Thread::MainThread()->GetTaskRunner(MainThreadTaskRunnerRestricted());
+ task_runner->PostTask(FROM_HERE, base::BindOnce(
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
deleted file mode 100644
index 3dfd10c8b403..000000000000
--- a/www/iridium/files/patch-third__party_blink_renderer_platform_widget_compositing_categorized__worker__pool.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc.orig 2023-03-13 07:33:08 UTC
-+++ third_party/blink/renderer/platform/widget/compositing/categorized_worker_pool.cc
-@@ -242,7 +242,7 @@ void CategorizedWorkerPoolImpl::Start(int max_concurre
- "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()->GetTaskRunner(MainThreadTaskRunnerRestricted()),
- base::BindOnce([](base::PlatformThreadId thread_id) {
diff --git a/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni
deleted file mode 100644
index 63910fb2275a..000000000000
--- a/www/iridium/files/patch-third__party_boringssl_BUILD.generated.gni
+++ /dev/null
@@ -1,18 +0,0 @@
---- third_party/boringssl/BUILD.generated.gni.orig 2023-04-22 17:45:15 UTC
-+++ third_party/boringssl/BUILD.generated.gni
-@@ -87,6 +87,7 @@ crypto_sources = [
- "src/crypto/cpu_aarch64_freebsd.c",
- "src/crypto/cpu_aarch64_fuchsia.c",
- "src/crypto/cpu_aarch64_linux.c",
-+ "src/crypto/cpu_aarch64_openbsd.c",
- "src/crypto/cpu_aarch64_win.c",
- "src/crypto/cpu_arm.c",
- "src/crypto/cpu_arm_freebsd.c",
-@@ -193,6 +194,7 @@ crypto_sources = [
- "src/crypto/rand_extra/deterministic.c",
- "src/crypto/rand_extra/forkunsafe.c",
- "src/crypto/rand_extra/fuchsia.c",
-+ "src/crypto/rand_extra/arc4random.c",
- "src/crypto/rand_extra/passive.c",
- "src/crypto/rand_extra/rand_extra.c",
- "src/crypto/rand_extra/windows.c",
diff --git a/www/iridium/files/patch-third__party_boringssl_BUILD.gn b/www/iridium/files/patch-third__party_boringssl_BUILD.gn
index 1a1afe0add38..c69450cfaf32 100644
--- a/www/iridium/files/patch-third__party_boringssl_BUILD.gn
+++ b/www/iridium/files/patch-third__party_boringssl_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/boringssl/BUILD.gn.orig 2022-04-01 07:48:30 UTC
+--- third_party/boringssl/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/BUILD.gn
-@@ -92,7 +92,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
+@@ -139,7 +139,7 @@ if (is_win && !is_msan && current_cpu != "arm64") {
public_configs = [ ":no_asm_config" ]
}
} else if (current_cpu == "arm64") {
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl
index 9ec9ae40996b..aab225bc359d 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_chacha_asm_chacha-x86__64.pl
@@ -1,18 +1,10 @@
---- third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig 2023-03-13 07:33:08 UTC
+--- third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/chacha/asm/chacha-x86_64.pl
-@@ -78,6 +78,7 @@ $code.=<<___;
-
- .extern OPENSSL_ia32cap_P
-
-+.rodata
+@@ -231,6 +231,7 @@ $code.=<<___;
.align 64
- .Lzero:
- .long 0,0,0,0
-@@ -107,6 +108,7 @@ $code.=<<___;
- .Lsixteen:
- .long 16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16
- .asciz "ChaCha20 for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-+.previous
- ___
-
- sub AUTOLOAD() # thunk [simplified] 32-bit style perlasm
+ ChaCha20_ctr32:
+ .cfi_startproc
++ _CET_ENDBR
+ cmp \$0,$len
+ je .Lno_data
+ mov OPENSSL_ia32cap_P+4(%rip),%r10
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl
index d97bdfec2d00..29acd206525e 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_aes128gcmsiv-x86__64.pl
@@ -1,19 +1,138 @@
---- third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig 2023-03-13 07:33:08 UTC
+--- third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/cipher_extra/asm/aes128gcmsiv-x86_64.pl
-@@ -32,7 +32,7 @@ open OUT,"| \"$^X\" \"$xlate\" $flavour \"$output\"";
- *STDOUT=*OUT;
+@@ -134,6 +134,7 @@ $code.=<<___;
+ .align 16
+ aesgcmsiv_htable_init:
+ .cfi_startproc
++ _CET_ENDBR
+ vmovdqa ($H), $T
+ vmovdqa $T, $TMP0
+ vmovdqa $T, ($Htbl) # H
+@@ -174,6 +175,7 @@ sub aesgcmsiv_htable6_init {
+ .align 16
+ aesgcmsiv_htable6_init:
+ .cfi_startproc
++ _CET_ENDBR
+ vmovdqa ($H), $T
+ vmovdqa $T, $TMP0
+ vmovdqa $T, ($Htbl) # H
+@@ -235,6 +237,7 @@ ___
+ .align 16
+ aesgcmsiv_htable_polyval:
+ .cfi_startproc
++ _CET_ENDBR
+ test $len, $len
+ jnz .Lhtable_polyval_start
+ ret
+@@ -420,6 +423,7 @@ sub aesgcmsiv_polyval_horner {
+ .align 16
+ aesgcmsiv_polyval_horner:
+ .cfi_startproc
++ _CET_ENDBR
+ test $L, $L
+ jnz .Lpolyval_horner_start
+ ret
+@@ -460,6 +464,7 @@ $code.=<<___;
+ .align 16
+ aes128gcmsiv_aes_ks:
+ .cfi_startproc
++ _CET_ENDBR
+ vmovdqu (%rdi), %xmm1 # xmm1 = user key
+ vmovdqa %xmm1, (%rsi) # rsi points to output
+
+@@ -521,6 +526,7 @@ $code.=<<___;
+ .align 16
+ aes256gcmsiv_aes_ks:
+ .cfi_startproc
++ _CET_ENDBR
+ vmovdqu (%rdi), %xmm1
+ vmovdqu 16(%rdi), %xmm3
+ vmovdqa %xmm1, (%rsi)
+@@ -614,6 +620,7 @@ ___
+ .align 16
+ aes128gcmsiv_aes_ks_enc_x1:
+ .cfi_startproc
++ _CET_ENDBR
+ vmovdqa (%rcx), %xmm1 # xmm1 = first 16 bytes of random key
+ vmovdqa 0*16(%rdi), $BLOCK1
- $code.=<<___;
--.data
-+.rodata
+@@ -687,6 +694,7 @@ ___
+ .align 16
+ aes128gcmsiv_kdf:
+ .cfi_startproc
++ _CET_ENDBR
+ # parameter 1: %rdi Pointer to NONCE
+ # parameter 2: %rsi Pointer to CT
+ # parameter 4: %rdx Pointer to keys
+@@ -787,6 +795,7 @@ ___
+ .align 16
+ aes128gcmsiv_enc_msg_x4:
+ .cfi_startproc
++ _CET_ENDBR
+ test $LEN, $LEN
+ jnz .L128_enc_msg_x4_start
+ ret
+@@ -984,6 +993,7 @@ ___
+ .align 16
+ aes128gcmsiv_enc_msg_x8:
+ .cfi_startproc
++ _CET_ENDBR
+ test $LEN, $LEN
+ jnz .L128_enc_msg_x8_start
+ ret
+@@ -1239,6 +1249,7 @@ ___
+ $code.=<<___;
+ .cfi_startproc
++ _CET_ENDBR
+ test \$~15, $LEN
+ jnz .L${labelPrefix}_dec_start
+ ret
+@@ -1578,6 +1589,7 @@ sub aes128gcmsiv_ecb_enc_block {
.align 16
- one:
-@@ -66,6 +66,7 @@ con3:
- .byte -1,-1,-1,-1,-1,-1,-1,-1,4,5,6,7,4,5,6,7
- and_mask:
- .long 0,0xffffffff, 0xffffffff, 0xffffffff
-+.previous
- ___
+ aes128gcmsiv_ecb_enc_block:
+ .cfi_startproc
++ _CET_ENDBR
+ vmovdqa (%rdi), $STATE_1
- $code.=<<___;
+ vpxor ($KSp), $STATE_1, $STATE_1
+@@ -1670,6 +1682,7 @@ ___
+ .align 16
+ aes256gcmsiv_aes_ks_enc_x1:
+ .cfi_startproc
++ _CET_ENDBR
+ vmovdqa con1(%rip), $CON_MASK # CON_MASK = 1,1,1,1
+ vmovdqa mask(%rip), $MASK_256 # MASK_256
+ vmovdqa ($PT), $BLOCK1
+@@ -1711,6 +1724,7 @@ sub aes256gcmsiv_ecb_enc_block {
+ .align 16
+ aes256gcmsiv_ecb_enc_block:
+ .cfi_startproc
++ _CET_ENDBR
+ vmovdqa (%rdi), $STATE_1
+ vpxor ($KSp), $STATE_1, $STATE_1
+ vaesenc 1*16($KSp), $STATE_1, $STATE_1
+@@ -1794,6 +1808,7 @@ ___
+ .align 16
+ aes256gcmsiv_enc_msg_x4:
+ .cfi_startproc
++ _CET_ENDBR
+ test $LEN, $LEN
+ jnz .L256_enc_msg_x4_start
+ ret
+@@ -1994,6 +2009,7 @@ ___
+ .align 16
+ aes256gcmsiv_enc_msg_x8:
+ .cfi_startproc
++ _CET_ENDBR
+ test $LEN, $LEN
+ jnz .L256_enc_msg_x8_start
+ ret
+@@ -2200,6 +2216,7 @@ ___
+ .align 16
+ aes256gcmsiv_kdf:
+ .cfi_startproc
++ _CET_ENDBR
+ # parameter 1: %rdi Pointer to NONCE
+ # parameter 2: %rsi Pointer to CT
+ # parameter 4: %rdx Pointer to keys
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl
index fb539238f310..ab437ae8ff63 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_cipher__extra_asm_chacha20__poly1305__x86__64.pl
@@ -1,18 +1,18 @@
---- third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig 2023-03-13 07:33:08 UTC
+--- third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/cipher_extra/asm/chacha20_poly1305_x86_64.pl
-@@ -42,6 +42,7 @@ $code.=<<___;
-
- chacha20_poly1305_constants:
-
-+.rodata
+@@ -449,6 +449,7 @@ $code.="
.align 64
- .Lchacha20_consts:
- .byte 'e','x','p','a','n','d',' ','3','2','-','b','y','t','e',' ','k'
-@@ -79,6 +80,7 @@ chacha20_poly1305_constants:
- .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00,0x00
- .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0x00
- .byte 0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff,0xff
-+.previous
- ___
-
- my ($oup,$inp,$inl,$adp,$keyp,$itr1,$itr2,$adl)=("%rdi","%rsi","%rbx","%rcx","%r9","%rcx","%r8","%r8");
+ chacha20_poly1305_open:
+ .cfi_startproc
++ _CET_ENDBR
+ push %rbp
+ .cfi_push %rbp
+ push %rbx
+@@ -871,6 +872,7 @@ $code.="
+ .align 64
+ chacha20_poly1305_seal:
+ .cfi_startproc
++ _CET_ENDBR
+ push %rbp
+ .cfi_push %rbp
+ push %rbx
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c b/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c
index ea84dbeaa89d..f5e1840fab67 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_cpu__aarch64__openbsd.c
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2022-04-01 07:48:30 UTC
+--- third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/cpu_aarch64_openbsd.c
-@@ -0,0 +1,57 @@
+@@ -1,3 +1,60 @@
+/* Copyright (c) 2022, Robert Nagy <robert@openbsd.org>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
@@ -58,3 +58,6 @@
+}
+
+#endif // OPENSSL_AARCH64 && OPENSSL_OPENBSD && !OPENSSL_STATIC_ARMCAP
+ /* Copyright (c) 2022, Robert Nagy <robert.nagy@gmail.com>
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl
index a942ed3da582..bb3d5096e28d 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_aesni-x86__64.pl
@@ -1,18 +1,74 @@
---- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-04-22 17:45:15 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/aesni-x86_64.pl
-@@ -3778,6 +3778,7 @@ ___
- }
-
- $code.=<<___;
-+.rodata
- .align 64
- .Lbswap_mask:
- .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -3800,6 +3801,7 @@ $code.=<<___;
-
- .asciz "AES for Intel AES-NI, CRYPTOGAMS by <appro\@openssl.org>"
- .align 64
-+.previous
+@@ -275,6 +275,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ #ifdef BORINGSSL_DISPATCH_TEST
+ .extern BORINGSSL_function_hit
+ movb \$1,BORINGSSL_function_hit+1(%rip)
+@@ -297,6 +298,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_decrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ movups ($inp),$inout0 # load input
+ mov 240($key),$rounds # key->rounds
+ ___
+@@ -617,6 +619,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_ecb_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
___
+ $code.=<<___ if ($win64);
+ lea -0x58(%rsp),%rsp
+@@ -1203,6 +1206,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_ctr32_encrypt_blocks:
+ .cfi_startproc
++ _CET_ENDBR
+ #ifdef BORINGSSL_DISPATCH_TEST
+ movb \$1,BORINGSSL_function_hit(%rip)
+ #endif
+@@ -1779,6 +1783,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_xts_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ lea (%rsp),%r11 # frame pointer
+ .cfi_def_cfa_register %r11
+ push %rbp
+@@ -2262,6 +2267,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_xts_decrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ lea (%rsp),%r11 # frame pointer
+ .cfi_def_cfa_register %r11
+ push %rbp
+@@ -2780,6 +2786,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_cbc_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ test $len,$len # check length
+ jz .Lcbc_ret
- # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame,
+@@ -3329,6 +3336,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_set_decrypt_key:
+ .cfi_startproc
++ _CET_ENDBR
+ .byte 0x48,0x83,0xEC,0x08 # sub rsp,8
+ .cfi_adjust_cfa_offset 8
+ call __aesni_set_encrypt_key
+@@ -3401,6 +3409,7 @@ $code.=<<___;
+ ${PREFIX}_set_encrypt_key:
+ __aesni_set_encrypt_key:
+ .cfi_startproc
++ _CET_ENDBR
+ #ifdef BORINGSSL_DISPATCH_TEST
+ movb \$1,BORINGSSL_function_hit+3(%rip)
+ #endif
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl
index 56f81ff1dda9..0b94779ffa86 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_aes_asm_vpaes-x86__64.pl
@@ -1,10 +1,50 @@
---- third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig 2023-03-13 07:33:08 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/aes/asm/vpaes-x86_64.pl
-@@ -1288,6 +1288,7 @@ _vpaes_preheat:
- ## ##
- ########################################################
- .type _vpaes_consts,\@object
-+.rodata
- .align 64
- _vpaes_consts:
- .Lk_inv: # inv, inva
+@@ -871,6 +871,7 @@ _vpaes_schedule_mangle:
+ .align 16
+ ${PREFIX}_set_encrypt_key:
+ .cfi_startproc
++ _CET_ENDBR
+ #ifdef BORINGSSL_DISPATCH_TEST
+ .extern BORINGSSL_function_hit
+ movb \$1, BORINGSSL_function_hit+5(%rip)
+@@ -926,6 +927,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_set_decrypt_key:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($win64);
+ lea -0xb8(%rsp),%rsp
+@@ -981,6 +983,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ #ifdef BORINGSSL_DISPATCH_TEST
+ .extern BORINGSSL_function_hit
+ movb \$1, BORINGSSL_function_hit+4(%rip)
+@@ -1030,6 +1033,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_decrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($win64);
+ lea -0xb8(%rsp),%rsp
+@@ -1081,6 +1085,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_cbc_encrypt:
+ .cfi_startproc
++ _CET_ENDBR
+ xchg $key,$len
+ ___
+ ($len,$key)=($key,$len);
+@@ -1166,6 +1171,7 @@ $code.=<<___;
+ .align 16
+ ${PREFIX}_ctr32_encrypt_blocks:
+ .cfi_startproc
++ _CET_ENDBR
+ # _vpaes_encrypt_core and _vpaes_encrypt_core_2x expect the key in %rdx.
+ xchg $key, $blocks
+ ___
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl
new file mode 100644
index 000000000000..ee31ba44c770
--- /dev/null
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_rsaz-avx2.pl
@@ -0,0 +1,50 @@
+--- third_party/boringssl/src/crypto/fipsmodule/bn/asm/rsaz-avx2.pl.orig 2023-07-24 14:27:53 UTC
++++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/rsaz-avx2.pl
+@@ -112,6 +112,7 @@ $code.=<<___;
+ .align 64
+ rsaz_1024_sqr_avx2: # 702 cycles, 14% faster than rsaz_1024_mul_avx2
+ .cfi_startproc
++ _CET_ENDBR
+ lea (%rsp), %rax
+ .cfi_def_cfa_register %rax
+ push %rbx
+@@ -863,6 +864,7 @@ $code.=<<___;
+ .align 64
+ rsaz_1024_mul_avx2:
+ .cfi_startproc
++ _CET_ENDBR
+ lea (%rsp), %rax
+ .cfi_def_cfa_register %rax
+ push %rbx
+@@ -1474,6 +1476,7 @@ $code.=<<___;
+ .align 32
+ rsaz_1024_red2norm_avx2:
+ .cfi_startproc
++ _CET_ENDBR
+ sub \$-128,$inp # size optimization
+ xor %rax,%rax
+ ___
+@@ -1515,6 +1518,7 @@ $code.=<<___;
+ .align 32
+ rsaz_1024_norm2red_avx2:
+ .cfi_startproc
++ _CET_ENDBR
+ sub \$-128,$out # size optimization
+ mov ($inp),@T[0]
+ mov \$0x1fffffff,%eax
+@@ -1559,6 +1563,7 @@ $code.=<<___;
+ .align 32
+ rsaz_1024_scatter5_avx2:
+ .cfi_startproc
++ _CET_ENDBR
+ vzeroupper
+ vmovdqu .Lscatter_permd(%rip),%ymm5
+ shl \$4,$power
+@@ -1586,6 +1591,7 @@ rsaz_1024_scatter5_avx2:
+ .align 32
+ rsaz_1024_gather5_avx2:
+ .cfi_startproc
++ _CET_ENDBR
+ vzeroupper
+ mov %rsp,%r11
+ .cfi_def_cfa_register %r11
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl
new file mode 100644
index 000000000000..f0b69b104453
--- /dev/null
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont.pl
@@ -0,0 +1,10 @@
+--- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont.pl.orig 2023-07-24 14:27:53 UTC
++++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont.pl
+@@ -92,6 +92,7 @@ $code=<<___;
+ .align 16
+ bn_mul_mont:
+ .cfi_startproc
++ _CET_ENDBR
+ mov ${num}d,${num}d
+ mov %rsp,%rax
+ .cfi_def_cfa_register %rax
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl
index e3996e30abd8..fd52146a55a8 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_bn_asm_x86__64-mont5.pl
@@ -1,16 +1,50 @@
---- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig 2023-03-13 07:33:08 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/bn/asm/x86_64-mont5.pl
-@@ -3576,11 +3576,13 @@ $code.=<<___;
- ___
- }
- $code.=<<___;
-+.rodata
+@@ -79,6 +79,7 @@ $code=<<___;
.align 64
- .Linc:
- .long 0,0, 1,1
- .long 2,2, 2,2
- .asciz "Montgomery Multiplication with scatter/gather for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-+.previous
+ bn_mul_mont_gather5:
+ .cfi_startproc
++ _CET_ENDBR
+ mov ${num}d,${num}d
+ mov %rsp,%rax
+ .cfi_def_cfa_register %rax
+@@ -1098,6 +1099,7 @@ $code.=<<___;
+ .align 32
+ bn_power5:
+ .cfi_startproc
++ _CET_ENDBR
+ mov %rsp,%rax
+ .cfi_def_cfa_register %rax
___
+@@ -1240,6 +1242,7 @@ $code.=<<___;
+ bn_sqr8x_internal:
+ __bn_sqr8x_internal:
+ .cfi_startproc
++ _CET_ENDBR
+ ##############################################################
+ # Squaring part:
+ #
+@@ -2737,6 +2740,7 @@ bn_powerx5:
+ bn_sqrx8x_internal:
+ __bn_sqrx8x_internal:
+ .cfi_startproc
++ _CET_ENDBR
+ ##################################################################
+ # Squaring part:
+ #
+@@ -3448,6 +3452,7 @@ $code.=<<___;
+ .align 16
+ bn_scatter5:
+ .cfi_startproc
++ _CET_ENDBR
+ cmp \$0, $num
+ jz .Lscatter_epilogue
- # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame,
+@@ -3478,6 +3483,7 @@ bn_scatter5:
+ bn_gather5:
+ .cfi_startproc
+ .LSEH_begin_bn_gather5: # Win64 thing, but harmless in other cases
++ _CET_ENDBR
+ # I can't trust assembler to use specific encoding:-(
+ .byte 0x4c,0x8d,0x14,0x24 #lea (%rsp),%r10
+ .cfi_def_cfa_register %r10
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl
index 91ede4d298c4..12f8807be84a 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256-x86__64-asm.pl
@@ -1,18 +1,98 @@
---- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig 2023-03-13 07:33:08 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256-x86_64-asm.pl
-@@ -62,6 +62,7 @@ $code.=<<___;
- .extern OPENSSL_ia32cap_P
-
- # The polynomial
-+.rodata
- .align 64
- .Lpoly:
- .quad 0xffffffffffffffff, 0x00000000ffffffff, 0x0000000000000000, 0xffffffff00000001
-@@ -80,6 +81,7 @@ $code.=<<___;
- .quad 0xf3b9cac2fc632551, 0xbce6faada7179e84, 0xffffffffffffffff, 0xffffffff00000000
- .LordK:
- .quad 0xccd1c8aaee00bc4f
-+.previous
- ___
-
- {
+@@ -98,6 +98,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_neg:
+ .cfi_startproc
++ _CET_ENDBR
+ push %r12
+ .cfi_push %r12
+ push %r13
+@@ -166,6 +167,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_ord_mul_mont:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($addx);
+ leaq OPENSSL_ia32cap_P(%rip), %rcx
+@@ -497,6 +499,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_ord_sqr_mont:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($addx);
+ leaq OPENSSL_ia32cap_P(%rip), %rcx
+@@ -1247,6 +1250,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_mul_mont:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($addx);
+ leaq OPENSSL_ia32cap_P(%rip), %rcx
+@@ -1549,6 +1553,7 @@ __ecp_nistz256_mul_montq:
+ .align 32
+ ecp_nistz256_sqr_mont:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($addx);
+ leaq OPENSSL_ia32cap_P(%rip), %rcx
+@@ -2098,6 +2103,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_select_w5:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($avx>1);
+ leaq OPENSSL_ia32cap_P(%rip), %rax
+@@ -2198,6 +2204,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_select_w7:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($avx>1);
+ leaq OPENSSL_ia32cap_P(%rip), %rax
+@@ -2403,6 +2410,7 @@ $code.=<<___;
+ ecp_nistz256_avx2_select_w7:
+ .cfi_startproc
+ .Lavx2_select_w7:
++ _CET_ENDBR
+ vzeroupper
+ ___
+ $code.=<<___ if ($win64);
+@@ -2514,6 +2522,7 @@ $code.=<<___;
+ .type ecp_nistz256_avx2_select_w7,\@function,3
+ .align 32
+ ecp_nistz256_avx2_select_w7:
++ _CET_ENDBR
+ .byte 0x0f,0x0b # ud2
+ ret
+ .size ecp_nistz256_avx2_select_w7,.-ecp_nistz256_avx2_select_w7
+@@ -2718,6 +2727,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_point_double:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($addx);
+ leaq OPENSSL_ia32cap_P(%rip), %rcx
+@@ -2970,6 +2980,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_point_add:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($addx);
+ leaq OPENSSL_ia32cap_P(%rip), %rcx
+@@ -3368,6 +3379,7 @@ $code.=<<___;
+ .align 32
+ ecp_nistz256_point_add_affine:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ $code.=<<___ if ($addx);
+ leaq OPENSSL_ia32cap_P(%rip), %rcx
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl
new file mode 100644
index 000000000000..ff08be36e5fc
--- /dev/null
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_ec_asm_p256__beeu-x86__64-asm.pl
@@ -0,0 +1,10 @@
+--- third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl.orig 2023-07-24 14:27:53 UTC
++++ third_party/boringssl/src/crypto/fipsmodule/ec/asm/p256_beeu-x86_64-asm.pl
+@@ -154,6 +154,7 @@ $code.=<<___;
+ .align 32
+ beeu_mod_inverse_vartime:
+ .cfi_startproc
++ _CET_ENDBR
+ push %rbp
+ .cfi_push rbp
+ push %r12
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl
new file mode 100644
index 000000000000..200a282061ed
--- /dev/null
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_md5_asm_md5-x86__64.pl
@@ -0,0 +1,10 @@
+--- third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl.orig 2023-07-24 14:27:53 UTC
++++ third_party/boringssl/src/crypto/fipsmodule/md5/asm/md5-x86_64.pl
+@@ -131,6 +131,7 @@ $code .= <<EOF;
+ .type md5_block_asm_data_order,\@function,3
+ md5_block_asm_data_order:
+ .cfi_startproc
++ _CET_ENDBR
+ push %rbp
+ .cfi_push rbp
+ push %rbx
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl
index a092bc9c69ac..014dbb27783f 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_aesni-gcm-x86__64.pl
@@ -1,18 +1,34 @@
---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig 2023-04-22 17:45:15 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/aesni-gcm-x86_64.pl
-@@ -1053,6 +1053,7 @@ $code.=<<___;
- ___
+@@ -442,6 +442,7 @@ $code.=<<___;
+ aesni_gcm_decrypt:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
+ xor %rax,%rax
- $code.=<<___;
-+.rodata
- .align 64
- .Lbswap_mask:
- .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -1066,6 +1067,7 @@ $code.=<<___;
- .byte 1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
- .asciz "AES-NI GCM module for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
- .align 64
-+.previous
- ___
- }}} else {{{
- $code=<<___; # assembler is too old
+ # We call |_aesni_ctr32_ghash_6x|, which requires at least 96 (0x60)
+@@ -715,6 +716,7 @@ _aesni_ctr32_6x:
+ aesni_gcm_encrypt:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
+ #ifdef BORINGSSL_DISPATCH_TEST
+ .extern BORINGSSL_function_hit
+ movb \$1,BORINGSSL_function_hit+2(%rip)
+@@ -1089,6 +1091,7 @@ $code=<<___; # assembler is too old
+ .globl aesni_gcm_encrypt
+ .type aesni_gcm_encrypt,\@abi-omnipotent
+ aesni_gcm_encrypt:
++ _CET_ENDBR
+ xor %eax,%eax
+ ret
+ .size aesni_gcm_encrypt,.-aesni_gcm_encrypt
+@@ -1096,6 +1099,7 @@ aesni_gcm_encrypt:
+ .globl aesni_gcm_decrypt
+ .type aesni_gcm_decrypt,\@abi-omnipotent
+ aesni_gcm_decrypt:
++ _CET_ENDBR
+ xor %eax,%eax
+ ret
+ .size aesni_gcm_decrypt,.-aesni_gcm_decrypt
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl
index 92f9a5984fd3..d63e306b5cfd 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-ssse3-x86__64.pl
@@ -1,18 +1,18 @@
---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig 2023-04-22 17:45:15 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-ssse3-x86_64.pl
-@@ -331,6 +331,7 @@ $code .= <<____;
- .seh_endproc
- .size gcm_ghash_ssse3,.-gcm_ghash_ssse3
-
-+.rodata
- .align 16
- # .Lreverse_bytes is a permutation which, if applied with pshufb, reverses the
- # bytes in an XMM register.
-@@ -339,6 +340,7 @@ $code .= <<____;
- # .Llow4_mask is an XMM mask which selects the low four bits of each byte.
- .Llow4_mask:
- .quad 0x0f0f0f0f0f0f0f0f, 0x0f0f0f0f0f0f0f0f
-+.previous
+@@ -104,6 +104,7 @@ my $code = <<____;
+ gcm_gmult_ssse3:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
____
-
- print $code;
+ $code .= <<____ if ($win64);
+ subq \$40, %rsp
+@@ -246,6 +247,7 @@ $code .= <<____;
+ gcm_ghash_ssse3:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
+ ____
+ $code .= <<____ if ($win64);
+ subq \$56, %rsp
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl
index 60e9336b3665..27447ea5fa02 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_modes_asm_ghash-x86__64.pl
@@ -1,18 +1,50 @@
---- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig 2023-04-22 17:45:15 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/modes/asm/ghash-x86_64.pl
-@@ -1297,6 +1297,7 @@ ___
- }
-
- $code.=<<___;
-+.rodata
- .align 64
- .Lbswap_mask:
- .byte 15,14,13,12,11,10,9,8,7,6,5,4,3,2,1,0
-@@ -1308,6 +1309,7 @@ $code.=<<___;
-
- .asciz "GHASH for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
- .align 64
-+.previous
+@@ -206,6 +206,7 @@ $code.=<<___;
+ gcm_init_clmul:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
+ .L_init_clmul:
___
-
- $code =~ s/\`([^\`]*)\`/eval($1)/gem;
+ $code.=<<___ if ($win64);
+@@ -288,6 +289,7 @@ $code.=<<___;
+ .align 16
+ gcm_gmult_clmul:
+ .cfi_startproc
++ _CET_ENDBR
+ .L_gmult_clmul:
+ movdqu ($Xip),$Xi
+ movdqa .Lbswap_mask(%rip),$T3
+@@ -340,6 +342,7 @@ $code.=<<___;
+ gcm_ghash_clmul:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
+ .L_ghash_clmul:
+ ___
+ $code.=<<___ if ($win64);
+@@ -708,6 +711,7 @@ $code.=<<___;
+ .align 32
+ gcm_init_avx:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ if ($avx) {
+ my ($Htbl,$Xip)=@_4args;
+@@ -853,6 +857,7 @@ $code.=<<___;
+ .align 32
+ gcm_gmult_avx:
+ .cfi_startproc
++ _CET_ENDBR
+ jmp .L_gmult_clmul
+ .cfi_endproc
+ .size gcm_gmult_avx,.-gcm_gmult_avx
+@@ -864,6 +869,7 @@ $code.=<<___;
+ .align 32
+ gcm_ghash_avx:
+ .cfi_startproc
++ _CET_ENDBR
+ ___
+ if ($avx) {
+ my ($Xip,$Htbl,$inp,$len)=@_4args;
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86__64.pl
new file mode 100644
index 000000000000..116d5fa0c53b
--- /dev/null
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_asm_rdrand-x86__64.pl
@@ -0,0 +1,18 @@
+--- third_party/boringssl/src/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl.orig 2023-07-24 14:27:53 UTC
++++ third_party/boringssl/src/crypto/fipsmodule/rand/asm/rdrand-x86_64.pl
+@@ -46,6 +46,7 @@ print<<___;
+ .align 16
+ CRYPTO_rdrand:
+ .cfi_startproc
++ _CET_ENDBR
+ xorq %rax, %rax
+ rdrand $tmp1
+ # An add-with-carry of zero effectively sets %rax to the carry flag.
+@@ -64,6 +65,7 @@ CRYPTO_rdrand:
+ .align 16
+ CRYPTO_rdrand_multiple8_buf:
+ .cfi_startproc
++ _CET_ENDBR
+ test $len, $len
+ jz .Lout
+ movq \$8, $tmp1
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
deleted file mode 100644
index b355ca1afe28..000000000000
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_rand_internal.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
-@@ -27,7 +27,8 @@ extern "C" {
-
-
- #if !defined(OPENSSL_WINDOWS) && !defined(OPENSSL_FUCHSIA) && \
-- !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && !defined(OPENSSL_TRUSTY)
-+ !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE) && !defined(OPENSSL_TRUSTY) && \
-+ !defined(OPENSSL_ARC4RANDOM)
- #define OPENSSL_URANDOM
- #endif
-
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl
index eb0f841ed159..6b3d6dc76515 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha1-x86__64.pl
@@ -1,18 +1,10 @@
---- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl.orig 2023-03-13 07:33:08 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha1-x86_64.pl
-@@ -1815,6 +1815,7 @@ ___
- }
- }
- $code.=<<___;
-+.rodata
- .align 64
- K_XX_XX:
- .long 0x5a827999,0x5a827999,0x5a827999,0x5a827999 # K_00_19
-@@ -1833,6 +1834,7 @@ ___
- $code.=<<___;
- .asciz "SHA1 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
- .align 64
-+.previous
- ___
-
- # EXCEPTION_DISPOSITION handler (EXCEPTION_RECORD *rec,ULONG64 frame,
+@@ -244,6 +244,7 @@ $code.=<<___;
+ .align 16
+ sha1_block_data_order:
+ .cfi_startproc
++ _CET_ENDBR
+ leaq OPENSSL_ia32cap_P(%rip),%r10
+ mov 0(%r10),%r9d
+ mov 4(%r10),%r8d
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl
index feb8d010c3d0..a1d584307dff 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_fipsmodule_sha_asm_sha512-x86__64.pl
@@ -1,30 +1,10 @@
---- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl.orig 2023-03-13 07:33:08 UTC
+--- third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/crypto/fipsmodule/sha/asm/sha512-x86_64.pl
-@@ -404,6 +404,7 @@ ___
-
- if ($SZ==4) {
- $code.=<<___;
-+.rodata
- .align 64
- .type $TABLE,\@object
- $TABLE:
-@@ -447,9 +448,11 @@ $TABLE:
- .long 0xffffffff,0xffffffff,0x03020100,0x0b0a0908
- .long 0xffffffff,0xffffffff,0x03020100,0x0b0a0908
- .asciz "SHA256 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-+.previous
+@@ -263,6 +263,7 @@ $code=<<___;
+ .align 16
+ $func:
+ .cfi_startproc
++ _CET_ENDBR
___
- } else {
- $code.=<<___;
-+.rodata
- .align 64
- .type $TABLE,\@object
- $TABLE:
-@@ -537,6 +540,7 @@ $TABLE:
- .quad 0x0001020304050607,0x08090a0b0c0d0e0f
- .quad 0x0001020304050607,0x08090a0b0c0d0e0f
- .asciz "SHA512 block transform for x86_64, CRYPTOGAMS by <appro\@openssl.org>"
-+.previous
- ___
- }
-
+ $code.=<<___ if ($SZ==4 || $avx);
+ leaq OPENSSL_ia32cap_P(%rip),%r11
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_perlasm_x86__64-xlate.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_perlasm_x86__64-xlate.pl
new file mode 100644
index 000000000000..dcd9537306df
--- /dev/null
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_perlasm_x86__64-xlate.pl
@@ -0,0 +1,24 @@
+--- third_party/boringssl/src/crypto/perlasm/x86_64-xlate.pl.orig 2023-07-24 14:27:53 UTC
++++ third_party/boringssl/src/crypto/perlasm/x86_64-xlate.pl
+@@ -1510,6 +1510,21 @@ OPTION DOTNAME
+ ___
+ }
+
++if ($nasm) {
++ print <<___;
++\%define _CET_ENDBR
++___
++} else {
++ print <<___;
++#if defined(__CET__)
++#include <cet.h>
++#else
++#define _CET_ENDBR
++#endif
++
++___
++}
++
+ if ($gas) {
+ my $target;
+ if ($elf) {
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c b/www/iridium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c
deleted file mode 100644
index edc7e28b7b77..000000000000
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_rand__extra_arc4random.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- third_party/boringssl/src/crypto/rand_extra/arc4random.c.orig 2022-03-28 18:11:04 UTC
-+++ third_party/boringssl/src/crypto/rand_extra/arc4random.c
-@@ -0,0 +1,33 @@
-+/* Copyright (c) 2018, Robert Nagy <robert@openbsd.org>
-+ *
-+ * Permission to use, copy, modify, and/or distribute this software for any
-+ * purpose with or without fee is hereby granted, provided that the above
-+ * copyright notice and this permission notice appear in all copies.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-+ * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
-+ * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */
-+
-+#define _BSD_SOURCE 1
-+
-+#include <openssl/rand.h>
-+
-+#if defined(OPENSSL_ARC4RANDOM) && !defined(BORINGSSL_UNSAFE_DETERMINISTIC_MODE)
-+
-+#include <stdlib.h>
-+
-+#include "../fipsmodule/rand/internal.h"
-+
-+void CRYPTO_sysrand_for_seed(uint8_t *out, size_t requested) {
-+ CRYPTO_sysrand(out, requested);
-+}
-+
-+void CRYPTO_sysrand(uint8_t *out, size_t requested) {
-+ arc4random_buf(out, requested);
-+}
-+
-+#endif // OPENSSL_ARC4RANDOM && !BORINGSSL_UNSAFE_DETERMINISTIC_MODE
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
deleted file mode 100644
index 9fa688598264..000000000000
--- a/www/iridium/files/patch-third__party_boringssl_src_crypto_refcount__c11.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- third_party/boringssl/src/crypto/refcount_c11.c.orig 2022-10-05 07:34:01 UTC
-+++ third_party/boringssl/src/crypto/refcount_c11.c
-@@ -22,6 +22,9 @@
- #include <stdatomic.h>
- #include <stdlib.h>
-
-+#if !defined(__cplusplus) && !defined(static_assert)
-+#define static_assert _Static_assert
-+#endif
-
- // See comment above the typedef of CRYPTO_refcount_t about these tests.
- static_assert(alignof(CRYPTO_refcount_t) == alignof(_Atomic CRYPTO_refcount_t),
diff --git a/www/iridium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl b/www/iridium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl
new file mode 100644
index 000000000000..392faac41b18
--- /dev/null
+++ b/www/iridium/files/patch-third__party_boringssl_src_crypto_test_asm_trampoline-x86__64.pl
@@ -0,0 +1,58 @@
+--- third_party/boringssl/src/crypto/test/asm/trampoline-x86_64.pl.orig 2023-07-24 14:27:53 UTC
++++ third_party/boringssl/src/crypto/test/asm/trampoline-x86_64.pl
+@@ -141,6 +141,7 @@ my $code = <<____;
+ abi_test_trampoline:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
+ # Stack layout:
+ # 8 bytes - align
+ # $caller_state_size bytes - saved caller registers
+@@ -307,6 +308,7 @@ foreach ("ax", "bx", "cx", "dx", "di", "si", "bp", 8..
+ .globl abi_test_clobber_r$_
+ .align 16
+ abi_test_clobber_r$_:
++ _CET_ENDBR
+ xorq %r$_, %r$_
+ ret
+ .size abi_test_clobber_r$_,.-abi_test_clobber_r$_
+@@ -319,6 +321,7 @@ foreach (0..15) {
+ .globl abi_test_clobber_xmm$_
+ .align 16
+ abi_test_clobber_xmm$_:
++ _CET_ENDBR
+ pxor %xmm$_, %xmm$_
+ ret
+ .size abi_test_clobber_xmm$_,.-abi_test_clobber_xmm$_
+@@ -335,6 +338,7 @@ $code .= <<____;
+ abi_test_bad_unwind_wrong_register:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
+ pushq %r12
+ .cfi_push %r13 # This should be %r13
+ .seh_pushreg %r13 # This should be %r13
+@@ -358,6 +362,7 @@ abi_test_bad_unwind_wrong_register:
+ abi_test_bad_unwind_temporary:
+ .cfi_startproc
+ .seh_startproc
++ _CET_ENDBR
+ pushq %r12
+ .cfi_push %r12
+ .seh_pushreg %r12
+@@ -384,6 +389,7 @@ abi_test_bad_unwind_temporary:
+ .type abi_test_set_direction_flag, \@abi-omnipotent
+ .globl abi_test_get_and_clear_direction_flag
+ abi_test_get_and_clear_direction_flag:
++ _CET_ENDBR
+ pushfq
+ popq %rax
+ andq \$0x400, %rax
+@@ -397,6 +403,7 @@ abi_test_get_and_clear_direction_flag:
+ .type abi_test_set_direction_flag, \@abi-omnipotent
+ .globl abi_test_set_direction_flag
+ abi_test_set_direction_flag:
++ _CET_ENDBR
+ std
+ ret
+ .size abi_test_set_direction_flag,.-abi_test_set_direction_flag
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
deleted file mode 100644
index 6d3417335bc1..000000000000
--- a/www/iridium/files/patch-third__party_boringssl_src_include_openssl_base.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- third_party/boringssl/src/include/openssl/base.h.orig 2023-04-22 17:45:15 UTC
-+++ third_party/boringssl/src/include/openssl/base.h
-@@ -151,6 +151,11 @@ extern "C" {
- #define OPENSSL_FUCHSIA
- #endif
-
-+#if defined(__OpenBSD__)
-+#define OPENSSL_OPENBSD
-+#define OPENSSL_ARC4RANDOM
-+#endif
-+
- #if defined(__TRUSTY__)
- #define OPENSSL_TRUSTY
- #define OPENSSL_NO_THREADS_CORRUPT_MEMORY_AND_LEAK_SECRETS_IF_THREADED
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
deleted file mode 100644
index 04cc267c0401..000000000000
--- a/www/iridium/files/patch-third__party_boringssl_src_include_openssl_thread.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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_boringssl_src_util_generate__build__files.py b/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py
index c71ba241ee24..cc76f2cd5865 100644
--- a/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py
+++ b/www/iridium/files/patch-third__party_boringssl_src_util_generate__build__files.py
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/util/generate_build_files.py.orig 2023-04-22 17:45:15 UTC
+--- third_party/boringssl/src/util/generate_build_files.py.orig 2023-07-24 14:27:53 UTC
+++ third_party/boringssl/src/util/generate_build_files.py
-@@ -785,10 +785,10 @@ def main(platforms):
+@@ -787,10 +787,10 @@ def main(platforms):
]
# Generate err_data.c
@@ -15,7 +15,7 @@
crypto_c_files.append('err_data.c')
crypto_c_files.sort()
-@@ -801,11 +801,11 @@ def main(platforms):
+@@ -803,11 +803,11 @@ def main(platforms):
crypto_test_files = []
if EMBED_TEST_DATA:
# Generate crypto_test_data.cc
diff --git a/www/iridium/files/patch-third__party_ruy_BUILD.gn b/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni
index 536bbfe43ccc..620f714a75aa 100644
--- a/www/iridium/files/patch-third__party_ruy_BUILD.gn
+++ b/www/iridium/files/patch-third__party_cpuinfo_cpuinfo.gni
@@ -1,11 +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 =
+--- third_party/cpuinfo/cpuinfo.gni.orig 2023-07-24 14:27:53 UTC
++++ third_party/cpuinfo/cpuinfo.gni
+@@ -7,7 +7,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 &&
+ # cpuinfo is crashy on the Windows Arm64 chips.
+ !(is_win && current_cpu == "arm64") &&
# 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_crc32c_BUILD.gn b/www/iridium/files/patch-third__party_crc32c_BUILD.gn
index 7468fb4e4f11..e29693525269 100644
--- a/www/iridium/files/patch-third__party_crc32c_BUILD.gn
+++ b/www/iridium/files/patch-third__party_crc32c_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/crc32c/BUILD.gn.orig 2022-03-28 18:11:04 UTC
+--- third_party/crc32c/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/crc32c/BUILD.gn
-@@ -47,7 +47,7 @@ config("crc32c_config") {
+@@ -46,7 +46,7 @@ config("crc32c_config") {
}
# Android added <sys/auxv.h> in API level 18.
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 db695db5ff19..18c6c27cb221 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,6 +1,6 @@
---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-12-06 08:09:13 UTC
+--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/dawn/include/dawn/native/VulkanBackend.h
-@@ -82,7 +82,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
+@@ -76,7 +76,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
};
// Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome
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
deleted file mode 100644
index 31e015b3fb10..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config.h
+++ /dev/null
@@ -1,752 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h.orig 2023-04-22 17:45:15 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config.h
-@@ -0,0 +1,749 @@
-+/* 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-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_LICENSE "LGPL version 2.1 or later"
-+#define CONFIG_THIS_YEAR 2023
-+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+#define CC_IDENT "OpenBSD clang version 13.0.0"
-+#define OS_NAME openbsd
-+#define av_restrict restrict
-+#define EXTERN_PREFIX ""
-+#define EXTERN_ASM
-+#define BUILDSUF ""
-+#define SLIBSUF ".so"
-+#define HAVE_MMX2 HAVE_MMXEXT
-+#define SWS_MAX_FILTER_SIZE 256
-+#define ARCH_AARCH64 1
-+#define ARCH_ALPHA 0
-+#define ARCH_ARM 0
-+#define ARCH_AVR32 0
-+#define ARCH_AVR32_AP 0
-+#define ARCH_AVR32_UC 0
-+#define ARCH_BFIN 0
-+#define ARCH_IA64 0
-+#define ARCH_LOONGARCH 0
-+#define ARCH_LOONGARCH32 0
-+#define ARCH_LOONGARCH64 0
-+#define ARCH_M68K 0
-+#define ARCH_MIPS 0
-+#define ARCH_MIPS64 0
-+#define ARCH_PARISC 0
-+#define ARCH_PPC 0
-+#define ARCH_PPC64 0
-+#define ARCH_RISCV 0
-+#define ARCH_S390 0
-+#define ARCH_SH4 0
-+#define ARCH_SPARC 0
-+#define ARCH_SPARC64 0
-+#define ARCH_TILEGX 0
-+#define ARCH_TILEPRO 0
-+#define ARCH_TOMI 0
-+#define ARCH_X86 0
-+#define ARCH_X86_32 0
-+#define ARCH_X86_64 0
-+#define HAVE_ARMV5TE 0
-+#define HAVE_ARMV6 0
-+#define HAVE_ARMV6T2 0
-+#define HAVE_ARMV8 1
-+#define HAVE_NEON 1
-+#define HAVE_VFP 1
-+#define HAVE_VFPV3 0
-+#define HAVE_SETEND 0
-+#define HAVE_ALTIVEC 0
-+#define HAVE_DCBZL 0
-+#define HAVE_LDBRX 0
-+#define HAVE_POWER8 0
-+#define HAVE_PPC4XX 0
-+#define HAVE_VSX 0
-+#define HAVE_RVV 0
-+#define HAVE_AESNI 0
-+#define HAVE_AMD3DNOW 0
-+#define HAVE_AMD3DNOWEXT 0
-+#define HAVE_AVX 0
-+#define HAVE_AVX2 0
-+#define HAVE_AVX512 0
-+#define HAVE_AVX512ICL 0
-+#define HAVE_FMA3 0
-+#define HAVE_FMA4 0
-+#define HAVE_MMX 0
-+#define HAVE_MMXEXT 0
-+#define HAVE_SSE 0
-+#define HAVE_SSE2 0
-+#define HAVE_SSE3 0
-+#define HAVE_SSE4 0
-+#define HAVE_SSE42 0
-+#define HAVE_SSSE3 0
-+#define HAVE_XOP 0
-+#define HAVE_CPUNOP 0
-+#define HAVE_I686 0
-+#define HAVE_MIPSFPU 0
-+#define HAVE_MIPS32R2 0
-+#define HAVE_MIPS32R5 0
-+#define HAVE_MIPS64R2 0
-+#define HAVE_MIPS32R6 0
-+#define HAVE_MIPS64R6 0
-+#define HAVE_MIPSDSP 0
-+#define HAVE_MIPSDSPR2 0
-+#define HAVE_MSA 0
-+#define HAVE_LOONGSON2 0
-+#define HAVE_LOONGSON3 0
-+#define HAVE_MMI 0
-+#define HAVE_LSX 0
-+#define HAVE_LASX 0
-+#define HAVE_ARMV5TE_EXTERNAL 0
-+#define HAVE_ARMV6_EXTERNAL 0
-+#define HAVE_ARMV6T2_EXTERNAL 0
-+#define HAVE_ARMV8_EXTERNAL 1
-+#define HAVE_NEON_EXTERNAL 1
-+#define HAVE_VFP_EXTERNAL 1
-+#define HAVE_VFPV3_EXTERNAL 0
-+#define HAVE_SETEND_EXTERNAL 0
-+#define HAVE_ALTIVEC_EXTERNAL 0
-+#define HAVE_DCBZL_EXTERNAL 0
-+#define HAVE_LDBRX_EXTERNAL 0
-+#define HAVE_POWER8_EXTERNAL 0
-+#define HAVE_PPC4XX_EXTERNAL 0
-+#define HAVE_VSX_EXTERNAL 0
-+#define HAVE_RVV_EXTERNAL 0
-+#define HAVE_AESNI_EXTERNAL 0
-+#define HAVE_AMD3DNOW_EXTERNAL 0
-+#define HAVE_AMD3DNOWEXT_EXTERNAL 0
-+#define HAVE_AVX_EXTERNAL 0
-+#define HAVE_AVX2_EXTERNAL 0
-+#define HAVE_AVX512_EXTERNAL 0
-+#define HAVE_AVX512ICL_EXTERNAL 0
-+#define HAVE_FMA3_EXTERNAL 0
-+#define HAVE_FMA4_EXTERNAL 0
-+#define HAVE_MMX_EXTERNAL 0
-+#define HAVE_MMXEXT_EXTERNAL 0
-+#define HAVE_SSE_EXTERNAL 0
-+#define HAVE_SSE2_EXTERNAL 0
-+#define HAVE_SSE3_EXTERNAL 0
-+#define HAVE_SSE4_EXTERNAL 0
-+#define HAVE_SSE42_EXTERNAL 0
-+#define HAVE_SSSE3_EXTERNAL 0
-+#define HAVE_XOP_EXTERNAL 0
-+#define HAVE_CPUNOP_EXTERNAL 0
-+#define HAVE_I686_EXTERNAL 0
-+#define HAVE_MIPSFPU_EXTERNAL 0
-+#define HAVE_MIPS32R2_EXTERNAL 0
-+#define HAVE_MIPS32R5_EXTERNAL 0
-+#define HAVE_MIPS64R2_EXTERNAL 0
-+#define HAVE_MIPS32R6_EXTERNAL 0
-+#define HAVE_MIPS64R6_EXTERNAL 0
-+#define HAVE_MIPSDSP_EXTERNAL 0
-+#define HAVE_MIPSDSPR2_EXTERNAL 0
-+#define HAVE_MSA_EXTERNAL 0
-+#define HAVE_LOONGSON2_EXTERNAL 0
-+#define HAVE_LOONGSON3_EXTERNAL 0
-+#define HAVE_MMI_EXTERNAL 0
-+#define HAVE_LSX_EXTERNAL 0
-+#define HAVE_LASX_EXTERNAL 0
-+#define HAVE_ARMV5TE_INLINE 0
-+#define HAVE_ARMV6_INLINE 0
-+#define HAVE_ARMV6T2_INLINE 0
-+#define HAVE_ARMV8_INLINE 1
-+#define HAVE_NEON_INLINE 1
-+#define HAVE_VFP_INLINE 1
-+#define HAVE_VFPV3_INLINE 0
-+#define HAVE_SETEND_INLINE 0
-+#define HAVE_ALTIVEC_INLINE 0
-+#define HAVE_DCBZL_INLINE 0
-+#define HAVE_LDBRX_INLINE 0
-+#define HAVE_POWER8_INLINE 0
-+#define HAVE_PPC4XX_INLINE 0
-+#define HAVE_VSX_INLINE 0
-+#define HAVE_RVV_INLINE 0
-+#define HAVE_AESNI_INLINE 0
-+#define HAVE_AMD3DNOW_INLINE 0
-+#define HAVE_AMD3DNOWEXT_INLINE 0
-+#define HAVE_AVX_INLINE 0
-+#define HAVE_AVX2_INLINE 0
-+#define HAVE_AVX512_INLINE 0
-+#define HAVE_AVX512ICL_INLINE 0
-+#define HAVE_FMA3_INLINE 0
-+#define HAVE_FMA4_INLINE 0
-+#define HAVE_MMX_INLINE 0
-+#define HAVE_MMXEXT_INLINE 0
-+#define HAVE_SSE_INLINE 0
-+#define HAVE_SSE2_INLINE 0
-+#define HAVE_SSE3_INLINE 0
-+#define HAVE_SSE4_INLINE 0
-+#define HAVE_SSE42_INLINE 0
-+#define HAVE_SSSE3_INLINE 0
-+#define HAVE_XOP_INLINE 0
-+#define HAVE_CPUNOP_INLINE 0
-+#define HAVE_I686_INLINE 0
-+#define HAVE_MIPSFPU_INLINE 0
-+#define HAVE_MIPS32R2_INLINE 0
-+#define HAVE_MIPS32R5_INLINE 0
-+#define HAVE_MIPS64R2_INLINE 0
-+#define HAVE_MIPS32R6_INLINE 0
-+#define HAVE_MIPS64R6_INLINE 0
-+#define HAVE_MIPSDSP_INLINE 0
-+#define HAVE_MIPSDSPR2_INLINE 0
-+#define HAVE_MSA_INLINE 0
-+#define HAVE_LOONGSON2_INLINE 0
-+#define HAVE_LOONGSON3_INLINE 0
-+#define HAVE_MMI_INLINE 0
-+#define HAVE_LSX_INLINE 0
-+#define HAVE_LASX_INLINE 0
-+#define HAVE_ALIGNED_STACK 1
-+#define HAVE_FAST_64BIT 1
-+#define HAVE_FAST_CLZ 1
-+#define HAVE_FAST_CMOV 0
-+#define HAVE_FAST_FLOAT16 1
-+#define HAVE_LOCAL_ALIGNED 0
-+#define HAVE_SIMD_ALIGN_16 1
-+#define HAVE_SIMD_ALIGN_32 0
-+#define HAVE_SIMD_ALIGN_64 0
-+#define HAVE_ATOMIC_CAS_PTR 0
-+#define HAVE_MACHINE_RW_BARRIER 0
-+#define HAVE_MEMORYBARRIER 0
-+#define HAVE_MM_EMPTY 0
-+#define HAVE_RDTSC 0
-+#define HAVE_SEM_TIMEDWAIT 1
-+#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+#define HAVE_INLINE_ASM 1
-+#define HAVE_SYMVER 0
-+#define HAVE_X86ASM 0
-+#define HAVE_BIGENDIAN 0
-+#define HAVE_FAST_UNALIGNED 1
-+#define HAVE_ARPA_INET_H 0
-+#define HAVE_ASM_TYPES_H 0
-+#define HAVE_CDIO_PARANOIA_H 0
-+#define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+#define HAVE_CUDA_H 0
-+#define HAVE_DISPATCH_DISPATCH_H 0
-+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0
-+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
-+#define HAVE_DEV_IC_BT8XX_H 1
-+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
-+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
-+#define HAVE_DIRECT_H 0
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DXGIDEBUG_H 0
-+#define HAVE_DXVA_H 0
-+#define HAVE_ES2_GL_H 0
-+#define HAVE_GSM_H 0
-+#define HAVE_IO_H 0
-+#define HAVE_LINUX_DMA_BUF_H 0
-+#define HAVE_LINUX_PERF_EVENT_H 0
-+#define HAVE_MACHINE_IOCTL_BT848_H 0
-+#define HAVE_MACHINE_IOCTL_METEOR_H 0
-+#define HAVE_MALLOC_H 0
-+#define HAVE_OPENCV2_CORE_CORE_C_H 0
-+#define HAVE_OPENGL_GL3_H 0
-+#define HAVE_POLL_H 1
-+#define HAVE_SYS_PARAM_H 1
-+#define HAVE_SYS_RESOURCE_H 1
-+#define HAVE_SYS_SELECT_H 1
-+#define HAVE_SYS_SOUNDCARD_H 0
-+#define HAVE_SYS_TIME_H 1
-+#define HAVE_SYS_UN_H 1
-+#define HAVE_SYS_VIDEOIO_H 1
-+#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 1 -- forced to 0. See https://crbug.com/590440 */
-+#define HAVE_WINDOWS_H 0
-+#define HAVE_WINSOCK2_H 0
-+#define HAVE_INTRINSICS_NEON 1
-+#define HAVE_ATANF 1
-+#define HAVE_ATAN2F 1
-+#define HAVE_CBRT 1
-+#define HAVE_CBRTF 1
-+#define HAVE_COPYSIGN 1
-+#define HAVE_COSF 1
-+#define HAVE_ERF 1
-+#define HAVE_EXP2 1
-+#define HAVE_EXP2F 1
-+#define HAVE_EXPF 1
-+#define HAVE_HYPOT 1
-+#define HAVE_ISFINITE 1
-+#define HAVE_ISINF 1
-+#define HAVE_ISNAN 1
-+#define HAVE_LDEXPF 1
-+#define HAVE_LLRINT 1
-+#define HAVE_LLRINTF 1
-+#define HAVE_LOG2 1
-+#define HAVE_LOG2F 1
-+#define HAVE_LOG10F 1
-+#define HAVE_LRINT 1
-+#define HAVE_LRINTF 1
-+#define HAVE_POWF 1
-+#define HAVE_RINT 1
-+#define HAVE_ROUND 1
-+#define HAVE_ROUNDF 1
-+#define HAVE_SINF 1
-+#define HAVE_TRUNC 1
-+#define HAVE_TRUNCF 1
-+#define HAVE_DOS_PATHS 0
-+#define HAVE_LIBC_MSVCRT 0
-+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
-+#define HAVE_SECTION_DATA_REL_RO 1
-+#define HAVE_THREADS 1
-+#define HAVE_UWP 0
-+#define HAVE_WINRT 0
-+#define HAVE_ACCESS 1
-+#define HAVE_ALIGNED_MALLOC 0
-+#define HAVE_ARC4RANDOM 1
-+#define HAVE_CLOCK_GETTIME 1
-+#define HAVE_CLOSESOCKET 0
-+#define HAVE_COMMANDLINETOARGVW 0
-+#define HAVE_FCNTL 1
-+#define HAVE_GETADDRINFO 0
-+#define HAVE_GETAUXVAL 0
-+#define HAVE_GETENV 1
-+#define HAVE_GETHRTIME 0
-+#define HAVE_GETOPT 1
-+#define HAVE_GETMODULEHANDLE 0
-+#define HAVE_GETPROCESSAFFINITYMASK 0
-+#define HAVE_GETPROCESSMEMORYINFO 0
-+#define HAVE_GETPROCESSTIMES 0
-+#define HAVE_GETRUSAGE 1
-+#define HAVE_GETSTDHANDLE 0
-+#define HAVE_GETSYSTEMTIMEASFILETIME 0
-+#define HAVE_GETTIMEOFDAY 1
-+#define HAVE_GLOB 1
-+#define HAVE_GLXGETPROCADDRESS 0
-+#define HAVE_GMTIME_R 1
-+#define HAVE_INET_ATON 0
-+#define HAVE_ISATTY 1
-+#define HAVE_KBHIT 0
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_LSTAT 1
-+#define HAVE_LZO1X_999_COMPRESS 0
-+#define HAVE_MACH_ABSOLUTE_TIME 0
-+#define HAVE_MAPVIEWOFFILE 0
-+#define HAVE_MEMALIGN 0
-+#define HAVE_MKSTEMP 1
-+#define HAVE_MMAP 1
-+#define HAVE_MPROTECT 1
-+#define HAVE_NANOSLEEP 1
-+#define HAVE_PEEKNAMEDPIPE 0
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */
-+#define HAVE_PTHREAD_CANCEL 1
-+#define HAVE_SCHED_GETAFFINITY 0
-+#define HAVE_SECITEMIMPORT 0
-+#define HAVE_SETCONSOLETEXTATTRIBUTE 0
-+#define HAVE_SETCONSOLECTRLHANDLER 0
-+#define HAVE_SETDLLDIRECTORY 0
-+#define HAVE_SETMODE 0
-+#define HAVE_SETRLIMIT 1
-+#define HAVE_SLEEP 0
-+#define HAVE_STRERROR_R 1
-+#define HAVE_SYSCONF 1
-+#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 1 -- forced to 0 for Fuchsia */
-+#define HAVE_USLEEP 1
-+#define HAVE_UTGETOSTYPEFROMSTRING 0
-+#define HAVE_VIRTUALALLOC 0
-+#define HAVE_WGLGETPROCADDRESS 0
-+#define HAVE_BCRYPT 0
-+#define HAVE_VAAPI_DRM 0
-+#define HAVE_VAAPI_X11 0
-+#define HAVE_VDPAU_X11 0
-+#define HAVE_PTHREADS 1
-+#define HAVE_OS2THREADS 0
-+#define HAVE_W32THREADS 0
-+#define HAVE_AS_ARCH_DIRECTIVE 0
-+#define HAVE_AS_DN_DIRECTIVE 0
-+#define HAVE_AS_FPU_DIRECTIVE 0
-+#define HAVE_AS_FUNC 0
-+#define HAVE_AS_OBJECT_ARCH 0
-+#define HAVE_ASM_MOD_Q 0
-+#define HAVE_BLOCKS_EXTENSION 0
-+#define HAVE_EBP_AVAILABLE 0
-+#define HAVE_EBX_AVAILABLE 0
-+#define HAVE_GNU_AS 0
-+#define HAVE_GNU_WINDRES 0
-+#define HAVE_IBM_ASM 0
-+#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
-+#define HAVE_INLINE_ASM_LABELS 1
-+#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-+#define HAVE_PRAGMA_DEPRECATED 1
-+#define HAVE_RSYNC_CONTIMEOUT 0
-+#define HAVE_SYMVER_ASM_LABEL 1
-+#define HAVE_SYMVER_GNU_ASM 1
-+/* #define HAVE_VFP_ARGS 0 -- softfp/hardfp selection is done by the chrome build */
-+#define HAVE_XFORM_ASM 0
-+#define HAVE_XMM_CLOBBERS 0
-+#define HAVE_DPI_AWARENESS_CONTEXT 0
-+#define HAVE_IDXGIOUTPUT5 0
-+#define HAVE_KCMVIDEOCODECTYPE_HEVC 0
-+#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
-+#define HAVE_KCMVIDEOCODECTYPE_VP9 0
-+#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0
-+#define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0
-+#define HAVE_SOCKLEN_T 0
-+#define HAVE_STRUCT_ADDRINFO 0
-+#define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-+#define HAVE_STRUCT_IP_MREQ_SOURCE 0
-+#define HAVE_STRUCT_IPV6_MREQ 0
-+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0
-+#define HAVE_STRUCT_POLLFD 0
-+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
-+#define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
-+#define HAVE_STRUCT_SOCKADDR_IN6 0
-+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
-+#define HAVE_GZIP 1
-+#define HAVE_LIBDRM_GETFB2 0
-+#define HAVE_MAKEINFO 1
-+#define HAVE_MAKEINFO_HTML 0
-+#define HAVE_OPENCL_D3D11 0
-+#define HAVE_OPENCL_DRM_ARM 0
-+#define HAVE_OPENCL_DRM_BEIGNET 0
-+#define HAVE_OPENCL_DXVA2 0
-+#define HAVE_OPENCL_VAAPI_BEIGNET 0
-+#define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+#define HAVE_PERL 1
-+#define HAVE_POD2MAN 1
-+#define HAVE_TEXI2HTML 0
-+#define HAVE_XMLLINT 1
-+#define HAVE_ZLIB_GZIP 0
-+#define CONFIG_DOC 0
-+#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 0
-+#define CONFIG_PODPAGES 0
-+#define CONFIG_TXTPAGES 0
-+#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
-+#define CONFIG_AVIO_READING_EXAMPLE 1
-+#define CONFIG_DECODE_AUDIO_EXAMPLE 1
-+#define CONFIG_DECODE_VIDEO_EXAMPLE 1
-+#define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-+#define CONFIG_ENCODE_AUDIO_EXAMPLE 1
-+#define CONFIG_ENCODE_VIDEO_EXAMPLE 1
-+#define CONFIG_EXTRACT_MVS_EXAMPLE 1
-+#define CONFIG_FILTER_AUDIO_EXAMPLE 0
-+#define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-+#define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-+#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 1
-+#define CONFIG_HW_DECODE_EXAMPLE 1
-+#define CONFIG_METADATA_EXAMPLE 1
-+#define CONFIG_MUXING_EXAMPLE 0
-+#define CONFIG_QSVDEC_EXAMPLE 0
-+#define CONFIG_REMUXING_EXAMPLE 1
-+#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-+#define CONFIG_SCALING_VIDEO_EXAMPLE 0
-+#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-+#define CONFIG_TRANSCODING_EXAMPLE 0
-+#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
-+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-+#define CONFIG_QSV_TRANSCODE_EXAMPLE 0
-+#define CONFIG_AVISYNTH 0
-+#define CONFIG_FREI0R 0
-+#define CONFIG_LIBCDIO 0
-+#define CONFIG_LIBDAVS2 0
-+#define CONFIG_LIBRUBBERBAND 0
-+#define CONFIG_LIBVIDSTAB 0
-+#define CONFIG_LIBX264 0
-+#define CONFIG_LIBX265 0
-+#define CONFIG_LIBXAVS 0
-+#define CONFIG_LIBXAVS2 0
-+#define CONFIG_LIBXVID 0
-+#define CONFIG_DECKLINK 0
-+#define CONFIG_LIBFDK_AAC 0
-+#define CONFIG_LIBTLS 0
-+#define CONFIG_GMP 0
-+#define CONFIG_LIBARIBB24 0
-+#define CONFIG_LIBLENSFUN 0
-+#define CONFIG_LIBOPENCORE_AMRNB 0
-+#define CONFIG_LIBOPENCORE_AMRWB 0
-+#define CONFIG_LIBVO_AMRWBENC 0
-+#define CONFIG_MBEDTLS 0
-+#define CONFIG_RKMPP 0
-+#define CONFIG_LIBSMBCLIENT 0
-+#define CONFIG_CHROMAPRINT 0
-+#define CONFIG_GCRYPT 0
-+#define CONFIG_GNUTLS 0
-+#define CONFIG_JNI 0
-+#define CONFIG_LADSPA 0
-+#define CONFIG_LCMS2 0
-+#define CONFIG_LIBAOM 0
-+#define CONFIG_LIBASS 0
-+#define CONFIG_LIBBLURAY 0
-+#define CONFIG_LIBBS2B 0
-+#define CONFIG_LIBCACA 0
-+#define CONFIG_LIBCELT 0
-+#define CONFIG_LIBCODEC2 0
-+#define CONFIG_LIBDAV1D 0
-+#define CONFIG_LIBDC1394 0
-+#define CONFIG_LIBDRM 0
-+#define CONFIG_LIBFLITE 0
-+#define CONFIG_LIBFONTCONFIG 0
-+#define CONFIG_LIBFREETYPE 0
-+#define CONFIG_LIBFRIBIDI 0
-+#define CONFIG_LIBGLSLANG 0
-+#define CONFIG_LIBGME 0
-+#define CONFIG_LIBGSM 0
-+#define CONFIG_LIBIEC61883 0
-+#define CONFIG_LIBILBC 0
-+#define CONFIG_LIBJACK 0
-+#define CONFIG_LIBJXL 0
-+#define CONFIG_LIBKLVANC 0
-+#define CONFIG_LIBKVAZAAR 0
-+#define CONFIG_LIBMODPLUG 0
-+#define CONFIG_LIBMP3LAME 0
-+#define CONFIG_LIBMYSOFA 0
-+#define CONFIG_LIBOPENCV 0
-+#define CONFIG_LIBOPENH264 0
-+#define CONFIG_LIBOPENJPEG 0
-+#define CONFIG_LIBOPENMPT 0
-+#define CONFIG_LIBOPENVINO 0
-+#define CONFIG_LIBOPUS 1
-+#define CONFIG_LIBPLACEBO 0
-+#define CONFIG_LIBPULSE 0
-+#define CONFIG_LIBRABBITMQ 0
-+#define CONFIG_LIBRAV1E 0
-+#define CONFIG_LIBRIST 0
-+#define CONFIG_LIBRSVG 0
-+#define CONFIG_LIBRTMP 0
-+#define CONFIG_LIBSHADERC 0
-+#define CONFIG_LIBSHINE 0
-+#define CONFIG_LIBSMBCLIENT 0
-+#define CONFIG_LIBSNAPPY 0
-+#define CONFIG_LIBSOXR 0
-+#define CONFIG_LIBSPEEX 0
-+#define CONFIG_LIBSRT 0
-+#define CONFIG_LIBSSH 0
-+#define CONFIG_LIBSVTAV1 0
-+#define CONFIG_LIBTENSORFLOW 0
-+#define CONFIG_LIBTESSERACT 0
-+#define CONFIG_LIBTHEORA 0
-+#define CONFIG_LIBTWOLAME 0
-+#define CONFIG_LIBUAVS3D 0
-+#define CONFIG_LIBV4L2 0
-+#define CONFIG_LIBVMAF 0
-+#define CONFIG_LIBVORBIS 0
-+#define CONFIG_LIBVPX 0
-+#define CONFIG_LIBWEBP 0
-+#define CONFIG_LIBXML2 0
-+#define CONFIG_LIBZIMG 0
-+#define CONFIG_LIBZMQ 0
-+#define CONFIG_LIBZVBI 0
-+#define CONFIG_LV2 0
-+#define CONFIG_MEDIACODEC 0
-+#define CONFIG_OPENAL 0
-+#define CONFIG_OPENGL 0
-+#define CONFIG_OPENSSL 0
-+#define CONFIG_POCKETSPHINX 0
-+#define CONFIG_VAPOURSYNTH 0
-+#define CONFIG_ALSA 0
-+#define CONFIG_APPKIT 0
-+#define CONFIG_AVFOUNDATION 0
-+#define CONFIG_BZLIB 0
-+#define CONFIG_COREIMAGE 0
-+#define CONFIG_ICONV 0
-+#define CONFIG_LIBXCB 0
-+#define CONFIG_LIBXCB_SHM 0
-+#define CONFIG_LIBXCB_SHAPE 0
-+#define CONFIG_LIBXCB_XFIXES 0
-+#define CONFIG_LZMA 0
-+#define CONFIG_MEDIAFOUNDATION 0
-+#define CONFIG_METAL 0
-+#define CONFIG_SCHANNEL 0
-+#define CONFIG_SDL2 0
-+#define CONFIG_SECURETRANSPORT 0
-+#define CONFIG_SNDIO 0
-+#define CONFIG_XLIB 0
-+#define CONFIG_ZLIB 0
-+#define CONFIG_CUDA_NVCC 0
-+#define CONFIG_CUDA_SDK 0
-+#define CONFIG_LIBNPP 0
-+#define CONFIG_LIBMFX 0
-+#define CONFIG_LIBVPL 0
-+#define CONFIG_MMAL 0
-+#define CONFIG_OMX 0
-+#define CONFIG_OPENCL 0
-+#define CONFIG_AMF 0
-+#define CONFIG_AUDIOTOOLBOX 0
-+#define CONFIG_CRYSTALHD 0
-+#define CONFIG_CUDA 0
-+#define CONFIG_CUDA_LLVM 0
-+#define CONFIG_CUVID 0
-+#define CONFIG_D3D11VA 0
-+#define CONFIG_DXVA2 0
-+#define CONFIG_FFNVCODEC 0
-+#define CONFIG_NVDEC 0
-+#define CONFIG_NVENC 0
-+#define CONFIG_VAAPI 0
-+#define CONFIG_VDPAU 0
-+#define CONFIG_VIDEOTOOLBOX 0
-+#define CONFIG_VULKAN 0
-+#define CONFIG_V4L2_M2M 0
-+#define CONFIG_FTRAPV 0
-+#define CONFIG_GRAY 0
-+#define CONFIG_HARDCODED_TABLES 0
-+#define CONFIG_OMX_RPI 0
-+#define CONFIG_RUNTIME_CPUDETECT 1
-+#define CONFIG_SAFE_BITSTREAM_READER 1
-+#define CONFIG_SHARED 0
-+#define CONFIG_SMALL 0
-+#define CONFIG_STATIC 1
-+#define CONFIG_SWSCALE_ALPHA 1
-+#define CONFIG_GPL 0
-+#define CONFIG_NONFREE 0
-+#define CONFIG_VERSION3 0
-+#define CONFIG_AVDEVICE 0
-+#define CONFIG_AVFILTER 0
-+#define CONFIG_SWSCALE 0
-+#define CONFIG_POSTPROC 0
-+#define CONFIG_AVFORMAT 1
-+#define CONFIG_AVCODEC 1
-+#define CONFIG_SWRESAMPLE 0
-+#define CONFIG_AVUTIL 1
-+#define CONFIG_FFPLAY 0
-+#define CONFIG_FFPROBE 0
-+#define CONFIG_FFMPEG 0
-+#define CONFIG_DCT 1
-+#define CONFIG_DWT 0
-+#define CONFIG_ERROR_RESILIENCE 0
-+#define CONFIG_FAAN 0
-+#define CONFIG_FAST_UNALIGNED 1
-+#define CONFIG_FFT 1
-+#define CONFIG_LSP 0
-+#define CONFIG_MDCT 0
-+#define CONFIG_PIXELUTILS 0
-+#define CONFIG_NETWORK 0
-+#define CONFIG_RDFT 1
-+#define CONFIG_AUTODETECT 0
-+#define CONFIG_FONTCONFIG 0
-+#define CONFIG_LARGE_TESTS 1
-+#define CONFIG_LINUX_PERF 0
-+#define CONFIG_MACOS_KPERF 0
-+#define CONFIG_MEMORY_POISONING 0
-+#define CONFIG_NEON_CLOBBER_TEST 0
-+#define CONFIG_OSSFUZZ 0
-+#define CONFIG_PIC 1
-+#define CONFIG_PTX_COMPRESSION 0
-+#define CONFIG_THUMB 0
-+#define CONFIG_VALGRIND_BACKTRACE 0
-+#define CONFIG_XMM_CLOBBER_TEST 0
-+#define CONFIG_BSFS 0
-+#define CONFIG_DECODERS 1
-+#define CONFIG_ENCODERS 0
-+#define CONFIG_HWACCELS 0
-+#define CONFIG_PARSERS 1
-+#define CONFIG_INDEVS 0
-+#define CONFIG_OUTDEVS 0
-+#define CONFIG_FILTERS 0
-+#define CONFIG_DEMUXERS 1
-+#define CONFIG_MUXERS 0
-+#define CONFIG_PROTOCOLS 0
-+#define CONFIG_AANDCTTABLES 0
-+#define CONFIG_AC3DSP 0
-+#define CONFIG_ADTS_HEADER 1
-+#define CONFIG_ATSC_A53 1
-+#define CONFIG_AUDIO_FRAME_QUEUE 0
-+#define CONFIG_AUDIODSP 0
-+#define CONFIG_BLOCKDSP 0
-+#define CONFIG_BSWAPDSP 0
-+#define CONFIG_CABAC 1
-+#define CONFIG_CBS 0
-+#define CONFIG_CBS_AV1 0
-+#define CONFIG_CBS_H264 0
-+#define CONFIG_CBS_H265 0
-+#define CONFIG_CBS_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
-+#define CONFIG_DVPROFILE 0
-+#define CONFIG_EXIF 0
-+#define CONFIG_FAANDCT 0
-+#define CONFIG_FAANIDCT 0
-+#define CONFIG_FDCTDSP 0
-+#define CONFIG_FMTCONVERT 0
-+#define CONFIG_FRAME_THREAD_ENCODER 0
-+#define CONFIG_G722DSP 0
-+#define CONFIG_GOLOMB 1
-+#define CONFIG_GPLV3 0
-+#define CONFIG_H263DSP 0
-+#define CONFIG_H264CHROMA 1
-+#define CONFIG_H264DSP 1
-+#define CONFIG_H264PARSE 1
-+#define CONFIG_H264PRED 1
-+#define CONFIG_H264QPEL 1
-+#define CONFIG_H264_SEI 1
-+#define CONFIG_HEVCPARSE 0
-+#define CONFIG_HEVC_SEI 0
-+#define CONFIG_HPELDSP 1
-+#define CONFIG_HUFFMAN 0
-+#define CONFIG_HUFFYUVDSP 0
-+#define CONFIG_HUFFYUVENCDSP 0
-+#define CONFIG_IDCTDSP 0
-+#define CONFIG_IIRFILTER 0
-+#define CONFIG_INFLATE_WRAPPER 0
-+#define CONFIG_INTRAX8 0
-+#define CONFIG_ISO_MEDIA 1
-+#define CONFIG_IVIDSP 0
-+#define CONFIG_JPEGTABLES 0
-+#define CONFIG_LGPLV3 0
-+#define CONFIG_LIBX262 0
-+#define CONFIG_LLAUDDSP 0
-+#define CONFIG_LLVIDDSP 0
-+#define CONFIG_LLVIDENCDSP 0
-+#define CONFIG_LPC 0
-+#define CONFIG_LZF 0
-+#define CONFIG_ME_CMP 0
-+#define CONFIG_MPEG_ER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
-+#define CONFIG_MPEG4AUDIO 1
-+#define CONFIG_MPEGVIDEO 0
-+#define CONFIG_MPEGVIDEODEC 0
-+#define CONFIG_MPEGVIDEOENC 0
-+#define CONFIG_MSMPEG4DEC 0
-+#define CONFIG_MSMPEG4ENC 0
-+#define CONFIG_MSS34DSP 0
-+#define CONFIG_PIXBLOCKDSP 0
-+#define CONFIG_QPELDSP 0
-+#define CONFIG_QSV 0
-+#define CONFIG_QSVDEC 0
-+#define CONFIG_QSVENC 0
-+#define CONFIG_QSVVPP 0
-+#define CONFIG_RANGECODER 0
-+#define CONFIG_RIFFDEC 1
-+#define CONFIG_RIFFENC 0
-+#define CONFIG_RTPDEC 0
-+#define CONFIG_RTPENC_CHAIN 0
-+#define CONFIG_RV34DSP 0
-+#define CONFIG_SCENE_SAD 0
-+#define CONFIG_SINEWIN 1
-+#define CONFIG_SNAPPY 0
-+#define CONFIG_SRTP 0
-+#define CONFIG_STARTCODE 1
-+#define CONFIG_TEXTUREDSP 0
-+#define CONFIG_TEXTUREDSPENC 0
-+#define CONFIG_TPELDSP 0
-+#define CONFIG_VAAPI_1 0
-+#define CONFIG_VAAPI_ENCODE 0
-+#define CONFIG_VC1DSP 0
-+#define CONFIG_VIDEODSP 1
-+#define CONFIG_VP3DSP 1
-+#define CONFIG_VP56DSP 0
-+#define CONFIG_VP8DSP 1
-+#define CONFIG_WMA_FREQS 0
-+#define CONFIG_WMV2DSP 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
deleted file mode 100644
index 6b16cb9a5241..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_arm64_config__components.h
+++ /dev/null
@@ -1,2149 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h.orig 2023-04-22 17:45:15 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/arm64/config_components.h
-@@ -0,0 +1,2146 @@
-+/* Automatically generated by configure - do not modify! */
-+#ifndef FFMPEG_CONFIG_COMPONENTS_H
-+#define FFMPEG_CONFIG_COMPONENTS_H
-+#define CONFIG_AAC_ADTSTOASC_BSF 0
-+#define CONFIG_AV1_FRAME_MERGE_BSF 0
-+#define CONFIG_AV1_FRAME_SPLIT_BSF 0
-+#define CONFIG_AV1_METADATA_BSF 0
-+#define CONFIG_CHOMP_BSF 0
-+#define CONFIG_DUMP_EXTRADATA_BSF 0
-+#define CONFIG_DCA_CORE_BSF 0
-+#define CONFIG_DTS2PTS_BSF 0
-+#define CONFIG_DV_ERROR_MARKER_BSF 0
-+#define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+#define CONFIG_FILTER_UNITS_BSF 0
-+#define CONFIG_H264_METADATA_BSF 0
-+#define CONFIG_H264_MP4TOANNEXB_BSF 0
-+#define CONFIG_H264_REDUNDANT_PPS_BSF 0
-+#define CONFIG_HAPQA_EXTRACT_BSF 0
-+#define CONFIG_HEVC_METADATA_BSF 0
-+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
-+#define CONFIG_IMX_DUMP_HEADER_BSF 0
-+#define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
-+#define CONFIG_MJPEG2JPEG_BSF 0
-+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+#define CONFIG_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_MEDIA100_DECODER 0
-+#define CONFIG_MIMIC_DECODER 0
-+#define CONFIG_MJPEG_DECODER 0
-+#define CONFIG_MJPEGB_DECODER 0
-+#define CONFIG_MMVIDEO_DECODER 0
-+#define CONFIG_MOBICLIP_DECODER 0
-+#define CONFIG_MOTIONPIXELS_DECODER 0
-+#define CONFIG_MPEG1VIDEO_DECODER 0
-+#define CONFIG_MPEG2VIDEO_DECODER 0
-+#define CONFIG_MPEG4_DECODER 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_PHM_DECODER 0
-+#define CONFIG_PHOTOCD_DECODER 0
-+#define CONFIG_PICTOR_DECODER 0
-+#define CONFIG_PIXLET_DECODER 0
-+#define CONFIG_PNG_DECODER 0
-+#define CONFIG_PPM_DECODER 0
-+#define CONFIG_PRORES_DECODER 0
-+#define CONFIG_PROSUMER_DECODER 0
-+#define CONFIG_PSD_DECODER 0
-+#define CONFIG_PTX_DECODER 0
-+#define CONFIG_QDRAW_DECODER 0
-+#define CONFIG_QOI_DECODER 0
-+#define CONFIG_QPEG_DECODER 0
-+#define CONFIG_QTRLE_DECODER 0
-+#define CONFIG_R10K_DECODER 0
-+#define CONFIG_R210_DECODER 0
-+#define CONFIG_RASC_DECODER 0
-+#define CONFIG_RAWVIDEO_DECODER 0
-+#define CONFIG_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_VQC_DECODER 0
-+#define CONFIG_WBMP_DECODER 0
-+#define CONFIG_WEBP_DECODER 0
-+#define CONFIG_WCMV_DECODER 0
-+#define CONFIG_WRAPPED_AVFRAME_DECODER 0
-+#define CONFIG_WMV1_DECODER 0
-+#define CONFIG_WMV2_DECODER 0
-+#define CONFIG_WMV3_DECODER 0
-+#define CONFIG_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_APAC_DECODER 0
-+#define CONFIG_APE_DECODER 0
-+#define CONFIG_APTX_DECODER 0
-+#define CONFIG_APTX_HD_DECODER 0
-+#define CONFIG_ATRAC1_DECODER 0
-+#define CONFIG_ATRAC3_DECODER 0
-+#define CONFIG_ATRAC3AL_DECODER 0
-+#define CONFIG_ATRAC3P_DECODER 0
-+#define CONFIG_ATRAC3PAL_DECODER 0
-+#define CONFIG_ATRAC9_DECODER 0
-+#define CONFIG_BINKAUDIO_DCT_DECODER 0
-+#define CONFIG_BINKAUDIO_RDFT_DECODER 0
-+#define CONFIG_BMV_AUDIO_DECODER 0
-+#define CONFIG_BONK_DECODER 0
-+#define CONFIG_COOK_DECODER 0
-+#define CONFIG_DCA_DECODER 0
-+#define CONFIG_DFPWM_DECODER 0
-+#define CONFIG_DOLBY_E_DECODER 0
-+#define CONFIG_DSD_LSBF_DECODER 0
-+#define CONFIG_DSD_MSBF_DECODER 0
-+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0
-+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0
-+#define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
-+#define CONFIG_DST_DECODER 0
-+#define CONFIG_EAC3_DECODER 0
-+#define CONFIG_EVRC_DECODER 0
-+#define CONFIG_FASTAUDIO_DECODER 0
-+#define CONFIG_FFWAVESYNTH_DECODER 0
-+#define CONFIG_FLAC_DECODER 1
-+#define CONFIG_FTR_DECODER 0
-+#define CONFIG_G723_1_DECODER 0
-+#define CONFIG_G729_DECODER 0
-+#define CONFIG_GSM_DECODER 0
-+#define CONFIG_GSM_MS_DECODER 0
-+#define CONFIG_HCA_DECODER 0
-+#define CONFIG_HCOM_DECODER 0
-+#define CONFIG_HDR_DECODER 0
-+#define CONFIG_IAC_DECODER 0
-+#define CONFIG_ILBC_DECODER 0
-+#define CONFIG_IMC_DECODER 0
-+#define CONFIG_INTERPLAY_ACM_DECODER 0
-+#define CONFIG_MACE3_DECODER 0
-+#define CONFIG_MACE6_DECODER 0
-+#define CONFIG_METASOUND_DECODER 0
-+#define CONFIG_MISC4_DECODER 0
-+#define CONFIG_MLP_DECODER 0
-+#define CONFIG_MP1_DECODER 0
-+#define CONFIG_MP1FLOAT_DECODER 0
-+#define CONFIG_MP2_DECODER 0
-+#define CONFIG_MP2FLOAT_DECODER 0
-+#define CONFIG_MP3FLOAT_DECODER 0
-+#define CONFIG_MP3_DECODER 1
-+#define CONFIG_MP3ADUFLOAT_DECODER 0
-+#define CONFIG_MP3ADU_DECODER 0
-+#define CONFIG_MP3ON4FLOAT_DECODER 0
-+#define CONFIG_MP3ON4_DECODER 0
-+#define CONFIG_MPC7_DECODER 0
-+#define CONFIG_MPC8_DECODER 0
-+#define CONFIG_MSNSIREN_DECODER 0
-+#define CONFIG_NELLYMOSER_DECODER 0
-+#define CONFIG_ON2AVC_DECODER 0
-+#define CONFIG_OPUS_DECODER 0
-+#define CONFIG_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_CBD2_DPCM_DECODER 0
-+#define CONFIG_DERF_DPCM_DECODER 0
-+#define CONFIG_GREMLIN_DPCM_DECODER 0
-+#define CONFIG_INTERPLAY_DPCM_DECODER 0
-+#define CONFIG_ROQ_DPCM_DECODER 0
-+#define CONFIG_SDX2_DPCM_DECODER 0
-+#define CONFIG_SOL_DPCM_DECODER 0
-+#define CONFIG_XAN_DPCM_DECODER 0
-+#define CONFIG_WADY_DPCM_DECODER 0
-+#define CONFIG_ADPCM_4XM_DECODER 0
-+#define CONFIG_ADPCM_ADX_DECODER 0
-+#define CONFIG_ADPCM_AFC_DECODER 0
-+#define CONFIG_ADPCM_AGM_DECODER 0
-+#define CONFIG_ADPCM_AICA_DECODER 0
-+#define CONFIG_ADPCM_ARGO_DECODER 0
-+#define CONFIG_ADPCM_CT_DECODER 0
-+#define CONFIG_ADPCM_DTK_DECODER 0
-+#define CONFIG_ADPCM_EA_DECODER 0
-+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
-+#define CONFIG_ADPCM_EA_R1_DECODER 0
-+#define CONFIG_ADPCM_EA_R2_DECODER 0
-+#define CONFIG_ADPCM_EA_R3_DECODER 0
-+#define CONFIG_ADPCM_EA_XAS_DECODER 0
-+#define CONFIG_ADPCM_G722_DECODER 0
-+#define CONFIG_ADPCM_G726_DECODER 0
-+#define CONFIG_ADPCM_G726LE_DECODER 0
-+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0
-+#define CONFIG_ADPCM_IMA_AMV_DECODER 0
-+#define CONFIG_ADPCM_IMA_ALP_DECODER 0
-+#define CONFIG_ADPCM_IMA_APC_DECODER 0
-+#define CONFIG_ADPCM_IMA_APM_DECODER 0
-+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
-+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK3_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK4_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_ISS_DECODER 0
-+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
-+#define CONFIG_ADPCM_IMA_MTF_DECODER 0
-+#define CONFIG_ADPCM_IMA_OKI_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_DECODER 0
-+#define CONFIG_ADPCM_IMA_RAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_SSI_DECODER 0
-+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
-+#define CONFIG_ADPCM_IMA_WAV_DECODER 0
-+#define CONFIG_ADPCM_IMA_WS_DECODER 0
-+#define CONFIG_ADPCM_MS_DECODER 0
-+#define CONFIG_ADPCM_MTAF_DECODER 0
-+#define CONFIG_ADPCM_PSX_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_2_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_3_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_4_DECODER 0
-+#define CONFIG_ADPCM_SWF_DECODER 0
-+#define CONFIG_ADPCM_THP_DECODER 0
-+#define CONFIG_ADPCM_THP_LE_DECODER 0
-+#define CONFIG_ADPCM_VIMA_DECODER 0
-+#define CONFIG_ADPCM_XA_DECODER 0
-+#define CONFIG_ADPCM_XMD_DECODER 0
-+#define CONFIG_ADPCM_YAMAHA_DECODER 0
-+#define CONFIG_ADPCM_ZORK_DECODER 0
-+#define CONFIG_SSA_DECODER 0
-+#define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
-+#define CONFIG_DVBSUB_DECODER 0
-+#define CONFIG_DVDSUB_DECODER 0
-+#define CONFIG_JACOSUB_DECODER 0
-+#define CONFIG_MICRODVD_DECODER 0
-+#define CONFIG_MOVTEXT_DECODER 0
-+#define CONFIG_MPL2_DECODER 0
-+#define CONFIG_PGSSUB_DECODER 0
-+#define CONFIG_PJS_DECODER 0
-+#define CONFIG_REALTEXT_DECODER 0
-+#define CONFIG_SAMI_DECODER 0
-+#define CONFIG_SRT_DECODER 0
-+#define CONFIG_STL_DECODER 0
-+#define CONFIG_SUBRIP_DECODER 0
-+#define CONFIG_SUBVIEWER_DECODER 0
-+#define CONFIG_SUBVIEWER1_DECODER 0
-+#define CONFIG_TEXT_DECODER 0
-+#define CONFIG_VPLAYER_DECODER 0
-+#define CONFIG_WEBVTT_DECODER 0
-+#define CONFIG_XSUB_DECODER 0
-+#define CONFIG_AAC_AT_DECODER 0
-+#define CONFIG_AC3_AT_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
-+#define CONFIG_ALAC_AT_DECODER 0
-+#define CONFIG_AMR_NB_AT_DECODER 0
-+#define CONFIG_EAC3_AT_DECODER 0
-+#define CONFIG_GSM_MS_AT_DECODER 0
-+#define CONFIG_ILBC_AT_DECODER 0
-+#define CONFIG_MP1_AT_DECODER 0
-+#define CONFIG_MP2_AT_DECODER 0
-+#define CONFIG_MP3_AT_DECODER 0
-+#define CONFIG_PCM_ALAW_AT_DECODER 0
-+#define CONFIG_PCM_MULAW_AT_DECODER 0
-+#define CONFIG_QDMC_AT_DECODER 0
-+#define CONFIG_QDM2_AT_DECODER 0
-+#define CONFIG_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_MEDIACODEC_DECODER 0
-+#define CONFIG_AV1_QSV_DECODER 0
-+#define CONFIG_LIBOPENH264_DECODER 0
-+#define CONFIG_H264_CUVID_DECODER 0
-+#define CONFIG_HEVC_CUVID_DECODER 0
-+#define CONFIG_HEVC_MEDIACODEC_DECODER 0
-+#define CONFIG_MJPEG_CUVID_DECODER 0
-+#define CONFIG_MJPEG_QSV_DECODER 0
-+#define CONFIG_MPEG1_CUVID_DECODER 0
-+#define CONFIG_MPEG2_CUVID_DECODER 0
-+#define CONFIG_MPEG4_CUVID_DECODER 0
-+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-+#define CONFIG_VC1_CUVID_DECODER 0
-+#define CONFIG_VP8_CUVID_DECODER 0
-+#define CONFIG_VP8_MEDIACODEC_DECODER 0
-+#define CONFIG_VP8_QSV_DECODER 0
-+#define CONFIG_VP9_CUVID_DECODER 0
-+#define CONFIG_VP9_MEDIACODEC_DECODER 0
-+#define CONFIG_VP9_QSV_DECODER 0
-+#define CONFIG_VNULL_DECODER 0
-+#define CONFIG_ANULL_DECODER 0
-+#define CONFIG_A64MULTI_ENCODER 0
-+#define CONFIG_A64MULTI5_ENCODER 0
-+#define CONFIG_ALIAS_PIX_ENCODER 0
-+#define CONFIG_AMV_ENCODER 0
-+#define CONFIG_APNG_ENCODER 0
-+#define CONFIG_ASV1_ENCODER 0
-+#define CONFIG_ASV2_ENCODER 0
-+#define CONFIG_AVRP_ENCODER 0
-+#define CONFIG_AVUI_ENCODER 0
-+#define CONFIG_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_H264_MEDIACODEC_ENCODER 0
-+#define CONFIG_HAP_ENCODER 0
-+#define CONFIG_HUFFYUV_ENCODER 0
-+#define CONFIG_JPEG2000_ENCODER 0
-+#define CONFIG_JPEGLS_ENCODER 0
-+#define CONFIG_LJPEG_ENCODER 0
-+#define CONFIG_MAGICYUV_ENCODER 0
-+#define CONFIG_MJPEG_ENCODER 0
-+#define CONFIG_MPEG1VIDEO_ENCODER 0
-+#define CONFIG_MPEG2VIDEO_ENCODER 0
-+#define CONFIG_MPEG4_ENCODER 0
-+#define CONFIG_MSMPEG4V2_ENCODER 0
-+#define CONFIG_MSMPEG4V3_ENCODER 0
-+#define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_PAM_ENCODER 0
-+#define CONFIG_PBM_ENCODER 0
-+#define CONFIG_PCX_ENCODER 0
-+#define CONFIG_PFM_ENCODER 0
-+#define CONFIG_PGM_ENCODER 0
-+#define CONFIG_PGMYUV_ENCODER 0
-+#define CONFIG_PHM_ENCODER 0
-+#define CONFIG_PNG_ENCODER 0
-+#define CONFIG_PPM_ENCODER 0
-+#define CONFIG_PRORES_ENCODER 0
-+#define CONFIG_PRORES_AW_ENCODER 0
-+#define CONFIG_PRORES_KS_ENCODER 0
-+#define CONFIG_QOI_ENCODER 0
-+#define CONFIG_QTRLE_ENCODER 0
-+#define CONFIG_R10K_ENCODER 0
-+#define CONFIG_R210_ENCODER 0
-+#define CONFIG_RAWVIDEO_ENCODER 0
-+#define CONFIG_ROQ_ENCODER 0
-+#define CONFIG_RPZA_ENCODER 0
-+#define CONFIG_RV10_ENCODER 0
-+#define CONFIG_RV20_ENCODER 0
-+#define CONFIG_S302M_ENCODER 0
-+#define CONFIG_SGI_ENCODER 0
-+#define CONFIG_SMC_ENCODER 0
-+#define CONFIG_SNOW_ENCODER 0
-+#define CONFIG_SPEEDHQ_ENCODER 0
-+#define CONFIG_SUNRAST_ENCODER 0
-+#define CONFIG_SVQ1_ENCODER 0
-+#define CONFIG_TARGA_ENCODER 0
-+#define CONFIG_TIFF_ENCODER 0
-+#define CONFIG_UTVIDEO_ENCODER 0
-+#define CONFIG_V210_ENCODER 0
-+#define CONFIG_V308_ENCODER 0
-+#define CONFIG_V408_ENCODER 0
-+#define CONFIG_V410_ENCODER 0
-+#define CONFIG_VBN_ENCODER 0
-+#define CONFIG_VC2_ENCODER 0
-+#define CONFIG_WBMP_ENCODER 0
-+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
-+#define CONFIG_WMV1_ENCODER 0
-+#define CONFIG_WMV2_ENCODER 0
-+#define CONFIG_XBM_ENCODER 0
-+#define CONFIG_XFACE_ENCODER 0
-+#define CONFIG_XWD_ENCODER 0
-+#define CONFIG_Y41P_ENCODER 0
-+#define CONFIG_YUV4_ENCODER 0
-+#define CONFIG_ZLIB_ENCODER 0
-+#define CONFIG_ZMBV_ENCODER 0
-+#define CONFIG_AAC_ENCODER 0
-+#define CONFIG_AC3_ENCODER 0
-+#define CONFIG_AC3_FIXED_ENCODER 0
-+#define CONFIG_ALAC_ENCODER 0
-+#define CONFIG_APTX_ENCODER 0
-+#define CONFIG_APTX_HD_ENCODER 0
-+#define CONFIG_DCA_ENCODER 0
-+#define CONFIG_DFPWM_ENCODER 0
-+#define CONFIG_EAC3_ENCODER 0
-+#define CONFIG_FLAC_ENCODER 0
-+#define CONFIG_G723_1_ENCODER 0
-+#define CONFIG_HDR_ENCODER 0
-+#define CONFIG_MLP_ENCODER 0
-+#define CONFIG_MP2_ENCODER 0
-+#define CONFIG_MP2FIXED_ENCODER 0
-+#define CONFIG_NELLYMOSER_ENCODER 0
-+#define CONFIG_OPUS_ENCODER 0
-+#define CONFIG_RA_144_ENCODER 0
-+#define CONFIG_SBC_ENCODER 0
-+#define CONFIG_SONIC_ENCODER 0
-+#define CONFIG_SONIC_LS_ENCODER 0
-+#define CONFIG_TRUEHD_ENCODER 0
-+#define CONFIG_TTA_ENCODER 0
-+#define CONFIG_VORBIS_ENCODER 0
-+#define CONFIG_WAVPACK_ENCODER 0
-+#define CONFIG_WMAV1_ENCODER 0
-+#define CONFIG_WMAV2_ENCODER 0
-+#define CONFIG_PCM_ALAW_ENCODER 0
-+#define CONFIG_PCM_BLURAY_ENCODER 0
-+#define CONFIG_PCM_DVD_ENCODER 0
-+#define CONFIG_PCM_F32BE_ENCODER 0
-+#define CONFIG_PCM_F32LE_ENCODER 0
-+#define CONFIG_PCM_F64BE_ENCODER 0
-+#define CONFIG_PCM_F64LE_ENCODER 0
-+#define CONFIG_PCM_MULAW_ENCODER 0
-+#define CONFIG_PCM_S8_ENCODER 0
-+#define CONFIG_PCM_S8_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16BE_ENCODER 0
-+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16LE_ENCODER 0
-+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S24BE_ENCODER 0
-+#define CONFIG_PCM_S24DAUD_ENCODER 0
-+#define CONFIG_PCM_S24LE_ENCODER 0
-+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S32BE_ENCODER 0
-+#define CONFIG_PCM_S32LE_ENCODER 0
-+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S64BE_ENCODER 0
-+#define CONFIG_PCM_S64LE_ENCODER 0
-+#define CONFIG_PCM_U8_ENCODER 0
-+#define CONFIG_PCM_U16BE_ENCODER 0
-+#define CONFIG_PCM_U16LE_ENCODER 0
-+#define CONFIG_PCM_U24BE_ENCODER 0
-+#define CONFIG_PCM_U24LE_ENCODER 0
-+#define CONFIG_PCM_U32BE_ENCODER 0
-+#define CONFIG_PCM_U32LE_ENCODER 0
-+#define CONFIG_PCM_VIDC_ENCODER 0
-+#define CONFIG_ROQ_DPCM_ENCODER 0
-+#define CONFIG_ADPCM_ADX_ENCODER 0
-+#define CONFIG_ADPCM_ARGO_ENCODER 0
-+#define CONFIG_ADPCM_G722_ENCODER 0
-+#define CONFIG_ADPCM_G726_ENCODER 0
-+#define CONFIG_ADPCM_G726LE_ENCODER 0
-+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0
-+#define CONFIG_ADPCM_IMA_APM_ENCODER 0
-+#define CONFIG_ADPCM_IMA_QT_ENCODER 0
-+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WS_ENCODER 0
-+#define CONFIG_ADPCM_MS_ENCODER 0
-+#define CONFIG_ADPCM_SWF_ENCODER 0
-+#define CONFIG_ADPCM_YAMAHA_ENCODER 0
-+#define CONFIG_SSA_ENCODER 0
-+#define CONFIG_ASS_ENCODER 0
-+#define CONFIG_DVBSUB_ENCODER 0
-+#define CONFIG_DVDSUB_ENCODER 0
-+#define CONFIG_MOVTEXT_ENCODER 0
-+#define CONFIG_SRT_ENCODER 0
-+#define CONFIG_SUBRIP_ENCODER 0
-+#define CONFIG_TEXT_ENCODER 0
-+#define CONFIG_TTML_ENCODER 0
-+#define CONFIG_WEBVTT_ENCODER 0
-+#define CONFIG_XSUB_ENCODER 0
-+#define CONFIG_AAC_AT_ENCODER 0
-+#define CONFIG_ALAC_AT_ENCODER 0
-+#define CONFIG_ILBC_AT_ENCODER 0
-+#define CONFIG_PCM_ALAW_AT_ENCODER 0
-+#define CONFIG_PCM_MULAW_AT_ENCODER 0
-+#define CONFIG_LIBAOM_AV1_ENCODER 0
-+#define CONFIG_LIBCODEC2_ENCODER 0
-+#define CONFIG_LIBFDK_AAC_ENCODER 0
-+#define CONFIG_LIBGSM_ENCODER 0
-+#define CONFIG_LIBGSM_MS_ENCODER 0
-+#define CONFIG_LIBILBC_ENCODER 0
-+#define CONFIG_LIBJXL_ENCODER 0
-+#define CONFIG_LIBMP3LAME_ENCODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+#define CONFIG_LIBOPENJPEG_ENCODER 0
-+#define CONFIG_LIBOPUS_ENCODER 0
-+#define CONFIG_LIBRAV1E_ENCODER 0
-+#define CONFIG_LIBSHINE_ENCODER 0
-+#define CONFIG_LIBSPEEX_ENCODER 0
-+#define CONFIG_LIBSVTAV1_ENCODER 0
-+#define CONFIG_LIBTHEORA_ENCODER 0
-+#define CONFIG_LIBTWOLAME_ENCODER 0
-+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
-+#define CONFIG_LIBVORBIS_ENCODER 0
-+#define CONFIG_LIBVPX_VP8_ENCODER 0
-+#define CONFIG_LIBVPX_VP9_ENCODER 0
-+#define CONFIG_LIBWEBP_ANIM_ENCODER 0
-+#define CONFIG_LIBWEBP_ENCODER 0
-+#define CONFIG_LIBX262_ENCODER 0
-+#define CONFIG_LIBX264_ENCODER 0
-+#define CONFIG_LIBX264RGB_ENCODER 0
-+#define CONFIG_LIBX265_ENCODER 0
-+#define CONFIG_LIBXAVS_ENCODER 0
-+#define CONFIG_LIBXAVS2_ENCODER 0
-+#define CONFIG_LIBXVID_ENCODER 0
-+#define CONFIG_AAC_MF_ENCODER 0
-+#define CONFIG_AC3_MF_ENCODER 0
-+#define CONFIG_H263_V4L2M2M_ENCODER 0
-+#define CONFIG_AV1_NVENC_ENCODER 0
-+#define CONFIG_AV1_QSV_ENCODER 0
-+#define CONFIG_AV1_AMF_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
-+#define CONFIG_H264_AMF_ENCODER 0
-+#define CONFIG_H264_MF_ENCODER 0
-+#define CONFIG_H264_NVENC_ENCODER 0
-+#define CONFIG_H264_OMX_ENCODER 0
-+#define CONFIG_H264_QSV_ENCODER 0
-+#define CONFIG_H264_V4L2M2M_ENCODER 0
-+#define CONFIG_H264_VAAPI_ENCODER 0
-+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_HEVC_AMF_ENCODER 0
-+#define CONFIG_HEVC_MEDIACODEC_ENCODER 0
-+#define CONFIG_HEVC_MF_ENCODER 0
-+#define CONFIG_HEVC_NVENC_ENCODER 0
-+#define CONFIG_HEVC_QSV_ENCODER 0
-+#define CONFIG_HEVC_V4L2M2M_ENCODER 0
-+#define CONFIG_HEVC_VAAPI_ENCODER 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_LIBKVAZAAR_ENCODER 0
-+#define CONFIG_MJPEG_QSV_ENCODER 0
-+#define CONFIG_MJPEG_VAAPI_ENCODER 0
-+#define CONFIG_MP3_MF_ENCODER 0
-+#define CONFIG_MPEG2_QSV_ENCODER 0
-+#define CONFIG_MPEG2_VAAPI_ENCODER 0
-+#define CONFIG_MPEG4_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_VNULL_ENCODER 0
-+#define CONFIG_ANULL_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_AV1_VDPAU_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_FTR_PARSER 0
-+#define CONFIG_G723_1_PARSER 0
-+#define CONFIG_G729_PARSER 0
-+#define CONFIG_GIF_PARSER 0
-+#define CONFIG_GSM_PARSER 0
-+#define CONFIG_H261_PARSER 0
-+#define CONFIG_H263_PARSER 0
-+#define CONFIG_H264_PARSER 1
-+#define CONFIG_HEVC_PARSER 0
-+#define CONFIG_HDR_PARSER 0
-+#define CONFIG_IPU_PARSER 0
-+#define CONFIG_JPEG2000_PARSER 0
-+#define CONFIG_MISC4_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_QOI_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_XWD_PARSER 0
-+#define CONFIG_ALSA_INDEV 0
-+#define CONFIG_ANDROID_CAMERA_INDEV 0
-+#define CONFIG_AVFOUNDATION_INDEV 0
-+#define CONFIG_BKTR_INDEV 0
-+#define CONFIG_DECKLINK_INDEV 0
-+#define CONFIG_DSHOW_INDEV 0
-+#define CONFIG_FBDEV_INDEV 0
-+#define CONFIG_GDIGRAB_INDEV 0
-+#define CONFIG_IEC61883_INDEV 0
-+#define CONFIG_JACK_INDEV 0
-+#define CONFIG_KMSGRAB_INDEV 0
-+#define CONFIG_LAVFI_INDEV 0
-+#define CONFIG_OPENAL_INDEV 0
-+#define CONFIG_OSS_INDEV 0
-+#define CONFIG_PULSE_INDEV 0
-+#define CONFIG_SNDIO_INDEV 0
-+#define CONFIG_V4L2_INDEV 0
-+#define CONFIG_VFWCAP_INDEV 0
-+#define CONFIG_XCBGRAB_INDEV 0
-+#define CONFIG_LIBCDIO_INDEV 0
-+#define CONFIG_LIBDC1394_INDEV 0
-+#define CONFIG_ALSA_OUTDEV 0
-+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
-+#define CONFIG_CACA_OUTDEV 0
-+#define CONFIG_DECKLINK_OUTDEV 0
-+#define CONFIG_FBDEV_OUTDEV 0
-+#define CONFIG_OPENGL_OUTDEV 0
-+#define CONFIG_OSS_OUTDEV 0
-+#define CONFIG_PULSE_OUTDEV 0
-+#define CONFIG_SDL2_OUTDEV 0
-+#define CONFIG_SNDIO_OUTDEV 0
-+#define CONFIG_V4L2_OUTDEV 0
-+#define CONFIG_XV_OUTDEV 0
-+#define CONFIG_ABENCH_FILTER 0
-+#define CONFIG_ACOMPRESSOR_FILTER 0
-+#define CONFIG_ACONTRAST_FILTER 0
-+#define CONFIG_ACOPY_FILTER 0
-+#define CONFIG_ACUE_FILTER 0
-+#define CONFIG_ACROSSFADE_FILTER 0
-+#define CONFIG_ACROSSOVER_FILTER 0
-+#define CONFIG_ACRUSHER_FILTER 0
-+#define CONFIG_ADECLICK_FILTER 0
-+#define CONFIG_ADECLIP_FILTER 0
-+#define CONFIG_ADECORRELATE_FILTER 0
-+#define CONFIG_ADELAY_FILTER 0
-+#define CONFIG_ADENORM_FILTER 0
-+#define CONFIG_ADERIVATIVE_FILTER 0
-+#define CONFIG_ADRC_FILTER 0
-+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
-+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
-+#define CONFIG_AECHO_FILTER 0
-+#define CONFIG_AEMPHASIS_FILTER 0
-+#define CONFIG_AEVAL_FILTER 0
-+#define CONFIG_AEXCITER_FILTER 0
-+#define CONFIG_AFADE_FILTER 0
-+#define CONFIG_AFFTDN_FILTER 0
-+#define CONFIG_AFFTFILT_FILTER 0
-+#define CONFIG_AFIR_FILTER 0
-+#define CONFIG_AFORMAT_FILTER 0
-+#define CONFIG_AFREQSHIFT_FILTER 0
-+#define CONFIG_AFWTDN_FILTER 0
-+#define CONFIG_AGATE_FILTER 0
-+#define CONFIG_AIIR_FILTER 0
-+#define CONFIG_AINTEGRAL_FILTER 0
-+#define CONFIG_AINTERLEAVE_FILTER 0
-+#define CONFIG_ALATENCY_FILTER 0
-+#define CONFIG_ALIMITER_FILTER 0
-+#define CONFIG_ALLPASS_FILTER 0
-+#define CONFIG_ALOOP_FILTER 0
-+#define CONFIG_AMERGE_FILTER 0
-+#define CONFIG_AMETADATA_FILTER 0
-+#define CONFIG_AMIX_FILTER 0
-+#define CONFIG_AMULTIPLY_FILTER 0
-+#define CONFIG_ANEQUALIZER_FILTER 0
-+#define CONFIG_ANLMDN_FILTER 0
-+#define CONFIG_ANLMF_FILTER 0
-+#define CONFIG_ANLMS_FILTER 0
-+#define CONFIG_ANULL_FILTER 0
-+#define CONFIG_APAD_FILTER 0
-+#define CONFIG_APERMS_FILTER 0
-+#define CONFIG_APHASER_FILTER 0
-+#define CONFIG_APHASESHIFT_FILTER 0
-+#define CONFIG_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_TILTSHELF_FILTER 0
-+#define CONFIG_TREBLE_FILTER 0
-+#define CONFIG_TREMOLO_FILTER 0
-+#define CONFIG_VIBRATO_FILTER 0
-+#define CONFIG_VIRTUALBASS_FILTER 0
-+#define CONFIG_VOLUME_FILTER 0
-+#define CONFIG_VOLUMEDETECT_FILTER 0
-+#define CONFIG_AEVALSRC_FILTER 0
-+#define CONFIG_AFDELAYSRC_FILTER 0
-+#define CONFIG_AFIRSRC_FILTER 0
-+#define CONFIG_ANOISESRC_FILTER 0
-+#define CONFIG_ANULLSRC_FILTER 0
-+#define CONFIG_FLITE_FILTER 0
-+#define CONFIG_HILBERT_FILTER 0
-+#define CONFIG_SINC_FILTER 0
-+#define CONFIG_SINE_FILTER 0
-+#define CONFIG_ANULLSINK_FILTER 0
-+#define CONFIG_ADDROI_FILTER 0
-+#define CONFIG_ALPHAEXTRACT_FILTER 0
-+#define CONFIG_ALPHAMERGE_FILTER 0
-+#define CONFIG_AMPLIFY_FILTER 0
-+#define CONFIG_ASS_FILTER 0
-+#define CONFIG_ATADENOISE_FILTER 0
-+#define CONFIG_AVGBLUR_FILTER 0
-+#define CONFIG_AVGBLUR_OPENCL_FILTER 0
-+#define CONFIG_AVGBLUR_VULKAN_FILTER 0
-+#define CONFIG_BACKGROUNDKEY_FILTER 0
-+#define CONFIG_BBOX_FILTER 0
-+#define CONFIG_BENCH_FILTER 0
-+#define CONFIG_BILATERAL_FILTER 0
-+#define CONFIG_BILATERAL_CUDA_FILTER 0
-+#define CONFIG_BITPLANENOISE_FILTER 0
-+#define CONFIG_BLACKDETECT_FILTER 0
-+#define CONFIG_BLACKFRAME_FILTER 0
-+#define CONFIG_BLEND_FILTER 0
-+#define CONFIG_BLEND_VULKAN_FILTER 0
-+#define CONFIG_BLOCKDETECT_FILTER 0
-+#define CONFIG_BLURDETECT_FILTER 0
-+#define CONFIG_BM3D_FILTER 0
-+#define CONFIG_BOXBLUR_FILTER 0
-+#define CONFIG_BOXBLUR_OPENCL_FILTER 0
-+#define CONFIG_BWDIF_FILTER 0
-+#define CONFIG_CAS_FILTER 0
-+#define CONFIG_CHROMABER_VULKAN_FILTER 0
-+#define CONFIG_CHROMAHOLD_FILTER 0
-+#define CONFIG_CHROMAKEY_FILTER 0
-+#define CONFIG_CHROMAKEY_CUDA_FILTER 0
-+#define CONFIG_CHROMANR_FILTER 0
-+#define CONFIG_CHROMASHIFT_FILTER 0
-+#define CONFIG_CIESCOPE_FILTER 0
-+#define CONFIG_CODECVIEW_FILTER 0
-+#define CONFIG_COLORBALANCE_FILTER 0
-+#define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORCONTRAST_FILTER 0
-+#define CONFIG_COLORCORRECT_FILTER 0
-+#define CONFIG_COLORIZE_FILTER 0
-+#define CONFIG_COLORKEY_FILTER 0
-+#define CONFIG_COLORKEY_OPENCL_FILTER 0
-+#define CONFIG_COLORHOLD_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
-+#define CONFIG_COLORMAP_FILTER 0
-+#define CONFIG_COLORMATRIX_FILTER 0
-+#define CONFIG_COLORSPACE_FILTER 0
-+#define CONFIG_COLORSPACE_CUDA_FILTER 0
-+#define CONFIG_COLORTEMPERATURE_FILTER 0
-+#define CONFIG_CONVOLUTION_FILTER 0
-+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
-+#define CONFIG_CONVOLVE_FILTER 0
-+#define CONFIG_COPY_FILTER 0
-+#define CONFIG_COREIMAGE_FILTER 0
-+#define CONFIG_CORR_FILTER 0
-+#define CONFIG_COVER_RECT_FILTER 0
-+#define CONFIG_CROP_FILTER 0
-+#define CONFIG_CROPDETECT_FILTER 0
-+#define CONFIG_CUE_FILTER 0
-+#define CONFIG_CURVES_FILTER 0
-+#define CONFIG_DATASCOPE_FILTER 0
-+#define CONFIG_DBLUR_FILTER 0
-+#define CONFIG_DCTDNOIZ_FILTER 0
-+#define CONFIG_DEBAND_FILTER 0
-+#define CONFIG_DEBLOCK_FILTER 0
-+#define CONFIG_DECIMATE_FILTER 0
-+#define CONFIG_DECONVOLVE_FILTER 0
-+#define CONFIG_DEDOT_FILTER 0
-+#define CONFIG_DEFLATE_FILTER 0
-+#define CONFIG_DEFLICKER_FILTER 0
-+#define CONFIG_DEINTERLACE_QSV_FILTER 0
-+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
-+#define CONFIG_DEJUDDER_FILTER 0
-+#define CONFIG_DELOGO_FILTER 0
-+#define CONFIG_DENOISE_VAAPI_FILTER 0
-+#define CONFIG_DERAIN_FILTER 0
-+#define CONFIG_DESHAKE_FILTER 0
-+#define CONFIG_DESHAKE_OPENCL_FILTER 0
-+#define CONFIG_DESPILL_FILTER 0
-+#define CONFIG_DETELECINE_FILTER 0
-+#define CONFIG_DILATION_FILTER 0
-+#define CONFIG_DILATION_OPENCL_FILTER 0
-+#define CONFIG_DISPLACE_FILTER 0
-+#define CONFIG_DNN_CLASSIFY_FILTER 0
-+#define CONFIG_DNN_DETECT_FILTER 0
-+#define CONFIG_DNN_PROCESSING_FILTER 0
-+#define CONFIG_DOUBLEWEAVE_FILTER 0
-+#define CONFIG_DRAWBOX_FILTER 0
-+#define CONFIG_DRAWGRAPH_FILTER 0
-+#define CONFIG_DRAWGRID_FILTER 0
-+#define CONFIG_DRAWTEXT_FILTER 0
-+#define CONFIG_EDGEDETECT_FILTER 0
-+#define CONFIG_ELBG_FILTER 0
-+#define CONFIG_ENTROPY_FILTER 0
-+#define CONFIG_EPX_FILTER 0
-+#define CONFIG_EQ_FILTER 0
-+#define CONFIG_EROSION_FILTER 0
-+#define CONFIG_EROSION_OPENCL_FILTER 0
-+#define CONFIG_ESTDIF_FILTER 0
-+#define CONFIG_EXPOSURE_FILTER 0
-+#define CONFIG_EXTRACTPLANES_FILTER 0
-+#define CONFIG_FADE_FILTER 0
-+#define CONFIG_FEEDBACK_FILTER 0
-+#define CONFIG_FFTDNOIZ_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
-+#define CONFIG_FIELD_FILTER 0
-+#define CONFIG_FIELDHINT_FILTER 0
-+#define CONFIG_FIELDMATCH_FILTER 0
-+#define CONFIG_FIELDORDER_FILTER 0
-+#define CONFIG_FILLBORDERS_FILTER 0
-+#define CONFIG_FIND_RECT_FILTER 0
-+#define CONFIG_FLIP_VULKAN_FILTER 0
-+#define CONFIG_FLOODFILL_FILTER 0
-+#define CONFIG_FORMAT_FILTER 0
-+#define CONFIG_FPS_FILTER 0
-+#define CONFIG_FRAMEPACK_FILTER 0
-+#define CONFIG_FRAMERATE_FILTER 0
-+#define CONFIG_FRAMESTEP_FILTER 0
-+#define CONFIG_FREEZEDETECT_FILTER 0
-+#define CONFIG_FREEZEFRAMES_FILTER 0
-+#define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
-+#define CONFIG_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_REMAP_OPENCL_FILTER 0
-+#define CONFIG_REMOVEGRAIN_FILTER 0
-+#define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
-+#define CONFIG_REVERSE_FILTER 0
-+#define CONFIG_RGBASHIFT_FILTER 0
-+#define CONFIG_ROBERTS_FILTER 0
-+#define CONFIG_ROBERTS_OPENCL_FILTER 0
-+#define CONFIG_ROTATE_FILTER 0
-+#define CONFIG_SAB_FILTER 0
-+#define CONFIG_SCALE_FILTER 0
-+#define CONFIG_SCALE_CUDA_FILTER 0
-+#define CONFIG_SCALE_NPP_FILTER 0
-+#define CONFIG_SCALE_QSV_FILTER 0
-+#define CONFIG_SCALE_VAAPI_FILTER 0
-+#define CONFIG_SCALE_VULKAN_FILTER 0
-+#define CONFIG_SCALE2REF_FILTER 0
-+#define CONFIG_SCALE2REF_NPP_FILTER 0
-+#define CONFIG_SCDET_FILTER 0
-+#define CONFIG_SCHARR_FILTER 0
-+#define CONFIG_SCROLL_FILTER 0
-+#define CONFIG_SEGMENT_FILTER 0
-+#define CONFIG_SELECT_FILTER 0
-+#define CONFIG_SELECTIVECOLOR_FILTER 0
-+#define CONFIG_SENDCMD_FILTER 0
-+#define CONFIG_SEPARATEFIELDS_FILTER 0
-+#define CONFIG_SETDAR_FILTER 0
-+#define CONFIG_SETFIELD_FILTER 0
-+#define CONFIG_SETPARAMS_FILTER 0
-+#define CONFIG_SETPTS_FILTER 0
-+#define CONFIG_SETRANGE_FILTER 0
-+#define CONFIG_SETSAR_FILTER 0
-+#define CONFIG_SETTB_FILTER 0
-+#define CONFIG_SHARPEN_NPP_FILTER 0
-+#define CONFIG_SHARPNESS_VAAPI_FILTER 0
-+#define CONFIG_SHEAR_FILTER 0
-+#define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
-+#define CONFIG_SHUFFLEFRAMES_FILTER 0
-+#define CONFIG_SHUFFLEPIXELS_FILTER 0
-+#define CONFIG_SHUFFLEPLANES_FILTER 0
-+#define CONFIG_SIDEDATA_FILTER 0
-+#define CONFIG_SIGNALSTATS_FILTER 0
-+#define CONFIG_SIGNATURE_FILTER 0
-+#define CONFIG_SITI_FILTER 0
-+#define CONFIG_SMARTBLUR_FILTER 0
-+#define CONFIG_SOBEL_FILTER 0
-+#define CONFIG_SOBEL_OPENCL_FILTER 0
-+#define CONFIG_SPLIT_FILTER 0
-+#define CONFIG_SPP_FILTER 0
-+#define CONFIG_SR_FILTER 0
-+#define CONFIG_SSIM_FILTER 0
-+#define CONFIG_SSIM360_FILTER 0
-+#define CONFIG_STEREO3D_FILTER 0
-+#define CONFIG_STREAMSELECT_FILTER 0
-+#define CONFIG_SUBTITLES_FILTER 0
-+#define CONFIG_SUPER2XSAI_FILTER 0
-+#define CONFIG_SWAPRECT_FILTER 0
-+#define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
-+#define CONFIG_TELECINE_FILTER 0
-+#define CONFIG_THISTOGRAM_FILTER 0
-+#define CONFIG_THRESHOLD_FILTER 0
-+#define CONFIG_THUMBNAIL_FILTER 0
-+#define CONFIG_THUMBNAIL_CUDA_FILTER 0
-+#define CONFIG_TILE_FILTER 0
-+#define CONFIG_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_HSTACK_VAAPI_FILTER 0
-+#define CONFIG_VSTACK_VAAPI_FILTER 0
-+#define CONFIG_XSTACK_VAAPI_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_DDAGRAB_FILTER 0
-+#define CONFIG_FREI0R_SRC_FILTER 0
-+#define CONFIG_GRADIENTS_FILTER 0
-+#define CONFIG_HALDCLUTSRC_FILTER 0
-+#define CONFIG_LIFE_FILTER 0
-+#define CONFIG_MANDELBROT_FILTER 0
-+#define CONFIG_MPTESTSRC_FILTER 0
-+#define CONFIG_NULLSRC_FILTER 0
-+#define CONFIG_OPENCLSRC_FILTER 0
-+#define CONFIG_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_A3DSCOPE_FILTER 0
-+#define CONFIG_ABITSCOPE_FILTER 0
-+#define CONFIG_ADRAWGRAPH_FILTER 0
-+#define CONFIG_AGRAPHMONITOR_FILTER 0
-+#define CONFIG_AHISTOGRAM_FILTER 0
-+#define CONFIG_APHASEMETER_FILTER 0
-+#define CONFIG_AVECTORSCOPE_FILTER 0
-+#define CONFIG_CONCAT_FILTER 0
-+#define CONFIG_SHOWCQT_FILTER 0
-+#define CONFIG_SHOWCWT_FILTER 0
-+#define CONFIG_SHOWFREQS_FILTER 0
-+#define CONFIG_SHOWSPATIAL_FILTER 0
-+#define CONFIG_SHOWSPECTRUM_FILTER 0
-+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0
-+#define CONFIG_SHOWVOLUME_FILTER 0
-+#define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
-+#define CONFIG_SPECTRUMSYNTH_FILTER 0
-+#define CONFIG_AVSYNCTEST_FILTER 0
-+#define CONFIG_AMOVIE_FILTER 0
-+#define CONFIG_MOVIE_FILTER 0
-+#define CONFIG_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_APAC_DEMUXER 0
-+#define CONFIG_APC_DEMUXER 0
-+#define CONFIG_APE_DEMUXER 0
-+#define CONFIG_APM_DEMUXER 0
-+#define CONFIG_APNG_DEMUXER 0
-+#define CONFIG_APTX_DEMUXER 0
-+#define CONFIG_APTX_HD_DEMUXER 0
-+#define CONFIG_AQTITLE_DEMUXER 0
-+#define CONFIG_ARGO_ASF_DEMUXER 0
-+#define CONFIG_ARGO_BRP_DEMUXER 0
-+#define CONFIG_ARGO_CVG_DEMUXER 0
-+#define CONFIG_ASF_DEMUXER 0
-+#define CONFIG_ASF_O_DEMUXER 0
-+#define CONFIG_ASS_DEMUXER 0
-+#define CONFIG_AST_DEMUXER 0
-+#define CONFIG_AU_DEMUXER 0
-+#define CONFIG_AV1_DEMUXER 0
-+#define CONFIG_AVI_DEMUXER 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_BONK_DEMUXER 0
-+#define CONFIG_C93_DEMUXER 0
-+#define CONFIG_CAF_DEMUXER 0
-+#define CONFIG_CAVSVIDEO_DEMUXER 0
-+#define CONFIG_CDG_DEMUXER 0
-+#define CONFIG_CDXL_DEMUXER 0
-+#define CONFIG_CINE_DEMUXER 0
-+#define CONFIG_CODEC2_DEMUXER 0
-+#define CONFIG_CODEC2RAW_DEMUXER 0
-+#define CONFIG_CONCAT_DEMUXER 0
-+#define CONFIG_DASH_DEMUXER 0
-+#define CONFIG_DATA_DEMUXER 0
-+#define CONFIG_DAUD_DEMUXER 0
-+#define CONFIG_DCSTR_DEMUXER 0
-+#define CONFIG_DERF_DEMUXER 0
-+#define CONFIG_DFA_DEMUXER 0
-+#define CONFIG_DFPWM_DEMUXER 0
-+#define CONFIG_DHAV_DEMUXER 0
-+#define CONFIG_DIRAC_DEMUXER 0
-+#define CONFIG_DNXHD_DEMUXER 0
-+#define CONFIG_DSF_DEMUXER 0
-+#define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
-+#define CONFIG_DTS_DEMUXER 0
-+#define CONFIG_DTSHD_DEMUXER 0
-+#define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
-+#define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_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_LAF_DEMUXER 0
-+#define CONFIG_LMLM4_DEMUXER 0
-+#define CONFIG_LOAS_DEMUXER 0
-+#define CONFIG_LUODAT_DEMUXER 0
-+#define CONFIG_LRC_DEMUXER 0
-+#define CONFIG_LVF_DEMUXER 0
-+#define CONFIG_LXF_DEMUXER 0
-+#define CONFIG_M4V_DEMUXER 0
-+#define CONFIG_MCA_DEMUXER 0
-+#define CONFIG_MCC_DEMUXER 0
-+#define CONFIG_MATROSKA_DEMUXER 1
-+#define CONFIG_MGSTS_DEMUXER 0
-+#define CONFIG_MICRODVD_DEMUXER 0
-+#define CONFIG_MJPEG_DEMUXER 0
-+#define CONFIG_MJPEG_2000_DEMUXER 0
-+#define CONFIG_MLP_DEMUXER 0
-+#define CONFIG_MLV_DEMUXER 0
-+#define CONFIG_MM_DEMUXER 0
-+#define CONFIG_MMF_DEMUXER 0
-+#define CONFIG_MODS_DEMUXER 0
-+#define CONFIG_MOFLEX_DEMUXER 0
-+#define CONFIG_MOV_DEMUXER 1
-+#define CONFIG_MP3_DEMUXER 1
-+#define CONFIG_MPC_DEMUXER 0
-+#define CONFIG_MPC8_DEMUXER 0
-+#define CONFIG_MPEGPS_DEMUXER 0
-+#define CONFIG_MPEGTS_DEMUXER 0
-+#define CONFIG_MPEGTSRAW_DEMUXER 0
-+#define CONFIG_MPEGVIDEO_DEMUXER 0
-+#define CONFIG_MPJPEG_DEMUXER 0
-+#define CONFIG_MPL2_DEMUXER 0
-+#define CONFIG_MPSUB_DEMUXER 0
-+#define CONFIG_MSF_DEMUXER 0
-+#define CONFIG_MSNWC_TCP_DEMUXER 0
-+#define CONFIG_MSP_DEMUXER 0
-+#define CONFIG_MTAF_DEMUXER 0
-+#define CONFIG_MTV_DEMUXER 0
-+#define CONFIG_MUSX_DEMUXER 0
-+#define CONFIG_MV_DEMUXER 0
-+#define CONFIG_MVI_DEMUXER 0
-+#define CONFIG_MXF_DEMUXER 0
-+#define CONFIG_MXG_DEMUXER 0
-+#define CONFIG_NC_DEMUXER 0
-+#define CONFIG_NISTSPHERE_DEMUXER 0
-+#define CONFIG_NSP_DEMUXER 0
-+#define CONFIG_NSV_DEMUXER 0
-+#define CONFIG_NUT_DEMUXER 0
-+#define CONFIG_NUV_DEMUXER 0
-+#define CONFIG_OBU_DEMUXER 0
-+#define CONFIG_OGG_DEMUXER 1
-+#define CONFIG_OMA_DEMUXER 0
-+#define CONFIG_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_WADY_DEMUXER 0
-+#define CONFIG_WAV_DEMUXER 1
-+#define CONFIG_WC3_DEMUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
-+#define CONFIG_WEBVTT_DEMUXER 0
-+#define CONFIG_WSAUD_DEMUXER 0
-+#define CONFIG_WSD_DEMUXER 0
-+#define CONFIG_WSVQA_DEMUXER 0
-+#define CONFIG_WTV_DEMUXER 0
-+#define CONFIG_WVE_DEMUXER 0
-+#define CONFIG_WV_DEMUXER 0
-+#define CONFIG_XA_DEMUXER 0
-+#define CONFIG_XBIN_DEMUXER 0
-+#define CONFIG_XMD_DEMUXER 0
-+#define CONFIG_XMV_DEMUXER 0
-+#define CONFIG_XVAG_DEMUXER 0
-+#define CONFIG_XWMA_DEMUXER 0
-+#define CONFIG_YOP_DEMUXER 0
-+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0
-+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_VBN_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
-+#define CONFIG_LIBGME_DEMUXER 0
-+#define CONFIG_LIBMODPLUG_DEMUXER 0
-+#define CONFIG_LIBOPENMPT_DEMUXER 0
-+#define CONFIG_VAPOURSYNTH_DEMUXER 0
-+#define CONFIG_A64_MUXER 0
-+#define CONFIG_AC3_MUXER 0
-+#define CONFIG_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_FD_PROTOCOL 0
-+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
-+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
-+#define CONFIG_FILE_PROTOCOL 0
-+#define CONFIG_FTP_PROTOCOL 0
-+#define CONFIG_GOPHER_PROTOCOL 0
-+#define CONFIG_GOPHERS_PROTOCOL 0
-+#define CONFIG_HLS_PROTOCOL 0
-+#define CONFIG_HTTP_PROTOCOL 0
-+#define CONFIG_HTTPPROXY_PROTOCOL 0
-+#define CONFIG_HTTPS_PROTOCOL 0
-+#define CONFIG_ICECAST_PROTOCOL 0
-+#define CONFIG_MMSH_PROTOCOL 0
-+#define CONFIG_MMST_PROTOCOL 0
-+#define CONFIG_MD5_PROTOCOL 0
-+#define CONFIG_PIPE_PROTOCOL 0
-+#define CONFIG_PROMPEG_PROTOCOL 0
-+#define CONFIG_RTMP_PROTOCOL 0
-+#define CONFIG_RTMPE_PROTOCOL 0
-+#define CONFIG_RTMPS_PROTOCOL 0
-+#define CONFIG_RTMPT_PROTOCOL 0
-+#define CONFIG_RTMPTE_PROTOCOL 0
-+#define CONFIG_RTMPTS_PROTOCOL 0
-+#define CONFIG_RTP_PROTOCOL 0
-+#define CONFIG_SCTP_PROTOCOL 0
-+#define CONFIG_SRTP_PROTOCOL 0
-+#define CONFIG_SUBFILE_PROTOCOL 0
-+#define CONFIG_TEE_PROTOCOL 0
-+#define CONFIG_TCP_PROTOCOL 0
-+#define CONFIG_TLS_PROTOCOL 0
-+#define CONFIG_UDP_PROTOCOL 0
-+#define CONFIG_UDPLITE_PROTOCOL 0
-+#define CONFIG_UNIX_PROTOCOL 0
-+#define CONFIG_LIBAMQP_PROTOCOL 0
-+#define CONFIG_LIBRIST_PROTOCOL 0
-+#define CONFIG_LIBRTMP_PROTOCOL 0
-+#define CONFIG_LIBRTMPE_PROTOCOL 0
-+#define CONFIG_LIBRTMPS_PROTOCOL 0
-+#define CONFIG_LIBRTMPT_PROTOCOL 0
-+#define CONFIG_LIBRTMPTE_PROTOCOL 0
-+#define CONFIG_LIBSRT_PROTOCOL 0
-+#define CONFIG_LIBSSH_PROTOCOL 0
-+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
-+#define CONFIG_LIBZMQ_PROTOCOL 0
-+#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
-+#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
-+#endif /* FFMPEG_CONFIG_COMPONENTS_H */
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
deleted file mode 100644
index 03d0e6133cd0..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
+++ /dev/null
@@ -1,735 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2023-04-22 17:45:15 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm
-@@ -0,0 +1,732 @@
-+; Automatically generated by configure - do not modify!
-+%define ARCH_AARCH64 0
-+%define ARCH_ALPHA 0
-+%define ARCH_ARM 0
-+%define ARCH_AVR32 0
-+%define ARCH_AVR32_AP 0
-+%define ARCH_AVR32_UC 0
-+%define ARCH_BFIN 0
-+%define ARCH_IA64 0
-+%define ARCH_LOONGARCH 0
-+%define ARCH_LOONGARCH32 0
-+%define ARCH_LOONGARCH64 0
-+%define ARCH_M68K 0
-+%define ARCH_MIPS 0
-+%define ARCH_MIPS64 0
-+%define ARCH_PARISC 0
-+%define ARCH_PPC 0
-+%define ARCH_PPC64 0
-+%define ARCH_RISCV 0
-+%define ARCH_S390 0
-+%define ARCH_SH4 0
-+%define ARCH_SPARC 0
-+%define ARCH_SPARC64 0
-+%define ARCH_TILEGX 0
-+%define ARCH_TILEPRO 0
-+%define ARCH_TOMI 0
-+%define ARCH_X86 1
-+%define ARCH_X86_32 1
-+%define ARCH_X86_64 0
-+%define HAVE_ARMV5TE 0
-+%define HAVE_ARMV6 0
-+%define HAVE_ARMV6T2 0
-+%define HAVE_ARMV8 0
-+%define HAVE_NEON 0
-+%define HAVE_VFP 0
-+%define HAVE_VFPV3 0
-+%define HAVE_SETEND 0
-+%define HAVE_ALTIVEC 0
-+%define HAVE_DCBZL 0
-+%define HAVE_LDBRX 0
-+%define HAVE_POWER8 0
-+%define HAVE_PPC4XX 0
-+%define HAVE_VSX 0
-+%define HAVE_RVV 0
-+%define HAVE_AESNI 1
-+%define HAVE_AMD3DNOW 1
-+%define HAVE_AMD3DNOWEXT 1
-+%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
-+%define HAVE_MMXEXT 1
-+%define HAVE_SSE 1
-+%define HAVE_SSE2 1
-+%define HAVE_SSE3 1
-+%define HAVE_SSE4 1
-+%define HAVE_SSE42 1
-+%define HAVE_SSSE3 1
-+%define HAVE_XOP 1
-+%define HAVE_CPUNOP 0
-+%define HAVE_I686 1
-+%define HAVE_MIPSFPU 0
-+%define HAVE_MIPS32R2 0
-+%define HAVE_MIPS32R5 0
-+%define HAVE_MIPS64R2 0
-+%define HAVE_MIPS32R6 0
-+%define HAVE_MIPS64R6 0
-+%define HAVE_MIPSDSP 0
-+%define HAVE_MIPSDSPR2 0
-+%define HAVE_MSA 0
-+%define HAVE_LOONGSON2 0
-+%define HAVE_LOONGSON3 0
-+%define HAVE_MMI 0
-+%define HAVE_LSX 0
-+%define HAVE_LASX 0
-+%define HAVE_ARMV5TE_EXTERNAL 0
-+%define HAVE_ARMV6_EXTERNAL 0
-+%define HAVE_ARMV6T2_EXTERNAL 0
-+%define HAVE_ARMV8_EXTERNAL 0
-+%define HAVE_NEON_EXTERNAL 0
-+%define HAVE_VFP_EXTERNAL 0
-+%define HAVE_VFPV3_EXTERNAL 0
-+%define HAVE_SETEND_EXTERNAL 0
-+%define HAVE_ALTIVEC_EXTERNAL 0
-+%define HAVE_DCBZL_EXTERNAL 0
-+%define HAVE_LDBRX_EXTERNAL 0
-+%define HAVE_POWER8_EXTERNAL 0
-+%define HAVE_PPC4XX_EXTERNAL 0
-+%define HAVE_VSX_EXTERNAL 0
-+%define HAVE_RVV_EXTERNAL 0
-+%define HAVE_AESNI_EXTERNAL 1
-+%define HAVE_AMD3DNOW_EXTERNAL 1
-+%define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+%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
-+%define HAVE_MMXEXT_EXTERNAL 1
-+%define HAVE_SSE_EXTERNAL 1
-+%define HAVE_SSE2_EXTERNAL 1
-+%define HAVE_SSE3_EXTERNAL 1
-+%define HAVE_SSE4_EXTERNAL 1
-+%define HAVE_SSE42_EXTERNAL 1
-+%define HAVE_SSSE3_EXTERNAL 1
-+%define HAVE_XOP_EXTERNAL 1
-+%define HAVE_CPUNOP_EXTERNAL 0
-+%define HAVE_I686_EXTERNAL 0
-+%define HAVE_MIPSFPU_EXTERNAL 0
-+%define HAVE_MIPS32R2_EXTERNAL 0
-+%define HAVE_MIPS32R5_EXTERNAL 0
-+%define HAVE_MIPS64R2_EXTERNAL 0
-+%define HAVE_MIPS32R6_EXTERNAL 0
-+%define HAVE_MIPS64R6_EXTERNAL 0
-+%define HAVE_MIPSDSP_EXTERNAL 0
-+%define HAVE_MIPSDSPR2_EXTERNAL 0
-+%define HAVE_MSA_EXTERNAL 0
-+%define HAVE_LOONGSON2_EXTERNAL 0
-+%define HAVE_LOONGSON3_EXTERNAL 0
-+%define HAVE_MMI_EXTERNAL 0
-+%define HAVE_LSX_EXTERNAL 0
-+%define HAVE_LASX_EXTERNAL 0
-+%define HAVE_ARMV5TE_INLINE 0
-+%define HAVE_ARMV6_INLINE 0
-+%define HAVE_ARMV6T2_INLINE 0
-+%define HAVE_ARMV8_INLINE 0
-+%define HAVE_NEON_INLINE 0
-+%define HAVE_VFP_INLINE 0
-+%define HAVE_VFPV3_INLINE 0
-+%define HAVE_SETEND_INLINE 0
-+%define HAVE_ALTIVEC_INLINE 0
-+%define HAVE_DCBZL_INLINE 0
-+%define HAVE_LDBRX_INLINE 0
-+%define HAVE_POWER8_INLINE 0
-+%define HAVE_PPC4XX_INLINE 0
-+%define HAVE_VSX_INLINE 0
-+%define HAVE_RVV_INLINE 0
-+%define HAVE_AESNI_INLINE 1
-+%define HAVE_AMD3DNOW_INLINE 1
-+%define HAVE_AMD3DNOWEXT_INLINE 1
-+%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
-+%define HAVE_MMXEXT_INLINE 1
-+%define HAVE_SSE_INLINE 1
-+%define HAVE_SSE2_INLINE 1
-+%define HAVE_SSE3_INLINE 1
-+%define HAVE_SSE4_INLINE 1
-+%define HAVE_SSE42_INLINE 1
-+%define HAVE_SSSE3_INLINE 1
-+%define HAVE_XOP_INLINE 1
-+%define HAVE_CPUNOP_INLINE 0
-+%define HAVE_I686_INLINE 0
-+%define HAVE_MIPSFPU_INLINE 0
-+%define HAVE_MIPS32R2_INLINE 0
-+%define HAVE_MIPS32R5_INLINE 0
-+%define HAVE_MIPS64R2_INLINE 0
-+%define HAVE_MIPS32R6_INLINE 0
-+%define HAVE_MIPS64R6_INLINE 0
-+%define HAVE_MIPSDSP_INLINE 0
-+%define HAVE_MIPSDSPR2_INLINE 0
-+%define HAVE_MSA_INLINE 0
-+%define HAVE_LOONGSON2_INLINE 0
-+%define HAVE_LOONGSON3_INLINE 0
-+%define HAVE_MMI_INLINE 0
-+%define HAVE_LSX_INLINE 0
-+%define HAVE_LASX_INLINE 0
-+%define HAVE_ALIGNED_STACK 0
-+%define HAVE_FAST_64BIT 0
-+%define HAVE_FAST_CLZ 1
-+%define HAVE_FAST_CMOV 0
-+%define HAVE_FAST_FLOAT16 0
-+%define HAVE_LOCAL_ALIGNED 1
-+%define HAVE_SIMD_ALIGN_16 1
-+%define HAVE_SIMD_ALIGN_32 1
-+%define HAVE_SIMD_ALIGN_64 1
-+%define HAVE_ATOMIC_CAS_PTR 0
-+%define HAVE_MACHINE_RW_BARRIER 0
-+%define HAVE_MEMORYBARRIER 0
-+%define HAVE_MM_EMPTY 0
-+%define HAVE_RDTSC 0
-+%define HAVE_SEM_TIMEDWAIT 1
-+%define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+%define HAVE_INLINE_ASM 1
-+%define HAVE_SYMVER 0
-+%define HAVE_X86ASM 1
-+%define HAVE_BIGENDIAN 0
-+%define HAVE_FAST_UNALIGNED 1
-+%define HAVE_ARPA_INET_H 0
-+%define HAVE_ASM_TYPES_H 0
-+%define HAVE_CDIO_PARANOIA_H 0
-+%define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+%define HAVE_CUDA_H 0
-+%define HAVE_DISPATCH_DISPATCH_H 0
-+%define HAVE_DEV_BKTR_IOCTL_BT848_H 0
-+%define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
-+%define HAVE_DEV_IC_BT8XX_H 1
-+%define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
-+%define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
-+%define HAVE_DIRECT_H 0
-+%define HAVE_DIRENT_H 1
-+%define HAVE_DXGIDEBUG_H 0
-+%define HAVE_DXVA_H 0
-+%define HAVE_ES2_GL_H 0
-+%define HAVE_GSM_H 0
-+%define HAVE_IO_H 0
-+%define HAVE_LINUX_DMA_BUF_H 0
-+%define HAVE_LINUX_PERF_EVENT_H 0
-+%define HAVE_MACHINE_IOCTL_BT848_H 0
-+%define HAVE_MACHINE_IOCTL_METEOR_H 0
-+%define HAVE_MALLOC_H 0
-+%define HAVE_OPENCV2_CORE_CORE_C_H 0
-+%define HAVE_OPENGL_GL3_H 0
-+%define HAVE_POLL_H 1
-+%define HAVE_SYS_PARAM_H 1
-+%define HAVE_SYS_RESOURCE_H 1
-+%define HAVE_SYS_SELECT_H 1
-+%define HAVE_SYS_SOUNDCARD_H 0
-+%define HAVE_SYS_TIME_H 1
-+%define HAVE_SYS_UN_H 1
-+%define HAVE_SYS_VIDEOIO_H 1
-+%define HAVE_TERMIOS_H 1
-+%define HAVE_UDPLITE_H 0
-+%define HAVE_UNISTD_H 1
-+%define HAVE_VALGRIND_VALGRIND_H 0 ; %define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440
-+%define HAVE_WINDOWS_H 0
-+%define HAVE_WINSOCK2_H 0
-+%define HAVE_INTRINSICS_NEON 0
-+%define HAVE_ATANF 1
-+%define HAVE_ATAN2F 1
-+%define HAVE_CBRT 1
-+%define HAVE_CBRTF 1
-+%define HAVE_COPYSIGN 1
-+%define HAVE_COSF 1
-+%define HAVE_ERF 1
-+%define HAVE_EXP2 1
-+%define HAVE_EXP2F 1
-+%define HAVE_EXPF 1
-+%define HAVE_HYPOT 1
-+%define HAVE_ISFINITE 1
-+%define HAVE_ISINF 1
-+%define HAVE_ISNAN 1
-+%define HAVE_LDEXPF 1
-+%define HAVE_LLRINT 1
-+%define HAVE_LLRINTF 1
-+%define HAVE_LOG2 1
-+%define HAVE_LOG2F 1
-+%define HAVE_LOG10F 1
-+%define HAVE_LRINT 1
-+%define HAVE_LRINTF 1
-+%define HAVE_POWF 1
-+%define HAVE_RINT 1
-+%define HAVE_ROUND 1
-+%define HAVE_ROUNDF 1
-+%define HAVE_SINF 1
-+%define HAVE_TRUNC 1
-+%define HAVE_TRUNCF 1
-+%define HAVE_DOS_PATHS 0
-+%define HAVE_LIBC_MSVCRT 0
-+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
-+%define HAVE_SECTION_DATA_REL_RO 1
-+%define HAVE_THREADS 1
-+%define HAVE_UWP 0
-+%define HAVE_WINRT 0
-+%define HAVE_ACCESS 1
-+%define HAVE_ALIGNED_MALLOC 0
-+%define HAVE_ARC4RANDOM 1
-+%define HAVE_CLOCK_GETTIME 1
-+%define HAVE_CLOSESOCKET 0
-+%define HAVE_COMMANDLINETOARGVW 0
-+%define HAVE_FCNTL 1
-+%define HAVE_GETADDRINFO 0
-+%define HAVE_GETAUXVAL 0
-+%define HAVE_GETENV 1
-+%define HAVE_GETHRTIME 0
-+%define HAVE_GETOPT 1
-+%define HAVE_GETMODULEHANDLE 0
-+%define HAVE_GETPROCESSAFFINITYMASK 0
-+%define HAVE_GETPROCESSMEMORYINFO 0
-+%define HAVE_GETPROCESSTIMES 0
-+%define HAVE_GETRUSAGE 1
-+%define HAVE_GETSTDHANDLE 0
-+%define HAVE_GETSYSTEMTIMEASFILETIME 0
-+%define HAVE_GETTIMEOFDAY 1
-+%define HAVE_GLOB 1
-+%define HAVE_GLXGETPROCADDRESS 0
-+%define HAVE_GMTIME_R 1
-+%define HAVE_INET_ATON 0
-+%define HAVE_ISATTY 1
-+%define HAVE_KBHIT 0
-+%define HAVE_LOCALTIME_R 1
-+%define HAVE_LSTAT 1
-+%define HAVE_LZO1X_999_COMPRESS 0
-+%define HAVE_MACH_ABSOLUTE_TIME 0
-+%define HAVE_MAPVIEWOFFILE 0
-+%define HAVE_MEMALIGN 0
-+%define HAVE_MKSTEMP 1
-+%define HAVE_MMAP 1
-+%define HAVE_MPROTECT 1
-+%define HAVE_NANOSLEEP 1
-+%define HAVE_PEEKNAMEDPIPE 0
-+%define HAVE_POSIX_MEMALIGN 1
-+%define HAVE_PRCTL 0
-+%define HAVE_PTHREAD_CANCEL 1
-+%define HAVE_SCHED_GETAFFINITY 0
-+%define HAVE_SECITEMIMPORT 0
-+%define HAVE_SETCONSOLETEXTATTRIBUTE 0
-+%define HAVE_SETCONSOLECTRLHANDLER 0
-+%define HAVE_SETDLLDIRECTORY 0
-+%define HAVE_SETMODE 0
-+%define HAVE_SETRLIMIT 1
-+%define HAVE_SLEEP 0
-+%define HAVE_STRERROR_R 1
-+%define HAVE_SYSCONF 1
-+%define HAVE_SYSCTL 0
-+%define HAVE_USLEEP 1
-+%define HAVE_UTGETOSTYPEFROMSTRING 0
-+%define HAVE_VIRTUALALLOC 0
-+%define HAVE_WGLGETPROCADDRESS 0
-+%define HAVE_BCRYPT 0
-+%define HAVE_VAAPI_DRM 0
-+%define HAVE_VAAPI_X11 0
-+%define HAVE_VDPAU_X11 0
-+%define HAVE_PTHREADS 1
-+%define HAVE_OS2THREADS 0
-+%define HAVE_W32THREADS 0
-+%define HAVE_AS_ARCH_DIRECTIVE 0
-+%define HAVE_AS_DN_DIRECTIVE 0
-+%define HAVE_AS_FPU_DIRECTIVE 0
-+%define HAVE_AS_FUNC 0
-+%define HAVE_AS_OBJECT_ARCH 0
-+%define HAVE_ASM_MOD_Q 0
-+%define HAVE_BLOCKS_EXTENSION 0
-+%define HAVE_EBP_AVAILABLE 1
-+%define HAVE_EBX_AVAILABLE 1
-+%define HAVE_GNU_AS 0
-+%define HAVE_GNU_WINDRES 0
-+%define HAVE_IBM_ASM 0
-+%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
-+%define HAVE_INLINE_ASM_LABELS 1
-+%define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-+%define HAVE_PRAGMA_DEPRECATED 1
-+%define HAVE_RSYNC_CONTIMEOUT 0
-+%define HAVE_SYMVER_ASM_LABEL 1
-+%define HAVE_SYMVER_GNU_ASM 1
-+%define HAVE_VFP_ARGS 0
-+%define HAVE_XFORM_ASM 0
-+%define HAVE_XMM_CLOBBERS 1
-+%define HAVE_DPI_AWARENESS_CONTEXT 0
-+%define HAVE_IDXGIOUTPUT5 0
-+%define HAVE_KCMVIDEOCODECTYPE_HEVC 0
-+%define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
-+%define HAVE_KCMVIDEOCODECTYPE_VP9 0
-+%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0
-+%define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0
-+%define HAVE_SOCKLEN_T 0
-+%define HAVE_STRUCT_ADDRINFO 0
-+%define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-+%define HAVE_STRUCT_IP_MREQ_SOURCE 0
-+%define HAVE_STRUCT_IPV6_MREQ 0
-+%define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0
-+%define HAVE_STRUCT_POLLFD 0
-+%define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
-+%define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
-+%define HAVE_STRUCT_SOCKADDR_IN6 0
-+%define HAVE_STRUCT_SOCKADDR_SA_LEN 0
-+%define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+%define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
-+%define HAVE_GZIP 1
-+%define HAVE_LIBDRM_GETFB2 0
-+%define HAVE_MAKEINFO 1
-+%define HAVE_MAKEINFO_HTML 0
-+%define HAVE_OPENCL_D3D11 0
-+%define HAVE_OPENCL_DRM_ARM 0
-+%define HAVE_OPENCL_DRM_BEIGNET 0
-+%define HAVE_OPENCL_DXVA2 0
-+%define HAVE_OPENCL_VAAPI_BEIGNET 0
-+%define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+%define HAVE_PERL 1
-+%define HAVE_POD2MAN 1
-+%define HAVE_TEXI2HTML 0
-+%define HAVE_XMLLINT 1
-+%define HAVE_ZLIB_GZIP 0
-+%define CONFIG_DOC 0
-+%define CONFIG_HTMLPAGES 0
-+%define CONFIG_MANPAGES 0
-+%define CONFIG_PODPAGES 0
-+%define CONFIG_TXTPAGES 0
-+%define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
-+%define CONFIG_AVIO_READING_EXAMPLE 1
-+%define CONFIG_DECODE_AUDIO_EXAMPLE 1
-+%define CONFIG_DECODE_VIDEO_EXAMPLE 1
-+%define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-+%define CONFIG_ENCODE_AUDIO_EXAMPLE 1
-+%define CONFIG_ENCODE_VIDEO_EXAMPLE 1
-+%define CONFIG_EXTRACT_MVS_EXAMPLE 1
-+%define CONFIG_FILTER_AUDIO_EXAMPLE 0
-+%define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-+%define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-+%define CONFIG_HTTP_MULTICLIENT_EXAMPLE 1
-+%define CONFIG_HW_DECODE_EXAMPLE 1
-+%define CONFIG_METADATA_EXAMPLE 1
-+%define CONFIG_MUXING_EXAMPLE 0
-+%define CONFIG_QSVDEC_EXAMPLE 0
-+%define CONFIG_REMUXING_EXAMPLE 1
-+%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-+%define CONFIG_SCALING_VIDEO_EXAMPLE 0
-+%define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-+%define CONFIG_TRANSCODING_EXAMPLE 0
-+%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
-+%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-+%define CONFIG_QSV_TRANSCODE_EXAMPLE 0
-+%define CONFIG_AVISYNTH 0
-+%define CONFIG_FREI0R 0
-+%define CONFIG_LIBCDIO 0
-+%define CONFIG_LIBDAVS2 0
-+%define CONFIG_LIBRUBBERBAND 0
-+%define CONFIG_LIBVIDSTAB 0
-+%define CONFIG_LIBX264 0
-+%define CONFIG_LIBX265 0
-+%define CONFIG_LIBXAVS 0
-+%define CONFIG_LIBXAVS2 0
-+%define CONFIG_LIBXVID 0
-+%define CONFIG_DECKLINK 0
-+%define CONFIG_LIBFDK_AAC 0
-+%define CONFIG_LIBTLS 0
-+%define CONFIG_GMP 0
-+%define CONFIG_LIBARIBB24 0
-+%define CONFIG_LIBLENSFUN 0
-+%define CONFIG_LIBOPENCORE_AMRNB 0
-+%define CONFIG_LIBOPENCORE_AMRWB 0
-+%define CONFIG_LIBVO_AMRWBENC 0
-+%define CONFIG_MBEDTLS 0
-+%define CONFIG_RKMPP 0
-+%define CONFIG_LIBSMBCLIENT 0
-+%define CONFIG_CHROMAPRINT 0
-+%define CONFIG_GCRYPT 0
-+%define CONFIG_GNUTLS 0
-+%define CONFIG_JNI 0
-+%define CONFIG_LADSPA 0
-+%define CONFIG_LCMS2 0
-+%define CONFIG_LIBAOM 0
-+%define CONFIG_LIBASS 0
-+%define CONFIG_LIBBLURAY 0
-+%define CONFIG_LIBBS2B 0
-+%define CONFIG_LIBCACA 0
-+%define CONFIG_LIBCELT 0
-+%define CONFIG_LIBCODEC2 0
-+%define CONFIG_LIBDAV1D 0
-+%define CONFIG_LIBDC1394 0
-+%define CONFIG_LIBDRM 0
-+%define CONFIG_LIBFLITE 0
-+%define CONFIG_LIBFONTCONFIG 0
-+%define CONFIG_LIBFREETYPE 0
-+%define CONFIG_LIBFRIBIDI 0
-+%define CONFIG_LIBGLSLANG 0
-+%define CONFIG_LIBGME 0
-+%define CONFIG_LIBGSM 0
-+%define CONFIG_LIBIEC61883 0
-+%define CONFIG_LIBILBC 0
-+%define CONFIG_LIBJACK 0
-+%define CONFIG_LIBJXL 0
-+%define CONFIG_LIBKLVANC 0
-+%define CONFIG_LIBKVAZAAR 0
-+%define CONFIG_LIBMODPLUG 0
-+%define CONFIG_LIBMP3LAME 0
-+%define CONFIG_LIBMYSOFA 0
-+%define CONFIG_LIBOPENCV 0
-+%define CONFIG_LIBOPENH264 0
-+%define CONFIG_LIBOPENJPEG 0
-+%define CONFIG_LIBOPENMPT 0
-+%define CONFIG_LIBOPENVINO 0
-+%define CONFIG_LIBOPUS 1
-+%define CONFIG_LIBPLACEBO 0
-+%define CONFIG_LIBPULSE 0
-+%define CONFIG_LIBRABBITMQ 0
-+%define CONFIG_LIBRAV1E 0
-+%define CONFIG_LIBRIST 0
-+%define CONFIG_LIBRSVG 0
-+%define CONFIG_LIBRTMP 0
-+%define CONFIG_LIBSHADERC 0
-+%define CONFIG_LIBSHINE 0
-+%define CONFIG_LIBSMBCLIENT 0
-+%define CONFIG_LIBSNAPPY 0
-+%define CONFIG_LIBSOXR 0
-+%define CONFIG_LIBSPEEX 0
-+%define CONFIG_LIBSRT 0
-+%define CONFIG_LIBSSH 0
-+%define CONFIG_LIBSVTAV1 0
-+%define CONFIG_LIBTENSORFLOW 0
-+%define CONFIG_LIBTESSERACT 0
-+%define CONFIG_LIBTHEORA 0
-+%define CONFIG_LIBTWOLAME 0
-+%define CONFIG_LIBUAVS3D 0
-+%define CONFIG_LIBV4L2 0
-+%define CONFIG_LIBVMAF 0
-+%define CONFIG_LIBVORBIS 0
-+%define CONFIG_LIBVPX 0
-+%define CONFIG_LIBWEBP 0
-+%define CONFIG_LIBXML2 0
-+%define CONFIG_LIBZIMG 0
-+%define CONFIG_LIBZMQ 0
-+%define CONFIG_LIBZVBI 0
-+%define CONFIG_LV2 0
-+%define CONFIG_MEDIACODEC 0
-+%define CONFIG_OPENAL 0
-+%define CONFIG_OPENGL 0
-+%define CONFIG_OPENSSL 0
-+%define CONFIG_POCKETSPHINX 0
-+%define CONFIG_VAPOURSYNTH 0
-+%define CONFIG_ALSA 0
-+%define CONFIG_APPKIT 0
-+%define CONFIG_AVFOUNDATION 0
-+%define CONFIG_BZLIB 0
-+%define CONFIG_COREIMAGE 0
-+%define CONFIG_ICONV 0
-+%define CONFIG_LIBXCB 0
-+%define CONFIG_LIBXCB_SHM 0
-+%define CONFIG_LIBXCB_SHAPE 0
-+%define CONFIG_LIBXCB_XFIXES 0
-+%define CONFIG_LZMA 0
-+%define CONFIG_MEDIAFOUNDATION 0
-+%define CONFIG_METAL 0
-+%define CONFIG_SCHANNEL 0
-+%define CONFIG_SDL2 0
-+%define CONFIG_SECURETRANSPORT 0
-+%define CONFIG_SNDIO 0
-+%define CONFIG_XLIB 0
-+%define CONFIG_ZLIB 0
-+%define CONFIG_CUDA_NVCC 0
-+%define CONFIG_CUDA_SDK 0
-+%define CONFIG_LIBNPP 0
-+%define CONFIG_LIBMFX 0
-+%define CONFIG_LIBVPL 0
-+%define CONFIG_MMAL 0
-+%define CONFIG_OMX 0
-+%define CONFIG_OPENCL 0
-+%define CONFIG_AMF 0
-+%define CONFIG_AUDIOTOOLBOX 0
-+%define CONFIG_CRYSTALHD 0
-+%define CONFIG_CUDA 0
-+%define CONFIG_CUDA_LLVM 0
-+%define CONFIG_CUVID 0
-+%define CONFIG_D3D11VA 0
-+%define CONFIG_DXVA2 0
-+%define CONFIG_FFNVCODEC 0
-+%define CONFIG_NVDEC 0
-+%define CONFIG_NVENC 0
-+%define CONFIG_VAAPI 0
-+%define CONFIG_VDPAU 0
-+%define CONFIG_VIDEOTOOLBOX 0
-+%define CONFIG_VULKAN 0
-+%define CONFIG_V4L2_M2M 0
-+%define CONFIG_FTRAPV 0
-+%define CONFIG_GRAY 0
-+%define CONFIG_HARDCODED_TABLES 0
-+%define CONFIG_OMX_RPI 0
-+%define CONFIG_RUNTIME_CPUDETECT 1
-+%define CONFIG_SAFE_BITSTREAM_READER 1
-+%define CONFIG_SHARED 0
-+%define CONFIG_SMALL 0
-+%define CONFIG_STATIC 1
-+%define CONFIG_SWSCALE_ALPHA 1
-+%define CONFIG_GPL 0
-+%define CONFIG_NONFREE 0
-+%define CONFIG_VERSION3 0
-+%define CONFIG_AVDEVICE 0
-+%define CONFIG_AVFILTER 0
-+%define CONFIG_SWSCALE 0
-+%define CONFIG_POSTPROC 0
-+%define CONFIG_AVFORMAT 1
-+%define CONFIG_AVCODEC 1
-+%define CONFIG_SWRESAMPLE 0
-+%define CONFIG_AVUTIL 1
-+%define CONFIG_FFPLAY 0
-+%define CONFIG_FFPROBE 0
-+%define CONFIG_FFMPEG 0
-+%define CONFIG_DCT 1
-+%define CONFIG_DWT 0
-+%define CONFIG_ERROR_RESILIENCE 0
-+%define CONFIG_FAAN 0
-+%define CONFIG_FAST_UNALIGNED 1
-+%define CONFIG_FFT 1
-+%define CONFIG_LSP 0
-+%define CONFIG_MDCT 0
-+%define CONFIG_PIXELUTILS 0
-+%define CONFIG_NETWORK 0
-+%define CONFIG_RDFT 1
-+%define CONFIG_AUTODETECT 0
-+%define CONFIG_FONTCONFIG 0
-+%define CONFIG_LARGE_TESTS 1
-+%define CONFIG_LINUX_PERF 0
-+%define CONFIG_MACOS_KPERF 0
-+%define CONFIG_MEMORY_POISONING 0
-+%define CONFIG_NEON_CLOBBER_TEST 0
-+%define CONFIG_OSSFUZZ 0
-+%define CONFIG_PIC 1
-+%define CONFIG_PTX_COMPRESSION 0
-+%define CONFIG_THUMB 0
-+%define CONFIG_VALGRIND_BACKTRACE 0
-+%define CONFIG_XMM_CLOBBER_TEST 0
-+%define CONFIG_BSFS 0
-+%define CONFIG_DECODERS 1
-+%define CONFIG_ENCODERS 0
-+%define CONFIG_HWACCELS 0
-+%define CONFIG_PARSERS 1
-+%define CONFIG_INDEVS 0
-+%define CONFIG_OUTDEVS 0
-+%define CONFIG_FILTERS 0
-+%define CONFIG_DEMUXERS 1
-+%define CONFIG_MUXERS 0
-+%define CONFIG_PROTOCOLS 0
-+%define CONFIG_AANDCTTABLES 0
-+%define CONFIG_AC3DSP 0
-+%define CONFIG_ADTS_HEADER 1
-+%define CONFIG_ATSC_A53 1
-+%define CONFIG_AUDIO_FRAME_QUEUE 0
-+%define CONFIG_AUDIODSP 0
-+%define CONFIG_BLOCKDSP 0
-+%define CONFIG_BSWAPDSP 0
-+%define CONFIG_CABAC 1
-+%define CONFIG_CBS 0
-+%define CONFIG_CBS_AV1 0
-+%define CONFIG_CBS_H264 0
-+%define CONFIG_CBS_H265 0
-+%define CONFIG_CBS_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
-+%define CONFIG_DVPROFILE 0
-+%define CONFIG_EXIF 0
-+%define CONFIG_FAANDCT 0
-+%define CONFIG_FAANIDCT 0
-+%define CONFIG_FDCTDSP 0
-+%define CONFIG_FMTCONVERT 0
-+%define CONFIG_FRAME_THREAD_ENCODER 0
-+%define CONFIG_G722DSP 0
-+%define CONFIG_GOLOMB 1
-+%define CONFIG_GPLV3 0
-+%define CONFIG_H263DSP 0
-+%define CONFIG_H264CHROMA 1
-+%define CONFIG_H264DSP 1
-+%define CONFIG_H264PARSE 1
-+%define CONFIG_H264PRED 1
-+%define CONFIG_H264QPEL 1
-+%define CONFIG_H264_SEI 1
-+%define CONFIG_HEVCPARSE 0
-+%define CONFIG_HEVC_SEI 0
-+%define CONFIG_HPELDSP 1
-+%define CONFIG_HUFFMAN 0
-+%define CONFIG_HUFFYUVDSP 0
-+%define CONFIG_HUFFYUVENCDSP 0
-+%define CONFIG_IDCTDSP 0
-+%define CONFIG_IIRFILTER 0
-+%define CONFIG_INFLATE_WRAPPER 0
-+%define CONFIG_INTRAX8 0
-+%define CONFIG_ISO_MEDIA 1
-+%define CONFIG_IVIDSP 0
-+%define CONFIG_JPEGTABLES 0
-+%define CONFIG_LGPLV3 0
-+%define CONFIG_LIBX262 0
-+%define CONFIG_LLAUDDSP 0
-+%define CONFIG_LLVIDDSP 0
-+%define CONFIG_LLVIDENCDSP 0
-+%define CONFIG_LPC 0
-+%define CONFIG_LZF 0
-+%define CONFIG_ME_CMP 0
-+%define CONFIG_MPEG_ER 0
-+%define CONFIG_MPEGAUDIO 1
-+%define CONFIG_MPEGAUDIODSP 1
-+%define CONFIG_MPEGAUDIOHEADER 1
-+%define CONFIG_MPEG4AUDIO 1
-+%define CONFIG_MPEGVIDEO 0
-+%define CONFIG_MPEGVIDEODEC 0
-+%define CONFIG_MPEGVIDEOENC 0
-+%define CONFIG_MSMPEG4DEC 0
-+%define CONFIG_MSMPEG4ENC 0
-+%define CONFIG_MSS34DSP 0
-+%define CONFIG_PIXBLOCKDSP 0
-+%define CONFIG_QPELDSP 0
-+%define CONFIG_QSV 0
-+%define CONFIG_QSVDEC 0
-+%define CONFIG_QSVENC 0
-+%define CONFIG_QSVVPP 0
-+%define CONFIG_RANGECODER 0
-+%define CONFIG_RIFFDEC 1
-+%define CONFIG_RIFFENC 0
-+%define CONFIG_RTPDEC 0
-+%define CONFIG_RTPENC_CHAIN 0
-+%define CONFIG_RV34DSP 0
-+%define CONFIG_SCENE_SAD 0
-+%define CONFIG_SINEWIN 1
-+%define CONFIG_SNAPPY 0
-+%define CONFIG_SRTP 0
-+%define CONFIG_STARTCODE 1
-+%define CONFIG_TEXTUREDSP 0
-+%define CONFIG_TEXTUREDSPENC 0
-+%define CONFIG_TPELDSP 0
-+%define CONFIG_VAAPI_1 0
-+%define CONFIG_VAAPI_ENCODE 0
-+%define CONFIG_VC1DSP 0
-+%define CONFIG_VIDEODSP 1
-+%define CONFIG_VP3DSP 1
-+%define CONFIG_VP56DSP 0
-+%define CONFIG_VP8DSP 1
-+%define CONFIG_WMA_FREQS 0
-+%define CONFIG_WMV2DSP 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
deleted file mode 100644
index f2e592622242..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h
+++ /dev/null
@@ -1,752 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2023-04-22 17:45:15 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h
-@@ -0,0 +1,749 @@
-+/* 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-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/liberato/src/release_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 2023
-+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+#define CC_IDENT "OpenBSD clang version 13.0.0"
-+#define OS_NAME openbsd
-+#define av_restrict restrict
-+#define EXTERN_PREFIX ""
-+#define EXTERN_ASM
-+#define BUILDSUF ""
-+#define SLIBSUF ".so"
-+#define HAVE_MMX2 HAVE_MMXEXT
-+#define SWS_MAX_FILTER_SIZE 256
-+#define ARCH_AARCH64 0
-+#define ARCH_ALPHA 0
-+#define ARCH_ARM 0
-+#define ARCH_AVR32 0
-+#define ARCH_AVR32_AP 0
-+#define ARCH_AVR32_UC 0
-+#define ARCH_BFIN 0
-+#define ARCH_IA64 0
-+#define ARCH_LOONGARCH 0
-+#define ARCH_LOONGARCH32 0
-+#define ARCH_LOONGARCH64 0
-+#define ARCH_M68K 0
-+#define ARCH_MIPS 0
-+#define ARCH_MIPS64 0
-+#define ARCH_PARISC 0
-+#define ARCH_PPC 0
-+#define ARCH_PPC64 0
-+#define ARCH_RISCV 0
-+#define ARCH_S390 0
-+#define ARCH_SH4 0
-+#define ARCH_SPARC 0
-+#define ARCH_SPARC64 0
-+#define ARCH_TILEGX 0
-+#define ARCH_TILEPRO 0
-+#define ARCH_TOMI 0
-+#define ARCH_X86 1
-+#define ARCH_X86_32 1
-+#define ARCH_X86_64 0
-+#define HAVE_ARMV5TE 0
-+#define HAVE_ARMV6 0
-+#define HAVE_ARMV6T2 0
-+#define HAVE_ARMV8 0
-+#define HAVE_NEON 0
-+#define HAVE_VFP 0
-+#define HAVE_VFPV3 0
-+#define HAVE_SETEND 0
-+#define HAVE_ALTIVEC 0
-+#define HAVE_DCBZL 0
-+#define HAVE_LDBRX 0
-+#define HAVE_POWER8 0
-+#define HAVE_PPC4XX 0
-+#define HAVE_VSX 0
-+#define HAVE_RVV 0
-+#define HAVE_AESNI 1
-+#define HAVE_AMD3DNOW 1
-+#define HAVE_AMD3DNOWEXT 1
-+#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
-+#define HAVE_MMXEXT 1
-+#define HAVE_SSE 1
-+#define HAVE_SSE2 1
-+#define HAVE_SSE3 1
-+#define HAVE_SSE4 1
-+#define HAVE_SSE42 1
-+#define HAVE_SSSE3 1
-+#define HAVE_XOP 1
-+#define HAVE_CPUNOP 0
-+#define HAVE_I686 1
-+#define HAVE_MIPSFPU 0
-+#define HAVE_MIPS32R2 0
-+#define HAVE_MIPS32R5 0
-+#define HAVE_MIPS64R2 0
-+#define HAVE_MIPS32R6 0
-+#define HAVE_MIPS64R6 0
-+#define HAVE_MIPSDSP 0
-+#define HAVE_MIPSDSPR2 0
-+#define HAVE_MSA 0
-+#define HAVE_LOONGSON2 0
-+#define HAVE_LOONGSON3 0
-+#define HAVE_MMI 0
-+#define HAVE_LSX 0
-+#define HAVE_LASX 0
-+#define HAVE_ARMV5TE_EXTERNAL 0
-+#define HAVE_ARMV6_EXTERNAL 0
-+#define HAVE_ARMV6T2_EXTERNAL 0
-+#define HAVE_ARMV8_EXTERNAL 0
-+#define HAVE_NEON_EXTERNAL 0
-+#define HAVE_VFP_EXTERNAL 0
-+#define HAVE_VFPV3_EXTERNAL 0
-+#define HAVE_SETEND_EXTERNAL 0
-+#define HAVE_ALTIVEC_EXTERNAL 0
-+#define HAVE_DCBZL_EXTERNAL 0
-+#define HAVE_LDBRX_EXTERNAL 0
-+#define HAVE_POWER8_EXTERNAL 0
-+#define HAVE_PPC4XX_EXTERNAL 0
-+#define HAVE_VSX_EXTERNAL 0
-+#define HAVE_RVV_EXTERNAL 0
-+#define HAVE_AESNI_EXTERNAL 1
-+#define HAVE_AMD3DNOW_EXTERNAL 1
-+#define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+#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
-+#define HAVE_MMXEXT_EXTERNAL 1
-+#define HAVE_SSE_EXTERNAL 1
-+#define HAVE_SSE2_EXTERNAL 1
-+#define HAVE_SSE3_EXTERNAL 1
-+#define HAVE_SSE4_EXTERNAL 1
-+#define HAVE_SSE42_EXTERNAL 1
-+#define HAVE_SSSE3_EXTERNAL 1
-+#define HAVE_XOP_EXTERNAL 1
-+#define HAVE_CPUNOP_EXTERNAL 0
-+#define HAVE_I686_EXTERNAL 0
-+#define HAVE_MIPSFPU_EXTERNAL 0
-+#define HAVE_MIPS32R2_EXTERNAL 0
-+#define HAVE_MIPS32R5_EXTERNAL 0
-+#define HAVE_MIPS64R2_EXTERNAL 0
-+#define HAVE_MIPS32R6_EXTERNAL 0
-+#define HAVE_MIPS64R6_EXTERNAL 0
-+#define HAVE_MIPSDSP_EXTERNAL 0
-+#define HAVE_MIPSDSPR2_EXTERNAL 0
-+#define HAVE_MSA_EXTERNAL 0
-+#define HAVE_LOONGSON2_EXTERNAL 0
-+#define HAVE_LOONGSON3_EXTERNAL 0
-+#define HAVE_MMI_EXTERNAL 0
-+#define HAVE_LSX_EXTERNAL 0
-+#define HAVE_LASX_EXTERNAL 0
-+#define HAVE_ARMV5TE_INLINE 0
-+#define HAVE_ARMV6_INLINE 0
-+#define HAVE_ARMV6T2_INLINE 0
-+#define HAVE_ARMV8_INLINE 0
-+#define HAVE_NEON_INLINE 0
-+#define HAVE_VFP_INLINE 0
-+#define HAVE_VFPV3_INLINE 0
-+#define HAVE_SETEND_INLINE 0
-+#define HAVE_ALTIVEC_INLINE 0
-+#define HAVE_DCBZL_INLINE 0
-+#define HAVE_LDBRX_INLINE 0
-+#define HAVE_POWER8_INLINE 0
-+#define HAVE_PPC4XX_INLINE 0
-+#define HAVE_VSX_INLINE 0
-+#define HAVE_RVV_INLINE 0
-+#define HAVE_AESNI_INLINE 1
-+#define HAVE_AMD3DNOW_INLINE 1
-+#define HAVE_AMD3DNOWEXT_INLINE 1
-+#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
-+#define HAVE_MMXEXT_INLINE 1
-+#define HAVE_SSE_INLINE 1
-+#define HAVE_SSE2_INLINE 1
-+#define HAVE_SSE3_INLINE 1
-+#define HAVE_SSE4_INLINE 1
-+#define HAVE_SSE42_INLINE 1
-+#define HAVE_SSSE3_INLINE 1
-+#define HAVE_XOP_INLINE 1
-+#define HAVE_CPUNOP_INLINE 0
-+#define HAVE_I686_INLINE 0
-+#define HAVE_MIPSFPU_INLINE 0
-+#define HAVE_MIPS32R2_INLINE 0
-+#define HAVE_MIPS32R5_INLINE 0
-+#define HAVE_MIPS64R2_INLINE 0
-+#define HAVE_MIPS32R6_INLINE 0
-+#define HAVE_MIPS64R6_INLINE 0
-+#define HAVE_MIPSDSP_INLINE 0
-+#define HAVE_MIPSDSPR2_INLINE 0
-+#define HAVE_MSA_INLINE 0
-+#define HAVE_LOONGSON2_INLINE 0
-+#define HAVE_LOONGSON3_INLINE 0
-+#define HAVE_MMI_INLINE 0
-+#define HAVE_LSX_INLINE 0
-+#define HAVE_LASX_INLINE 0
-+#define HAVE_ALIGNED_STACK 0
-+#define HAVE_FAST_64BIT 0
-+#define HAVE_FAST_CLZ 1
-+#define HAVE_FAST_CMOV 0
-+#define HAVE_FAST_FLOAT16 0
-+#define HAVE_LOCAL_ALIGNED 1
-+#define HAVE_SIMD_ALIGN_16 1
-+#define HAVE_SIMD_ALIGN_32 1
-+#define HAVE_SIMD_ALIGN_64 1
-+#define HAVE_ATOMIC_CAS_PTR 0
-+#define HAVE_MACHINE_RW_BARRIER 0
-+#define HAVE_MEMORYBARRIER 0
-+#define HAVE_MM_EMPTY 0
-+#define HAVE_RDTSC 0
-+#define HAVE_SEM_TIMEDWAIT 1
-+#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+#define HAVE_INLINE_ASM 1
-+#define HAVE_SYMVER 0
-+#define HAVE_X86ASM 1
-+#define HAVE_BIGENDIAN 0
-+#define HAVE_FAST_UNALIGNED 1
-+#define HAVE_ARPA_INET_H 0
-+#define HAVE_ASM_TYPES_H 0
-+#define HAVE_CDIO_PARANOIA_H 0
-+#define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+#define HAVE_CUDA_H 0
-+#define HAVE_DISPATCH_DISPATCH_H 0
-+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0
-+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
-+#define HAVE_DEV_IC_BT8XX_H 1
-+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
-+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
-+#define HAVE_DIRECT_H 0
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DXGIDEBUG_H 0
-+#define HAVE_DXVA_H 0
-+#define HAVE_ES2_GL_H 0
-+#define HAVE_GSM_H 0
-+#define HAVE_IO_H 0
-+#define HAVE_LINUX_DMA_BUF_H 0
-+#define HAVE_LINUX_PERF_EVENT_H 0
-+#define HAVE_MACHINE_IOCTL_BT848_H 0
-+#define HAVE_MACHINE_IOCTL_METEOR_H 0
-+#define HAVE_MALLOC_H 0
-+#define HAVE_OPENCV2_CORE_CORE_C_H 0
-+#define HAVE_OPENGL_GL3_H 0
-+#define HAVE_POLL_H 1
-+#define HAVE_SYS_PARAM_H 1
-+#define HAVE_SYS_RESOURCE_H 1
-+#define HAVE_SYS_SELECT_H 1
-+#define HAVE_SYS_SOUNDCARD_H 0
-+#define HAVE_SYS_TIME_H 1
-+#define HAVE_SYS_UN_H 1
-+#define HAVE_SYS_VIDEOIO_H 1
-+#define HAVE_TERMIOS_H 1
-+#define HAVE_UDPLITE_H 0
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */
-+#define HAVE_WINDOWS_H 0
-+#define HAVE_WINSOCK2_H 0
-+#define HAVE_INTRINSICS_NEON 0
-+#define HAVE_ATANF 1
-+#define HAVE_ATAN2F 1
-+#define HAVE_CBRT 1
-+#define HAVE_CBRTF 1
-+#define HAVE_COPYSIGN 1
-+#define HAVE_COSF 1
-+#define HAVE_ERF 1
-+#define HAVE_EXP2 1
-+#define HAVE_EXP2F 1
-+#define HAVE_EXPF 1
-+#define HAVE_HYPOT 1
-+#define HAVE_ISFINITE 1
-+#define HAVE_ISINF 1
-+#define HAVE_ISNAN 1
-+#define HAVE_LDEXPF 1
-+#define HAVE_LLRINT 1
-+#define HAVE_LLRINTF 1
-+#define HAVE_LOG2 1
-+#define HAVE_LOG2F 1
-+#define HAVE_LOG10F 1
-+#define HAVE_LRINT 1
-+#define HAVE_LRINTF 1
-+#define HAVE_POWF 1
-+#define HAVE_RINT 1
-+#define HAVE_ROUND 1
-+#define HAVE_ROUNDF 1
-+#define HAVE_SINF 1
-+#define HAVE_TRUNC 1
-+#define HAVE_TRUNCF 1
-+#define HAVE_DOS_PATHS 0
-+#define HAVE_LIBC_MSVCRT 0
-+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
-+#define HAVE_SECTION_DATA_REL_RO 1
-+#define HAVE_THREADS 1
-+#define HAVE_UWP 0
-+#define HAVE_WINRT 0
-+#define HAVE_ACCESS 1
-+#define HAVE_ALIGNED_MALLOC 0
-+#define HAVE_ARC4RANDOM 1
-+#define HAVE_CLOCK_GETTIME 1
-+#define HAVE_CLOSESOCKET 0
-+#define HAVE_COMMANDLINETOARGVW 0
-+#define HAVE_FCNTL 1
-+#define HAVE_GETADDRINFO 0
-+#define HAVE_GETAUXVAL 0
-+#define HAVE_GETENV 1
-+#define HAVE_GETHRTIME 0
-+#define HAVE_GETOPT 1
-+#define HAVE_GETMODULEHANDLE 0
-+#define HAVE_GETPROCESSAFFINITYMASK 0
-+#define HAVE_GETPROCESSMEMORYINFO 0
-+#define HAVE_GETPROCESSTIMES 0
-+#define HAVE_GETRUSAGE 1
-+#define HAVE_GETSTDHANDLE 0
-+#define HAVE_GETSYSTEMTIMEASFILETIME 0
-+#define HAVE_GETTIMEOFDAY 1
-+#define HAVE_GLOB 1
-+#define HAVE_GLXGETPROCADDRESS 0
-+#define HAVE_GMTIME_R 1
-+#define HAVE_INET_ATON 0
-+#define HAVE_ISATTY 1
-+#define HAVE_KBHIT 0
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_LSTAT 1
-+#define HAVE_LZO1X_999_COMPRESS 0
-+#define HAVE_MACH_ABSOLUTE_TIME 0
-+#define HAVE_MAPVIEWOFFILE 0
-+#define HAVE_MEMALIGN 0
-+#define HAVE_MKSTEMP 1
-+#define HAVE_MMAP 1
-+#define HAVE_MPROTECT 1
-+#define HAVE_NANOSLEEP 1
-+#define HAVE_PEEKNAMEDPIPE 0
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */
-+#define HAVE_PTHREAD_CANCEL 1
-+#define HAVE_SCHED_GETAFFINITY 0
-+#define HAVE_SECITEMIMPORT 0
-+#define HAVE_SETCONSOLETEXTATTRIBUTE 0
-+#define HAVE_SETCONSOLECTRLHANDLER 0
-+#define HAVE_SETDLLDIRECTORY 0
-+#define HAVE_SETMODE 0
-+#define HAVE_SETRLIMIT 1
-+#define HAVE_SLEEP 0
-+#define HAVE_STRERROR_R 1
-+#define HAVE_SYSCONF 1
-+#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 0 -- forced to 0 for Fuchsia */
-+#define HAVE_USLEEP 1
-+#define HAVE_UTGETOSTYPEFROMSTRING 0
-+#define HAVE_VIRTUALALLOC 0
-+#define HAVE_WGLGETPROCADDRESS 0
-+#define HAVE_BCRYPT 0
-+#define HAVE_VAAPI_DRM 0
-+#define HAVE_VAAPI_X11 0
-+#define HAVE_VDPAU_X11 0
-+#define HAVE_PTHREADS 1
-+#define HAVE_OS2THREADS 0
-+#define HAVE_W32THREADS 0
-+#define HAVE_AS_ARCH_DIRECTIVE 0
-+#define HAVE_AS_DN_DIRECTIVE 0
-+#define HAVE_AS_FPU_DIRECTIVE 0
-+#define HAVE_AS_FUNC 0
-+#define HAVE_AS_OBJECT_ARCH 0
-+#define HAVE_ASM_MOD_Q 0
-+#define HAVE_BLOCKS_EXTENSION 0
-+/* #define HAVE_EBP_AVAILABLE 1 -- ebp selection is done by the chrome build */
-+#define HAVE_EBX_AVAILABLE 1
-+#define HAVE_GNU_AS 0
-+#define HAVE_GNU_WINDRES 0
-+#define HAVE_IBM_ASM 0
-+#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 1
-+#define HAVE_INLINE_ASM_LABELS 1
-+#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-+#define HAVE_PRAGMA_DEPRECATED 1
-+#define HAVE_RSYNC_CONTIMEOUT 0
-+#define HAVE_SYMVER_ASM_LABEL 1
-+#define HAVE_SYMVER_GNU_ASM 1
-+#define HAVE_VFP_ARGS 0
-+#define HAVE_XFORM_ASM 0
-+#define HAVE_XMM_CLOBBERS 1
-+#define HAVE_DPI_AWARENESS_CONTEXT 0
-+#define HAVE_IDXGIOUTPUT5 0
-+#define HAVE_KCMVIDEOCODECTYPE_HEVC 0
-+#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
-+#define HAVE_KCMVIDEOCODECTYPE_VP9 0
-+#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0
-+#define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0
-+#define HAVE_SOCKLEN_T 0
-+#define HAVE_STRUCT_ADDRINFO 0
-+#define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-+#define HAVE_STRUCT_IP_MREQ_SOURCE 0
-+#define HAVE_STRUCT_IPV6_MREQ 0
-+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0
-+#define HAVE_STRUCT_POLLFD 0
-+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
-+#define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
-+#define HAVE_STRUCT_SOCKADDR_IN6 0
-+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
-+#define HAVE_GZIP 1
-+#define HAVE_LIBDRM_GETFB2 0
-+#define HAVE_MAKEINFO 1
-+#define HAVE_MAKEINFO_HTML 0
-+#define HAVE_OPENCL_D3D11 0
-+#define HAVE_OPENCL_DRM_ARM 0
-+#define HAVE_OPENCL_DRM_BEIGNET 0
-+#define HAVE_OPENCL_DXVA2 0
-+#define HAVE_OPENCL_VAAPI_BEIGNET 0
-+#define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+#define HAVE_PERL 1
-+#define HAVE_POD2MAN 1
-+#define HAVE_TEXI2HTML 0
-+#define HAVE_XMLLINT 1
-+#define HAVE_ZLIB_GZIP 0
-+#define CONFIG_DOC 0
-+#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 0
-+#define CONFIG_PODPAGES 0
-+#define CONFIG_TXTPAGES 0
-+#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
-+#define CONFIG_AVIO_READING_EXAMPLE 1
-+#define CONFIG_DECODE_AUDIO_EXAMPLE 1
-+#define CONFIG_DECODE_VIDEO_EXAMPLE 1
-+#define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-+#define CONFIG_ENCODE_AUDIO_EXAMPLE 1
-+#define CONFIG_ENCODE_VIDEO_EXAMPLE 1
-+#define CONFIG_EXTRACT_MVS_EXAMPLE 1
-+#define CONFIG_FILTER_AUDIO_EXAMPLE 0
-+#define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-+#define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-+#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 1
-+#define CONFIG_HW_DECODE_EXAMPLE 1
-+#define CONFIG_METADATA_EXAMPLE 1
-+#define CONFIG_MUXING_EXAMPLE 0
-+#define CONFIG_QSVDEC_EXAMPLE 0
-+#define CONFIG_REMUXING_EXAMPLE 1
-+#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-+#define CONFIG_SCALING_VIDEO_EXAMPLE 0
-+#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-+#define CONFIG_TRANSCODING_EXAMPLE 0
-+#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
-+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-+#define CONFIG_QSV_TRANSCODE_EXAMPLE 0
-+#define CONFIG_AVISYNTH 0
-+#define CONFIG_FREI0R 0
-+#define CONFIG_LIBCDIO 0
-+#define CONFIG_LIBDAVS2 0
-+#define CONFIG_LIBRUBBERBAND 0
-+#define CONFIG_LIBVIDSTAB 0
-+#define CONFIG_LIBX264 0
-+#define CONFIG_LIBX265 0
-+#define CONFIG_LIBXAVS 0
-+#define CONFIG_LIBXAVS2 0
-+#define CONFIG_LIBXVID 0
-+#define CONFIG_DECKLINK 0
-+#define CONFIG_LIBFDK_AAC 0
-+#define CONFIG_LIBTLS 0
-+#define CONFIG_GMP 0
-+#define CONFIG_LIBARIBB24 0
-+#define CONFIG_LIBLENSFUN 0
-+#define CONFIG_LIBOPENCORE_AMRNB 0
-+#define CONFIG_LIBOPENCORE_AMRWB 0
-+#define CONFIG_LIBVO_AMRWBENC 0
-+#define CONFIG_MBEDTLS 0
-+#define CONFIG_RKMPP 0
-+#define CONFIG_LIBSMBCLIENT 0
-+#define CONFIG_CHROMAPRINT 0
-+#define CONFIG_GCRYPT 0
-+#define CONFIG_GNUTLS 0
-+#define CONFIG_JNI 0
-+#define CONFIG_LADSPA 0
-+#define CONFIG_LCMS2 0
-+#define CONFIG_LIBAOM 0
-+#define CONFIG_LIBASS 0
-+#define CONFIG_LIBBLURAY 0
-+#define CONFIG_LIBBS2B 0
-+#define CONFIG_LIBCACA 0
-+#define CONFIG_LIBCELT 0
-+#define CONFIG_LIBCODEC2 0
-+#define CONFIG_LIBDAV1D 0
-+#define CONFIG_LIBDC1394 0
-+#define CONFIG_LIBDRM 0
-+#define CONFIG_LIBFLITE 0
-+#define CONFIG_LIBFONTCONFIG 0
-+#define CONFIG_LIBFREETYPE 0
-+#define CONFIG_LIBFRIBIDI 0
-+#define CONFIG_LIBGLSLANG 0
-+#define CONFIG_LIBGME 0
-+#define CONFIG_LIBGSM 0
-+#define CONFIG_LIBIEC61883 0
-+#define CONFIG_LIBILBC 0
-+#define CONFIG_LIBJACK 0
-+#define CONFIG_LIBJXL 0
-+#define CONFIG_LIBKLVANC 0
-+#define CONFIG_LIBKVAZAAR 0
-+#define CONFIG_LIBMODPLUG 0
-+#define CONFIG_LIBMP3LAME 0
-+#define CONFIG_LIBMYSOFA 0
-+#define CONFIG_LIBOPENCV 0
-+#define CONFIG_LIBOPENH264 0
-+#define CONFIG_LIBOPENJPEG 0
-+#define CONFIG_LIBOPENMPT 0
-+#define CONFIG_LIBOPENVINO 0
-+#define CONFIG_LIBOPUS 1
-+#define CONFIG_LIBPLACEBO 0
-+#define CONFIG_LIBPULSE 0
-+#define CONFIG_LIBRABBITMQ 0
-+#define CONFIG_LIBRAV1E 0
-+#define CONFIG_LIBRIST 0
-+#define CONFIG_LIBRSVG 0
-+#define CONFIG_LIBRTMP 0
-+#define CONFIG_LIBSHADERC 0
-+#define CONFIG_LIBSHINE 0
-+#define CONFIG_LIBSMBCLIENT 0
-+#define CONFIG_LIBSNAPPY 0
-+#define CONFIG_LIBSOXR 0
-+#define CONFIG_LIBSPEEX 0
-+#define CONFIG_LIBSRT 0
-+#define CONFIG_LIBSSH 0
-+#define CONFIG_LIBSVTAV1 0
-+#define CONFIG_LIBTENSORFLOW 0
-+#define CONFIG_LIBTESSERACT 0
-+#define CONFIG_LIBTHEORA 0
-+#define CONFIG_LIBTWOLAME 0
-+#define CONFIG_LIBUAVS3D 0
-+#define CONFIG_LIBV4L2 0
-+#define CONFIG_LIBVMAF 0
-+#define CONFIG_LIBVORBIS 0
-+#define CONFIG_LIBVPX 0
-+#define CONFIG_LIBWEBP 0
-+#define CONFIG_LIBXML2 0
-+#define CONFIG_LIBZIMG 0
-+#define CONFIG_LIBZMQ 0
-+#define CONFIG_LIBZVBI 0
-+#define CONFIG_LV2 0
-+#define CONFIG_MEDIACODEC 0
-+#define CONFIG_OPENAL 0
-+#define CONFIG_OPENGL 0
-+#define CONFIG_OPENSSL 0
-+#define CONFIG_POCKETSPHINX 0
-+#define CONFIG_VAPOURSYNTH 0
-+#define CONFIG_ALSA 0
-+#define CONFIG_APPKIT 0
-+#define CONFIG_AVFOUNDATION 0
-+#define CONFIG_BZLIB 0
-+#define CONFIG_COREIMAGE 0
-+#define CONFIG_ICONV 0
-+#define CONFIG_LIBXCB 0
-+#define CONFIG_LIBXCB_SHM 0
-+#define CONFIG_LIBXCB_SHAPE 0
-+#define CONFIG_LIBXCB_XFIXES 0
-+#define CONFIG_LZMA 0
-+#define CONFIG_MEDIAFOUNDATION 0
-+#define CONFIG_METAL 0
-+#define CONFIG_SCHANNEL 0
-+#define CONFIG_SDL2 0
-+#define CONFIG_SECURETRANSPORT 0
-+#define CONFIG_SNDIO 0
-+#define CONFIG_XLIB 0
-+#define CONFIG_ZLIB 0
-+#define CONFIG_CUDA_NVCC 0
-+#define CONFIG_CUDA_SDK 0
-+#define CONFIG_LIBNPP 0
-+#define CONFIG_LIBMFX 0
-+#define CONFIG_LIBVPL 0
-+#define CONFIG_MMAL 0
-+#define CONFIG_OMX 0
-+#define CONFIG_OPENCL 0
-+#define CONFIG_AMF 0
-+#define CONFIG_AUDIOTOOLBOX 0
-+#define CONFIG_CRYSTALHD 0
-+#define CONFIG_CUDA 0
-+#define CONFIG_CUDA_LLVM 0
-+#define CONFIG_CUVID 0
-+#define CONFIG_D3D11VA 0
-+#define CONFIG_DXVA2 0
-+#define CONFIG_FFNVCODEC 0
-+#define CONFIG_NVDEC 0
-+#define CONFIG_NVENC 0
-+#define CONFIG_VAAPI 0
-+#define CONFIG_VDPAU 0
-+#define CONFIG_VIDEOTOOLBOX 0
-+#define CONFIG_VULKAN 0
-+#define CONFIG_V4L2_M2M 0
-+#define CONFIG_FTRAPV 0
-+#define CONFIG_GRAY 0
-+#define CONFIG_HARDCODED_TABLES 0
-+#define CONFIG_OMX_RPI 0
-+#define CONFIG_RUNTIME_CPUDETECT 1
-+#define CONFIG_SAFE_BITSTREAM_READER 1
-+#define CONFIG_SHARED 0
-+#define CONFIG_SMALL 0
-+#define CONFIG_STATIC 1
-+#define CONFIG_SWSCALE_ALPHA 1
-+#define CONFIG_GPL 0
-+#define CONFIG_NONFREE 0
-+#define CONFIG_VERSION3 0
-+#define CONFIG_AVDEVICE 0
-+#define CONFIG_AVFILTER 0
-+#define CONFIG_SWSCALE 0
-+#define CONFIG_POSTPROC 0
-+#define CONFIG_AVFORMAT 1
-+#define CONFIG_AVCODEC 1
-+#define CONFIG_SWRESAMPLE 0
-+#define CONFIG_AVUTIL 1
-+#define CONFIG_FFPLAY 0
-+#define CONFIG_FFPROBE 0
-+#define CONFIG_FFMPEG 0
-+#define CONFIG_DCT 1
-+#define CONFIG_DWT 0
-+#define CONFIG_ERROR_RESILIENCE 0
-+#define CONFIG_FAAN 0
-+#define CONFIG_FAST_UNALIGNED 1
-+#define CONFIG_FFT 1
-+#define CONFIG_LSP 0
-+#define CONFIG_MDCT 0
-+#define CONFIG_PIXELUTILS 0
-+#define CONFIG_NETWORK 0
-+#define CONFIG_RDFT 1
-+#define CONFIG_AUTODETECT 0
-+#define CONFIG_FONTCONFIG 0
-+#define CONFIG_LARGE_TESTS 1
-+#define CONFIG_LINUX_PERF 0
-+#define CONFIG_MACOS_KPERF 0
-+#define CONFIG_MEMORY_POISONING 0
-+#define CONFIG_NEON_CLOBBER_TEST 0
-+#define CONFIG_OSSFUZZ 0
-+#define CONFIG_PIC 1
-+#define CONFIG_PTX_COMPRESSION 0
-+#define CONFIG_THUMB 0
-+#define CONFIG_VALGRIND_BACKTRACE 0
-+#define CONFIG_XMM_CLOBBER_TEST 0
-+#define CONFIG_BSFS 0
-+#define CONFIG_DECODERS 1
-+#define CONFIG_ENCODERS 0
-+#define CONFIG_HWACCELS 0
-+#define CONFIG_PARSERS 1
-+#define CONFIG_INDEVS 0
-+#define CONFIG_OUTDEVS 0
-+#define CONFIG_FILTERS 0
-+#define CONFIG_DEMUXERS 1
-+#define CONFIG_MUXERS 0
-+#define CONFIG_PROTOCOLS 0
-+#define CONFIG_AANDCTTABLES 0
-+#define CONFIG_AC3DSP 0
-+#define CONFIG_ADTS_HEADER 1
-+#define CONFIG_ATSC_A53 1
-+#define CONFIG_AUDIO_FRAME_QUEUE 0
-+#define CONFIG_AUDIODSP 0
-+#define CONFIG_BLOCKDSP 0
-+#define CONFIG_BSWAPDSP 0
-+#define CONFIG_CABAC 1
-+#define CONFIG_CBS 0
-+#define CONFIG_CBS_AV1 0
-+#define CONFIG_CBS_H264 0
-+#define CONFIG_CBS_H265 0
-+#define CONFIG_CBS_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
-+#define CONFIG_DVPROFILE 0
-+#define CONFIG_EXIF 0
-+#define CONFIG_FAANDCT 0
-+#define CONFIG_FAANIDCT 0
-+#define CONFIG_FDCTDSP 0
-+#define CONFIG_FMTCONVERT 0
-+#define CONFIG_FRAME_THREAD_ENCODER 0
-+#define CONFIG_G722DSP 0
-+#define CONFIG_GOLOMB 1
-+#define CONFIG_GPLV3 0
-+#define CONFIG_H263DSP 0
-+#define CONFIG_H264CHROMA 1
-+#define CONFIG_H264DSP 1
-+#define CONFIG_H264PARSE 1
-+#define CONFIG_H264PRED 1
-+#define CONFIG_H264QPEL 1
-+#define CONFIG_H264_SEI 1
-+#define CONFIG_HEVCPARSE 0
-+#define CONFIG_HEVC_SEI 0
-+#define CONFIG_HPELDSP 1
-+#define CONFIG_HUFFMAN 0
-+#define CONFIG_HUFFYUVDSP 0
-+#define CONFIG_HUFFYUVENCDSP 0
-+#define CONFIG_IDCTDSP 0
-+#define CONFIG_IIRFILTER 0
-+#define CONFIG_INFLATE_WRAPPER 0
-+#define CONFIG_INTRAX8 0
-+#define CONFIG_ISO_MEDIA 1
-+#define CONFIG_IVIDSP 0
-+#define CONFIG_JPEGTABLES 0
-+#define CONFIG_LGPLV3 0
-+#define CONFIG_LIBX262 0
-+#define CONFIG_LLAUDDSP 0
-+#define CONFIG_LLVIDDSP 0
-+#define CONFIG_LLVIDENCDSP 0
-+#define CONFIG_LPC 0
-+#define CONFIG_LZF 0
-+#define CONFIG_ME_CMP 0
-+#define CONFIG_MPEG_ER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
-+#define CONFIG_MPEG4AUDIO 1
-+#define CONFIG_MPEGVIDEO 0
-+#define CONFIG_MPEGVIDEODEC 0
-+#define CONFIG_MPEGVIDEOENC 0
-+#define CONFIG_MSMPEG4DEC 0
-+#define CONFIG_MSMPEG4ENC 0
-+#define CONFIG_MSS34DSP 0
-+#define CONFIG_PIXBLOCKDSP 0
-+#define CONFIG_QPELDSP 0
-+#define CONFIG_QSV 0
-+#define CONFIG_QSVDEC 0
-+#define CONFIG_QSVENC 0
-+#define CONFIG_QSVVPP 0
-+#define CONFIG_RANGECODER 0
-+#define CONFIG_RIFFDEC 1
-+#define CONFIG_RIFFENC 0
-+#define CONFIG_RTPDEC 0
-+#define CONFIG_RTPENC_CHAIN 0
-+#define CONFIG_RV34DSP 0
-+#define CONFIG_SCENE_SAD 0
-+#define CONFIG_SINEWIN 1
-+#define CONFIG_SNAPPY 0
-+#define CONFIG_SRTP 0
-+#define CONFIG_STARTCODE 1
-+#define CONFIG_TEXTUREDSP 0
-+#define CONFIG_TEXTUREDSPENC 0
-+#define CONFIG_TPELDSP 0
-+#define CONFIG_VAAPI_1 0
-+#define CONFIG_VAAPI_ENCODE 0
-+#define CONFIG_VC1DSP 0
-+#define CONFIG_VIDEODSP 1
-+#define CONFIG_VP3DSP 1
-+#define CONFIG_VP56DSP 0
-+#define CONFIG_VP8DSP 1
-+#define CONFIG_WMA_FREQS 0
-+#define CONFIG_WMV2DSP 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
deleted file mode 100644
index 6502d1837949..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h
+++ /dev/null
@@ -1,2149 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h.orig 2023-04-22 17:45:15 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h
-@@ -0,0 +1,2146 @@
-+/* Automatically generated by configure - do not modify! */
-+#ifndef FFMPEG_CONFIG_COMPONENTS_H
-+#define FFMPEG_CONFIG_COMPONENTS_H
-+#define CONFIG_AAC_ADTSTOASC_BSF 0
-+#define CONFIG_AV1_FRAME_MERGE_BSF 0
-+#define CONFIG_AV1_FRAME_SPLIT_BSF 0
-+#define CONFIG_AV1_METADATA_BSF 0
-+#define CONFIG_CHOMP_BSF 0
-+#define CONFIG_DUMP_EXTRADATA_BSF 0
-+#define CONFIG_DCA_CORE_BSF 0
-+#define CONFIG_DTS2PTS_BSF 0
-+#define CONFIG_DV_ERROR_MARKER_BSF 0
-+#define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+#define CONFIG_FILTER_UNITS_BSF 0
-+#define CONFIG_H264_METADATA_BSF 0
-+#define CONFIG_H264_MP4TOANNEXB_BSF 0
-+#define CONFIG_H264_REDUNDANT_PPS_BSF 0
-+#define CONFIG_HAPQA_EXTRACT_BSF 0
-+#define CONFIG_HEVC_METADATA_BSF 0
-+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
-+#define CONFIG_IMX_DUMP_HEADER_BSF 0
-+#define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
-+#define CONFIG_MJPEG2JPEG_BSF 0
-+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+#define CONFIG_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_MEDIA100_DECODER 0
-+#define CONFIG_MIMIC_DECODER 0
-+#define CONFIG_MJPEG_DECODER 0
-+#define CONFIG_MJPEGB_DECODER 0
-+#define CONFIG_MMVIDEO_DECODER 0
-+#define CONFIG_MOBICLIP_DECODER 0
-+#define CONFIG_MOTIONPIXELS_DECODER 0
-+#define CONFIG_MPEG1VIDEO_DECODER 0
-+#define CONFIG_MPEG2VIDEO_DECODER 0
-+#define CONFIG_MPEG4_DECODER 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_PHM_DECODER 0
-+#define CONFIG_PHOTOCD_DECODER 0
-+#define CONFIG_PICTOR_DECODER 0
-+#define CONFIG_PIXLET_DECODER 0
-+#define CONFIG_PNG_DECODER 0
-+#define CONFIG_PPM_DECODER 0
-+#define CONFIG_PRORES_DECODER 0
-+#define CONFIG_PROSUMER_DECODER 0
-+#define CONFIG_PSD_DECODER 0
-+#define CONFIG_PTX_DECODER 0
-+#define CONFIG_QDRAW_DECODER 0
-+#define CONFIG_QOI_DECODER 0
-+#define CONFIG_QPEG_DECODER 0
-+#define CONFIG_QTRLE_DECODER 0
-+#define CONFIG_R10K_DECODER 0
-+#define CONFIG_R210_DECODER 0
-+#define CONFIG_RASC_DECODER 0
-+#define CONFIG_RAWVIDEO_DECODER 0
-+#define CONFIG_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_VQC_DECODER 0
-+#define CONFIG_WBMP_DECODER 0
-+#define CONFIG_WEBP_DECODER 0
-+#define CONFIG_WCMV_DECODER 0
-+#define CONFIG_WRAPPED_AVFRAME_DECODER 0
-+#define CONFIG_WMV1_DECODER 0
-+#define CONFIG_WMV2_DECODER 0
-+#define CONFIG_WMV3_DECODER 0
-+#define CONFIG_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_APAC_DECODER 0
-+#define CONFIG_APE_DECODER 0
-+#define CONFIG_APTX_DECODER 0
-+#define CONFIG_APTX_HD_DECODER 0
-+#define CONFIG_ATRAC1_DECODER 0
-+#define CONFIG_ATRAC3_DECODER 0
-+#define CONFIG_ATRAC3AL_DECODER 0
-+#define CONFIG_ATRAC3P_DECODER 0
-+#define CONFIG_ATRAC3PAL_DECODER 0
-+#define CONFIG_ATRAC9_DECODER 0
-+#define CONFIG_BINKAUDIO_DCT_DECODER 0
-+#define CONFIG_BINKAUDIO_RDFT_DECODER 0
-+#define CONFIG_BMV_AUDIO_DECODER 0
-+#define CONFIG_BONK_DECODER 0
-+#define CONFIG_COOK_DECODER 0
-+#define CONFIG_DCA_DECODER 0
-+#define CONFIG_DFPWM_DECODER 0
-+#define CONFIG_DOLBY_E_DECODER 0
-+#define CONFIG_DSD_LSBF_DECODER 0
-+#define CONFIG_DSD_MSBF_DECODER 0
-+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0
-+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0
-+#define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
-+#define CONFIG_DST_DECODER 0
-+#define CONFIG_EAC3_DECODER 0
-+#define CONFIG_EVRC_DECODER 0
-+#define CONFIG_FASTAUDIO_DECODER 0
-+#define CONFIG_FFWAVESYNTH_DECODER 0
-+#define CONFIG_FLAC_DECODER 1
-+#define CONFIG_FTR_DECODER 0
-+#define CONFIG_G723_1_DECODER 0
-+#define CONFIG_G729_DECODER 0
-+#define CONFIG_GSM_DECODER 0
-+#define CONFIG_GSM_MS_DECODER 0
-+#define CONFIG_HCA_DECODER 0
-+#define CONFIG_HCOM_DECODER 0
-+#define CONFIG_HDR_DECODER 0
-+#define CONFIG_IAC_DECODER 0
-+#define CONFIG_ILBC_DECODER 0
-+#define CONFIG_IMC_DECODER 0
-+#define CONFIG_INTERPLAY_ACM_DECODER 0
-+#define CONFIG_MACE3_DECODER 0
-+#define CONFIG_MACE6_DECODER 0
-+#define CONFIG_METASOUND_DECODER 0
-+#define CONFIG_MISC4_DECODER 0
-+#define CONFIG_MLP_DECODER 0
-+#define CONFIG_MP1_DECODER 0
-+#define CONFIG_MP1FLOAT_DECODER 0
-+#define CONFIG_MP2_DECODER 0
-+#define CONFIG_MP2FLOAT_DECODER 0
-+#define CONFIG_MP3FLOAT_DECODER 0
-+#define CONFIG_MP3_DECODER 1
-+#define CONFIG_MP3ADUFLOAT_DECODER 0
-+#define CONFIG_MP3ADU_DECODER 0
-+#define CONFIG_MP3ON4FLOAT_DECODER 0
-+#define CONFIG_MP3ON4_DECODER 0
-+#define CONFIG_MPC7_DECODER 0
-+#define CONFIG_MPC8_DECODER 0
-+#define CONFIG_MSNSIREN_DECODER 0
-+#define CONFIG_NELLYMOSER_DECODER 0
-+#define CONFIG_ON2AVC_DECODER 0
-+#define CONFIG_OPUS_DECODER 0
-+#define CONFIG_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_CBD2_DPCM_DECODER 0
-+#define CONFIG_DERF_DPCM_DECODER 0
-+#define CONFIG_GREMLIN_DPCM_DECODER 0
-+#define CONFIG_INTERPLAY_DPCM_DECODER 0
-+#define CONFIG_ROQ_DPCM_DECODER 0
-+#define CONFIG_SDX2_DPCM_DECODER 0
-+#define CONFIG_SOL_DPCM_DECODER 0
-+#define CONFIG_XAN_DPCM_DECODER 0
-+#define CONFIG_WADY_DPCM_DECODER 0
-+#define CONFIG_ADPCM_4XM_DECODER 0
-+#define CONFIG_ADPCM_ADX_DECODER 0
-+#define CONFIG_ADPCM_AFC_DECODER 0
-+#define CONFIG_ADPCM_AGM_DECODER 0
-+#define CONFIG_ADPCM_AICA_DECODER 0
-+#define CONFIG_ADPCM_ARGO_DECODER 0
-+#define CONFIG_ADPCM_CT_DECODER 0
-+#define CONFIG_ADPCM_DTK_DECODER 0
-+#define CONFIG_ADPCM_EA_DECODER 0
-+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
-+#define CONFIG_ADPCM_EA_R1_DECODER 0
-+#define CONFIG_ADPCM_EA_R2_DECODER 0
-+#define CONFIG_ADPCM_EA_R3_DECODER 0
-+#define CONFIG_ADPCM_EA_XAS_DECODER 0
-+#define CONFIG_ADPCM_G722_DECODER 0
-+#define CONFIG_ADPCM_G726_DECODER 0
-+#define CONFIG_ADPCM_G726LE_DECODER 0
-+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0
-+#define CONFIG_ADPCM_IMA_AMV_DECODER 0
-+#define CONFIG_ADPCM_IMA_ALP_DECODER 0
-+#define CONFIG_ADPCM_IMA_APC_DECODER 0
-+#define CONFIG_ADPCM_IMA_APM_DECODER 0
-+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
-+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK3_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK4_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_ISS_DECODER 0
-+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
-+#define CONFIG_ADPCM_IMA_MTF_DECODER 0
-+#define CONFIG_ADPCM_IMA_OKI_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_DECODER 0
-+#define CONFIG_ADPCM_IMA_RAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_SSI_DECODER 0
-+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
-+#define CONFIG_ADPCM_IMA_WAV_DECODER 0
-+#define CONFIG_ADPCM_IMA_WS_DECODER 0
-+#define CONFIG_ADPCM_MS_DECODER 0
-+#define CONFIG_ADPCM_MTAF_DECODER 0
-+#define CONFIG_ADPCM_PSX_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_2_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_3_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_4_DECODER 0
-+#define CONFIG_ADPCM_SWF_DECODER 0
-+#define CONFIG_ADPCM_THP_DECODER 0
-+#define CONFIG_ADPCM_THP_LE_DECODER 0
-+#define CONFIG_ADPCM_VIMA_DECODER 0
-+#define CONFIG_ADPCM_XA_DECODER 0
-+#define CONFIG_ADPCM_XMD_DECODER 0
-+#define CONFIG_ADPCM_YAMAHA_DECODER 0
-+#define CONFIG_ADPCM_ZORK_DECODER 0
-+#define CONFIG_SSA_DECODER 0
-+#define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
-+#define CONFIG_DVBSUB_DECODER 0
-+#define CONFIG_DVDSUB_DECODER 0
-+#define CONFIG_JACOSUB_DECODER 0
-+#define CONFIG_MICRODVD_DECODER 0
-+#define CONFIG_MOVTEXT_DECODER 0
-+#define CONFIG_MPL2_DECODER 0
-+#define CONFIG_PGSSUB_DECODER 0
-+#define CONFIG_PJS_DECODER 0
-+#define CONFIG_REALTEXT_DECODER 0
-+#define CONFIG_SAMI_DECODER 0
-+#define CONFIG_SRT_DECODER 0
-+#define CONFIG_STL_DECODER 0
-+#define CONFIG_SUBRIP_DECODER 0
-+#define CONFIG_SUBVIEWER_DECODER 0
-+#define CONFIG_SUBVIEWER1_DECODER 0
-+#define CONFIG_TEXT_DECODER 0
-+#define CONFIG_VPLAYER_DECODER 0
-+#define CONFIG_WEBVTT_DECODER 0
-+#define CONFIG_XSUB_DECODER 0
-+#define CONFIG_AAC_AT_DECODER 0
-+#define CONFIG_AC3_AT_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
-+#define CONFIG_ALAC_AT_DECODER 0
-+#define CONFIG_AMR_NB_AT_DECODER 0
-+#define CONFIG_EAC3_AT_DECODER 0
-+#define CONFIG_GSM_MS_AT_DECODER 0
-+#define CONFIG_ILBC_AT_DECODER 0
-+#define CONFIG_MP1_AT_DECODER 0
-+#define CONFIG_MP2_AT_DECODER 0
-+#define CONFIG_MP3_AT_DECODER 0
-+#define CONFIG_PCM_ALAW_AT_DECODER 0
-+#define CONFIG_PCM_MULAW_AT_DECODER 0
-+#define CONFIG_QDMC_AT_DECODER 0
-+#define CONFIG_QDM2_AT_DECODER 0
-+#define CONFIG_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_MEDIACODEC_DECODER 0
-+#define CONFIG_AV1_QSV_DECODER 0
-+#define CONFIG_LIBOPENH264_DECODER 0
-+#define CONFIG_H264_CUVID_DECODER 0
-+#define CONFIG_HEVC_CUVID_DECODER 0
-+#define CONFIG_HEVC_MEDIACODEC_DECODER 0
-+#define CONFIG_MJPEG_CUVID_DECODER 0
-+#define CONFIG_MJPEG_QSV_DECODER 0
-+#define CONFIG_MPEG1_CUVID_DECODER 0
-+#define CONFIG_MPEG2_CUVID_DECODER 0
-+#define CONFIG_MPEG4_CUVID_DECODER 0
-+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-+#define CONFIG_VC1_CUVID_DECODER 0
-+#define CONFIG_VP8_CUVID_DECODER 0
-+#define CONFIG_VP8_MEDIACODEC_DECODER 0
-+#define CONFIG_VP8_QSV_DECODER 0
-+#define CONFIG_VP9_CUVID_DECODER 0
-+#define CONFIG_VP9_MEDIACODEC_DECODER 0
-+#define CONFIG_VP9_QSV_DECODER 0
-+#define CONFIG_VNULL_DECODER 0
-+#define CONFIG_ANULL_DECODER 0
-+#define CONFIG_A64MULTI_ENCODER 0
-+#define CONFIG_A64MULTI5_ENCODER 0
-+#define CONFIG_ALIAS_PIX_ENCODER 0
-+#define CONFIG_AMV_ENCODER 0
-+#define CONFIG_APNG_ENCODER 0
-+#define CONFIG_ASV1_ENCODER 0
-+#define CONFIG_ASV2_ENCODER 0
-+#define CONFIG_AVRP_ENCODER 0
-+#define CONFIG_AVUI_ENCODER 0
-+#define CONFIG_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_H264_MEDIACODEC_ENCODER 0
-+#define CONFIG_HAP_ENCODER 0
-+#define CONFIG_HUFFYUV_ENCODER 0
-+#define CONFIG_JPEG2000_ENCODER 0
-+#define CONFIG_JPEGLS_ENCODER 0
-+#define CONFIG_LJPEG_ENCODER 0
-+#define CONFIG_MAGICYUV_ENCODER 0
-+#define CONFIG_MJPEG_ENCODER 0
-+#define CONFIG_MPEG1VIDEO_ENCODER 0
-+#define CONFIG_MPEG2VIDEO_ENCODER 0
-+#define CONFIG_MPEG4_ENCODER 0
-+#define CONFIG_MSMPEG4V2_ENCODER 0
-+#define CONFIG_MSMPEG4V3_ENCODER 0
-+#define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_PAM_ENCODER 0
-+#define CONFIG_PBM_ENCODER 0
-+#define CONFIG_PCX_ENCODER 0
-+#define CONFIG_PFM_ENCODER 0
-+#define CONFIG_PGM_ENCODER 0
-+#define CONFIG_PGMYUV_ENCODER 0
-+#define CONFIG_PHM_ENCODER 0
-+#define CONFIG_PNG_ENCODER 0
-+#define CONFIG_PPM_ENCODER 0
-+#define CONFIG_PRORES_ENCODER 0
-+#define CONFIG_PRORES_AW_ENCODER 0
-+#define CONFIG_PRORES_KS_ENCODER 0
-+#define CONFIG_QOI_ENCODER 0
-+#define CONFIG_QTRLE_ENCODER 0
-+#define CONFIG_R10K_ENCODER 0
-+#define CONFIG_R210_ENCODER 0
-+#define CONFIG_RAWVIDEO_ENCODER 0
-+#define CONFIG_ROQ_ENCODER 0
-+#define CONFIG_RPZA_ENCODER 0
-+#define CONFIG_RV10_ENCODER 0
-+#define CONFIG_RV20_ENCODER 0
-+#define CONFIG_S302M_ENCODER 0
-+#define CONFIG_SGI_ENCODER 0
-+#define CONFIG_SMC_ENCODER 0
-+#define CONFIG_SNOW_ENCODER 0
-+#define CONFIG_SPEEDHQ_ENCODER 0
-+#define CONFIG_SUNRAST_ENCODER 0
-+#define CONFIG_SVQ1_ENCODER 0
-+#define CONFIG_TARGA_ENCODER 0
-+#define CONFIG_TIFF_ENCODER 0
-+#define CONFIG_UTVIDEO_ENCODER 0
-+#define CONFIG_V210_ENCODER 0
-+#define CONFIG_V308_ENCODER 0
-+#define CONFIG_V408_ENCODER 0
-+#define CONFIG_V410_ENCODER 0
-+#define CONFIG_VBN_ENCODER 0
-+#define CONFIG_VC2_ENCODER 0
-+#define CONFIG_WBMP_ENCODER 0
-+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
-+#define CONFIG_WMV1_ENCODER 0
-+#define CONFIG_WMV2_ENCODER 0
-+#define CONFIG_XBM_ENCODER 0
-+#define CONFIG_XFACE_ENCODER 0
-+#define CONFIG_XWD_ENCODER 0
-+#define CONFIG_Y41P_ENCODER 0
-+#define CONFIG_YUV4_ENCODER 0
-+#define CONFIG_ZLIB_ENCODER 0
-+#define CONFIG_ZMBV_ENCODER 0
-+#define CONFIG_AAC_ENCODER 0
-+#define CONFIG_AC3_ENCODER 0
-+#define CONFIG_AC3_FIXED_ENCODER 0
-+#define CONFIG_ALAC_ENCODER 0
-+#define CONFIG_APTX_ENCODER 0
-+#define CONFIG_APTX_HD_ENCODER 0
-+#define CONFIG_DCA_ENCODER 0
-+#define CONFIG_DFPWM_ENCODER 0
-+#define CONFIG_EAC3_ENCODER 0
-+#define CONFIG_FLAC_ENCODER 0
-+#define CONFIG_G723_1_ENCODER 0
-+#define CONFIG_HDR_ENCODER 0
-+#define CONFIG_MLP_ENCODER 0
-+#define CONFIG_MP2_ENCODER 0
-+#define CONFIG_MP2FIXED_ENCODER 0
-+#define CONFIG_NELLYMOSER_ENCODER 0
-+#define CONFIG_OPUS_ENCODER 0
-+#define CONFIG_RA_144_ENCODER 0
-+#define CONFIG_SBC_ENCODER 0
-+#define CONFIG_SONIC_ENCODER 0
-+#define CONFIG_SONIC_LS_ENCODER 0
-+#define CONFIG_TRUEHD_ENCODER 0
-+#define CONFIG_TTA_ENCODER 0
-+#define CONFIG_VORBIS_ENCODER 0
-+#define CONFIG_WAVPACK_ENCODER 0
-+#define CONFIG_WMAV1_ENCODER 0
-+#define CONFIG_WMAV2_ENCODER 0
-+#define CONFIG_PCM_ALAW_ENCODER 0
-+#define CONFIG_PCM_BLURAY_ENCODER 0
-+#define CONFIG_PCM_DVD_ENCODER 0
-+#define CONFIG_PCM_F32BE_ENCODER 0
-+#define CONFIG_PCM_F32LE_ENCODER 0
-+#define CONFIG_PCM_F64BE_ENCODER 0
-+#define CONFIG_PCM_F64LE_ENCODER 0
-+#define CONFIG_PCM_MULAW_ENCODER 0
-+#define CONFIG_PCM_S8_ENCODER 0
-+#define CONFIG_PCM_S8_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16BE_ENCODER 0
-+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16LE_ENCODER 0
-+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S24BE_ENCODER 0
-+#define CONFIG_PCM_S24DAUD_ENCODER 0
-+#define CONFIG_PCM_S24LE_ENCODER 0
-+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S32BE_ENCODER 0
-+#define CONFIG_PCM_S32LE_ENCODER 0
-+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S64BE_ENCODER 0
-+#define CONFIG_PCM_S64LE_ENCODER 0
-+#define CONFIG_PCM_U8_ENCODER 0
-+#define CONFIG_PCM_U16BE_ENCODER 0
-+#define CONFIG_PCM_U16LE_ENCODER 0
-+#define CONFIG_PCM_U24BE_ENCODER 0
-+#define CONFIG_PCM_U24LE_ENCODER 0
-+#define CONFIG_PCM_U32BE_ENCODER 0
-+#define CONFIG_PCM_U32LE_ENCODER 0
-+#define CONFIG_PCM_VIDC_ENCODER 0
-+#define CONFIG_ROQ_DPCM_ENCODER 0
-+#define CONFIG_ADPCM_ADX_ENCODER 0
-+#define CONFIG_ADPCM_ARGO_ENCODER 0
-+#define CONFIG_ADPCM_G722_ENCODER 0
-+#define CONFIG_ADPCM_G726_ENCODER 0
-+#define CONFIG_ADPCM_G726LE_ENCODER 0
-+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0
-+#define CONFIG_ADPCM_IMA_APM_ENCODER 0
-+#define CONFIG_ADPCM_IMA_QT_ENCODER 0
-+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WS_ENCODER 0
-+#define CONFIG_ADPCM_MS_ENCODER 0
-+#define CONFIG_ADPCM_SWF_ENCODER 0
-+#define CONFIG_ADPCM_YAMAHA_ENCODER 0
-+#define CONFIG_SSA_ENCODER 0
-+#define CONFIG_ASS_ENCODER 0
-+#define CONFIG_DVBSUB_ENCODER 0
-+#define CONFIG_DVDSUB_ENCODER 0
-+#define CONFIG_MOVTEXT_ENCODER 0
-+#define CONFIG_SRT_ENCODER 0
-+#define CONFIG_SUBRIP_ENCODER 0
-+#define CONFIG_TEXT_ENCODER 0
-+#define CONFIG_TTML_ENCODER 0
-+#define CONFIG_WEBVTT_ENCODER 0
-+#define CONFIG_XSUB_ENCODER 0
-+#define CONFIG_AAC_AT_ENCODER 0
-+#define CONFIG_ALAC_AT_ENCODER 0
-+#define CONFIG_ILBC_AT_ENCODER 0
-+#define CONFIG_PCM_ALAW_AT_ENCODER 0
-+#define CONFIG_PCM_MULAW_AT_ENCODER 0
-+#define CONFIG_LIBAOM_AV1_ENCODER 0
-+#define CONFIG_LIBCODEC2_ENCODER 0
-+#define CONFIG_LIBFDK_AAC_ENCODER 0
-+#define CONFIG_LIBGSM_ENCODER 0
-+#define CONFIG_LIBGSM_MS_ENCODER 0
-+#define CONFIG_LIBILBC_ENCODER 0
-+#define CONFIG_LIBJXL_ENCODER 0
-+#define CONFIG_LIBMP3LAME_ENCODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+#define CONFIG_LIBOPENJPEG_ENCODER 0
-+#define CONFIG_LIBOPUS_ENCODER 0
-+#define CONFIG_LIBRAV1E_ENCODER 0
-+#define CONFIG_LIBSHINE_ENCODER 0
-+#define CONFIG_LIBSPEEX_ENCODER 0
-+#define CONFIG_LIBSVTAV1_ENCODER 0
-+#define CONFIG_LIBTHEORA_ENCODER 0
-+#define CONFIG_LIBTWOLAME_ENCODER 0
-+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
-+#define CONFIG_LIBVORBIS_ENCODER 0
-+#define CONFIG_LIBVPX_VP8_ENCODER 0
-+#define CONFIG_LIBVPX_VP9_ENCODER 0
-+#define CONFIG_LIBWEBP_ANIM_ENCODER 0
-+#define CONFIG_LIBWEBP_ENCODER 0
-+#define CONFIG_LIBX262_ENCODER 0
-+#define CONFIG_LIBX264_ENCODER 0
-+#define CONFIG_LIBX264RGB_ENCODER 0
-+#define CONFIG_LIBX265_ENCODER 0
-+#define CONFIG_LIBXAVS_ENCODER 0
-+#define CONFIG_LIBXAVS2_ENCODER 0
-+#define CONFIG_LIBXVID_ENCODER 0
-+#define CONFIG_AAC_MF_ENCODER 0
-+#define CONFIG_AC3_MF_ENCODER 0
-+#define CONFIG_H263_V4L2M2M_ENCODER 0
-+#define CONFIG_AV1_NVENC_ENCODER 0
-+#define CONFIG_AV1_QSV_ENCODER 0
-+#define CONFIG_AV1_AMF_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
-+#define CONFIG_H264_AMF_ENCODER 0
-+#define CONFIG_H264_MF_ENCODER 0
-+#define CONFIG_H264_NVENC_ENCODER 0
-+#define CONFIG_H264_OMX_ENCODER 0
-+#define CONFIG_H264_QSV_ENCODER 0
-+#define CONFIG_H264_V4L2M2M_ENCODER 0
-+#define CONFIG_H264_VAAPI_ENCODER 0
-+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_HEVC_AMF_ENCODER 0
-+#define CONFIG_HEVC_MEDIACODEC_ENCODER 0
-+#define CONFIG_HEVC_MF_ENCODER 0
-+#define CONFIG_HEVC_NVENC_ENCODER 0
-+#define CONFIG_HEVC_QSV_ENCODER 0
-+#define CONFIG_HEVC_V4L2M2M_ENCODER 0
-+#define CONFIG_HEVC_VAAPI_ENCODER 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_LIBKVAZAAR_ENCODER 0
-+#define CONFIG_MJPEG_QSV_ENCODER 0
-+#define CONFIG_MJPEG_VAAPI_ENCODER 0
-+#define CONFIG_MP3_MF_ENCODER 0
-+#define CONFIG_MPEG2_QSV_ENCODER 0
-+#define CONFIG_MPEG2_VAAPI_ENCODER 0
-+#define CONFIG_MPEG4_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_VNULL_ENCODER 0
-+#define CONFIG_ANULL_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_AV1_VDPAU_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_FTR_PARSER 0
-+#define CONFIG_G723_1_PARSER 0
-+#define CONFIG_G729_PARSER 0
-+#define CONFIG_GIF_PARSER 0
-+#define CONFIG_GSM_PARSER 0
-+#define CONFIG_H261_PARSER 0
-+#define CONFIG_H263_PARSER 0
-+#define CONFIG_H264_PARSER 1
-+#define CONFIG_HEVC_PARSER 0
-+#define CONFIG_HDR_PARSER 0
-+#define CONFIG_IPU_PARSER 0
-+#define CONFIG_JPEG2000_PARSER 0
-+#define CONFIG_MISC4_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_QOI_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_XWD_PARSER 0
-+#define CONFIG_ALSA_INDEV 0
-+#define CONFIG_ANDROID_CAMERA_INDEV 0
-+#define CONFIG_AVFOUNDATION_INDEV 0
-+#define CONFIG_BKTR_INDEV 0
-+#define CONFIG_DECKLINK_INDEV 0
-+#define CONFIG_DSHOW_INDEV 0
-+#define CONFIG_FBDEV_INDEV 0
-+#define CONFIG_GDIGRAB_INDEV 0
-+#define CONFIG_IEC61883_INDEV 0
-+#define CONFIG_JACK_INDEV 0
-+#define CONFIG_KMSGRAB_INDEV 0
-+#define CONFIG_LAVFI_INDEV 0
-+#define CONFIG_OPENAL_INDEV 0
-+#define CONFIG_OSS_INDEV 0
-+#define CONFIG_PULSE_INDEV 0
-+#define CONFIG_SNDIO_INDEV 0
-+#define CONFIG_V4L2_INDEV 0
-+#define CONFIG_VFWCAP_INDEV 0
-+#define CONFIG_XCBGRAB_INDEV 0
-+#define CONFIG_LIBCDIO_INDEV 0
-+#define CONFIG_LIBDC1394_INDEV 0
-+#define CONFIG_ALSA_OUTDEV 0
-+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
-+#define CONFIG_CACA_OUTDEV 0
-+#define CONFIG_DECKLINK_OUTDEV 0
-+#define CONFIG_FBDEV_OUTDEV 0
-+#define CONFIG_OPENGL_OUTDEV 0
-+#define CONFIG_OSS_OUTDEV 0
-+#define CONFIG_PULSE_OUTDEV 0
-+#define CONFIG_SDL2_OUTDEV 0
-+#define CONFIG_SNDIO_OUTDEV 0
-+#define CONFIG_V4L2_OUTDEV 0
-+#define CONFIG_XV_OUTDEV 0
-+#define CONFIG_ABENCH_FILTER 0
-+#define CONFIG_ACOMPRESSOR_FILTER 0
-+#define CONFIG_ACONTRAST_FILTER 0
-+#define CONFIG_ACOPY_FILTER 0
-+#define CONFIG_ACUE_FILTER 0
-+#define CONFIG_ACROSSFADE_FILTER 0
-+#define CONFIG_ACROSSOVER_FILTER 0
-+#define CONFIG_ACRUSHER_FILTER 0
-+#define CONFIG_ADECLICK_FILTER 0
-+#define CONFIG_ADECLIP_FILTER 0
-+#define CONFIG_ADECORRELATE_FILTER 0
-+#define CONFIG_ADELAY_FILTER 0
-+#define CONFIG_ADENORM_FILTER 0
-+#define CONFIG_ADERIVATIVE_FILTER 0
-+#define CONFIG_ADRC_FILTER 0
-+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
-+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
-+#define CONFIG_AECHO_FILTER 0
-+#define CONFIG_AEMPHASIS_FILTER 0
-+#define CONFIG_AEVAL_FILTER 0
-+#define CONFIG_AEXCITER_FILTER 0
-+#define CONFIG_AFADE_FILTER 0
-+#define CONFIG_AFFTDN_FILTER 0
-+#define CONFIG_AFFTFILT_FILTER 0
-+#define CONFIG_AFIR_FILTER 0
-+#define CONFIG_AFORMAT_FILTER 0
-+#define CONFIG_AFREQSHIFT_FILTER 0
-+#define CONFIG_AFWTDN_FILTER 0
-+#define CONFIG_AGATE_FILTER 0
-+#define CONFIG_AIIR_FILTER 0
-+#define CONFIG_AINTEGRAL_FILTER 0
-+#define CONFIG_AINTERLEAVE_FILTER 0
-+#define CONFIG_ALATENCY_FILTER 0
-+#define CONFIG_ALIMITER_FILTER 0
-+#define CONFIG_ALLPASS_FILTER 0
-+#define CONFIG_ALOOP_FILTER 0
-+#define CONFIG_AMERGE_FILTER 0
-+#define CONFIG_AMETADATA_FILTER 0
-+#define CONFIG_AMIX_FILTER 0
-+#define CONFIG_AMULTIPLY_FILTER 0
-+#define CONFIG_ANEQUALIZER_FILTER 0
-+#define CONFIG_ANLMDN_FILTER 0
-+#define CONFIG_ANLMF_FILTER 0
-+#define CONFIG_ANLMS_FILTER 0
-+#define CONFIG_ANULL_FILTER 0
-+#define CONFIG_APAD_FILTER 0
-+#define CONFIG_APERMS_FILTER 0
-+#define CONFIG_APHASER_FILTER 0
-+#define CONFIG_APHASESHIFT_FILTER 0
-+#define CONFIG_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_TILTSHELF_FILTER 0
-+#define CONFIG_TREBLE_FILTER 0
-+#define CONFIG_TREMOLO_FILTER 0
-+#define CONFIG_VIBRATO_FILTER 0
-+#define CONFIG_VIRTUALBASS_FILTER 0
-+#define CONFIG_VOLUME_FILTER 0
-+#define CONFIG_VOLUMEDETECT_FILTER 0
-+#define CONFIG_AEVALSRC_FILTER 0
-+#define CONFIG_AFDELAYSRC_FILTER 0
-+#define CONFIG_AFIRSRC_FILTER 0
-+#define CONFIG_ANOISESRC_FILTER 0
-+#define CONFIG_ANULLSRC_FILTER 0
-+#define CONFIG_FLITE_FILTER 0
-+#define CONFIG_HILBERT_FILTER 0
-+#define CONFIG_SINC_FILTER 0
-+#define CONFIG_SINE_FILTER 0
-+#define CONFIG_ANULLSINK_FILTER 0
-+#define CONFIG_ADDROI_FILTER 0
-+#define CONFIG_ALPHAEXTRACT_FILTER 0
-+#define CONFIG_ALPHAMERGE_FILTER 0
-+#define CONFIG_AMPLIFY_FILTER 0
-+#define CONFIG_ASS_FILTER 0
-+#define CONFIG_ATADENOISE_FILTER 0
-+#define CONFIG_AVGBLUR_FILTER 0
-+#define CONFIG_AVGBLUR_OPENCL_FILTER 0
-+#define CONFIG_AVGBLUR_VULKAN_FILTER 0
-+#define CONFIG_BACKGROUNDKEY_FILTER 0
-+#define CONFIG_BBOX_FILTER 0
-+#define CONFIG_BENCH_FILTER 0
-+#define CONFIG_BILATERAL_FILTER 0
-+#define CONFIG_BILATERAL_CUDA_FILTER 0
-+#define CONFIG_BITPLANENOISE_FILTER 0
-+#define CONFIG_BLACKDETECT_FILTER 0
-+#define CONFIG_BLACKFRAME_FILTER 0
-+#define CONFIG_BLEND_FILTER 0
-+#define CONFIG_BLEND_VULKAN_FILTER 0
-+#define CONFIG_BLOCKDETECT_FILTER 0
-+#define CONFIG_BLURDETECT_FILTER 0
-+#define CONFIG_BM3D_FILTER 0
-+#define CONFIG_BOXBLUR_FILTER 0
-+#define CONFIG_BOXBLUR_OPENCL_FILTER 0
-+#define CONFIG_BWDIF_FILTER 0
-+#define CONFIG_CAS_FILTER 0
-+#define CONFIG_CHROMABER_VULKAN_FILTER 0
-+#define CONFIG_CHROMAHOLD_FILTER 0
-+#define CONFIG_CHROMAKEY_FILTER 0
-+#define CONFIG_CHROMAKEY_CUDA_FILTER 0
-+#define CONFIG_CHROMANR_FILTER 0
-+#define CONFIG_CHROMASHIFT_FILTER 0
-+#define CONFIG_CIESCOPE_FILTER 0
-+#define CONFIG_CODECVIEW_FILTER 0
-+#define CONFIG_COLORBALANCE_FILTER 0
-+#define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORCONTRAST_FILTER 0
-+#define CONFIG_COLORCORRECT_FILTER 0
-+#define CONFIG_COLORIZE_FILTER 0
-+#define CONFIG_COLORKEY_FILTER 0
-+#define CONFIG_COLORKEY_OPENCL_FILTER 0
-+#define CONFIG_COLORHOLD_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
-+#define CONFIG_COLORMAP_FILTER 0
-+#define CONFIG_COLORMATRIX_FILTER 0
-+#define CONFIG_COLORSPACE_FILTER 0
-+#define CONFIG_COLORSPACE_CUDA_FILTER 0
-+#define CONFIG_COLORTEMPERATURE_FILTER 0
-+#define CONFIG_CONVOLUTION_FILTER 0
-+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
-+#define CONFIG_CONVOLVE_FILTER 0
-+#define CONFIG_COPY_FILTER 0
-+#define CONFIG_COREIMAGE_FILTER 0
-+#define CONFIG_CORR_FILTER 0
-+#define CONFIG_COVER_RECT_FILTER 0
-+#define CONFIG_CROP_FILTER 0
-+#define CONFIG_CROPDETECT_FILTER 0
-+#define CONFIG_CUE_FILTER 0
-+#define CONFIG_CURVES_FILTER 0
-+#define CONFIG_DATASCOPE_FILTER 0
-+#define CONFIG_DBLUR_FILTER 0
-+#define CONFIG_DCTDNOIZ_FILTER 0
-+#define CONFIG_DEBAND_FILTER 0
-+#define CONFIG_DEBLOCK_FILTER 0
-+#define CONFIG_DECIMATE_FILTER 0
-+#define CONFIG_DECONVOLVE_FILTER 0
-+#define CONFIG_DEDOT_FILTER 0
-+#define CONFIG_DEFLATE_FILTER 0
-+#define CONFIG_DEFLICKER_FILTER 0
-+#define CONFIG_DEINTERLACE_QSV_FILTER 0
-+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
-+#define CONFIG_DEJUDDER_FILTER 0
-+#define CONFIG_DELOGO_FILTER 0
-+#define CONFIG_DENOISE_VAAPI_FILTER 0
-+#define CONFIG_DERAIN_FILTER 0
-+#define CONFIG_DESHAKE_FILTER 0
-+#define CONFIG_DESHAKE_OPENCL_FILTER 0
-+#define CONFIG_DESPILL_FILTER 0
-+#define CONFIG_DETELECINE_FILTER 0
-+#define CONFIG_DILATION_FILTER 0
-+#define CONFIG_DILATION_OPENCL_FILTER 0
-+#define CONFIG_DISPLACE_FILTER 0
-+#define CONFIG_DNN_CLASSIFY_FILTER 0
-+#define CONFIG_DNN_DETECT_FILTER 0
-+#define CONFIG_DNN_PROCESSING_FILTER 0
-+#define CONFIG_DOUBLEWEAVE_FILTER 0
-+#define CONFIG_DRAWBOX_FILTER 0
-+#define CONFIG_DRAWGRAPH_FILTER 0
-+#define CONFIG_DRAWGRID_FILTER 0
-+#define CONFIG_DRAWTEXT_FILTER 0
-+#define CONFIG_EDGEDETECT_FILTER 0
-+#define CONFIG_ELBG_FILTER 0
-+#define CONFIG_ENTROPY_FILTER 0
-+#define CONFIG_EPX_FILTER 0
-+#define CONFIG_EQ_FILTER 0
-+#define CONFIG_EROSION_FILTER 0
-+#define CONFIG_EROSION_OPENCL_FILTER 0
-+#define CONFIG_ESTDIF_FILTER 0
-+#define CONFIG_EXPOSURE_FILTER 0
-+#define CONFIG_EXTRACTPLANES_FILTER 0
-+#define CONFIG_FADE_FILTER 0
-+#define CONFIG_FEEDBACK_FILTER 0
-+#define CONFIG_FFTDNOIZ_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
-+#define CONFIG_FIELD_FILTER 0
-+#define CONFIG_FIELDHINT_FILTER 0
-+#define CONFIG_FIELDMATCH_FILTER 0
-+#define CONFIG_FIELDORDER_FILTER 0
-+#define CONFIG_FILLBORDERS_FILTER 0
-+#define CONFIG_FIND_RECT_FILTER 0
-+#define CONFIG_FLIP_VULKAN_FILTER 0
-+#define CONFIG_FLOODFILL_FILTER 0
-+#define CONFIG_FORMAT_FILTER 0
-+#define CONFIG_FPS_FILTER 0
-+#define CONFIG_FRAMEPACK_FILTER 0
-+#define CONFIG_FRAMERATE_FILTER 0
-+#define CONFIG_FRAMESTEP_FILTER 0
-+#define CONFIG_FREEZEDETECT_FILTER 0
-+#define CONFIG_FREEZEFRAMES_FILTER 0
-+#define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
-+#define CONFIG_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_REMAP_OPENCL_FILTER 0
-+#define CONFIG_REMOVEGRAIN_FILTER 0
-+#define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
-+#define CONFIG_REVERSE_FILTER 0
-+#define CONFIG_RGBASHIFT_FILTER 0
-+#define CONFIG_ROBERTS_FILTER 0
-+#define CONFIG_ROBERTS_OPENCL_FILTER 0
-+#define CONFIG_ROTATE_FILTER 0
-+#define CONFIG_SAB_FILTER 0
-+#define CONFIG_SCALE_FILTER 0
-+#define CONFIG_SCALE_CUDA_FILTER 0
-+#define CONFIG_SCALE_NPP_FILTER 0
-+#define CONFIG_SCALE_QSV_FILTER 0
-+#define CONFIG_SCALE_VAAPI_FILTER 0
-+#define CONFIG_SCALE_VULKAN_FILTER 0
-+#define CONFIG_SCALE2REF_FILTER 0
-+#define CONFIG_SCALE2REF_NPP_FILTER 0
-+#define CONFIG_SCDET_FILTER 0
-+#define CONFIG_SCHARR_FILTER 0
-+#define CONFIG_SCROLL_FILTER 0
-+#define CONFIG_SEGMENT_FILTER 0
-+#define CONFIG_SELECT_FILTER 0
-+#define CONFIG_SELECTIVECOLOR_FILTER 0
-+#define CONFIG_SENDCMD_FILTER 0
-+#define CONFIG_SEPARATEFIELDS_FILTER 0
-+#define CONFIG_SETDAR_FILTER 0
-+#define CONFIG_SETFIELD_FILTER 0
-+#define CONFIG_SETPARAMS_FILTER 0
-+#define CONFIG_SETPTS_FILTER 0
-+#define CONFIG_SETRANGE_FILTER 0
-+#define CONFIG_SETSAR_FILTER 0
-+#define CONFIG_SETTB_FILTER 0
-+#define CONFIG_SHARPEN_NPP_FILTER 0
-+#define CONFIG_SHARPNESS_VAAPI_FILTER 0
-+#define CONFIG_SHEAR_FILTER 0
-+#define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
-+#define CONFIG_SHUFFLEFRAMES_FILTER 0
-+#define CONFIG_SHUFFLEPIXELS_FILTER 0
-+#define CONFIG_SHUFFLEPLANES_FILTER 0
-+#define CONFIG_SIDEDATA_FILTER 0
-+#define CONFIG_SIGNALSTATS_FILTER 0
-+#define CONFIG_SIGNATURE_FILTER 0
-+#define CONFIG_SITI_FILTER 0
-+#define CONFIG_SMARTBLUR_FILTER 0
-+#define CONFIG_SOBEL_FILTER 0
-+#define CONFIG_SOBEL_OPENCL_FILTER 0
-+#define CONFIG_SPLIT_FILTER 0
-+#define CONFIG_SPP_FILTER 0
-+#define CONFIG_SR_FILTER 0
-+#define CONFIG_SSIM_FILTER 0
-+#define CONFIG_SSIM360_FILTER 0
-+#define CONFIG_STEREO3D_FILTER 0
-+#define CONFIG_STREAMSELECT_FILTER 0
-+#define CONFIG_SUBTITLES_FILTER 0
-+#define CONFIG_SUPER2XSAI_FILTER 0
-+#define CONFIG_SWAPRECT_FILTER 0
-+#define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
-+#define CONFIG_TELECINE_FILTER 0
-+#define CONFIG_THISTOGRAM_FILTER 0
-+#define CONFIG_THRESHOLD_FILTER 0
-+#define CONFIG_THUMBNAIL_FILTER 0
-+#define CONFIG_THUMBNAIL_CUDA_FILTER 0
-+#define CONFIG_TILE_FILTER 0
-+#define CONFIG_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_HSTACK_VAAPI_FILTER 0
-+#define CONFIG_VSTACK_VAAPI_FILTER 0
-+#define CONFIG_XSTACK_VAAPI_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_DDAGRAB_FILTER 0
-+#define CONFIG_FREI0R_SRC_FILTER 0
-+#define CONFIG_GRADIENTS_FILTER 0
-+#define CONFIG_HALDCLUTSRC_FILTER 0
-+#define CONFIG_LIFE_FILTER 0
-+#define CONFIG_MANDELBROT_FILTER 0
-+#define CONFIG_MPTESTSRC_FILTER 0
-+#define CONFIG_NULLSRC_FILTER 0
-+#define CONFIG_OPENCLSRC_FILTER 0
-+#define CONFIG_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_A3DSCOPE_FILTER 0
-+#define CONFIG_ABITSCOPE_FILTER 0
-+#define CONFIG_ADRAWGRAPH_FILTER 0
-+#define CONFIG_AGRAPHMONITOR_FILTER 0
-+#define CONFIG_AHISTOGRAM_FILTER 0
-+#define CONFIG_APHASEMETER_FILTER 0
-+#define CONFIG_AVECTORSCOPE_FILTER 0
-+#define CONFIG_CONCAT_FILTER 0
-+#define CONFIG_SHOWCQT_FILTER 0
-+#define CONFIG_SHOWCWT_FILTER 0
-+#define CONFIG_SHOWFREQS_FILTER 0
-+#define CONFIG_SHOWSPATIAL_FILTER 0
-+#define CONFIG_SHOWSPECTRUM_FILTER 0
-+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0
-+#define CONFIG_SHOWVOLUME_FILTER 0
-+#define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
-+#define CONFIG_SPECTRUMSYNTH_FILTER 0
-+#define CONFIG_AVSYNCTEST_FILTER 0
-+#define CONFIG_AMOVIE_FILTER 0
-+#define CONFIG_MOVIE_FILTER 0
-+#define CONFIG_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_APAC_DEMUXER 0
-+#define CONFIG_APC_DEMUXER 0
-+#define CONFIG_APE_DEMUXER 0
-+#define CONFIG_APM_DEMUXER 0
-+#define CONFIG_APNG_DEMUXER 0
-+#define CONFIG_APTX_DEMUXER 0
-+#define CONFIG_APTX_HD_DEMUXER 0
-+#define CONFIG_AQTITLE_DEMUXER 0
-+#define CONFIG_ARGO_ASF_DEMUXER 0
-+#define CONFIG_ARGO_BRP_DEMUXER 0
-+#define CONFIG_ARGO_CVG_DEMUXER 0
-+#define CONFIG_ASF_DEMUXER 0
-+#define CONFIG_ASF_O_DEMUXER 0
-+#define CONFIG_ASS_DEMUXER 0
-+#define CONFIG_AST_DEMUXER 0
-+#define CONFIG_AU_DEMUXER 0
-+#define CONFIG_AV1_DEMUXER 0
-+#define CONFIG_AVI_DEMUXER 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_BONK_DEMUXER 0
-+#define CONFIG_C93_DEMUXER 0
-+#define CONFIG_CAF_DEMUXER 0
-+#define CONFIG_CAVSVIDEO_DEMUXER 0
-+#define CONFIG_CDG_DEMUXER 0
-+#define CONFIG_CDXL_DEMUXER 0
-+#define CONFIG_CINE_DEMUXER 0
-+#define CONFIG_CODEC2_DEMUXER 0
-+#define CONFIG_CODEC2RAW_DEMUXER 0
-+#define CONFIG_CONCAT_DEMUXER 0
-+#define CONFIG_DASH_DEMUXER 0
-+#define CONFIG_DATA_DEMUXER 0
-+#define CONFIG_DAUD_DEMUXER 0
-+#define CONFIG_DCSTR_DEMUXER 0
-+#define CONFIG_DERF_DEMUXER 0
-+#define CONFIG_DFA_DEMUXER 0
-+#define CONFIG_DFPWM_DEMUXER 0
-+#define CONFIG_DHAV_DEMUXER 0
-+#define CONFIG_DIRAC_DEMUXER 0
-+#define CONFIG_DNXHD_DEMUXER 0
-+#define CONFIG_DSF_DEMUXER 0
-+#define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
-+#define CONFIG_DTS_DEMUXER 0
-+#define CONFIG_DTSHD_DEMUXER 0
-+#define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
-+#define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_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_LAF_DEMUXER 0
-+#define CONFIG_LMLM4_DEMUXER 0
-+#define CONFIG_LOAS_DEMUXER 0
-+#define CONFIG_LUODAT_DEMUXER 0
-+#define CONFIG_LRC_DEMUXER 0
-+#define CONFIG_LVF_DEMUXER 0
-+#define CONFIG_LXF_DEMUXER 0
-+#define CONFIG_M4V_DEMUXER 0
-+#define CONFIG_MCA_DEMUXER 0
-+#define CONFIG_MCC_DEMUXER 0
-+#define CONFIG_MATROSKA_DEMUXER 1
-+#define CONFIG_MGSTS_DEMUXER 0
-+#define CONFIG_MICRODVD_DEMUXER 0
-+#define CONFIG_MJPEG_DEMUXER 0
-+#define CONFIG_MJPEG_2000_DEMUXER 0
-+#define CONFIG_MLP_DEMUXER 0
-+#define CONFIG_MLV_DEMUXER 0
-+#define CONFIG_MM_DEMUXER 0
-+#define CONFIG_MMF_DEMUXER 0
-+#define CONFIG_MODS_DEMUXER 0
-+#define CONFIG_MOFLEX_DEMUXER 0
-+#define CONFIG_MOV_DEMUXER 1
-+#define CONFIG_MP3_DEMUXER 1
-+#define CONFIG_MPC_DEMUXER 0
-+#define CONFIG_MPC8_DEMUXER 0
-+#define CONFIG_MPEGPS_DEMUXER 0
-+#define CONFIG_MPEGTS_DEMUXER 0
-+#define CONFIG_MPEGTSRAW_DEMUXER 0
-+#define CONFIG_MPEGVIDEO_DEMUXER 0
-+#define CONFIG_MPJPEG_DEMUXER 0
-+#define CONFIG_MPL2_DEMUXER 0
-+#define CONFIG_MPSUB_DEMUXER 0
-+#define CONFIG_MSF_DEMUXER 0
-+#define CONFIG_MSNWC_TCP_DEMUXER 0
-+#define CONFIG_MSP_DEMUXER 0
-+#define CONFIG_MTAF_DEMUXER 0
-+#define CONFIG_MTV_DEMUXER 0
-+#define CONFIG_MUSX_DEMUXER 0
-+#define CONFIG_MV_DEMUXER 0
-+#define CONFIG_MVI_DEMUXER 0
-+#define CONFIG_MXF_DEMUXER 0
-+#define CONFIG_MXG_DEMUXER 0
-+#define CONFIG_NC_DEMUXER 0
-+#define CONFIG_NISTSPHERE_DEMUXER 0
-+#define CONFIG_NSP_DEMUXER 0
-+#define CONFIG_NSV_DEMUXER 0
-+#define CONFIG_NUT_DEMUXER 0
-+#define CONFIG_NUV_DEMUXER 0
-+#define CONFIG_OBU_DEMUXER 0
-+#define CONFIG_OGG_DEMUXER 1
-+#define CONFIG_OMA_DEMUXER 0
-+#define CONFIG_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_WADY_DEMUXER 0
-+#define CONFIG_WAV_DEMUXER 1
-+#define CONFIG_WC3_DEMUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
-+#define CONFIG_WEBVTT_DEMUXER 0
-+#define CONFIG_WSAUD_DEMUXER 0
-+#define CONFIG_WSD_DEMUXER 0
-+#define CONFIG_WSVQA_DEMUXER 0
-+#define CONFIG_WTV_DEMUXER 0
-+#define CONFIG_WVE_DEMUXER 0
-+#define CONFIG_WV_DEMUXER 0
-+#define CONFIG_XA_DEMUXER 0
-+#define CONFIG_XBIN_DEMUXER 0
-+#define CONFIG_XMD_DEMUXER 0
-+#define CONFIG_XMV_DEMUXER 0
-+#define CONFIG_XVAG_DEMUXER 0
-+#define CONFIG_XWMA_DEMUXER 0
-+#define CONFIG_YOP_DEMUXER 0
-+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0
-+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_VBN_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
-+#define CONFIG_LIBGME_DEMUXER 0
-+#define CONFIG_LIBMODPLUG_DEMUXER 0
-+#define CONFIG_LIBOPENMPT_DEMUXER 0
-+#define CONFIG_VAPOURSYNTH_DEMUXER 0
-+#define CONFIG_A64_MUXER 0
-+#define CONFIG_AC3_MUXER 0
-+#define CONFIG_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_FD_PROTOCOL 0
-+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
-+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
-+#define CONFIG_FILE_PROTOCOL 0
-+#define CONFIG_FTP_PROTOCOL 0
-+#define CONFIG_GOPHER_PROTOCOL 0
-+#define CONFIG_GOPHERS_PROTOCOL 0
-+#define CONFIG_HLS_PROTOCOL 0
-+#define CONFIG_HTTP_PROTOCOL 0
-+#define CONFIG_HTTPPROXY_PROTOCOL 0
-+#define CONFIG_HTTPS_PROTOCOL 0
-+#define CONFIG_ICECAST_PROTOCOL 0
-+#define CONFIG_MMSH_PROTOCOL 0
-+#define CONFIG_MMST_PROTOCOL 0
-+#define CONFIG_MD5_PROTOCOL 0
-+#define CONFIG_PIPE_PROTOCOL 0
-+#define CONFIG_PROMPEG_PROTOCOL 0
-+#define CONFIG_RTMP_PROTOCOL 0
-+#define CONFIG_RTMPE_PROTOCOL 0
-+#define CONFIG_RTMPS_PROTOCOL 0
-+#define CONFIG_RTMPT_PROTOCOL 0
-+#define CONFIG_RTMPTE_PROTOCOL 0
-+#define CONFIG_RTMPTS_PROTOCOL 0
-+#define CONFIG_RTP_PROTOCOL 0
-+#define CONFIG_SCTP_PROTOCOL 0
-+#define CONFIG_SRTP_PROTOCOL 0
-+#define CONFIG_SUBFILE_PROTOCOL 0
-+#define CONFIG_TEE_PROTOCOL 0
-+#define CONFIG_TCP_PROTOCOL 0
-+#define CONFIG_TLS_PROTOCOL 0
-+#define CONFIG_UDP_PROTOCOL 0
-+#define CONFIG_UDPLITE_PROTOCOL 0
-+#define CONFIG_UNIX_PROTOCOL 0
-+#define CONFIG_LIBAMQP_PROTOCOL 0
-+#define CONFIG_LIBRIST_PROTOCOL 0
-+#define CONFIG_LIBRTMP_PROTOCOL 0
-+#define CONFIG_LIBRTMPE_PROTOCOL 0
-+#define CONFIG_LIBRTMPS_PROTOCOL 0
-+#define CONFIG_LIBRTMPT_PROTOCOL 0
-+#define CONFIG_LIBRTMPTE_PROTOCOL 0
-+#define CONFIG_LIBSRT_PROTOCOL 0
-+#define CONFIG_LIBSSH_PROTOCOL 0
-+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
-+#define CONFIG_LIBZMQ_PROTOCOL 0
-+#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
-+#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
-+#endif /* FFMPEG_CONFIG_COMPONENTS_H */
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
deleted file mode 100644
index ed592c917983..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm
+++ /dev/null
@@ -1,735 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm.orig 2023-04-22 17:45:15 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.asm
-@@ -0,0 +1,732 @@
-+; Automatically generated by configure - do not modify!
-+%define ARCH_AARCH64 0
-+%define ARCH_ALPHA 0
-+%define ARCH_ARM 0
-+%define ARCH_AVR32 0
-+%define ARCH_AVR32_AP 0
-+%define ARCH_AVR32_UC 0
-+%define ARCH_BFIN 0
-+%define ARCH_IA64 0
-+%define ARCH_LOONGARCH 0
-+%define ARCH_LOONGARCH32 0
-+%define ARCH_LOONGARCH64 0
-+%define ARCH_M68K 0
-+%define ARCH_MIPS 0
-+%define ARCH_MIPS64 0
-+%define ARCH_PARISC 0
-+%define ARCH_PPC 0
-+%define ARCH_PPC64 0
-+%define ARCH_RISCV 0
-+%define ARCH_S390 0
-+%define ARCH_SH4 0
-+%define ARCH_SPARC 0
-+%define ARCH_SPARC64 0
-+%define ARCH_TILEGX 0
-+%define ARCH_TILEPRO 0
-+%define ARCH_TOMI 0
-+%define ARCH_X86 1
-+%define ARCH_X86_32 0
-+%define ARCH_X86_64 1
-+%define HAVE_ARMV5TE 0
-+%define HAVE_ARMV6 0
-+%define HAVE_ARMV6T2 0
-+%define HAVE_ARMV8 0
-+%define HAVE_NEON 0
-+%define HAVE_VFP 0
-+%define HAVE_VFPV3 0
-+%define HAVE_SETEND 0
-+%define HAVE_ALTIVEC 0
-+%define HAVE_DCBZL 0
-+%define HAVE_LDBRX 0
-+%define HAVE_POWER8 0
-+%define HAVE_PPC4XX 0
-+%define HAVE_VSX 0
-+%define HAVE_RVV 0
-+%define HAVE_AESNI 1
-+%define HAVE_AMD3DNOW 1
-+%define HAVE_AMD3DNOWEXT 1
-+%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
-+%define HAVE_MMXEXT 1
-+%define HAVE_SSE 1
-+%define HAVE_SSE2 1
-+%define HAVE_SSE3 1
-+%define HAVE_SSE4 1
-+%define HAVE_SSE42 1
-+%define HAVE_SSSE3 1
-+%define HAVE_XOP 1
-+%define HAVE_CPUNOP 0
-+%define HAVE_I686 1
-+%define HAVE_MIPSFPU 0
-+%define HAVE_MIPS32R2 0
-+%define HAVE_MIPS32R5 0
-+%define HAVE_MIPS64R2 0
-+%define HAVE_MIPS32R6 0
-+%define HAVE_MIPS64R6 0
-+%define HAVE_MIPSDSP 0
-+%define HAVE_MIPSDSPR2 0
-+%define HAVE_MSA 0
-+%define HAVE_LOONGSON2 0
-+%define HAVE_LOONGSON3 0
-+%define HAVE_MMI 0
-+%define HAVE_LSX 0
-+%define HAVE_LASX 0
-+%define HAVE_ARMV5TE_EXTERNAL 0
-+%define HAVE_ARMV6_EXTERNAL 0
-+%define HAVE_ARMV6T2_EXTERNAL 0
-+%define HAVE_ARMV8_EXTERNAL 0
-+%define HAVE_NEON_EXTERNAL 0
-+%define HAVE_VFP_EXTERNAL 0
-+%define HAVE_VFPV3_EXTERNAL 0
-+%define HAVE_SETEND_EXTERNAL 0
-+%define HAVE_ALTIVEC_EXTERNAL 0
-+%define HAVE_DCBZL_EXTERNAL 0
-+%define HAVE_LDBRX_EXTERNAL 0
-+%define HAVE_POWER8_EXTERNAL 0
-+%define HAVE_PPC4XX_EXTERNAL 0
-+%define HAVE_VSX_EXTERNAL 0
-+%define HAVE_RVV_EXTERNAL 0
-+%define HAVE_AESNI_EXTERNAL 1
-+%define HAVE_AMD3DNOW_EXTERNAL 1
-+%define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+%define HAVE_AVX_EXTERNAL 1
-+%define HAVE_AVX2_EXTERNAL 1
-+%define HAVE_AVX512_EXTERNAL 1
-+%define HAVE_AVX512ICL_EXTERNAL 1
-+%define HAVE_FMA3_EXTERNAL 1
-+%define HAVE_FMA4_EXTERNAL 1
-+%define HAVE_MMX_EXTERNAL 1
-+%define HAVE_MMXEXT_EXTERNAL 1
-+%define HAVE_SSE_EXTERNAL 1
-+%define HAVE_SSE2_EXTERNAL 1
-+%define HAVE_SSE3_EXTERNAL 1
-+%define HAVE_SSE4_EXTERNAL 1
-+%define HAVE_SSE42_EXTERNAL 1
-+%define HAVE_SSSE3_EXTERNAL 1
-+%define HAVE_XOP_EXTERNAL 1
-+%define HAVE_CPUNOP_EXTERNAL 0
-+%define HAVE_I686_EXTERNAL 0
-+%define HAVE_MIPSFPU_EXTERNAL 0
-+%define HAVE_MIPS32R2_EXTERNAL 0
-+%define HAVE_MIPS32R5_EXTERNAL 0
-+%define HAVE_MIPS64R2_EXTERNAL 0
-+%define HAVE_MIPS32R6_EXTERNAL 0
-+%define HAVE_MIPS64R6_EXTERNAL 0
-+%define HAVE_MIPSDSP_EXTERNAL 0
-+%define HAVE_MIPSDSPR2_EXTERNAL 0
-+%define HAVE_MSA_EXTERNAL 0
-+%define HAVE_LOONGSON2_EXTERNAL 0
-+%define HAVE_LOONGSON3_EXTERNAL 0
-+%define HAVE_MMI_EXTERNAL 0
-+%define HAVE_LSX_EXTERNAL 0
-+%define HAVE_LASX_EXTERNAL 0
-+%define HAVE_ARMV5TE_INLINE 0
-+%define HAVE_ARMV6_INLINE 0
-+%define HAVE_ARMV6T2_INLINE 0
-+%define HAVE_ARMV8_INLINE 0
-+%define HAVE_NEON_INLINE 0
-+%define HAVE_VFP_INLINE 0
-+%define HAVE_VFPV3_INLINE 0
-+%define HAVE_SETEND_INLINE 0
-+%define HAVE_ALTIVEC_INLINE 0
-+%define HAVE_DCBZL_INLINE 0
-+%define HAVE_LDBRX_INLINE 0
-+%define HAVE_POWER8_INLINE 0
-+%define HAVE_PPC4XX_INLINE 0
-+%define HAVE_VSX_INLINE 0
-+%define HAVE_RVV_INLINE 0
-+%define HAVE_AESNI_INLINE 1
-+%define HAVE_AMD3DNOW_INLINE 1
-+%define HAVE_AMD3DNOWEXT_INLINE 1
-+%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
-+%define HAVE_MMXEXT_INLINE 1
-+%define HAVE_SSE_INLINE 1
-+%define HAVE_SSE2_INLINE 1
-+%define HAVE_SSE3_INLINE 1
-+%define HAVE_SSE4_INLINE 1
-+%define HAVE_SSE42_INLINE 1
-+%define HAVE_SSSE3_INLINE 1
-+%define HAVE_XOP_INLINE 1
-+%define HAVE_CPUNOP_INLINE 0
-+%define HAVE_I686_INLINE 0
-+%define HAVE_MIPSFPU_INLINE 0
-+%define HAVE_MIPS32R2_INLINE 0
-+%define HAVE_MIPS32R5_INLINE 0
-+%define HAVE_MIPS64R2_INLINE 0
-+%define HAVE_MIPS32R6_INLINE 0
-+%define HAVE_MIPS64R6_INLINE 0
-+%define HAVE_MIPSDSP_INLINE 0
-+%define HAVE_MIPSDSPR2_INLINE 0
-+%define HAVE_MSA_INLINE 0
-+%define HAVE_LOONGSON2_INLINE 0
-+%define HAVE_LOONGSON3_INLINE 0
-+%define HAVE_MMI_INLINE 0
-+%define HAVE_LSX_INLINE 0
-+%define HAVE_LASX_INLINE 0
-+%define HAVE_ALIGNED_STACK 1
-+%define HAVE_FAST_64BIT 1
-+%define HAVE_FAST_CLZ 1
-+%define HAVE_FAST_CMOV 1
-+%define HAVE_FAST_FLOAT16 0
-+%define HAVE_LOCAL_ALIGNED 1
-+%define HAVE_SIMD_ALIGN_16 1
-+%define HAVE_SIMD_ALIGN_32 1
-+%define HAVE_SIMD_ALIGN_64 1
-+%define HAVE_ATOMIC_CAS_PTR 0
-+%define HAVE_MACHINE_RW_BARRIER 0
-+%define HAVE_MEMORYBARRIER 0
-+%define HAVE_MM_EMPTY 1
-+%define HAVE_RDTSC 0
-+%define HAVE_SEM_TIMEDWAIT 1
-+%define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+%define HAVE_INLINE_ASM 1
-+%define HAVE_SYMVER 0
-+%define HAVE_X86ASM 1
-+%define HAVE_BIGENDIAN 0
-+%define HAVE_FAST_UNALIGNED 1
-+%define HAVE_ARPA_INET_H 0
-+%define HAVE_ASM_TYPES_H 0
-+%define HAVE_CDIO_PARANOIA_H 0
-+%define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+%define HAVE_CUDA_H 0
-+%define HAVE_DISPATCH_DISPATCH_H 0
-+%define HAVE_DEV_BKTR_IOCTL_BT848_H 0
-+%define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
-+%define HAVE_DEV_IC_BT8XX_H 1
-+%define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
-+%define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
-+%define HAVE_DIRECT_H 0
-+%define HAVE_DIRENT_H 1
-+%define HAVE_DXGIDEBUG_H 0
-+%define HAVE_DXVA_H 0
-+%define HAVE_ES2_GL_H 0
-+%define HAVE_GSM_H 0
-+%define HAVE_IO_H 0
-+%define HAVE_LINUX_DMA_BUF_H 0
-+%define HAVE_LINUX_PERF_EVENT_H 0
-+%define HAVE_MACHINE_IOCTL_BT848_H 0
-+%define HAVE_MACHINE_IOCTL_METEOR_H 0
-+%define HAVE_MALLOC_H 0
-+%define HAVE_OPENCV2_CORE_CORE_C_H 0
-+%define HAVE_OPENGL_GL3_H 0
-+%define HAVE_POLL_H 1
-+%define HAVE_SYS_PARAM_H 1
-+%define HAVE_SYS_RESOURCE_H 1
-+%define HAVE_SYS_SELECT_H 1
-+%define HAVE_SYS_SOUNDCARD_H 0
-+%define HAVE_SYS_TIME_H 1
-+%define HAVE_SYS_UN_H 1
-+%define HAVE_SYS_VIDEOIO_H 1
-+%define HAVE_TERMIOS_H 1
-+%define HAVE_UDPLITE_H 0
-+%define HAVE_UNISTD_H 1
-+%define HAVE_VALGRIND_VALGRIND_H 0 ; %define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440
-+%define HAVE_WINDOWS_H 0
-+%define HAVE_WINSOCK2_H 0
-+%define HAVE_INTRINSICS_NEON 0
-+%define HAVE_ATANF 1
-+%define HAVE_ATAN2F 1
-+%define HAVE_CBRT 1
-+%define HAVE_CBRTF 1
-+%define HAVE_COPYSIGN 1
-+%define HAVE_COSF 1
-+%define HAVE_ERF 1
-+%define HAVE_EXP2 1
-+%define HAVE_EXP2F 1
-+%define HAVE_EXPF 1
-+%define HAVE_HYPOT 1
-+%define HAVE_ISFINITE 1
-+%define HAVE_ISINF 1
-+%define HAVE_ISNAN 1
-+%define HAVE_LDEXPF 1
-+%define HAVE_LLRINT 1
-+%define HAVE_LLRINTF 1
-+%define HAVE_LOG2 1
-+%define HAVE_LOG2F 1
-+%define HAVE_LOG10F 1
-+%define HAVE_LRINT 1
-+%define HAVE_LRINTF 1
-+%define HAVE_POWF 1
-+%define HAVE_RINT 1
-+%define HAVE_ROUND 1
-+%define HAVE_ROUNDF 1
-+%define HAVE_SINF 1
-+%define HAVE_TRUNC 1
-+%define HAVE_TRUNCF 1
-+%define HAVE_DOS_PATHS 0
-+%define HAVE_LIBC_MSVCRT 0
-+%define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
-+%define HAVE_SECTION_DATA_REL_RO 1
-+%define HAVE_THREADS 1
-+%define HAVE_UWP 0
-+%define HAVE_WINRT 0
-+%define HAVE_ACCESS 1
-+%define HAVE_ALIGNED_MALLOC 0
-+%define HAVE_ARC4RANDOM 1
-+%define HAVE_CLOCK_GETTIME 1
-+%define HAVE_CLOSESOCKET 0
-+%define HAVE_COMMANDLINETOARGVW 0
-+%define HAVE_FCNTL 1
-+%define HAVE_GETADDRINFO 0
-+%define HAVE_GETAUXVAL 0
-+%define HAVE_GETENV 1
-+%define HAVE_GETHRTIME 0
-+%define HAVE_GETOPT 1
-+%define HAVE_GETMODULEHANDLE 0
-+%define HAVE_GETPROCESSAFFINITYMASK 0
-+%define HAVE_GETPROCESSMEMORYINFO 0
-+%define HAVE_GETPROCESSTIMES 0
-+%define HAVE_GETRUSAGE 1
-+%define HAVE_GETSTDHANDLE 0
-+%define HAVE_GETSYSTEMTIMEASFILETIME 0
-+%define HAVE_GETTIMEOFDAY 1
-+%define HAVE_GLOB 1
-+%define HAVE_GLXGETPROCADDRESS 0
-+%define HAVE_GMTIME_R 1
-+%define HAVE_INET_ATON 0
-+%define HAVE_ISATTY 1
-+%define HAVE_KBHIT 0
-+%define HAVE_LOCALTIME_R 1
-+%define HAVE_LSTAT 1
-+%define HAVE_LZO1X_999_COMPRESS 0
-+%define HAVE_MACH_ABSOLUTE_TIME 0
-+%define HAVE_MAPVIEWOFFILE 0
-+%define HAVE_MEMALIGN 0
-+%define HAVE_MKSTEMP 1
-+%define HAVE_MMAP 1
-+%define HAVE_MPROTECT 1
-+%define HAVE_NANOSLEEP 1
-+%define HAVE_PEEKNAMEDPIPE 0
-+%define HAVE_POSIX_MEMALIGN 1
-+%define HAVE_PRCTL 0
-+%define HAVE_PTHREAD_CANCEL 1
-+%define HAVE_SCHED_GETAFFINITY 0
-+%define HAVE_SECITEMIMPORT 0
-+%define HAVE_SETCONSOLETEXTATTRIBUTE 0
-+%define HAVE_SETCONSOLECTRLHANDLER 0
-+%define HAVE_SETDLLDIRECTORY 0
-+%define HAVE_SETMODE 0
-+%define HAVE_SETRLIMIT 1
-+%define HAVE_SLEEP 0
-+%define HAVE_STRERROR_R 1
-+%define HAVE_SYSCONF 1
-+%define HAVE_SYSCTL 0
-+%define HAVE_USLEEP 1
-+%define HAVE_UTGETOSTYPEFROMSTRING 0
-+%define HAVE_VIRTUALALLOC 0
-+%define HAVE_WGLGETPROCADDRESS 0
-+%define HAVE_BCRYPT 0
-+%define HAVE_VAAPI_DRM 0
-+%define HAVE_VAAPI_X11 0
-+%define HAVE_VDPAU_X11 0
-+%define HAVE_PTHREADS 1
-+%define HAVE_OS2THREADS 0
-+%define HAVE_W32THREADS 0
-+%define HAVE_AS_ARCH_DIRECTIVE 0
-+%define HAVE_AS_DN_DIRECTIVE 0
-+%define HAVE_AS_FPU_DIRECTIVE 0
-+%define HAVE_AS_FUNC 0
-+%define HAVE_AS_OBJECT_ARCH 0
-+%define HAVE_ASM_MOD_Q 0
-+%define HAVE_BLOCKS_EXTENSION 0
-+%define HAVE_EBP_AVAILABLE 1
-+%define HAVE_EBX_AVAILABLE 1
-+%define HAVE_GNU_AS 0
-+%define HAVE_GNU_WINDRES 0
-+%define HAVE_IBM_ASM 0
-+%define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
-+%define HAVE_INLINE_ASM_LABELS 1
-+%define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-+%define HAVE_PRAGMA_DEPRECATED 1
-+%define HAVE_RSYNC_CONTIMEOUT 1
-+%define HAVE_SYMVER_ASM_LABEL 1
-+%define HAVE_SYMVER_GNU_ASM 1
-+%define HAVE_VFP_ARGS 0
-+%define HAVE_XFORM_ASM 0
-+%define HAVE_XMM_CLOBBERS 1
-+%define HAVE_DPI_AWARENESS_CONTEXT 0
-+%define HAVE_IDXGIOUTPUT5 0
-+%define HAVE_KCMVIDEOCODECTYPE_HEVC 0
-+%define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
-+%define HAVE_KCMVIDEOCODECTYPE_VP9 0
-+%define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0
-+%define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0
-+%define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0
-+%define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0
-+%define HAVE_SOCKLEN_T 0
-+%define HAVE_STRUCT_ADDRINFO 0
-+%define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-+%define HAVE_STRUCT_IP_MREQ_SOURCE 0
-+%define HAVE_STRUCT_IPV6_MREQ 0
-+%define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0
-+%define HAVE_STRUCT_POLLFD 0
-+%define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
-+%define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
-+%define HAVE_STRUCT_SOCKADDR_IN6 0
-+%define HAVE_STRUCT_SOCKADDR_SA_LEN 0
-+%define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+%define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+%define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
-+%define HAVE_GZIP 1
-+%define HAVE_LIBDRM_GETFB2 0
-+%define HAVE_MAKEINFO 1
-+%define HAVE_MAKEINFO_HTML 0
-+%define HAVE_OPENCL_D3D11 0
-+%define HAVE_OPENCL_DRM_ARM 0
-+%define HAVE_OPENCL_DRM_BEIGNET 0
-+%define HAVE_OPENCL_DXVA2 0
-+%define HAVE_OPENCL_VAAPI_BEIGNET 0
-+%define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+%define HAVE_PERL 1
-+%define HAVE_POD2MAN 1
-+%define HAVE_TEXI2HTML 0
-+%define HAVE_XMLLINT 1
-+%define HAVE_ZLIB_GZIP 0
-+%define CONFIG_DOC 0
-+%define CONFIG_HTMLPAGES 0
-+%define CONFIG_MANPAGES 0
-+%define CONFIG_PODPAGES 0
-+%define CONFIG_TXTPAGES 0
-+%define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
-+%define CONFIG_AVIO_READING_EXAMPLE 1
-+%define CONFIG_DECODE_AUDIO_EXAMPLE 1
-+%define CONFIG_DECODE_VIDEO_EXAMPLE 1
-+%define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-+%define CONFIG_ENCODE_AUDIO_EXAMPLE 1
-+%define CONFIG_ENCODE_VIDEO_EXAMPLE 1
-+%define CONFIG_EXTRACT_MVS_EXAMPLE 1
-+%define CONFIG_FILTER_AUDIO_EXAMPLE 0
-+%define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-+%define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-+%define CONFIG_HTTP_MULTICLIENT_EXAMPLE 1
-+%define CONFIG_HW_DECODE_EXAMPLE 1
-+%define CONFIG_METADATA_EXAMPLE 1
-+%define CONFIG_MUXING_EXAMPLE 0
-+%define CONFIG_QSVDEC_EXAMPLE 0
-+%define CONFIG_REMUXING_EXAMPLE 1
-+%define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-+%define CONFIG_SCALING_VIDEO_EXAMPLE 0
-+%define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-+%define CONFIG_TRANSCODING_EXAMPLE 0
-+%define CONFIG_VAAPI_ENCODE_EXAMPLE 0
-+%define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-+%define CONFIG_QSV_TRANSCODE_EXAMPLE 0
-+%define CONFIG_AVISYNTH 0
-+%define CONFIG_FREI0R 0
-+%define CONFIG_LIBCDIO 0
-+%define CONFIG_LIBDAVS2 0
-+%define CONFIG_LIBRUBBERBAND 0
-+%define CONFIG_LIBVIDSTAB 0
-+%define CONFIG_LIBX264 0
-+%define CONFIG_LIBX265 0
-+%define CONFIG_LIBXAVS 0
-+%define CONFIG_LIBXAVS2 0
-+%define CONFIG_LIBXVID 0
-+%define CONFIG_DECKLINK 0
-+%define CONFIG_LIBFDK_AAC 0
-+%define CONFIG_LIBTLS 0
-+%define CONFIG_GMP 0
-+%define CONFIG_LIBARIBB24 0
-+%define CONFIG_LIBLENSFUN 0
-+%define CONFIG_LIBOPENCORE_AMRNB 0
-+%define CONFIG_LIBOPENCORE_AMRWB 0
-+%define CONFIG_LIBVO_AMRWBENC 0
-+%define CONFIG_MBEDTLS 0
-+%define CONFIG_RKMPP 0
-+%define CONFIG_LIBSMBCLIENT 0
-+%define CONFIG_CHROMAPRINT 0
-+%define CONFIG_GCRYPT 0
-+%define CONFIG_GNUTLS 0
-+%define CONFIG_JNI 0
-+%define CONFIG_LADSPA 0
-+%define CONFIG_LCMS2 0
-+%define CONFIG_LIBAOM 0
-+%define CONFIG_LIBASS 0
-+%define CONFIG_LIBBLURAY 0
-+%define CONFIG_LIBBS2B 0
-+%define CONFIG_LIBCACA 0
-+%define CONFIG_LIBCELT 0
-+%define CONFIG_LIBCODEC2 0
-+%define CONFIG_LIBDAV1D 0
-+%define CONFIG_LIBDC1394 0
-+%define CONFIG_LIBDRM 0
-+%define CONFIG_LIBFLITE 0
-+%define CONFIG_LIBFONTCONFIG 0
-+%define CONFIG_LIBFREETYPE 0
-+%define CONFIG_LIBFRIBIDI 0
-+%define CONFIG_LIBGLSLANG 0
-+%define CONFIG_LIBGME 0
-+%define CONFIG_LIBGSM 0
-+%define CONFIG_LIBIEC61883 0
-+%define CONFIG_LIBILBC 0
-+%define CONFIG_LIBJACK 0
-+%define CONFIG_LIBJXL 0
-+%define CONFIG_LIBKLVANC 0
-+%define CONFIG_LIBKVAZAAR 0
-+%define CONFIG_LIBMODPLUG 0
-+%define CONFIG_LIBMP3LAME 0
-+%define CONFIG_LIBMYSOFA 0
-+%define CONFIG_LIBOPENCV 0
-+%define CONFIG_LIBOPENH264 0
-+%define CONFIG_LIBOPENJPEG 0
-+%define CONFIG_LIBOPENMPT 0
-+%define CONFIG_LIBOPENVINO 0
-+%define CONFIG_LIBOPUS 1
-+%define CONFIG_LIBPLACEBO 0
-+%define CONFIG_LIBPULSE 0
-+%define CONFIG_LIBRABBITMQ 0
-+%define CONFIG_LIBRAV1E 0
-+%define CONFIG_LIBRIST 0
-+%define CONFIG_LIBRSVG 0
-+%define CONFIG_LIBRTMP 0
-+%define CONFIG_LIBSHADERC 0
-+%define CONFIG_LIBSHINE 0
-+%define CONFIG_LIBSMBCLIENT 0
-+%define CONFIG_LIBSNAPPY 0
-+%define CONFIG_LIBSOXR 0
-+%define CONFIG_LIBSPEEX 0
-+%define CONFIG_LIBSRT 0
-+%define CONFIG_LIBSSH 0
-+%define CONFIG_LIBSVTAV1 0
-+%define CONFIG_LIBTENSORFLOW 0
-+%define CONFIG_LIBTESSERACT 0
-+%define CONFIG_LIBTHEORA 0
-+%define CONFIG_LIBTWOLAME 0
-+%define CONFIG_LIBUAVS3D 0
-+%define CONFIG_LIBV4L2 0
-+%define CONFIG_LIBVMAF 0
-+%define CONFIG_LIBVORBIS 0
-+%define CONFIG_LIBVPX 0
-+%define CONFIG_LIBWEBP 0
-+%define CONFIG_LIBXML2 0
-+%define CONFIG_LIBZIMG 0
-+%define CONFIG_LIBZMQ 0
-+%define CONFIG_LIBZVBI 0
-+%define CONFIG_LV2 0
-+%define CONFIG_MEDIACODEC 0
-+%define CONFIG_OPENAL 0
-+%define CONFIG_OPENGL 0
-+%define CONFIG_OPENSSL 0
-+%define CONFIG_POCKETSPHINX 0
-+%define CONFIG_VAPOURSYNTH 0
-+%define CONFIG_ALSA 0
-+%define CONFIG_APPKIT 0
-+%define CONFIG_AVFOUNDATION 0
-+%define CONFIG_BZLIB 0
-+%define CONFIG_COREIMAGE 0
-+%define CONFIG_ICONV 0
-+%define CONFIG_LIBXCB 0
-+%define CONFIG_LIBXCB_SHM 0
-+%define CONFIG_LIBXCB_SHAPE 0
-+%define CONFIG_LIBXCB_XFIXES 0
-+%define CONFIG_LZMA 0
-+%define CONFIG_MEDIAFOUNDATION 0
-+%define CONFIG_METAL 0
-+%define CONFIG_SCHANNEL 0
-+%define CONFIG_SDL2 0
-+%define CONFIG_SECURETRANSPORT 0
-+%define CONFIG_SNDIO 0
-+%define CONFIG_XLIB 0
-+%define CONFIG_ZLIB 0
-+%define CONFIG_CUDA_NVCC 0
-+%define CONFIG_CUDA_SDK 0
-+%define CONFIG_LIBNPP 0
-+%define CONFIG_LIBMFX 0
-+%define CONFIG_LIBVPL 0
-+%define CONFIG_MMAL 0
-+%define CONFIG_OMX 0
-+%define CONFIG_OPENCL 0
-+%define CONFIG_AMF 0
-+%define CONFIG_AUDIOTOOLBOX 0
-+%define CONFIG_CRYSTALHD 0
-+%define CONFIG_CUDA 0
-+%define CONFIG_CUDA_LLVM 0
-+%define CONFIG_CUVID 0
-+%define CONFIG_D3D11VA 0
-+%define CONFIG_DXVA2 0
-+%define CONFIG_FFNVCODEC 0
-+%define CONFIG_NVDEC 0
-+%define CONFIG_NVENC 0
-+%define CONFIG_VAAPI 0
-+%define CONFIG_VDPAU 0
-+%define CONFIG_VIDEOTOOLBOX 0
-+%define CONFIG_VULKAN 0
-+%define CONFIG_V4L2_M2M 0
-+%define CONFIG_FTRAPV 0
-+%define CONFIG_GRAY 0
-+%define CONFIG_HARDCODED_TABLES 0
-+%define CONFIG_OMX_RPI 0
-+%define CONFIG_RUNTIME_CPUDETECT 1
-+%define CONFIG_SAFE_BITSTREAM_READER 1
-+%define CONFIG_SHARED 0
-+%define CONFIG_SMALL 0
-+%define CONFIG_STATIC 1
-+%define CONFIG_SWSCALE_ALPHA 1
-+%define CONFIG_GPL 0
-+%define CONFIG_NONFREE 0
-+%define CONFIG_VERSION3 0
-+%define CONFIG_AVDEVICE 0
-+%define CONFIG_AVFILTER 0
-+%define CONFIG_SWSCALE 0
-+%define CONFIG_POSTPROC 0
-+%define CONFIG_AVFORMAT 1
-+%define CONFIG_AVCODEC 1
-+%define CONFIG_SWRESAMPLE 0
-+%define CONFIG_AVUTIL 1
-+%define CONFIG_FFPLAY 0
-+%define CONFIG_FFPROBE 0
-+%define CONFIG_FFMPEG 0
-+%define CONFIG_DCT 1
-+%define CONFIG_DWT 0
-+%define CONFIG_ERROR_RESILIENCE 0
-+%define CONFIG_FAAN 0
-+%define CONFIG_FAST_UNALIGNED 1
-+%define CONFIG_FFT 1
-+%define CONFIG_LSP 0
-+%define CONFIG_MDCT 0
-+%define CONFIG_PIXELUTILS 0
-+%define CONFIG_NETWORK 0
-+%define CONFIG_RDFT 1
-+%define CONFIG_AUTODETECT 0
-+%define CONFIG_FONTCONFIG 0
-+%define CONFIG_LARGE_TESTS 1
-+%define CONFIG_LINUX_PERF 0
-+%define CONFIG_MACOS_KPERF 0
-+%define CONFIG_MEMORY_POISONING 0
-+%define CONFIG_NEON_CLOBBER_TEST 0
-+%define CONFIG_OSSFUZZ 0
-+%define CONFIG_PIC 1
-+%define CONFIG_PTX_COMPRESSION 0
-+%define CONFIG_THUMB 0
-+%define CONFIG_VALGRIND_BACKTRACE 0
-+%define CONFIG_XMM_CLOBBER_TEST 0
-+%define CONFIG_BSFS 0
-+%define CONFIG_DECODERS 1
-+%define CONFIG_ENCODERS 0
-+%define CONFIG_HWACCELS 0
-+%define CONFIG_PARSERS 1
-+%define CONFIG_INDEVS 0
-+%define CONFIG_OUTDEVS 0
-+%define CONFIG_FILTERS 0
-+%define CONFIG_DEMUXERS 1
-+%define CONFIG_MUXERS 0
-+%define CONFIG_PROTOCOLS 0
-+%define CONFIG_AANDCTTABLES 0
-+%define CONFIG_AC3DSP 0
-+%define CONFIG_ADTS_HEADER 1
-+%define CONFIG_ATSC_A53 1
-+%define CONFIG_AUDIO_FRAME_QUEUE 0
-+%define CONFIG_AUDIODSP 0
-+%define CONFIG_BLOCKDSP 0
-+%define CONFIG_BSWAPDSP 0
-+%define CONFIG_CABAC 1
-+%define CONFIG_CBS 0
-+%define CONFIG_CBS_AV1 0
-+%define CONFIG_CBS_H264 0
-+%define CONFIG_CBS_H265 0
-+%define CONFIG_CBS_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
-+%define CONFIG_DVPROFILE 0
-+%define CONFIG_EXIF 0
-+%define CONFIG_FAANDCT 0
-+%define CONFIG_FAANIDCT 0
-+%define CONFIG_FDCTDSP 0
-+%define CONFIG_FMTCONVERT 0
-+%define CONFIG_FRAME_THREAD_ENCODER 0
-+%define CONFIG_G722DSP 0
-+%define CONFIG_GOLOMB 1
-+%define CONFIG_GPLV3 0
-+%define CONFIG_H263DSP 0
-+%define CONFIG_H264CHROMA 1
-+%define CONFIG_H264DSP 1
-+%define CONFIG_H264PARSE 1
-+%define CONFIG_H264PRED 1
-+%define CONFIG_H264QPEL 1
-+%define CONFIG_H264_SEI 1
-+%define CONFIG_HEVCPARSE 0
-+%define CONFIG_HEVC_SEI 0
-+%define CONFIG_HPELDSP 1
-+%define CONFIG_HUFFMAN 0
-+%define CONFIG_HUFFYUVDSP 0
-+%define CONFIG_HUFFYUVENCDSP 0
-+%define CONFIG_IDCTDSP 0
-+%define CONFIG_IIRFILTER 0
-+%define CONFIG_INFLATE_WRAPPER 0
-+%define CONFIG_INTRAX8 0
-+%define CONFIG_ISO_MEDIA 1
-+%define CONFIG_IVIDSP 0
-+%define CONFIG_JPEGTABLES 0
-+%define CONFIG_LGPLV3 0
-+%define CONFIG_LIBX262 0
-+%define CONFIG_LLAUDDSP 0
-+%define CONFIG_LLVIDDSP 0
-+%define CONFIG_LLVIDENCDSP 0
-+%define CONFIG_LPC 0
-+%define CONFIG_LZF 0
-+%define CONFIG_ME_CMP 0
-+%define CONFIG_MPEG_ER 0
-+%define CONFIG_MPEGAUDIO 1
-+%define CONFIG_MPEGAUDIODSP 1
-+%define CONFIG_MPEGAUDIOHEADER 1
-+%define CONFIG_MPEG4AUDIO 1
-+%define CONFIG_MPEGVIDEO 0
-+%define CONFIG_MPEGVIDEODEC 0
-+%define CONFIG_MPEGVIDEOENC 0
-+%define CONFIG_MSMPEG4DEC 0
-+%define CONFIG_MSMPEG4ENC 0
-+%define CONFIG_MSS34DSP 0
-+%define CONFIG_PIXBLOCKDSP 0
-+%define CONFIG_QPELDSP 0
-+%define CONFIG_QSV 0
-+%define CONFIG_QSVDEC 0
-+%define CONFIG_QSVENC 0
-+%define CONFIG_QSVVPP 0
-+%define CONFIG_RANGECODER 0
-+%define CONFIG_RIFFDEC 1
-+%define CONFIG_RIFFENC 0
-+%define CONFIG_RTPDEC 0
-+%define CONFIG_RTPENC_CHAIN 0
-+%define CONFIG_RV34DSP 0
-+%define CONFIG_SCENE_SAD 0
-+%define CONFIG_SINEWIN 1
-+%define CONFIG_SNAPPY 0
-+%define CONFIG_SRTP 0
-+%define CONFIG_STARTCODE 1
-+%define CONFIG_TEXTUREDSP 0
-+%define CONFIG_TEXTUREDSPENC 0
-+%define CONFIG_TPELDSP 0
-+%define CONFIG_VAAPI_1 0
-+%define CONFIG_VAAPI_ENCODE 0
-+%define CONFIG_VC1DSP 0
-+%define CONFIG_VIDEODSP 1
-+%define CONFIG_VP3DSP 1
-+%define CONFIG_VP56DSP 0
-+%define CONFIG_VP8DSP 1
-+%define CONFIG_WMA_FREQS 0
-+%define CONFIG_WMV2DSP 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
deleted file mode 100644
index c2f73a9f809c..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h
+++ /dev/null
@@ -1,752 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h.orig 2023-04-22 17:45:15 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config.h
-@@ -0,0 +1,749 @@
-+/* 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-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/liberato/src/release_chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --enable-lto --arch=x86_64 --target-os=linux --enable-pic --cc=clang --cxx=clang++ --ld=clang --extra-ldflags='-fuse-ld=lld' --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
-+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
-+#define CONFIG_THIS_YEAR 2023
-+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
-+#define AVCONV_DATADIR "/usr/local/share/ffmpeg"
-+#define CC_IDENT "OpenBSD clang version 13.0.0"
-+#define OS_NAME linux
-+#define av_restrict restrict
-+#define EXTERN_PREFIX ""
-+#define EXTERN_ASM
-+#define BUILDSUF ""
-+#define SLIBSUF ".so"
-+#define HAVE_MMX2 HAVE_MMXEXT
-+#define SWS_MAX_FILTER_SIZE 256
-+#define ARCH_AARCH64 0
-+#define ARCH_ALPHA 0
-+#define ARCH_ARM 0
-+#define ARCH_AVR32 0
-+#define ARCH_AVR32_AP 0
-+#define ARCH_AVR32_UC 0
-+#define ARCH_BFIN 0
-+#define ARCH_IA64 0
-+#define ARCH_LOONGARCH 0
-+#define ARCH_LOONGARCH32 0
-+#define ARCH_LOONGARCH64 0
-+#define ARCH_M68K 0
-+#define ARCH_MIPS 0
-+#define ARCH_MIPS64 0
-+#define ARCH_PARISC 0
-+#define ARCH_PPC 0
-+#define ARCH_PPC64 0
-+#define ARCH_RISCV 0
-+#define ARCH_S390 0
-+#define ARCH_SH4 0
-+#define ARCH_SPARC 0
-+#define ARCH_SPARC64 0
-+#define ARCH_TILEGX 0
-+#define ARCH_TILEPRO 0
-+#define ARCH_TOMI 0
-+#define ARCH_X86 1
-+#define ARCH_X86_32 0
-+#define ARCH_X86_64 1
-+#define HAVE_ARMV5TE 0
-+#define HAVE_ARMV6 0
-+#define HAVE_ARMV6T2 0
-+#define HAVE_ARMV8 0
-+#define HAVE_NEON 0
-+#define HAVE_VFP 0
-+#define HAVE_VFPV3 0
-+#define HAVE_SETEND 0
-+#define HAVE_ALTIVEC 0
-+#define HAVE_DCBZL 0
-+#define HAVE_LDBRX 0
-+#define HAVE_POWER8 0
-+#define HAVE_PPC4XX 0
-+#define HAVE_VSX 0
-+#define HAVE_RVV 0
-+#define HAVE_AESNI 1
-+#define HAVE_AMD3DNOW 1
-+#define HAVE_AMD3DNOWEXT 1
-+#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
-+#define HAVE_MMXEXT 1
-+#define HAVE_SSE 1
-+#define HAVE_SSE2 1
-+#define HAVE_SSE3 1
-+#define HAVE_SSE4 1
-+#define HAVE_SSE42 1
-+#define HAVE_SSSE3 1
-+#define HAVE_XOP 1
-+#define HAVE_CPUNOP 0
-+#define HAVE_I686 1
-+#define HAVE_MIPSFPU 0
-+#define HAVE_MIPS32R2 0
-+#define HAVE_MIPS32R5 0
-+#define HAVE_MIPS64R2 0
-+#define HAVE_MIPS32R6 0
-+#define HAVE_MIPS64R6 0
-+#define HAVE_MIPSDSP 0
-+#define HAVE_MIPSDSPR2 0
-+#define HAVE_MSA 0
-+#define HAVE_LOONGSON2 0
-+#define HAVE_LOONGSON3 0
-+#define HAVE_MMI 0
-+#define HAVE_LSX 0
-+#define HAVE_LASX 0
-+#define HAVE_ARMV5TE_EXTERNAL 0
-+#define HAVE_ARMV6_EXTERNAL 0
-+#define HAVE_ARMV6T2_EXTERNAL 0
-+#define HAVE_ARMV8_EXTERNAL 0
-+#define HAVE_NEON_EXTERNAL 0
-+#define HAVE_VFP_EXTERNAL 0
-+#define HAVE_VFPV3_EXTERNAL 0
-+#define HAVE_SETEND_EXTERNAL 0
-+#define HAVE_ALTIVEC_EXTERNAL 0
-+#define HAVE_DCBZL_EXTERNAL 0
-+#define HAVE_LDBRX_EXTERNAL 0
-+#define HAVE_POWER8_EXTERNAL 0
-+#define HAVE_PPC4XX_EXTERNAL 0
-+#define HAVE_VSX_EXTERNAL 0
-+#define HAVE_RVV_EXTERNAL 0
-+#define HAVE_AESNI_EXTERNAL 1
-+#define HAVE_AMD3DNOW_EXTERNAL 1
-+#define HAVE_AMD3DNOWEXT_EXTERNAL 1
-+#define HAVE_AVX_EXTERNAL 1
-+#define HAVE_AVX2_EXTERNAL 1
-+#define HAVE_AVX512_EXTERNAL 1
-+#define HAVE_AVX512ICL_EXTERNAL 1
-+#define HAVE_FMA3_EXTERNAL 1
-+#define HAVE_FMA4_EXTERNAL 1
-+#define HAVE_MMX_EXTERNAL 1
-+#define HAVE_MMXEXT_EXTERNAL 1
-+#define HAVE_SSE_EXTERNAL 1
-+#define HAVE_SSE2_EXTERNAL 1
-+#define HAVE_SSE3_EXTERNAL 1
-+#define HAVE_SSE4_EXTERNAL 1
-+#define HAVE_SSE42_EXTERNAL 1
-+#define HAVE_SSSE3_EXTERNAL 1
-+#define HAVE_XOP_EXTERNAL 1
-+#define HAVE_CPUNOP_EXTERNAL 0
-+#define HAVE_I686_EXTERNAL 0
-+#define HAVE_MIPSFPU_EXTERNAL 0
-+#define HAVE_MIPS32R2_EXTERNAL 0
-+#define HAVE_MIPS32R5_EXTERNAL 0
-+#define HAVE_MIPS64R2_EXTERNAL 0
-+#define HAVE_MIPS32R6_EXTERNAL 0
-+#define HAVE_MIPS64R6_EXTERNAL 0
-+#define HAVE_MIPSDSP_EXTERNAL 0
-+#define HAVE_MIPSDSPR2_EXTERNAL 0
-+#define HAVE_MSA_EXTERNAL 0
-+#define HAVE_LOONGSON2_EXTERNAL 0
-+#define HAVE_LOONGSON3_EXTERNAL 0
-+#define HAVE_MMI_EXTERNAL 0
-+#define HAVE_LSX_EXTERNAL 0
-+#define HAVE_LASX_EXTERNAL 0
-+#define HAVE_ARMV5TE_INLINE 0
-+#define HAVE_ARMV6_INLINE 0
-+#define HAVE_ARMV6T2_INLINE 0
-+#define HAVE_ARMV8_INLINE 0
-+#define HAVE_NEON_INLINE 0
-+#define HAVE_VFP_INLINE 0
-+#define HAVE_VFPV3_INLINE 0
-+#define HAVE_SETEND_INLINE 0
-+#define HAVE_ALTIVEC_INLINE 0
-+#define HAVE_DCBZL_INLINE 0
-+#define HAVE_LDBRX_INLINE 0
-+#define HAVE_POWER8_INLINE 0
-+#define HAVE_PPC4XX_INLINE 0
-+#define HAVE_VSX_INLINE 0
-+#define HAVE_RVV_INLINE 0
-+#define HAVE_AESNI_INLINE 1
-+#define HAVE_AMD3DNOW_INLINE 1
-+#define HAVE_AMD3DNOWEXT_INLINE 1
-+#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
-+#define HAVE_MMXEXT_INLINE 1
-+#define HAVE_SSE_INLINE 1
-+#define HAVE_SSE2_INLINE 1
-+#define HAVE_SSE3_INLINE 1
-+#define HAVE_SSE4_INLINE 1
-+#define HAVE_SSE42_INLINE 1
-+#define HAVE_SSSE3_INLINE 1
-+#define HAVE_XOP_INLINE 1
-+#define HAVE_CPUNOP_INLINE 0
-+#define HAVE_I686_INLINE 0
-+#define HAVE_MIPSFPU_INLINE 0
-+#define HAVE_MIPS32R2_INLINE 0
-+#define HAVE_MIPS32R5_INLINE 0
-+#define HAVE_MIPS64R2_INLINE 0
-+#define HAVE_MIPS32R6_INLINE 0
-+#define HAVE_MIPS64R6_INLINE 0
-+#define HAVE_MIPSDSP_INLINE 0
-+#define HAVE_MIPSDSPR2_INLINE 0
-+#define HAVE_MSA_INLINE 0
-+#define HAVE_LOONGSON2_INLINE 0
-+#define HAVE_LOONGSON3_INLINE 0
-+#define HAVE_MMI_INLINE 0
-+#define HAVE_LSX_INLINE 0
-+#define HAVE_LASX_INLINE 0
-+#define HAVE_ALIGNED_STACK 1
-+#define HAVE_FAST_64BIT 1
-+#define HAVE_FAST_CLZ 1
-+#define HAVE_FAST_CMOV 1
-+#define HAVE_FAST_FLOAT16 0
-+#define HAVE_LOCAL_ALIGNED 1
-+#define HAVE_SIMD_ALIGN_16 1
-+#define HAVE_SIMD_ALIGN_32 1
-+#define HAVE_SIMD_ALIGN_64 1
-+#define HAVE_ATOMIC_CAS_PTR 0
-+#define HAVE_MACHINE_RW_BARRIER 0
-+#define HAVE_MEMORYBARRIER 0
-+#define HAVE_MM_EMPTY 1
-+#define HAVE_RDTSC 0
-+#define HAVE_SEM_TIMEDWAIT 1
-+#define HAVE_SYNC_VAL_COMPARE_AND_SWAP 1
-+#define HAVE_INLINE_ASM 1
-+#define HAVE_SYMVER 0
-+#define HAVE_X86ASM 1
-+#define HAVE_BIGENDIAN 0
-+#define HAVE_FAST_UNALIGNED 1
-+#define HAVE_ARPA_INET_H 0
-+#define HAVE_ASM_TYPES_H 0
-+#define HAVE_CDIO_PARANOIA_H 0
-+#define HAVE_CDIO_PARANOIA_PARANOIA_H 0
-+#define HAVE_CUDA_H 0
-+#define HAVE_DISPATCH_DISPATCH_H 0
-+#define HAVE_DEV_BKTR_IOCTL_BT848_H 0
-+#define HAVE_DEV_BKTR_IOCTL_METEOR_H 0
-+#define HAVE_DEV_IC_BT8XX_H 1
-+#define HAVE_DEV_VIDEO_BKTR_IOCTL_BT848_H 0
-+#define HAVE_DEV_VIDEO_METEOR_IOCTL_METEOR_H 0
-+#define HAVE_DIRECT_H 0
-+#define HAVE_DIRENT_H 1
-+#define HAVE_DXGIDEBUG_H 0
-+#define HAVE_DXVA_H 0
-+#define HAVE_ES2_GL_H 0
-+#define HAVE_GSM_H 0
-+#define HAVE_IO_H 0
-+#define HAVE_LINUX_DMA_BUF_H 0
-+#define HAVE_LINUX_PERF_EVENT_H 0
-+#define HAVE_MACHINE_IOCTL_BT848_H 0
-+#define HAVE_MACHINE_IOCTL_METEOR_H 0
-+#define HAVE_MALLOC_H 0
-+#define HAVE_OPENCV2_CORE_CORE_C_H 0
-+#define HAVE_OPENGL_GL3_H 0
-+#define HAVE_POLL_H 1
-+#define HAVE_SYS_PARAM_H 1
-+#define HAVE_SYS_RESOURCE_H 1
-+#define HAVE_SYS_SELECT_H 1
-+#define HAVE_SYS_SOUNDCARD_H 0
-+#define HAVE_SYS_TIME_H 1
-+#define HAVE_SYS_UN_H 1
-+#define HAVE_SYS_VIDEOIO_H 1
-+#define HAVE_TERMIOS_H 1
-+#define HAVE_UDPLITE_H 0
-+#define HAVE_UNISTD_H 1
-+#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */
-+#define HAVE_WINDOWS_H 0
-+#define HAVE_WINSOCK2_H 0
-+#define HAVE_INTRINSICS_NEON 0
-+#define HAVE_ATANF 1
-+#define HAVE_ATAN2F 1
-+#define HAVE_CBRT 1
-+#define HAVE_CBRTF 1
-+#define HAVE_COPYSIGN 1
-+#define HAVE_COSF 1
-+#define HAVE_ERF 1
-+#define HAVE_EXP2 1
-+#define HAVE_EXP2F 1
-+#define HAVE_EXPF 1
-+#define HAVE_HYPOT 1
-+#define HAVE_ISFINITE 1
-+#define HAVE_ISINF 1
-+#define HAVE_ISNAN 1
-+#define HAVE_LDEXPF 1
-+#define HAVE_LLRINT 1
-+#define HAVE_LLRINTF 1
-+#define HAVE_LOG2 1
-+#define HAVE_LOG2F 1
-+#define HAVE_LOG10F 1
-+#define HAVE_LRINT 1
-+#define HAVE_LRINTF 1
-+#define HAVE_POWF 1
-+#define HAVE_RINT 1
-+#define HAVE_ROUND 1
-+#define HAVE_ROUNDF 1
-+#define HAVE_SINF 1
-+#define HAVE_TRUNC 1
-+#define HAVE_TRUNCF 1
-+#define HAVE_DOS_PATHS 0
-+#define HAVE_LIBC_MSVCRT 0
-+#define HAVE_MMAL_PARAMETER_VIDEO_MAX_NUM_CALLBACKS 0
-+#define HAVE_SECTION_DATA_REL_RO 1
-+#define HAVE_THREADS 1
-+#define HAVE_UWP 0
-+#define HAVE_WINRT 0
-+#define HAVE_ACCESS 1
-+#define HAVE_ALIGNED_MALLOC 0
-+#define HAVE_ARC4RANDOM 1
-+#define HAVE_CLOCK_GETTIME 1
-+#define HAVE_CLOSESOCKET 0
-+#define HAVE_COMMANDLINETOARGVW 0
-+#define HAVE_FCNTL 1
-+#define HAVE_GETADDRINFO 0
-+#define HAVE_GETAUXVAL 0
-+#define HAVE_GETENV 1
-+#define HAVE_GETHRTIME 0
-+#define HAVE_GETOPT 1
-+#define HAVE_GETMODULEHANDLE 0
-+#define HAVE_GETPROCESSAFFINITYMASK 0
-+#define HAVE_GETPROCESSMEMORYINFO 0
-+#define HAVE_GETPROCESSTIMES 0
-+#define HAVE_GETRUSAGE 1
-+#define HAVE_GETSTDHANDLE 0
-+#define HAVE_GETSYSTEMTIMEASFILETIME 0
-+#define HAVE_GETTIMEOFDAY 1
-+#define HAVE_GLOB 1
-+#define HAVE_GLXGETPROCADDRESS 0
-+#define HAVE_GMTIME_R 1
-+#define HAVE_INET_ATON 0
-+#define HAVE_ISATTY 1
-+#define HAVE_KBHIT 0
-+#define HAVE_LOCALTIME_R 1
-+#define HAVE_LSTAT 1
-+#define HAVE_LZO1X_999_COMPRESS 0
-+#define HAVE_MACH_ABSOLUTE_TIME 0
-+#define HAVE_MAPVIEWOFFILE 0
-+#define HAVE_MEMALIGN 0
-+#define HAVE_MKSTEMP 1
-+#define HAVE_MMAP 1
-+#define HAVE_MPROTECT 1
-+#define HAVE_NANOSLEEP 1
-+#define HAVE_PEEKNAMEDPIPE 0
-+#define HAVE_POSIX_MEMALIGN 1
-+#define HAVE_PRCTL 0 /* #define HAVE_PRCTL 1 -- forced to 0 for Fuchsia */
-+#define HAVE_PTHREAD_CANCEL 1
-+#define HAVE_SCHED_GETAFFINITY 0
-+#define HAVE_SECITEMIMPORT 0
-+#define HAVE_SETCONSOLETEXTATTRIBUTE 0
-+#define HAVE_SETCONSOLECTRLHANDLER 0
-+#define HAVE_SETDLLDIRECTORY 0
-+#define HAVE_SETMODE 0
-+#define HAVE_SETRLIMIT 1
-+#define HAVE_SLEEP 0
-+#define HAVE_STRERROR_R 1
-+#define HAVE_SYSCONF 1
-+#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 0 -- forced to 0 for Fuchsia */
-+#define HAVE_USLEEP 1
-+#define HAVE_UTGETOSTYPEFROMSTRING 0
-+#define HAVE_VIRTUALALLOC 0
-+#define HAVE_WGLGETPROCADDRESS 0
-+#define HAVE_BCRYPT 0
-+#define HAVE_VAAPI_DRM 0
-+#define HAVE_VAAPI_X11 0
-+#define HAVE_VDPAU_X11 0
-+#define HAVE_PTHREADS 1
-+#define HAVE_OS2THREADS 0
-+#define HAVE_W32THREADS 0
-+#define HAVE_AS_ARCH_DIRECTIVE 0
-+#define HAVE_AS_DN_DIRECTIVE 0
-+#define HAVE_AS_FPU_DIRECTIVE 0
-+#define HAVE_AS_FUNC 0
-+#define HAVE_AS_OBJECT_ARCH 0
-+#define HAVE_ASM_MOD_Q 0
-+#define HAVE_BLOCKS_EXTENSION 0
-+#define HAVE_EBP_AVAILABLE 1
-+#define HAVE_EBX_AVAILABLE 1
-+#define HAVE_GNU_AS 0
-+#define HAVE_GNU_WINDRES 0
-+#define HAVE_IBM_ASM 0
-+#define HAVE_INLINE_ASM_DIRECT_SYMBOL_REFS 0
-+#define HAVE_INLINE_ASM_LABELS 1
-+#define HAVE_INLINE_ASM_NONLOCAL_LABELS 1
-+#define HAVE_PRAGMA_DEPRECATED 1
-+#define HAVE_RSYNC_CONTIMEOUT 1
-+#define HAVE_SYMVER_ASM_LABEL 1
-+#define HAVE_SYMVER_GNU_ASM 1
-+#define HAVE_VFP_ARGS 0
-+#define HAVE_XFORM_ASM 0
-+#define HAVE_XMM_CLOBBERS 1
-+#define HAVE_DPI_AWARENESS_CONTEXT 0
-+#define HAVE_IDXGIOUTPUT5 0
-+#define HAVE_KCMVIDEOCODECTYPE_HEVC 0
-+#define HAVE_KCMVIDEOCODECTYPE_HEVCWITHALPHA 0
-+#define HAVE_KCMVIDEOCODECTYPE_VP9 0
-+#define HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR8BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_422YPCBCR16BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR8BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR10BIPLANARVIDEORANGE 0
-+#define HAVE_KCVPIXELFORMATTYPE_444YPCBCR16BIPLANARVIDEORANGE 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_2084_PQ 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2100_HLG 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_LINEAR 0
-+#define HAVE_KCVIMAGEBUFFERYCBCRMATRIX_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERCOLORPRIMARIES_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_ITU_R_2020 0
-+#define HAVE_KCVIMAGEBUFFERTRANSFERFUNCTION_SMPTE_ST_428_1 0
-+#define HAVE_SOCKLEN_T 0
-+#define HAVE_STRUCT_ADDRINFO 0
-+#define HAVE_STRUCT_GROUP_SOURCE_REQ 0
-+#define HAVE_STRUCT_IP_MREQ_SOURCE 0
-+#define HAVE_STRUCT_IPV6_MREQ 0
-+#define HAVE_STRUCT_MSGHDR_MSG_FLAGS 0
-+#define HAVE_STRUCT_POLLFD 0
-+#define HAVE_STRUCT_RUSAGE_RU_MAXRSS 1
-+#define HAVE_STRUCT_SCTP_EVENT_SUBSCRIBE 0
-+#define HAVE_STRUCT_SOCKADDR_IN6 0
-+#define HAVE_STRUCT_SOCKADDR_SA_LEN 0
-+#define HAVE_STRUCT_SOCKADDR_STORAGE 0
-+#define HAVE_STRUCT_STAT_ST_MTIM_TV_NSEC 1
-+#define HAVE_STRUCT_V4L2_FRMIVALENUM_DISCRETE 1
-+#define HAVE_GZIP 1
-+#define HAVE_LIBDRM_GETFB2 0
-+#define HAVE_MAKEINFO 1
-+#define HAVE_MAKEINFO_HTML 0
-+#define HAVE_OPENCL_D3D11 0
-+#define HAVE_OPENCL_DRM_ARM 0
-+#define HAVE_OPENCL_DRM_BEIGNET 0
-+#define HAVE_OPENCL_DXVA2 0
-+#define HAVE_OPENCL_VAAPI_BEIGNET 0
-+#define HAVE_OPENCL_VAAPI_INTEL_MEDIA 0
-+#define HAVE_PERL 1
-+#define HAVE_POD2MAN 1
-+#define HAVE_TEXI2HTML 0
-+#define HAVE_XMLLINT 1
-+#define HAVE_ZLIB_GZIP 0
-+#define CONFIG_DOC 0
-+#define CONFIG_HTMLPAGES 0
-+#define CONFIG_MANPAGES 0
-+#define CONFIG_PODPAGES 0
-+#define CONFIG_TXTPAGES 0
-+#define CONFIG_AVIO_LIST_DIR_EXAMPLE 1
-+#define CONFIG_AVIO_READING_EXAMPLE 1
-+#define CONFIG_DECODE_AUDIO_EXAMPLE 1
-+#define CONFIG_DECODE_VIDEO_EXAMPLE 1
-+#define CONFIG_DEMUXING_DECODING_EXAMPLE 1
-+#define CONFIG_ENCODE_AUDIO_EXAMPLE 1
-+#define CONFIG_ENCODE_VIDEO_EXAMPLE 1
-+#define CONFIG_EXTRACT_MVS_EXAMPLE 1
-+#define CONFIG_FILTER_AUDIO_EXAMPLE 0
-+#define CONFIG_FILTERING_AUDIO_EXAMPLE 0
-+#define CONFIG_FILTERING_VIDEO_EXAMPLE 0
-+#define CONFIG_HTTP_MULTICLIENT_EXAMPLE 1
-+#define CONFIG_HW_DECODE_EXAMPLE 1
-+#define CONFIG_METADATA_EXAMPLE 1
-+#define CONFIG_MUXING_EXAMPLE 0
-+#define CONFIG_QSVDEC_EXAMPLE 0
-+#define CONFIG_REMUXING_EXAMPLE 1
-+#define CONFIG_RESAMPLING_AUDIO_EXAMPLE 0
-+#define CONFIG_SCALING_VIDEO_EXAMPLE 0
-+#define CONFIG_TRANSCODE_AAC_EXAMPLE 0
-+#define CONFIG_TRANSCODING_EXAMPLE 0
-+#define CONFIG_VAAPI_ENCODE_EXAMPLE 0
-+#define CONFIG_VAAPI_TRANSCODE_EXAMPLE 0
-+#define CONFIG_QSV_TRANSCODE_EXAMPLE 0
-+#define CONFIG_AVISYNTH 0
-+#define CONFIG_FREI0R 0
-+#define CONFIG_LIBCDIO 0
-+#define CONFIG_LIBDAVS2 0
-+#define CONFIG_LIBRUBBERBAND 0
-+#define CONFIG_LIBVIDSTAB 0
-+#define CONFIG_LIBX264 0
-+#define CONFIG_LIBX265 0
-+#define CONFIG_LIBXAVS 0
-+#define CONFIG_LIBXAVS2 0
-+#define CONFIG_LIBXVID 0
-+#define CONFIG_DECKLINK 0
-+#define CONFIG_LIBFDK_AAC 0
-+#define CONFIG_LIBTLS 0
-+#define CONFIG_GMP 0
-+#define CONFIG_LIBARIBB24 0
-+#define CONFIG_LIBLENSFUN 0
-+#define CONFIG_LIBOPENCORE_AMRNB 0
-+#define CONFIG_LIBOPENCORE_AMRWB 0
-+#define CONFIG_LIBVO_AMRWBENC 0
-+#define CONFIG_MBEDTLS 0
-+#define CONFIG_RKMPP 0
-+#define CONFIG_LIBSMBCLIENT 0
-+#define CONFIG_CHROMAPRINT 0
-+#define CONFIG_GCRYPT 0
-+#define CONFIG_GNUTLS 0
-+#define CONFIG_JNI 0
-+#define CONFIG_LADSPA 0
-+#define CONFIG_LCMS2 0
-+#define CONFIG_LIBAOM 0
-+#define CONFIG_LIBASS 0
-+#define CONFIG_LIBBLURAY 0
-+#define CONFIG_LIBBS2B 0
-+#define CONFIG_LIBCACA 0
-+#define CONFIG_LIBCELT 0
-+#define CONFIG_LIBCODEC2 0
-+#define CONFIG_LIBDAV1D 0
-+#define CONFIG_LIBDC1394 0
-+#define CONFIG_LIBDRM 0
-+#define CONFIG_LIBFLITE 0
-+#define CONFIG_LIBFONTCONFIG 0
-+#define CONFIG_LIBFREETYPE 0
-+#define CONFIG_LIBFRIBIDI 0
-+#define CONFIG_LIBGLSLANG 0
-+#define CONFIG_LIBGME 0
-+#define CONFIG_LIBGSM 0
-+#define CONFIG_LIBIEC61883 0
-+#define CONFIG_LIBILBC 0
-+#define CONFIG_LIBJACK 0
-+#define CONFIG_LIBJXL 0
-+#define CONFIG_LIBKLVANC 0
-+#define CONFIG_LIBKVAZAAR 0
-+#define CONFIG_LIBMODPLUG 0
-+#define CONFIG_LIBMP3LAME 0
-+#define CONFIG_LIBMYSOFA 0
-+#define CONFIG_LIBOPENCV 0
-+#define CONFIG_LIBOPENH264 0
-+#define CONFIG_LIBOPENJPEG 0
-+#define CONFIG_LIBOPENMPT 0
-+#define CONFIG_LIBOPENVINO 0
-+#define CONFIG_LIBOPUS 1
-+#define CONFIG_LIBPLACEBO 0
-+#define CONFIG_LIBPULSE 0
-+#define CONFIG_LIBRABBITMQ 0
-+#define CONFIG_LIBRAV1E 0
-+#define CONFIG_LIBRIST 0
-+#define CONFIG_LIBRSVG 0
-+#define CONFIG_LIBRTMP 0
-+#define CONFIG_LIBSHADERC 0
-+#define CONFIG_LIBSHINE 0
-+#define CONFIG_LIBSMBCLIENT 0
-+#define CONFIG_LIBSNAPPY 0
-+#define CONFIG_LIBSOXR 0
-+#define CONFIG_LIBSPEEX 0
-+#define CONFIG_LIBSRT 0
-+#define CONFIG_LIBSSH 0
-+#define CONFIG_LIBSVTAV1 0
-+#define CONFIG_LIBTENSORFLOW 0
-+#define CONFIG_LIBTESSERACT 0
-+#define CONFIG_LIBTHEORA 0
-+#define CONFIG_LIBTWOLAME 0
-+#define CONFIG_LIBUAVS3D 0
-+#define CONFIG_LIBV4L2 0
-+#define CONFIG_LIBVMAF 0
-+#define CONFIG_LIBVORBIS 0
-+#define CONFIG_LIBVPX 0
-+#define CONFIG_LIBWEBP 0
-+#define CONFIG_LIBXML2 0
-+#define CONFIG_LIBZIMG 0
-+#define CONFIG_LIBZMQ 0
-+#define CONFIG_LIBZVBI 0
-+#define CONFIG_LV2 0
-+#define CONFIG_MEDIACODEC 0
-+#define CONFIG_OPENAL 0
-+#define CONFIG_OPENGL 0
-+#define CONFIG_OPENSSL 0
-+#define CONFIG_POCKETSPHINX 0
-+#define CONFIG_VAPOURSYNTH 0
-+#define CONFIG_ALSA 0
-+#define CONFIG_APPKIT 0
-+#define CONFIG_AVFOUNDATION 0
-+#define CONFIG_BZLIB 0
-+#define CONFIG_COREIMAGE 0
-+#define CONFIG_ICONV 0
-+#define CONFIG_LIBXCB 0
-+#define CONFIG_LIBXCB_SHM 0
-+#define CONFIG_LIBXCB_SHAPE 0
-+#define CONFIG_LIBXCB_XFIXES 0
-+#define CONFIG_LZMA 0
-+#define CONFIG_MEDIAFOUNDATION 0
-+#define CONFIG_METAL 0
-+#define CONFIG_SCHANNEL 0
-+#define CONFIG_SDL2 0
-+#define CONFIG_SECURETRANSPORT 0
-+#define CONFIG_SNDIO 0
-+#define CONFIG_XLIB 0
-+#define CONFIG_ZLIB 0
-+#define CONFIG_CUDA_NVCC 0
-+#define CONFIG_CUDA_SDK 0
-+#define CONFIG_LIBNPP 0
-+#define CONFIG_LIBMFX 0
-+#define CONFIG_LIBVPL 0
-+#define CONFIG_MMAL 0
-+#define CONFIG_OMX 0
-+#define CONFIG_OPENCL 0
-+#define CONFIG_AMF 0
-+#define CONFIG_AUDIOTOOLBOX 0
-+#define CONFIG_CRYSTALHD 0
-+#define CONFIG_CUDA 0
-+#define CONFIG_CUDA_LLVM 0
-+#define CONFIG_CUVID 0
-+#define CONFIG_D3D11VA 0
-+#define CONFIG_DXVA2 0
-+#define CONFIG_FFNVCODEC 0
-+#define CONFIG_NVDEC 0
-+#define CONFIG_NVENC 0
-+#define CONFIG_VAAPI 0
-+#define CONFIG_VDPAU 0
-+#define CONFIG_VIDEOTOOLBOX 0
-+#define CONFIG_VULKAN 0
-+#define CONFIG_V4L2_M2M 0
-+#define CONFIG_FTRAPV 0
-+#define CONFIG_GRAY 0
-+#define CONFIG_HARDCODED_TABLES 0
-+#define CONFIG_OMX_RPI 0
-+#define CONFIG_RUNTIME_CPUDETECT 1
-+#define CONFIG_SAFE_BITSTREAM_READER 1
-+#define CONFIG_SHARED 0
-+#define CONFIG_SMALL 0
-+#define CONFIG_STATIC 1
-+#define CONFIG_SWSCALE_ALPHA 1
-+#define CONFIG_GPL 0
-+#define CONFIG_NONFREE 0
-+#define CONFIG_VERSION3 0
-+#define CONFIG_AVDEVICE 0
-+#define CONFIG_AVFILTER 0
-+#define CONFIG_SWSCALE 0
-+#define CONFIG_POSTPROC 0
-+#define CONFIG_AVFORMAT 1
-+#define CONFIG_AVCODEC 1
-+#define CONFIG_SWRESAMPLE 0
-+#define CONFIG_AVUTIL 1
-+#define CONFIG_FFPLAY 0
-+#define CONFIG_FFPROBE 0
-+#define CONFIG_FFMPEG 0
-+#define CONFIG_DCT 1
-+#define CONFIG_DWT 0
-+#define CONFIG_ERROR_RESILIENCE 0
-+#define CONFIG_FAAN 0
-+#define CONFIG_FAST_UNALIGNED 1
-+#define CONFIG_FFT 1
-+#define CONFIG_LSP 0
-+#define CONFIG_MDCT 0
-+#define CONFIG_PIXELUTILS 0
-+#define CONFIG_NETWORK 0
-+#define CONFIG_RDFT 1
-+#define CONFIG_AUTODETECT 0
-+#define CONFIG_FONTCONFIG 0
-+#define CONFIG_LARGE_TESTS 1
-+#define CONFIG_LINUX_PERF 0
-+#define CONFIG_MACOS_KPERF 0
-+#define CONFIG_MEMORY_POISONING 0
-+#define CONFIG_NEON_CLOBBER_TEST 0
-+#define CONFIG_OSSFUZZ 0
-+#define CONFIG_PIC 1
-+#define CONFIG_PTX_COMPRESSION 0
-+#define CONFIG_THUMB 0
-+#define CONFIG_VALGRIND_BACKTRACE 0
-+#define CONFIG_XMM_CLOBBER_TEST 0
-+#define CONFIG_BSFS 0
-+#define CONFIG_DECODERS 1
-+#define CONFIG_ENCODERS 0
-+#define CONFIG_HWACCELS 0
-+#define CONFIG_PARSERS 1
-+#define CONFIG_INDEVS 0
-+#define CONFIG_OUTDEVS 0
-+#define CONFIG_FILTERS 0
-+#define CONFIG_DEMUXERS 1
-+#define CONFIG_MUXERS 0
-+#define CONFIG_PROTOCOLS 0
-+#define CONFIG_AANDCTTABLES 0
-+#define CONFIG_AC3DSP 0
-+#define CONFIG_ADTS_HEADER 1
-+#define CONFIG_ATSC_A53 1
-+#define CONFIG_AUDIO_FRAME_QUEUE 0
-+#define CONFIG_AUDIODSP 0
-+#define CONFIG_BLOCKDSP 0
-+#define CONFIG_BSWAPDSP 0
-+#define CONFIG_CABAC 1
-+#define CONFIG_CBS 0
-+#define CONFIG_CBS_AV1 0
-+#define CONFIG_CBS_H264 0
-+#define CONFIG_CBS_H265 0
-+#define CONFIG_CBS_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
-+#define CONFIG_DVPROFILE 0
-+#define CONFIG_EXIF 0
-+#define CONFIG_FAANDCT 0
-+#define CONFIG_FAANIDCT 0
-+#define CONFIG_FDCTDSP 0
-+#define CONFIG_FMTCONVERT 0
-+#define CONFIG_FRAME_THREAD_ENCODER 0
-+#define CONFIG_G722DSP 0
-+#define CONFIG_GOLOMB 1
-+#define CONFIG_GPLV3 0
-+#define CONFIG_H263DSP 0
-+#define CONFIG_H264CHROMA 1
-+#define CONFIG_H264DSP 1
-+#define CONFIG_H264PARSE 1
-+#define CONFIG_H264PRED 1
-+#define CONFIG_H264QPEL 1
-+#define CONFIG_H264_SEI 1
-+#define CONFIG_HEVCPARSE 0
-+#define CONFIG_HEVC_SEI 0
-+#define CONFIG_HPELDSP 1
-+#define CONFIG_HUFFMAN 0
-+#define CONFIG_HUFFYUVDSP 0
-+#define CONFIG_HUFFYUVENCDSP 0
-+#define CONFIG_IDCTDSP 0
-+#define CONFIG_IIRFILTER 0
-+#define CONFIG_INFLATE_WRAPPER 0
-+#define CONFIG_INTRAX8 0
-+#define CONFIG_ISO_MEDIA 1
-+#define CONFIG_IVIDSP 0
-+#define CONFIG_JPEGTABLES 0
-+#define CONFIG_LGPLV3 0
-+#define CONFIG_LIBX262 0
-+#define CONFIG_LLAUDDSP 0
-+#define CONFIG_LLVIDDSP 0
-+#define CONFIG_LLVIDENCDSP 0
-+#define CONFIG_LPC 0
-+#define CONFIG_LZF 0
-+#define CONFIG_ME_CMP 0
-+#define CONFIG_MPEG_ER 0
-+#define CONFIG_MPEGAUDIO 1
-+#define CONFIG_MPEGAUDIODSP 1
-+#define CONFIG_MPEGAUDIOHEADER 1
-+#define CONFIG_MPEG4AUDIO 1
-+#define CONFIG_MPEGVIDEO 0
-+#define CONFIG_MPEGVIDEODEC 0
-+#define CONFIG_MPEGVIDEOENC 0
-+#define CONFIG_MSMPEG4DEC 0
-+#define CONFIG_MSMPEG4ENC 0
-+#define CONFIG_MSS34DSP 0
-+#define CONFIG_PIXBLOCKDSP 0
-+#define CONFIG_QPELDSP 0
-+#define CONFIG_QSV 0
-+#define CONFIG_QSVDEC 0
-+#define CONFIG_QSVENC 0
-+#define CONFIG_QSVVPP 0
-+#define CONFIG_RANGECODER 0
-+#define CONFIG_RIFFDEC 1
-+#define CONFIG_RIFFENC 0
-+#define CONFIG_RTPDEC 0
-+#define CONFIG_RTPENC_CHAIN 0
-+#define CONFIG_RV34DSP 0
-+#define CONFIG_SCENE_SAD 0
-+#define CONFIG_SINEWIN 1
-+#define CONFIG_SNAPPY 0
-+#define CONFIG_SRTP 0
-+#define CONFIG_STARTCODE 1
-+#define CONFIG_TEXTUREDSP 0
-+#define CONFIG_TEXTUREDSPENC 0
-+#define CONFIG_TPELDSP 0
-+#define CONFIG_VAAPI_1 0
-+#define CONFIG_VAAPI_ENCODE 0
-+#define CONFIG_VC1DSP 0
-+#define CONFIG_VIDEODSP 1
-+#define CONFIG_VP3DSP 1
-+#define CONFIG_VP56DSP 0
-+#define CONFIG_VP8DSP 1
-+#define CONFIG_WMA_FREQS 0
-+#define CONFIG_WMV2DSP 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
deleted file mode 100644
index f96c8f7deb70..000000000000
--- a/www/iridium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h
+++ /dev/null
@@ -1,2149 +0,0 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h.orig 2023-04-22 17:45:15 UTC
-+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/x64/config_components.h
-@@ -0,0 +1,2146 @@
-+/* Automatically generated by configure - do not modify! */
-+#ifndef FFMPEG_CONFIG_COMPONENTS_H
-+#define FFMPEG_CONFIG_COMPONENTS_H
-+#define CONFIG_AAC_ADTSTOASC_BSF 0
-+#define CONFIG_AV1_FRAME_MERGE_BSF 0
-+#define CONFIG_AV1_FRAME_SPLIT_BSF 0
-+#define CONFIG_AV1_METADATA_BSF 0
-+#define CONFIG_CHOMP_BSF 0
-+#define CONFIG_DUMP_EXTRADATA_BSF 0
-+#define CONFIG_DCA_CORE_BSF 0
-+#define CONFIG_DTS2PTS_BSF 0
-+#define CONFIG_DV_ERROR_MARKER_BSF 0
-+#define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+#define CONFIG_FILTER_UNITS_BSF 0
-+#define CONFIG_H264_METADATA_BSF 0
-+#define CONFIG_H264_MP4TOANNEXB_BSF 0
-+#define CONFIG_H264_REDUNDANT_PPS_BSF 0
-+#define CONFIG_HAPQA_EXTRACT_BSF 0
-+#define CONFIG_HEVC_METADATA_BSF 0
-+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
-+#define CONFIG_IMX_DUMP_HEADER_BSF 0
-+#define CONFIG_MEDIA100_TO_MJPEGB_BSF 0
-+#define CONFIG_MJPEG2JPEG_BSF 0
-+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+#define CONFIG_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_MEDIA100_DECODER 0
-+#define CONFIG_MIMIC_DECODER 0
-+#define CONFIG_MJPEG_DECODER 0
-+#define CONFIG_MJPEGB_DECODER 0
-+#define CONFIG_MMVIDEO_DECODER 0
-+#define CONFIG_MOBICLIP_DECODER 0
-+#define CONFIG_MOTIONPIXELS_DECODER 0
-+#define CONFIG_MPEG1VIDEO_DECODER 0
-+#define CONFIG_MPEG2VIDEO_DECODER 0
-+#define CONFIG_MPEG4_DECODER 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_PHM_DECODER 0
-+#define CONFIG_PHOTOCD_DECODER 0
-+#define CONFIG_PICTOR_DECODER 0
-+#define CONFIG_PIXLET_DECODER 0
-+#define CONFIG_PNG_DECODER 0
-+#define CONFIG_PPM_DECODER 0
-+#define CONFIG_PRORES_DECODER 0
-+#define CONFIG_PROSUMER_DECODER 0
-+#define CONFIG_PSD_DECODER 0
-+#define CONFIG_PTX_DECODER 0
-+#define CONFIG_QDRAW_DECODER 0
-+#define CONFIG_QOI_DECODER 0
-+#define CONFIG_QPEG_DECODER 0
-+#define CONFIG_QTRLE_DECODER 0
-+#define CONFIG_R10K_DECODER 0
-+#define CONFIG_R210_DECODER 0
-+#define CONFIG_RASC_DECODER 0
-+#define CONFIG_RAWVIDEO_DECODER 0
-+#define CONFIG_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_VQC_DECODER 0
-+#define CONFIG_WBMP_DECODER 0
-+#define CONFIG_WEBP_DECODER 0
-+#define CONFIG_WCMV_DECODER 0
-+#define CONFIG_WRAPPED_AVFRAME_DECODER 0
-+#define CONFIG_WMV1_DECODER 0
-+#define CONFIG_WMV2_DECODER 0
-+#define CONFIG_WMV3_DECODER 0
-+#define CONFIG_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_APAC_DECODER 0
-+#define CONFIG_APE_DECODER 0
-+#define CONFIG_APTX_DECODER 0
-+#define CONFIG_APTX_HD_DECODER 0
-+#define CONFIG_ATRAC1_DECODER 0
-+#define CONFIG_ATRAC3_DECODER 0
-+#define CONFIG_ATRAC3AL_DECODER 0
-+#define CONFIG_ATRAC3P_DECODER 0
-+#define CONFIG_ATRAC3PAL_DECODER 0
-+#define CONFIG_ATRAC9_DECODER 0
-+#define CONFIG_BINKAUDIO_DCT_DECODER 0
-+#define CONFIG_BINKAUDIO_RDFT_DECODER 0
-+#define CONFIG_BMV_AUDIO_DECODER 0
-+#define CONFIG_BONK_DECODER 0
-+#define CONFIG_COOK_DECODER 0
-+#define CONFIG_DCA_DECODER 0
-+#define CONFIG_DFPWM_DECODER 0
-+#define CONFIG_DOLBY_E_DECODER 0
-+#define CONFIG_DSD_LSBF_DECODER 0
-+#define CONFIG_DSD_MSBF_DECODER 0
-+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0
-+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0
-+#define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
-+#define CONFIG_DST_DECODER 0
-+#define CONFIG_EAC3_DECODER 0
-+#define CONFIG_EVRC_DECODER 0
-+#define CONFIG_FASTAUDIO_DECODER 0
-+#define CONFIG_FFWAVESYNTH_DECODER 0
-+#define CONFIG_FLAC_DECODER 1
-+#define CONFIG_FTR_DECODER 0
-+#define CONFIG_G723_1_DECODER 0
-+#define CONFIG_G729_DECODER 0
-+#define CONFIG_GSM_DECODER 0
-+#define CONFIG_GSM_MS_DECODER 0
-+#define CONFIG_HCA_DECODER 0
-+#define CONFIG_HCOM_DECODER 0
-+#define CONFIG_HDR_DECODER 0
-+#define CONFIG_IAC_DECODER 0
-+#define CONFIG_ILBC_DECODER 0
-+#define CONFIG_IMC_DECODER 0
-+#define CONFIG_INTERPLAY_ACM_DECODER 0
-+#define CONFIG_MACE3_DECODER 0
-+#define CONFIG_MACE6_DECODER 0
-+#define CONFIG_METASOUND_DECODER 0
-+#define CONFIG_MISC4_DECODER 0
-+#define CONFIG_MLP_DECODER 0
-+#define CONFIG_MP1_DECODER 0
-+#define CONFIG_MP1FLOAT_DECODER 0
-+#define CONFIG_MP2_DECODER 0
-+#define CONFIG_MP2FLOAT_DECODER 0
-+#define CONFIG_MP3FLOAT_DECODER 0
-+#define CONFIG_MP3_DECODER 1
-+#define CONFIG_MP3ADUFLOAT_DECODER 0
-+#define CONFIG_MP3ADU_DECODER 0
-+#define CONFIG_MP3ON4FLOAT_DECODER 0
-+#define CONFIG_MP3ON4_DECODER 0
-+#define CONFIG_MPC7_DECODER 0
-+#define CONFIG_MPC8_DECODER 0
-+#define CONFIG_MSNSIREN_DECODER 0
-+#define CONFIG_NELLYMOSER_DECODER 0
-+#define CONFIG_ON2AVC_DECODER 0
-+#define CONFIG_OPUS_DECODER 0
-+#define CONFIG_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_CBD2_DPCM_DECODER 0
-+#define CONFIG_DERF_DPCM_DECODER 0
-+#define CONFIG_GREMLIN_DPCM_DECODER 0
-+#define CONFIG_INTERPLAY_DPCM_DECODER 0
-+#define CONFIG_ROQ_DPCM_DECODER 0
-+#define CONFIG_SDX2_DPCM_DECODER 0
-+#define CONFIG_SOL_DPCM_DECODER 0
-+#define CONFIG_XAN_DPCM_DECODER 0
-+#define CONFIG_WADY_DPCM_DECODER 0
-+#define CONFIG_ADPCM_4XM_DECODER 0
-+#define CONFIG_ADPCM_ADX_DECODER 0
-+#define CONFIG_ADPCM_AFC_DECODER 0
-+#define CONFIG_ADPCM_AGM_DECODER 0
-+#define CONFIG_ADPCM_AICA_DECODER 0
-+#define CONFIG_ADPCM_ARGO_DECODER 0
-+#define CONFIG_ADPCM_CT_DECODER 0
-+#define CONFIG_ADPCM_DTK_DECODER 0
-+#define CONFIG_ADPCM_EA_DECODER 0
-+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
-+#define CONFIG_ADPCM_EA_R1_DECODER 0
-+#define CONFIG_ADPCM_EA_R2_DECODER 0
-+#define CONFIG_ADPCM_EA_R3_DECODER 0
-+#define CONFIG_ADPCM_EA_XAS_DECODER 0
-+#define CONFIG_ADPCM_G722_DECODER 0
-+#define CONFIG_ADPCM_G726_DECODER 0
-+#define CONFIG_ADPCM_G726LE_DECODER 0
-+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0
-+#define CONFIG_ADPCM_IMA_AMV_DECODER 0
-+#define CONFIG_ADPCM_IMA_ALP_DECODER 0
-+#define CONFIG_ADPCM_IMA_APC_DECODER 0
-+#define CONFIG_ADPCM_IMA_APM_DECODER 0
-+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
-+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK3_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK4_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_ISS_DECODER 0
-+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
-+#define CONFIG_ADPCM_IMA_MTF_DECODER 0
-+#define CONFIG_ADPCM_IMA_OKI_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_DECODER 0
-+#define CONFIG_ADPCM_IMA_RAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_SSI_DECODER 0
-+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
-+#define CONFIG_ADPCM_IMA_WAV_DECODER 0
-+#define CONFIG_ADPCM_IMA_WS_DECODER 0
-+#define CONFIG_ADPCM_MS_DECODER 0
-+#define CONFIG_ADPCM_MTAF_DECODER 0
-+#define CONFIG_ADPCM_PSX_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_2_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_3_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_4_DECODER 0
-+#define CONFIG_ADPCM_SWF_DECODER 0
-+#define CONFIG_ADPCM_THP_DECODER 0
-+#define CONFIG_ADPCM_THP_LE_DECODER 0
-+#define CONFIG_ADPCM_VIMA_DECODER 0
-+#define CONFIG_ADPCM_XA_DECODER 0
-+#define CONFIG_ADPCM_XMD_DECODER 0
-+#define CONFIG_ADPCM_YAMAHA_DECODER 0
-+#define CONFIG_ADPCM_ZORK_DECODER 0
-+#define CONFIG_SSA_DECODER 0
-+#define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
-+#define CONFIG_DVBSUB_DECODER 0
-+#define CONFIG_DVDSUB_DECODER 0
-+#define CONFIG_JACOSUB_DECODER 0
-+#define CONFIG_MICRODVD_DECODER 0
-+#define CONFIG_MOVTEXT_DECODER 0
-+#define CONFIG_MPL2_DECODER 0
-+#define CONFIG_PGSSUB_DECODER 0
-+#define CONFIG_PJS_DECODER 0
-+#define CONFIG_REALTEXT_DECODER 0
-+#define CONFIG_SAMI_DECODER 0
-+#define CONFIG_SRT_DECODER 0
-+#define CONFIG_STL_DECODER 0
-+#define CONFIG_SUBRIP_DECODER 0
-+#define CONFIG_SUBVIEWER_DECODER 0
-+#define CONFIG_SUBVIEWER1_DECODER 0
-+#define CONFIG_TEXT_DECODER 0
-+#define CONFIG_VPLAYER_DECODER 0
-+#define CONFIG_WEBVTT_DECODER 0
-+#define CONFIG_XSUB_DECODER 0
-+#define CONFIG_AAC_AT_DECODER 0
-+#define CONFIG_AC3_AT_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
-+#define CONFIG_ALAC_AT_DECODER 0
-+#define CONFIG_AMR_NB_AT_DECODER 0
-+#define CONFIG_EAC3_AT_DECODER 0
-+#define CONFIG_GSM_MS_AT_DECODER 0
-+#define CONFIG_ILBC_AT_DECODER 0
-+#define CONFIG_MP1_AT_DECODER 0
-+#define CONFIG_MP2_AT_DECODER 0
-+#define CONFIG_MP3_AT_DECODER 0
-+#define CONFIG_PCM_ALAW_AT_DECODER 0
-+#define CONFIG_PCM_MULAW_AT_DECODER 0
-+#define CONFIG_QDMC_AT_DECODER 0
-+#define CONFIG_QDM2_AT_DECODER 0
-+#define CONFIG_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_MEDIACODEC_DECODER 0
-+#define CONFIG_AV1_QSV_DECODER 0
-+#define CONFIG_LIBOPENH264_DECODER 0
-+#define CONFIG_H264_CUVID_DECODER 0
-+#define CONFIG_HEVC_CUVID_DECODER 0
-+#define CONFIG_HEVC_MEDIACODEC_DECODER 0
-+#define CONFIG_MJPEG_CUVID_DECODER 0
-+#define CONFIG_MJPEG_QSV_DECODER 0
-+#define CONFIG_MPEG1_CUVID_DECODER 0
-+#define CONFIG_MPEG2_CUVID_DECODER 0
-+#define CONFIG_MPEG4_CUVID_DECODER 0
-+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-+#define CONFIG_VC1_CUVID_DECODER 0
-+#define CONFIG_VP8_CUVID_DECODER 0
-+#define CONFIG_VP8_MEDIACODEC_DECODER 0
-+#define CONFIG_VP8_QSV_DECODER 0
-+#define CONFIG_VP9_CUVID_DECODER 0
-+#define CONFIG_VP9_MEDIACODEC_DECODER 0
-+#define CONFIG_VP9_QSV_DECODER 0
-+#define CONFIG_VNULL_DECODER 0
-+#define CONFIG_ANULL_DECODER 0
-+#define CONFIG_A64MULTI_ENCODER 0
-+#define CONFIG_A64MULTI5_ENCODER 0
-+#define CONFIG_ALIAS_PIX_ENCODER 0
-+#define CONFIG_AMV_ENCODER 0
-+#define CONFIG_APNG_ENCODER 0
-+#define CONFIG_ASV1_ENCODER 0
-+#define CONFIG_ASV2_ENCODER 0
-+#define CONFIG_AVRP_ENCODER 0
-+#define CONFIG_AVUI_ENCODER 0
-+#define CONFIG_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_H264_MEDIACODEC_ENCODER 0
-+#define CONFIG_HAP_ENCODER 0
-+#define CONFIG_HUFFYUV_ENCODER 0
-+#define CONFIG_JPEG2000_ENCODER 0
-+#define CONFIG_JPEGLS_ENCODER 0
-+#define CONFIG_LJPEG_ENCODER 0
-+#define CONFIG_MAGICYUV_ENCODER 0
-+#define CONFIG_MJPEG_ENCODER 0
-+#define CONFIG_MPEG1VIDEO_ENCODER 0
-+#define CONFIG_MPEG2VIDEO_ENCODER 0
-+#define CONFIG_MPEG4_ENCODER 0
-+#define CONFIG_MSMPEG4V2_ENCODER 0
-+#define CONFIG_MSMPEG4V3_ENCODER 0
-+#define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_PAM_ENCODER 0
-+#define CONFIG_PBM_ENCODER 0
-+#define CONFIG_PCX_ENCODER 0
-+#define CONFIG_PFM_ENCODER 0
-+#define CONFIG_PGM_ENCODER 0
-+#define CONFIG_PGMYUV_ENCODER 0
-+#define CONFIG_PHM_ENCODER 0
-+#define CONFIG_PNG_ENCODER 0
-+#define CONFIG_PPM_ENCODER 0
-+#define CONFIG_PRORES_ENCODER 0
-+#define CONFIG_PRORES_AW_ENCODER 0
-+#define CONFIG_PRORES_KS_ENCODER 0
-+#define CONFIG_QOI_ENCODER 0
-+#define CONFIG_QTRLE_ENCODER 0
-+#define CONFIG_R10K_ENCODER 0
-+#define CONFIG_R210_ENCODER 0
-+#define CONFIG_RAWVIDEO_ENCODER 0
-+#define CONFIG_ROQ_ENCODER 0
-+#define CONFIG_RPZA_ENCODER 0
-+#define CONFIG_RV10_ENCODER 0
-+#define CONFIG_RV20_ENCODER 0
-+#define CONFIG_S302M_ENCODER 0
-+#define CONFIG_SGI_ENCODER 0
-+#define CONFIG_SMC_ENCODER 0
-+#define CONFIG_SNOW_ENCODER 0
-+#define CONFIG_SPEEDHQ_ENCODER 0
-+#define CONFIG_SUNRAST_ENCODER 0
-+#define CONFIG_SVQ1_ENCODER 0
-+#define CONFIG_TARGA_ENCODER 0
-+#define CONFIG_TIFF_ENCODER 0
-+#define CONFIG_UTVIDEO_ENCODER 0
-+#define CONFIG_V210_ENCODER 0
-+#define CONFIG_V308_ENCODER 0
-+#define CONFIG_V408_ENCODER 0
-+#define CONFIG_V410_ENCODER 0
-+#define CONFIG_VBN_ENCODER 0
-+#define CONFIG_VC2_ENCODER 0
-+#define CONFIG_WBMP_ENCODER 0
-+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
-+#define CONFIG_WMV1_ENCODER 0
-+#define CONFIG_WMV2_ENCODER 0
-+#define CONFIG_XBM_ENCODER 0
-+#define CONFIG_XFACE_ENCODER 0
-+#define CONFIG_XWD_ENCODER 0
-+#define CONFIG_Y41P_ENCODER 0
-+#define CONFIG_YUV4_ENCODER 0
-+#define CONFIG_ZLIB_ENCODER 0
-+#define CONFIG_ZMBV_ENCODER 0
-+#define CONFIG_AAC_ENCODER 0
-+#define CONFIG_AC3_ENCODER 0
-+#define CONFIG_AC3_FIXED_ENCODER 0
-+#define CONFIG_ALAC_ENCODER 0
-+#define CONFIG_APTX_ENCODER 0
-+#define CONFIG_APTX_HD_ENCODER 0
-+#define CONFIG_DCA_ENCODER 0
-+#define CONFIG_DFPWM_ENCODER 0
-+#define CONFIG_EAC3_ENCODER 0
-+#define CONFIG_FLAC_ENCODER 0
-+#define CONFIG_G723_1_ENCODER 0
-+#define CONFIG_HDR_ENCODER 0
-+#define CONFIG_MLP_ENCODER 0
-+#define CONFIG_MP2_ENCODER 0
-+#define CONFIG_MP2FIXED_ENCODER 0
-+#define CONFIG_NELLYMOSER_ENCODER 0
-+#define CONFIG_OPUS_ENCODER 0
-+#define CONFIG_RA_144_ENCODER 0
-+#define CONFIG_SBC_ENCODER 0
-+#define CONFIG_SONIC_ENCODER 0
-+#define CONFIG_SONIC_LS_ENCODER 0
-+#define CONFIG_TRUEHD_ENCODER 0
-+#define CONFIG_TTA_ENCODER 0
-+#define CONFIG_VORBIS_ENCODER 0
-+#define CONFIG_WAVPACK_ENCODER 0
-+#define CONFIG_WMAV1_ENCODER 0
-+#define CONFIG_WMAV2_ENCODER 0
-+#define CONFIG_PCM_ALAW_ENCODER 0
-+#define CONFIG_PCM_BLURAY_ENCODER 0
-+#define CONFIG_PCM_DVD_ENCODER 0
-+#define CONFIG_PCM_F32BE_ENCODER 0
-+#define CONFIG_PCM_F32LE_ENCODER 0
-+#define CONFIG_PCM_F64BE_ENCODER 0
-+#define CONFIG_PCM_F64LE_ENCODER 0
-+#define CONFIG_PCM_MULAW_ENCODER 0
-+#define CONFIG_PCM_S8_ENCODER 0
-+#define CONFIG_PCM_S8_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16BE_ENCODER 0
-+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16LE_ENCODER 0
-+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S24BE_ENCODER 0
-+#define CONFIG_PCM_S24DAUD_ENCODER 0
-+#define CONFIG_PCM_S24LE_ENCODER 0
-+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S32BE_ENCODER 0
-+#define CONFIG_PCM_S32LE_ENCODER 0
-+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S64BE_ENCODER 0
-+#define CONFIG_PCM_S64LE_ENCODER 0
-+#define CONFIG_PCM_U8_ENCODER 0
-+#define CONFIG_PCM_U16BE_ENCODER 0
-+#define CONFIG_PCM_U16LE_ENCODER 0
-+#define CONFIG_PCM_U24BE_ENCODER 0
-+#define CONFIG_PCM_U24LE_ENCODER 0
-+#define CONFIG_PCM_U32BE_ENCODER 0
-+#define CONFIG_PCM_U32LE_ENCODER 0
-+#define CONFIG_PCM_VIDC_ENCODER 0
-+#define CONFIG_ROQ_DPCM_ENCODER 0
-+#define CONFIG_ADPCM_ADX_ENCODER 0
-+#define CONFIG_ADPCM_ARGO_ENCODER 0
-+#define CONFIG_ADPCM_G722_ENCODER 0
-+#define CONFIG_ADPCM_G726_ENCODER 0
-+#define CONFIG_ADPCM_G726LE_ENCODER 0
-+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0
-+#define CONFIG_ADPCM_IMA_APM_ENCODER 0
-+#define CONFIG_ADPCM_IMA_QT_ENCODER 0
-+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WS_ENCODER 0
-+#define CONFIG_ADPCM_MS_ENCODER 0
-+#define CONFIG_ADPCM_SWF_ENCODER 0
-+#define CONFIG_ADPCM_YAMAHA_ENCODER 0
-+#define CONFIG_SSA_ENCODER 0
-+#define CONFIG_ASS_ENCODER 0
-+#define CONFIG_DVBSUB_ENCODER 0
-+#define CONFIG_DVDSUB_ENCODER 0
-+#define CONFIG_MOVTEXT_ENCODER 0
-+#define CONFIG_SRT_ENCODER 0
-+#define CONFIG_SUBRIP_ENCODER 0
-+#define CONFIG_TEXT_ENCODER 0
-+#define CONFIG_TTML_ENCODER 0
-+#define CONFIG_WEBVTT_ENCODER 0
-+#define CONFIG_XSUB_ENCODER 0
-+#define CONFIG_AAC_AT_ENCODER 0
-+#define CONFIG_ALAC_AT_ENCODER 0
-+#define CONFIG_ILBC_AT_ENCODER 0
-+#define CONFIG_PCM_ALAW_AT_ENCODER 0
-+#define CONFIG_PCM_MULAW_AT_ENCODER 0
-+#define CONFIG_LIBAOM_AV1_ENCODER 0
-+#define CONFIG_LIBCODEC2_ENCODER 0
-+#define CONFIG_LIBFDK_AAC_ENCODER 0
-+#define CONFIG_LIBGSM_ENCODER 0
-+#define CONFIG_LIBGSM_MS_ENCODER 0
-+#define CONFIG_LIBILBC_ENCODER 0
-+#define CONFIG_LIBJXL_ENCODER 0
-+#define CONFIG_LIBMP3LAME_ENCODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+#define CONFIG_LIBOPENJPEG_ENCODER 0
-+#define CONFIG_LIBOPUS_ENCODER 0
-+#define CONFIG_LIBRAV1E_ENCODER 0
-+#define CONFIG_LIBSHINE_ENCODER 0
-+#define CONFIG_LIBSPEEX_ENCODER 0
-+#define CONFIG_LIBSVTAV1_ENCODER 0
-+#define CONFIG_LIBTHEORA_ENCODER 0
-+#define CONFIG_LIBTWOLAME_ENCODER 0
-+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
-+#define CONFIG_LIBVORBIS_ENCODER 0
-+#define CONFIG_LIBVPX_VP8_ENCODER 0
-+#define CONFIG_LIBVPX_VP9_ENCODER 0
-+#define CONFIG_LIBWEBP_ANIM_ENCODER 0
-+#define CONFIG_LIBWEBP_ENCODER 0
-+#define CONFIG_LIBX262_ENCODER 0
-+#define CONFIG_LIBX264_ENCODER 0
-+#define CONFIG_LIBX264RGB_ENCODER 0
-+#define CONFIG_LIBX265_ENCODER 0
-+#define CONFIG_LIBXAVS_ENCODER 0
-+#define CONFIG_LIBXAVS2_ENCODER 0
-+#define CONFIG_LIBXVID_ENCODER 0
-+#define CONFIG_AAC_MF_ENCODER 0
-+#define CONFIG_AC3_MF_ENCODER 0
-+#define CONFIG_H263_V4L2M2M_ENCODER 0
-+#define CONFIG_AV1_NVENC_ENCODER 0
-+#define CONFIG_AV1_QSV_ENCODER 0
-+#define CONFIG_AV1_AMF_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
-+#define CONFIG_H264_AMF_ENCODER 0
-+#define CONFIG_H264_MF_ENCODER 0
-+#define CONFIG_H264_NVENC_ENCODER 0
-+#define CONFIG_H264_OMX_ENCODER 0
-+#define CONFIG_H264_QSV_ENCODER 0
-+#define CONFIG_H264_V4L2M2M_ENCODER 0
-+#define CONFIG_H264_VAAPI_ENCODER 0
-+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_HEVC_AMF_ENCODER 0
-+#define CONFIG_HEVC_MEDIACODEC_ENCODER 0
-+#define CONFIG_HEVC_MF_ENCODER 0
-+#define CONFIG_HEVC_NVENC_ENCODER 0
-+#define CONFIG_HEVC_QSV_ENCODER 0
-+#define CONFIG_HEVC_V4L2M2M_ENCODER 0
-+#define CONFIG_HEVC_VAAPI_ENCODER 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_LIBKVAZAAR_ENCODER 0
-+#define CONFIG_MJPEG_QSV_ENCODER 0
-+#define CONFIG_MJPEG_VAAPI_ENCODER 0
-+#define CONFIG_MP3_MF_ENCODER 0
-+#define CONFIG_MPEG2_QSV_ENCODER 0
-+#define CONFIG_MPEG2_VAAPI_ENCODER 0
-+#define CONFIG_MPEG4_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_VNULL_ENCODER 0
-+#define CONFIG_ANULL_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_AV1_VDPAU_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_FTR_PARSER 0
-+#define CONFIG_G723_1_PARSER 0
-+#define CONFIG_G729_PARSER 0
-+#define CONFIG_GIF_PARSER 0
-+#define CONFIG_GSM_PARSER 0
-+#define CONFIG_H261_PARSER 0
-+#define CONFIG_H263_PARSER 0
-+#define CONFIG_H264_PARSER 1
-+#define CONFIG_HEVC_PARSER 0
-+#define CONFIG_HDR_PARSER 0
-+#define CONFIG_IPU_PARSER 0
-+#define CONFIG_JPEG2000_PARSER 0
-+#define CONFIG_MISC4_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_QOI_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_XWD_PARSER 0
-+#define CONFIG_ALSA_INDEV 0
-+#define CONFIG_ANDROID_CAMERA_INDEV 0
-+#define CONFIG_AVFOUNDATION_INDEV 0
-+#define CONFIG_BKTR_INDEV 0
-+#define CONFIG_DECKLINK_INDEV 0
-+#define CONFIG_DSHOW_INDEV 0
-+#define CONFIG_FBDEV_INDEV 0
-+#define CONFIG_GDIGRAB_INDEV 0
-+#define CONFIG_IEC61883_INDEV 0
-+#define CONFIG_JACK_INDEV 0
-+#define CONFIG_KMSGRAB_INDEV 0
-+#define CONFIG_LAVFI_INDEV 0
-+#define CONFIG_OPENAL_INDEV 0
-+#define CONFIG_OSS_INDEV 0
-+#define CONFIG_PULSE_INDEV 0
-+#define CONFIG_SNDIO_INDEV 0
-+#define CONFIG_V4L2_INDEV 0
-+#define CONFIG_VFWCAP_INDEV 0
-+#define CONFIG_XCBGRAB_INDEV 0
-+#define CONFIG_LIBCDIO_INDEV 0
-+#define CONFIG_LIBDC1394_INDEV 0
-+#define CONFIG_ALSA_OUTDEV 0
-+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
-+#define CONFIG_CACA_OUTDEV 0
-+#define CONFIG_DECKLINK_OUTDEV 0
-+#define CONFIG_FBDEV_OUTDEV 0
-+#define CONFIG_OPENGL_OUTDEV 0
-+#define CONFIG_OSS_OUTDEV 0
-+#define CONFIG_PULSE_OUTDEV 0
-+#define CONFIG_SDL2_OUTDEV 0
-+#define CONFIG_SNDIO_OUTDEV 0
-+#define CONFIG_V4L2_OUTDEV 0
-+#define CONFIG_XV_OUTDEV 0
-+#define CONFIG_ABENCH_FILTER 0
-+#define CONFIG_ACOMPRESSOR_FILTER 0
-+#define CONFIG_ACONTRAST_FILTER 0
-+#define CONFIG_ACOPY_FILTER 0
-+#define CONFIG_ACUE_FILTER 0
-+#define CONFIG_ACROSSFADE_FILTER 0
-+#define CONFIG_ACROSSOVER_FILTER 0
-+#define CONFIG_ACRUSHER_FILTER 0
-+#define CONFIG_ADECLICK_FILTER 0
-+#define CONFIG_ADECLIP_FILTER 0
-+#define CONFIG_ADECORRELATE_FILTER 0
-+#define CONFIG_ADELAY_FILTER 0
-+#define CONFIG_ADENORM_FILTER 0
-+#define CONFIG_ADERIVATIVE_FILTER 0
-+#define CONFIG_ADRC_FILTER 0
-+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
-+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
-+#define CONFIG_AECHO_FILTER 0
-+#define CONFIG_AEMPHASIS_FILTER 0
-+#define CONFIG_AEVAL_FILTER 0
-+#define CONFIG_AEXCITER_FILTER 0
-+#define CONFIG_AFADE_FILTER 0
-+#define CONFIG_AFFTDN_FILTER 0
-+#define CONFIG_AFFTFILT_FILTER 0
-+#define CONFIG_AFIR_FILTER 0
-+#define CONFIG_AFORMAT_FILTER 0
-+#define CONFIG_AFREQSHIFT_FILTER 0
-+#define CONFIG_AFWTDN_FILTER 0
-+#define CONFIG_AGATE_FILTER 0
-+#define CONFIG_AIIR_FILTER 0
-+#define CONFIG_AINTEGRAL_FILTER 0
-+#define CONFIG_AINTERLEAVE_FILTER 0
-+#define CONFIG_ALATENCY_FILTER 0
-+#define CONFIG_ALIMITER_FILTER 0
-+#define CONFIG_ALLPASS_FILTER 0
-+#define CONFIG_ALOOP_FILTER 0
-+#define CONFIG_AMERGE_FILTER 0
-+#define CONFIG_AMETADATA_FILTER 0
-+#define CONFIG_AMIX_FILTER 0
-+#define CONFIG_AMULTIPLY_FILTER 0
-+#define CONFIG_ANEQUALIZER_FILTER 0
-+#define CONFIG_ANLMDN_FILTER 0
-+#define CONFIG_ANLMF_FILTER 0
-+#define CONFIG_ANLMS_FILTER 0
-+#define CONFIG_ANULL_FILTER 0
-+#define CONFIG_APAD_FILTER 0
-+#define CONFIG_APERMS_FILTER 0
-+#define CONFIG_APHASER_FILTER 0
-+#define CONFIG_APHASESHIFT_FILTER 0
-+#define CONFIG_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_TILTSHELF_FILTER 0
-+#define CONFIG_TREBLE_FILTER 0
-+#define CONFIG_TREMOLO_FILTER 0
-+#define CONFIG_VIBRATO_FILTER 0
-+#define CONFIG_VIRTUALBASS_FILTER 0
-+#define CONFIG_VOLUME_FILTER 0
-+#define CONFIG_VOLUMEDETECT_FILTER 0
-+#define CONFIG_AEVALSRC_FILTER 0
-+#define CONFIG_AFDELAYSRC_FILTER 0
-+#define CONFIG_AFIRSRC_FILTER 0
-+#define CONFIG_ANOISESRC_FILTER 0
-+#define CONFIG_ANULLSRC_FILTER 0
-+#define CONFIG_FLITE_FILTER 0
-+#define CONFIG_HILBERT_FILTER 0
-+#define CONFIG_SINC_FILTER 0
-+#define CONFIG_SINE_FILTER 0
-+#define CONFIG_ANULLSINK_FILTER 0
-+#define CONFIG_ADDROI_FILTER 0
-+#define CONFIG_ALPHAEXTRACT_FILTER 0
-+#define CONFIG_ALPHAMERGE_FILTER 0
-+#define CONFIG_AMPLIFY_FILTER 0
-+#define CONFIG_ASS_FILTER 0
-+#define CONFIG_ATADENOISE_FILTER 0
-+#define CONFIG_AVGBLUR_FILTER 0
-+#define CONFIG_AVGBLUR_OPENCL_FILTER 0
-+#define CONFIG_AVGBLUR_VULKAN_FILTER 0
-+#define CONFIG_BACKGROUNDKEY_FILTER 0
-+#define CONFIG_BBOX_FILTER 0
-+#define CONFIG_BENCH_FILTER 0
-+#define CONFIG_BILATERAL_FILTER 0
-+#define CONFIG_BILATERAL_CUDA_FILTER 0
-+#define CONFIG_BITPLANENOISE_FILTER 0
-+#define CONFIG_BLACKDETECT_FILTER 0
-+#define CONFIG_BLACKFRAME_FILTER 0
-+#define CONFIG_BLEND_FILTER 0
-+#define CONFIG_BLEND_VULKAN_FILTER 0
-+#define CONFIG_BLOCKDETECT_FILTER 0
-+#define CONFIG_BLURDETECT_FILTER 0
-+#define CONFIG_BM3D_FILTER 0
-+#define CONFIG_BOXBLUR_FILTER 0
-+#define CONFIG_BOXBLUR_OPENCL_FILTER 0
-+#define CONFIG_BWDIF_FILTER 0
-+#define CONFIG_CAS_FILTER 0
-+#define CONFIG_CHROMABER_VULKAN_FILTER 0
-+#define CONFIG_CHROMAHOLD_FILTER 0
-+#define CONFIG_CHROMAKEY_FILTER 0
-+#define CONFIG_CHROMAKEY_CUDA_FILTER 0
-+#define CONFIG_CHROMANR_FILTER 0
-+#define CONFIG_CHROMASHIFT_FILTER 0
-+#define CONFIG_CIESCOPE_FILTER 0
-+#define CONFIG_CODECVIEW_FILTER 0
-+#define CONFIG_COLORBALANCE_FILTER 0
-+#define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORCONTRAST_FILTER 0
-+#define CONFIG_COLORCORRECT_FILTER 0
-+#define CONFIG_COLORIZE_FILTER 0
-+#define CONFIG_COLORKEY_FILTER 0
-+#define CONFIG_COLORKEY_OPENCL_FILTER 0
-+#define CONFIG_COLORHOLD_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
-+#define CONFIG_COLORMAP_FILTER 0
-+#define CONFIG_COLORMATRIX_FILTER 0
-+#define CONFIG_COLORSPACE_FILTER 0
-+#define CONFIG_COLORSPACE_CUDA_FILTER 0
-+#define CONFIG_COLORTEMPERATURE_FILTER 0
-+#define CONFIG_CONVOLUTION_FILTER 0
-+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
-+#define CONFIG_CONVOLVE_FILTER 0
-+#define CONFIG_COPY_FILTER 0
-+#define CONFIG_COREIMAGE_FILTER 0
-+#define CONFIG_CORR_FILTER 0
-+#define CONFIG_COVER_RECT_FILTER 0
-+#define CONFIG_CROP_FILTER 0
-+#define CONFIG_CROPDETECT_FILTER 0
-+#define CONFIG_CUE_FILTER 0
-+#define CONFIG_CURVES_FILTER 0
-+#define CONFIG_DATASCOPE_FILTER 0
-+#define CONFIG_DBLUR_FILTER 0
-+#define CONFIG_DCTDNOIZ_FILTER 0
-+#define CONFIG_DEBAND_FILTER 0
-+#define CONFIG_DEBLOCK_FILTER 0
-+#define CONFIG_DECIMATE_FILTER 0
-+#define CONFIG_DECONVOLVE_FILTER 0
-+#define CONFIG_DEDOT_FILTER 0
-+#define CONFIG_DEFLATE_FILTER 0
-+#define CONFIG_DEFLICKER_FILTER 0
-+#define CONFIG_DEINTERLACE_QSV_FILTER 0
-+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
-+#define CONFIG_DEJUDDER_FILTER 0
-+#define CONFIG_DELOGO_FILTER 0
-+#define CONFIG_DENOISE_VAAPI_FILTER 0
-+#define CONFIG_DERAIN_FILTER 0
-+#define CONFIG_DESHAKE_FILTER 0
-+#define CONFIG_DESHAKE_OPENCL_FILTER 0
-+#define CONFIG_DESPILL_FILTER 0
-+#define CONFIG_DETELECINE_FILTER 0
-+#define CONFIG_DILATION_FILTER 0
-+#define CONFIG_DILATION_OPENCL_FILTER 0
-+#define CONFIG_DISPLACE_FILTER 0
-+#define CONFIG_DNN_CLASSIFY_FILTER 0
-+#define CONFIG_DNN_DETECT_FILTER 0
-+#define CONFIG_DNN_PROCESSING_FILTER 0
-+#define CONFIG_DOUBLEWEAVE_FILTER 0
-+#define CONFIG_DRAWBOX_FILTER 0
-+#define CONFIG_DRAWGRAPH_FILTER 0
-+#define CONFIG_DRAWGRID_FILTER 0
-+#define CONFIG_DRAWTEXT_FILTER 0
-+#define CONFIG_EDGEDETECT_FILTER 0
-+#define CONFIG_ELBG_FILTER 0
-+#define CONFIG_ENTROPY_FILTER 0
-+#define CONFIG_EPX_FILTER 0
-+#define CONFIG_EQ_FILTER 0
-+#define CONFIG_EROSION_FILTER 0
-+#define CONFIG_EROSION_OPENCL_FILTER 0
-+#define CONFIG_ESTDIF_FILTER 0
-+#define CONFIG_EXPOSURE_FILTER 0
-+#define CONFIG_EXTRACTPLANES_FILTER 0
-+#define CONFIG_FADE_FILTER 0
-+#define CONFIG_FEEDBACK_FILTER 0
-+#define CONFIG_FFTDNOIZ_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
-+#define CONFIG_FIELD_FILTER 0
-+#define CONFIG_FIELDHINT_FILTER 0
-+#define CONFIG_FIELDMATCH_FILTER 0
-+#define CONFIG_FIELDORDER_FILTER 0
-+#define CONFIG_FILLBORDERS_FILTER 0
-+#define CONFIG_FIND_RECT_FILTER 0
-+#define CONFIG_FLIP_VULKAN_FILTER 0
-+#define CONFIG_FLOODFILL_FILTER 0
-+#define CONFIG_FORMAT_FILTER 0
-+#define CONFIG_FPS_FILTER 0
-+#define CONFIG_FRAMEPACK_FILTER 0
-+#define CONFIG_FRAMERATE_FILTER 0
-+#define CONFIG_FRAMESTEP_FILTER 0
-+#define CONFIG_FREEZEDETECT_FILTER 0
-+#define CONFIG_FREEZEFRAMES_FILTER 0
-+#define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
-+#define CONFIG_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_REMAP_OPENCL_FILTER 0
-+#define CONFIG_REMOVEGRAIN_FILTER 0
-+#define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
-+#define CONFIG_REVERSE_FILTER 0
-+#define CONFIG_RGBASHIFT_FILTER 0
-+#define CONFIG_ROBERTS_FILTER 0
-+#define CONFIG_ROBERTS_OPENCL_FILTER 0
-+#define CONFIG_ROTATE_FILTER 0
-+#define CONFIG_SAB_FILTER 0
-+#define CONFIG_SCALE_FILTER 0
-+#define CONFIG_SCALE_CUDA_FILTER 0
-+#define CONFIG_SCALE_NPP_FILTER 0
-+#define CONFIG_SCALE_QSV_FILTER 0
-+#define CONFIG_SCALE_VAAPI_FILTER 0
-+#define CONFIG_SCALE_VULKAN_FILTER 0
-+#define CONFIG_SCALE2REF_FILTER 0
-+#define CONFIG_SCALE2REF_NPP_FILTER 0
-+#define CONFIG_SCDET_FILTER 0
-+#define CONFIG_SCHARR_FILTER 0
-+#define CONFIG_SCROLL_FILTER 0
-+#define CONFIG_SEGMENT_FILTER 0
-+#define CONFIG_SELECT_FILTER 0
-+#define CONFIG_SELECTIVECOLOR_FILTER 0
-+#define CONFIG_SENDCMD_FILTER 0
-+#define CONFIG_SEPARATEFIELDS_FILTER 0
-+#define CONFIG_SETDAR_FILTER 0
-+#define CONFIG_SETFIELD_FILTER 0
-+#define CONFIG_SETPARAMS_FILTER 0
-+#define CONFIG_SETPTS_FILTER 0
-+#define CONFIG_SETRANGE_FILTER 0
-+#define CONFIG_SETSAR_FILTER 0
-+#define CONFIG_SETTB_FILTER 0
-+#define CONFIG_SHARPEN_NPP_FILTER 0
-+#define CONFIG_SHARPNESS_VAAPI_FILTER 0
-+#define CONFIG_SHEAR_FILTER 0
-+#define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
-+#define CONFIG_SHUFFLEFRAMES_FILTER 0
-+#define CONFIG_SHUFFLEPIXELS_FILTER 0
-+#define CONFIG_SHUFFLEPLANES_FILTER 0
-+#define CONFIG_SIDEDATA_FILTER 0
-+#define CONFIG_SIGNALSTATS_FILTER 0
-+#define CONFIG_SIGNATURE_FILTER 0
-+#define CONFIG_SITI_FILTER 0
-+#define CONFIG_SMARTBLUR_FILTER 0
-+#define CONFIG_SOBEL_FILTER 0
-+#define CONFIG_SOBEL_OPENCL_FILTER 0
-+#define CONFIG_SPLIT_FILTER 0
-+#define CONFIG_SPP_FILTER 0
-+#define CONFIG_SR_FILTER 0
-+#define CONFIG_SSIM_FILTER 0
-+#define CONFIG_SSIM360_FILTER 0
-+#define CONFIG_STEREO3D_FILTER 0
-+#define CONFIG_STREAMSELECT_FILTER 0
-+#define CONFIG_SUBTITLES_FILTER 0
-+#define CONFIG_SUPER2XSAI_FILTER 0
-+#define CONFIG_SWAPRECT_FILTER 0
-+#define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
-+#define CONFIG_TELECINE_FILTER 0
-+#define CONFIG_THISTOGRAM_FILTER 0
-+#define CONFIG_THRESHOLD_FILTER 0
-+#define CONFIG_THUMBNAIL_FILTER 0
-+#define CONFIG_THUMBNAIL_CUDA_FILTER 0
-+#define CONFIG_TILE_FILTER 0
-+#define CONFIG_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_HSTACK_VAAPI_FILTER 0
-+#define CONFIG_VSTACK_VAAPI_FILTER 0
-+#define CONFIG_XSTACK_VAAPI_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_DDAGRAB_FILTER 0
-+#define CONFIG_FREI0R_SRC_FILTER 0
-+#define CONFIG_GRADIENTS_FILTER 0
-+#define CONFIG_HALDCLUTSRC_FILTER 0
-+#define CONFIG_LIFE_FILTER 0
-+#define CONFIG_MANDELBROT_FILTER 0
-+#define CONFIG_MPTESTSRC_FILTER 0
-+#define CONFIG_NULLSRC_FILTER 0
-+#define CONFIG_OPENCLSRC_FILTER 0
-+#define CONFIG_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_A3DSCOPE_FILTER 0
-+#define CONFIG_ABITSCOPE_FILTER 0
-+#define CONFIG_ADRAWGRAPH_FILTER 0
-+#define CONFIG_AGRAPHMONITOR_FILTER 0
-+#define CONFIG_AHISTOGRAM_FILTER 0
-+#define CONFIG_APHASEMETER_FILTER 0
-+#define CONFIG_AVECTORSCOPE_FILTER 0
-+#define CONFIG_CONCAT_FILTER 0
-+#define CONFIG_SHOWCQT_FILTER 0
-+#define CONFIG_SHOWCWT_FILTER 0
-+#define CONFIG_SHOWFREQS_FILTER 0
-+#define CONFIG_SHOWSPATIAL_FILTER 0
-+#define CONFIG_SHOWSPECTRUM_FILTER 0
-+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0
-+#define CONFIG_SHOWVOLUME_FILTER 0
-+#define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
-+#define CONFIG_SPECTRUMSYNTH_FILTER 0
-+#define CONFIG_AVSYNCTEST_FILTER 0
-+#define CONFIG_AMOVIE_FILTER 0
-+#define CONFIG_MOVIE_FILTER 0
-+#define CONFIG_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_APAC_DEMUXER 0
-+#define CONFIG_APC_DEMUXER 0
-+#define CONFIG_APE_DEMUXER 0
-+#define CONFIG_APM_DEMUXER 0
-+#define CONFIG_APNG_DEMUXER 0
-+#define CONFIG_APTX_DEMUXER 0
-+#define CONFIG_APTX_HD_DEMUXER 0
-+#define CONFIG_AQTITLE_DEMUXER 0
-+#define CONFIG_ARGO_ASF_DEMUXER 0
-+#define CONFIG_ARGO_BRP_DEMUXER 0
-+#define CONFIG_ARGO_CVG_DEMUXER 0
-+#define CONFIG_ASF_DEMUXER 0
-+#define CONFIG_ASF_O_DEMUXER 0
-+#define CONFIG_ASS_DEMUXER 0
-+#define CONFIG_AST_DEMUXER 0
-+#define CONFIG_AU_DEMUXER 0
-+#define CONFIG_AV1_DEMUXER 0
-+#define CONFIG_AVI_DEMUXER 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_BONK_DEMUXER 0
-+#define CONFIG_C93_DEMUXER 0
-+#define CONFIG_CAF_DEMUXER 0
-+#define CONFIG_CAVSVIDEO_DEMUXER 0
-+#define CONFIG_CDG_DEMUXER 0
-+#define CONFIG_CDXL_DEMUXER 0
-+#define CONFIG_CINE_DEMUXER 0
-+#define CONFIG_CODEC2_DEMUXER 0
-+#define CONFIG_CODEC2RAW_DEMUXER 0
-+#define CONFIG_CONCAT_DEMUXER 0
-+#define CONFIG_DASH_DEMUXER 0
-+#define CONFIG_DATA_DEMUXER 0
-+#define CONFIG_DAUD_DEMUXER 0
-+#define CONFIG_DCSTR_DEMUXER 0
-+#define CONFIG_DERF_DEMUXER 0
-+#define CONFIG_DFA_DEMUXER 0
-+#define CONFIG_DFPWM_DEMUXER 0
-+#define CONFIG_DHAV_DEMUXER 0
-+#define CONFIG_DIRAC_DEMUXER 0
-+#define CONFIG_DNXHD_DEMUXER 0
-+#define CONFIG_DSF_DEMUXER 0
-+#define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
-+#define CONFIG_DTS_DEMUXER 0
-+#define CONFIG_DTSHD_DEMUXER 0
-+#define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
-+#define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_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_LAF_DEMUXER 0
-+#define CONFIG_LMLM4_DEMUXER 0
-+#define CONFIG_LOAS_DEMUXER 0
-+#define CONFIG_LUODAT_DEMUXER 0
-+#define CONFIG_LRC_DEMUXER 0
-+#define CONFIG_LVF_DEMUXER 0
-+#define CONFIG_LXF_DEMUXER 0
-+#define CONFIG_M4V_DEMUXER 0
-+#define CONFIG_MCA_DEMUXER 0
-+#define CONFIG_MCC_DEMUXER 0
-+#define CONFIG_MATROSKA_DEMUXER 1
-+#define CONFIG_MGSTS_DEMUXER 0
-+#define CONFIG_MICRODVD_DEMUXER 0
-+#define CONFIG_MJPEG_DEMUXER 0
-+#define CONFIG_MJPEG_2000_DEMUXER 0
-+#define CONFIG_MLP_DEMUXER 0
-+#define CONFIG_MLV_DEMUXER 0
-+#define CONFIG_MM_DEMUXER 0
-+#define CONFIG_MMF_DEMUXER 0
-+#define CONFIG_MODS_DEMUXER 0
-+#define CONFIG_MOFLEX_DEMUXER 0
-+#define CONFIG_MOV_DEMUXER 1
-+#define CONFIG_MP3_DEMUXER 1
-+#define CONFIG_MPC_DEMUXER 0
-+#define CONFIG_MPC8_DEMUXER 0
-+#define CONFIG_MPEGPS_DEMUXER 0
-+#define CONFIG_MPEGTS_DEMUXER 0
-+#define CONFIG_MPEGTSRAW_DEMUXER 0
-+#define CONFIG_MPEGVIDEO_DEMUXER 0
-+#define CONFIG_MPJPEG_DEMUXER 0
-+#define CONFIG_MPL2_DEMUXER 0
-+#define CONFIG_MPSUB_DEMUXER 0
-+#define CONFIG_MSF_DEMUXER 0
-+#define CONFIG_MSNWC_TCP_DEMUXER 0
-+#define CONFIG_MSP_DEMUXER 0
-+#define CONFIG_MTAF_DEMUXER 0
-+#define CONFIG_MTV_DEMUXER 0
-+#define CONFIG_MUSX_DEMUXER 0
-+#define CONFIG_MV_DEMUXER 0
-+#define CONFIG_MVI_DEMUXER 0
-+#define CONFIG_MXF_DEMUXER 0
-+#define CONFIG_MXG_DEMUXER 0
-+#define CONFIG_NC_DEMUXER 0
-+#define CONFIG_NISTSPHERE_DEMUXER 0
-+#define CONFIG_NSP_DEMUXER 0
-+#define CONFIG_NSV_DEMUXER 0
-+#define CONFIG_NUT_DEMUXER 0
-+#define CONFIG_NUV_DEMUXER 0
-+#define CONFIG_OBU_DEMUXER 0
-+#define CONFIG_OGG_DEMUXER 1
-+#define CONFIG_OMA_DEMUXER 0
-+#define CONFIG_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_WADY_DEMUXER 0
-+#define CONFIG_WAV_DEMUXER 1
-+#define CONFIG_WC3_DEMUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
-+#define CONFIG_WEBVTT_DEMUXER 0
-+#define CONFIG_WSAUD_DEMUXER 0
-+#define CONFIG_WSD_DEMUXER 0
-+#define CONFIG_WSVQA_DEMUXER 0
-+#define CONFIG_WTV_DEMUXER 0
-+#define CONFIG_WVE_DEMUXER 0
-+#define CONFIG_WV_DEMUXER 0
-+#define CONFIG_XA_DEMUXER 0
-+#define CONFIG_XBIN_DEMUXER 0
-+#define CONFIG_XMD_DEMUXER 0
-+#define CONFIG_XMV_DEMUXER 0
-+#define CONFIG_XVAG_DEMUXER 0
-+#define CONFIG_XWMA_DEMUXER 0
-+#define CONFIG_YOP_DEMUXER 0
-+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0
-+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_HDR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGXL_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PFM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QOI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_VBN_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
-+#define CONFIG_LIBGME_DEMUXER 0
-+#define CONFIG_LIBMODPLUG_DEMUXER 0
-+#define CONFIG_LIBOPENMPT_DEMUXER 0
-+#define CONFIG_VAPOURSYNTH_DEMUXER 0
-+#define CONFIG_A64_MUXER 0
-+#define CONFIG_AC3_MUXER 0
-+#define CONFIG_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_FD_PROTOCOL 0
-+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
-+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
-+#define CONFIG_FILE_PROTOCOL 0
-+#define CONFIG_FTP_PROTOCOL 0
-+#define CONFIG_GOPHER_PROTOCOL 0
-+#define CONFIG_GOPHERS_PROTOCOL 0
-+#define CONFIG_HLS_PROTOCOL 0
-+#define CONFIG_HTTP_PROTOCOL 0
-+#define CONFIG_HTTPPROXY_PROTOCOL 0
-+#define CONFIG_HTTPS_PROTOCOL 0
-+#define CONFIG_ICECAST_PROTOCOL 0
-+#define CONFIG_MMSH_PROTOCOL 0
-+#define CONFIG_MMST_PROTOCOL 0
-+#define CONFIG_MD5_PROTOCOL 0
-+#define CONFIG_PIPE_PROTOCOL 0
-+#define CONFIG_PROMPEG_PROTOCOL 0
-+#define CONFIG_RTMP_PROTOCOL 0
-+#define CONFIG_RTMPE_PROTOCOL 0
-+#define CONFIG_RTMPS_PROTOCOL 0
-+#define CONFIG_RTMPT_PROTOCOL 0
-+#define CONFIG_RTMPTE_PROTOCOL 0
-+#define CONFIG_RTMPTS_PROTOCOL 0
-+#define CONFIG_RTP_PROTOCOL 0
-+#define CONFIG_SCTP_PROTOCOL 0
-+#define CONFIG_SRTP_PROTOCOL 0
-+#define CONFIG_SUBFILE_PROTOCOL 0
-+#define CONFIG_TEE_PROTOCOL 0
-+#define CONFIG_TCP_PROTOCOL 0
-+#define CONFIG_TLS_PROTOCOL 0
-+#define CONFIG_UDP_PROTOCOL 0
-+#define CONFIG_UDPLITE_PROTOCOL 0
-+#define CONFIG_UNIX_PROTOCOL 0
-+#define CONFIG_LIBAMQP_PROTOCOL 0
-+#define CONFIG_LIBRIST_PROTOCOL 0
-+#define CONFIG_LIBRTMP_PROTOCOL 0
-+#define CONFIG_LIBRTMPE_PROTOCOL 0
-+#define CONFIG_LIBRTMPS_PROTOCOL 0
-+#define CONFIG_LIBRTMPT_PROTOCOL 0
-+#define CONFIG_LIBRTMPTE_PROTOCOL 0
-+#define CONFIG_LIBSRT_PROTOCOL 0
-+#define CONFIG_LIBSSH_PROTOCOL 0
-+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
-+#define CONFIG_LIBZMQ_PROTOCOL 0
-+#define CONFIG_IPFS_GATEWAY_PROTOCOL 0
-+#define CONFIG_IPNS_GATEWAY_PROTOCOL 0
-+#endif /* FFMPEG_CONFIG_COMPONENTS_H */
diff --git a/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py b/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py
new file mode 100644
index 000000000000..67477530885e
--- /dev/null
+++ b/www/iridium/files/patch-third__party_ffmpeg_chromium_scripts_build__ffmpeg.py
@@ -0,0 +1,121 @@
+--- third_party/ffmpeg/chromium/scripts/build_ffmpeg.py.orig 2023-07-24 14:27:53 UTC
++++ third_party/ffmpeg/chromium/scripts/build_ffmpeg.py
+@@ -29,7 +29,7 @@ NDK_ROOT_DIR = os.path.abspath(
+ SUCCESS_TOKEN = 'THIS_BUILD_WORKED'
+
+ sys.path.append(os.path.join(CHROMIUM_ROOT_DIR, 'build'))
+-import gn_helpers
++#import gn_helpers
+
+ BRANDINGS = [
+ 'Chrome',
+@@ -42,6 +42,8 @@ ARCH_MAP = {
+ 'linux': [
+ 'ia32', 'x64', 'noasm-x64', 'arm', 'arm-neon', 'arm64'
+ ],
++ 'openbsd': ['x64', 'arm64', 'ia32'],
++ 'freebsd': ['x64', 'arm64', 'ia32'],
+ 'mac': ['x64', 'arm64'],
+ 'win': ['ia32', 'x64', 'arm64'],
+ }
+@@ -51,6 +53,8 @@ USAGE_END = """
+ Valid combinations are android [%(android)s]
+ linux [%(linux)s]
+ mac [%(mac)s]
++ openbsd [%(openbsd)s]
++ freebsd [%(freebsd)s]
+ win [%(win)s]
+
+ If no target architecture is specified all will be built.
+@@ -123,6 +127,10 @@ def PrintAndCheckCall(argv, *args, **kwargs):
+ def DetermineHostOsAndArch():
+ if platform.system() == 'Linux':
+ host_os = 'linux'
++ if platform.system() == 'OpenBSD':
++ host_os = 'openbsd'
++ elif platform.system() == 'FreeBSD':
++ host_os = 'freebsd'
+ elif platform.system() == 'Darwin':
+ host_os = 'mac'
+ elif platform.system() == 'Windows' or 'CYGWIN_NT' in platform.system():
+@@ -132,7 +140,7 @@ def DetermineHostOsAndArch():
+
+ if re.match(r'i.86', platform.machine()):
+ host_arch = 'ia32'
+- elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64':
++ elif platform.machine() == 'x86_64' or platform.machine() == 'AMD64' or platform.machine() == 'amd64':
+ host_arch = 'x64'
+ elif platform.machine() == 'aarch64':
+ host_arch = 'arm64'
+@@ -149,7 +157,7 @@ def DetermineHostOsAndArch():
+
+
+ def GetDsoName(target_os, dso_name, dso_version):
+- if target_os in ('linux', 'linux-noasm', 'android'):
++ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'):
+ return 'lib%s.so.%s' % (dso_name, dso_version)
+ elif target_os == 'mac':
+ return 'lib%s.%s.dylib' % (dso_name, dso_version)
+@@ -492,7 +500,7 @@ def BuildFFmpeg(target_os, target_arch, host_os, host_
+ # removing <sys/sysctl.h> soon, so this is needed to silence a deprecation
+ # #warning which will be converted to an error via -Werror.
+ # There is also no prctl.h
+- if target_os in ['linux', 'linux-noasm']:
++ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']:
+ pre_make_rewrites += [
+ (r'(#define HAVE_SYSCTL [01])',
+ r'#define HAVE_SYSCTL 0 /* \1 -- forced to 0 for Fuchsia */'),
+@@ -613,7 +621,7 @@ def main(argv):
+ configure_args = args[2:]
+
+
+- if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all'):
++ if target_os not in ('android', 'linux', 'linux-noasm', 'mac', 'win', 'all', 'openbsd', 'freebsd'):
+ parser.print_help()
+ return 1
+
+@@ -735,7 +743,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+ '--enable-parser=vp3,vp8',
+ ])
+
+- if target_os in ('linux', 'linux-noasm', 'android'):
++ if target_os in ('linux', 'linux-noasm', 'android', 'openbsd', 'freebsd'):
+ if target_arch == 'x64':
+ if target_os == 'android':
+ configure_flags['Common'].extend([
+@@ -745,7 +753,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+ configure_flags['Common'].extend([
+ '--enable-lto',
+ '--arch=x86_64',
+- '--target-os=linux',
++ '--target-os=' + target_os,
+ ])
+
+ if host_arch != 'x64':
+@@ -836,7 +844,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+ '--extra-cflags=-mfpu=vfpv3-d16',
+ ])
+ elif target_arch == 'arm64':
+- if target_os != 'android':
++ if target_os != 'android' and target_os != 'openbsd' and target_os != 'freebsd':
+ if host_arch != 'arm64':
+ configure_flags['Common'].extend([
+ '--enable-cross-compile',
+@@ -898,7 +906,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+ '--disable-mips64r2',
+ '--enable-msa',
+ ])
+- if target_os == 'linux':
++ if target_os == 'Linux':
+ configure_flags['Common'].extend([
+ '--enable-cross-compile',
+ '--target-os=linux',
+@@ -1049,7 +1057,7 @@ def ConfigureAndBuild(target_arch, target_os, host_os,
+ 'Chrome', configure_flags['Common'] + configure_flags['ChromeAndroid'] +
+ configure_args)
+
+- if target_os in ['linux', 'linux-noasm']:
++ if target_os in ['linux', 'linux-noasm', 'openbsd', 'freebsd']:
+ # ChromeOS enables MPEG4 which requires error resilience :(
+ chrome_os_flags = (
+ configure_flags['Common'] + configure_flags['Chrome'] +
diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm b/www/iridium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm
new file mode 100644
index 000000000000..af7e6097c805
--- /dev/null
+++ b/www/iridium/files/patch-third__party_ffmpeg_libavcodec_x86_fft.asm
@@ -0,0 +1,108 @@
+--- third_party/ffmpeg/libavcodec/x86/fft.asm.orig 2023-07-24 14:27:53 UTC
++++ third_party/ffmpeg/libavcodec/x86/fft.asm
+@@ -296,6 +296,7 @@ INIT_YMM avx
+ %if HAVE_AVX_EXTERNAL
+ align 16
+ fft8_avx:
++ _CET_ENDBR
+ mova m0, Z(0)
+ mova m1, Z(1)
+ T8_AVX m0, m1, m2, m3, m4
+@@ -306,6 +307,7 @@ fft8_avx:
+
+ align 16
+ fft16_avx:
++ _CET_ENDBR
+ mova m2, Z(2)
+ mova m3, Z(3)
+ T4_SSE m2, m3, m7
+@@ -343,6 +345,7 @@ fft16_avx:
+
+ align 16
+ fft32_avx:
++ _CET_ENDBR
+ call fft16_avx
+
+ mova m0, Z(4)
+@@ -367,6 +370,7 @@ fft32_avx:
+ ret
+
+ fft32_interleave_avx:
++ _CET_ENDBR
+ call fft32_avx
+ mov r2d, 32
+ .deint_loop:
+@@ -390,6 +394,7 @@ INIT_XMM sse
+ align 16
+ fft4_avx:
+ fft4_sse:
++ _CET_ENDBR
+ mova m0, Z(0)
+ mova m1, Z(1)
+ T4_SSE m0, m1, m2
+@@ -399,6 +404,7 @@ fft4_sse:
+
+ align 16
+ fft8_sse:
++ _CET_ENDBR
+ mova m0, Z(0)
+ mova m1, Z(1)
+ T4_SSE m0, m1, m2
+@@ -413,6 +419,7 @@ fft8_sse:
+
+ align 16
+ fft16_sse:
++ _CET_ENDBR
+ mova m0, Z(0)
+ mova m1, Z(1)
+ T4_SSE m0, m1, m2
+@@ -441,6 +448,7 @@ fft16_sse:
+ %macro DECL_PASS 2+ ; name, payload
+ align 16
+ %1:
++ _CET_ENDBR
+ DEFINE_ARGS zc, w, n, o1, o3
+ lea o3q, [nq*3]
+ lea o1q, [nq*8]
+@@ -457,10 +465,6 @@ DEFINE_ARGS zc, w, n, o1, o3
+ %macro FFT_DISPATCH 2; clobbers 5 GPRs, 8 XMMs
+ lea r2, [dispatch_tab%1]
+ mov r2, [r2 + (%2q-2)*gprsize]
+-%ifdef PIC
+- lea r3, [$$]
+- add r2, r3
+-%endif
+ call r2
+ %endmacro ; FFT_DISPATCH
+
+@@ -585,11 +589,7 @@ cglobal imdct_calc, 3,5,3
+ jl .loop
+ RET
+
+-%ifdef PIC
+-%define SECTION_REL - $$
+-%else
+ %define SECTION_REL
+-%endif
+
+ %macro DECL_FFT 1-2 ; nbits, suffix
+ %ifidn %0, 1
+@@ -613,6 +613,7 @@ cglobal imdct_calc, 3,5,3
+
+ align 16
+ fft %+ n %+ fullsuffix:
++ _CET_ENDBR
+ call fft %+ n2 %+ SUFFIX
+ add r0, n*4 - (n&(-2<<%1))
+ call fft %+ n4 %+ SUFFIX
+@@ -627,8 +628,10 @@ fft %+ n %+ fullsuffix:
+ %endrep
+ %undef n
+
++[SECTION .data.rel.ro write]
+ align 8
+ dispatch_tab %+ fullsuffix: pointer list_of_fft
++__?SECT?__
+ %endmacro ; DECL_FFT
+
+ %if HAVE_AVX_EXTERNAL
diff --git a/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm b/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
new file mode 100644
index 000000000000..60e8ddfa6dc6
--- /dev/null
+++ b/www/iridium/files/patch-third__party_ffmpeg_libavutil_x86_x86inc.asm
@@ -0,0 +1,23 @@
+--- third_party/ffmpeg/libavutil/x86/x86inc.asm.orig 2023-07-24 14:27:53 UTC
++++ third_party/ffmpeg/libavutil/x86/x86inc.asm
+@@ -53,6 +53,12 @@
+ %endif
+ %endif
+
++%if ARCH_X86_64
++ %define _CET_ENDBR endbr64
++%else
++ %define _CET_ENDBR
++%endif
++
+ %define WIN64 0
+ %define UNIX64 0
+ %if ARCH_X86_64
+@@ -768,6 +774,7 @@ BRANCH_INSTR jz, je, jnz, jne, jl, jle, jnl, jnle, jg,
+ %endif
+ align function_align
+ %2:
++ _CET_ENDBR
+ RESET_MM_PERMUTATION ; needed for x86-64, also makes disassembly somewhat nicer
+ %xdefine rstk rsp ; copy of the original stack pointer, used when greater alignment than the known stack alignment is required
+ %assign stack_offset 0 ; stack pointer offset relative to the return address
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
index 89c2f6240247..e2c1876aa1b9 100644
--- 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
@@ -1,4 +1,4 @@
---- third_party/ipcz/src/reference_drivers/random.cc.orig 2022-10-05 07:34:01 UTC
+--- third_party/ipcz/src/reference_drivers/random.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/ipcz/src/reference_drivers/random.cc
@@ -15,7 +15,7 @@
#include <limits>
@@ -7,8 +7,8 @@
-#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>
+ #include <unistd.h>
@@ -78,7 +78,7 @@ void RandomBytes(absl::Span<uint8_t> destination) {
ABSL_ASSERT(ok);
#elif BUILDFLAG(IS_FUCHSIA)
diff --git a/www/iridium/files/patch-third__party_libevent_event.h b/www/iridium/files/patch-third__party_libevent_event.h
deleted file mode 100644
index d57850e37963..000000000000
--- a/www/iridium/files/patch-third__party_libevent_event.h
+++ /dev/null
@@ -1,14 +0,0 @@
---- 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>
-+#else
- /*
- * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu>
- * All rights reserved.
-@@ -1210,3 +1213,4 @@ int evtag_unmarshal_timeval(struct evbuffer *evbuf, ev
- #endif
-
- #endif /* _EVENT_H_ */
-+#endif
diff --git a/www/iridium/files/patch-third__party_opus_BUILD.gn b/www/iridium/files/patch-third__party_opus_BUILD.gn
deleted file mode 100644
index 82444676b8fe..000000000000
--- a/www/iridium/files/patch-third__party_opus_BUILD.gn
+++ /dev/null
@@ -1,10 +0,0 @@
---- third_party/opus/BUILD.gn.orig 2022-03-28 18:11:04 UTC
-+++ third_party/opus/BUILD.gn
-@@ -41,7 +41,6 @@ config("opus_private_config") {
- # Prefer alloca() over variable length arrays which are often inefficient;
- # the opus code will automatically handle this correctly per-platform.
- "USE_ALLOCA",
-- "HAVE_ALLOCA_H",
- ]
-
- include_dirs = [
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 7a73e22a3a97..6f98d6238a45 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-10-05 07:34:01 UTC
+--- third_party/pdfium/core/fxge/cfx_fontmapper.cpp.orig 2023-07-24 14:27:53 UTC
+++ third_party/pdfium/core/fxge/cfx_fontmapper.cpp
-@@ -157,7 +157,7 @@ constexpr AltFontFamily kAltFontFamilies[] = {
+@@ -158,7 +158,7 @@ constexpr AltFontFamily kAltFontFamilies[] = {
{"ForteMT", "Forte"},
};
diff --git a/www/iridium/files/patch-third__party_pdfium_pdfium.gni b/www/iridium/files/patch-third__party_pdfium_pdfium.gni
index 64ab6a4bb395..8138197de3cc 100644
--- a/www/iridium/files/patch-third__party_pdfium_pdfium.gni
+++ b/www/iridium/files/patch-third__party_pdfium_pdfium.gni
@@ -1,7 +1,7 @@
---- third_party/pdfium/pdfium.gni.orig 2023-03-13 07:33:08 UTC
+--- third_party/pdfium/pdfium.gni.orig 2023-07-24 14:27:53 UTC
+++ third_party/pdfium/pdfium.gni
@@ -42,7 +42,7 @@ declare_args() {
- pdf_use_cxx20 = is_win && is_component_build
+ pdf_use_cxx20 = (is_win && is_component_build) || is_fuchsia
# Build PDFium with PartitionAlloc as the memory allocator.
- pdf_use_partition_alloc = pdf_use_partition_alloc_override
diff --git a/www/iridium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h b/www/iridium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h
new file mode 100644
index 000000000000..a14688d02e11
--- /dev/null
+++ b/www/iridium/files/patch-third__party_pdfium_third__party_base_compiler__specific.h
@@ -0,0 +1,11 @@
+--- third_party/pdfium/third_party/base/compiler_specific.h.orig 2023-07-24 14:27:53 UTC
++++ third_party/pdfium/third_party/base/compiler_specific.h
+@@ -17,7 +17,7 @@
+ // Annotate a function indicating it should not be inlined.
+ // Use like:
+ // NOINLINE void DoStuff() { ... }
+-#if defined(__clang__) && HAS_ATTRIBUTE(noinline)
++#if defined(__clang__) && (__clang_major__ >= 15) && HAS_ATTRIBUTE(noinline)
+ #define NOINLINE [[clang::noinline]]
+ #elif defined(COMPILER_GCC) && HAS_ATTRIBUTE(noinline)
+ #define NOINLINE __attribute__((noinline))
diff --git a/www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_track__event__legacy.h b/www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
index ae82b4f8eb14..f0d3d9c94d2c 100644
--- a/www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_track__event__legacy.h
+++ b/www/iridium/files/patch-third__party_perfetto_include_perfetto_tracing_internal_track__event__legacy.h
@@ -1,6 +1,6 @@
---- third_party/perfetto/include/perfetto/tracing/track_event_legacy.h.orig 2023-04-22 17:45:15 UTC
-+++ third_party/perfetto/include/perfetto/tracing/track_event_legacy.h
-@@ -267,7 +267,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTraceId {
+--- third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h.orig 2023-07-24 14:27:53 UTC
++++ third_party/perfetto/include/perfetto/tracing/internal/track_event_legacy.h
+@@ -249,7 +249,7 @@ class PERFETTO_EXPORT_COMPONENT LegacyTraceId {
// are different. E.g. on Mac size_t is considered a different type from
// uint64_t even though it has the same size and signedness.
// Below we add overloads for those types that are known to cause ambiguity.
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 9092e4eab2b2..d09bb614e2db 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 2023-04-22 17:45:15 UTC
+--- third_party/perfetto/src/tracing/core/tracing_service_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/perfetto/src/tracing/core/tracing_service_impl.cc
-@@ -3122,7 +3122,8 @@ bool TracingServiceImpl::SnapshotClocks(
+@@ -3149,7 +3149,8 @@ bool TracingServiceImpl::SnapshotClocks(
#if !PERFETTO_BUILDFLAG(PERFETTO_OS_APPLE) && \
!PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && \
diff --git a/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc b/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc
new file mode 100644
index 000000000000..bd7edf3ff83e
--- /dev/null
+++ b/www/iridium/files/patch-third__party_perfetto_src_tracing_track.cc
@@ -0,0 +1,11 @@
+--- third_party/perfetto/src/tracing/track.cc.orig 2023-07-24 14:27:53 UTC
++++ third_party/perfetto/src/tracing/track.cc
+@@ -143,7 +143,7 @@ namespace internal {
+ namespace {
+
+ uint64_t GetProcessStartTime() {
+-#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN)
++#if !PERFETTO_BUILDFLAG(PERFETTO_OS_WIN) && !PERFETTO_BUILDFLAG(PERFETTO_OS_BSD)
+ std::string stat;
+ if (!base::ReadFile("/proc/self/stat", &stat))
+ return 0u;
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 67a0d6fa1e8a..15cadeeaeb90 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,4 +1,4 @@
---- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-01-17 19:19:00 UTC
+--- third_party/vulkan-deps/vulkan-loader/src/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/vulkan-deps/vulkan-loader/src/BUILD.gn
@@ -59,7 +59,7 @@ config("vulkan_internal_config") {
defines += [
@@ -8,4 +8,4 @@
+ "FALLBACK_DATA_DIRS=\"/usr/X11R6/share:/usr/local/share:/usr/share\"",
]
}
- }
+ if (!vulkan_loader_shared) {
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 0d8986e8931d..707a896200ef 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 2023-01-17 19:19:00 UTC
+--- third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/vulkan-deps/vulkan-loader/src/loader/vk_loader_platform.h
-@@ -294,7 +294,15 @@ static inline char *loader_platform_executable_path(ch
+@@ -300,7 +300,15 @@ static inline char *loader_platform_executable_path(ch
return buffer;
}
diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
index ea6bccbcf638..9326c9d7b2a3 100644
--- a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vk__mem__alloc.h
+++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_external_vma_vk__mem__alloc.h
@@ -1,11 +1,11 @@
---- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h.orig 2023-03-13 07:33:08 UTC
-+++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vk_mem_alloc.h
-@@ -2703,7 +2703,7 @@ static void* vma_aligned_alloc(size_t alignment, size_
+--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h.orig 2023-07-24 14:27:53 UTC
++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/external/vma/vk_mem_alloc.h
+@@ -2740,7 +2740,7 @@ static void* vma_aligned_alloc(size_t alignment, 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__)
- #define ALIGNED_ALLOC_WITH_POSIX_MEMALIGN
- #elif defined(__GNU_LIBRARY__)
- # if !defined(__GLIBC_PREREQ) || !__GLIBC_PREREQ(2, 16)
+ #include <cstdlib>
+
+ #if defined(__APPLE__)
diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp
new file mode 100644
index 000000000000..e7c410ff5e94
--- /dev/null
+++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_stateless_sl__instance__device.cpp
@@ -0,0 +1,17 @@
+--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp.orig 2023-07-24 14:27:53 UTC
++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/stateless/sl_instance_device.cpp
+@@ -46,12 +46,12 @@ bool StatelessValidation::ValidateApiVersion(uint32_t
+ skip |= LogError(instance, "VUID-VkApplicationInfo-apiVersion-04010",
+ "Invalid CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). "
+ "Using VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".",
+- api_version, effective_api_version.major(), effective_api_version.minor());
++ api_version, effective_api_version.vk_major(), effective_api_version.vk_minor());
+ } else {
+ skip |= LogWarning(instance, kVUIDUndefined,
+ "Unrecognized CreateInstance->pCreateInfo->pApplicationInfo.apiVersion number (0x%08x). "
+ "Assuming VK_API_VERSION_%" PRIu32 "_%" PRIu32 ".",
+- api_version, effective_api_version.major(), effective_api_version.minor());
++ api_version, effective_api_version.vk_major(), effective_api_version.vk_minor());
+ }
+ }
+ return skip;
diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h
new file mode 100644
index 000000000000..481cb109c7cf
--- /dev/null
+++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_utils_vk__layer__utils.h
@@ -0,0 +1,11 @@
+--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h.orig 2023-07-24 14:27:53 UTC
++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/utils/vk_layer_utils.h
+@@ -69,7 +69,7 @@ static inline std::string StringAPIVersion(APIVersion
+ if (!version.valid()) {
+ return "<unrecognized>";
+ }
+- version_name << version.major() << "." << version.minor() << "." << version.patch() << " (0x" << std::setfill('0')
++ version_name << version.vk_major() << "." << version.vk_minor() << "." << version.vk_patch() << " (0x" << std::setfill('0')
+ << std::setw(8) << std::hex << version.value() << ")";
+ return version_name.str();
+ }
diff --git a/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h
new file mode 100644
index 000000000000..e9f2896ea8d8
--- /dev/null
+++ b/www/iridium/files/patch-third__party_vulkan-deps_vulkan-validation-layers_src_layers_vulkan_generated_vk__extension__helper.h
@@ -0,0 +1,15 @@
+--- third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h.orig 2023-07-24 14:27:53 UTC
++++ third_party/vulkan-deps/vulkan-validation-layers/src/layers/vulkan/generated/vk_extension_helper.h
+@@ -68,9 +68,9 @@ class APIVersion {
+
+ bool valid() const { return api_version_ != VVL_UNRECOGNIZED_API_VERSION; }
+ uint32_t value() const { return api_version_; }
+- uint32_t major() const { return VK_API_VERSION_MAJOR(api_version_); }
+- uint32_t minor() const { return VK_API_VERSION_MINOR(api_version_); }
+- uint32_t patch() const { return VK_API_VERSION_PATCH(api_version_); }
++ uint32_t vk_major() const { return VK_API_VERSION_MAJOR(api_version_); }
++ uint32_t vk_minor() const { return VK_API_VERSION_MINOR(api_version_); }
++ uint32_t vk_patch() const { return VK_API_VERSION_PATCH(api_version_); }
+
+ bool operator<(APIVersion api_version) const { return api_version_ < api_version.api_version_; }
+ bool operator<=(APIVersion api_version) const { return api_version_ <= api_version.api_version_; }
diff --git a/www/iridium/files/patch-third__party_webrtc_BUILD.gn b/www/iridium/files/patch-third__party_webrtc_BUILD.gn
index f67e8b641f8e..2665b7ad5154 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 2023-03-13 07:33:08 UTC
+--- third_party/webrtc/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/webrtc/BUILD.gn
-@@ -211,6 +211,9 @@ config("common_inherited_config") {
+@@ -212,6 +212,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 ebe7b6fc3405..4ae9e1d56c69 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 2023-03-13 07:33:08 UTC
+--- third_party/webrtc/modules/audio_device/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/webrtc/modules/audio_device/BUILD.gn
-@@ -300,7 +300,7 @@ rtc_library("audio_device_impl") {
+@@ -330,7 +330,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_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc b/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
index 4c49350779a4..7862edb6b19a 100644
--- a/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
+++ b/www/iridium/files/patch-third__party_webrtc_modules_desktop__capture_linux_x11_x__server__pixel__buffer.cc
@@ -1,6 +1,6 @@
---- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2022-03-28 18:11:04 UTC
+--- third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/webrtc/modules/desktop_capture/linux/x11/x_server_pixel_buffer.cc
-@@ -212,6 +212,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
+@@ -203,6 +203,12 @@ bool XServerPixelBuffer::Init(XAtomCache* cache, Windo
void XServerPixelBuffer::InitShm(const XWindowAttributes& attributes) {
Visual* default_visual = attributes.visual;
int default_depth = attributes.depth;
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 3b40c462fed8..e39b3147e86d 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 2023-03-13 07:33:08 UTC
+--- third_party/webrtc/rtc_base/network.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/webrtc/rtc_base/network.cc
-@@ -288,7 +288,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
+@@ -292,7 +292,12 @@ AdapterType GetAdapterTypeFromName(absl::string_view n
}
#endif
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
index e582e8a9e0d4..034e1a4b96d8 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.cc
@@ -1,6 +1,6 @@
---- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2023-01-17 19:19:00 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.cc.orig 2023-07-24 14:27:53 UTC
+++ third_party/webrtc/rtc_base/physical_socket_server.cc
-@@ -54,7 +54,7 @@
+@@ -56,7 +56,7 @@
#include "rtc_base/time_utils.h"
#include "system_wrappers/include/field_trial.h"
@@ -9,7 +9,7 @@
#include <linux/sockios.h>
#endif
-@@ -73,7 +73,7 @@ typedef void* SockOptArg;
+@@ -75,7 +75,7 @@ typedef void* SockOptArg;
#endif // WEBRTC_POSIX
@@ -18,7 +18,7 @@
int64_t GetSocketRecvTimestamp(int socket) {
struct timeval tv_ioctl;
-@@ -308,7 +308,7 @@ int PhysicalSocket::GetOption(Option opt, int* value)
+@@ -310,7 +310,7 @@ int PhysicalSocket::GetOption(Option opt, int* value)
return -1;
}
if (opt == OPT_DONTFRAGMENT) {
@@ -27,7 +27,7 @@
*value = (*value != IP_PMTUDISC_DONT) ? 1 : 0;
#endif
} else if (opt == OPT_DSCP) {
-@@ -326,7 +326,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -328,7 +328,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
if (TranslateOption(opt, &slevel, &sopt) == -1)
return -1;
if (opt == OPT_DONTFRAGMENT) {
@@ -36,7 +36,7 @@
value = (value) ? IP_PMTUDISC_DO : IP_PMTUDISC_DONT;
#endif
} else if (opt == OPT_DSCP) {
-@@ -354,7 +354,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
+@@ -356,7 +356,7 @@ int PhysicalSocket::SetOption(Option opt, int value) {
int PhysicalSocket::Send(const void* pv, size_t cb) {
int sent = DoSend(
s_, reinterpret_cast<const char*>(pv), static_cast<int>(cb),
@@ -45,7 +45,7 @@
// Suppress SIGPIPE. Without this, attempting to send on a socket whose
// other end is closed will result in a SIGPIPE signal being raised to
// our process, which by default will terminate the process, which we
-@@ -383,7 +383,7 @@ int PhysicalSocket::SendTo(const void* buffer,
+@@ -385,7 +385,7 @@ int PhysicalSocket::SendTo(const void* buffer,
size_t len = addr.ToSockAddrStorage(&saddr);
int sent =
DoSendTo(s_, static_cast<const char*>(buffer), static_cast<int>(length),
@@ -54,7 +54,7 @@
// Suppress SIGPIPE. See above for explanation.
MSG_NOSIGNAL,
#else
-@@ -641,7 +641,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
+@@ -643,7 +643,7 @@ int PhysicalSocket::TranslateOption(Option opt, int* s
*slevel = IPPROTO_IP;
*sopt = IP_DONTFRAGMENT;
break;
diff --git a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
index 833e5782be9e..422b440c6e4b 100644
--- a/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
+++ b/www/iridium/files/patch-third__party_webrtc_rtc__base_physical__socket__server.h
@@ -1,11 +1,11 @@
---- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2022-12-01 10:35:46 UTC
+--- third_party/webrtc/rtc_base/physical_socket_server.h.orig 2023-07-24 14:27:53 UTC
+++ third_party/webrtc/rtc_base/physical_socket_server.h
-@@ -12,7 +12,7 @@
- #define RTC_BASE_PHYSICAL_SOCKET_SERVER_H_
-
+@@ -14,7 +14,7 @@
#include "api/units/time_delta.h"
--#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX)
-+#if defined(WEBRTC_POSIX) && defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+
+ #if defined(WEBRTC_POSIX)
+-#if defined(WEBRTC_LINUX)
++#if defined(WEBRTC_LINUX) && !defined(WEBRTC_BSD)
+ // On Linux, use epoll.
#include <sys/epoll.h>
#define WEBRTC_USE_EPOLL 1
- #endif
diff --git a/www/iridium/files/patch-third__party_zlib_BUILD.gn b/www/iridium/files/patch-third__party_zlib_BUILD.gn
index dc68b0d89fac..0efe36085e4e 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-10-05 07:34:01 UTC
+--- third_party/zlib/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ third_party/zlib/BUILD.gn
-@@ -117,7 +117,7 @@ if (use_arm_neon_optimizations) {
+@@ -127,7 +127,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" ]
-@@ -138,7 +138,7 @@ if (use_arm_neon_optimizations) {
+@@ -148,7 +148,7 @@ if (use_arm_neon_optimizations) {
source_set("zlib_arm_crc32") {
visibility = [ ":*" ]
@@ -18,7 +18,7 @@
include_dirs = [ "." ]
if (!is_win && !is_clang) {
-@@ -401,7 +401,7 @@ static_library("minizip") {
+@@ -416,7 +416,7 @@ static_library("minizip") {
]
}
diff --git a/www/iridium/files/patch-tools_generate__shim__headers_generate__shim__headers.py b/www/iridium/files/patch-tools_generate__shim__headers_generate__shim__headers.py
new file mode 100644
index 000000000000..5a52be506836
--- /dev/null
+++ b/www/iridium/files/patch-tools_generate__shim__headers_generate__shim__headers.py
@@ -0,0 +1,21 @@
+--- tools/generate_shim_headers/generate_shim_headers.py.orig 2023-07-24 14:27:53 UTC
++++ tools/generate_shim_headers/generate_shim_headers.py
+@@ -18,7 +18,7 @@ import sys
+
+
+ SHIM_TEMPLATE = """
+-#if defined(OFFICIAL_BUILD)
++#if defined(GOOGLE_CHROME_BUILD)
+ #error shim headers must not be used in official builds!
+ #endif
+ """
+@@ -65,6 +65,9 @@ def GeneratorMain(argv):
+ if options.outputs:
+ yield os.path.join(target_directory, header_filename)
+ if options.generate:
++ source_file = os.path.join(root, header_filename)
++ if os.path.exists(source_file):
++ os.unlink(source_file)
+ header_path = os.path.join(target_directory, header_filename)
+ header_dir = os.path.dirname(header_path)
+ if not os.path.exists(header_dir):
diff --git a/www/iridium/files/patch-tools_gn_build_gen.py b/www/iridium/files/patch-tools_gn_build_gen.py
index 9a80226ed476..900f596f1373 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-10-05 07:34:01 UTC
+--- tools/gn/build/gen.py.orig 2023-07-24 14:27:53 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']
-@@ -279,7 +285,7 @@ def WriteGenericNinja(path, static_libraries, executab
+@@ -283,7 +289,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',
-@@ -494,6 +500,9 @@ def WriteGNNinja(path, platform, host, options, args_l
+@@ -506,6 +512,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_json__schema__compiler_feature__compiler.py b/www/iridium/files/patch-tools_json__schema__compiler_feature__compiler.py
index d48fc9be005d..35488ce66440 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,6 +1,6 @@
---- tools/json_schema_compiler/feature_compiler.py.orig 2023-04-22 17:45:15 UTC
+--- tools/json_schema_compiler/feature_compiler.py.orig 2023-07-24 14:27:53 UTC
+++ tools/json_schema_compiler/feature_compiler.py
-@@ -271,6 +271,8 @@ FEATURE_GRAMMAR = ({
+@@ -272,6 +272,8 @@ FEATURE_GRAMMAR = ({
'linux': 'Feature::LINUX_PLATFORM',
'mac': 'Feature::MACOSX_PLATFORM',
'win': 'Feature::WIN_PLATFORM',
diff --git a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
index b546ffb8e0ba..0c1a6ff5adb0 100644
--- a/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
+++ b/www/iridium/files/patch-tools_perf_chrome__telemetry__build_BUILD.gn
@@ -1,6 +1,6 @@
---- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2022-12-06 08:09:13 UTC
+--- tools/perf/chrome_telemetry_build/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ tools/perf/chrome_telemetry_build/BUILD.gn
-@@ -45,7 +45,7 @@ group("telemetry_chrome_test") {
+@@ -47,7 +47,7 @@ group("telemetry_chrome_test") {
data_deps += [ "//chrome:reorder_imports" ]
}
@@ -9,7 +9,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
# CrOS currently has issues with the locally compiled version of
-@@ -186,7 +186,7 @@ group("telemetry_chrome_test_without_chrome") {
+@@ -172,7 +172,7 @@ group("telemetry_chrome_test_without_chrome") {
]
# Cr-Fuchsia doesn't support breakpad.
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 1bd8fb7eebd8..f2a37d8fbfdb 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-10-05 07:34:01 UTC
+--- ui/base/ime/fake_text_input_client.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/base/ime/fake_text_input_client.cc
-@@ -163,7 +163,7 @@ bool FakeTextInputClient::ShouldDoLearning() {
+@@ -167,7 +167,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 8f715790b4dc..1019174bca93 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-10-05 07:34:01 UTC
+--- ui/base/ime/fake_text_input_client.h.orig 2023-07-24 14:27:53 UTC
+++ ui/base/ime/fake_text_input_client.h
-@@ -71,7 +71,7 @@ class FakeTextInputClient : public TextInputClient {
+@@ -73,7 +73,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_text__input__client.h b/www/iridium/files/patch-ui_base_ime_text__input__client.h
index a25d2623f7c6..69d184c20e47 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-12-06 08:09:13 UTC
+--- ui/base/ime/text_input_client.h.orig 2023-07-24 14:27:53 UTC
+++ ui/base/ime/text_input_client.h
-@@ -242,7 +242,7 @@ class COMPONENT_EXPORT(UI_BASE_IME) TextInputClient
+@@ -265,7 +265,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 c6d86e608c0a..d11abd874642 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 2023-03-13 07:33:08 UTC
+--- ui/base/resource/resource_bundle.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/base/resource/resource_bundle.cc
-@@ -885,7 +885,7 @@ void ResourceBundle::ReloadFonts() {
+@@ -916,7 +916,7 @@ void ResourceBundle::ReloadFonts() {
}
ResourceScaleFactor ResourceBundle::GetMaxResourceScaleFactor() const {
@@ -8,4 +8,4 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
return max_scale_factor_;
#else
- return GetSupportedResourceScaleFactors().back();
+ return GetMaxSupportedResourceScaleFactor();
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 74c78c80e3c2..e47dd7edbdba 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,6 +1,6 @@
---- ui/base/test/skia_gold_pixel_diff.cc.orig 2023-01-17 19:19:00 UTC
+--- ui/base/test/skia_gold_pixel_diff.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/base/test/skia_gold_pixel_diff.cc
-@@ -151,7 +151,7 @@ std::string SkiaGoldPixelDiff::GetPlatform() {
+@@ -104,7 +104,7 @@ const char* GetPlatformName() {
return "macOS";
// 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_ui__base__features.cc b/www/iridium/files/patch-ui_base_ui__base__features.cc
index 6bea9c0b351d..2c36a6711cb9 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 2023-03-13 07:33:08 UTC
+--- ui/base/ui_base_features.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/base/ui_base_features.cc
-@@ -210,7 +210,7 @@ BASE_FEATURE(kExperimentalFlingAnimation,
+@@ -206,7 +206,7 @@ BASE_FEATURE(kExperimentalFlingAnimation,
"ExperimentalFlingAnimation",
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
!BUILDFLAG(IS_CHROMEOS_LACROS))
base::FEATURE_ENABLED_BY_DEFAULT
-@@ -315,7 +315,7 @@ bool IsForcedColorsEnabled() {
+@@ -313,7 +313,7 @@ bool IsForcedColorsEnabled() {
// milestones.
BASE_FEATURE(kEyeDropper,
"EyeDropper",
@@ -18,3 +18,12 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
+@@ -500,7 +500,7 @@ ChromeRefresh2023Level GetChromeRefresh2023Level() {
+ return level;
+ }
+
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ BASE_FEATURE(kWebUiSystemFont,
+ "WebUiSystemFont",
+ base::FEATURE_ENABLED_BY_DEFAULT);
diff --git a/www/iridium/files/patch-ui_base_ui__base__features.h b/www/iridium/files/patch-ui_base_ui__base__features.h
new file mode 100644
index 000000000000..68f4cfcd17e6
--- /dev/null
+++ b/www/iridium/files/patch-ui_base_ui__base__features.h
@@ -0,0 +1,11 @@
+--- ui/base/ui_base_features.h.orig 2023-07-24 14:27:53 UTC
++++ ui/base/ui_base_features.h
+@@ -242,7 +242,7 @@ enum class ChromeRefresh2023Level {
+ COMPONENT_EXPORT(UI_BASE_FEATURES)
+ ChromeRefresh2023Level GetChromeRefresh2023Level();
+
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ COMPONENT_EXPORT(UI_BASE_FEATURES) BASE_DECLARE_FEATURE(kWebUiSystemFont);
+ #endif
+
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 7ca18537b974..eaa056385871 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,15 @@
---- ui/base/webui/web_ui_util.cc.orig 2023-03-13 07:33:08 UTC
+--- ui/base/webui/web_ui_util.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/base/webui/web_ui_util.cc
-@@ -212,7 +212,7 @@ std::string GetFontFamily() {
+@@ -39,7 +39,7 @@ namespace {
+ constexpr float kMaxScaleFactor = 1000.0f;
+
+ std::string GetFontFamilyMd() {
+-#if !BUILDFLAG(IS_LINUX)
++#if !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ if (base::FeatureList::IsEnabled(features::kWebUiSystemFont)) {
+ return GetFontFamily();
+ }
+@@ -219,7 +219,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_color_color__id.h b/www/iridium/files/patch-ui_color_color__id.h
index 9c3acd7fb9af..94d7dfd257ba 100644
--- a/www/iridium/files/patch-ui_color_color__id.h
+++ b/www/iridium/files/patch-ui_color_color__id.h
@@ -1,6 +1,6 @@
---- ui/color/color_id.h.orig 2023-04-22 17:45:15 UTC
+--- ui/color/color_id.h.orig 2023-07-24 14:27:53 UTC
+++ ui/color/color_id.h
-@@ -435,7 +435,7 @@
+@@ -496,7 +496,7 @@
E_CPONLY(kColorNativeColor6) \
E_CPONLY(kColorNativeBaseColor) \
E_CPONLY(kColorNativeSecondaryColor)
diff --git a/www/iridium/files/patch-ui_compositor_compositor.cc b/www/iridium/files/patch-ui_compositor_compositor.cc
index d0cc00a9bac3..26dd5aeb2de5 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 2023-04-22 17:45:15 UTC
+--- ui/compositor/compositor.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/compositor/compositor.cc
-@@ -886,7 +886,7 @@ void Compositor::OnResume() {
+@@ -897,7 +897,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 ba27bc214e7e..0c536413aeb8 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 2023-04-22 17:45:15 UTC
+--- ui/compositor/compositor.h.orig 2023-07-24 14:27:53 UTC
+++ ui/compositor/compositor.h
-@@ -453,7 +453,7 @@ class COMPOSITOR_EXPORT Compositor : public base::Powe
+@@ -458,7 +458,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_events_devices_x11_device__data__manager__x11.cc b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
index 032d2ae22c24..b13e697a04f3 100644
--- a/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
+++ b/www/iridium/files/patch-ui_events_devices_x11_device__data__manager__x11.cc
@@ -1,10 +1,10 @@
---- ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-01-17 19:19:00 UTC
+--- ui/events/devices/x11/device_data_manager_x11.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/events/devices/x11/device_data_manager_x11.cc
-@@ -875,6 +875,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
+@@ -876,6 +876,7 @@ void DeviceDataManagerX11::SetDisabledKeyboardAllowedK
}
void DeviceDataManagerX11::DisableDevice(x11::Input::DeviceId deviceid) {
+ NOTIMPLEMENTED();
blocked_devices_.set(static_cast<uint32_t>(deviceid), true);
// TODO(rsadam@): Support blocking touchscreen devices.
- std::vector<InputDevice> keyboards = GetKeyboardDevices();
+ std::vector<KeyboardDevice> keyboards = GetKeyboardDevices();
diff --git a/www/iridium/files/patch-ui_events_event.cc b/www/iridium/files/patch-ui_events_event.cc
index a6d9e096a5b0..73bc718fdac0 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 2023-01-17 19:19:00 UTC
+--- ui/events/event.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/events/event.cc
-@@ -419,7 +419,7 @@ std::string LocatedEvent::ToString() const {
+@@ -420,7 +420,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)) {
-@@ -674,7 +674,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const
+@@ -675,7 +675,7 @@ std::unique_ptr<Event> MouseWheelEvent::Clone() const
return std::make_unique<MouseWheelEvent>(*this);
}
@@ -18,7 +18,7 @@
// This value matches Windows, Fuchsia WHEEL_DELTA, and (roughly) Firefox on
// Linux.
// static
-@@ -923,7 +923,7 @@ void KeyEvent::InitializeNative() {
+@@ -930,7 +930,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_gfx_BUILD.gn b/www/iridium/files/patch-ui_gfx_BUILD.gn
index bb396e3b1dfb..4dfdb9a8f061 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 2023-04-22 17:45:15 UTC
+--- ui/gfx/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ ui/gfx/BUILD.gn
-@@ -610,7 +610,7 @@ source_set("memory_buffer_sources") {
+@@ -627,7 +627,7 @@ source_set("memory_buffer_sources") {
deps += [ "//build/config/linux/libdrm" ]
}
diff --git a/www/iridium/files/patch-ui_gfx_codec_png__codec.cc b/www/iridium/files/patch-ui_gfx_codec_png__codec.cc
index b1f6d3d6f73e..852dad6e33ef 100644
--- a/www/iridium/files/patch-ui_gfx_codec_png__codec.cc
+++ b/www/iridium/files/patch-ui_gfx_codec_png__codec.cc
@@ -1,7 +1,7 @@
---- ui/gfx/codec/png_codec.cc.orig 2022-03-28 18:11:04 UTC
+--- ui/gfx/codec/png_codec.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/gfx/codec/png_codec.cc
-@@ -10,7 +10,7 @@
- #include "base/memory/raw_ptr.h"
+@@ -11,7 +11,7 @@
+ #include "base/memory/raw_ptr_exclusion.h"
#include "base/notreached.h"
#include "base/strings/string_util.h"
-#include "third_party/libpng/png.h"
diff --git a/www/iridium/files/patch-ui_gfx_font__list.cc b/www/iridium/files/patch-ui_gfx_font__list.cc
deleted file mode 100644
index 0418232490e6..000000000000
--- a/www/iridium/files/patch-ui_gfx_font__list.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- ui/gfx/font_list.cc.orig 2022-03-28 18:11:04 UTC
-+++ ui/gfx/font_list.cc
-@@ -27,7 +27,7 @@ base::LazyInstance<scoped_refptr<gfx::FontListImpl>>::
- bool g_default_impl_initialized = false;
-
- bool IsFontFamilyAvailable(const std::string& family, SkFontMgr* fontManager) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- return !!fontManager->legacyMakeTypeface(family.c_str(), SkFontStyle());
- #else
- sk_sp<SkFontStyleSet> set(fontManager->matchFamily(family.c_str()));
diff --git a/www/iridium/files/patch-ui_gfx_native__widget__types.h b/www/iridium/files/patch-ui_gfx_native__widget__types.h
index 93e910e69741..82eaa0062955 100644
--- a/www/iridium/files/patch-ui_gfx_native__widget__types.h
+++ b/www/iridium/files/patch-ui_gfx_native__widget__types.h
@@ -1,6 +1,6 @@
---- ui/gfx/native_widget_types.h.orig 2022-03-28 18:11:04 UTC
+--- ui/gfx/native_widget_types.h.orig 2023-07-24 14:27:53 UTC
+++ ui/gfx/native_widget_types.h
-@@ -106,7 +106,7 @@ class SkBitmap;
+@@ -101,7 +101,7 @@ class SkBitmap;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -8,13 +8,13 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
extern "C" {
struct _AtkObject;
- typedef struct _AtkObject AtkObject;
-@@ -209,7 +209,7 @@ typedef NSFont* NativeFont;
- typedef id NativeViewAccessible;
+ using AtkObject = struct _AtkObject;
+@@ -221,7 +221,7 @@ using NativeViewAccessible = struct objc_object*;
+ #endif
// 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)
// Linux doesn't have a native font type.
- typedef AtkObject* NativeViewAccessible;
+ using NativeViewAccessible = AtkObject*;
#else
diff --git a/www/iridium/files/patch-ui_gfx_switches.cc b/www/iridium/files/patch-ui_gfx_switches.cc
index 8f0b797f20ce..e60baaf6532c 100644
--- a/www/iridium/files/patch-ui_gfx_switches.cc
+++ b/www/iridium/files/patch-ui_gfx_switches.cc
@@ -1,6 +1,6 @@
---- ui/gfx/switches.cc.orig 2023-01-17 19:19:00 UTC
+--- ui/gfx/switches.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/gfx/switches.cc
-@@ -33,7 +33,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe
+@@ -28,7 +28,7 @@ const char kForcePrefersReducedMotion[] = "force-prefe
// Run in headless mode, i.e., without a UI or display server dependencies.
const char kHeadless[] = "headless";
diff --git a/www/iridium/files/patch-ui_gfx_switches.h b/www/iridium/files/patch-ui_gfx_switches.h
index 09a063e1c502..1188a001fb4f 100644
--- a/www/iridium/files/patch-ui_gfx_switches.h
+++ b/www/iridium/files/patch-ui_gfx_switches.h
@@ -1,6 +1,6 @@
---- ui/gfx/switches.h.orig 2023-04-22 17:45:15 UTC
+--- ui/gfx/switches.h.orig 2023-07-24 14:27:53 UTC
+++ ui/gfx/switches.h
-@@ -19,7 +19,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu
+@@ -18,7 +18,7 @@ GFX_SWITCHES_EXPORT extern const char kEnableNativeGpu
GFX_SWITCHES_EXPORT extern const char kForcePrefersReducedMotion[];
GFX_SWITCHES_EXPORT extern const char kHeadless[];
diff --git a/www/iridium/files/patch-ui_gl_BUILD.gn b/www/iridium/files/patch-ui_gl_BUILD.gn
index af321f2c7a28..474c42eca48f 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 2023-04-22 17:45:15 UTC
+--- ui/gl/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ ui/gl/BUILD.gn
-@@ -162,8 +162,6 @@ component("gl") {
+@@ -161,8 +161,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") {
+@@ -179,7 +177,6 @@ component("gl") {
]
public_deps = [
"//base",
@@ -17,7 +17,7 @@
"//ui/events/platform",
"//ui/gfx",
"//ui/gfx/geometry",
-@@ -398,7 +395,6 @@ component("gl") {
+@@ -377,7 +374,6 @@ component("gl") {
data_deps += [
"//third_party/angle:libEGL",
"//third_party/angle:libGLESv2",
@@ -25,7 +25,7 @@
]
if (enable_swiftshader) {
data_deps += [
-@@ -632,7 +628,6 @@ test("gl_unittests") {
+@@ -621,7 +617,6 @@ test("gl_unittests") {
data_deps = [
"//testing/buildbot/filters:gl_unittests_filters",
diff --git a/www/iridium/files/patch-ui_gl_gl__bindings.h b/www/iridium/files/patch-ui_gl_gl__bindings.h
index 9622e3695c77..7ae75a3d9a3f 100644
--- a/www/iridium/files/patch-ui_gl_gl__bindings.h
+++ b/www/iridium/files/patch-ui_gl_gl__bindings.h
@@ -1,6 +1,6 @@
---- ui/gl/gl_bindings.h.orig 2023-04-22 17:45:15 UTC
+--- ui/gl/gl_bindings.h.orig 2023-07-24 14:27:53 UTC
+++ ui/gl/gl_bindings.h
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
#include <GL/wglext.h>
#elif BUILDFLAG(IS_MAC)
#include <OpenGL/OpenGL.h>
diff --git a/www/iridium/files/patch-ui_gl_gl__context.cc b/www/iridium/files/patch-ui_gl_gl__context.cc
index 8569c10b3476..442160a4cc0d 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 2023-04-22 17:45:15 UTC
+--- ui/gl/gl_context.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/gl/gl_context.cc
-@@ -416,7 +416,7 @@ bool GLContext::MakeVirtuallyCurrent(
+@@ -443,7 +443,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__implementation.cc b/www/iridium/files/patch-ui_gl_gl__implementation.cc
index e1cf188654a9..1aea112ed92b 100644
--- a/www/iridium/files/patch-ui_gl_gl__implementation.cc
+++ b/www/iridium/files/patch-ui_gl_gl__implementation.cc
@@ -1,6 +1,6 @@
---- ui/gl/gl_implementation.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/gl/gl_implementation.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/gl/gl_implementation.cc
-@@ -284,7 +284,7 @@ GetRequestedGLImplementationFromCommandLine(
+@@ -281,7 +281,7 @@ GetRequestedGLImplementationFromCommandLine(
*fallback_to_software_gl = false;
bool overrideUseSoftwareGL =
command_line->HasSwitch(switches::kOverrideUseSoftwareGLForTests);
diff --git a/www/iridium/files/patch-ui_gl_gl__switches.cc b/www/iridium/files/patch-ui_gl_gl__switches.cc
index 244e1ff5d9c7..2d65e8de2258 100644
--- a/www/iridium/files/patch-ui_gl_gl__switches.cc
+++ b/www/iridium/files/patch-ui_gl_gl__switches.cc
@@ -1,4 +1,4 @@
---- ui/gl/gl_switches.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/gl/gl_switches.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/gl/gl_switches.cc
@@ -11,7 +11,7 @@
#include "base/android/build_info.h"
@@ -9,7 +9,7 @@
#include <vulkan/vulkan_core.h>
#include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck
#endif
-@@ -295,7 +295,7 @@ bool IsDefaultANGLEVulkan() {
+@@ -271,7 +271,7 @@ bool IsDefaultANGLEVulkan() {
base::android::SDK_VERSION_Q)
return false;
#endif // BUILDFLAG(IS_ANDROID)
diff --git a/www/iridium/files/patch-ui_native__theme_native__theme.h b/www/iridium/files/patch-ui_native__theme_native__theme.h
index 2625c5f180d9..a4209eb02770 100644
--- a/www/iridium/files/patch-ui_native__theme_native__theme.h
+++ b/www/iridium/files/patch-ui_native__theme_native__theme.h
@@ -1,6 +1,6 @@
---- ui/native_theme/native_theme.h.orig 2022-04-01 07:48:30 UTC
+--- ui/native_theme/native_theme.h.orig 2023-07-24 14:27:53 UTC
+++ ui/native_theme/native_theme.h
-@@ -59,7 +59,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
+@@ -60,7 +60,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
kCheckbox,
// 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_ozone_common_features.cc b/www/iridium/files/patch-ui_ozone_common_features.cc
new file mode 100644
index 000000000000..3968d60d1e4c
--- /dev/null
+++ b/www/iridium/files/patch-ui_ozone_common_features.cc
@@ -0,0 +1,11 @@
+--- ui/ozone/common/features.cc.orig 2023-07-24 14:27:53 UTC
++++ ui/ozone/common/features.cc
+@@ -30,7 +30,7 @@ BASE_FEATURE(kWaylandSurfaceSubmissionInPixelCoordinat
+ // enabled.
+ BASE_FEATURE(kWaylandFractionalScaleV1,
+ "WaylandFractionalScaleV1",
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::FEATURE_ENABLED_BY_DEFAULT
+ #else
+ base::FEATURE_DISABLED_BY_DEFAULT
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
index 2c13f94d6ce9..9a478cd5c6cc 100644
--- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/ozone/platform/wayland/host/wayland_toplevel_window.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/ozone/platform/wayland/host/wayland_toplevel_window.cc
-@@ -448,7 +448,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
+@@ -516,7 +516,7 @@ void WaylandToplevelWindow::HandleAuraToplevelConfigur
const bool did_active_change = is_active_ != window_states.is_activated;
is_active_ = window_states.is_activated;
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
index ee7abd589b2a..c2c9a990fe06 100644
--- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__toplevel__window.h
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-03-13 07:33:08 UTC
+--- ui/ozone/platform/wayland/host/wayland_toplevel_window.h.orig 2023-07-24 14:27:53 UTC
+++ ui/ozone/platform/wayland/host/wayland_toplevel_window.h
-@@ -250,7 +250,7 @@ class WaylandToplevelWindow : public WaylandWindow,
+@@ -244,7 +244,7 @@ class WaylandToplevelWindow : public WaylandWindow,
// Contains the previous state of the window.
PlatformWindowState previous_state_ = PlatformWindowState::kUnknown;
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h
index f2cc476492b7..7f21eeaeaef5 100644
--- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_wayland__window.h
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-03-13 07:33:08 UTC
+--- ui/ozone/platform/wayland/host/wayland_window.h.orig 2023-07-24 14:27:53 UTC
+++ ui/ozone/platform/wayland/host/wayland_window.h
-@@ -231,7 +231,7 @@ class WaylandWindow : public PlatformWindow,
+@@ -235,7 +235,7 @@ class WaylandWindow : public PlatformWindow,
bool is_snapped_primary = false;
bool is_snapped_secondary = false;
bool is_floated = false;
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
index ea0d743f1a74..2abe64948884 100644
--- a/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_host_xdg__toplevel__wrapper__impl.cc
@@ -1,6 +1,6 @@
---- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/ozone/platform/wayland/host/xdg_toplevel_wrapper_impl.cc
-@@ -272,7 +272,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel(
+@@ -277,7 +277,7 @@ void XDGToplevelWrapperImpl::ConfigureTopLevel(
CheckIfWlArrayHasValue(states, XDG_TOPLEVEL_STATE_ACTIVATED),
};
diff --git a/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc b/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
index 1c1722cff682..6a045bb53e6d 100644
--- a/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
+++ b/www/iridium/files/patch-ui_ozone_platform_wayland_ozone__platform__wayland.cc
@@ -1,4 +1,4 @@
---- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/ozone/platform/wayland/ozone_platform_wayland.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/ozone/platform/wayland/ozone_platform_wayland.cc
@@ -71,7 +71,7 @@
#include "ui/ozone/platform/wayland/host/wayland_cursor_factory.h"
@@ -18,7 +18,7 @@
linux_ui_delegate_ =
std::make_unique<LinuxUiDelegateWayland>(connection_.get());
#endif
-@@ -470,7 +470,7 @@ class OzonePlatformWayland : public OzonePlatform,
+@@ -472,7 +472,7 @@ class OzonePlatformWayland : public OzonePlatform,
DrmRenderNodePathFinder path_finder_;
#endif
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 7e07bafe7b6f..c6e75a5d5487 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-12-06 08:09:13 UTC
+--- ui/ozone/public/ozone_platform.h.orig 2023-07-24 14:27:53 UTC
+++ ui/ozone/public/ozone_platform.h
-@@ -144,7 +144,7 @@ class COMPONENT_EXPORT(OZONE) OzonePlatform {
+@@ -140,7 +140,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__delegate.cc b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc
index 059ae473213e..f0567b67878f 100644
--- a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc
+++ b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.cc
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/platform_window/platform_window_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/platform_window/platform_window_delegate.cc
-@@ -29,7 +29,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
+@@ -36,7 +36,7 @@ PlatformWindowDelegate::PlatformWindowDelegate() = def
PlatformWindowDelegate::~PlatformWindowDelegate() = default;
diff --git a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
index ba8a04cb42cc..6e9c8bf47609 100644
--- a/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
+++ b/www/iridium/files/patch-ui_platform__window_platform__window__delegate.h
@@ -1,6 +1,6 @@
---- ui/platform_window/platform_window_delegate.h.orig 2023-04-22 17:45:15 UTC
+--- ui/platform_window/platform_window_delegate.h.orig 2023-07-24 14:27:53 UTC
+++ ui/platform_window/platform_window_delegate.h
-@@ -130,7 +130,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
+@@ -134,7 +134,7 @@ class COMPONENT_EXPORT(PLATFORM_WINDOW) PlatformWindow
virtual void OnWindowStateChanged(PlatformWindowState old_state,
PlatformWindowState new_state) = 0;
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 fe3b294fd60a..0fe278ccda55 100644
--- a/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
+++ b/www/iridium/files/patch-ui_views_controls_textfield_textfield.cc
@@ -1,6 +1,6 @@
---- ui/views/controls/textfield/textfield.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/views/controls/textfield/textfield.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/views/controls/textfield/textfield.cc
-@@ -74,7 +74,7 @@
+@@ -75,7 +75,7 @@
#include "base/win/win_util.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_command_auralinux.h"
#include "ui/linux/linux_ui.h"
#endif
-@@ -168,7 +168,7 @@ bool IsControlKeyModifier(int flags) {
+@@ -169,7 +169,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,7 +18,7 @@
return flags & ui::EF_CONTROL_DOWN;
#else
return false;
-@@ -706,7 +706,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
+@@ -715,7 +715,7 @@ bool Textfield::OnKeyPressed(const ui::KeyEvent& event
if (!textfield)
return handled;
@@ -27,7 +27,7 @@
auto* linux_ui = ui::LinuxUi::instance();
std::vector<ui::TextEditCommandAuraLinux> commands;
if (!handled && linux_ui &&
-@@ -878,7 +878,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
+@@ -938,7 +938,7 @@ void Textfield::AboutToRequestFocusFromTabTraversal(bo
}
bool Textfield::SkipDefaultKeyEventProcessing(const ui::KeyEvent& event) {
@@ -36,7 +36,7 @@
// Skip any accelerator handling that conflicts with custom keybindings.
auto* linux_ui = ui::LinuxUi::instance();
std::vector<ui::TextEditCommandAuraLinux> commands;
-@@ -1831,7 +1831,7 @@ bool Textfield::ShouldDoLearning() {
+@@ -1935,7 +1935,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(
-@@ -2344,14 +2344,14 @@ ui::TextEditCommand Textfield::GetCommandForKeyEvent(
+@@ -2448,14 +2448,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 a4f9c2927f0a..18267d2a8f9c 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,6 @@
---- ui/views/controls/textfield/textfield.h.orig 2023-03-13 07:33:08 UTC
+--- ui/views/controls/textfield/textfield.h.orig 2023-07-24 14:27:53 UTC
+++ ui/views/controls/textfield/textfield.h
-@@ -42,7 +42,7 @@
+@@ -43,7 +43,7 @@
#include "ui/views/view.h"
#include "ui/views/word_lookup_client.h"
@@ -9,7 +9,7 @@
#include <vector>
#endif
-@@ -450,7 +450,7 @@ class VIEWS_EXPORT Textfield : public View,
+@@ -448,7 +448,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_corewm_tooltip__aura.cc b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
index 0018471bff5a..93b123689012 100644
--- a/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
+++ b/www/iridium/files/patch-ui_views_corewm_tooltip__aura.cc
@@ -1,6 +1,6 @@
---- ui/views/corewm/tooltip_aura.cc.orig 2023-03-13 07:33:08 UTC
+--- ui/views/corewm/tooltip_aura.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/views/corewm/tooltip_aura.cc
-@@ -51,7 +51,7 @@ constexpr int kVerticalPaddingBottom = 5;
+@@ -38,7 +38,7 @@ namespace {
bool CanUseTranslucentTooltipWidget() {
// 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_widget_desktop__aura_desktop__drag__drop__client__ozone.cc b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
index e8ae68288c8f..18916291fd95 100644
--- a/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
+++ b/www/iridium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2023-01-17 19:19:00 UTC
+--- ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone.cc
-@@ -194,7 +194,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
+@@ -195,7 +195,7 @@ DragOperation DesktopDragDropClientOzone::StartDragAnd
return drag_operation_;
}
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 437de3693760..2115f273f7a7 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,6 @@
---- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/views/widget/desktop_aura/desktop_window_tree_host_platform.cc
-@@ -43,7 +43,7 @@
+@@ -44,7 +44,7 @@
#include "ui/wm/core/window_util.h"
#include "ui/wm/public/window_move_client.h"
@@ -9,7 +9,7 @@
#include "ui/views/widget/desktop_aura/desktop_drag_drop_client_ozone_linux.h"
#endif
-@@ -257,7 +257,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
+@@ -259,7 +259,7 @@ void DesktopWindowTreeHostPlatform::Init(const Widget:
if (params.type == Widget::InitParams::TYPE_WINDOW)
GetContentWindow()->SetProperty(aura::client::kAnimationsDisabledKey, true);
@@ -18,7 +18,7 @@
const bool requires_accelerated_widget = params.requires_accelerated_widget;
#else
const bool requires_accelerated_widget = false;
-@@ -329,7 +329,7 @@ std::unique_ptr<aura::client::DragDropClient>
+@@ -336,7 +336,7 @@ std::unique_ptr<aura::client::DragDropClient>
DesktopWindowTreeHostPlatform::CreateDragDropClient() {
ui::WmDragHandler* drag_handler = ui::GetWmDragHandler(*(platform_window()));
std::unique_ptr<DesktopDragDropClientOzone> drag_drop_client =
diff --git a/www/iridium/files/patch-ui_views_widget_widget.cc b/www/iridium/files/patch-ui_views_widget_widget.cc
index 1b21a212d414..b78237a5958b 100644
--- a/www/iridium/files/patch-ui_views_widget_widget.cc
+++ b/www/iridium/files/patch-ui_views_widget_widget.cc
@@ -1,6 +1,6 @@
---- ui/views/widget/widget.cc.orig 2023-04-22 17:45:15 UTC
+--- ui/views/widget/widget.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/views/widget/widget.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
#include "ui/views/window/custom_frame_view.h"
#include "ui/views/window/dialog_delegate.h"
@@ -9,7 +9,7 @@
#include "ui/linux/linux_ui.h"
#endif
-@@ -1989,7 +1989,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const
+@@ -2048,7 +2048,7 @@ const ui::NativeTheme* Widget::GetNativeTheme() const
if (parent_)
return parent_->GetNativeTheme();
diff --git a/www/iridium/files/patch-ui_views_widget_widget.h b/www/iridium/files/patch-ui_views_widget_widget.h
index 97b18cff54b8..6d799015c704 100644
--- a/www/iridium/files/patch-ui_views_widget_widget.h
+++ b/www/iridium/files/patch-ui_views_widget_widget.h
@@ -1,6 +1,6 @@
---- ui/views/widget/widget.h.orig 2023-01-17 19:19:00 UTC
+--- ui/views/widget/widget.h.orig 2023-07-24 14:27:53 UTC
+++ ui/views/widget/widget.h
-@@ -408,7 +408,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
+@@ -410,7 +410,7 @@ class VIEWS_EXPORT Widget : public internal::NativeWid
// If set, the widget was created in headless mode.
bool headless_mode = false;
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 392c9a91ec84..1f2a025feae8 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 2023-03-13 07:33:08 UTC
+--- ui/views/window/dialog_delegate.cc.orig 2023-07-24 14:27:53 UTC
+++ ui/views/window/dialog_delegate.cc
-@@ -73,7 +73,7 @@ Widget* DialogDelegate::CreateDialogWidget(
+@@ -72,7 +72,7 @@ Widget* DialogDelegate::CreateDialogWidget(
// static
bool DialogDelegate::CanSupportCustomFrame(gfx::NativeView parent) {
diff --git a/www/iridium/files/patch-v8_BUILD.gn b/www/iridium/files/patch-v8_BUILD.gn
index 5a931c3e0491..f435a746e3ea 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 2023-04-22 17:45:15 UTC
+--- v8/BUILD.gn.orig 2023-07-24 14:27:53 UTC
+++ v8/BUILD.gn
-@@ -1304,6 +1304,14 @@ config("toolchain") {
+@@ -1356,6 +1356,14 @@ config("toolchain") {
} else if (target_os == "chromeos") {
defines += [ "V8_HAVE_TARGET_OS" ]
defines += [ "V8_TARGET_OS_CHROMEOS" ]
@@ -15,7 +15,7 @@
}
# TODO(infra): Support v8_enable_prof on Windows.
-@@ -5717,7 +5725,7 @@ v8_component("v8_libbase") {
+@@ -5876,7 +5884,7 @@ v8_component("v8_libbase") {
}
}
@@ -24,7 +24,7 @@
sources += [
"src/base/debug/stack_trace_posix.cc",
"src/base/platform/platform-linux.cc",
-@@ -5728,6 +5736,18 @@ v8_component("v8_libbase") {
+@@ -5887,6 +5895,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
index 55312edf1288..2a1616d54532 100644
--- a/www/iridium/files/patch-v8_include_v8-internal.h
+++ b/www/iridium/files/patch-v8_include_v8-internal.h
@@ -1,6 +1,6 @@
---- v8/include/v8-internal.h.orig 2023-04-22 17:45:15 UTC
+--- v8/include/v8-internal.h.orig 2023-07-24 14:27:53 UTC
+++ v8/include/v8-internal.h
-@@ -176,7 +176,7 @@ using SandboxedPointer_t = Address;
+@@ -173,7 +173,7 @@ using SandboxedPointer_t = Address;
#ifdef V8_ENABLE_SANDBOX
// Size of the sandbox, excluding the guard regions surrounding it.
diff --git a/www/iridium/files/patch-v8_src_api_api.cc b/www/iridium/files/patch-v8_src_api_api.cc
index 60e04742a416..9e4cb695921a 100644
--- a/www/iridium/files/patch-v8_src_api_api.cc
+++ b/www/iridium/files/patch-v8_src_api_api.cc
@@ -1,15 +1,15 @@
---- v8/src/api/api.cc.orig 2023-04-22 17:45:15 UTC
+--- v8/src/api/api.cc.orig 2023-07-24 14:27:53 UTC
+++ v8/src/api/api.cc
-@@ -142,7 +142,7 @@
+@@ -143,7 +143,7 @@
#include "src/wasm/wasm-serialization.h"
#endif // V8_ENABLE_WEBASSEMBLY
-#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 <unistd.h>
- #if V8_ENABLE_WEBASSEMBLY
-@@ -6343,7 +6343,7 @@ bool v8::V8::Initialize(const int build_config) {
+@@ -6465,7 +6465,7 @@ bool v8::V8::Initialize(const int build_config) {
return true;
}
diff --git a/www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc b/www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc
index cd3e48f6de8b..bc153d3fd489 100644
--- a/www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc
+++ b/www/iridium/files/patch-v8_src_base_platform_platform-openbsd.cc
@@ -1,4 +1,4 @@
---- v8/src/base/platform/platform-openbsd.cc.orig 2022-03-28 18:11:04 UTC
+--- v8/src/base/platform/platform-openbsd.cc.orig 2023-07-24 14:27:53 UTC
+++ v8/src/base/platform/platform-openbsd.cc
@@ -6,6 +6,7 @@
// POSIX-compatible parts, the implementation is in platform-posix.cc.
@@ -14,7 +14,7 @@
void OS::AdjustSchedulingParams() {}
+
+// static
-+Stack::StackSlot Stack::GetStackStart() {
++Stack::StackSlot Stack::ObtainCurrentThreadStackStart() {
+ stack_t ss;
+ void *base;
+ if (pthread_stackseg_np(pthread_self(), &ss) != 0)
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 7800c5cabe49..80defe7ff086 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,4 +1,4 @@
---- v8/src/base/platform/platform-posix.cc.orig 2023-03-13 07:33:08 UTC
+--- v8/src/base/platform/platform-posix.cc.orig 2023-07-24 14:27:53 UTC
+++ v8/src/base/platform/platform-posix.cc
@@ -53,7 +53,7 @@
#if V8_OS_DARWIN
@@ -42,7 +42,7 @@
// TODO(bbudge) Move Cygwin and Fuchsia stuff into platform-specific files.
#if !V8_OS_CYGWIN && !V8_OS_FUCHSIA
-@@ -661,7 +669,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor
+@@ -666,7 +674,7 @@ void OS::DestroySharedMemoryHandle(PlatformSharedMemor
// static
bool OS::HasLazyCommits() {
@@ -51,7 +51,7 @@
return true;
#else
// TODO(bbudge) Return true for all POSIX platforms.
-@@ -1238,7 +1246,7 @@ void Thread::SetThreadLocal(LocalStorageKey key, void*
+@@ -1243,7 +1251,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_DARWIN) && !defined(_AIX) && \
@@ -59,4 +59,4 @@
+ !defined(V8_OS_SOLARIS) && !defined(V8_OS_OPENBSD)
// static
- Stack::StackSlot Stack::GetStackStart() {
+ Stack::StackSlot Stack::ObtainCurrentThreadStackStart() {
diff --git a/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h b/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h
new file mode 100644
index 000000000000..a8002f790cbf
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_baseline_x64_baseline-assembler-x64-inl.h
@@ -0,0 +1,13 @@
+--- v8/src/baseline/x64/baseline-assembler-x64-inl.h.orig 2023-07-24 14:27:53 UTC
++++ v8/src/baseline/x64/baseline-assembler-x64-inl.h
+@@ -73,9 +73,7 @@ MemOperand BaselineAssembler::FeedbackVectorOperand()
+
+ void BaselineAssembler::Bind(Label* label) { __ bind(label); }
+
+-void BaselineAssembler::JumpTarget() {
+- // NOP on x64.
+-}
++void BaselineAssembler::JumpTarget() { __ endbr64(); }
+
+ void BaselineAssembler::Jump(Label* target, Label::Distance distance) {
+ __ jmp(target, distance);
diff --git a/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc b/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc
new file mode 100644
index 000000000000..b27d15ec01f6
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_builtins_x64_builtins-x64.cc
@@ -0,0 +1,45 @@
+--- v8/src/builtins/x64/builtins-x64.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/builtins/x64/builtins-x64.cc
+@@ -43,6 +43,8 @@ namespace internal {
+ #define __ ACCESS_MASM(masm)
+
+ void Builtins::Generate_Adaptor(MacroAssembler* masm, Address address) {
++ __ CodeEntry();
++
+ __ LoadAddress(kJavaScriptCallExtraArg1Register,
+ ExternalReference::Create(address));
+ __ Jump(BUILTIN_CODE(masm->isolate(), AdaptorWithBuiltinExitFrame),
+@@ -457,7 +459,7 @@ void Generate_JSEntryVariant(MacroAssembler* masm, Sta
+ // Jump to a faked try block that does the invoke, with a faked catch
+ // block that sets the pending exception.
+ __ jmp(&invoke);
+- __ bind(&handler_entry);
++ __ BindExceptionHandler(&handler_entry);
+
+ // Store the current pc as the handler offset. It's used later to create the
+ // handler table.
+@@ -3801,6 +3803,8 @@ void GenericJSToWasmWrapperHelper(MacroAssembler* masm
+ RestoreParentSuspender(masm, rbx, rcx);
+ }
+ __ bind(&suspend);
++
++ __ endbr64();
+ // No need to process the return value if the stack is suspended, there is a
+ // single 'externref' value (the promise) which doesn't require conversion.
+
+@@ -4165,6 +4169,7 @@ void Builtins::Generate_WasmSuspend(MacroAssembler* ma
+ LoadJumpBuffer(masm, jmpbuf, true);
+ __ Trap();
+ __ bind(&resume);
++ __ endbr64();
+ __ LeaveFrame(StackFrame::STACK_SWITCH);
+ __ ret(0);
+ }
+@@ -4310,6 +4315,7 @@ void Generate_WasmResumeHelper(MacroAssembler* masm, w
+ }
+ __ Trap();
+ __ bind(&suspend);
++ __ endbr64();
+ __ LeaveFrame(StackFrame::STACK_SWITCH);
+ // Pop receiver + parameter.
+ __ ret(2 * kSystemPointerSize);
diff --git a/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.cc b/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.cc
new file mode 100644
index 000000000000..9131125aef2d
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.cc
@@ -0,0 +1,42 @@
+--- v8/src/codegen/x64/assembler-x64.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/codegen/x64/assembler-x64.cc
+@@ -1313,6 +1313,14 @@ void Assembler::hlt() {
+ emit(0xF4);
+ }
+
++void Assembler::endbr64() {
++ EnsureSpace ensure_space(this);
++ emit(0xF3);
++ emit(0x0f);
++ emit(0x1e);
++ emit(0xfa);
++}
++
+ void Assembler::emit_idiv(Register src, int size) {
+ EnsureSpace ensure_space(this);
+ emit_rex(src, size);
+@@ -1580,16 +1588,22 @@ void Assembler::jmp(Handle<Code> target, RelocInfo::Mo
+ emitl(code_target_index);
+ }
+
+-void Assembler::jmp(Register target) {
++void Assembler::jmp(Register target, bool notrack) {
+ EnsureSpace ensure_space(this);
++ if (notrack) {
++ emit(0x3e);
++ }
+ // Opcode FF/4 r64.
+ emit_optional_rex_32(target);
+ emit(0xFF);
+ emit_modrm(0x4, target);
+ }
+
+-void Assembler::jmp(Operand src) {
++void Assembler::jmp(Operand src, bool notrack) {
+ EnsureSpace ensure_space(this);
++ if (notrack) {
++ emit(0x3e);
++ }
+ // Opcode FF/4 m64.
+ emit_optional_rex_32(src);
+ emit(0xFF);
diff --git a/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h b/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h
new file mode 100644
index 000000000000..6c73aae5df63
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_codegen_x64_assembler-x64.h
@@ -0,0 +1,21 @@
+--- v8/src/codegen/x64/assembler-x64.h.orig 2023-07-24 14:27:53 UTC
++++ v8/src/codegen/x64/assembler-x64.h
+@@ -856,6 +856,7 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa
+ void ret(int imm16);
+ void ud2();
+ void setcc(Condition cc, Register reg);
++ void endbr64();
+
+ void pblendw(XMMRegister dst, Operand src, uint8_t mask);
+ void pblendw(XMMRegister dst, XMMRegister src, uint8_t mask);
+@@ -913,8 +914,8 @@ class V8_EXPORT_PRIVATE Assembler : public AssemblerBa
+ void jmp(Handle<Code> target, RelocInfo::Mode rmode);
+
+ // Jump near absolute indirect (r64)
+- void jmp(Register adr);
+- void jmp(Operand src);
++ void jmp(Register adr, bool notrack = false);
++ void jmp(Operand src, bool notrack = false);
+
+ // Unconditional jump relative to the current address. Low-level routine,
+ // use with caution!
diff --git a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc
new file mode 100644
index 000000000000..e3547c0a99ad
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.cc
@@ -0,0 +1,20 @@
+--- v8/src/codegen/x64/macro-assembler-x64.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/codegen/x64/macro-assembler-x64.cc
+@@ -50,6 +50,8 @@ Operand StackArgumentsAccessor::GetArgumentOperand(int
+ return Operand(rsp, kPCOnStackSize + index * kSystemPointerSize);
+ }
+
++void MacroAssembler::CodeEntry() { endbr64(); }
++
+ void MacroAssembler::Load(Register destination, ExternalReference source) {
+ if (root_array_available_ && options().enable_root_relative_access) {
+ intptr_t delta = RootRegisterOffsetForExternalReference(isolate(), source);
+@@ -1874,7 +1876,7 @@ void MacroAssembler::Switch(Register scratch, Register
+ cmpq(reg, Immediate(num_labels));
+ j(above_equal, &fallthrough);
+ leaq(table, MemOperand(&jump_table));
+- jmp(MemOperand(table, reg, times_8, 0));
++ jmp(MemOperand(table, reg, times_8, 0), /*notrack=*/true);
+ // Emit the jump table inline, under the assumption that it's not too big.
+ Align(kSystemPointerSize);
+ bind(&jump_table);
diff --git a/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h
new file mode 100644
index 000000000000..4902d8a3346f
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_codegen_x64_macro-assembler-x64.h
@@ -0,0 +1,20 @@
+--- v8/src/codegen/x64/macro-assembler-x64.h.orig 2023-07-24 14:27:53 UTC
++++ v8/src/codegen/x64/macro-assembler-x64.h
+@@ -613,11 +613,14 @@ class V8_EXPORT_PRIVATE MacroAssembler
+
+ // Define a function entrypoint. This doesn't emit any code for this
+ // architecture, as control-flow integrity is not supported for it.
+- void CodeEntry() {}
++ void CodeEntry();
+ // Define an exception handler.
+- void ExceptionHandler() {}
++ void ExceptionHandler() { CodeEntry(); }
+ // Define an exception handler and bind a label.
+- void BindExceptionHandler(Label* label) { bind(label); }
++ void BindExceptionHandler(Label* label) {
++ bind(label);
++ CodeEntry();
++ }
+
+ // ---------------------------------------------------------------------------
+ // Pointer compression support
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 d06138083f86..0b768baa490d 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-12-06 08:09:13 UTC
+--- v8/src/compiler/backend/ia32/instruction-selector-ia32.cc.orig 2023-07-24 14:27:53 UTC
+++ v8/src/compiler/backend/ia32/instruction-selector-ia32.cc
-@@ -3034,6 +3034,7 @@ void InstructionSelector::VisitI8x16Shuffle(Node* node
+@@ -3043,6 +3043,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;
-@@ -3087,6 +3088,9 @@ void VisitMinOrMax(InstructionSelector* selector, Node
+@@ -3096,6 +3097,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_compiler_backend_x64_code-generator-x64.cc b/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc
new file mode 100644
index 000000000000..07e95b7fbc12
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_compiler_backend_x64_code-generator-x64.cc
@@ -0,0 +1,11 @@
+--- v8/src/compiler/backend/x64/code-generator-x64.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/compiler/backend/x64/code-generator-x64.cc
+@@ -6576,7 +6576,7 @@ void CodeGenerator::AssembleArchTableSwitch(Instructio
+ __ cmpl(input, Immediate(case_count));
+ __ j(above_equal, GetLabel(i.InputRpo(1)));
+ __ leaq(kScratchRegister, Operand(table));
+- __ jmp(Operand(kScratchRegister, input, times_8, 0));
++ __ jmp(Operand(kScratchRegister, input, times_8, 0), /*notrack=*/true);
+ }
+
+ void CodeGenerator::AssembleArchSelect(Instruction* instr,
diff --git a/www/iridium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc b/www/iridium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc
new file mode 100644
index 000000000000..e7c91e29bb3b
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_deoptimizer_x64_deoptimizer-x64.cc
@@ -0,0 +1,11 @@
+--- v8/src/deoptimizer/x64/deoptimizer-x64.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/deoptimizer/x64/deoptimizer-x64.cc
+@@ -21,7 +21,7 @@ ASSERT_OFFSET(Builtin::kDeoptimizationEntry_Lazy);
+ #undef ASSERT_OFFSET
+
+ const int Deoptimizer::kEagerDeoptExitSize = 4;
+-const int Deoptimizer::kLazyDeoptExitSize = 4;
++const int Deoptimizer::kLazyDeoptExitSize = 8;
+
+ Float32 RegisterValues::GetFloatRegister(unsigned n) const {
+ return Float32::FromBits(
diff --git a/www/iridium/files/patch-v8_src_execution_isolate.cc b/www/iridium/files/patch-v8_src_execution_isolate.cc
index d6b4ea9580ad..2d501dd475e8 100644
--- a/www/iridium/files/patch-v8_src_execution_isolate.cc
+++ b/www/iridium/files/patch-v8_src_execution_isolate.cc
@@ -1,4 +1,4 @@
---- v8/src/execution/isolate.cc.orig 2023-04-22 17:45:15 UTC
+--- v8/src/execution/isolate.cc.orig 2023-07-24 14:27:53 UTC
+++ v8/src/execution/isolate.cc
@@ -146,6 +146,10 @@
#include "src/execution/simulator-base.h"
@@ -11,12 +11,12 @@
extern "C" const uint8_t v8_Default_embedded_blob_code_[];
extern "C" uint32_t v8_Default_embedded_blob_code_size_;
extern "C" const uint8_t v8_Default_embedded_blob_data_[];
-@@ -3849,6 +3853,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
+@@ -3935,6 +3939,11 @@ void Isolate::InitializeDefaultEmbeddedBlob() {
uint32_t code_size = DefaultEmbeddedBlobCodeSize();
const uint8_t* data = DefaultEmbeddedBlobData();
uint32_t data_size = DefaultEmbeddedBlobDataSize();
+
-+#if defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
++#if defined(V8_OS_OPENBSD)
+ mprotect(reinterpret_cast<void *>(const_cast<uint8_t *>(code)),
+ code_size, PROT_READ | PROT_EXEC);
+#endif
diff --git a/www/iridium/files/patch-v8_src_flags_flags.cc b/www/iridium/files/patch-v8_src_flags_flags.cc
new file mode 100644
index 000000000000..70cc20fc2726
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_flags_flags.cc
@@ -0,0 +1,36 @@
+--- v8/src/flags/flags.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/flags/flags.cc
+@@ -12,6 +12,10 @@
+ #include <iomanip>
+ #include <sstream>
+
++#if V8_OS_OPENBSD
++#include <sys/mman.h>
++#endif
++
+ #include "src/base/functional.h"
+ #include "src/base/logging.h"
+ #include "src/base/platform/platform.h"
+@@ -31,7 +35,11 @@
+ namespace v8::internal {
+
+ // Define {v8_flags}, declared in flags.h.
++#if V8_OS_OPENBSD
++FlagValues v8_flags __attribute__((section(".openbsd.mutable")));
++#else
+ FlagValues v8_flags;
++#endif
+
+ // {v8_flags} needs to be aligned to a memory page, and the size needs to be a
+ // multiple of a page size. This is required for memory-protection of the memory
+@@ -822,6 +830,10 @@ void FlagList::FreezeFlags() {
+ // Note that for string flags we only protect the pointer itself, but not the
+ // string storage. TODO(12887): Fix this.
+ base::OS::SetDataReadOnly(&v8_flags, sizeof(v8_flags));
++#if V8_OS_OPENBSD
++ if (mimmutable(&v8_flags, sizeof(v8_flags)) == -1)
++ FATAL("unable to set immutability of v8_flags");
++#endif
+ }
+
+ // static
diff --git a/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h b/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h
new file mode 100644
index 000000000000..c57c616ac085
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64-inl.h
@@ -0,0 +1,14 @@
+--- v8/src/maglev/x64/maglev-assembler-x64-inl.h.orig 2023-07-24 14:27:53 UTC
++++ v8/src/maglev/x64/maglev-assembler-x64-inl.h
+@@ -207,7 +207,10 @@ void MaglevAssembler::PushReverse(T... vals) {
+ detail::PushAllHelper<T...>::PushReverse(this, vals...);
+ }
+
+-inline void MaglevAssembler::BindJumpTarget(Label* label) { bind(label); }
++inline void MaglevAssembler::BindJumpTarget(Label* label) {
++ bind(label);
++ endbr64();
++}
+
+ inline void MaglevAssembler::BindBlock(BasicBlock* block) {
+ bind(block->label());
diff --git a/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc b/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc
new file mode 100644
index 000000000000..dc3314a3169d
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_maglev_x64_maglev-assembler-x64.cc
@@ -0,0 +1,14 @@
+--- v8/src/maglev/x64/maglev-assembler-x64.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/maglev/x64/maglev-assembler-x64.cc
+@@ -636,8 +636,10 @@ void MaglevAssembler::TryTruncateDoubleToInt32(Registe
+ void MaglevAssembler::Prologue(Graph* graph) {
+ BailoutIfDeoptimized(rbx);
+
++ CodeEntry();
++
+ if (graph->has_recursive_calls()) {
+- bind(code_gen_state()->entry_label());
++ BindJumpTarget(code_gen_state()->entry_label());
+ }
+
+ // Tiering support.
diff --git a/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc b/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc
new file mode 100644
index 000000000000..2ac5fc9723a7
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.cc
@@ -0,0 +1,22 @@
+--- v8/src/regexp/x64/regexp-macro-assembler-x64.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/regexp/x64/regexp-macro-assembler-x64.cc
+@@ -110,6 +110,7 @@ RegExpMacroAssemblerX64::RegExpMacroAssemblerX64(Isola
+ backtrack_label_(),
+ exit_label_() {
+ DCHECK_EQ(0, registers_to_save % 2);
++ __ CodeEntry();
+ __ jmp(&entry_label_); // We'll write the entry code when we know more.
+ __ bind(&start_label_); // And then continue from here.
+ }
+@@ -714,6 +715,11 @@ bool RegExpMacroAssemblerX64::CheckSpecialClassRanges(
+ // Match any character.
+ return true;
+ }
++}
++
++void RegExpMacroAssemblerX64::BindJumpTarget(Label* label) {
++ Bind(label);
++ __ CodeEntry();
+ }
+
+ void RegExpMacroAssemblerX64::Fail() {
diff --git a/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h b/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h
new file mode 100644
index 000000000000..f08cb279ffc9
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_regexp_x64_regexp-macro-assembler-x64.h
@@ -0,0 +1,12 @@
+--- v8/src/regexp/x64/regexp-macro-assembler-x64.h.orig 2023-07-24 14:27:53 UTC
++++ v8/src/regexp/x64/regexp-macro-assembler-x64.h
+@@ -59,6 +59,9 @@ class V8_EXPORT_PRIVATE RegExpMacroAssemblerX64
+ void CheckPosition(int cp_offset, Label* on_outside_input) override;
+ bool CheckSpecialClassRanges(StandardCharacterSet type,
+ Label* on_no_match) override;
++
++ void BindJumpTarget(Label* label) override;
++
+ void Fail() override;
+ Handle<HeapObject> GetCode(Handle<String> source) override;
+ void GoTo(Label* label) override;
diff --git a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
index 759d8b049953..73a1018d5f48 100644
--- a/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
+++ b/www/iridium/files/patch-v8_src_snapshot_embedded_platform-embedded-file-writer-generic.cc
@@ -1,8 +1,8 @@
---- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-04-22 17:45:15 UTC
+--- v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc.orig 2023-07-24 14:27:53 UTC
+++ v8/src/snapshot/embedded/platform-embedded-file-writer-generic.cc
@@ -9,6 +9,10 @@
- #include "src/objects/code.h"
+ #include "src/objects/instruction-stream.h"
+#if V8_OS_OPENBSD
+#include <sys/param.h>
@@ -11,31 +11,29 @@
namespace v8 {
namespace internal {
-@@ -35,6 +39,10 @@ const char* DirectiveAsString(DataDirective directive)
+@@ -35,6 +39,8 @@ const char* DirectiveAsString(DataDirective directive)
void PlatformEmbeddedFileWriterGeneric::SectionText() {
if (target_os_ == EmbeddedTargetOs::kChromeOS) {
fprintf(fp_, ".section .text.hot.embedded\n");
-+#if !defined(V8_TARGET_ARCH_IA32)
+ } else if (target_os_ == EmbeddedTargetOs::kOpenBSD) {
+ fprintf(fp_, ".section .openbsd.mutable,\"a\"\n");
-+#endif
} else {
fprintf(fp_, ".section .text\n");
}
-@@ -66,6 +74,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli
+@@ -66,6 +72,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToCodeAli
// On these architectures and platforms, we remap the builtins, so need these
// to be aligned on a page boundary.
fprintf(fp_, ".balign 4096\n");
-+#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
++#elif V8_OS_OPENBSD
+ fprintf(fp_, ".balign %d\n", PAGE_SIZE);
#elif V8_TARGET_ARCH_X64
// On x64 use 64-bytes code alignment to allow 64-bytes loop header alignment.
static_assert(64 >= kCodeAlignment);
-@@ -86,6 +96,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz
+@@ -86,6 +94,8 @@ void PlatformEmbeddedFileWriterGeneric::AlignToPageSiz
(V8_TARGET_ARCH_X64 || V8_TARGET_ARCH_ARM64)
// Since the builtins are remapped, need to pad until the next page boundary.
fprintf(fp_, ".balign 4096\n");
-+#elif defined(V8_OS_OPENBSD) && !defined(V8_TARGET_ARCH_IA32)
++#elif V8_OS_OPENBSD
+ fprintf(fp_, ".balign %d\n", PAGE_SIZE);
#endif
}
diff --git a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
index f81a0ec7dca1..2d7dd9b9fa36 100644
--- a/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
+++ b/www/iridium/files/patch-v8_src_trap-handler_handler-inside-posix.cc
@@ -1,6 +1,6 @@
---- v8/src/trap-handler/handler-inside-posix.cc.orig 2023-01-17 19:19:00 UTC
+--- v8/src/trap-handler/handler-inside-posix.cc.orig 2023-07-24 14:27:53 UTC
+++ v8/src/trap-handler/handler-inside-posix.cc
-@@ -55,6 +55,8 @@ namespace trap_handler {
+@@ -59,6 +59,8 @@ namespace trap_handler {
#define CONTEXT_REG(reg, REG) &uc->uc_mcontext->__ss.__##reg
#elif V8_OS_FREEBSD
#define CONTEXT_REG(reg, REG) &uc->uc_mcontext.mc_##reg
@@ -9,7 +9,7 @@
#else
#error "Unsupported platform."
#endif
-@@ -64,8 +66,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) {
+@@ -68,8 +70,12 @@ bool IsKernelGeneratedSignal(siginfo_t* info) {
// si_code at its default of 0 for signals that don’t originate in hardware.
// The other conditions are only relevant for Linux.
return info->si_code > 0 && info->si_code != SI_USER &&
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 75dfcdd81414..3be2d7659163 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,4 +1,4 @@
---- v8/src/trap-handler/trap-handler.h.orig 2022-10-05 07:34:01 UTC
+--- v8/src/trap-handler/trap-handler.h.orig 2023-07-24 14:27:53 UTC
+++ v8/src/trap-handler/trap-handler.h
@@ -20,7 +20,7 @@ namespace trap_handler {
// X64 on Linux, Windows, MacOS, FreeBSD.
@@ -7,5 +7,5 @@
- 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_DARWIN
+ // Arm64 (non-simulator) on Mac and Linux.
+ #elif V8_TARGET_ARCH_ARM64 && V8_HOST_ARCH_ARM64 && \
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 323c87d35b66..1fd8b965f41f 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,6 +1,6 @@
---- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-04-22 17:45:15 UTC
+--- v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h.orig 2023-07-24 14:27:53 UTC
+++ v8/src/wasm/baseline/ia32/liftoff-assembler-ia32.h
-@@ -424,7 +424,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
+@@ -419,7 +419,7 @@ void LiftoffAssembler::StoreTaggedPointer(Register dst
}
void LiftoffAssembler::Load(LiftoffRegister dst, Register src_addr,
@@ -9,7 +9,7 @@
LoadType type, uint32_t* protected_load_pc,
bool /* is_load_mem */, bool /* i64_offset */,
bool needs_shift) {
-@@ -504,7 +504,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
+@@ -499,7 +499,7 @@ void LiftoffAssembler::Load(LiftoffRegister dst, Regis
}
void LiftoffAssembler::Store(Register dst_addr, Register offset_reg,
@@ -18,7 +18,7 @@
StoreType type, LiftoffRegList pinned,
uint32_t* protected_store_pc,
bool /* is_store_mem */, bool /* i64_offset */) {
-@@ -573,7 +573,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
+@@ -568,7 +568,7 @@ void LiftoffAssembler::Store(Register dst_addr, Regist
}
void LiftoffAssembler::AtomicLoad(LiftoffRegister dst, Register src_addr,
@@ -27,7 +27,7 @@
LoadType type, LiftoffRegList /* pinned */,
bool /* i64_offset */) {
if (type.value() != LoadType::kI64Load) {
-@@ -593,7 +593,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
+@@ -588,7 +588,7 @@ void LiftoffAssembler::AtomicLoad(LiftoffRegister dst,
}
void LiftoffAssembler::AtomicStore(Register dst_addr, Register offset_reg,
@@ -36,7 +36,7 @@
StoreType type, LiftoffRegList pinned,
bool /* i64_offset */) {
DCHECK_NE(offset_reg, no_reg);
-@@ -663,7 +663,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
+@@ -658,7 +658,7 @@ enum Binop { kAdd, kSub, kAnd, kOr, kXor, kExchange };
inline void AtomicAddOrSubOrExchange32(LiftoffAssembler* lasm, Binop binop,
Register dst_addr, Register offset_reg,
@@ -45,7 +45,7 @@
LiftoffRegister value,
LiftoffRegister result, StoreType type) {
DCHECK_EQ(value, result);
-@@ -730,7 +730,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
+@@ -725,7 +725,7 @@ inline void AtomicAddOrSubOrExchange32(LiftoffAssemble
}
inline void AtomicBinop32(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -54,7 +54,7 @@
LiftoffRegister value, LiftoffRegister result,
StoreType type) {
DCHECK_EQ(value, result);
-@@ -842,7 +842,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
+@@ -837,7 +837,7 @@ inline void AtomicBinop32(LiftoffAssembler* lasm, Bino
}
inline void AtomicBinop64(LiftoffAssembler* lasm, Binop op, Register dst_addr,
@@ -63,7 +63,7 @@
LiftoffRegister value, LiftoffRegister result) {
// We need {ebx} here, which is the root register. As the root register it
// needs special treatment. As we use {ebx} directly in the code below, we
-@@ -934,7 +934,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
+@@ -929,7 +929,7 @@ inline void AtomicBinop64(LiftoffAssembler* lasm, Bino
} // namespace liftoff
void LiftoffAssembler::AtomicAdd(Register dst_addr, Register offset_reg,
@@ -72,7 +72,7 @@
LiftoffRegister result, StoreType type,
bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
-@@ -948,7 +948,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
+@@ -943,7 +943,7 @@ void LiftoffAssembler::AtomicAdd(Register dst_addr, Re
}
void LiftoffAssembler::AtomicSub(Register dst_addr, Register offset_reg,
@@ -81,7 +81,7 @@
LiftoffRegister result, StoreType type,
bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
-@@ -961,7 +961,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
+@@ -956,7 +956,7 @@ void LiftoffAssembler::AtomicSub(Register dst_addr, Re
}
void LiftoffAssembler::AtomicAnd(Register dst_addr, Register offset_reg,
@@ -90,7 +90,7 @@
LiftoffRegister result, StoreType type,
bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
-@@ -975,7 +975,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
+@@ -970,7 +970,7 @@ void LiftoffAssembler::AtomicAnd(Register dst_addr, Re
}
void LiftoffAssembler::AtomicOr(Register dst_addr, Register offset_reg,
@@ -99,7 +99,7 @@
LiftoffRegister result, StoreType type,
bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
-@@ -989,7 +989,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
+@@ -984,7 +984,7 @@ void LiftoffAssembler::AtomicOr(Register dst_addr, Reg
}
void LiftoffAssembler::AtomicXor(Register dst_addr, Register offset_reg,
@@ -108,7 +108,7 @@
LiftoffRegister result, StoreType type,
bool /* i64_offset */) {
if (type.value() == StoreType::kI64Store) {
-@@ -1003,7 +1003,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
+@@ -998,7 +998,7 @@ void LiftoffAssembler::AtomicXor(Register dst_addr, Re
}
void LiftoffAssembler::AtomicExchange(Register dst_addr, Register offset_reg,
@@ -117,7 +117,7 @@
LiftoffRegister value,
LiftoffRegister result, StoreType type,
bool /* i64_offset */) {
-@@ -1018,7 +1018,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
+@@ -1013,7 +1013,7 @@ void LiftoffAssembler::AtomicExchange(Register dst_add
}
void LiftoffAssembler::AtomicCompareExchange(
diff --git a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc
new file mode 100644
index 000000000000..72ac1bd16ffb
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.cc
@@ -0,0 +1,51 @@
+--- v8/src/wasm/jump-table-assembler.cc.orig 2023-07-24 14:27:53 UTC
++++ v8/src/wasm/jump-table-assembler.cc
+@@ -52,15 +52,21 @@ void JumpTableAssembler::InitializeJumpsToLazyCompileT
+ #if V8_TARGET_ARCH_X64
+ void JumpTableAssembler::EmitLazyCompileJumpSlot(uint32_t func_index,
+ Address lazy_compile_target) {
++ intptr_t displacement =
++ static_cast<intptr_t>(reinterpret_cast<uint8_t*>(lazy_compile_target) -
++ (pc_ + 9) - kNearJmpInstrSize);
++ if (!is_int32(displacement)) return;
++ CodeEntry(); // 4 bytes
+ // Use a push, because mov to an extended register takes 6 bytes.
+- pushq_imm32(func_index); // 5 bytes
+- EmitJumpSlot(lazy_compile_target); // 5 bytes
++ pushq_imm32(func_index); // 5 bytes
++ near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes
+ }
+
+ bool JumpTableAssembler::EmitJumpSlot(Address target) {
+ intptr_t displacement = static_cast<intptr_t>(
+- reinterpret_cast<uint8_t*>(target) - pc_ - kNearJmpInstrSize);
++ reinterpret_cast<uint8_t*>(target) - (pc_ + 4) - kNearJmpInstrSize);
+ if (!is_int32(displacement)) return false;
++ CodeEntry(); // 4 bytes
+ near_jmp(displacement, RelocInfo::NO_INFO); // 5 bytes
+ return true;
+ }
+@@ -68,11 +74,12 @@ bool JumpTableAssembler::EmitJumpSlot(Address target)
+ void JumpTableAssembler::EmitFarJumpSlot(Address target) {
+ Label data;
+ int start_offset = pc_offset();
++ CodeEntry(); // 4 bytes
+ jmp(Operand(&data)); // 6 bytes
+- Nop(2); // 2 bytes
++ Nop(6); // 6 bytes
+ // The data must be properly aligned, so it can be patched atomically (see
+ // {PatchFarJumpSlot}).
+- DCHECK_EQ(start_offset + kSystemPointerSize, pc_offset());
++ DCHECK_EQ(start_offset + kFarJumpTableSlotOffset, pc_offset());
+ USE(start_offset);
+ bind(&data);
+ dq(target); // 8 bytes
+@@ -83,7 +90,7 @@ void JumpTableAssembler::PatchFarJumpSlot(Address slot
+ // The slot needs to be pointer-size aligned so we can atomically update it.
+ DCHECK(IsAligned(slot, kSystemPointerSize));
+ // Offset of the target is at 8 bytes, see {EmitFarJumpSlot}.
+- reinterpret_cast<std::atomic<Address>*>(slot + kSystemPointerSize)
++ reinterpret_cast<std::atomic<Address>*>(slot + kFarJumpTableSlotOffset)
+ ->store(target, std::memory_order_relaxed);
+ // The update is atomic because the address is properly aligned.
+ // Because of cache coherence, the data update will eventually be seen by all
diff --git a/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h
new file mode 100644
index 000000000000..b9a08a85b23b
--- /dev/null
+++ b/www/iridium/files/patch-v8_src_wasm_jump-table-assembler.h
@@ -0,0 +1,16 @@
+--- v8/src/wasm/jump-table-assembler.h.orig 2023-07-24 14:27:53 UTC
++++ v8/src/wasm/jump-table-assembler.h
+@@ -185,9 +185,10 @@ class V8_EXPORT_PRIVATE JumpTableAssembler : public Ma
+ // boundaries. The jump table line size has been chosen to satisfy this.
+ #if V8_TARGET_ARCH_X64
+ static constexpr int kJumpTableLineSize = 64;
+- static constexpr int kJumpTableSlotSize = 5;
+- static constexpr int kFarJumpTableSlotSize = 16;
+- static constexpr int kLazyCompileTableSlotSize = 10;
++ static constexpr int kJumpTableSlotSize = 5 + 4;
++ static constexpr int kFarJumpTableSlotOffset = 2 * kSystemPointerSize;
++ static constexpr int kFarJumpTableSlotSize = 16 + 8;
++ static constexpr int kLazyCompileTableSlotSize = 10 + 4;
+ #elif V8_TARGET_ARCH_IA32
+ static constexpr int kJumpTableLineSize = 64;
+ static constexpr int kJumpTableSlotSize = 5;
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 7fa210a47c9e..c928f02458f4 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-12-06 08:09:13 UTC
+--- weblayer/browser/browser_main_parts_impl.cc.orig 2023-07-24 14:27:53 UTC
+++ weblayer/browser/browser_main_parts_impl.cc
-@@ -80,7 +80,7 @@
+@@ -81,7 +81,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
-@@ -197,7 +197,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
+@@ -200,7 +200,7 @@ int BrowserMainPartsImpl::PreEarlyInitialization() {
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.