aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2022-06-18 05:51:42 +0000
committerRene Ladan <rene@FreeBSD.org>2022-06-22 08:02:35 +0000
commit80ffbf089df7cc8d4b4879e23f6816fc7e338f7f (patch)
tree23b8c15850649e788bdcc2a8b3ed62ff0d793988
parente408d5e4ec74b0d09aa3306a49065cac0c429427 (diff)
downloadports-80ffbf089df7cc8d4b4879e23f6816fc7e338f7f.tar.gz
ports-80ffbf089df7cc8d4b4879e23f6816fc7e338f7f.zip
www/chromium: update to 103.0.5060.53
-rw-r--r--www/chromium/Makefile4
-rw-r--r--www/chromium/distinfo14
-rw-r--r--www/chromium/files/patch-BUILD.gn10
-rw-r--r--www/chromium/files/patch-base_BUILD.gn22
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc13
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h6
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc4
-rw-r--r--www/chromium/files/patch-base_files_dir__reader__linux.h39
-rw-r--r--www/chromium/files/patch-base_files_dir__reader__posix.h20
-rw-r--r--www/chromium/files/patch-base_files_file__util__posix.cc4
-rw-r--r--www/chromium/files/patch-base_files_file__util__unittest.cc6
-rw-r--r--www/chromium/files/patch-base_i18n_icu__util.cc6
-rw-r--r--www/chromium/files/patch-base_logging__unittest.cc4
-rw-r--r--www/chromium/files/patch-base_memory_platform__shared__memory__region.h6
-rw-r--r--www/chromium/files/patch-base_process_launch.h4
-rw-r--r--www/chromium/files/patch-base_process_launch__posix.cc4
-rw-r--r--www/chromium/files/patch-base_process_process__metrics.cc12
-rw-r--r--www/chromium/files/patch-base_process_process__metrics.h28
-rw-r--r--www/chromium/files/patch-base_process_process__unittest.cc4
-rw-r--r--www/chromium/files/patch-base_synchronization_lock__impl.h6
-rw-r--r--www/chromium/files/patch-base_system_sys__info.cc4
-rw-r--r--www/chromium/files/patch-base_system_sys__info.h6
-rw-r--r--www/chromium/files/patch-base_system_sys__info__posix.cc10
-rw-r--r--www/chromium/files/patch-base_system_sys__info__unittest.cc4
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread__linux.cc22
-rw-r--r--www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc6
-rw-r--r--www/chromium/files/patch-base_trace__event_process__memory__dump.cc6
-rw-r--r--www/chromium/files/patch-build_config_compiler_BUILD.gn21
-rw-r--r--www/chromium/files/patch-build_config_rust.gni4
-rw-r--r--www/chromium/files/patch-build_linux_unbundle_libxml.gn10
-rw-r--r--www/chromium/files/patch-cc_BUILD.gn6
-rw-r--r--www/chromium/files/patch-chrome_app_app__management__strings.grdp10
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__command__ids.h13
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main.cc6
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main__delegate.cc18
-rw-r--r--www/chromium/files/patch-chrome_app_chromium__strings.grd18
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd8
-rw-r--r--www/chromium/files/patch-chrome_app_google__chrome__strings.grd18
-rw-r--r--www/chromium/files/patch-chrome_app_theme_theme__resources.grd8
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc33
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__resources.grd4
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc24
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc32
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_component__updater_registration.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd12
-rw-r--r--www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__item__model.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.cc35
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__prefs.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h12
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.cc21
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h19
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc (renamed from www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc)6
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc (renamed from www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc)8
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h (renamed from www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h)6
-rw-r--r--www/chromium/files/patch-chrome_browser_platform__util__linux.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc17
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_route.ts4
-rw-r--r--www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__helper.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__service.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc37
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__commands.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__commands.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc39
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc20
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.cc18
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__features.h12
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.cc16
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__paths.h4
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.cc14
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h12
-rw-r--r--www/chromium/files/patch-chrome_common_url__constants.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_url__constants.h4
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.cc10
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.h8
-rw-r--r--www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.cc20
-rw-r--r--www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.h20
-rw-r--r--www/chromium/files/patch-chrome_test_BUILD.gn4
-rw-r--r--www/chromium/files/patch-chrome_test_interaction_interaction__sequence__browser__util.cc11
-rw-r--r--www/chromium/files/patch-chrome_updater_app_app__install.cc4
-rw-r--r--www/chromium/files/patch-chrome_updater_configurator.cc4
-rw-r--r--www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc47
-rw-r--r--www/chromium/files/patch-chrome_updater_util.cc4
-rw-r--r--www/chromium/files/patch-chrome_utility_services.cc35
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc16
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc6
-rw-r--r--www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc4
-rw-r--r--www/chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc11
-rw-r--r--www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc11
-rw-r--r--www/chromium/files/patch-components_autofill__payments__strings.grdp4
-rw-r--r--www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc4
-rw-r--r--www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc6
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc8
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.h12
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.cc6
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__list.h10
-rw-r--r--www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc4
-rw-r--r--www/chromium/files/patch-components_flags__ui_flags__state.cc12
-rw-r--r--www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc4
-rw-r--r--www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc4
-rw-r--r--www/chromium/files/patch-components_os__crypt_libsecret__util__linux.cc4
-rw-r--r--www/chromium/files/patch-components_os__crypt_os__crypt.h49
-rw-r--r--www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc4
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_login__database.cc8
-rw-r--r--www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc6
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc8
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc6
-rw-r--r--www/chromium/files/patch-components_policy_resources_policy__templates.json44
-rw-r--r--www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc8
-rw-r--r--www/chromium/files/patch-components_storage__monitor_BUILD.gn12
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc4
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc6
-rw-r--r--www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h6
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner__impl.cc22
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc4
-rw-r--r--www/chromium/files/patch-content_browser_browser__main__loop.cc10
-rw-r--r--www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc14
-rw-r--r--www/chromium/files/patch-content_browser_download_download__manager__impl.cc8
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc10
-rw-r--r--www/chromium/files/patch-content_browser_media_media__interface__proxy.cc6
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc29
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h20
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc10
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc8
-rw-r--r--www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc24
-rw-r--r--www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc4
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__main.cc14
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.cc8
-rw-r--r--www/chromium/files/patch-content_public_common_content__features.h4
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.cc6
-rw-r--r--www/chromium/files/patch-content_public_common_content__switches.h4
-rw-r--r--www/chromium/files/patch-content_renderer_render__thread__impl.cc12
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc12
-rw-r--r--www/chromium/files/patch-content_shell_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc33
-rw-r--r--www/chromium/files/patch-content_test_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_utility_services.cc31
-rw-r--r--www/chromium/files/patch-content_utility_utility__main.cc17
-rw-r--r--www/chromium/files/patch-content_zygote_zygote__main__linux.cc12
-rw-r--r--www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni4
-rw-r--r--www/chromium/files/patch-extensions_browser_extension__prefs.cc4
-rw-r--r--www/chromium/files/patch-extensions_common_command.cc (renamed from www/chromium/files/patch-chrome_common_extensions_command.cc)8
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__ozone.cc11
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc22
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc11
-rw-r--r--www/chromium/files/patch-gpu_config_gpu__control__list.cc6
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__init.cc16
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h4
-rw-r--r--www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc4
-rw-r--r--www/chromium/files/patch-ipc_ipc__channel.h4
-rw-r--r--www/chromium/files/patch-media_audio_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_audio_audio__features.cc4
-rw-r--r--www/chromium/files/patch-media_base_audio__latency.cc4
-rw-r--r--www/chromium/files/patch-media_base_media__switches.cc10
-rw-r--r--www/chromium/files/patch-media_base_media__switches.h6
-rw-r--r--www/chromium/files/patch-media_base_supported__types.cc6
-rw-r--r--www/chromium/files/patch-media_capture_video_video__capture__device__client.cc4
-rw-r--r--www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc4
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc4
-rw-r--r--www/chromium/files/patch-media_media__options.gni8
-rw-r--r--www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h4
-rw-r--r--www/chromium/files/patch-media_webrtc_audio__processor.cc4
-rw-r--r--www/chromium/files/patch-media_webrtc_helpers__unittests.cc4
-rw-r--r--www/chromium/files/patch-media_webrtc_webrtc__features.cc11
-rw-r--r--www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni4
-rw-r--r--www/chromium/files/patch-net_BUILD.gn28
-rw-r--r--www/chromium/files/patch-net_base_sockaddr__util__posix.cc (renamed from www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc)7
-rw-r--r--www/chromium/files/patch-net_base_sockaddr__util__posix__unittest.cc12
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc.cc4
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc.h4
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc4
-rw-r--r--www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc4
-rw-r--r--www/chromium/files/patch-net_dns_host__resolver__manager.cc4
-rw-r--r--www/chromium/files/patch-net_socket_tcp__socket__posix.cc16
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__posix.cc8
-rw-r--r--www/chromium/files/patch-net_third__party_quiche_BUILD.gn38
-rw-r--r--www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc6
-rw-r--r--www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc8
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context__builder.cc4
-rw-r--r--www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc6
-rw-r--r--www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h4
-rw-r--r--www/chromium/files/patch-printing_printing__features.cc11
-rw-r--r--www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc4
-rw-r--r--www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc30
-rw-r--r--www/chromium/files/patch-remoting_host_remoting__me2me__host.cc56
-rw-r--r--www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc29
-rw-r--r--www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc17
-rw-r--r--www/chromium/files/patch-sandbox_policy_BUILD.gn6
-rw-r--r--www/chromium/files/patch-sandbox_policy_sandbox__type.cc47
-rw-r--r--www/chromium/files/patch-sandbox_policy_switches.cc6
-rw-r--r--www/chromium/files/patch-sandbox_policy_switches.h6
-rw-r--r--www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc44
-rw-r--r--www/chromium/files/patch-services_device_hid_hid__connection__fido.cc5
-rw-r--r--www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc5
-rw-r--r--www/chromium/files/patch-services_device_hid_hid__service__fido.cc5
-rw-r--r--www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc5
-rw-r--r--www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc4
-rw-r--r--www/chromium/files/patch-services_network_BUILD.gn4
-rw-r--r--www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc4
-rw-r--r--www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc21
-rw-r--r--www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc4
-rw-r--r--www/chromium/files/patch-third__party_angle_BUILD.gn10
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp14
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h4
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h6
-rw-r--r--www/chromium/files/patch-third__party_angle_util_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc8
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc14
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json522
-rw-r--r--www/chromium/files/patch-third__party_dawn_generator_dawn__version__generator.py22
-rw-r--r--www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h10
-rw-r--r--www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h10
-rw-r--r--www/chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp10
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm2070
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h2072
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h2066
-rw-r--r--www/chromium/files/patch-third__party_ipcz_src_reference__drivers_random.cc20
-rw-r--r--www/chromium/files/patch-third__party_pdfium_core_fxge_linux_fx__linux__impl.cpp4
-rw-r--r--www/chromium/files/patch-third__party_pdfium_fxjs_fx__date__helpers.cpp6
-rw-r--r--www/chromium/files/patch-third__party_perfetto_src_base_test_vm__test__utils.cc4
-rw-r--r--www/chromium/files/patch-third__party_sqlite_src_amalgamation_sqlite3.c6
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_Common_Configurator.cpp13
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_Common_MutexLock.hpp11
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_Common_SharedLibrary.hpp11
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_Main_SwiftConfig.cpp14
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Display.cpp20
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_Surface.cpp11
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.cpp29
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libEGL_libEGL.hpp11
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_OpenGL_libGLESv2_libGLESv2.hpp11
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_System_Configurator.cpp12
-rw-r--r--www/chromium/files/patch-third__party_tflite_features.gni9
-rw-r--r--www/chromium/files/patch-third__party_webrtc_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_webrtc_rtc__base_network.cc6
-rw-r--r--www/chromium/files/patch-third__party_zlib_BUILD.gn4
-rw-r--r--www/chromium/files/patch-tools_gn_build_gen.py6
-rw-r--r--www/chromium/files/patch-tools_memory_partition__allocator_inspect__utils.h11
-rw-r--r--www/chromium/files/patch-ui_aura_screen__ozone.h4
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.cc6
-rw-r--r--www/chromium/files/patch-ui_color_color__id.h4
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.cc4
-rw-r--r--www/chromium/files/patch-ui_compositor_compositor.h4
-rw-r--r--www/chromium/files/patch-ui_display_screen.h8
-rw-r--r--www/chromium/files/patch-ui_events_event__switches.cc8
-rw-r--r--www/chromium/files/patch-ui_events_event__switches.h6
-rw-r--r--www/chromium/files/patch-ui_gfx_mojom_buffer__types__mojom__traits.cc4
-rw-r--r--www/chromium/files/patch-ui_gl_BUILD.gn6
-rw-r--r--www/chromium/files/patch-ui_gl_gl__image__glx__native__pixmap.cc4
-rw-r--r--www/chromium/files/patch-ui_gtk_printing_print__dialog__gtk.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc4
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb8
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb8
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb8
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb8
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__th.xtb8
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb8
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-TW.xtb8
-rw-r--r--www/chromium/files/patch-ui_views_examples_widget__example.cc4
-rw-r--r--www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc4
-rw-r--r--www/chromium/files/patch-ui_views_linux__ui_linux__ui.h6
-rw-r--r--www/chromium/files/patch-ui_views_test_ui__controls__factory__desktop__aura__ozone.cc20
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__drag__drop__client__ozone.h11
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__screen__ozone.cc8
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc22
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform__impl__interactive__uitest.cc11
-rw-r--r--www/chromium/files/patch-ui_views_widget_native__widget__aura.cc29
-rw-r--r--www/chromium/files/patch-ui_views_widget_widget.cc4
-rw-r--r--www/chromium/files/patch-v8_BUILD.gn8
-rw-r--r--www/chromium/files/patch-v8_src_api_api.cc8
-rw-r--r--www/chromium/files/patch-v8_src_base_atomicops.h13
-rw-r--r--www/chromium/files/patch-v8_src_base_platform_platform-posix.cc6
-rw-r--r--www/chromium/files/patch-v8_src_compiler_backend_ia32_instruction-selector-ia32.cc6
-rw-r--r--www/chromium/files/patch-v8_src_diagnostics_perf-jit.cc4
-rw-r--r--www/chromium/files/patch-v8_src_diagnostics_perf-jit.h4
-rw-r--r--www/chromium/files/patch-weblayer_browser_browser__main__parts__impl.cc4
-rw-r--r--www/chromium/files/patch-weblayer_browser_content__browser__client__impl.cc6
338 files changed, 5758 insertions, 3886 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index ef6a49dbe35a..c1d35882ffb0 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,7 +1,7 @@
# Created by: Florent Thoumie <flz@FreeBSD.org>
PORTNAME= chromium
-PORTVERSION= 102.0.5005.115
+PORTVERSION= 103.0.5060.53
CATEGORIES= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:fonts
@@ -197,7 +197,7 @@ SNDIO_VARS_OFF= GN_ARGS+=use_sndio=false
.include "Makefile.tests"
TEST_DISTFILES= ${PORTNAME}-${DISTVERSION}-testdata${EXTRACT_SUFX} \
- test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz:fonts
+ test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz:fonts
TEST_ALL_TARGET= ${TEST_TARGETS}
.include <bsd.port.options.mk>
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index d27ac26ad93a..05d2f47cc3dc 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1654845180
-SHA256 (chromium-102.0.5005.115.tar.xz) = 301d40e5373b6dad9bc6aeb6898116d1f7dd2d0589ed18e108c56e2290df47e6
-SIZE (chromium-102.0.5005.115.tar.xz) = 1461900356
-SHA256 (chromium-102.0.5005.115-testdata.tar.xz) = f979682d8f159cdab5bc0f07ca6342e6e8f7718fedb30dac49bdd8f3f9739a4e
-SIZE (chromium-102.0.5005.115-testdata.tar.xz) = 260718224
-SHA256 (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = ec973eccd669d417fbf2d0a4dac730744a3174268ff062db5451b55c82bc3492
-SIZE (test_fonts-cd96fc55dc243f6c6f4cb63ad117cad6cd48dceb.tar.gz) = 26759650
+TIMESTAMP = 1655470095
+SHA256 (chromium-103.0.5060.53.tar.xz) = 0ecbae14670506da90c8bf744f83f52a64a5fff0765c2e2e066b0e68b805b101
+SIZE (chromium-103.0.5060.53.tar.xz) = 1470748636
+SHA256 (chromium-103.0.5060.53-testdata.tar.xz) = df1e4c1864c2b338553c19c58418c9c0fe4f9581e86d21ce3d2594594a3ec572
+SIZE (chromium-103.0.5060.53-testdata.tar.xz) = 260732188
+SHA256 (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = a2ca2962daf482a8f943163541e1c73ba4b2694fabcd2510981f2db4eda493c8
+SIZE (test_fonts-336e775eec536b2d785cc80eff6ac39051931286.tar.gz) = 32624734
diff --git a/www/chromium/files/patch-BUILD.gn b/www/chromium/files/patch-BUILD.gn
index 98eca15f4c7c..2ff3fd50744c 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ BUILD.gn
@@ -54,7 +54,7 @@ declare_args() {
root_extra_deps = []
@@ -17,7 +17,7 @@
"//net:net_unittests",
"//services:services_unittests",
"//services/service_manager/public/cpp",
-@@ -450,7 +449,7 @@ group("gn_all") {
+@@ -447,7 +446,7 @@ group("gn_all") {
]
}
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1159,7 +1167,7 @@ if (!is_ios) {
+@@ -1167,7 +1175,7 @@ if (!is_ios) {
data_deps += [ "//content/web_test:web_test_common_mojom_js_data_deps" ]
}
@@ -60,7 +60,7 @@
data_deps +=
[ "//third_party/breakpad:minidump_stackwalk($host_toolchain)" ]
}
-@@ -1168,7 +1176,7 @@ if (!is_ios) {
+@@ -1176,7 +1184,7 @@ if (!is_ios) {
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
@@ -69,7 +69,7 @@
data_deps += [ "//third_party/breakpad:dump_syms($host_toolchain)" ]
}
-@@ -1565,7 +1573,7 @@ group("chromium_builder_perf") {
+@@ -1580,7 +1588,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 7f88a789793f..61aca5553be5 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,6 +1,6 @@
---- base/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- base/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ base/BUILD.gn
-@@ -998,7 +998,7 @@ mixed_component("base") {
+@@ -1004,7 +1004,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
@@ -9,7 +9,7 @@
sources += [
"cpu_affinity_posix.cc",
"cpu_affinity_posix.h",
-@@ -1009,6 +1009,12 @@ mixed_component("base") {
+@@ -1015,6 +1015,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@@ -22,7 +22,7 @@
}
if (is_win) {
-@@ -1486,11 +1492,23 @@ mixed_component("base") {
+@@ -1496,11 +1502,23 @@ mixed_component("base") {
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
if (!use_sysroot &&
@@ -47,7 +47,7 @@
if (use_allocator_shim) {
sources += [
"allocator/allocator_shim.cc",
-@@ -1518,7 +1536,7 @@ mixed_component("base") {
+@@ -1528,7 +1546,7 @@ mixed_component("base") {
]
configs += [ "//base/allocator:mac_no_default_new_delete_symbols" ]
}
@@ -56,7 +56,7 @@
sources += [
"allocator/allocator_shim_override_cpp_symbols.h",
"allocator/allocator_shim_override_glibc_weak_symbols.h",
-@@ -1574,7 +1592,7 @@ mixed_component("base") {
+@@ -1584,7 +1602,7 @@ mixed_component("base") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -65,7 +65,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2147,6 +2165,42 @@ mixed_component("base") {
+@@ -2158,6 +2176,42 @@ mixed_component("base") {
}
}
@@ -108,7 +108,7 @@
# iOS
if (is_ios) {
sources -= [
-@@ -3436,7 +3490,7 @@ test("base_unittests") {
+@@ -3452,7 +3506,7 @@ test("base_unittests") {
}
}
@@ -117,7 +117,7 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3484,7 +3538,7 @@ test("base_unittests") {
+@@ -3500,7 +3554,7 @@ test("base_unittests") {
"posix/unix_domain_socket_unittest.cc",
"task/thread_pool/task_tracker_posix_unittest.cc",
]
@@ -126,7 +126,7 @@
sources += [
"cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3495,7 +3549,7 @@ test("base_unittests") {
+@@ -3511,7 +3565,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
@@ -135,7 +135,7 @@
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3657,7 +3711,7 @@ test("base_unittests") {
+@@ -3683,7 +3737,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h
index b92553d33536..f16c9802cfb4 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_address__space__randomization.h
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-05-19 14:06:27 UTC
+--- base/allocator/partition_allocator/address_space_randomization.h.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/address_space_randomization.h
@@ -38,7 +38,7 @@ AslrMask(uintptr_t bits) {
@@ -9,7 +9,7 @@
// We shouldn't allocate system pages at all for sanitizer builds. However,
// we do, and if random hint addresses interfere with address ranges
-@@ -121,7 +121,7 @@ AslrMask(uintptr_t bits) {
+@@ -128,7 +128,7 @@ AslrMask(uintptr_t bits) {
return AslrAddress(0x20000000ULL);
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc
new file mode 100644
index 000000000000..024aa1e97b2c
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc
@@ -0,0 +1,13 @@
+--- base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc.orig 2022-06-17 14:20:10 UTC
++++ base/allocator/partition_allocator/partition_alloc_base/rand_util_posix.cc
+@@ -88,6 +88,10 @@ void RandBytes(void* output, size_t output_length) {
+ return;
+ }
+ }
++#elif BUILDFLAG(IS_BSD)
++ if (getentropy(output, output_length) == 0) {
++ return;
++ }
+ #endif
+
+ // If the OS-specific mechanisms didn't work, fall through to reading from
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
index 380fe64d6f07..9bb71dd6268f 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-05-19 14:06:27 UTC
+--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -80,7 +80,7 @@ PartitionPageShift() {
+@@ -84,7 +84,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
index 294bfc737221..abf25cf132ff 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__page.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_page.h.orig 2022-05-19 14:06:27 UTC
+--- base/allocator/partition_allocator/partition_page.h.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/partition_page.h
-@@ -129,13 +129,14 @@ struct __attribute__((packed)) SlotSpanMetadata {
+@@ -130,13 +130,14 @@ struct SlotSpanMetadata {
PartitionBucket<thread_safe>* const bucket = nullptr;
// CHECK()ed in AllocNewSlotSpan().
@@ -17,7 +17,7 @@
// System page size can be 4, 16, or 64 kiB on Linux on arm64. 64 kiB is
// currently (kMaxSlotsPerSlotSpanBits == 13) not supported by the code,
// so we use the 16 kiB maximum (64 kiB will crash).
-@@ -149,7 +150,9 @@ struct __attribute__((packed)) SlotSpanMetadata {
+@@ -150,7 +151,9 @@ struct SlotSpanMetadata {
#endif // defined(PA_HAS_64_BITS_POINTERS) && BUILDFLAG(IS_APPLE)
// The maximum number of bits needed to cover all currently supported OSes.
static constexpr size_t kMaxSlotsPerSlotSpanBits = 13;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
index 6461c1678b28..70cba6b75bf8 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc
@@ -1,4 +1,4 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2022-05-19 14:06:27 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2022-06-17 14:20:10 UTC
+++ base/allocator/partition_allocator/partition_root.cc
@@ -29,7 +29,7 @@
#include "wow64apiset.h"
@@ -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
-@@ -648,7 +648,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -651,7 +651,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/chromium/files/patch-base_files_dir__reader__linux.h b/www/chromium/files/patch-base_files_dir__reader__linux.h
new file mode 100644
index 000000000000..82ff9a17eb2e
--- /dev/null
+++ b/www/chromium/files/patch-base_files_dir__reader__linux.h
@@ -0,0 +1,39 @@
+--- base/files/dir_reader_linux.h.orig 2022-06-18 05:49:12 UTC
++++ base/files/dir_reader_linux.h
+@@ -16,10 +16,16 @@
+ #include "base/logging.h"
+ #include "base/posix/eintr_wrapper.h"
+
++#include "build/build_config.h"
++
+ // See the comments in dir_reader_posix.h about this.
+
+ namespace base {
+
++#if BUILDFLAG(IS_BSD)
++#include <dirent.h>
++typedef struct dirent linux_dirent;
++#else
+ struct linux_dirent {
+ uint64_t d_ino;
+ int64_t d_off;
+@@ -27,6 +33,7 @@ struct linux_dirent {
+ unsigned char d_type;
+ char d_name[0];
+ };
++#endif
+
+ class DirReaderLinux {
+ public:
+@@ -61,7 +68,11 @@ class DirReaderLinux {
+ if (offset_ != size_)
+ return true;
+
++#if BUILDFLAG(IS_BSD)
++ const int r = getdents(fd_, reinterpret_cast<char *>(buf_), sizeof(buf_));
++#else
+ const int r = syscall(__NR_getdents64, fd_, buf_, sizeof(buf_));
++#endif
+ if (r == 0)
+ return false;
+ if (r == -1) {
diff --git a/www/chromium/files/patch-base_files_dir__reader__posix.h b/www/chromium/files/patch-base_files_dir__reader__posix.h
new file mode 100644
index 000000000000..2285fb726f8e
--- /dev/null
+++ b/www/chromium/files/patch-base_files_dir__reader__posix.h
@@ -0,0 +1,20 @@
+--- base/files/dir_reader_posix.h.orig 2022-06-17 14:20:10 UTC
++++ base/files/dir_reader_posix.h
+@@ -17,7 +17,7 @@
+ // seems worse than falling back to enumerating all file descriptors so we will
+ // probably never implement this on the Mac.
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ #include "base/files/dir_reader_linux.h"
+ #else
+ #include "base/files/dir_reader_fallback.h"
+@@ -25,7 +25,7 @@
+
+ namespace base {
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
+ typedef DirReaderLinux DirReaderPosix;
+ #else
+ typedef DirReaderFallback DirReaderPosix;
diff --git a/www/chromium/files/patch-base_files_file__util__posix.cc b/www/chromium/files/patch-base_files_file__util__posix.cc
index 058f7033f6a9..d0148196ba56 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_posix.cc.orig 2022-05-19 14:06:27 UTC
+--- base/files/file_util_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ base/files/file_util_posix.cc
-@@ -697,32 +697,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -696,32 +696,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/chromium/files/patch-base_files_file__util__unittest.cc b/www/chromium/files/patch-base_files_file__util__unittest.cc
index 7a1b5ff376fb..cbc96b4a9d6f 100644
--- a/www/chromium/files/patch-base_files_file__util__unittest.cc
+++ b/www/chromium/files/patch-base_files_file__util__unittest.cc
@@ -1,6 +1,6 @@
---- base/files/file_util_unittest.cc.orig 2022-04-21 18:48:31 UTC
+--- base/files/file_util_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ base/files/file_util_unittest.cc
-@@ -3523,7 +3523,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
+@@ -3522,7 +3522,7 @@ TEST_F(FileUtilTest, ReadFileToStringWithNamedPipe) {
}
#endif // BUILDFLAG(IS_WIN)
@@ -9,7 +9,7 @@
TEST_F(FileUtilTest, ReadFileToStringWithProcFileSystem) {
FilePath file_path("/proc/cpuinfo");
std::string data = "temp";
-@@ -4239,7 +4239,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
+@@ -4238,7 +4238,7 @@ TEST(FileUtilMultiThreadedTest, MultiThreadedTempFiles
NULL);
#else
size_t bytes_written =
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index 9f649aad1cf1..f9fe06225de0 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,6 +1,6 @@
---- base/i18n/icu_util.cc.orig 2022-05-19 14:06:27 UTC
+--- base/i18n/icu_util.cc.orig 2022-06-17 14:20:10 UTC
+++ base/i18n/icu_util.cc
-@@ -52,7 +52,7 @@
+@@ -54,7 +54,7 @@
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
@@ -9,7 +9,7 @@
!BUILDFLAG(IS_CHROMECAST))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
-@@ -324,7 +324,7 @@ void InitializeIcuTimeZone() {
+@@ -326,7 +326,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
diff --git a/www/chromium/files/patch-base_logging__unittest.cc b/www/chromium/files/patch-base_logging__unittest.cc
index 875546922a1c..b792452342c0 100644
--- a/www/chromium/files/patch-base_logging__unittest.cc
+++ b/www/chromium/files/patch-base_logging__unittest.cc
@@ -1,4 +1,4 @@
---- base/logging_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- base/logging_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ base/logging_unittest.cc
@@ -32,7 +32,7 @@
#include "base/posix/eintr_wrapper.h"
@@ -9,7 +9,7 @@
#include <ucontext.h>
#endif
-@@ -552,14 +552,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
+@@ -574,14 +574,18 @@ void CheckCrashTestSighandler(int, siginfo_t* info, vo
// need the arch-specific boilerplate below, which is inspired by breakpad.
// At the same time, on OSX, ucontext.h is deprecated but si_addr works fine.
uintptr_t crash_addr = 0;
diff --git a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
index 8bc7dfe4b8ec..852cc726f377 100644
--- a/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
+++ b/www/chromium/files/patch-base_memory_platform__shared__memory__region.h
@@ -1,6 +1,6 @@
---- base/memory/platform_shared_memory_region.h.orig 2022-05-19 14:06:27 UTC
+--- base/memory/platform_shared_memory_region.h.orig 2022-06-17 14:20:10 UTC
+++ base/memory/platform_shared_memory_region.h
-@@ -14,7 +14,7 @@
+@@ -16,7 +16,7 @@
#include <stdint.h>
@@ -9,7 +9,7 @@
namespace content {
class SandboxIPCHandler;
}
-@@ -81,7 +81,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
+@@ -83,7 +83,7 @@ class BASE_EXPORT PlatformSharedMemoryRegion {
kMaxValue = GET_SHMEM_TEMP_DIR_FAILURE
};
diff --git a/www/chromium/files/patch-base_process_launch.h b/www/chromium/files/patch-base_process_launch.h
index 5ad4c6605f88..2a8f08199824 100644
--- a/www/chromium/files/patch-base_process_launch.h
+++ b/www/chromium/files/patch-base_process_launch.h
@@ -1,6 +1,6 @@
---- base/process/launch.h.orig 2022-05-19 14:06:27 UTC
+--- base/process/launch.h.orig 2022-06-17 14:20:10 UTC
+++ base/process/launch.h
-@@ -199,7 +199,7 @@ struct BASE_EXPORT LaunchOptions {
+@@ -198,7 +198,7 @@ struct BASE_EXPORT LaunchOptions {
bool clear_environment = false;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
diff --git a/www/chromium/files/patch-base_process_launch__posix.cc b/www/chromium/files/patch-base_process_launch__posix.cc
index 7e4f92b48eb9..137785dd2f2b 100644
--- a/www/chromium/files/patch-base_process_launch__posix.cc
+++ b/www/chromium/files/patch-base_process_launch__posix.cc
@@ -1,6 +1,6 @@
---- base/process/launch_posix.cc.orig 2022-02-07 13:39:41 UTC
+--- base/process/launch_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ base/process/launch_posix.cc
-@@ -64,6 +64,9 @@
+@@ -63,6 +63,9 @@
#error "macOS should use launch_mac.cc"
#endif
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc
index 504425708f12..612be1c5ded0 100644
--- a/www/chromium/files/patch-base_process_process__metrics.cc
+++ b/www/chromium/files/patch-base_process_process__metrics.cc
@@ -1,6 +1,6 @@
---- base/process/process_metrics.cc.orig 2022-05-19 14:06:27 UTC
+--- base/process/process_metrics.cc.orig 2022-06-17 14:20:10 UTC
+++ base/process/process_metrics.cc
-@@ -18,7 +18,7 @@ namespace base {
+@@ -17,7 +17,7 @@ namespace base {
namespace {
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
int CalculateEventsPerSecond(uint64_t event_count,
uint64_t* last_event_count,
base::TimeTicks* last_calculated) {
-@@ -55,7 +55,7 @@ SystemMetrics SystemMetrics::Sample() {
+@@ -54,7 +54,7 @@ SystemMetrics SystemMetrics::Sample() {
SystemMetrics system_metrics;
system_metrics.committed_memory_ = GetSystemCommitCharge();
@@ -18,7 +18,7 @@
GetSystemMemoryInfo(&system_metrics.memory_info_);
GetVmStatInfo(&system_metrics.vmstat_info_);
GetSystemDiskInfo(&system_metrics.disk_info_);
-@@ -74,7 +74,7 @@ Value SystemMetrics::ToValue() const {
+@@ -73,7 +73,7 @@ Value SystemMetrics::ToValue() const {
Value res(Value::Type::DICTIONARY);
res.SetIntKey("committed_memory", static_cast<int>(committed_memory_));
@@ -27,7 +27,7 @@
Value meminfo = memory_info_.ToValue();
Value vmstat = vmstat_info_.ToValue();
meminfo.MergeDictionary(&vmstat);
-@@ -100,7 +100,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
+@@ -99,7 +99,7 @@ std::unique_ptr<ProcessMetrics> ProcessMetrics::Create
#endif // !BUILDFLAG(IS_MAC)
}
@@ -36,7 +36,7 @@
double ProcessMetrics::GetPlatformIndependentCPUUsage() {
TimeDelta cumulative_cpu = GetCumulativeCPUUsage();
TimeTicks time = TimeTicks::Now();
-@@ -151,7 +151,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
+@@ -150,7 +150,7 @@ double ProcessMetrics::GetPreciseCPUUsage() {
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h
index c6d856e7598b..79286ab92b7d 100644
--- a/www/chromium/files/patch-base_process_process__metrics.h
+++ b/www/chromium/files/patch-base_process_process__metrics.h
@@ -1,6 +1,6 @@
---- base/process/process_metrics.h.orig 2022-05-19 14:06:27 UTC
+--- base/process/process_metrics.h.orig 2022-06-17 14:20:10 UTC
+++ base/process/process_metrics.h
-@@ -36,7 +36,7 @@
+@@ -35,7 +35,7 @@
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -9,7 +9,7 @@
#include <string>
#include <utility>
#include <vector>
-@@ -52,7 +52,7 @@ class Value;
+@@ -51,7 +51,7 @@ class Value;
// Full declaration is in process_metrics_iocounters.h.
struct IoCounters;
@@ -18,7 +18,7 @@
// Minor and major page fault counts since the process creation.
// Both counts are process-wide, and exclude child processes.
//
-@@ -107,7 +107,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -106,7 +106,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;
-@@ -155,7 +155,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -154,7 +154,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
-@@ -238,7 +238,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -237,7 +237,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;
-@@ -259,7 +259,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -258,7 +258,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)
-@@ -270,7 +270,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -269,7 +269,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -63,7 +63,7 @@
CPU::CoreType GetCoreType(int core_index);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) ||
// BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX)
-@@ -294,7 +294,7 @@ class BASE_EXPORT ProcessMetrics {
+@@ -293,7 +293,7 @@ class BASE_EXPORT ProcessMetrics {
#endif
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -72,7 +72,7 @@
// Same thing for idle wakeups.
TimeTicks last_idle_wakeups_time_;
uint64_t last_absolute_idle_wakeups_;
-@@ -337,7 +337,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
+@@ -336,7 +336,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
@@ -81,7 +81,7 @@
// Data about system-wide memory consumption. Values are in KB. Available on
// Windows, Mac, Linux, Android and Chrome OS.
//
-@@ -372,7 +372,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -371,7 +371,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -90,7 +90,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
-@@ -387,7 +387,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
+@@ -386,7 +386,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
#endif
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -99,7 +99,7 @@
int buffers = 0;
int cached = 0;
int active_anon = 0;
-@@ -424,7 +424,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
+@@ -423,7 +423,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
// BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -108,7 +108,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.
-@@ -611,7 +611,7 @@ class BASE_EXPORT SystemMetrics {
+@@ -610,7 +610,7 @@ class BASE_EXPORT SystemMetrics {
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
size_t committed_memory_;
diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc
index 0b87a05680b7..32da363685fc 100644
--- a/www/chromium/files/patch-base_process_process__unittest.cc
+++ b/www/chromium/files/patch-base_process_process__unittest.cc
@@ -1,6 +1,6 @@
---- base/process/process_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- base/process/process_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ base/process/process_unittest.cc
-@@ -140,7 +140,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
+@@ -139,7 +139,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/chromium/files/patch-base_synchronization_lock__impl.h b/www/chromium/files/patch-base_synchronization_lock__impl.h
index 4c06c2a54589..baac846e9d78 100644
--- a/www/chromium/files/patch-base_synchronization_lock__impl.h
+++ b/www/chromium/files/patch-base_synchronization_lock__impl.h
@@ -1,6 +1,6 @@
---- base/synchronization/lock_impl.h.orig 2022-05-19 14:06:27 UTC
+--- base/synchronization/lock_impl.h.orig 2022-06-17 14:20:10 UTC
+++ base/synchronization/lock_impl.h
-@@ -106,6 +106,10 @@ void LockImpl::Unlock() {
+@@ -107,6 +107,10 @@ void LockImpl::Unlock() {
}
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
@@ -11,7 +11,7 @@
#if DCHECK_IS_ON()
BASE_EXPORT void dcheck_trylock_result(int rv);
-@@ -126,6 +130,9 @@ void LockImpl::Unlock() {
+@@ -127,6 +131,9 @@ void LockImpl::Unlock() {
dcheck_unlock_result(rv);
#endif
}
diff --git a/www/chromium/files/patch-base_system_sys__info.cc b/www/chromium/files/patch-base_system_sys__info.cc
index 9c2c95db0407..a9affa23e4ae 100644
--- a/www/chromium/files/patch-base_system_sys__info.cc
+++ b/www/chromium/files/patch-base_system_sys__info.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info.cc.orig 2022-05-19 14:06:27 UTC
+--- base/system/sys_info.cc.orig 2022-06-17 14:20:10 UTC
+++ base/system/sys_info.cc
-@@ -104,7 +104,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
+@@ -103,7 +103,7 @@ void SysInfo::GetHardwareInfo(base::OnceCallback<void(
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE)
base::ThreadPool::PostTaskAndReplyWithResult(
FROM_HERE, {}, base::BindOnce(&GetHardwareInfoSync), std::move(callback));
diff --git a/www/chromium/files/patch-base_system_sys__info.h b/www/chromium/files/patch-base_system_sys__info.h
index 4194bbc4732d..cd89561cd4d8 100644
--- a/www/chromium/files/patch-base_system_sys__info.h
+++ b/www/chromium/files/patch-base_system_sys__info.h
@@ -1,6 +1,6 @@
---- base/system/sys_info.h.orig 2022-03-16 08:38:25 UTC
+--- base/system/sys_info.h.orig 2022-06-17 14:20:10 UTC
+++ base/system/sys_info.h
-@@ -212,6 +212,8 @@ class BASE_EXPORT SysInfo {
+@@ -211,6 +211,8 @@ class BASE_EXPORT SysInfo {
// On Desktop this returns true when memory <= 2GB.
static bool IsLowEndDevice();
@@ -9,7 +9,7 @@
private:
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
FRIEND_TEST_ALL_PREFIXES(debug::SystemMetricsTest, ParseMeminfo);
-@@ -222,7 +224,7 @@ class BASE_EXPORT SysInfo {
+@@ -221,7 +223,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
diff --git a/www/chromium/files/patch-base_system_sys__info__posix.cc b/www/chromium/files/patch-base_system_sys__info__posix.cc
index 42ceb1fda2dd..a27e4ff85693 100644
--- a/www/chromium/files/patch-base_system_sys__info__posix.cc
+++ b/www/chromium/files/patch-base_system_sys__info__posix.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_posix.cc.orig 2022-03-25 21:59:56 UTC
+--- base/system/sys_info_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ base/system/sys_info_posix.cc
-@@ -37,7 +37,7 @@
+@@ -36,7 +36,7 @@
namespace {
@@ -9,7 +9,7 @@
int NumberOfProcessors() {
// sysconf returns the number of "logical" (not "physical") processors on both
// Mac and Linux. So we get the number of max available "logical" processors.
-@@ -77,7 +77,7 @@ int NumberOfProcessors() {
+@@ -76,7 +76,7 @@ int NumberOfProcessors() {
base::LazyInstance<base::internal::LazySysInfoValue<int, NumberOfProcessors>>::
Leaky g_lazy_number_of_processors = LAZY_INSTANCE_INITIALIZER;
@@ -18,7 +18,7 @@
int64_t AmountOfVirtualMemory() {
struct rlimit limit;
-@@ -143,11 +143,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
+@@ -142,11 +142,11 @@ bool GetDiskSpaceInfo(const base::FilePath& path,
namespace base {
@@ -32,7 +32,7 @@
// static
int64_t SysInfo::AmountOfVirtualMemory() {
-@@ -239,6 +239,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
+@@ -236,6 +236,8 @@ std::string SysInfo::OperatingSystemArchitecture() {
arch = "x86";
} else if (arch == "amd64") {
arch = "x86_64";
diff --git a/www/chromium/files/patch-base_system_sys__info__unittest.cc b/www/chromium/files/patch-base_system_sys__info__unittest.cc
index 2d9da201de79..f7c662a4e82e 100644
--- a/www/chromium/files/patch-base_system_sys__info__unittest.cc
+++ b/www/chromium/files/patch-base_system_sys__info__unittest.cc
@@ -1,6 +1,6 @@
---- base/system/sys_info_unittest.cc.orig 2022-03-25 21:59:56 UTC
+--- base/system/sys_info_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ base/system/sys_info_unittest.cc
-@@ -234,12 +234,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
+@@ -233,12 +233,15 @@ TEST_F(SysInfoTest, GetHardwareInfo) {
EXPECT_TRUE(IsStringUTF8(hardware_info->model));
bool empty_result_expected =
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_WIN) || \
diff --git a/www/chromium/files/patch-base_threading_platform__thread__linux.cc b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
index db45be7f723b..d10b804f030b 100644
--- a/www/chromium/files/patch-base_threading_platform__thread__linux.cc
+++ b/www/chromium/files/patch-base_threading_platform__thread__linux.cc
@@ -1,6 +1,6 @@
---- base/threading/platform_thread_linux.cc.orig 2022-05-19 14:06:27 UTC
+--- base/threading/platform_thread_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ base/threading/platform_thread_linux.cc
-@@ -30,7 +30,9 @@
+@@ -29,7 +29,9 @@
#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
#include <pthread.h>
@@ -10,16 +10,16 @@
#include <sys/resource.h>
#include <sys/time.h>
#include <sys/types.h>
-@@ -133,7 +135,7 @@ int sched_setattr(pid_t pid,
+@@ -132,7 +134,7 @@ int sched_setattr(pid_t pid,
#endif // !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_AIX)
- #endif // BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ #endif // BUILDFLAG(IS_CHROMEOS)
-#if !BUILDFLAG(IS_NACL)
+#if !BUILDFLAG(IS_NACL) && !BUILDFLAG(IS_BSD)
const FilePath::CharType kCgroupDirectory[] =
FILE_PATH_LITERAL("/sys/fs/cgroup");
-@@ -287,7 +289,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI
+@@ -286,7 +288,7 @@ void SetThreadCgroupsForThreadPriority(PlatformThreadI
namespace internal {
namespace {
@@ -28,7 +28,7 @@
const struct sched_param kRealTimePrio = {8};
#endif
} // namespace
-@@ -300,7 +302,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
+@@ -299,7 +301,7 @@ const ThreadPriorityToNiceValuePair kThreadPriorityToN
};
bool CanSetThreadPriorityToRealtimeAudio() {
@@ -37,7 +37,7 @@
// A non-zero soft-limit on RLIMIT_RTPRIO is required to be allowed to invoke
// pthread_setschedparam in SetCurrentThreadPriorityForPlatform().
struct rlimit rlim;
-@@ -311,7 +313,7 @@ bool CanSetThreadPriorityToRealtimeAudio() {
+@@ -310,7 +312,7 @@ bool CanSetThreadPriorityToRealtimeAudio() {
}
bool SetCurrentThreadPriorityForPlatform(ThreadPriority priority) {
@@ -46,7 +46,7 @@
// For legacy schedtune interface
SetThreadCgroupsForThreadPriority(PlatformThread::CurrentId(), priority);
-@@ -329,7 +331,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
+@@ -328,7 +330,7 @@ bool SetCurrentThreadPriorityForPlatform(ThreadPriorit
}
absl::optional<ThreadPriority> GetCurrentThreadPriorityForPlatform() {
@@ -55,7 +55,7 @@
int maybe_sched_rr = 0;
struct sched_param maybe_realtime_prio = {0};
if (pthread_getschedparam(pthread_self(), &maybe_sched_rr,
-@@ -348,7 +350,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
+@@ -347,7 +349,7 @@ absl::optional<ThreadPriority> GetCurrentThreadPriorit
void PlatformThread::SetName(const std::string& name) {
ThreadIdNameManager::GetInstance()->SetName(name);
@@ -64,7 +64,7 @@
// On linux we can get the thread names to show up in the debugger by setting
// the process name for the LWP. We don't want to do this for the main
// thread because that would rename the process, causing tools like killall
-@@ -378,8 +380,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
+@@ -377,8 +379,10 @@ void PlatformThread::SetThreadPriority(ProcessId proce
// priority.
CHECK_NE(thread_id, process_id);
@@ -73,5 +73,5 @@
SetThreadCgroupsForThreadPriority(thread_id, priority);
+#endif
- #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ #if BUILDFLAG(IS_CHROMEOS)
// For upstream uclamp interface. We try both legacy (schedtune, as done
diff --git a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
index 630217b469e1..3a85c8907285 100644
--- a/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
+++ b/www/chromium/files/patch-base_trace__event_malloc__dump__provider.cc
@@ -1,4 +1,4 @@
---- base/trace_event/malloc_dump_provider.cc.orig 2022-05-19 14:06:27 UTC
+--- base/trace_event/malloc_dump_provider.cc.orig 2022-06-17 14:20:10 UTC
+++ base/trace_event/malloc_dump_provider.cc
@@ -23,6 +23,8 @@
@@ -9,7 +9,7 @@
#else
#include <malloc.h>
#endif
-@@ -174,7 +176,8 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
+@@ -176,7 +178,8 @@ void ReportAppleAllocStats(size_t* total_virtual_size,
#if (BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && BUILDFLAG(IS_ANDROID)) || \
(!BUILDFLAG(USE_PARTITION_ALLOC_AS_MALLOC) && !BUILDFLAG(IS_WIN) && \
@@ -19,7 +19,7 @@
void ReportMallinfoStats(ProcessMemoryDump* pmd,
size_t* total_virtual_size,
size_t* resident_size,
-@@ -339,6 +342,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
+@@ -341,6 +344,9 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDump
&allocated_objects_count);
#elif BUILDFLAG(IS_FUCHSIA)
// TODO(fuchsia): Port, see https://crbug.com/706592.
diff --git a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
index d31975d16574..e697c602ffd7 100644
--- a/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
+++ b/www/chromium/files/patch-base_trace__event_process__memory__dump.cc
@@ -1,6 +1,6 @@
---- base/trace_event/process_memory_dump.cc.orig 2022-02-28 16:54:41 UTC
+--- base/trace_event/process_memory_dump.cc.orig 2022-06-17 14:20:10 UTC
+++ base/trace_event/process_memory_dump.cc
-@@ -105,7 +105,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
+@@ -106,7 +106,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
#if BUILDFLAG(IS_WIN)
std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
@@ -9,7 +9,7 @@
std::unique_ptr<char[]> vec(new char[max_vec_size]);
#elif BUILDFLAG(IS_POSIX) || BUILDFLAG(IS_FUCHSIA)
std::unique_ptr<unsigned char[]> vec(new unsigned char[max_vec_size]);
-@@ -130,7 +130,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
+@@ -131,7 +131,7 @@ absl::optional<size_t> ProcessMemoryDump::CountResiden
for (size_t i = 0; i < page_count; i++)
resident_page_count += vec[i].VirtualAttributes.Valid;
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index 890458560e59..aa5b6f12202c 100644
--- a/www/chromium/files/patch-build_config_compiler_BUILD.gn
+++ b/www/chromium/files/patch-build_config_compiler_BUILD.gn
@@ -1,4 +1,4 @@
---- build/config/compiler/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- build/config/compiler/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ build/config/compiler/BUILD.gn
@@ -231,13 +231,16 @@ config("default_include_dirs") {
# Compiler instrumentation can introduce dependencies in DSOs to symbols in
@@ -38,7 +38,7 @@
cflags += [ "-fcrash-diagnostics-dir=" + clang_diagnostic_dir ]
# TODO(hans): Remove this once Clang generates better optimized debug info
-@@ -904,7 +911,7 @@ config("compiler_cpu_abi") {
+@@ -903,7 +910,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -47,7 +47,7 @@
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
}
-@@ -918,7 +925,7 @@ config("compiler_cpu_abi") {
+@@ -917,7 +924,7 @@ config("compiler_cpu_abi") {
cflags += [ "-mtune=$arm_tune" ]
}
} else if (current_cpu == "arm64") {
@@ -56,7 +56,7 @@
cflags += [ "--target=aarch64-linux-gnu" ]
ldflags += [ "--target=aarch64-linux-gnu" ]
}
-@@ -1239,7 +1246,7 @@ config("compiler_deterministic") {
+@@ -1238,7 +1245,7 @@ config("compiler_deterministic") {
# different build directory like "out/feature_a" and "out/feature_b" if
# we build same files with same compile flag.
# Other paths are already given in relative, no need to normalize them.
@@ -65,7 +65,7 @@
# TODO(https://crbug.com/1231236): Use -ffile-compilation-dir= here.
cflags += [
"-Xclang",
-@@ -1530,7 +1537,7 @@ config("default_warnings") {
+@@ -1529,12 +1536,12 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -73,9 +73,6 @@
+ if (!is_nacl && !is_bsd) {
# TODO(https://crbug.com/1300731) Clean up and enable.
cflags += [ "-Wno-unqualified-std-cast-call" ]
-
-@@ -1538,7 +1545,7 @@ config("default_warnings") {
- cflags += [ "-Wno-deprecated-non-prototype" ]
}
- if (!is_nacl && !(is_chromeos ||
@@ -83,7 +80,7 @@
default_toolchain == "//build/toolchain/cros:target")) {
# TODO(https://crbug.com/1316298): Re-enable once test failure is figured out
cflags += [
-@@ -1723,7 +1730,7 @@ config("no_chromium_code") {
+@@ -1719,7 +1726,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -92,7 +89,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2237,7 +2244,7 @@ config("afdo_optimize_size") {
+@@ -2233,7 +2240,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") {
@@ -101,7 +98,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2253,7 +2260,7 @@ config("afdo") {
+@@ -2249,7 +2256,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@@ -110,7 +107,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2396,7 +2403,8 @@ config("symbols") {
+@@ -2392,7 +2399,8 @@ config("symbols") {
}
}
diff --git a/www/chromium/files/patch-build_config_rust.gni b/www/chromium/files/patch-build_config_rust.gni
index 88a93d14ee6d..724cec8e0742 100644
--- a/www/chromium/files/patch-build_config_rust.gni
+++ b/www/chromium/files/patch-build_config_rust.gni
@@ -1,6 +1,6 @@
---- build/config/rust.gni.orig 2022-03-25 21:59:56 UTC
+--- build/config/rust.gni.orig 2022-06-17 14:20:10 UTC
+++ build/config/rust.gni
-@@ -116,7 +116,7 @@ if (enable_rust) {
+@@ -124,7 +124,7 @@ if (enable_rust) {
rust_sysroot = "//third_party/rust-toolchain"
use_unverified_rust_toolchain = false
} else {
diff --git a/www/chromium/files/patch-build_linux_unbundle_libxml.gn b/www/chromium/files/patch-build_linux_unbundle_libxml.gn
deleted file mode 100644
index 37cfca7fbd71..000000000000
--- a/www/chromium/files/patch-build_linux_unbundle_libxml.gn
+++ /dev/null
@@ -1,10 +0,0 @@
---- build/linux/unbundle/libxml.gn.orig 2022-04-21 18:48:31 UTC
-+++ build/linux/unbundle/libxml.gn
-@@ -19,6 +19,7 @@ static_library("libxml_utils") {
- ":xml_reader",
- ":xml_writer",
- "//base/test:test_support",
-+ "//services/data_decoder:lib",
- "//services/data_decoder:xml_parser_fuzzer_deps",
- ]
- sources = [
diff --git a/www/chromium/files/patch-cc_BUILD.gn b/www/chromium/files/patch-cc_BUILD.gn
index 1812b54d7afc..b6f50ae884f8 100644
--- a/www/chromium/files/patch-cc_BUILD.gn
+++ b/www/chromium/files/patch-cc_BUILD.gn
@@ -1,6 +1,6 @@
---- cc/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- cc/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ cc/BUILD.gn
-@@ -665,7 +665,7 @@ cc_test_static_library("test_support") {
+@@ -669,7 +669,7 @@ cc_test_static_library("test_support") {
if (enable_vulkan) {
deps += [ "//gpu/vulkan/init" ]
}
@@ -9,7 +9,7 @@
data_deps = [ "//third_party/mesa_headers" ]
}
}
-@@ -893,7 +893,6 @@ cc_test("cc_unittests") {
+@@ -897,7 +897,6 @@ cc_test("cc_unittests") {
data = [ "//components/viz/test/data/" ]
data_deps = [
"//testing/buildbot/filters:cc_unittests_filters",
diff --git a/www/chromium/files/patch-chrome_app_app__management__strings.grdp b/www/chromium/files/patch-chrome_app_app__management__strings.grdp
index b7638925e9e3..3499a698d0af 100644
--- a/www/chromium/files/patch-chrome_app_app__management__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_app__management__strings.grdp
@@ -1,11 +1,11 @@
---- chrome/app/app_management_strings.grdp.orig 2022-05-19 14:06:27 UTC
+--- chrome/app/app_management_strings.grdp.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/app_management_strings.grdp
-@@ -165,7 +165,7 @@
+@@ -174,7 +174,7 @@
</message>
</if>
- <!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash` once fixed. -->
-- <if expr="is_fuchsia or is_linux and not chromeos_ash">
-+ <if expr="is_fuchsia or is_posix and not chromeos_ash">
+ <!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash and not chromeos_lacros` once fixed. -->
+- <if expr="is_fuchsia or is_linux and not chromeos_ash and not chromeos_lacros">
++ <if expr="is_fuchsia or is_posix and not chromeos_ash and not chromeos_lacros">
<message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations.">
You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
diff --git a/www/chromium/files/patch-chrome_app_chrome__command__ids.h b/www/chromium/files/patch-chrome_app_chrome__command__ids.h
index cf79191cac1c..e5fe7eacffed 100644
--- a/www/chromium/files/patch-chrome_app_chrome__command__ids.h
+++ b/www/chromium/files/patch-chrome_app_chrome__command__ids.h
@@ -1,6 +1,6 @@
---- chrome/app/chrome_command_ids.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/app/chrome_command_ids.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/chrome_command_ids.h
-@@ -66,7 +66,7 @@
+@@ -67,7 +67,7 @@
#define IDC_NAME_WINDOW 34049
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch of lacros-chrome is complete.
@@ -9,12 +9,3 @@
#define IDC_USE_SYSTEM_TITLE_BAR 34051
#define IDC_RESTORE_WINDOW 34052
#endif
-@@ -447,7 +447,7 @@
- #define IDC_CONTENT_CONTEXT_QUICK_ANSWERS_INLINE_QUERY 52414
- #endif
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Screen AI
- #define IDC_RUN_SCREEN_AI 52420
- #endif
diff --git a/www/chromium/files/patch-chrome_app_chrome__main.cc b/www/chromium/files/patch-chrome_app_chrome__main.cc
index 6dcdad77169d..f0268b40f412 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/app/chrome_main.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/chrome_main.cc
-@@ -25,7 +25,7 @@
+@@ -26,7 +26,7 @@
#include "chrome/app/notification_metrics.h"
#endif
@@ -9,7 +9,7 @@
#include "base/base_switches.h"
#endif
-@@ -146,7 +146,7 @@ int ChromeMain(int argc, const char** argv) {
+@@ -147,7 +147,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/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index e2579407f457..e725615c2082 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/app/chrome_main_delegate.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/chrome_main_delegate.cc
-@@ -116,7 +116,7 @@
+@@ -117,7 +117,7 @@
#include "chrome/app/chrome_crash_reporter_client.h"
#endif
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -159,12 +159,12 @@
+@@ -160,12 +160,12 @@
#include "v8/include/v8.h"
#endif
@@ -60,7 +60,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -669,6 +669,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
+@@ -668,6 +668,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
// not always enabled on Linux/ChromeOS.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@@ -69,7 +69,7 @@
#else
bool enable_gwp_asan = true;
#endif
-@@ -807,7 +809,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -806,7 +808,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -78,8 +78,8 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -838,7 +840,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
- #if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+@@ -837,7 +839,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+ #if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
-#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
@@ -87,7 +87,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -1153,7 +1155,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1163,7 +1165,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@@ -96,7 +96,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if BUILDFLAG(IS_ANDROID)
-@@ -1223,7 +1225,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+@@ -1233,7 +1235,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/chromium/files/patch-chrome_app_chromium__strings.grd b/www/chromium/files/patch-chrome_app_chromium__strings.grd
index aa755102c0fe..28bfed9125df 100644
--- a/www/chromium/files/patch-chrome_app_chromium__strings.grd
+++ b/www/chromium/files/patch-chrome_app_chromium__strings.grd
@@ -1,4 +1,4 @@
---- chrome/app/chromium_strings.grd.orig 2022-05-19 14:06:27 UTC
+--- chrome/app/chromium_strings.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/chromium_strings.grd
@@ -296,7 +296,7 @@ If you update this file, be sure also to update google
Welcome to Chromium; new browser window opened
@@ -9,12 +9,12 @@
<message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
Welcome to Chromium
</message>
-@@ -981,7 +981,7 @@ Permissions you've already given to websites and apps
- </message>
-
- <!-- ProcessSingleton -->
-- <if expr="is_linux or is_macosx">
-+ <if expr="is_posix or is_macosx">
- <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
- The profile appears to be in use by another Chromium process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chromium has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chromium.
+@@ -410,7 +410,7 @@ If you update this file, be sure also to update google
+ Chromium may not function correctly because it is no longer supported on Windows XP or Windows Vista
+ </message>
+ </if>
+- <if expr="is_linux">
++ <if expr="is_posix">
+ <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
+ Chromium may not function correctly because it is no longer supported on this Linux distribution
</message>
diff --git a/www/chromium/files/patch-chrome_app_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index b1dbb1741e2e..809a54ddbe8e 100644
--- a/www/chromium/files/patch-chrome_app_generated__resources.grd
+++ b/www/chromium/files/patch-chrome_app_generated__resources.grd
@@ -1,4 +1,4 @@
---- chrome/app/generated_resources.grd.orig 2022-05-19 14:06:27 UTC
+--- chrome/app/generated_resources.grd.orig 2022-06-17 14:20:10 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.
-->
-@@ -3013,7 +3013,7 @@ are declared in tools/grit/grit_rule.gni.
+@@ -2989,7 +2989,7 @@ are declared in tools/grit/grit_rule.gni.
</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>
-@@ -8670,7 +8670,7 @@ Keep your key file in a safe place. You will need it t
+@@ -8669,7 +8669,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
@@ -27,7 +27,7 @@
<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>
-@@ -9821,7 +9821,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -9823,7 +9823,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
diff --git a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
index 4202f42e44a1..5306ef5a6679 100644
--- a/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
+++ b/www/chromium/files/patch-chrome_app_google__chrome__strings.grd
@@ -1,4 +1,4 @@
---- chrome/app/google_chrome_strings.grd.orig 2022-05-19 14:06:27 UTC
+--- chrome/app/google_chrome_strings.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/google_chrome_strings.grd
@@ -301,7 +301,7 @@ chromium_strings.grd. -->
Welcome to Chrome; new browser window opened
@@ -9,12 +9,12 @@
<message name="IDS_FIRST_RUN_DIALOG_WINDOW_TITLE" desc="Window title of First Run dialog on Mac and Linux, displayed in title bar">
Welcome to Google Chrome
</message>
-@@ -1048,7 +1048,7 @@ Permissions you've already given to websites and apps
- </message>
-
- <!-- ProcessSingleton -->
-- <if expr="is_linux or is_macosx">
-+ <if expr="is_posix or is_macosx">
- <message name="IDS_PROFILE_IN_USE_POSIX" desc="Message shown when the browser cannot start because the profile is in use on a different host.">
- The profile appears to be in use by another Google Chrome process (<ph name="PROCESS_ID">$1<ex>12345</ex></ph>) on another computer (<ph name="HOST_NAME">$2<ex>example.com</ex></ph>). Chrome has locked the profile so that it doesn't get corrupted. If you are sure no other processes are using this profile, you can unlock the profile and relaunch Chrome.
+@@ -438,7 +438,7 @@ chromium_strings.grd. -->
+ This computer will no longer receive Google Chrome updates because Windows XP and Windows Vista are no longer supported
+ </message>
+ </if>
+- <if expr="is_linux">
++ <if expr="is_posix">
+ <message name="IDS_LINUX_OBSOLETE" desc="A message displayed on an at-launch infobar and about:help warning the user that the OS version they are using is no longer supported.">
+ Google Chrome may not function correctly because it is no longer supported on this Linux distribution
</message>
diff --git a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
index 959a0c285ffa..491d03995e76 100644
--- a/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
+++ b/www/chromium/files/patch-chrome_app_theme_theme__resources.grd
@@ -1,6 +1,6 @@
---- chrome/app/theme/theme_resources.grd.orig 2022-05-19 14:06:27 UTC
+--- chrome/app/theme/theme_resources.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/app/theme/theme_resources.grd
-@@ -128,11 +128,11 @@
+@@ -130,11 +130,11 @@
<structure type="chrome_scaled_image" name="IDR_PRERENDER" file="common/prerender_succeed_icon.png" />
</if>
<if expr="not _google_chrome">
@@ -14,7 +14,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="chromium/linux/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="chromium/linux/product_logo_32.png" />
</if>
-@@ -140,7 +140,7 @@
+@@ -142,7 +142,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_NAME_22_WHITE" file="chromium/product_logo_name_22_white.png" />
</if>
<if expr="_google_chrome">
@@ -23,7 +23,7 @@
<if expr="not is_android">
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_16" file="google_chrome/product_logo_16.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32" file="google_chrome/product_logo_32.png" />
-@@ -148,7 +148,7 @@
+@@ -150,7 +150,7 @@
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_BETA" file="google_chrome/product_logo_32_beta.png" />
<structure type="chrome_scaled_image" name="IDR_PRODUCT_LOGO_32_DEV" file="google_chrome/product_logo_32_dev.png" />
</if>
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index b4582e90b40e..c64416ccb5bb 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,4 +1,4 @@
---- chrome/browser/about_flags.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/about_flags.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/about_flags.cc
@@ -202,7 +202,7 @@
#include "ui/native_theme/native_theme_features.h"
@@ -9,8 +9,8 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -274,7 +274,7 @@
- #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h"
+@@ -275,7 +275,7 @@
+ #include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck
#endif // ENABLE_SUPERVISED_USERS
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -363,7 +363,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
+@@ -364,7 +364,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
gl::kANGLEImplementationMetalName}};
#endif
@@ -36,7 +36,7 @@
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
-@@ -3668,7 +3668,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -3681,7 +3681,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
#endif // BUILDFLAG(IS_CHROMEOS)
@@ -45,16 +45,16 @@
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -4271,7 +4271,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4283,7 +4283,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
- flag_descriptions::kOzonePlatformHintDescription, kOsLinux | kOsLacros,
+ flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
-@@ -4291,7 +4291,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4302,7 +4302,7 @@ const FeatureEntry kFeatureEntries[] = {
password_manager::features::kForceInitialSyncWhenDecryptionFails)},
#endif // BUILDFLAG(IS_LINUX)
@@ -63,7 +63,7 @@
{"skip-undecryptable-passwords",
flag_descriptions::kSkipUndecryptablePasswordsName,
flag_descriptions::kSkipUndecryptablePasswordsDescription,
-@@ -4986,7 +4986,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4979,7 +4979,7 @@ const FeatureEntry kFeatureEntries[] = {
"OmniboxBundledExperimentV1")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -72,16 +72,7 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -5375,7 +5375,7 @@ const FeatureEntry kFeatureEntries[] = {
- #endif // BUILDFLAG(IS_ANDROID)
-
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
- {"webui-feedback", flag_descriptions::kWebuiFeedbackName,
- flag_descriptions::kWebuiFeedbackDescription, kOsDesktop,
- FEATURE_VALUE_TYPE(features::kWebUIFeedback)},
-@@ -6396,7 +6396,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6378,7 +6378,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -90,7 +81,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
-@@ -7260,7 +7260,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7251,7 +7251,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -99,7 +90,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -7551,7 +7551,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7547,7 +7547,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
index ddb257f073dc..74f8da11f951 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/browser_process_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/browser_process_impl.cc
-@@ -209,7 +209,7 @@
+@@ -208,7 +208,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
-@@ -1158,7 +1158,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1153,7 +1153,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
-@@ -1415,7 +1415,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1405,7 +1405,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/chromium/files/patch-chrome_browser_browser__process__impl.h b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
index 4b7342b9edb6..cf6f1932bf97 100644
--- a/www/chromium/files/patch-chrome_browser_browser__process__impl.h
+++ b/www/chromium/files/patch-chrome_browser_browser__process__impl.h
@@ -1,6 +1,6 @@
---- chrome/browser/browser_process_impl.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/browser_process_impl.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/browser_process_impl.h
-@@ -366,7 +366,7 @@ class BrowserProcessImpl : public BrowserProcess,
+@@ -358,7 +358,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/chromium/files/patch-chrome_browser_browser__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
index b340908a4530..2e2aebe2dfa9 100644
--- a/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -1,6 +1,6 @@
---- chrome/browser/browser_resources.grd.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/browser_resources.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/browser_resources.grd
-@@ -119,7 +119,7 @@
+@@ -125,7 +125,7 @@
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_chromeos.json" type="BINDATA" />
</if>
<!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash` once fixed. -->
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index 4e550f8411c9..53c50bc0a333 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -100,13 +100,13 @@
+@@ -110,13 +110,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
-@@ -177,7 +177,7 @@
+@@ -183,7 +183,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,8 +25,8 @@
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
-@@ -726,7 +726,7 @@ void PopulateChromeFrameBinders(
- #endif
+@@ -752,7 +752,7 @@ void PopulateChromeFrameBinders(
+ #endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS)
@@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -734,7 +734,7 @@ void PopulateChromeFrameBinders(
+@@ -760,7 +760,7 @@ void PopulateChromeFrameBinders(
#endif
#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || \
@@ -43,7 +43,7 @@
if (base::FeatureList::IsEnabled(blink::features::kDesktopPWAsSubApps) &&
render_frame_host->IsInPrimaryMainFrame()) {
map->Add<blink::mojom::SubAppsService>(
-@@ -781,14 +781,14 @@ void PopulateChromeWebUIFrameBinders(
+@@ -815,14 +815,14 @@ void PopulateChromeWebUIFrameBinders(
SegmentationInternalsUI>(map);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -60,7 +60,7 @@
RegisterWebUIControllerInterfaceBinder<
app_management::mojom::PageHandlerFactory, WebAppSettingsUI>(map);
#endif
-@@ -1111,7 +1111,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1163,7 +1163,7 @@ void PopulateChromeWebUIFrameBinders(
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
index 71cba7c6a9bf..478d89ed72f3 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_browser_main.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -230,11 +230,11 @@
+@@ -231,11 +231,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/breakpad_linux.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -269,7 +269,7 @@
+@@ -270,7 +270,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -23,7 +23,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
-@@ -1009,7 +1009,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1019,7 +1019,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
browser_creator_->AddFirstRunTabs(master_prefs_->new_tabs);
}
@@ -32,7 +32,7 @@
// Create directory for user-level Native Messaging manifest files. This
// makes it less likely that the directory will be created by third-party
// software with incorrect owner or permission. See crbug.com/725513 .
-@@ -1022,7 +1022,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1032,7 +1032,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -41,7 +41,7 @@
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(
-@@ -1043,7 +1043,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1053,7 +1053,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
index 711142efa19a..4393081b8a6f 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__browser__main__linux.cc
@@ -1,20 +1,28 @@
---- chrome/browser/chrome_browser_main_linux.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/chrome_browser_main_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_browser_main_linux.cc
-@@ -57,7 +57,7 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
+@@ -57,13 +57,15 @@ ChromeBrowserMainPartsLinux::~ChromeBrowserMainPartsLi
}
void ChromeBrowserMainPartsLinux::PostCreateMainMessageLoop() {
--#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// No-op: Ash and Lacros Bluetooth DBusManager initialization depend on
// FeatureList, and is done elsewhere.
- #else
-@@ -122,7 +122,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
+ #endif // BUILDFLAG(IS_CHROMEOS)
+
+ #if !BUILDFLAG(IS_CHROMEOS)
++#if !BUILDFLAG(IS_BSD)
+ bluez::BluezDBusManager::Initialize(nullptr /* system_bus */);
++#endif
+
+ // Set up crypt config. This needs to be done before anything starts the
+ // network service, as the raw encryption key needs to be shared with the
+@@ -123,7 +125,7 @@ void ChromeBrowserMainPartsLinux::PostBrowserStart() {
#endif // defined(USE_DBUS) && !BUILDFLAG(IS_CHROMEOS)
void ChromeBrowserMainPartsLinux::PostDestroyThreads() {
--#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || defined(OS_BSD)
+-#if BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// No-op; per PostBrowserStart() comment, this is done elsewhere.
#else
bluez::BluezDBusManager::Shutdown();
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 668295937676..223119fd9585 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -378,7 +378,7 @@
+@@ -381,7 +381,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"
@@ -9,7 +9,7 @@
#include "chrome/browser/chrome_browser_main_linux.h"
#elif BUILDFLAG(IS_ANDROID)
#include "base/android/application_status_listener.h"
-@@ -448,17 +448,17 @@
+@@ -454,17 +454,17 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -30,7 +30,7 @@
#if !BUILDFLAG(IS_ANDROID)
#include "base/debug/leak_annotations.h"
#include "components/crash/core/app/breakpad_linux.h"
-@@ -466,12 +466,12 @@
+@@ -472,12 +472,12 @@
#include "components/crash/content/browser/crash_handler_host_linux.h"
#endif
@@ -45,7 +45,7 @@
#include "chrome/browser/enterprise/connectors/device_trust/navigation_throttle.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) ||
// BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -493,11 +493,11 @@
+@@ -501,11 +501,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -59,7 +59,7 @@
#include "chrome/browser/chrome_browser_main_extra_parts_linux.h"
#elif defined(USE_OZONE)
#include "chrome/browser/chrome_browser_main_extra_parts_ozone.h"
-@@ -889,7 +889,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
+@@ -892,7 +892,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
@@ -68,16 +68,16 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
-@@ -1406,7 +1406,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1410,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
- std::move(parameters), &startup_data_);
+ is_integration_test, &startup_data_);
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
- std::move(parameters), &startup_data_);
+ is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1440,7 +1440,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1444,7 +1444,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
std::make_unique<ChromeBrowserMainExtraPartsViewsLacros>());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -86,7 +86,7 @@
main_parts->AddParts(
std::make_unique<ChromeBrowserMainExtraPartsViewsLinux>());
#else
-@@ -1457,7 +1457,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(
+@@ -1461,7 +1461,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLacros>());
#endif
@@ -95,7 +95,7 @@
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsLinux>());
#elif defined(USE_OZONE)
main_parts->AddParts(std::make_unique<ChromeBrowserMainExtraPartsOzone>());
-@@ -2206,6 +2206,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2230,6 +2230,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
#elif BUILDFLAG(IS_POSIX)
#if BUILDFLAG(IS_ANDROID)
bool enable_crash_reporter = true;
@@ -104,7 +104,7 @@
#else
bool enable_crash_reporter = false;
if (crash_reporter::IsCrashpadEnabled()) {
-@@ -2513,7 +2515,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2547,7 +2549,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
ThreadProfilerConfiguration::Get()->AppendCommandLineSwitchForChildProcess(
command_line);
@@ -113,7 +113,7 @@
// TODO(https://crbug.com/1316129): Re-enable for Lacros.
// Processes may only query perf_event_open with the BPF sandbox disabled.
if (browser_command_line.HasSwitch(switches::kEnableThreadInstructionCount) &&
-@@ -3903,7 +3905,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3960,7 +3962,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -122,7 +122,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4310,14 +4312,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4371,14 +4373,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -139,7 +139,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -4350,7 +4352,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4411,7 +4413,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
index b2959c6b4fed..fc1d0ff538ca 100644
--- a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
+++ b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h
@@ -1,6 +1,6 @@
---- chrome/browser/chrome_content_browser_client.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -414,7 +414,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -420,7 +420,7 @@ class ChromeContentBrowserClient : public content::Con
void OverridePageVisibilityState(
content::RenderFrameHost* render_frame_host,
content::PageVisibilityState* visibility_state) override;
diff --git a/www/chromium/files/patch-chrome_browser_component__updater_registration.cc b/www/chromium/files/patch-chrome_browser_component__updater_registration.cc
deleted file mode 100644
index 782c92a32dab..000000000000
--- a/www/chromium/files/patch-chrome_browser_component__updater_registration.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/component_updater/registration.cc.orig 2022-05-19 14:06:27 UTC
-+++ chrome/browser/component_updater/registration.cc
-@@ -90,7 +90,7 @@
- #include "chrome/browser/component_updater/widevine_cdm_component_installer.h"
- #endif // BUILDFLAG(ENABLE_WIDEVINE_CDM_COMPONENT)
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/component_updater/screen_ai_component_installer.h"
- #endif // BUILDFLAG(IS_LINUX)
-
-@@ -214,7 +214,7 @@ void RegisterComponentsForUpdate() {
-
- RegisterClientSidePhishingComponent(cus);
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- RegisterScreenAIComponent(cus, g_browser_process->local_state());
- #endif // BUILDFLAG(IS_LINUX)
-
diff --git a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
index a7fe163ba2e5..69a0309f6183 100644
--- a/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
+++ b/www/chromium/files/patch-chrome_browser_crash__upload__list_crash__upload__list.cc
@@ -1,11 +1,11 @@
---- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/crash_upload_list/crash_upload_list.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/crash_upload_list/crash_upload_list.cc
-@@ -52,7 +52,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
+@@ -50,7 +50,7 @@ scoped_refptr<UploadList> CreateCrashUploadList() {
+ // which isn't compatible with CrashUploadListCrashpad. crash_sender continues
// to log uploads in CrashUploadList::kReporterLogFilename.
// Linux is handled below.
- #if !(BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
-- BUILDFLAG(IS_LINUX))
-+ BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
+-#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX))
++#if !(BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD))
if (crash_reporter::IsCrashpadEnabled()) {
return new CrashUploadListCrashpad();
}
diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
index b548b1227e0e..d41f7b1f7e2f 100644
--- a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
@@ -1,11 +1,11 @@
---- chrome/browser/dev_ui_browser_resources.grd.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
-@@ -50,7 +50,7 @@ This file specifies browser resources for developer-fa
- <include name="IDR_PROFILE_INTERNALS_HTML" file="resources\profiles\profile_internals.html" type="BINDATA" />
- <include name="IDR_MEDIA_SESSION_MOJOM_WEBUI_JS" file="${root_gen_dir}\mojom-webui\services\media_session\public\mojom\media_session.mojom-webui.js" use_base_dir="false" type="BINDATA" />
+@@ -41,7 +41,7 @@ This file specifies browser resources for developer-fa
+ <include name="IDR_PREDICTORS_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\predictors.js" use_base_dir="false" type="BINDATA" />
+ <include name="IDR_PREDICTORS_RESOURCE_PREFETCH_PREDICTOR_JS" file="${root_gen_dir}\chrome\browser\resources\predictors\resource_prefetch_predictor.js" use_base_dir="false" type="BINDATA" />
-- <if expr="is_android or is_linux">
-+ <if expr="is_android or is_posix">
+- <if expr="is_android or is_linux or chromeos_ash or chromeos_lacros">
++ <if expr="is_android or is_posix or chromeos_ash or chromeos_lacros">
<include name="IDR_SANDBOX_INTERNALS_HTML" file="resources\sandbox_internals\sandbox_internals.html" preprocess="true" type="BINDATA" />
<include name="IDR_SANDBOX_INTERNALS_JS" file="resources\sandbox_internals\sandbox_internals.js" preprocess="true" type="BINDATA" />
</if>
diff --git a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
index c08101b188a1..45628b84695c 100644
--- a/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_download_chrome__download__manager__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/download/chrome_download_manager_delegate.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/download/chrome_download_manager_delegate.cc
-@@ -1533,7 +1533,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1540,7 +1540,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
target_info->is_filetype_handled_safely)
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
@@ -9,7 +9,7 @@
if (item->GetOriginalMimeType() == "application/x-x509-user-cert")
DownloadItemModel(item).SetShouldPreferOpeningInBrowser(true);
#endif
-@@ -1585,7 +1585,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
+@@ -1592,7 +1592,7 @@ void ChromeDownloadManagerDelegate::OnDownloadTargetDe
bool ChromeDownloadManagerDelegate::IsOpenInBrowserPreferreredForFile(
const base::FilePath& path) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -18,7 +18,7 @@
if (path.MatchesExtension(FILE_PATH_LITERAL(".pdf"))) {
return !download_prefs_->ShouldOpenPdfInSystemReader();
}
-@@ -1693,7 +1693,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
+@@ -1699,7 +1699,7 @@ void ChromeDownloadManagerDelegate::CheckDownloadAllow
content::CheckDownloadAllowedCallback check_download_allowed_cb) {
DCHECK_CURRENTLY_ON(BrowserThread::UI);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -27,7 +27,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()) {
-@@ -1735,7 +1735,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
+@@ -1741,7 +1741,7 @@ std::unique_ptr<download::DownloadItemRenameHandler>
ChromeDownloadManagerDelegate::GetRenameHandlerForDownload(
download::DownloadItem* download_item) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -36,7 +36,7 @@
return enterprise_connectors::FileSystemRenameHandler::CreateIfNeeded(
download_item);
#else
-@@ -1751,7 +1751,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
+@@ -1757,7 +1757,7 @@ void ChromeDownloadManagerDelegate::CheckSavePackageAl
DCHECK(download_item->IsSavePackageDownload());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
index 22ae1dedb0e4..6f6f53a1f27f 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
@@ -1,6 +1,6 @@
---- chrome/browser/download/download_item_model.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/download/download_item_model.cc
-@@ -678,7 +678,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -671,7 +671,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();
-@@ -718,7 +718,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -711,7 +711,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
DownloadCommands::ALWAYS_OPEN_TYPE);
DownloadPrefs* prefs = DownloadPrefs::FromBrowserContext(profile());
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
index 1191fd54aa79..6c02c285ce32 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.cc
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/download/download_prefs.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/download/download_prefs.cc
@@ -13,6 +13,7 @@
#include "base/callback_helpers.h"
@@ -46,25 +46,7 @@
registry->RegisterBooleanPref(prefs::kOpenPdfDownloadInSystemReader, false);
#endif
#if BUILDFLAG(IS_ANDROID)
-@@ -434,7 +439,7 @@ bool DownloadPrefs::IsDownloadPathManaged() const {
-
- bool DownloadPrefs::IsAutoOpenByUserUsed() const {
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
-- BUILDFLAG(IS_MAC)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- if (ShouldOpenPdfInSystemReader())
- return true;
- #endif
-@@ -449,7 +454,7 @@ bool DownloadPrefs::IsAutoOpenEnabled(const GURL& url,
- DCHECK(extension[0] == base::FilePath::kExtensionSeparator);
- extension.erase(0, 1);
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
-- BUILDFLAG(IS_MAC)
-+ BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- if (base::FilePath::CompareEqualIgnoreCase(extension,
- FILE_PATH_LITERAL("pdf")) &&
- ShouldOpenPdfInSystemReader())
-@@ -504,7 +509,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
+@@ -496,7 +501,7 @@ void DownloadPrefs::DisableAutoOpenByUserBasedOnExtens
}
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -73,7 +55,7 @@
void DownloadPrefs::SetShouldOpenPdfInSystemReader(bool should_open) {
if (should_open_pdf_in_system_reader_ == should_open)
return;
-@@ -526,7 +531,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
+@@ -528,7 +533,7 @@ bool DownloadPrefs::ShouldOpenPdfInSystemReader() cons
void DownloadPrefs::ResetAutoOpenByUser() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -82,7 +64,16 @@
SetShouldOpenPdfInSystemReader(false);
#endif
auto_open_by_user_.clear();
-@@ -666,7 +671,14 @@ base::FilePath DownloadPrefs::SanitizeDownloadTargetPa
+@@ -559,7 +564,7 @@ void DownloadPrefs::SaveAutoOpenState() {
+ bool DownloadPrefs::CanPlatformEnableAutoOpenForPdf() const {
+ #if BUILDFLAG(IS_CHROMEOS)
+ return false; // There is no UI for auto-open on ChromeOS.
+-#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ return ShouldOpenPdfInSystemReader();
+ #else
+ return false;
+@@ -678,7 +683,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/chromium/files/patch-chrome_browser_download_download__prefs.h b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
index 7bc29b44a5a3..11d432acfbc2 100644
--- a/www/chromium/files/patch-chrome_browser_download_download__prefs.h
+++ b/www/chromium/files/patch-chrome_browser_download_download__prefs.h
@@ -1,4 +1,4 @@
---- chrome/browser/download/download_prefs.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/download/download_prefs.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/download/download_prefs.h
@@ -125,7 +125,7 @@ class DownloadPrefs {
void DisableAutoOpenByUserBasedOnExtension(const base::FilePath& file_name);
@@ -9,7 +9,7 @@
// Store the user preference to disk. If |should_open| is true, also disable
// the built-in PDF plugin. If |should_open| is false, enable the PDF plugin.
void SetShouldOpenPdfInSystemReader(bool should_open);
-@@ -185,7 +185,7 @@ class DownloadPrefs {
+@@ -186,7 +186,7 @@ class DownloadPrefs {
std::unique_ptr<policy::URLBlocklist> auto_open_allowed_by_urls_;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index 12a4cc805196..737f36d6551e 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
+++ b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1302,6 +1302,10 @@ static_library("extensions") {
+@@ -1281,6 +1281,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
index a88036a55cae..38cc6a034c09 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc
-@@ -155,7 +155,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
+@@ -168,7 +168,7 @@ EnterpriseReportingPrivateGetDeviceIdFunction::
// getPersistentSecret
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
index 885f7e4d295e..fdafe702d58a 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_enterprise__reporting__private__api.h
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.h
-@@ -45,7 +45,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
+@@ -52,7 +52,7 @@ class EnterpriseReportingPrivateGetDeviceIdFunction :
~EnterpriseReportingPrivateGetDeviceIdFunction() override;
};
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
index b70742d8aa83..0f7b19fef295 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_settings__private_prefs__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -183,7 +183,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -187,7 +187,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
(*s_allowlist)[::prefs::kUseCustomChromeFrame] =
settings_api::PrefType::PREF_TYPE_BOOLEAN;
#endif
-@@ -197,7 +197,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
settings_api::PrefType::PREF_TYPE_NUMBER;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
index ae603afe7673..62824e0b0fa3 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -53,7 +53,7 @@
+@@ -52,7 +52,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
#include "ppapi/buildflags/buildflags.h"
@@ -9,10 +9,10 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
-@@ -133,7 +133,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+@@ -131,7 +131,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+ #endif
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
- extensions::SignedInDevicesManager::GetFactoryInstance();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
extensions::SystemIndicatorManagerFactory::GetInstance();
diff --git a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
index ebbdbd6295d6..de4b90789eb5 100644
--- a/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
+++ b/www/chromium/files/patch-chrome_browser_file__system__access_chrome__file__system__access__permission__context.cc
@@ -1,6 +1,6 @@
---- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -217,7 +217,7 @@ const struct {
+@@ -219,7 +219,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif
diff --git a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h
index e354427b6e15..306e49626ec7 100644
--- a/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h
+++ b/www/chromium/files/patch-chrome_browser_first__run_first__run__internal.h
@@ -1,11 +1,11 @@
---- chrome/browser/first_run/first_run_internal.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/first_run/first_run_internal.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/first_run/first_run_internal.h
-@@ -58,7 +58,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
+@@ -56,7 +56,7 @@ FirstRunState DetermineFirstRunState(bool has_sentinel
+ bool force_first_run,
+ bool no_first_run);
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// For testing, forces the first run dialog to either be shown or not. If not
// called, the decision to show the dialog or not will be made by Chrome based
// on a number of factors (such as install type, whether it's a Chrome-branded
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 67486d5f9f47..05d76b6df0e6 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,24 +1,15 @@
---- chrome/browser/flag_descriptions.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -5639,7 +5639,7 @@ const char kDownloadShelfWebUIDescription[] =
+@@ -5709,7 +5709,7 @@ const char kSideSearchDSESupportDescription[] =
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-
- const char kWebuiFeedbackName[] = "WebUI Feedback";
- const char kWebuiFeedbackDescription[] =
-@@ -5650,7 +5650,7 @@ const char kWebuiFeedbackDescription[] =
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
const char kDesktopRestructuredLanguageSettingsName[] =
"Restructured Language Settings (Desktop)";
-@@ -5676,7 +5676,7 @@ const char kWebShareDescription[] =
+@@ -5735,7 +5735,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -27,7 +18,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -5688,7 +5688,7 @@ const char kOzonePlatformHintDescription[] =
+@@ -5747,7 +5747,7 @@ const char kOzonePlatformHintDescription[] =
"\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. ";
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
@@ -36,7 +27,7 @@
const char kCleanUndecryptablePasswordsLinuxName[] =
"Cleanup local undecryptable passwords during initial sync flow";
const char kCleanUndecryptablePasswordsLinuxDescription[] =
-@@ -5701,7 +5701,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
+@@ -5760,7 +5760,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX)
@@ -45,7 +36,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -5832,7 +5832,7 @@ const char kElasticOverscrollDescription[] =
+@@ -5875,7 +5875,7 @@ const char kElasticOverscrollDescription[] =
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.h b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
index c15792e97796..c562addb2caf 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,24 +1,15 @@
---- chrome/browser/flag_descriptions.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/flag_descriptions.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -3241,7 +3241,7 @@ extern const char kDownloadShelfWebUIDescription[];
+@@ -3279,7 +3279,7 @@ extern const char kSideSearchDSESupportDescription[];
// Random platform combinations -----------------------------------------------
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
-
- extern const char kWebuiFeedbackName[];
- extern const char kWebuiFeedbackDescription[];
-@@ -3250,7 +3250,7 @@ extern const char kWebuiFeedbackDescription[];
- // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
-
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
extern const char kDesktopRestructuredLanguageSettingsName[];
extern const char kDesktopRestructuredLanguageSettingsDescription[];
-@@ -3269,7 +3269,7 @@ extern const char kWebShareName[];
+@@ -3298,7 +3298,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -27,7 +18,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3285,7 +3285,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
+@@ -3314,7 +3314,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@@ -36,7 +27,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -3377,7 +3377,7 @@ extern const char kElasticOverscrollDescription[];
+@@ -3395,7 +3395,7 @@ extern const char kElasticOverscrollDescription[];
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
index 7e2720742be7..336a741b996e 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__browser__main__extra__parts__metrics.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -57,8 +57,10 @@
+@@ -60,8 +60,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
-@@ -223,7 +225,7 @@ void RecordStartupMetrics() {
+@@ -227,7 +229,7 @@ void RecordStartupMetrics() {
// Record whether Chrome is the default browser or not.
// Disabled on Linux due to hanging browser tests, see crbug.com/1216328.
diff --git a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
index 912d6984b293..3b3454b1ab3c 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_chrome__metrics__service__client.cc
@@ -1,6 +1,6 @@
---- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -784,7 +784,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -787,7 +787,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
// 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_LACROS))
metrics_service_->RegisterMetricsProvider(
std::make_unique<DesktopPlatformFeaturesMetricsProvider>());
-@@ -874,7 +874,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -876,7 +876,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@@ -18,7 +18,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
metrics_service_->RegisterMetricsProvider(
-@@ -1053,7 +1053,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -1055,7 +1055,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/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc b/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
index c88046d4002e..d8d02e8bf313 100644
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__metrics__recorder__util.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
@@ -1,6 +1,6 @@
---- chrome/browser/performance_monitor/process_metrics_recorder_util.cc.orig 2022-05-19 14:06:27 UTC
-+++ chrome/browser/performance_monitor/process_metrics_recorder_util.cc
-@@ -43,7 +43,7 @@ void RecordProcessHistograms(const char* histogram_suf
+--- chrome/browser/metrics/power/process_metrics_recorder_util.cc.orig 2022-06-17 14:20:10 UTC
++++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
+@@ -41,7 +41,7 @@ void RecordProcessHistograms(const char* histogram_suf
kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount);
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
index d4341d8d8ff2..8ca94aafbb07 100644
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
@@ -1,6 +1,6 @@
---- chrome/browser/performance_monitor/process_monitor.cc.orig 2022-05-19 14:06:27 UTC
-+++ chrome/browser/performance_monitor/process_monitor.cc
-@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
+--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-06-17 14:20:10 UTC
++++ chrome/browser/metrics/power/process_monitor.cc
+@@ -59,7 +59,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
metrics.precise_cpu_usage = process_metrics.GetPreciseCPUUsage();
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
@@ -9,7 +9,7 @@
metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
#endif
#if BUILDFLAG(IS_MAC)
-@@ -119,7 +119,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
+@@ -114,7 +114,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h
index 7e90761af238..5c14d103a0f9 100644
--- a/www/chromium/files/patch-chrome_browser_performance__monitor_process__monitor.h
+++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h
@@ -1,6 +1,6 @@
---- chrome/browser/performance_monitor/process_monitor.h.orig 2022-05-19 14:06:27 UTC
-+++ chrome/browser/performance_monitor/process_monitor.h
-@@ -78,7 +78,7 @@ class ProcessMonitor : public content::BrowserChildPro
+--- chrome/browser/metrics/power/process_monitor.h.orig 2022-06-17 14:20:10 UTC
++++ chrome/browser/metrics/power/process_monitor.h
+@@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
index 6c677548e70d..0e2e20a6d695 100644
--- a/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_platform__util__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/platform_util_linux.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/platform_util_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/platform_util_linux.cc
-@@ -298,7 +298,9 @@ void RunCommand(const std::string& command,
+@@ -294,7 +294,9 @@ void RunCommand(const std::string& command,
base::LaunchOptions options;
options.current_directory = working_directory;
diff --git a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc b/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
deleted file mode 100644
index 6762dc97c10f..000000000000
--- a/www/chromium/files/patch-chrome_browser_plugins_plugins__resource__service.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/plugins/plugins_resource_service.cc.orig 2022-02-28 16:54:41 UTC
-+++ chrome/browser/plugins/plugins_resource_service.cc
-@@ -62,7 +62,7 @@ GURL GetPluginsServerURL() {
- filename = "plugins_win.json";
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
- filename = "plugins_chromeos.json";
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- filename = "plugins_linux.json";
- #elif BUILDFLAG(IS_MAC)
- filename = "plugins_mac.json";
diff --git a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
index c5533c6b1ade..a9763e11d754 100644
--- a/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc
@@ -1,7 +1,7 @@
---- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/policy/configuration_policy_handler_list_factory.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -187,7 +187,7 @@
- #endif // BUILDFLAG(ENABLE_SIDE_SEARCH)
+@@ -186,7 +186,7 @@
+ #endif // BUILDFLAG(ENABLE_SPELLCHECK)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_FUCHSIA)
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h"
#endif
-@@ -1557,7 +1557,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1562,7 +1562,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_CHROMEOS)
@@ -18,7 +18,7 @@
{ key::kAuthNegotiateDelegateByKdcPolicy,
prefs::kAuthNegotiateDelegateByKdcPolicy,
base::Value::Type::BOOLEAN },
-@@ -1624,7 +1624,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1626,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -27,7 +27,7 @@
{ key::kChromeAppsEnabled,
extensions::pref_names::kChromeAppsEnabled,
base::Value::Type::BOOLEAN },
-@@ -1940,7 +1940,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -1945,7 +1945,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
key::kBrowsingDataLifetime, browsing_data::prefs::kBrowsingDataLifetime,
chrome_schema));
@@ -36,7 +36,7 @@
handlers->AddHandler(std::make_unique<LocalSyncPolicyHandler>());
handlers->AddHandler(std::make_unique<ThemeColorPolicyHandler>());
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN)
-@@ -2294,7 +2294,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2299,7 +2299,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
static_cast<int>(variations::RestrictionPolicy::ALL), false));
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -45,7 +45,7 @@
handlers->AddHandler(
std::make_unique<web_app::WebAppSettingsPolicyHandler>(chrome_schema));
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) ||
-@@ -2313,7 +2313,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2318,7 +2318,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
policy::key::kSpellcheckLanguageBlocklist));
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
diff --git a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
index db49d7358c07..75c4ed1a175b 100644
--- a/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
+++ b/www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc
@@ -1,6 +1,6 @@
---- chrome/browser/prefs/browser_prefs.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -430,14 +430,14 @@
+@@ -434,14 +434,14 @@
#include "components/os_crypt/os_crypt.h"
#endif
@@ -17,7 +17,7 @@
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
#include "chrome/browser/browser_switcher/browser_switcher_prefs.h"
#endif
-@@ -1191,7 +1191,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
+@@ -1177,7 +1177,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@@ -26,16 +26,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif
-@@ -1205,7 +1205,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
- registry->RegisterBooleanPref(
- policy::policy_prefs::kSetTimeoutWithout1MsClampEnabled, false);
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- screen_ai::RegisterLocalStatePrefs(registry);
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-
-@@ -1504,7 +1504,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1492,7 +1492,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
index 8374e8b2683c..0f457624265d 100644
--- a/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_print__backend__service__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/printing/print_backend_service_manager.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/printing/print_backend_service_manager.cc
-@@ -480,7 +480,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R
+@@ -481,7 +481,7 @@ absl::optional<uint32_t> PrintBackendServiceManager::R
query_clients_.insert(client_id);
break;
case ClientType::kQueryWithUi:
@@ -9,7 +9,7 @@
if (!query_with_ui_clients_.empty())
return absl::nullopt;
#endif
-@@ -705,7 +705,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -706,7 +706,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;
-@@ -762,7 +762,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
+@@ -763,7 +763,7 @@ PrintBackendServiceManager::DetermineIdleTimeoutUpdate
return kNoClientsRegisteredResetOnIdleTimeout;
case ClientType::kQueryWithUi:
diff --git a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc b/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
index a59897bf8a89..52c3aba74cf3 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_chrome__browser__main__extra__parts__profiles.cc
+++ b/www/chromium/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 2022-05-19 14:06:27 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -400,7 +400,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -406,7 +406,7 @@ void ChromeBrowserMainExtraPartsProfiles::
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
index 841292078166..d066c4e0c6b5 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profile_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/profiles/profile_impl.cc
-@@ -264,6 +264,10 @@
+@@ -259,6 +259,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
#endif
@@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
-@@ -844,7 +848,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
+@@ -845,7 +849,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
}
base::FilePath ProfileImpl::last_selected_directory() {
diff --git a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
index 497ec10d4120..31386232e3d3 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc
@@ -1,6 +1,6 @@
---- chrome/browser/profiles/profiles_state.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/profiles/profiles_state.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/profiles/profiles_state.cc
-@@ -176,7 +176,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
+@@ -177,7 +177,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/chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
index be6eb02d57a1..b6a965119496 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
@@ -1,6 +1,6 @@
---- chrome/browser/resources/settings/route.ts.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/resources/settings/route.ts.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/resources/settings/route.ts
-@@ -188,7 +188,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
+@@ -190,7 +190,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y');
diff --git a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
index f8d53d434290..38567566017e 100644
--- a/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
+++ b/www/chromium/files/patch-chrome_browser_safe__browsing_download__protection_file__analyzer.cc
@@ -1,4 +1,4 @@
---- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc
@@ -20,7 +20,7 @@
#include "content/public/browser/browser_thread.h"
@@ -18,7 +18,7 @@
} else if (inspection_type == DownloadFileType::OFFICE_DOCUMENT) {
StartExtractDocumentFeatures();
#endif
-@@ -283,7 +283,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
+@@ -289,7 +289,7 @@ void FileAnalyzer::OnDmgAnalysisFinished(
}
#endif // BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc b/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
index ed53b893c4a0..f70285bf99a2 100644
--- a/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/signin/primary_account_policy_manager.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/signin/primary_account_policy_manager.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/signin/primary_account_policy_manager.cc
-@@ -22,7 +22,7 @@
+@@ -23,7 +23,7 @@
#include "google_apis/gaia/gaia_auth_util.h"
#include "ui/base/l10n/l10n_util.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_finder.h"
-@@ -34,7 +34,7 @@
+@@ -35,7 +35,7 @@
#include "chrome/browser/ui/webui/profile_helper.h"
#endif
@@ -18,7 +18,7 @@
// Manager that presents the profile will be deleted dialog on the first active
// browser window.
class PrimaryAccountPolicyManager::DeleteProfileDialogManager
-@@ -249,7 +249,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
+@@ -250,7 +250,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
break;
}
case signin::Tribool::kFalse:
@@ -27,7 +27,7 @@
// Force remove the profile if sign out is not allowed and if the
// primary account is no longer allowed.
// This may be called while the profile is initializing, so it must be
-@@ -280,7 +280,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
+@@ -281,7 +281,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
#endif // !BUILDFLAG(IS_CHROMEOS_ASH)
}
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
new file mode 100644
index 000000000000..8aa7e5d70afe
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/themes/theme_helper.cc.orig 2022-06-17 14:20:10 UTC
++++ chrome/browser/themes/theme_helper.cc
+@@ -24,7 +24,7 @@
+ #include "ui/native_theme/common_theme.h"
+ #include "ui/native_theme/native_theme.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/views/linux_ui/linux_ui.h"
+ #endif
+
+@@ -494,7 +494,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
+
+ ui::NativeTheme const* native_theme =
+ ui::NativeTheme::GetInstanceForNativeUi();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ if (const auto* linux_ui = views::LinuxUI::instance()) {
+ // We rely on the fact that the system theme is in use iff `theme_supplier`
+ // is non-null, but this is cheating. In the future this might not hold
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
index 201e89390c56..ee944889c1f2 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__service.cc
@@ -1,4 +1,4 @@
---- chrome/browser/themes/theme_service.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/themes/theme_service.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/themes/theme_service.cc
@@ -72,7 +72,7 @@
#include "extensions/browser/extension_registry_observer.h"
@@ -9,7 +9,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -511,7 +511,7 @@ ThemeService::BrowserThemeProvider::GetColorProviderCo
+@@ -489,7 +489,7 @@ ThemeService::BrowserThemeProvider::GetColorProviderCo
native_theme = ui::NativeTheme::GetInstanceForDarkUI();
} else {
native_theme = ui::NativeTheme::GetInstanceForNativeUi();
@@ -18,7 +18,7 @@
if (const auto* linux_ui = views::LinuxUI::instance()) {
native_theme =
linux_ui->GetNativeTheme(delegate_->ShouldUseSystemTheme());
-@@ -631,7 +631,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
+@@ -611,7 +611,7 @@ CustomThemeSupplier* ThemeService::GetThemeSupplier()
}
bool ThemeService::ShouldUseSystemTheme() const {
@@ -27,7 +27,7 @@
return profile_->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme);
#else
return false;
-@@ -639,7 +639,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
+@@ -619,7 +619,7 @@ bool ThemeService::ShouldUseSystemTheme() const {
}
bool ThemeService::ShouldUseCustomFrame() const {
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h
new file mode 100644
index 000000000000..b8a35a466f16
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_browser.h
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/browser.h.orig 2022-06-17 14:20:10 UTC
++++ chrome/browser/ui/browser.h
+@@ -734,7 +734,7 @@ class Browser : public TabStripModelObserver,
+
+ StatusBubble* GetStatusBubbleForTesting();
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ void RunScreenAIAnnotator();
+ #endif
+
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index b3fdff9f3d18..475c34166459 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
@@ -1,15 +1,6 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/browser_command_controller.cc
-@@ -71,7 +71,7 @@
- #include "ui/base/ui_base_features.h"
- #include "ui/events/keycodes/keyboard_codes.h"
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/accessibility/accessibility_features.h"
- #endif
-
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
-@@ -287,7 +287,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -288,7 +288,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -523,7 +523,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -524,7 +524,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -36,16 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -926,7 +926,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
- ExecuteUIDebugCommand(id, browser_);
- break;
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- case IDC_RUN_SCREEN_AI:
- RunScreenAi(browser_);
- break;
-@@ -1088,7 +1088,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1087,7 +1087,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -54,12 +36,3 @@
command_updater_.UpdateCommandEnabled(IDC_MINIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_MAXIMIZE_WINDOW, true);
command_updater_.UpdateCommandEnabled(IDC_RESTORE_WINDOW, true);
-@@ -1474,7 +1474,7 @@ void BrowserCommandController::UpdateCommandsForFullsc
- command_updater_.UpdateCommandEnabled(
- IDC_FOCUS_INACTIVE_POPUP_FOR_ACCESSIBILITY, main_not_fullscreen);
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- command_updater_.UpdateCommandEnabled(IDC_RUN_SCREEN_AI,
- features::IsScreenAIEnabled());
- #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc b/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
deleted file mode 100644
index 9ccd79eefb9f..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_browser__commands.cc
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/ui/browser_commands.cc.orig 2022-05-19 14:06:27 UTC
-+++ chrome/browser/ui/browser_commands.cc
-@@ -176,7 +176,7 @@
- #include "chromeos/lacros/lacros_service.h"
- #endif
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "ui/accessibility/ax_action_data.h"
- #include "ui/accessibility/ax_enums.mojom.h"
- #endif
-@@ -1859,7 +1859,7 @@ void UnfollowSite(content::WebContents* web_contents)
- feed::UnfollowSite(web_contents);
- }
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- void RunScreenAi(Browser* browser) {
- ui::AXActionData ad;
- ad.action = ax::mojom::Action::kRunScreenAi;
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__commands.h b/www/chromium/files/patch-chrome_browser_ui_browser__commands.h
deleted file mode 100644
index a9511ee83274..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_browser__commands.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/browser_commands.h.orig 2022-05-19 14:06:27 UTC
-+++ chrome/browser/ui/browser_commands.h
-@@ -251,7 +251,7 @@ void ProcessInterceptedChromeURLNavigationInIncognito(
- void FollowSite(content::WebContents* web_contents);
- void UnfollowSite(content::WebContents* web_contents);
-
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- // Triggers the Screen AI to be run once on the |browser|.
- void RunScreenAi(Browser* browser);
- #endif // BUILDFLAG(IS_LINUX)
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
index 48471d5179ed..543c6c1e4458 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/chrome_pages.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/chrome_pages.cc
-@@ -561,7 +561,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -566,7 +566,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
index 11914612e99f..6fdc2d8d1d80 100644
--- a/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
+++ b/www/chromium/files/patch-chrome_browser_ui_chrome__pages.h
@@ -1,4 +1,4 @@
---- chrome/browser/ui/chrome_pages.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/chrome_pages.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/chrome_pages.h
@@ -26,7 +26,7 @@
#endif
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/web_app_utils.h"
#endif
-@@ -202,7 +202,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -204,7 +204,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
index c4500cd60570..29634fb51731 100644
--- a/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_signin__view__controller.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/signin_view_controller.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/signin_view_controller.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/signin_view_controller.cc
-@@ -262,7 +262,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+@@ -273,7 +273,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
SkColor profile_color,
signin::SigninChoiceCallback callback) {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
index efe06fd7ba6a..813b834db6e9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_bad__flags__prompt.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/startup/bad_flags_prompt.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/startup/bad_flags_prompt.cc
-@@ -92,7 +92,7 @@ static const char* kBadFlags[] = {
+@@ -91,7 +91,7 @@ static const char* kBadFlags[] = {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index 57dfa984310d..077c2a9282c5 100644
--- a/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/startup/startup_browser_creator.cc
@@ -128,7 +128,7 @@
#include "chrome/credential_provider/common/gcp_strings.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/ui/startup/web_app_info_recorder_utils.h"
#endif
-@@ -1007,7 +1007,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1014,7 +1014,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
silent_launch = true;
}
@@ -18,7 +18,7 @@
// Writes open and installed web apps to the specified file without
// launching a new browser window or tab.
if (base::FeatureList::IsEnabled(features::kListWebAppsSwitch) &&
-@@ -1197,7 +1197,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1204,7 +1204,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/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index 8e542f4d7477..2ba23e5a47b7 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,15 +1,15 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -192,7 +192,7 @@
+@@ -196,7 +196,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ #include "chrome/browser/autofill_assistant/common_dependencies_chrome.h"
+ #include "chrome/browser/autofill_assistant/platform_dependencies_desktop.h"
#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
- #include "chrome/browser/ui/browser_finder.h"
- #include "chrome/browser/ui/hats/hats_helper.h"
-@@ -530,13 +530,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -532,13 +532,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -25,7 +25,7 @@
if (base::FeatureList::IsEnabled(
features::kHappinessTrackingSurveysForDesktopDemo) ||
base::FeatureList::IsEnabled(features::kTrustSafetySentimentSurvey) ||
-@@ -551,7 +551,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -553,7 +553,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -33,4 +33,4 @@
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(
autofill_assistant::features::kAutofillAssistantDesktop)) {
- autofill_assistant::CreateForWebContents(web_contents);
+ autofill_assistant::CreateForWebContents(
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
index d618a4423631..e21d9769aab0 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc
@@ -1,29 +1,29 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
-@@ -62,11 +62,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
+ {ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
+ {ui::VKEY_9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
{ui::VKEY_NUMPAD9, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_LAST_TAB},
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ui::VKEY_9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
{ui::VKEY_NUMPAD9, ui::EF_ALT_DOWN, IDC_SELECT_LAST_TAB},
- #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #endif // BUILDFLAG(IS_LINUX)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
{ui::VKEY_NEXT, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_MOVE_TAB_NEXT},
{ui::VKEY_PRIOR, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
IDC_MOVE_TAB_PREVIOUS},
-@@ -97,7 +97,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -93,7 +93,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+ {ui::VKEY_NUMPAD7, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_6},
+ {ui::VKEY_8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
{ui::VKEY_NUMPAD8, ui::EF_PLATFORM_ACCELERATOR, IDC_SELECT_TAB_7},
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
{ui::VKEY_1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_NUMPAD1, ui::EF_ALT_DOWN, IDC_SELECT_TAB_0},
{ui::VKEY_2, ui::EF_ALT_DOWN, IDC_SELECT_TAB_1},
-@@ -142,7 +142,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+@@ -138,7 +138,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
IDC_SHOW_AVATAR_MENU},
// Platform-specific key maps.
@@ -32,12 +32,3 @@
{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},
-@@ -240,7 +240,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
- {ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS},
- #endif // !BUILDFLAG(IS_CHROMEOS_ASH)
- #endif // !BUILDFLAG(IS_MAC)
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN, IDC_RUN_SCREEN_AI},
- #endif
- };
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
index 384e3fabd16e..b55489a351f9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate.h
@@ -1,11 +1,16 @@
---- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/chrome_views_delegate.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/chrome_views_delegate.h
-@@ -51,7 +51,7 @@ class ChromeViewsDelegate : public views::ViewsDelegat
+@@ -51,11 +51,11 @@ class ChromeViewsDelegate : public views::ViewsDelegat
base::OnceClosure callback) override;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- gfx::ImageSkia* GetDefaultWindowIcon() const override;
bool WindowManagerProvidesTitleBar(bool maximized) override;
#endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ gfx::ImageSkia* GetDefaultWindowIcon() const override;
+ #endif
+
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
new file mode 100644
index 000000000000..87a83c6e9198
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_views_chrome__views__delegate__linux.cc
@@ -0,0 +1,20 @@
+--- chrome/browser/ui/views/chrome_views_delegate_linux.cc.orig 2022-06-17 14:20:10 UTC
++++ chrome/browser/ui/views/chrome_views_delegate_linux.cc
+@@ -23,7 +23,7 @@ bool IsDesktopEnvironmentUnity() {
+ return desktop_env == base::nix::DESKTOP_ENVIRONMENT_UNITY;
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ int GetWindowIconResourceId() {
+ #if BUILDFLAG(GOOGLE_CHROME_BRANDING)
+ switch (chrome::GetChannel()) {
+@@ -52,7 +52,7 @@ views::NativeWidget* ChromeViewsDelegate::CreateNative
+ return ::CreateNativeWidget(native_widget_type, params, delegate);
+ }
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ gfx::ImageSkia* ChromeViewsDelegate::GetDefaultWindowIcon() const {
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+ return rb.GetImageSkiaNamed(GetWindowIconResourceId());
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
index 4e75ddb2b7d9..b48887d90b38 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_first__run__dialog.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/first_run_dialog.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/first_run_dialog.cc
-@@ -38,7 +38,7 @@
+@@ -34,7 +34,7 @@
namespace {
@@ -15,6 +15,6 @@
ChangeMetricsReportingState(report_crashes_->GetChecked());
-#else
+#elif !BUILDFLAG(IS_BSD)
- #if BUILDFLAG(IS_CHROMEOS_ASH)
- metrics::structured::NeutrinoDevicesLog(
- metrics::structured::NeutrinoDevicesLocation::kFirstRunDialog);
+ ChangeMetricsReportingStateWithReply(
+ report_crashes_->GetChecked(),
+ base::BindOnce(&InitCrashReporterIfEnabled));
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
index dbd0a894f425..571992fbd269 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc
-@@ -151,7 +151,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
+@@ -145,7 +145,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
}
void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h
deleted file mode 100644
index 8b456b44c4f1..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h.orig 2022-02-28 16:54:41 UTC
-+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.h
-@@ -95,7 +95,7 @@ class BrowserDesktopWindowTreeHostLinux
- // browser_desktop_window_tree_host_lacros.cc.
- #if BUILDFLAG(IS_CHROMEOS_LACROS)
- using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameLacros;
--#elif BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- using DesktopBrowserFrameAuraPlatform = DesktopBrowserFrameAuraLinux;
- #else
- #error Unknown platform
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
index 65f637d362ba..8383d8d732f7 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__frame.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/views/frame/browser_frame.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/frame/browser_frame.cc
@@ -49,11 +49,11 @@
@@ -23,7 +23,7 @@
return ThemeServiceFactory::GetForProfile(profile)->UsingSystemTheme();
#else
return false;
-@@ -268,7 +268,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
+@@ -277,7 +277,7 @@ void BrowserFrame::OnNativeWidgetWorkspaceChanged() {
IsVisibleOnAllWorkspaces());
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -32,7 +32,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()
-@@ -389,7 +389,7 @@ void BrowserFrame::SelectNativeTheme() {
+@@ -398,7 +398,7 @@ void BrowserFrame::SelectNativeTheme() {
return;
}
@@ -41,7 +41,7 @@
const views::LinuxUI* linux_ui = views::LinuxUI::instance();
// Ignore GTK+ for web apps with window-controls-overlay as the
// display_override so the web contents can blend with the overlay by using
-@@ -408,7 +408,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
+@@ -417,7 +417,7 @@ bool BrowserFrame::RegenerateFrameOnThemeChange(
bool need_regenerate = false;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
index 0b8c96b46162..78bb5a55ec2d 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1956,7 +1956,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -1964,7 +1964,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/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
index 8afa8e836fff..9934192460ee 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_frame_system__menu__model__builder.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/frame/system_menu_model_builder.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/frame/system_menu_model_builder.cc
-@@ -77,7 +77,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
+@@ -76,7 +76,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
ui::SimpleMenuModel* model) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
model->AddItemWithStringId(IDC_MINIMIZE_WINDOW, IDS_MINIMIZE_WINDOW_MENU);
model->AddItemWithStringId(IDC_MAXIMIZE_WINDOW, IDS_MAXIMIZE_WINDOW_MENU);
model->AddItemWithStringId(IDC_RESTORE_WINDOW, IDS_RESTORE_WINDOW_MENU);
-@@ -93,7 +93,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
+@@ -92,7 +92,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForBrowser
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -17,8 +17,8 @@
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
model->AddSeparator(ui::NORMAL_SEPARATOR);
bool supports_server_side_decorations = true;
- #if defined(USE_OZONE) && \
-@@ -148,7 +148,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
+ #if defined(USE_OZONE) && !BUILDFLAG(IS_CHROMEOS)
+@@ -146,7 +146,7 @@ void SystemMenuModelBuilder::BuildSystemMenuForAppOrPo
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
index 5c4323c49c43..7697ffc30943 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_hung__renderer__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/hung_renderer_view.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/hung_renderer_view.cc
-@@ -403,7 +403,7 @@ void HungRendererDialogView::ForceCrashHungRenderer()
+@@ -401,7 +401,7 @@ void HungRendererDialogView::ForceCrashHungRenderer()
content::RenderProcessHost* rph =
hung_pages_table_model_->GetRenderWidgetHost()->GetProcess();
if (rph) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
index aadbc302c4da..813a4e82c7ca 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_signin__view__controller__delegate__views.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
-@@ -139,7 +139,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
+@@ -140,7 +140,7 @@ SigninViewControllerDelegateViews::CreateProfileCustom
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// static
std::unique_ptr<views::WebView>
SigninViewControllerDelegateViews::CreateEnterpriseConfirmationWebView(
-@@ -421,7 +421,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
+@@ -419,7 +419,7 @@ SigninViewControllerDelegate::CreateProfileCustomizati
#endif // BUILDFLAG(ENABLE_DICE_SUPPORT)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
index daad11b85efb..f8a3357ffeac 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -480,7 +480,7 @@ void TabDragController::Init(TabDragContext* source_co
// synchronous on desktop Linux, so use that.
@@ -22,12 +22,12 @@
}
// If source window was maximized - maximize the new window as well.
--#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
-
+-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && \
++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) && \
+ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_MAC)
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
-@@ -2358,7 +2358,7 @@ TabDragController::Liveness TabDragController::GetLoca
+@@ -2362,7 +2362,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/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
index bc8f13bfea06..b4f64221bb59 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -304,7 +304,7 @@
+@@ -299,7 +299,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
-@@ -329,17 +329,17 @@
+@@ -324,17 +324,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
-@@ -695,7 +695,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -680,7 +680,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@@ -39,8 +39,8 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1115,7 +1115,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
- return &NewWebUI<ash::SampleSystemWebAppUI>;
+@@ -1096,7 +1096,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+ #endif // !defined(USE_REAL_DBUS_CLIENTS)
#endif // !defined(OFFICIAL_BUILD)
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
@@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
-@@ -1173,7 +1173,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1154,7 +1154,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)
-@@ -1229,27 +1229,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1213,27 +1213,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
}
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc b/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc
index ac2334aba092..7ba115f42964 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_connectors__internals_zero__trust__utils.cc
@@ -1,7 +1,7 @@
---- chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/webui/connectors_internals/zero_trust_utils.cc
-@@ -9,7 +9,7 @@
- #include "base/strings/string_util.h"
+@@ -6,7 +6,7 @@
+
#include "build/build_config.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -9,17 +9,17 @@
#include "chrome/browser/browser_process.h"
#include "chrome/browser/policy/chrome_browser_policy_connector.h"
#include "components/enterprise/browser/controller/chrome_browser_cloud_management_controller.h"
-@@ -66,7 +66,7 @@ void TrySetSignal(base::flat_map<std::string, std::str
- std::vector<base::StringPiece>(values.begin(), values.end()), ", ");
- }
+@@ -22,7 +22,7 @@ namespace utils {
+
+ namespace {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
connectors_internals::mojom::KeyTrustLevel ParseTrustLevel(
BPKUR::KeyTrustLevel trust_level) {
-@@ -171,7 +171,7 @@ base::flat_map<std::string, std::string> SignalsToMap(
- }
+@@ -53,7 +53,7 @@ connectors_internals::mojom::KeyType AlgorithmToType(
+ } // namespace
connectors_internals::mojom::KeyInfoPtr GetKeyInfo() {
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
index e715ba89489c..de30d3e44763 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
+++ b/www/chromium/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 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
-@@ -316,7 +316,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
+@@ -322,7 +322,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) || \
@@ -9,7 +9,7 @@
is_deprecated_app =
extensions::IsExtensionUnsupportedDeprecatedApp(context, extension->id());
#endif
-@@ -1387,7 +1387,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
+@@ -1398,7 +1398,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
options.os_hooks[web_app::OsHookType::kUninstallationViaOsSettings] =
web_app->CanUserUninstallWebApp();
diff --git a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
index 7e23bc2e263b..1056f2c08bae 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_settings__localized__strings__provider.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc
@@ -116,7 +116,7 @@
#include "chrome/browser/ui/webui/settings/chromeos/constants/routes.mojom.h"
@@ -18,7 +18,7 @@
#include "ui/ozone/public/ozone_platform.h"
#endif
-@@ -371,7 +371,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -372,7 +372,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
{"huge", IDS_SETTINGS_HUGE_FONT_SIZE},
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +27,7 @@
{"systemTheme", IDS_SETTINGS_SYSTEM_THEME},
{"useSystemTheme", IDS_SETTINGS_USE_SYSTEM_THEME},
{"classicTheme", IDS_SETTINGS_CLASSIC_THEME},
-@@ -379,7 +379,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -380,7 +380,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
#else
{"resetToDefaultTheme", IDS_SETTINGS_RESET_TO_DEFAULT_THEME},
#endif
@@ -36,7 +36,7 @@
{"showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS},
#endif
#if BUILDFLAG(IS_MAC)
-@@ -400,7 +400,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -401,7 +401,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/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
index f5e4edc63ee2..e7a263bab4e9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_window__sizer_window__sizer.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/window_sizer/window_sizer.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/ui/window_sizer/window_sizer.cc
-@@ -173,7 +173,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState(
+@@ -172,7 +172,7 @@ void WindowSizer::GetBrowserWindowBoundsAndShowState(
browser, window_bounds, show_state);
}
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
index 8ed33da82169..b921cc1742c4 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_os__integration_web__app__shortcut.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/web_applications/os_integration/web_app_shortcut.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/web_applications/os_integration/web_app_shortcut.cc
-@@ -43,7 +43,7 @@ namespace {
+@@ -44,7 +44,7 @@ namespace {
#if BUILDFLAG(IS_MAC)
const int kDesiredIconSizesForShortcut[] = {16, 32, 128, 256, 512};
@@ -9,7 +9,7 @@
// Linux supports icons of any size. FreeDesktop Icon Theme Specification states
// that "Minimally you should install a 48x48 icon in the hicolor theme."
const int kDesiredIconSizesForShortcut[] = {16, 32, 48, 128, 256, 512};
-@@ -133,7 +133,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr
+@@ -147,7 +147,7 @@ ScopedShortcutOverrideForTesting::~ScopedShortcutOverr
}
}
}
@@ -18,7 +18,7 @@
directories = {&desktop};
#endif
for (base::ScopedTempDir* dir : directories) {
-@@ -177,7 +177,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over
+@@ -191,7 +191,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over
scoped_override->chrome_apps_folder.CreateUniqueTempDirUnderPath(
base_path);
DCHECK(success);
@@ -27,7 +27,7 @@
bool success =
scoped_override->desktop.CreateUniqueTempDirUnderPath(base_path);
DCHECK(success);
-@@ -197,7 +197,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over
+@@ -211,7 +211,7 @@ std::unique_ptr<ScopedShortcutOverrideForTesting> Over
#elif BUILDFLAG(IS_MAC)
bool success = scoped_override->chrome_apps_folder.CreateUniqueTempDir();
DCHECK(success);
diff --git a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
index 6beb7b9a4582..98b63fd85a9f 100644
--- a/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
+++ b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
@@ -1,6 +1,6 @@
---- chrome/browser/web_applications/web_app_provider.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/web_applications/web_app_provider.cc
-@@ -292,7 +292,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
+@@ -281,7 +281,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
protocol_handler_manager.get());
std::unique_ptr<UrlHandlerManager> url_handler_manager;
diff --git a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
index de944fd655dc..9810900717e1 100644
--- a/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
+++ b/www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc
@@ -1,6 +1,6 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -557,7 +557,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
+@@ -670,7 +670,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
// TODO(crbug.com/1052397): Revisit the macro expression once build flag
// switch of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index 3c431f2e6835..d76d025c188a 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/chrome_features.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/chrome_features.cc
@@ -104,7 +104,7 @@ const 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.
-@@ -298,7 +298,7 @@ const base::Feature kDesktopPWAsNotificationIconAndTit
+@@ -287,7 +287,7 @@ const base::Feature kDesktopPWAsEnforceWebAppSettingsP
// Enables or disables Desktop PWAs to be auto-started on OS login.
const base::Feature kDesktopPWAsRunOnOsLogin {
"DesktopPWAsRunOnOsLogin",
@@ -27,7 +27,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -314,7 +314,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA
+@@ -303,7 +303,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA
base::FEATURE_DISABLED_BY_DEFAULT};
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -36,7 +36,7 @@
// Serves web app settings at chrome://app-settings/<app-id>.
const base::Feature kDesktopPWAsWebAppSettingsPage{
"DesktopPWAsWebAppSettingsPage", base::FEATURE_ENABLED_BY_DEFAULT};
-@@ -333,7 +333,7 @@ const base::Feature kKeepForceInstalledPreinstalledApp
+@@ -327,7 +327,7 @@ const base::Feature kDmTokenDeletion{"DmTokenDeletion"
const 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
-@@ -349,7 +349,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -343,7 +343,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
-@@ -646,7 +646,7 @@ const base::Feature kKernelnextVMs{"KernelnextVMs",
- base::FEATURE_DISABLED_BY_DEFAULT};
- #endif
+@@ -639,7 +639,7 @@ const base::Feature kIncognitoParamFilterEnabled{
+ const base::Feature kIPHInWebUIDemo{"IPHInWebUIDemo",
+ base::FEATURE_DISABLED_BY_DEFAULT};
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)) || BUILDFLAG(IS_BSD)
COMPONENT_EXPORT(CHROME_FEATURES)
const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -659,7 +659,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -652,7 +652,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
&kLinuxLowMemoryMonitor, "critical_level", 255};
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.h b/www/chromium/files/patch-chrome_common_chrome__features.h
index 35273b09cef8..ec04c20c41ca 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_features.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/chrome_features.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/chrome_features.h
@@ -91,7 +91,7 @@ extern const base::Feature kArcPiGhostWindow;
COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns;
@@ -18,7 +18,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kBackgroundModeAllowRestart;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -223,7 +223,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -220,7 +220,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kDesktopPWAsWebBundles;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,16 +27,16 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kDesktopPWAsWebAppSettingsPage;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -451,7 +451,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
- extern const base::Feature kKernelnextVMs;
- #endif
+@@ -449,7 +449,7 @@ extern const base::Feature kIncognitoParamFilterEnable
+ COMPONENT_EXPORT(CHROME_FEATURES)
+ extern const base::Feature kIPHInWebUIDemo;
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS)
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kLinuxLowMemoryMonitor;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -460,7 +460,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -458,7 +458,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::FeatureParam<int> kLinuxLowMemoryMonitorCriticalLevel;
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.cc b/www/chromium/files/patch-chrome_common_chrome__paths.cc
index 1f9c0bc83498..940ec1a8352a 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_paths.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/chrome_paths.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/chrome_paths.cc
-@@ -48,14 +48,14 @@
+@@ -49,14 +49,14 @@
namespace {
@@ -18,7 +18,7 @@
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -182,7 +182,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -183,7 +183,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;
-@@ -429,10 +429,12 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -426,10 +426,12 @@ bool PathProvider(int key, base::FilePath* result) {
if (!base::PathExists(cur)) // We don't want to create this
return false;
break;
@@ -41,7 +41,7 @@
#else
cur = base::FilePath(FILE_PATH_LITERAL("/etc/chromium/policies"));
#endif
-@@ -444,7 +446,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -441,7 +443,7 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
BUILDFLAG(CHROMIUM_BRANDING)) || \
@@ -50,7 +50,7 @@
case chrome::DIR_USER_EXTERNAL_EXTENSIONS: {
if (!base::PathService::Get(chrome::DIR_USER_DATA, &cur))
return false;
-@@ -452,7 +454,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -449,7 +451,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
}
#endif
@@ -59,7 +59,7 @@
case chrome::DIR_STANDALONE_EXTERNAL_EXTENSIONS: {
cur = base::FilePath(kFilepathSinglePrefExtensions);
break;
-@@ -496,7 +498,7 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -493,7 +495,7 @@ bool PathProvider(int key, base::FilePath* result) {
break;
#endif
@@ -68,7 +68,7 @@
case chrome::DIR_NATIVE_MESSAGING:
#if BUILDFLAG(IS_MAC)
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
-@@ -510,6 +512,9 @@ bool PathProvider(int key, base::FilePath* result) {
+@@ -507,6 +509,9 @@ bool PathProvider(int key, base::FilePath* result) {
#if BUILDFLAG(GOOGLE_CHROME_BRANDING)
cur = base::FilePath(FILE_PATH_LITERAL(
"/etc/opt/chrome/native-messaging-hosts"));
diff --git a/www/chromium/files/patch-chrome_common_chrome__paths.h b/www/chromium/files/patch-chrome_common_chrome__paths.h
index 1941de84727c..12f6569093fa 100644
--- a/www/chromium/files/patch-chrome_common_chrome__paths.h
+++ b/www/chromium/files/patch-chrome_common_chrome__paths.h
@@ -1,4 +1,4 @@
---- chrome/common/chrome_paths.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/common/chrome_paths.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/chrome_paths.h
@@ -56,7 +56,7 @@ enum {
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
@@ -18,7 +18,7 @@
DIR_STANDALONE_EXTERNAL_EXTENSIONS, // Directory for 'per-extension'
// definition manifest files that
// describe extensions which are to be
-@@ -114,7 +114,7 @@ enum {
+@@ -117,7 +117,7 @@ enum {
DIR_CHROMEOS_CUSTOM_WALLPAPERS, // Directory where custom wallpapers
// reside.
#endif
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 04b95fd57e0d..487a233935a2 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.cc
+++ b/www/chromium/files/patch-chrome_common_pref__names.cc
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/pref_names.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/pref_names.cc
-@@ -1221,7 +1221,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
+@@ -1220,7 +1220,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
// Linux specific preference on whether we should match the system theme.
const char kUsesSystemTheme[] = "extensions.theme.use_system";
#endif
-@@ -1324,7 +1324,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1315,7 +1315,7 @@ const char kShowUpdatePromotionInfoBar[] =
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
// 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";
-@@ -1809,7 +1809,7 @@ const char kDownloadDirUpgraded[] = "download.director
+@@ -1810,7 +1810,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
-@@ -2104,7 +2104,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
+@@ -2111,7 +2111,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
// its isolation requirements.
const char kWebAppsIsolationState[] = "web_apps.isolation_state";
@@ -36,7 +36,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
// Dictionary that maps origins to web apps that can act as URL handlers.
const char kWebAppsUrlHandlerInfo[] = "web_apps.url_handler_info";
-@@ -2234,7 +2234,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
+@@ -2241,7 +2241,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
// requests.
const char kBasicAuthOverHttpEnabled[] = "auth.basic_over_http_enabled";
@@ -45,7 +45,7 @@
// Boolean that specifies whether OK-AS-DELEGATE flag from KDC is respected
// along with kAuthNegotiateDelegateAllowlist.
const char kAuthNegotiateDelegateByKdcPolicy[] =
-@@ -3172,7 +3172,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
+@@ -3246,7 +3246,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
const char kSandboxExternalProtocolBlocked[] =
"profile.sandbox_external_protocol_blocked";
diff --git a/www/chromium/files/patch-chrome_common_pref__names.h b/www/chromium/files/patch-chrome_common_pref__names.h
index b2dd7abfec78..177307b9df53 100644
--- a/www/chromium/files/patch-chrome_common_pref__names.h
+++ b/www/chromium/files/patch-chrome_common_pref__names.h
@@ -1,6 +1,6 @@
---- chrome/common/pref_names.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/pref_names.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/pref_names.h
-@@ -377,7 +377,7 @@ extern const char kUseAshProxy[];
+@@ -381,7 +381,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.
@@ -18,7 +18,7 @@
extern const char kUseCustomChromeFrame[];
#endif
#if BUILDFLAG(ENABLE_PLUGINS)
-@@ -590,7 +590,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
+@@ -595,7 +595,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)
-@@ -700,7 +700,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
+@@ -706,7 +706,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
-@@ -839,7 +839,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
+@@ -844,7 +844,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)
-@@ -1081,7 +1081,7 @@ extern const char kBlockAutoplayEnabled[];
+@@ -1108,7 +1108,7 @@ extern const char kBlockAutoplayEnabled[];
#endif
extern const char kSandboxExternalProtocolBlocked[];
diff --git a/www/chromium/files/patch-chrome_common_url__constants.cc b/www/chromium/files/patch-chrome_common_url__constants.cc
index 3404f016bd60..a8825a007ff9 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/url_constants.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/url_constants.cc
-@@ -476,7 +476,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
+@@ -479,7 +479,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/chromium/files/patch-chrome_common_url__constants.h b/www/chromium/files/patch-chrome_common_url__constants.h
index c9d4af2c790b..86516c868a4b 100644
--- a/www/chromium/files/patch-chrome_common_url__constants.h
+++ b/www/chromium/files/patch-chrome_common_url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/url_constants.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/url_constants.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/url_constants.h
-@@ -446,7 +446,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
+@@ -449,7 +449,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
extern const char kPhoneHubPermissionLearnMoreURL[];
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.cc b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
index 49349be39b27..94010631f0ad 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.cc
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.cc
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/webui_url_constants.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -453,18 +453,18 @@ const char kOsUIHelpAppURL[] = "os://help-app";
+@@ -451,18 +451,18 @@ const char kOsUIHelpAppURL[] = "os://help-app";
const char kOsUIVersionURL[] = "os://version";
#endif
@@ -22,7 +22,7 @@
const char kChromeUIDiscardsHost[] = "discards";
const char kChromeUIDiscardsURL[] = "chrome://discards/";
#endif
-@@ -479,14 +479,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -477,14 +477,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[] =
-@@ -501,7 +501,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -499,7 +499,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
const char kChromeUIProfilePickerStartupQuery[] = "startup";
#endif
@@ -57,7 +57,7 @@
const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
const char kChromeUIWebAppSettingsHost[] = "app-settings";
#endif
-@@ -779,7 +779,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -778,7 +778,7 @@ const char* const kChromeDebugURLs[] = {
blink::kChromeUIGpuJavaCrashURL,
kChromeUIJavaCrashURL,
#endif
diff --git a/www/chromium/files/patch-chrome_common_webui__url__constants.h b/www/chromium/files/patch-chrome_common_webui__url__constants.h
index 69131e754d5d..337e54139e46 100644
--- a/www/chromium/files/patch-chrome_common_webui__url__constants.h
+++ b/www/chromium/files/patch-chrome_common_webui__url__constants.h
@@ -1,6 +1,6 @@
---- chrome/common/webui_url_constants.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/webui_url_constants.h.orig 2022-06-17 14:20:10 UTC
+++ chrome/common/webui_url_constants.h
-@@ -382,24 +382,24 @@ extern const char kOsUIHelpAppURL[];
+@@ -384,24 +384,24 @@ extern const char kOsUIHelpAppURL[];
extern const char kOsUIVersionURL[];
#endif
@@ -29,7 +29,7 @@
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
-@@ -414,14 +414,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -416,14 +416,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[];
-@@ -433,7 +433,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -435,7 +435,7 @@ extern const char kChromeUIProfilePickerUrl[];
extern const char kChromeUIProfilePickerStartupQuery[];
#endif
diff --git a/www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.cc b/www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.cc
new file mode 100644
index 000000000000..bb370b5b8570
--- /dev/null
+++ b/www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.cc
@@ -0,0 +1,20 @@
+--- chrome/services/system_signals/public/cpp/system_signals_service_host.cc.orig 2022-06-17 14:20:10 UTC
++++ chrome/services/system_signals/public/cpp/system_signals_service_host.cc
+@@ -12,7 +12,7 @@
+ #include "content/public/browser/service_process_host.h"
+ #elif BUILDFLAG(IS_MAC)
+ #include "chrome/services/system_signals/mac/mac_system_signals_service.h"
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "chrome/services/system_signals/linux/linux_system_signals_service.h"
+ #endif
+
+@@ -39,7 +39,7 @@ SystemSignalsServiceHost::GetService() {
+ return &remote_service_;
+ }
+
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+
+ device_signals::mojom::SystemSignalsService*
+ SystemSignalsServiceHost::GetService() {
diff --git a/www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.h b/www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.h
new file mode 100644
index 000000000000..772a3c12e8e4
--- /dev/null
+++ b/www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.h
@@ -0,0 +1,20 @@
+--- chrome/services/system_signals/public/cpp/system_signals_service_host.h.orig 2022-06-17 14:20:10 UTC
++++ chrome/services/system_signals/public/cpp/system_signals_service_host.h
+@@ -10,7 +10,7 @@
+
+ #if BUILDFLAG(IS_WIN)
+ #include "mojo/public/cpp/bindings/remote.h"
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ #include <memory>
+ #endif
+
+@@ -33,7 +33,7 @@ class SystemSignalsServiceHost {
+ private:
+ #if BUILDFLAG(IS_WIN)
+ mojom::Remote<device_signals::mojom::SystemSignalsService> remote_service_;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
+ std::unique_ptr<device_signals::mojom::SystemSignalsService> local_service_;
+ #endif
+ };
diff --git a/www/chromium/files/patch-chrome_test_BUILD.gn b/www/chromium/files/patch-chrome_test_BUILD.gn
index 716204ec664c..e52a7851d696 100644
--- a/www/chromium/files/patch-chrome_test_BUILD.gn
+++ b/www/chromium/files/patch-chrome_test_BUILD.gn
@@ -1,6 +1,6 @@
---- chrome/test/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- chrome/test/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ chrome/test/BUILD.gn
-@@ -9454,7 +9454,7 @@ test("chrome_app_unittests") {
+@@ -9488,7 +9488,7 @@ test("chrome_app_unittests") {
"//components/heap_profiling/in_process",
"//components/safe_browsing:buildflags",
]
diff --git a/www/chromium/files/patch-chrome_test_interaction_interaction__sequence__browser__util.cc b/www/chromium/files/patch-chrome_test_interaction_interaction__sequence__browser__util.cc
new file mode 100644
index 000000000000..c166f08ee18e
--- /dev/null
+++ b/www/chromium/files/patch-chrome_test_interaction_interaction__sequence__browser__util.cc
@@ -0,0 +1,11 @@
+--- chrome/test/interaction/interaction_sequence_browser_util.cc.orig 2022-06-17 14:20:10 UTC
++++ chrome/test/interaction/interaction_sequence_browser_util.cc
+@@ -53,7 +53,7 @@ class RenderFrameHost;
+
+ namespace {
+
+-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
++#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #define SUPPORTS_PIXEL_TESTS 1
+ #else
+ #define SUPPORTS_PIXEL_TESTS 0
diff --git a/www/chromium/files/patch-chrome_updater_app_app__install.cc b/www/chromium/files/patch-chrome_updater_app_app__install.cc
index 19d6a80a76cd..49758d18177d 100644
--- a/www/chromium/files/patch-chrome_updater_app_app__install.cc
+++ b/www/chromium/files/patch-chrome_updater_app_app__install.cc
@@ -1,6 +1,6 @@
---- chrome/updater/app/app_install.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/updater/app/app_install.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/updater/app/app_install.cc
-@@ -188,7 +188,7 @@ void AppInstall::WakeCandidate() {
+@@ -197,7 +197,7 @@ void AppInstall::WakeCandidate() {
update_service_internal, base::WrapRefCounted(this)));
}
diff --git a/www/chromium/files/patch-chrome_updater_configurator.cc b/www/chromium/files/patch-chrome_updater_configurator.cc
index 2802860a344c..5da57674da73 100644
--- a/www/chromium/files/patch-chrome_updater_configurator.cc
+++ b/www/chromium/files/patch-chrome_updater_configurator.cc
@@ -1,6 +1,6 @@
---- chrome/updater/configurator.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/updater/configurator.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/updater/configurator.cc
-@@ -39,7 +39,7 @@
+@@ -40,7 +40,7 @@
#include "chrome/updater/win/net/network.h"
#elif BUILDFLAG(IS_MAC)
#include "chrome/updater/mac/net/network.h"
diff --git a/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc b/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc
deleted file mode 100644
index 9e31a013f94f..000000000000
--- a/www/chromium/files/patch-chrome_updater_device__management_cloud__policy__util.cc
+++ /dev/null
@@ -1,47 +0,0 @@
---- chrome/updater/device_management/cloud_policy_util.cc.orig 2022-02-28 16:54:41 UTC
-+++ chrome/updater/device_management/cloud_policy_util.cc
-@@ -22,7 +22,7 @@
- #include <wincred.h>
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include <pwd.h>
- #include <sys/types.h>
- #include <unistd.h>
-@@ -36,7 +36,7 @@
-
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include <limits.h> // For HOST_NAME_MAX
- #endif
-
-@@ -63,7 +63,7 @@
-
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- #include "base/system/sys_info.h"
- #endif
-
-@@ -111,7 +111,7 @@ std::string GetPolicyVerificationKey() {
- std::string GetMachineName() {
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- char hostname[HOST_NAME_MAX];
- if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
- return hostname;
-@@ -161,7 +161,7 @@ std::string GetMachineName() {
- }
-
- std::string GetOSVersion() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- return base::SysInfo::OperatingSystemVersion();
- #elif BUILDFLAG(IS_WIN)
- base::win::OSInfo::VersionNumber version_number =
diff --git a/www/chromium/files/patch-chrome_updater_util.cc b/www/chromium/files/patch-chrome_updater_util.cc
index 3a9f249cbdfc..4806e48563b4 100644
--- a/www/chromium/files/patch-chrome_updater_util.cc
+++ b/www/chromium/files/patch-chrome_updater_util.cc
@@ -1,6 +1,6 @@
---- chrome/updater/util.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/updater/util.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/updater/util.cc
-@@ -266,7 +266,7 @@ GURL AppendQueryParameter(const GURL& url,
+@@ -261,7 +261,7 @@ GURL AppendQueryParameter(const GURL& url,
return url.ReplaceComponents(replacements);
}
diff --git a/www/chromium/files/patch-chrome_utility_services.cc b/www/chromium/files/patch-chrome_utility_services.cc
index ce7e69ff7508..b650922a7624 100644
--- a/www/chromium/files/patch-chrome_utility_services.cc
+++ b/www/chromium/files/patch-chrome_utility_services.cc
@@ -1,15 +1,6 @@
---- chrome/utility/services.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/utility/services.cc.orig 2022-06-17 14:20:10 UTC
+++ chrome/utility/services.cc
-@@ -28,7 +28,7 @@
- #include "printing/buildflags/buildflags.h"
- #include "ui/accessibility/accessibility_features.h"
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/screen_ai/screen_ai_service_impl.h"
- #endif
-
-@@ -67,7 +67,7 @@
+@@ -74,7 +74,7 @@
#include "chrome/services/file_util/file_util_service.h" // nogncheck
#endif
@@ -18,16 +9,7 @@
#include "chrome/services/file_util/document_analysis_service.h" // nogncheck
#endif
-@@ -215,7 +215,7 @@ auto RunSpeechRecognitionService(
- }
- #endif // !BUILDFLAG(IS_ANDROID)
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- auto RunScreenAIService(
- mojo::PendingReceiver<screen_ai::mojom::ScreenAIService> receiver) {
- return std::make_unique<screen_ai::ScreenAIService>(std::move(receiver));
-@@ -229,7 +229,7 @@ auto RunCupsIppParser(
+@@ -249,7 +249,7 @@ auto RunCupsIppParser(
}
#endif
@@ -36,16 +18,7 @@
auto RunDocumentAnalysis(
mojo::PendingReceiver<chrome::mojom::DocumentAnalysisService> receiver) {
return std::make_unique<DocumentAnalysisService>(std::move(receiver));
-@@ -382,7 +382,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
- services.Add(RunSpeechRecognitionService);
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- if (features::IsScreenAIEnabled())
- services.Add(RunScreenAIService);
- #endif
-@@ -406,7 +406,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -432,7 +432,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
services.Add(RunFileUtil);
#endif
diff --git a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
index c5dad6837844..731841914719 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-05-19 14:06:27 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig 2022-06-17 14:20:10 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
-@@ -92,7 +92,7 @@
+@@ -91,7 +91,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>
-@@ -147,7 +147,7 @@
+@@ -146,7 +146,7 @@
#include "extensions/browser/extension_prefs.h" // nogncheck
#endif
@@ -18,7 +18,7 @@
#include "chromecast/browser/exo/wayland_server_controller.h"
#endif
-@@ -283,7 +283,7 @@ class CastViewsDelegate : public views::ViewsDelegate
+@@ -282,7 +282,7 @@ class CastViewsDelegate : public views::ViewsDelegate
#endif // defined(USE_AURA)
@@ -27,7 +27,7 @@
base::FilePath GetApplicationFontsDir() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -329,7 +329,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -328,7 +328,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
{cc::switches::kDisableThreadedAnimation, ""},
#endif // BUILDFLAG(IS_ANDROID)
#endif // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -36,7 +36,7 @@
#if defined(ARCH_CPU_X86_FAMILY)
// This is needed for now to enable the x11 Ozone platform to work with
// current Linux/NVidia OpenGL drivers.
-@@ -519,7 +519,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -516,7 +516,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
views_delegate_ = std::make_unique<CastViewsDelegate>();
#endif // defined(USE_AURA)
@@ -45,7 +45,7 @@
base::FilePath dir_font = GetApplicationFontsDir();
const FcChar8 *dir_font_char8 = reinterpret_cast<const FcChar8*>(dir_font.value().data());
if (!FcConfigAppFontAddDir(gfx::GetGlobalFontConfig(), dir_font_char8)) {
-@@ -750,7 +750,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() {
+@@ -747,7 +747,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() {
cast_browser_process_->browser_context());
#endif
@@ -54,7 +54,7 @@
wayland_server_controller_ =
std::make_unique<WaylandServerController>(window_manager_.get());
#endif
-@@ -825,7 +825,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() {
+@@ -822,7 +822,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() {
cast_browser_process_->cast_service()->Stop();
diff --git a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
index 2f482e80813f..e397aeb17314 100644
--- a/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
+++ b/www/chromium/files/patch-chromecast_browser_cast__content__browser__client.cc
@@ -1,4 +1,4 @@
---- chromecast/browser/cast_content_browser_client.cc.orig 2022-05-19 14:06:27 UTC
+--- chromecast/browser/cast_content_browser_client.cc.orig 2022-06-17 14:20:10 UTC
+++ chromecast/browser/cast_content_browser_client.cc
@@ -135,7 +135,7 @@
#include "extensions/common/constants.h" // nogncheck
@@ -9,7 +9,7 @@
#include "chromecast/browser/webview/webview_controller.h"
#endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-@@ -476,7 +476,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
+@@ -474,7 +474,7 @@ void CastContentBrowserClient::AppendExtraCommandLineS
switches::kAudioOutputChannels));
}
} else if (process_type == switches::kGpuProcess) {
@@ -18,7 +18,7 @@
// Necessary for accelerated 2d canvas. By default on Linux, Chromium
// assumes GLES2 contexts can be lost to a power-save mode, which breaks GPU
// canvas apps.
-@@ -872,7 +872,7 @@ CastContentBrowserClient::CreateThrottlesForNavigation
+@@ -870,7 +870,7 @@ CastContentBrowserClient::CreateThrottlesForNavigation
handle, general_audience_browsing_service_.get()));
}
diff --git a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
index f9aa34f1cb55..57484e1e13f9 100644
--- a/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
+++ b/www/chromium/files/patch-chromecast_renderer_cast__content__renderer__client.cc
@@ -1,6 +1,6 @@
---- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-03-25 21:59:56 UTC
+--- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-06-17 14:20:10 UTC
+++ chromecast/renderer/cast_content_renderer_client.cc
-@@ -194,7 +194,7 @@ void CastContentRendererClient::RenderFrameCreated(
+@@ -190,7 +190,7 @@ void CastContentRendererClient::RenderFrameCreated(
dispatcher->OnRenderFrameCreated(render_frame);
#endif
diff --git a/www/chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc b/www/chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc
new file mode 100644
index 000000000000..deb1e3ffd6fb
--- /dev/null
+++ b/www/chromium/files/patch-components_autofill__assistant_browser_autofill__assistant__impl.cc
@@ -0,0 +1,11 @@
+--- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-06-17 14:20:10 UTC
++++ components/autofill_assistant/browser/autofill_assistant_impl.cc
+@@ -113,7 +113,7 @@ void AutofillAssistantImpl::GetCapabilitiesByHashPrefi
+ client_context.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID);
+ #endif
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ client_context.set_platform_type(ClientContextProto::PLATFORM_TYPE_DESKTOP);
+ #endif
+
diff --git a/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc b/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc
new file mode 100644
index 000000000000..2f292859d16f
--- /dev/null
+++ b/www/chromium/files/patch-components_autofill__assistant_browser_client__context.cc
@@ -0,0 +1,11 @@
+--- components/autofill_assistant/browser/client_context.cc.orig 2022-06-17 14:20:10 UTC
++++ components/autofill_assistant/browser/client_context.cc
+@@ -20,7 +20,7 @@ ClientContextImpl::ClientContextImpl(const Client* cli
+ proto_.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID);
+ #endif
+ #if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
+- BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_WIN) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
+ proto_.set_platform_type(ClientContextProto::PLATFORM_TYPE_DESKTOP);
+ #endif
+
diff --git a/www/chromium/files/patch-components_autofill__payments__strings.grdp b/www/chromium/files/patch-components_autofill__payments__strings.grdp
index 6cfac250aa08..35d6cf55921f 100644
--- a/www/chromium/files/patch-components_autofill__payments__strings.grdp
+++ b/www/chromium/files/patch-components_autofill__payments__strings.grdp
@@ -1,6 +1,6 @@
---- components/autofill_payments_strings.grdp.orig 2022-05-19 14:06:27 UTC
+--- components/autofill_payments_strings.grdp.orig 2022-06-17 14:20:10 UTC
+++ components/autofill_payments_strings.grdp
-@@ -124,7 +124,7 @@
+@@ -127,7 +127,7 @@
<message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java">
Save card
</message>
diff --git a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
index e04afbe2c5b7..a758e7a15a79 100644
--- a/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
+++ b/www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/common/autofill_payments_features.cc.orig 2022-05-19 14:06:27 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-06-17 14:20:10 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -201,7 +201,7 @@ const base::Feature kAutofillUpstreamAllowAllEmailDoma
+@@ -227,7 +227,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/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
index def575e44335..48df9a6dfeae 100644
--- a/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
+++ b/www/chromium/files/patch-components_embedder__support_user__agent__utils__unittest.cc
@@ -1,6 +1,6 @@
---- components/embedder_support/user_agent_utils_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- components/embedder_support/user_agent_utils_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ components/embedder_support/user_agent_utils_unittest.cc
-@@ -54,7 +54,7 @@ namespace {
+@@ -55,7 +55,7 @@ namespace {
static constexpr char kChromeProductVersionRegex[] =
"Chrome/([0-9]+).([0-9]+).([0-9]+).([0-9]+)";
@@ -9,7 +9,7 @@
std::string GetMachine() {
struct utsname unixinfo;
uname(&unixinfo);
-@@ -162,7 +162,7 @@ void CheckUserAgentStringOrdering(bool mobile_device)
+@@ -163,7 +163,7 @@ void CheckUserAgentStringOrdering(bool mobile_device)
int value;
ASSERT_TRUE(base::StringToInt(pieces[i], &value));
}
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
index 5274ab655829..15d3d2fe9c67 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2022-05-19 14:06:27 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2022-06-17 14:20:10 UTC
+++ components/feature_engagement/public/feature_constants.cc
-@@ -22,7 +22,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy",
+@@ -23,7 +23,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy",
base::FEATURE_DISABLED_BY_DEFAULT};
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,8 +9,8 @@
const base::Feature kIPHDesktopSharedHighlightingFeature{
"IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kIPHDesktopTabGroupsNewGroupFeature{
-@@ -288,7 +288,7 @@ const base::Feature kIPHPasswordSuggestionsFeature{
- "IPH_PasswordSuggestions", base::FEATURE_DISABLED_BY_DEFAULT};
+@@ -293,7 +293,7 @@ const base::Feature kIPHFollowWhileBrowsingFeature{
+ "IPH_FollowWhileBrowsing", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // BUILDFLAG(IS_IOS)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
index 130a5c4eb349..5a706daeca67 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__constants.h
@@ -1,7 +1,7 @@
---- components/feature_engagement/public/feature_constants.h.orig 2022-05-19 14:06:27 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2022-06-17 14:20:10 UTC
+++ components/feature_engagement/public/feature_constants.h
-@@ -30,7 +30,7 @@ extern const base::Feature kUseClientConfigIPH;
- extern const base::Feature kIPHDummyFeature;
+@@ -32,7 +32,7 @@ extern const base::Feature kIPHDummyFeature;
+ extern const base::Feature kEnableIPH;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
@@ -9,12 +9,12 @@
extern const base::Feature kIPHDesktopSharedHighlightingFeature;
extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature;
extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature;
-@@ -175,7 +175,7 @@ extern const base::Feature kIPHDefaultSiteViewFeature;
- extern const base::Feature kIPHPasswordSuggestionsFeature;
+@@ -178,7 +178,7 @@ extern const base::Feature kIPHPasswordSuggestionsFeat
+ extern const base::Feature kIPHFollowWhileBrowsingFeature;
#endif // BUILDFLAG(IS_IOS)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA)
extern const base::Feature kIPHAutofillVirtualCardSuggestionFeature;
- extern const base::Feature kIPHUpdatedConnectionSecurityIndicatorsFeature;
+ #endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
index 9072d425dd9d..5d99f4a6d541 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.cc
@@ -1,7 +1,7 @@
---- components/feature_engagement/public/feature_list.cc.orig 2022-05-19 14:06:27 UTC
+--- components/feature_engagement/public/feature_list.cc.orig 2022-06-17 14:20:10 UTC
+++ components/feature_engagement/public/feature_list.cc
-@@ -120,7 +120,7 @@ const base::Feature* const kAllFeatures[] = {
- &kIPHPasswordSuggestionsFeature,
+@@ -121,7 +121,7 @@ const base::Feature* const kAllFeatures[] = {
+ &kIPHFollowWhileBrowsingFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
index f30ceb6912d2..f62d8c0d1d20 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
@@ -1,6 +1,6 @@
---- components/feature_engagement/public/feature_list.h.orig 2022-05-19 14:06:27 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2022-06-17 14:20:10 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -224,7 +224,7 @@ DEFINE_VARIATION_PARAM(kIPHPasswordSuggestionsFeature,
+@@ -225,7 +225,7 @@ DEFINE_VARIATION_PARAM(kIPHFollowWhileBrowsingFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
DEFINE_VARIATION_PARAM(kIPHDesktopTabGroupsNewGroupFeature,
"IPH_DesktopTabGroupsNewGroup");
DEFINE_VARIATION_PARAM(kIPHFocusModeFeature, "IPH_FocusMode");
-@@ -255,7 +255,8 @@ DEFINE_VARIATION_PARAM(kIPHIntentChipFeature, "IPH_Int
+@@ -254,7 +254,8 @@ DEFINE_VARIATION_PARAM(kIPHIntentChipFeature, "IPH_Int
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -20,15 +20,15 @@
"IPH_AutofillVirtualCardSuggestion");
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
@@ -360,7 +361,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
- VARIATION_ENTRY(kIPHDefaultSiteViewFeature),
VARIATION_ENTRY(kIPHPasswordSuggestionsFeature),
+ VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature),
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
- BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature),
VARIATION_ENTRY(kIPHFocusModeFeature),
VARIATION_ENTRY(kIPHGlobalMediaControls),
-@@ -384,7 +385,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -383,7 +384,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc b/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc
index 75b5eb8fc90a..affbc249ee4a 100644
--- a/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc
+++ b/www/chromium/files/patch-components_feed_core_v2_proto__util__unittest.cc
@@ -1,6 +1,6 @@
---- components/feed/core/v2/proto_util_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- components/feed/core/v2/proto_util_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ components/feed/core/v2/proto_util_unittest.cc
-@@ -39,8 +39,8 @@ TEST(ProtoUtilTest, CreateClientInfo) {
+@@ -42,8 +42,8 @@ TEST(ProtoUtilTest, CreateClientInfo) {
feedwire::ClientInfo result = CreateClientInfo(request_metadata);
EXPECT_EQ(feedwire::ClientInfo::CHROME_ANDROID, result.app_type());
EXPECT_EQ(feedwire::Version::RELEASE, result.app_version().build_type());
diff --git a/www/chromium/files/patch-components_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc
index 9dca2225b1bf..1bb08041928c 100644
--- a/www/chromium/files/patch-components_flags__ui_flags__state.cc
+++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc
@@ -1,11 +1,11 @@
---- components/flags_ui/flags_state.cc.orig 2022-05-19 14:06:27 UTC
+--- components/flags_ui/flags_state.cc.orig 2022-06-17 14:20:10 UTC
+++ components/flags_ui/flags_state.cc
-@@ -623,7 +623,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
- #elif BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -624,7 +624,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
return kOsCrOS;
- #elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
-- BUILDFLAG(IS_OPENBSD)
-+ BUILDFLAG(IS_BSD)
+ #elif BUILDFLAG(IS_CHROMEOS_LACROS)
+ return kOsLacros;
+-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_OPENBSD)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return kOsLinux;
#elif BUILDFLAG(IS_ANDROID)
return kOsAndroid;
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
index 8cef443a87d0..151940bea908 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-05-19 14:06:27 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-06-17 14:20:10 UTC
+++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -813,7 +813,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -823,7 +823,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
}
#endif // #if !BUILDFLAG(IS_ANDROID)
diff --git a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
index ee8cecd1a764..f542cf9e6e33 100644
--- a/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
+++ b/www/chromium/files/patch-components_network__session__configurator_browser_network__session__configurator__unittest.cc
@@ -1,6 +1,6 @@
---- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-05-19 14:06:27 UTC
+--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ components/network_session_configurator/browser/network_session_configurator_unittest.cc
-@@ -807,7 +807,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
+@@ -832,7 +832,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
}
TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) {
diff --git a/www/chromium/files/patch-components_os__crypt_libsecret__util__linux.cc b/www/chromium/files/patch-components_os__crypt_libsecret__util__linux.cc
index 8c33525f1c23..2a3b51e501c6 100644
--- a/www/chromium/files/patch-components_os__crypt_libsecret__util__linux.cc
+++ b/www/chromium/files/patch-components_os__crypt_libsecret__util__linux.cc
@@ -1,6 +1,6 @@
---- components/os_crypt/libsecret_util_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- components/os_crypt/libsecret_util_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ components/os_crypt/libsecret_util_linux.cc
-@@ -101,13 +101,13 @@ bool LibsecretLoader::LoadLibsecret() {
+@@ -102,13 +102,13 @@ bool LibsecretLoader::LoadLibsecret() {
if (libsecret_loaded_)
return true;
diff --git a/www/chromium/files/patch-components_os__crypt_os__crypt.h b/www/chromium/files/patch-components_os__crypt_os__crypt.h
index 25a8a5a21a60..5ea36009e617 100644
--- a/www/chromium/files/patch-components_os__crypt_os__crypt.h
+++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h
@@ -1,6 +1,6 @@
---- components/os_crypt/os_crypt.h.orig 2022-04-21 18:48:31 UTC
+--- components/os_crypt/os_crypt.h.orig 2022-06-17 14:20:10 UTC
+++ components/os_crypt/os_crypt.h
-@@ -14,7 +14,7 @@
+@@ -15,7 +15,7 @@
#include "build/build_config.h"
#include "build/chromecast_buildflags.h"
@@ -9,7 +9,16 @@
class KeyStorageLinux;
#endif // BUILDFLAG(IS_LINUX)
-@@ -30,7 +30,7 @@ struct Config;
+@@ -24,7 +24,7 @@ class PrefRegistrySimple;
+ class PrefService;
+ #endif
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ namespace crypto {
+ class SymmetricKey;
+ }
+@@ -37,7 +37,7 @@ struct Config;
// Temporary interface due to OSCrypt refactor. See OSCryptImpl for descriptions
// of what each function does.
namespace OSCrypt {
@@ -18,7 +27,7 @@
COMPONENT_EXPORT(OS_CRYPT)
void SetConfig(std::unique_ptr<os_crypt::Config> config);
#endif // BUILDFLAG(IS_LINUX)
-@@ -75,7 +75,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b
+@@ -82,7 +82,7 @@ COMPONENT_EXPORT(OS_CRYPT) void UseMockKeyForTesting(b
COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy);
COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting();
#endif // BUILDFLAG(IS_WIN)
@@ -26,22 +35,38 @@
+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST))
COMPONENT_EXPORT(OS_CRYPT)
void UseMockKeyStorageForTesting(
- std::unique_ptr<KeyStorageLinux> (*get_key_storage_mock)());
-@@ -95,7 +95,7 @@ class OSCryptImpl {
- OSCryptImpl(const OSCryptImpl&) = delete;
- OSCryptImpl& operator=(const OSCryptImpl&) = delete;
+ base::OnceCallback<std::unique_ptr<KeyStorageLinux>()>
+@@ -109,7 +109,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
+ // Returns singleton instance of OSCryptImpl.
+ static OSCryptImpl* GetInstance();
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Set the configuration of OSCryptImpl.
// This method, or SetRawEncryptionKey(), must be called before using
// EncryptString() and DecryptString().
-@@ -200,7 +200,7 @@ class OSCryptImpl {
- static void ResetStateForTesting();
+@@ -201,7 +201,7 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
+ void ResetStateForTesting();
#endif
-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST))
// For unit testing purposes, inject methods to be used.
- // |get_key_storage_mock| provides the desired |KeyStorage| implementation.
- // If the provider returns |nullptr|, a hardcoded password will be used.
+ // |storage_provider_factory| provides the desired |KeyStorage|
+ // implementation. If the provider returns |nullptr|, a hardcoded password
+@@ -226,13 +226,13 @@ class COMPONENT_EXPORT(OS_CRYPT) OSCryptImpl {
+ crypto::SymmetricKey* GetEncryptionKey();
+ #endif // BUILDFLAG(IS_APPLE)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+ // This lock is used to make the GetEncryptionKey and
+ // GetRawEncryptionKey methods thread-safe.
+ static base::Lock& GetLock();
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Create the KeyStorage. Will be null if no service is found. A Config must
+ // be set before every call to this method.
+ std::unique_ptr<KeyStorageLinux> CreateKeyStorage();
diff --git a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc
index 0bbcfdb492aa..dfd3a09911fc 100644
--- a/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc
+++ b/www/chromium/files/patch-components_paint__preview_browser_paint__preview__client.cc
@@ -1,6 +1,6 @@
---- components/paint_preview/browser/paint_preview_client.cc.orig 2022-05-19 14:06:27 UTC
+--- components/paint_preview/browser/paint_preview_client.cc.orig 2022-06-17 14:20:10 UTC
+++ components/paint_preview/browser/paint_preview_client.cc
-@@ -312,8 +312,8 @@ void PaintPreviewClient::CapturePaintPreview(
+@@ -309,8 +309,8 @@ void PaintPreviewClient::CapturePaintPreview(
metadata->set_url(url.spec());
metadata->set_version(kPaintPreviewVersion);
auto* chromeVersion = metadata->mutable_chrome_version();
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
index 990c4482e491..3dec4797afa5 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/login_database.cc.orig 2022-04-21 18:48:31 UTC
+--- components/password_manager/core/browser/login_database.cc.orig 2022-06-17 14:20:10 UTC
+++ components/password_manager/core/browser/login_database.cc
-@@ -701,7 +701,7 @@ std::string GeneratePlaceholders(size_t count) {
+@@ -699,7 +699,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) {
-@@ -718,7 +718,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
+@@ -716,7 +716,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;
-@@ -1547,7 +1547,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
+@@ -1545,7 +1545,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
}
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
index a056b951423e..ba6673758771 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_sync_password__sync__bridge.cc
@@ -1,6 +1,6 @@
---- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-05-19 14:06:27 UTC
+--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-06-17 14:20:10 UTC
+++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -150,7 +150,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -153,7 +153,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
// Delete the local undecryptable copy when this is MacOS only.
#if BUILDFLAG(IS_MAC)
return true;
@@ -9,7 +9,7 @@
return base::FeatureList::IsEnabled(
features::kSyncUndecryptablePasswordsLinux);
#else
-@@ -159,7 +159,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -162,7 +162,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
}
bool ShouldCleanSyncMetadataDuringStartupWhenDecryptionFails() {
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
index 5914211e9a11..0a7de79656e1 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.cc
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_features.cc.orig 2022-05-19 14:06:27 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2022-06-17 14:20:10 UTC
+++ components/password_manager/core/common/password_manager_features.cc
@@ -70,7 +70,7 @@ const base::Feature kFillingAcrossAffiliatedWebsites{
const base::Feature kFillOnAccountSelect = {"fill-on-account-select",
@@ -9,7 +9,7 @@
// When enabled, initial sync will be forced during startup if the password
// store has encryption service failures.
const base::Feature kForceInitialSyncWhenDecryptionFails = {
-@@ -148,7 +148,7 @@ const base::Feature kRecoverFromNeverSaveAndroid = {
+@@ -152,7 +152,7 @@ const base::Feature kRecoverFromNeverSaveAndroid = {
const base::Feature kSecondaryServerFieldPredictions = {
"SecondaryServerFieldPredictions", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -18,9 +18,9 @@
// Displays at least the decryptable and never saved logins in the password
// manager
const base::Feature kSkipUndecryptablePasswords = {
-@@ -160,7 +160,7 @@ const base::Feature kSkipUndecryptablePasswords = {
- const base::Feature kSupportForAddPasswordsInSettings = {
+@@ -169,7 +169,7 @@ const base::Feature kSupportForAddPasswordsInSettings
"SupportForAddPasswordsInSettings", base::FEATURE_DISABLED_BY_DEFAULT};
+ #endif
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
index a58c41faac7f..03dafd6464f1 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__client.cc
@@ -1,6 +1,6 @@
---- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-05-19 14:06:27 UTC
+--- components/policy/core/common/cloud/cloud_policy_client.cc.orig 2022-06-17 14:20:10 UTC
+++ components/policy/core/common/cloud/cloud_policy_client.cc
-@@ -422,7 +422,7 @@ void CloudPolicyClient::FetchPolicy() {
+@@ -447,7 +447,7 @@ void CloudPolicyClient::FetchPolicy() {
fetch_request->set_invalidation_payload(invalidation_payload_);
}
}
@@ -8,4 +8,4 @@
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// Only set browser device identifier for CBCM Chrome cloud policy on
// desktop.
- if (base::FeatureList::IsEnabled(
+ if (type_to_fetch.first ==
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
index b9f17c5136da..4650aa2a3db9 100644
--- a/www/chromium/files/patch-components_policy_resources_policy__templates.json
+++ b/www/chromium/files/patch-components_policy_resources_policy__templates.json
@@ -1,6 +1,6 @@
---- components/policy/resources/policy_templates.json.orig 2022-05-19 14:06:27 UTC
+--- components/policy/resources/policy_templates.json.orig 2022-06-17 14:20:10 UTC
+++ components/policy/resources/policy_templates.json
-@@ -1434,7 +1434,7 @@
+@@ -1437,7 +1437,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -9,7 +9,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -2560,7 +2560,7 @@
+@@ -2565,7 +2565,7 @@
'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -4326,7 +4326,7 @@
+@@ -4331,7 +4331,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -27,7 +27,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -4355,7 +4355,7 @@
+@@ -4360,7 +4360,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pastarmovj@chromium.org'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -36,7 +36,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -5319,7 +5319,7 @@
+@@ -5324,7 +5324,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -45,7 +45,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -5380,7 +5380,7 @@
+@@ -5385,7 +5385,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'string',
'schema': { 'type': 'string' },
@@ -54,7 +54,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -5446,7 +5446,7 @@
+@@ -5451,7 +5451,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'rsorokin@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -63,7 +63,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -10588,7 +10588,7 @@
+@@ -10677,7 +10677,7 @@
'owners': ['file://net/cert/OWNERS', 'rsleevi@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -72,7 +72,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -10682,7 +10682,7 @@
+@@ -10771,7 +10771,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -81,7 +81,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -12679,7 +12679,7 @@
+@@ -12774,7 +12774,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'pmarko@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -90,7 +90,7 @@
'features': {
'can_be_recommended': True,
'dynamic_refresh': True,
-@@ -13537,7 +13537,7 @@
+@@ -13632,7 +13632,7 @@
'owners': ['file://components/policy/resources/OWNERS', 'bartfab@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -99,7 +99,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -20502,7 +20502,7 @@
+@@ -20597,7 +20597,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -108,7 +108,7 @@
'features': {
'can_be_recommended': False,
'dynamic_refresh': True,
-@@ -20533,7 +20533,7 @@
+@@ -20628,7 +20628,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -117,7 +117,7 @@
'deprecated': True,
'features': {
'can_be_recommended': False,
-@@ -20567,7 +20567,7 @@
+@@ -20662,7 +20662,7 @@
'items': { 'type': 'string' }
},
# Spell checking is provided by macOS, so can't be controlled on Mac.
@@ -126,7 +126,7 @@
'features': {
'can_be_recommended': False,
'dynamic_refresh': True,
-@@ -21337,7 +21337,7 @@
+@@ -21432,7 +21432,7 @@
'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -135,7 +135,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -25611,7 +25611,7 @@
+@@ -25706,7 +25706,7 @@
'owners': ['file://services/audio/OWNERS', 'dalecurtis@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -144,7 +144,7 @@
'features': {
'dynamic_refresh': False,
'per_profile': False,
-@@ -26955,7 +26955,7 @@ If this policy is left unset, privacy screen is disabl
+@@ -27050,7 +27050,7 @@ If this policy is left unset, privacy screen is disabl
'owners': ['file://chrome/browser/notifications/OWNERS', 'knollr@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -153,7 +153,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -26979,7 +26979,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google
+@@ -27074,7 +27074,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google
'owners': ['file://chrome/browser/notifications/OWNERS'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -162,7 +162,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -28077,7 +28077,7 @@ If you disable this policy, web page scrolling to spec
+@@ -28172,7 +28172,7 @@ If you disable this policy, web page scrolling to spec
'owners': ['asumaneev@google.com'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -171,7 +171,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -29320,7 +29320,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
+@@ -29418,7 +29418,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
},
],
'default': True,
@@ -180,7 +180,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -29453,7 +29453,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
+@@ -29551,7 +29551,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
'owners': ['mattm@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
diff --git a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc b/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
index 71179c9bddb0..41f3c97311f9 100644
--- a/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc
@@ -1,14 +1,14 @@
---- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2022-05-19 14:06:27 UTC
+--- components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
-@@ -35,6 +35,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
- VLOG(2) << "Screen AI library loaded pre-sandboxing:" << library_path;
+@@ -36,6 +36,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
}
+ screen_ai::SetPreloadedLibraryFilePath(library_path);
+#if !BUILDFLAG(IS_BSD)
auto* instance = sandbox::policy::SandboxLinux::GetInstance();
std::vector<BrokerFilePermission> permissions{
-@@ -46,6 +47,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
+@@ -52,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
sandbox::syscall_broker::COMMAND_OPEN}),
permissions, sandbox::policy::SandboxLinux::PreSandboxHook(), options);
instance->EngageNamespaceSandboxIfPossible();
diff --git a/www/chromium/files/patch-components_storage__monitor_BUILD.gn b/www/chromium/files/patch-components_storage__monitor_BUILD.gn
index 1c3dc3ad0240..ad6acf227a78 100644
--- a/www/chromium/files/patch-components_storage__monitor_BUILD.gn
+++ b/www/chromium/files/patch-components_storage__monitor_BUILD.gn
@@ -1,11 +1,11 @@
---- components/storage_monitor/BUILD.gn.orig 2022-02-28 16:54:41 UTC
+--- components/storage_monitor/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ components/storage_monitor/BUILD.gn
-@@ -174,7 +174,7 @@ source_set("unit_tests") {
- "mtp_manager_client_chromeos_unittest.cc",
+@@ -175,7 +175,7 @@ source_set("unit_tests") {
"storage_monitor_chromeos_unittest.cc",
]
-- } else if (is_linux || is_chromeos_lacros) {
-+ } else if ((is_linux || is_chromeos_lacros) && !is_bsd) {
+ }
+- } else if (is_linux || is_chromeos_lacros) {
++ } else if ((is_linux || is_chromeos_lacros) && !is_bsd) {
+ if (use_udev) {
sources += [ "storage_monitor_linux_unittest.cc" ]
}
- }
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
index 21b67c3514dd..0bb456540868 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_skia__output__surface__impl.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1200,7 +1200,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1145,7 +1145,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
->GetDeviceQueue()
->GetVulkanPhysicalDevice(),
VK_IMAGE_TILING_OPTIMAL, ycbcr_info);
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
index 5dec66679a00..db81d3f41ab7 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.cc
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-02-28 16:54:41 UTC
+--- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-06-17 14:20:10 UTC
+++ components/viz/service/display_embedder/software_output_surface.cc
-@@ -118,7 +118,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
+@@ -114,7 +114,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
if (needs_swap_size_notifications_)
client_->DidSwapWithSize(pixel_size);
#endif
-@@ -149,7 +149,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
+@@ -145,7 +145,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
index fd322b83c76d..d4e2a47f7605 100644
--- a/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
+++ b/www/chromium/files/patch-components_viz_service_display__embedder_software__output__surface.h
@@ -1,6 +1,6 @@
---- components/viz/service/display_embedder/software_output_surface.h.orig 2022-05-19 14:06:27 UTC
+--- components/viz/service/display_embedder/software_output_surface.h.orig 2022-06-17 14:20:10 UTC
+++ components/viz/service/display_embedder/software_output_surface.h
-@@ -57,7 +57,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
+@@ -53,7 +53,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
gfx::OverlayTransform GetDisplayTransform() override;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
void SetNeedsSwapSizeNotifications(
bool needs_swap_size_notifications) override;
#endif
-@@ -79,7 +79,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
+@@ -75,7 +75,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index e331d51e75f1..72c42f514b4f 100644
--- a/www/chromium/files/patch-content_app_content__main__runner__impl.cc
+++ b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
@@ -1,6 +1,6 @@
---- content/app/content_main_runner_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- content/app/content_main_runner_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ content/app/content_main_runner_impl.cc
-@@ -129,13 +129,13 @@
+@@ -128,13 +128,13 @@
#include "base/posix/global_descriptors.h"
#include "content/public/common/content_descriptors.h"
@@ -16,7 +16,7 @@
#include "base/native_library.h"
#include "base/rand_util.h"
#include "content/public/common/zygote/sandbox_support_linux.h"
-@@ -169,6 +169,10 @@
+@@ -173,6 +173,10 @@
#include "media/base/media_switches.h"
#endif
@@ -27,7 +27,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "base/system/sys_info.h"
#include "content/browser/android/battery_metrics.h"
-@@ -338,7 +342,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -356,7 +360,7 @@ void InitializeZygoteSandboxForBrowserProcess(
}
#endif // BUILDFLAG(USE_ZYGOTE_HANDLE)
@@ -36,7 +36,7 @@
#if BUILDFLAG(ENABLE_PLUGINS)
// Loads the (native) libraries but does not initialize them (i.e., does not
-@@ -374,7 +378,7 @@ void PreloadLibraryCdms() {
+@@ -392,7 +396,7 @@ void PreloadLibraryCdms() {
}
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
@@ -45,7 +45,7 @@
void PreSandboxInit() {
// Pre-acquire resources needed by BoringSSL. See
// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
-@@ -390,6 +394,11 @@ void PreSandboxInit() {
+@@ -408,6 +412,11 @@ void PreSandboxInit() {
#endif
InitializeWebRtcModule();
@@ -57,7 +57,7 @@
// Set the android SkFontMgr for blink. We need to ensure this is done
// before the sandbox is initialized to allow the font manager to access
// font configuration files on disk.
-@@ -559,7 +568,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
+@@ -577,7 +586,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
delegate->ZygoteStarting(&zygote_fork_delegates);
media::InitializeMediaLibrary();
@@ -66,7 +66,7 @@
PreSandboxInit();
#endif
-@@ -745,11 +754,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -763,11 +772,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -80,7 +80,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -926,6 +934,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -944,6 +952,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
}
#endif
@@ -97,7 +97,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
-@@ -981,7 +999,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -999,7 +1017,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
mojo::core::InitFeatures();
}
@@ -106,7 +106,7 @@
// If dynamic Mojo Core is being used, ensure that it's loaded very early in
// the child/zygote process, before any sandbox is initialized. The library
// is not fully initialized with IPC support until a ChildProcess is later
-@@ -1014,6 +1032,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1032,6 +1050,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
content_main_params_.reset();
RegisterMainThreadFactories();
diff --git a/www/chromium/files/patch-content_browser_BUILD.gn b/www/chromium/files/patch-content_browser_BUILD.gn
index 979871d51d65..0e0a5450823d 100644
--- a/www/chromium/files/patch-content_browser_BUILD.gn
+++ b/www/chromium/files/patch-content_browser_BUILD.gn
@@ -1,6 +1,6 @@
---- content/browser/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- content/browser/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ content/browser/BUILD.gn
-@@ -2389,6 +2389,13 @@ source_set("browser") {
+@@ -2407,6 +2407,13 @@ source_set("browser") {
]
}
diff --git a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
index e599a1e02682..9d24051a7806 100644
--- a/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_browser__child__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_child_process_host_impl.cc.orig 2022-03-25 21:59:56 UTC
+--- content/browser/browser_child_process_host_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/browser_child_process_host_impl.cc
-@@ -292,6 +292,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
+@@ -294,6 +294,7 @@ void BrowserChildProcessHostImpl::LaunchWithoutExtraCo
switches::kDisableBestEffortTasks,
switches::kDisableLogging,
switches::kEnableLogging,
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index 8c65553b3781..c1f5f1ecd32f 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,6 +1,6 @@
---- content/browser/browser_main_loop.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/browser_main_loop.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/browser_main_loop.cc
-@@ -242,6 +242,12 @@
+@@ -243,6 +243,12 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
#endif
@@ -13,7 +13,7 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -549,6 +555,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -540,6 +546,12 @@ int BrowserMainLoop::EarlyInitialization() {
// by now since a thread to start the ServiceManager has been created
// before the browser main loop starts.
DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
@@ -26,7 +26,7 @@
#endif
// GLib's spawning of new processes is buggy, so it's important that at this
-@@ -576,7 +588,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -567,7 +579,7 @@ int BrowserMainLoop::EarlyInitialization() {
// Up the priority of the UI thread unless it was already high (since Mac
// and recent versions of Android (O+) do this automatically).
@@ -35,7 +35,7 @@
if (base::FeatureList::IsEnabled(
features::kBrowserUseDisplayThreadPriority) &&
base::PlatformThread::GetCurrentThreadPriority() <
-@@ -587,7 +599,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -578,7 +590,7 @@ int BrowserMainLoop::EarlyInitialization() {
#endif // !BUILDFLAG(IS_MAC)
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
diff --git a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
index 2a89d2d51ac1..0f54c1724e7e 100644
--- a/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
+++ b/www/chromium/files/patch-content_browser_child__process__launcher__helper__linux.cc
@@ -1,6 +1,6 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig 2022-02-28 16:54:41 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/child_process_launcher_helper_linux.cc
-@@ -19,7 +19,9 @@
+@@ -20,7 +20,9 @@
#include "content/public/common/result_codes.h"
#include "content/public/common/sandboxed_process_launcher_delegate.h"
#include "content/public/common/zygote/sandbox_support_linux.h"
@@ -10,7 +10,7 @@
#include "sandbox/policy/linux/sandbox_linux.h"
namespace content {
-@@ -68,6 +70,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -74,6 +76,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
int* launch_result) {
*is_synchronous_launch = true;
@@ -18,7 +18,7 @@
ZygoteHandle zygote_handle =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
? nullptr
-@@ -81,7 +84,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -87,7 +90,6 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
GetProcessType());
*launch_result = LAUNCH_RESULT_SUCCESS;
@@ -26,7 +26,7 @@
if (handle) {
// It could be a renderer process or an utility process.
int oom_score = content::kMiscOomScore;
-@@ -90,13 +92,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -96,13 +98,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
oom_score = content::kLowestRendererOomScore;
ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score);
}
@@ -41,7 +41,7 @@
Process process;
process.process = base::LaunchProcess(*command_line(), options);
-@@ -114,10 +116,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
+@@ -120,10 +122,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
const ChildProcessLauncherHelper::Process& process,
bool known_dead) {
ChildProcessTerminationInfo info;
@@ -56,7 +56,7 @@
info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
&info.exit_code);
} else {
-@@ -141,13 +147,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
+@@ -147,13 +153,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
DCHECK(CurrentlyOnProcessLauncherTaskRunner());
process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
diff --git a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
index 135079c3ef4f..2bc019e81334 100644
--- a/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
+++ b/www/chromium/files/patch-content_browser_download_download__manager__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/download/download_manager_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- content/browser/download/download_manager_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/download/download_manager_impl.cc
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@
#include "third_party/blink/public/common/storage_key/storage_key.h"
#include "url/origin.h"
@@ -9,7 +9,7 @@
#include "base/nix/xdg_util.h"
#endif
-@@ -218,7 +218,7 @@ class DownloadItemFactoryImpl : public download::Downl
+@@ -219,7 +219,7 @@ class DownloadItemFactoryImpl : public download::Downl
}
};
@@ -18,7 +18,7 @@
base::FilePath GetTemporaryDownloadDirectory() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
return base::nix::GetXDGDirectory(env.get(), "XDG_DATA_HOME", ".local/share");
-@@ -654,7 +654,7 @@ bool DownloadManagerImpl::InterceptDownload(
+@@ -656,7 +656,7 @@ bool DownloadManagerImpl::InterceptDownload(
base::FilePath DownloadManagerImpl::GetDefaultDownloadDirectory() {
base::FilePath default_download_directory;
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
index cc749785d7e2..660992a77dea 100644
--- a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
+++ b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
@@ -1,6 +1,6 @@
---- content/browser/gpu/gpu_process_host.cc.orig 2022-02-28 16:54:41 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/gpu/gpu_process_host.cc
-@@ -100,7 +100,7 @@
+@@ -102,7 +102,7 @@
#include "ui/ozone/public/ozone_switches.h"
#endif
@@ -9,15 +9,15 @@
#include "ui/gfx/switches.h"
#endif
-@@ -252,6 +252,7 @@ static const char* const kSwitchNames[] = {
+@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = {
switches::kEnableBackgroundThreadPool,
switches::kEnableGpuRasterization,
switches::kEnableLogging,
+ switches::kDisableUnveil,
switches::kEnableDeJelly,
switches::kDeJellyScreenWidth,
- switches::kDocumentTransitionSlowdownFactor,
-@@ -289,7 +290,7 @@ static const char* const kSwitchNames[] = {
+ switches::kDoubleBufferCompositing,
+@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = {
switches::kOzoneDumpFile,
switches::kDisableBufferBWCompression,
#endif
diff --git a/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc b/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
index aa1f464c30ee..983c990f29ad 100644
--- a/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
+++ b/www/chromium/files/patch-content_browser_media_media__interface__proxy.cc
@@ -1,6 +1,6 @@
---- content/browser/media/media_interface_proxy.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/media/media_interface_proxy.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/media/media_interface_proxy.cc
-@@ -73,7 +73,7 @@
+@@ -74,7 +74,7 @@
#include "media/mojo/services/mojo_renderer_service.h" // nogncheck
#endif
@@ -9,7 +9,7 @@
#include "content/public/browser/stable_video_decoder_factory.h"
#include "media/base/media_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -293,7 +293,7 @@ void MediaInterfaceProxy::CreateVideoDecoder(
+@@ -294,7 +294,7 @@ void MediaInterfaceProxy::CreateVideoDecoder(
mojo::PendingRemote<media::stable::mojom::StableVideoDecoder>
oop_video_decoder;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc
deleted file mode 100644
index a89c4c3df9de..000000000000
--- a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.cc
+++ /dev/null
@@ -1,29 +0,0 @@
---- content/browser/renderer_host/render_frame_host_impl.cc.orig 2022-05-19 14:06:27 UTC
-+++ content/browser/renderer_host/render_frame_host_impl.cc
-@@ -276,7 +276,7 @@
- #include "content/browser/renderer_host/render_view_host_delegate_view.h"
- #endif
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "content/browser/accessibility/ax_screen_ai_annotator.h"
- #include "ui/accessibility/accessibility_features.h"
- #endif
-@@ -2661,7 +2661,7 @@ void RenderFrameHostImpl::AccessibilityPerformAction(
- view->SetLastPointerType(ui::EventPointerType::kTouch);
- }
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- if (action_data.action == ax::mojom::Action::kRunScreenAi) {
- RunScreenAIAnnotator();
- return;
-@@ -2671,7 +2671,7 @@ void RenderFrameHostImpl::AccessibilityPerformAction(
- render_accessibility_->PerformAction(action_data);
- }
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void RenderFrameHostImpl::RunScreenAIAnnotator() {
- if (!features::IsScreenAIEnabled())
- return;
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h
deleted file mode 100644
index 787c0c54c2e2..000000000000
--- a/www/chromium/files/patch-content_browser_renderer__host_render__frame__host__impl.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- content/browser/renderer_host/render_frame_host_impl.h.orig 2022-05-19 14:06:27 UTC
-+++ content/browser/renderer_host/render_frame_host_impl.h
-@@ -3341,7 +3341,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
-
- TraceProto::LifecycleState LifecycleStateToProto() const;
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- void RunScreenAIAnnotator();
- #endif
-
-@@ -4193,7 +4193,7 @@ class CONTENT_EXPORT RenderFrameHostImpl
- BackForwardCacheDisablingFeaturesCallback
- back_forward_cache_disabling_features_callback_for_testing_;
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Manages the snapshot processing by Screen AI, if enabled.
- std::unique_ptr<AXScreenAIAnnotator> ax_screen_ai_annotator_;
- #endif
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
index c2fa8838903a..a712450c8147 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/renderer_host/render_process_host_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
-@@ -210,7 +210,7 @@
+@@ -211,7 +211,7 @@
#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
#endif
@@ -9,7 +9,7 @@
#include <sys/resource.h>
#include "components/services/font/public/mojom/font_service.mojom.h" // nogncheck
-@@ -1180,7 +1180,7 @@ static constexpr size_t kUnknownPlatformProcessLimit =
+@@ -1139,7 +1139,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;
-@@ -1267,7 +1267,7 @@ class RenderProcessHostImpl::IOThreadHostImpl : public
+@@ -1226,7 +1226,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;
-@@ -3257,6 +3257,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3212,6 +3212,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
switches::kDisableSpeechAPI,
switches::kDisableThreadedCompositing,
switches::kDisableTouchDragDrop,
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
index fbec9c89ecb7..c7e7c39501b4 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.h
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/render_process_host_impl.h.orig 2022-05-19 14:06:27 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-06-17 14:20:10 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -461,7 +461,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -466,7 +466,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
// Sets this RenderProcessHost to be guest only. For Testing only.
void SetForGuestsOnlyForTesting();
diff --git a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
index dfafc2c1bb09..55f1ef78958f 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_render__widget__host__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/renderer_host/render_widget_host_view_aura.cc
@@ -114,7 +114,7 @@
#include "ui/gfx/gdi_util.h"
@@ -18,7 +18,7 @@
BrowserAccessibilityManager* manager =
host()->GetOrCreateRootBrowserAccessibilityManager();
if (manager && manager->GetRoot())
-@@ -1596,7 +1596,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1583,7 +1583,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) {
-@@ -2408,7 +2408,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2396,7 +2396,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
return NeedsInputGrab();
#else
return false;
-@@ -2585,7 +2585,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2573,7 +2573,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
diff --git a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
index f7a5722a4449..b7f79c80b996 100644
--- a/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
+++ b/www/chromium/files/patch-content_browser_utility__sandbox__delegate.cc
@@ -1,6 +1,6 @@
---- content/browser/utility_sandbox_delegate.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/utility_sandbox_delegate.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/utility_sandbox_delegate.cc
-@@ -62,10 +62,10 @@ UtilitySandboxedProcessLauncherDelegate::
+@@ -63,10 +63,10 @@ UtilitySandboxedProcessLauncherDelegate::
#if BUILDFLAG(ENABLE_PLUGINS)
sandbox_type_ == sandbox::mojom::Sandbox::kPpapi ||
#endif
@@ -13,16 +13,7 @@
sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -75,7 +75,7 @@ UtilitySandboxedProcessLauncherDelegate::
- sandbox_type_ == sandbox::mojom::Sandbox::kLibassistant ||
- #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
- #endif // BUILDFLAG(IS_CHROMEOS_ASH)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
- #endif
- sandbox_type_ == sandbox::mojom::Sandbox::kAudio ||
-@@ -108,7 +108,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
+@@ -109,7 +109,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
// unsandboxed zygote and then apply their actual sandboxes in the forked
// process upon startup.
if (sandbox_type_ == sandbox::mojom::Sandbox::kNetwork ||
@@ -31,12 +22,3 @@
sandbox_type_ == sandbox::mojom::Sandbox::kHardwareVideoDecoding ||
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -122,7 +122,7 @@ ZygoteHandle UtilitySandboxedProcessLauncherDelegate::
- #if BUILDFLAG(ENABLE_OOP_PRINTING)
- sandbox_type_ == sandbox::mojom::Sandbox::kPrintBackend ||
- #endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- sandbox_type_ == sandbox::mojom::Sandbox::kScreenAI ||
- #endif
- sandbox_type_ == sandbox::mojom::Sandbox::kSpeechRecognition) {
diff --git a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
index 336ecc8a9179..aac99b7f3e98 100644
--- a/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
+++ b/www/chromium/files/patch-content_browser_web__contents_web__contents__view__aura.cc
@@ -1,4 +1,4 @@
---- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/web_contents/web_contents_view_aura.cc.orig 2022-06-17 14:20:10 UTC
+++ content/browser/web_contents/web_contents_view_aura.cc
@@ -159,7 +159,7 @@ class WebDragSourceAura : public content::WebContentsO
raw_ptr<aura::Window> window_;
@@ -18,7 +18,7 @@
// We set the file contents before the URL because the URL also sets file
// contents (to a .URL shortcut). We want to prefer file content data over
// a shortcut so we add it first.
-@@ -1333,7 +1333,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
+@@ -1343,7 +1343,7 @@ void WebContentsViewAura::OnMouseEvent(ui::MouseEvent*
// Linux window managers like to handle raise-on-click themselves. If we
// raise-on-click manually, this may override user settings that prevent
// focus-stealing.
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index f3e058e2c8cd..c7c3757f1819 100644
--- a/www/chromium/files/patch-content_gpu_gpu__main.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__main.cc
@@ -1,6 +1,6 @@
---- content/gpu/gpu_main.cc.orig 2022-05-19 14:06:27 UTC
+--- content/gpu/gpu_main.cc.orig 2022-06-17 14:20:10 UTC
+++ content/gpu/gpu_main.cc
-@@ -87,7 +87,7 @@
+@@ -88,7 +88,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"
-@@ -109,7 +109,7 @@ namespace content {
+@@ -110,7 +110,7 @@ namespace content {
namespace {
@@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -171,7 +171,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -172,7 +172,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_);
-@@ -267,7 +267,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -268,7 +268,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
-@@ -410,17 +410,19 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -411,17 +411,19 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
@@ -57,7 +57,7 @@
// SandboxLinux::InitializeSandbox() must always be called
// with only one thread.
-@@ -455,11 +457,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -456,11 +458,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
*base::CommandLine::ForCurrentProcess()),
base::BindOnce(GpuProcessPreSandboxHook), sandbox_options);
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index b54010be9e01..810c599221d1 100644
--- a/www/chromium/files/patch-content_public_common_content__features.cc
+++ b/www/chromium/files/patch-content_public_common_content__features.cc
@@ -1,4 +1,4 @@
---- content/public/common/content_features.cc.orig 2022-05-19 14:06:27 UTC
+--- content/public/common/content_features.cc.orig 2022-06-17 14:20:10 UTC
+++ content/public/common/content_features.cc
@@ -43,7 +43,7 @@ const base::Feature kAudioServiceOutOfProcess {
"AudioServiceOutOfProcess",
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -1055,7 +1055,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB
+@@ -1029,7 +1029,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB
const base::Feature kWebAssemblyCodeProtection{
"WebAssemblyCodeProtection", base::FEATURE_ENABLED_BY_DEFAULT};
@@ -27,7 +27,7 @@
// Use memory protection keys in userspace (PKU) (if available) to protect code
// JITed for WebAssembly. Fall back to traditional memory protection if
// WebAssemblyCodeProtection is also enabled.
-@@ -1085,7 +1085,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi
+@@ -1059,7 +1059,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi
const base::Feature kWebAssemblyTrapHandler {
"WebAssemblyTrapHandler",
#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
@@ -36,7 +36,7 @@
defined(ARCH_CPU_X86_64)) || \
(BUILDFLAG(IS_MAC) && defined(ARCH_CPU_ARM64))
base::FEATURE_ENABLED_BY_DEFAULT
-@@ -1166,7 +1166,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{
+@@ -1140,7 +1140,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{
// Controls whether the WebUSB API is enabled:
// https://wicg.github.io/webusb
diff --git a/www/chromium/files/patch-content_public_common_content__features.h b/www/chromium/files/patch-content_public_common_content__features.h
index 08a96085a4b3..6576958c187c 100644
--- a/www/chromium/files/patch-content_public_common_content__features.h
+++ b/www/chromium/files/patch-content_public_common_content__features.h
@@ -1,6 +1,6 @@
---- content/public/common/content_features.h.orig 2022-05-19 14:06:27 UTC
+--- content/public/common/content_features.h.orig 2022-06-17 14:20:10 UTC
+++ content/public/common/content_features.h
-@@ -264,7 +264,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture;
+@@ -257,7 +257,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture;
CONTENT_EXPORT extern const base::Feature kWebAppWindowControlsOverlay;
CONTENT_EXPORT extern const base::Feature kWebAssemblyBaseline;
CONTENT_EXPORT extern const base::Feature kWebAssemblyCodeProtection;
diff --git a/www/chromium/files/patch-content_public_common_content__switches.cc b/www/chromium/files/patch-content_public_common_content__switches.cc
index ab653cca6f60..9a2153259489 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.cc
+++ b/www/chromium/files/patch-content_public_common_content__switches.cc
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.cc.orig 2022-05-19 14:06:27 UTC
+--- content/public/common/content_switches.cc.orig 2022-06-17 14:20:10 UTC
+++ content/public/common/content_switches.cc
-@@ -370,6 +370,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] =
+@@ -365,6 +365,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] =
// builds.
const char kEnableLogging[] = "enable-logging";
@@ -9,7 +9,7 @@
// Enables the type, downlinkMax attributes of the NetInfo API. Also, enables
// triggering of change attribute of the NetInfo API when there is a change in
// the connection type.
-@@ -981,7 +983,7 @@ const char kEnableAutomation[] = "enable-automation";
+@@ -975,7 +977,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/chromium/files/patch-content_public_common_content__switches.h b/www/chromium/files/patch-content_public_common_content__switches.h
index dd5a2ce9fd0f..e9d4d9f91b71 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,4 +1,4 @@
---- content/public/common/content_switches.h.orig 2022-05-19 14:06:27 UTC
+--- content/public/common/content_switches.h.orig 2022-06-17 14:20:10 UTC
+++ content/public/common/content_switches.h
@@ -117,6 +117,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu
CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[];
@@ -8,7 +8,7 @@
CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -265,7 +266,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -264,7 +265,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index 25c46e126b26..d90cb036286b 100644
--- a/www/chromium/files/patch-content_renderer_render__thread__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_thread_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- content/renderer/render_thread_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -189,7 +189,7 @@
+@@ -190,7 +190,7 @@
#if BUILDFLAG(IS_MAC)
#include <malloc/malloc.h>
@@ -9,7 +9,7 @@
#include <malloc.h>
#endif
-@@ -716,7 +716,7 @@ void RenderThreadImpl::Init() {
+@@ -717,7 +717,7 @@ void RenderThreadImpl::Init() {
DCHECK(parsed_num_raster_threads) << string_value;
DCHECK_GT(num_raster_threads, 0);
@@ -18,7 +18,7 @@
categorized_worker_pool_->SetBackgroundingCallback(
main_thread_scheduler_->DefaultTaskRunner(),
base::BindOnce(
-@@ -739,7 +739,7 @@ void RenderThreadImpl::Init() {
+@@ -740,7 +740,7 @@ void RenderThreadImpl::Init() {
base::DiscardableMemoryAllocator::SetInstance(
discardable_memory_allocator_.get());
@@ -27,7 +27,7 @@
if (base::FeatureList::IsEnabled(
blink::features::kBlinkCompositorUseDisplayThreadPriority)) {
render_message_filter()->SetThreadPriority(
-@@ -1098,7 +1098,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1099,7 +1099,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
const bool enable_video_decode_accelerator =
@@ -36,7 +36,7 @@
base::FeatureList::IsEnabled(media::kVaapiVideoDecodeLinux) &&
#else
!cmd_line->HasSwitch(switches::kDisableAcceleratedVideoDecode) &&
-@@ -1109,7 +1109,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1110,7 +1110,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
const bool enable_video_encode_accelerator =
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
index 122ec1373f57..dca05fa29d81 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
-@@ -109,7 +109,7 @@
+@@ -110,7 +110,7 @@
#if BUILDFLAG(IS_MAC)
#include "content/child/child_process_sandbox_support_impl_mac.h"
@@ -9,7 +9,7 @@
#include "content/child/child_process_sandbox_support_impl_linux.h"
#endif
-@@ -178,7 +178,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -179,7 +179,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
main_thread_scheduler_(main_thread_scheduler) {
// RenderThread may not exist in some tests.
if (RenderThreadImpl::current()) {
@@ -18,7 +18,7 @@
mojo::PendingRemote<font_service::mojom::FontService> font_service;
RenderThreadImpl::current()->BindHostReceiver(
font_service.InitWithNewPipeAndPassReceiver());
-@@ -188,7 +188,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
+@@ -189,7 +189,7 @@ RendererBlinkPlatformImpl::RendererBlinkPlatformImpl(
#endif
}
@@ -27,7 +27,7 @@
if (sandboxEnabled()) {
#if BUILDFLAG(IS_MAC)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -283,7 +283,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory(
+@@ -284,7 +284,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory(
/*terminate_sync_load_event=*/nullptr);
}
@@ -37,7 +37,7 @@
void RendererBlinkPlatformImpl::SetDisplayThreadPriority(
base::PlatformThreadId thread_id) {
if (RenderThreadImpl* render_thread = RenderThreadImpl::current()) {
-@@ -298,7 +299,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
+@@ -299,7 +300,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index 4384cd627ed4..2e72e582baab 100644
--- a/www/chromium/files/patch-content_shell_BUILD.gn
+++ b/www/chromium/files/patch-content_shell_BUILD.gn
@@ -1,6 +1,6 @@
---- content/shell/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- content/shell/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ content/shell/BUILD.gn
-@@ -880,7 +880,7 @@ group("content_shell_crash_test") {
+@@ -879,7 +879,7 @@ group("content_shell_crash_test") {
if (is_win) {
data_deps += [ "//build/win:copy_cdb_to_output" ]
}
diff --git a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
index 354654dfb0eb..f3be501ed62b 100644
--- a/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
+++ b/www/chromium/files/patch-content_shell_browser_shell__browser__main__parts.cc
@@ -1,6 +1,6 @@
---- content/shell/browser/shell_browser_main_parts.cc.orig 2022-05-19 14:06:27 UTC
+--- content/shell/browser/shell_browser_main_parts.cc.orig 2022-06-17 14:20:10 UTC
+++ content/shell/browser/shell_browser_main_parts.cc
-@@ -51,7 +51,7 @@
+@@ -50,7 +50,7 @@
#include "net/base/network_change_notifier.h"
#endif
@@ -9,7 +9,16 @@
#include "ui/base/ime/init/input_method_initializer.h"
#endif
-@@ -131,7 +131,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
+@@ -65,7 +65,7 @@
+ #include "chromeos/lacros/dbus/lacros_dbus_thread_manager.h"
+ #endif
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "ui/views/linux_ui/linux_ui.h" // nogncheck
+ #include "ui/views/linux_ui/linux_ui_factory.h" // nogncheck
+ #endif
+@@ -129,7 +129,7 @@ void ShellBrowserMainParts::PostCreateMainMessageLoop(
}
int ShellBrowserMainParts::PreEarlyInitialization() {
@@ -18,3 +27,21 @@
ui::InitializeInputMethodForTesting();
#endif
#if BUILDFLAG(IS_ANDROID)
+@@ -153,7 +153,7 @@ void ShellBrowserMainParts::ToolkitInitialized() {
+ if (switches::IsRunWebTestsSwitchPresent())
+ return;
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ views::LinuxUI::SetInstance(CreateLinuxUi());
+ #endif
+ }
+@@ -196,7 +196,7 @@ void ShellBrowserMainParts::PostMainMessageLoopRun() {
+ ShellDevToolsManagerDelegate::StopHttpHandler();
+ browser_context_.reset();
+ off_the_record_browser_context_.reset();
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ views::LinuxUI::SetInstance(nullptr);
+ #endif
+ performance_manager_lifetime_.reset();
diff --git a/www/chromium/files/patch-content_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index d2fe457d92dd..434f6b6e977c 100644
--- a/www/chromium/files/patch-content_test_BUILD.gn
+++ b/www/chromium/files/patch-content_test_BUILD.gn
@@ -1,6 +1,6 @@
---- content/test/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- content/test/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ content/test/BUILD.gn
-@@ -1938,7 +1938,7 @@ static_library("run_all_unittests") {
+@@ -1955,7 +1955,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
@@ -9,7 +9,7 @@
deps += [ "//content/common:set_process_title_linux" ]
}
}
-@@ -2888,7 +2888,7 @@ test("content_unittests") {
+@@ -2917,7 +2917,7 @@ test("content_unittests") {
deps += [ "//third_party/boringssl" ]
}
diff --git a/www/chromium/files/patch-content_utility_services.cc b/www/chromium/files/patch-content_utility_services.cc
index 421ce9c78c37..7c22404390f0 100644
--- a/www/chromium/files/patch-content_utility_services.cc
+++ b/www/chromium/files/patch-content_utility_services.cc
@@ -1,4 +1,4 @@
---- content/utility/services.cc.orig 2022-02-28 16:54:41 UTC
+--- content/utility/services.cc.orig 2022-06-17 14:20:10 UTC
+++ content/utility/services.cc
@@ -67,7 +67,7 @@
extern sandbox::TargetServices* g_utility_target_services;
@@ -9,7 +9,16 @@
#include "sandbox/linux/services/libc_interceptor.h"
#include "sandbox/policy/mojom/sandbox.mojom.h"
#include "sandbox/policy/sandbox_type.h"
-@@ -205,7 +205,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
+@@ -89,7 +89,7 @@ extern sandbox::TargetServices* g_utility_target_servi
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
+ // BUILDFLAG(USE_V4L2_CODEC))
+
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
+ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
+ #include "media/mojo/services/stable_video_decoder_factory_service.h" // nogncheck
+ #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
+@@ -210,7 +210,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
<< "task_policy_set TASK_QOS_POLICY";
#endif
@@ -18,3 +27,21 @@
auto* command_line = base::CommandLine::ForCurrentProcess();
if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
sandbox::mojom::Sandbox::kNoSandbox) {
+@@ -300,7 +300,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
+ // BUILDFLAG(USE_V4L2_CODEC))
+
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
+ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
+ auto RunStableVideoDecoderFactoryService(
+ mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory>
+@@ -354,7 +354,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+ #endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
+ // BUILDFLAG(USE_V4L2_CODEC))
+
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)) && \
+ (BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
+ services.Add(RunStableVideoDecoderFactoryService);
+ #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)) &&
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc
index 870834b11c62..c28b1490a69a 100644
--- a/www/chromium/files/patch-content_utility_utility__main.cc
+++ b/www/chromium/files/patch-content_utility_utility__main.cc
@@ -1,12 +1,11 @@
---- content/utility/utility_main.cc.orig 2022-05-19 14:06:27 UTC
+--- content/utility/utility_main.cc.orig 2022-06-17 14:20:10 UTC
+++ content/utility/utility_main.cc
-@@ -32,18 +32,20 @@
+@@ -31,17 +31,19 @@
#include "third_party/icu/source/common/unicode/unistr.h"
#include "third_party/icu/source/i18n/unicode/timezone.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.h"
#include "content/utility/speech/speech_recognition_sandbox_hook_linux.h"
#if BUILDFLAG(ENABLE_PRINTING)
#include "printing/sandbox/print_backend_sandbox_hook_linux.h"
@@ -23,7 +22,7 @@
#include "gpu/config/gpu_info_collector.h"
#include "media/gpu/sandbox/hardware_video_decoding_sandbox_hook_linux.h"
-@@ -52,6 +54,10 @@
+@@ -50,6 +52,10 @@
#include "third_party/angle/src/gpu_info_util/SystemInfo.h" // nogncheck
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
@@ -34,7 +33,7 @@
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/services/ime/ime_sandbox_hook.h"
#include "chromeos/assistant/buildflags.h"
-@@ -139,7 +145,7 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -129,7 +135,7 @@ int UtilityMain(MainFunctionParams parameters) {
}
}
@@ -43,16 +42,16 @@
// Initializes the sandbox before any threads are created.
// TODO(jorgelo): move this after GTK initialization when we enable a strict
// Seccomp-BPF policy.
-@@ -165,7 +171,7 @@ int UtilityMain(MainFunctionParams parameters) {
- case sandbox::mojom::Sandbox::kScreenAI:
+@@ -157,7 +163,7 @@ int UtilityMain(MainFunctionParams parameters) {
pre_sandbox_hook = base::BindOnce(&screen_ai::ScreenAIPreSandboxHook);
break;
+ #endif
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_BSD)
case sandbox::mojom::Sandbox::kHardwareVideoDecoding:
pre_sandbox_hook =
base::BindOnce(&media::HardwareVideoDecodingPreSandboxHook);
-@@ -188,10 +194,11 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -180,10 +186,11 @@ int UtilityMain(MainFunctionParams parameters) {
default:
break;
}
@@ -65,7 +64,7 @@
if (sandbox_type == sandbox::mojom::Sandbox::kHardwareVideoDecoding) {
// The kHardwareVideoDecoding sandbox needs to know the GPU type in order
// to select the right policy.
-@@ -204,6 +211,11 @@ int UtilityMain(MainFunctionParams parameters) {
+@@ -196,6 +203,11 @@ int UtilityMain(MainFunctionParams parameters) {
sandbox::policy::Sandbox::Initialize(
sandbox_type, std::move(pre_sandbox_hook), sandbox_options);
}
diff --git a/www/chromium/files/patch-content_zygote_zygote__main__linux.cc b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc
index 91c7bc1e35f7..691d24aab691 100644
--- a/www/chromium/files/patch-content_zygote_zygote__main__linux.cc
+++ b/www/chromium/files/patch-content_zygote_zygote__main__linux.cc
@@ -1,4 +1,4 @@
---- content/zygote/zygote_main_linux.cc.orig 2022-02-07 13:39:41 UTC
+--- content/zygote/zygote_main_linux.cc.orig 2022-06-17 14:20:10 UTC
+++ content/zygote/zygote_main_linux.cc
@@ -11,7 +11,9 @@
#include <stddef.h>
@@ -10,7 +10,7 @@
#include <sys/socket.h>
#include <sys/types.h>
#include <unistd.h>
-@@ -40,7 +42,9 @@
+@@ -41,7 +43,9 @@
#include "sandbox/linux/services/thread_helpers.h"
#include "sandbox/linux/suid/client/setuid_sandbox_client.h"
#include "sandbox/policy/linux/sandbox_debug_handling_linux.h"
@@ -20,7 +20,7 @@
#include "sandbox/policy/sandbox.h"
#include "sandbox/policy/switches.h"
#include "third_party/icu/source/i18n/unicode/timezone.h"
-@@ -49,6 +53,7 @@ namespace content {
+@@ -50,6 +54,7 @@ namespace content {
namespace {
@@ -28,7 +28,7 @@
void CloseFds(const std::vector<int>& fds) {
for (const auto& it : fds) {
PCHECK(0 == IGNORE_EINTR(close(it)));
-@@ -66,9 +71,11 @@ base::OnceClosure ClosureFromTwoClosures(base::OnceClo
+@@ -67,9 +72,11 @@ base::OnceClosure ClosureFromTwoClosures(base::OnceClo
},
std::move(one), std::move(two));
}
@@ -40,7 +40,7 @@
// This function triggers the static and lazy construction of objects that need
// to be created before imposing the sandbox.
static void ZygotePreSandboxInit() {
-@@ -173,9 +180,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand
+@@ -174,9 +181,11 @@ static void EnterLayerOneSandbox(sandbox::policy::Sand
CHECK(!using_layer1_sandbox);
}
}
@@ -52,7 +52,7 @@
sandbox::SetAmZygoteOrRenderer(true, GetSandboxFD());
auto* linux_sandbox = sandbox::policy::SandboxLinux::GetInstance();
-@@ -240,6 +249,9 @@ bool ZygoteMain(
+@@ -241,6 +250,9 @@ bool ZygoteMain(
// This function call can return multiple times, once per fork().
return zygote.ProcessRequests();
diff --git a/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni b/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni
index 5a4b92be382e..febddef647a9 100644
--- a/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni
+++ b/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni
@@ -1,9 +1,9 @@
---- device/bluetooth/cast_bluetooth.gni.orig 2021-12-16 17:28:29 UTC
+--- device/bluetooth/cast_bluetooth.gni.orig 2022-06-17 14:20:10 UTC
+++ device/bluetooth/cast_bluetooth.gni
@@ -2,5 +2,5 @@ import("//build/config/features.gni")
declare_args() {
force_cast_bluetooth = false
-- use_bluez = use_dbus
+- use_bluez = (is_linux || is_chromeos) && !is_castos
+ use_bluez = use_dbus && !is_bsd
}
diff --git a/www/chromium/files/patch-extensions_browser_extension__prefs.cc b/www/chromium/files/patch-extensions_browser_extension__prefs.cc
index d351fd2b78ac..0a57a4b83be4 100644
--- a/www/chromium/files/patch-extensions_browser_extension__prefs.cc
+++ b/www/chromium/files/patch-extensions_browser_extension__prefs.cc
@@ -1,6 +1,6 @@
---- extensions/browser/extension_prefs.cc.orig 2022-05-19 14:06:27 UTC
+--- extensions/browser/extension_prefs.cc.orig 2022-06-17 14:20:10 UTC
+++ extensions/browser/extension_prefs.cc
-@@ -2271,7 +2271,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
+@@ -2270,7 +2270,7 @@ void ExtensionPrefs::RegisterProfilePrefs(
registry->RegisterDictionaryPref(kInstallSignature);
registry->RegisterListPref(kExternalUninstalls);
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_common_extensions_command.cc b/www/chromium/files/patch-extensions_common_command.cc
index c5fb7b11aecd..6955640d6a46 100644
--- a/www/chromium/files/patch-chrome_common_extensions_command.cc
+++ b/www/chromium/files/patch-extensions_common_command.cc
@@ -1,8 +1,8 @@
---- chrome/common/extensions/command.cc.orig 2022-05-19 14:06:27 UTC
-+++ chrome/common/extensions/command.cc
-@@ -295,7 +295,7 @@ std::string Command::CommandPlatform() {
+--- extensions/common/command.cc.orig 2022-06-17 14:20:10 UTC
++++ extensions/common/command.cc
+@@ -288,7 +288,7 @@ std::string Command::CommandPlatform() {
return values::kKeybindingPlatformMac;
- #elif BUILDFLAG(IS_CHROMEOS_ASH) || BUILDFLAG(IS_CHROMEOS_LACROS)
+ #elif BUILDFLAG(IS_CHROMEOS)
return values::kKeybindingPlatformChromeOs;
-#elif BUILDFLAG(IS_LINUX)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
index 2dd27a0ccf4d..855c9b131c6c 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_external__vk__image__backing.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-05-19 14:06:27 UTC
+--- gpu/command_buffer/service/external_vk_image_backing.cc.orig 2022-06-17 14:20:10 UTC
+++ gpu/command_buffer/service/external_vk_image_backing.cc
@@ -30,7 +30,7 @@
#include "ui/gl/gl_version_info.h"
@@ -9,7 +9,7 @@
#include "gpu/command_buffer/service/external_vk_image_dawn_representation.h"
#endif
-@@ -570,7 +570,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
+@@ -571,7 +571,7 @@ ExternalVkImageBacking::ProduceDawn(SharedImageManager
MemoryTypeTracker* tracker,
WGPUDevice wgpuDevice,
WGPUBackendType backend_type) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc
index 306ee714d0b7..6da7029eab09 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__angle__vulkan.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-05-19 14:06:27 UTC
+--- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-06-17 14:20:10 UTC
+++ gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
-@@ -577,7 +577,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle
+@@ -576,7 +576,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle
// TODO(penghuang): verify the scanout is the right usage for video playback.
// crbug.com/1280798
constexpr auto kSupportedUsages =
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__ozone.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__ozone.cc
new file mode 100644
index 000000000000..5c0d9b0cdef5
--- /dev/null
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__backing__factory__ozone.cc
@@ -0,0 +1,11 @@
+--- gpu/command_buffer/service/shared_image_backing_factory_ozone.cc.orig 2022-06-17 14:20:10 UTC
++++ gpu/command_buffer/service/shared_image_backing_factory_ozone.cc
+@@ -218,7 +218,7 @@ bool SharedImageBackingFactoryOzone::IsSupported(
+ !CanImportGpuMemoryBufferToVulkan(gmb_type)) {
+ return false;
+ }
+-#elif BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
++#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
+ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST)
+ bool used_by_skia = (usage & SHARED_IMAGE_USAGE_RASTER) ||
+ (usage & SHARED_IMAGE_USAGE_DISPLAY);
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc
index 2513ce5c68d0..f1172d9981fd 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc
@@ -1,29 +1,29 @@
---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-05-19 14:06:27 UTC
+--- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-06-17 14:20:10 UTC
+++ gpu/command_buffer/service/shared_image_factory.cc
-@@ -46,7 +46,7 @@
- #include "ui/ozone/public/ozone_platform.h"
+@@ -50,7 +50,7 @@
+ #endif
#endif
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN)) && \
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)) && \
BUILDFLAG(ENABLE_VULKAN)
#include "gpu/command_buffer/service/external_vk_image_factory.h"
- #elif BUILDFLAG(IS_ANDROID) && BUILDFLAG(ENABLE_VULKAN)
-@@ -81,7 +81,7 @@
+ #include "gpu/command_buffer/service/shared_image_backing_factory_ozone.h"
+@@ -86,7 +86,7 @@
namespace gpu {
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
- !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST) && \
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
+ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CASTOS) && \
BUILDFLAG(ENABLE_VULKAN)
-@@ -325,7 +325,7 @@ SharedImageFactory::SharedImageFactory(
+@@ -387,7 +387,7 @@ SharedImageFactory::SharedImageFactory(
factories_.push_back(std::move(external_vk_image_factory));
}
#elif defined(USE_OZONE)
-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMEOS_ASH) && \
- !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CHROMECAST)
+ !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_CASTOS)
// Desktop Linux, not ChromeOS.
- if (gr_context_type_ == GrContextType::kVulkan &&
+ if (ShouldUseOzoneFactory()) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
index 045d71aff7db..d950b892da48 100644
--- a/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc
@@ -1,6 +1,6 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1547,7 +1547,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter(
+@@ -1421,7 +1421,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter(
if (gr_context_type_ != GrContextType::kVulkan &&
use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
index fa8050758e8d..c96914bd19c3 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__gpu__memory__buffer__unittest.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2022-03-25 21:59:56 UTC
+--- gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ gpu/command_buffer/tests/gl_gpu_memory_buffer_unittest.cc
@@ -29,7 +29,7 @@
#include "ui/gl/gl_image.h"
@@ -18,12 +18,3 @@
class GpuMemoryBufferTestEGL : public testing::Test,
public gpu::GpuCommandBufferTestEGL {
public:
-@@ -364,7 +364,7 @@ TEST_P(GpuMemoryBufferTest, Lifecycle) {
- glDeleteTextures(1, &texture_id);
- }
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // Test glCreateImageCHROMIUM with gfx::NATIVE_PIXMAP. Basically the test
- // reproduces the situation where some dmabuf fds are available outside the
- // gpu process and the user wants to import them using glCreateImageCHROMIUM.
diff --git a/www/chromium/files/patch-gpu_config_gpu__control__list.cc b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
index 644cf5b2b178..3e785a5cfe09 100644
--- a/www/chromium/files/patch-gpu_config_gpu__control__list.cc
+++ b/www/chromium/files/patch-gpu_config_gpu__control__list.cc
@@ -1,6 +1,6 @@
---- gpu/config/gpu_control_list.cc.orig 2022-05-19 14:06:27 UTC
+--- gpu/config/gpu_control_list.cc.orig 2022-06-17 14:20:10 UTC
+++ gpu/config/gpu_control_list.cc
-@@ -261,7 +261,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
+@@ -302,7 +302,7 @@ bool GpuControlList::More::GLVersionInfoMismatch(
GpuControlList::GLType GpuControlList::More::GetDefaultGLType() {
#if BUILDFLAG(IS_CHROMEOS)
return kGLTypeGL;
@@ -9,7 +9,7 @@
return kGLTypeGL;
#elif BUILDFLAG(IS_MAC)
return kGLTypeGL;
-@@ -784,7 +784,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
+@@ -844,7 +844,7 @@ GpuControlList::OsType GpuControlList::GetOsType() {
return kOsAndroid;
#elif BUILDFLAG(IS_FUCHSIA)
return kOsFuchsia;
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index a4abf1a0301e..7e3d02be826b 100644
--- a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
+++ b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
@@ -1,6 +1,6 @@
---- gpu/ipc/service/gpu_init.cc.orig 2022-05-19 14:06:27 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2022-06-17 14:20:10 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -313,7 +313,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -318,7 +318,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
-@@ -363,7 +363,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -368,7 +368,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
bool attempted_startsandbox = false;
@@ -18,7 +18,7 @@
// On Chrome OS ARM Mali, GPU driver userspace creates threads when
// initializing a GL context, so start the sandbox early.
// TODO(zmo): Need to collect OS version before this.
-@@ -412,7 +412,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -417,7 +417,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
if (gl_initialized && gl_use_swiftshader_ &&
!gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) {
@@ -27,7 +27,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -445,7 +445,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -450,7 +450,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
}
}
@@ -36,7 +36,7 @@
// The ContentSandboxHelper is currently the only one implementation of
// GpuSandboxHelper and it has no dependency. Except on Linux where
// VaapiWrapper checks the GL implementation to determine which display
-@@ -504,7 +504,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -510,7 +510,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
command_line, gpu_feature_info_,
gpu_preferences_.disable_software_rasterizer, false);
if (gl_use_swiftshader_) {
@@ -45,7 +45,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -627,7 +627,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -637,7 +637,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
@@ -54,7 +54,7 @@
// Driver may create a compatibility profile context when collect graphics
// information on Linux platform. Try to collect graphics information
// based on core profile context after disabling platform extensions.
-@@ -857,7 +857,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -867,7 +867,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h
index e1e8158bd26a..aa8733048357 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h
+++ b/www/chromium/files/patch-headless_lib_browser_headless__browser__main__parts.h
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_browser_main_parts.h.orig 2022-02-28 16:54:41 UTC
+--- headless/lib/browser/headless_browser_main_parts.h.orig 2022-06-17 14:20:10 UTC
+++ headless/lib/browser/headless_browser_main_parts.h
-@@ -50,7 +50,7 @@ class HEADLESS_EXPORT HeadlessBrowserMainParts
+@@ -48,7 +48,7 @@ class HEADLESS_EXPORT HeadlessBrowserMainParts
#if BUILDFLAG(IS_MAC)
void PreCreateMainMessageLoop() override;
#endif
diff --git a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
index 094da6fa2849..244ad62eab49 100644
--- a/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
+++ b/www/chromium/files/patch-headless_lib_browser_headless__request__context__manager.cc
@@ -1,6 +1,6 @@
---- headless/lib/browser/headless_request_context_manager.cc.orig 2022-05-19 14:06:27 UTC
+--- headless/lib/browser/headless_request_context_manager.cc.orig 2022-06-17 14:20:10 UTC
+++ headless/lib/browser/headless_request_context_manager.cc
-@@ -64,7 +64,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
+@@ -65,7 +65,7 @@ void SetCryptKeyOnce(const base::FilePath& user_data_p
return;
done_once = true;
diff --git a/www/chromium/files/patch-ipc_ipc__channel.h b/www/chromium/files/patch-ipc_ipc__channel.h
index 7fe7304f8b70..568237754a60 100644
--- a/www/chromium/files/patch-ipc_ipc__channel.h
+++ b/www/chromium/files/patch-ipc_ipc__channel.h
@@ -1,6 +1,6 @@
---- ipc/ipc_channel.h.orig 2022-02-28 16:54:41 UTC
+--- ipc/ipc_channel.h.orig 2022-06-17 14:20:10 UTC
+++ ipc/ipc_channel.h
-@@ -235,7 +235,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
+@@ -234,7 +234,7 @@ class COMPONENT_EXPORT(IPC) Channel : public Sender {
static std::string GenerateUniqueRandomChannelID();
#endif
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index c7780eee9e89..ec409b677f70 100644
--- a/www/chromium/files/patch-media_audio_BUILD.gn
+++ b/www/chromium/files/patch-media_audio_BUILD.gn
@@ -1,6 +1,6 @@
---- media/audio/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- media/audio/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ media/audio/BUILD.gn
-@@ -243,9 +243,20 @@ source_set("audio") {
+@@ -245,9 +245,20 @@ source_set("audio") {
]
}
diff --git a/www/chromium/files/patch-media_audio_audio__features.cc b/www/chromium/files/patch-media_audio_audio__features.cc
index cc57efce1236..a63feeec497c 100644
--- a/www/chromium/files/patch-media_audio_audio__features.cc
+++ b/www/chromium/files/patch-media_audio_audio__features.cc
@@ -1,6 +1,6 @@
---- media/audio/audio_features.cc.orig 2022-02-28 16:54:41 UTC
+--- media/audio/audio_features.cc.orig 2022-06-17 14:20:10 UTC
+++ media/audio/audio_features.cc
-@@ -19,7 +19,7 @@ const base::Feature kPlatformAudioEncoder{"PlatformAud
+@@ -14,7 +14,7 @@ namespace features {
const base::Feature kAudioServiceOutOfProcessKillAtHang{
"AudioServiceOutOfProcessKillAtHang",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-media_base_audio__latency.cc b/www/chromium/files/patch-media_base_audio__latency.cc
index a51069bbe202..c3919836726c 100644
--- a/www/chromium/files/patch-media_base_audio__latency.cc
+++ b/www/chromium/files/patch-media_base_audio__latency.cc
@@ -1,6 +1,6 @@
---- media/base/audio_latency.cc.orig 2022-02-28 16:54:41 UTC
+--- media/base/audio_latency.cc.orig 2022-06-17 14:20:10 UTC
+++ media/base/audio_latency.cc
-@@ -135,7 +135,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in
+@@ -137,7 +137,7 @@ int AudioLatency::GetRtcBufferSize(int sample_rate, in
}
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index a6eec177873a..5d4027c634a4 100644
--- a/www/chromium/files/patch-media_base_media__switches.cc
+++ b/www/chromium/files/patch-media_base_media__switches.cc
@@ -1,4 +1,4 @@
---- media/base/media_switches.cc.orig 2022-05-19 14:06:27 UTC
+--- media/base/media_switches.cc.orig 2022-06-17 14:20:10 UTC
+++ media/base/media_switches.cc
@@ -10,7 +10,7 @@
#include "components/system_media_controls/linux/buildflags/buildflags.h"
@@ -9,7 +9,7 @@
#include "base/cpu.h"
#endif
-@@ -416,7 +416,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
+@@ -439,7 +439,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
const base::Feature kGlobalMediaControls {
"GlobalMediaControls",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -18,7 +18,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -448,7 +448,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
+@@ -471,7 +471,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
const base::Feature kGlobalMediaControlsPictureInPicture {
"GlobalMediaControlsPictureInPicture",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
base::FEATURE_ENABLED_BY_DEFAULT
#else
base::FEATURE_DISABLED_BY_DEFAULT
-@@ -489,7 +489,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
+@@ -508,7 +508,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
const base::Feature kUnifiedAutoplay{"UnifiedAutoplay",
base::FEATURE_ENABLED_BY_DEFAULT};
@@ -36,7 +36,7 @@
// Enable vaapi video decoding on linux. This is already enabled by default on
// chromeos, but needs an experiment on linux.
const base::Feature kVaapiVideoDecodeLinux{"VaapiVideoDecoder",
-@@ -863,7 +863,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod
+@@ -922,7 +922,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod
"DeprecateLowUsageCodecs", base::FEATURE_ENABLED_BY_DEFAULT};
#endif // BUILDFLAG(IS_CHROMEOS)
diff --git a/www/chromium/files/patch-media_base_media__switches.h b/www/chromium/files/patch-media_base_media__switches.h
index 09ad0059497c..13ca017f2761 100644
--- a/www/chromium/files/patch-media_base_media__switches.h
+++ b/www/chromium/files/patch-media_base_media__switches.h
@@ -1,6 +1,6 @@
---- media/base/media_switches.h.orig 2022-05-19 14:06:27 UTC
+--- media/base/media_switches.h.orig 2022-06-17 14:20:10 UTC
+++ media/base/media_switches.h
-@@ -195,7 +195,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr
+@@ -199,7 +199,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr
MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream;
MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore;
MEDIA_EXPORT extern const base::Feature kUseR16Texture;
@@ -9,7 +9,7 @@
MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux;
MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux;
#endif // BUILDFLAG(IS_LINUX)
-@@ -278,7 +278,7 @@ MEDIA_EXPORT extern const base::Feature kD3D11Vp9kSVCH
+@@ -306,7 +306,7 @@ MEDIA_EXPORT extern const base::FeatureParam<
MEDIA_EXPORT extern const base::Feature kDeprecateLowUsageCodecs;
#endif
diff --git a/www/chromium/files/patch-media_base_supported__types.cc b/www/chromium/files/patch-media_base_supported__types.cc
index 6cfc24869008..d7c8969d0d4a 100644
--- a/www/chromium/files/patch-media_base_supported__types.cc
+++ b/www/chromium/files/patch-media_base_supported__types.cc
@@ -1,4 +1,4 @@
---- media/base/supported_types.cc.orig 2022-06-10 07:26:31 UTC
+--- media/base/supported_types.cc.orig 2022-06-17 14:20:10 UTC
+++ media/base/supported_types.cc
@@ -205,7 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) {
return false;
@@ -7,5 +7,5 @@
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
return GetSupplementalProfileCache()->IsProfileSupported(type.profile);
- #else
- return true;
+ #elif BUILDFLAG(IS_MAC)
+ if (__builtin_available(macOS 11.0, *))
diff --git a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
index 8ae8e6c1d5bd..0b8fd8d4a5db 100644
--- a/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
+++ b/www/chromium/files/patch-media_capture_video_video__capture__device__client.cc
@@ -1,6 +1,6 @@
---- media/capture/video/video_capture_device_client.cc.orig 2022-02-28 16:54:41 UTC
+--- media/capture/video/video_capture_device_client.cc.orig 2022-06-17 14:20:10 UTC
+++ media/capture/video/video_capture_device_client.cc
-@@ -320,7 +320,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
+@@ -317,7 +317,7 @@ void VideoCaptureDeviceClient::OnIncomingCapturedData(
// see http://linuxtv.org/downloads/v4l-dvb-apis/packed-rgb.html.
// Windows RGB24 defines blue at lowest byte,
// see https://msdn.microsoft.com/en-us/library/windows/desktop/dd407253
diff --git a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
index fc9753486ae9..271b45919fa8 100644
--- a/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
+++ b/www/chromium/files/patch-media_gpu_gpu__video__encode__accelerator__factory.cc
@@ -1,6 +1,6 @@
---- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-04-21 18:48:31 UTC
+--- media/gpu/gpu_video_encode_accelerator_factory.cc.orig 2022-06-17 14:20:10 UTC
+++ media/gpu/gpu_video_encode_accelerator_factory.cc
-@@ -96,7 +96,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
+@@ -103,7 +103,7 @@ std::vector<VEAFactoryFunction> GetVEAFactoryFunctions
return vea_factory_functions;
#if BUILDFLAG(USE_VAAPI)
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
index e8b8aa1b6a2b..a0a7f1ca4935 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-04-21 18:48:31 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-06-17 14:20:10 UTC
+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -582,7 +582,7 @@ VADisplayState::VADisplayState()
+@@ -590,7 +590,7 @@ VADisplayState::VADisplayState()
bool VADisplayState::Initialize() {
base::AutoLock auto_lock(va_lock_);
diff --git a/www/chromium/files/patch-media_media__options.gni b/www/chromium/files/patch-media_media__options.gni
index 915143278a5b..af85b063a3a2 100644
--- a/www/chromium/files/patch-media_media__options.gni
+++ b/www/chromium/files/patch-media_media__options.gni
@@ -1,4 +1,4 @@
---- media/media_options.gni.orig 2022-02-28 16:54:41 UTC
+--- media/media_options.gni.orig 2022-06-17 14:20:10 UTC
+++ media/media_options.gni
@@ -125,9 +125,12 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
@@ -7,11 +7,11 @@
+ # Enable runtime selection of sndio(7)
+ use_sndio = false
+
- # Alsa should be used on non-Android, non-Mac POSIX systems.
- # Alsa should be used on desktop Chromecast and audio-only Chromecast builds.
+ # Alsa should be used on non-Android, non-Mac POSIX systems (excluding CastOS
+ # video builds).
- if (is_posix && !is_android && !is_mac &&
+ if (is_posix && !is_android && !is_mac && !is_bsd &&
- (!is_chromecast || is_cast_desktop_build || is_cast_audio_only)) {
+ (!is_castos || is_cast_audio_only)) {
use_alsa = true
@@ -142,6 +145,10 @@ declare_args() {
diff --git a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h b/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
index c8745ab93146..81678c827a61 100644
--- a/www/chromium/files/patch-media_mojo_mojom_stable_stable__video__decoder__types__mojom__traits.h
+++ b/www/chromium/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-05-19 14:06:27 UTC
+--- media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h.orig 2022-06-17 14:20:10 UTC
+++ media/mojo/mojom/stable/stable_video_decoder_types_mojom_traits.h
-@@ -620,7 +620,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
+@@ -625,7 +625,7 @@ struct StructTraits<media::stable::mojom::NativeGpuMem
static const gfx::GpuMemoryBufferId& id(
const gfx::GpuMemoryBufferHandle& input);
diff --git a/www/chromium/files/patch-media_webrtc_audio__processor.cc b/www/chromium/files/patch-media_webrtc_audio__processor.cc
index 90d2e8933ec6..c9d2ff76afed 100644
--- a/www/chromium/files/patch-media_webrtc_audio__processor.cc
+++ b/www/chromium/files/patch-media_webrtc_audio__processor.cc
@@ -1,6 +1,6 @@
---- media/webrtc/audio_processor.cc.orig 2022-05-19 14:06:27 UTC
+--- media/webrtc/audio_processor.cc.orig 2022-06-17 14:20:10 UTC
+++ media/webrtc/audio_processor.cc
-@@ -466,7 +466,7 @@ absl::optional<double> AudioProcessor::ProcessData(
+@@ -473,7 +473,7 @@ absl::optional<double> AudioProcessor::ProcessData(
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
DCHECK_LE(volume, 1.0);
#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc
index 5cf8052588ee..3fba74be9256 100644
--- a/www/chromium/files/patch-media_webrtc_helpers__unittests.cc
+++ b/www/chromium/files/patch-media_webrtc_helpers__unittests.cc
@@ -1,4 +1,4 @@
---- media/webrtc/helpers_unittests.cc.orig 2022-05-19 14:06:27 UTC
+--- media/webrtc/helpers_unittests.cc.orig 2022-06-17 14:20:10 UTC
+++ media/webrtc/helpers_unittests.cc
@@ -36,7 +36,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
EXPECT_FALSE(config.pre_amplifier.enabled);
@@ -9,7 +9,7 @@
EXPECT_TRUE(config.gain_controller2.enabled);
#else
EXPECT_FALSE(config.gain_controller2.enabled);
-@@ -93,7 +93,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
+@@ -98,7 +98,7 @@ TEST(CreateWebRtcAudioProcessingModuleTest, CheckDefau
// Check that either AGC1 digital or AGC2 digital is used based on the
// platforms where the Hybrid AGC is enabled by default.
diff --git a/www/chromium/files/patch-media_webrtc_webrtc__features.cc b/www/chromium/files/patch-media_webrtc_webrtc__features.cc
index c203655688cc..a453cc1d0390 100644
--- a/www/chromium/files/patch-media_webrtc_webrtc__features.cc
+++ b/www/chromium/files/patch-media_webrtc_webrtc__features.cc
@@ -1,4 +1,4 @@
---- media/webrtc/webrtc_features.cc.orig 2022-02-28 16:54:41 UTC
+--- media/webrtc/webrtc_features.cc.orig 2022-06-17 14:20:10 UTC
+++ media/webrtc/webrtc_features.cc
@@ -9,7 +9,7 @@
@@ -9,3 +9,12 @@
constexpr base::FeatureState kWebRtcHybridAgcState =
base::FEATURE_ENABLED_BY_DEFAULT;
#else
+@@ -19,7 +19,7 @@ constexpr base::FeatureState kWebRtcHybridAgcState =
+ } // namespace
+
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS)
++ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ constexpr base::FeatureState kWebRtcAnalogAgcClippingControlState =
+ base::FEATURE_ENABLED_BY_DEFAULT;
+ #else
diff --git a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
index b4511f374ac0..0be942f4872c 100644
--- a/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
+++ b/www/chromium/files/patch-mojo_public_tools_bindings_mojom.gni
@@ -1,6 +1,6 @@
---- mojo/public/tools/bindings/mojom.gni.orig 2022-05-19 14:06:27 UTC
+--- mojo/public/tools/bindings/mojom.gni.orig 2022-06-17 14:20:10 UTC
+++ mojo/public/tools/bindings/mojom.gni
-@@ -689,6 +689,16 @@ template("mojom") {
+@@ -694,6 +694,16 @@ template("mojom") {
enabled_features += [ "is_win" ]
}
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 4b5d771694d5..3ea3984b877e 100644
--- a/www/chromium/files/patch-net_BUILD.gn
+++ b/www/chromium/files/patch-net_BUILD.gn
@@ -1,4 +1,4 @@
---- net/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- net/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ net/BUILD.gn
@@ -104,7 +104,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
@@ -9,15 +9,7 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1081,6 +1081,7 @@ component("net") {
- "//net/dns:mdns_client",
- "//net/dns/public",
- "//net/third_party/quiche",
-+ "//sandbox/policy",
- ]
-
- allow_circular_includes_from = [
-@@ -1207,6 +1208,15 @@ component("net") {
+@@ -1201,6 +1201,15 @@ component("net") {
]
}
@@ -33,7 +25,7 @@
if (is_mac) {
sources += [
"base/network_notification_thread_mac.cc",
-@@ -1337,7 +1347,7 @@ component("net") {
+@@ -1333,7 +1342,7 @@ component("net") {
}
}
@@ -42,7 +34,7 @@
sources += [
"base/network_change_notifier_posix.cc",
"base/network_change_notifier_posix.h",
-@@ -1370,7 +1380,7 @@ component("net") {
+@@ -1366,7 +1375,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
@@ -51,7 +43,7 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -4358,7 +4368,7 @@ test("net_unittests") {
+@@ -4373,7 +4382,7 @@ test("net_unittests") {
]
}
@@ -60,7 +52,7 @@
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
-@@ -4432,6 +4442,10 @@ test("net_unittests") {
+@@ -4445,6 +4454,10 @@ test("net_unittests") {
"//url:buildflags",
]
@@ -68,10 +60,10 @@
+ deps += [ "//sandbox/policy" ]
+ }
+
- allow_circular_includes_from = [ "//net/third_party/quiche:quiche_tests" ]
-
if (enable_websockets) {
-@@ -4502,7 +4516,7 @@ test("net_unittests") {
+ deps += [ "//net/server:tests" ]
+ }
+@@ -4517,7 +4530,7 @@ test("net_unittests") {
]
}
@@ -80,7 +72,7 @@
sources += [
"quic/platform/impl/quic_flags_test.cc",
"tools/quic/quic_http_proxy_backend_stream_test.cc",
-@@ -4649,7 +4663,7 @@ test("net_unittests") {
+@@ -4665,7 +4678,7 @@ test("net_unittests") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc b/www/chromium/files/patch-net_base_sockaddr__util__posix.cc
index f24c61654424..24c932b83326 100644
--- a/www/chromium/files/patch-net_socket_unix__domain__client__socket__posix.cc
+++ b/www/chromium/files/patch-net_base_sockaddr__util__posix.cc
@@ -1,11 +1,12 @@
---- net/socket/unix_domain_client_socket_posix.cc.orig 2022-02-28 16:54:41 UTC
-+++ net/socket/unix_domain_client_socket_posix.cc
-@@ -60,7 +60,7 @@ bool UnixDomainClientSocket::FillAddress(const std::st
+--- net/base/sockaddr_util_posix.cc.orig 2022-06-17 14:20:10 UTC
++++ net/base/sockaddr_util_posix.cc
+@@ -40,7 +40,8 @@ bool FillUnixAddress(const std::string& socket_path,
return true;
}
-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
++ // XXX ?
// Convert the path given into abstract socket name. It must start with
// the '\0' character, so we are adding it. |addr_len| must specify the
// length of the structure exactly, as potentially the socket name may
diff --git a/www/chromium/files/patch-net_base_sockaddr__util__posix__unittest.cc b/www/chromium/files/patch-net_base_sockaddr__util__posix__unittest.cc
new file mode 100644
index 000000000000..50ed6dc7f90d
--- /dev/null
+++ b/www/chromium/files/patch-net_base_sockaddr__util__posix__unittest.cc
@@ -0,0 +1,12 @@
+--- net/base/sockaddr_util_posix_unittest.cc.orig 2022-06-17 14:20:10 UTC
++++ net/base/sockaddr_util_posix_unittest.cc
+@@ -83,7 +83,8 @@ TEST(FillUnixAddressTest, AbstractLinuxAddress) {
+ size_t path_max = MaxPathLength(&storage);
+ std::string path(path_max, '0');
+
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
++ // XXX?
+ EXPECT_TRUE(FillUnixAddress(path, /*use_abstract_namespace=*/true, &storage));
+
+ EXPECT_EQ(path.size() + 1U + offsetof(struct sockaddr_un, sun_path),
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.cc b/www/chromium/files/patch-net_cert_cert__verify__proc.cc
index d9b2ded4bcaf..2b0b95101b4e 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc.cc
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc.cc
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.cc.orig 2022-03-25 21:59:56 UTC
+--- net/cert/cert_verify_proc.cc.orig 2022-06-17 14:20:10 UTC
+++ net/cert/cert_verify_proc.cc
-@@ -552,7 +552,7 @@ base::Value CertVerifyParams(X509Certificate* cert,
+@@ -527,7 +527,7 @@ base::Value CertVerifyParams(X509Certificate* cert,
} // namespace
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc.h b/www/chromium/files/patch-net_cert_cert__verify__proc.h
index c73588b0ff78..8e0e2535a303 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc.h
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc.h
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc.h.orig 2022-03-25 21:59:56 UTC
+--- net/cert/cert_verify_proc.h.orig 2022-06-17 14:20:10 UTC
+++ net/cert/cert_verify_proc.h
-@@ -79,7 +79,7 @@ class NET_EXPORT CertVerifyProc
+@@ -80,7 +80,7 @@ class NET_EXPORT CertVerifyProc
kMaxValue = kOther
};
diff --git a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
index 2adc8a62414e..80ffa8812960 100644
--- a/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
+++ b/www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc
@@ -1,6 +1,6 @@
---- net/cert/cert_verify_proc_unittest.cc.orig 2022-05-19 14:06:27 UTC
+--- net/cert/cert_verify_proc_unittest.cc.orig 2022-06-17 14:20:10 UTC
+++ net/cert/cert_verify_proc_unittest.cc
-@@ -232,7 +232,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier
+@@ -240,7 +240,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier
CERT_VERIFY_PROC_MAC, CERT_VERIFY_PROC_BUILTIN
#elif BUILDFLAG(IS_WIN)
CERT_VERIFY_PROC_WIN, CERT_VERIFY_PROC_BUILTIN_CHROME_ROOTS
diff --git a/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc b/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc
index 8290fcc26da0..ea6580b0cab2 100644
--- a/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc
+++ b/www/chromium/files/patch-net_disk__cache_simple_simple__file__tracker.cc
@@ -1,6 +1,6 @@
---- net/disk_cache/simple/simple_file_tracker.cc.orig 2022-02-07 13:39:41 UTC
+--- net/disk_cache/simple/simple_file_tracker.cc.orig 2022-06-17 14:20:10 UTC
+++ net/disk_cache/simple/simple_file_tracker.cc
-@@ -28,7 +28,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit
+@@ -29,7 +29,17 @@ void RecordFileDescripterLimiterOp(FileDescriptorLimit
} // namespace
SimpleFileTracker::SimpleFileTracker(int file_limit)
diff --git a/www/chromium/files/patch-net_dns_host__resolver__manager.cc b/www/chromium/files/patch-net_dns_host__resolver__manager.cc
index da4e19114df1..09afd4db5f2a 100644
--- a/www/chromium/files/patch-net_dns_host__resolver__manager.cc
+++ b/www/chromium/files/patch-net_dns_host__resolver__manager.cc
@@ -1,6 +1,6 @@
---- net/dns/host_resolver_manager.cc.orig 2022-05-19 14:06:27 UTC
+--- net/dns/host_resolver_manager.cc.orig 2022-06-17 14:20:10 UTC
+++ net/dns/host_resolver_manager.cc
-@@ -3157,7 +3157,7 @@ HostResolverManager::HostResolverManager(
+@@ -3156,7 +3156,7 @@ HostResolverManager::HostResolverManager(
}
if (system_dns_config_notifier_)
system_dns_config_notifier_->AddObserver(this);
diff --git a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
index f49f1cb1caa9..8408ed6a4f63 100644
--- a/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_tcp__socket__posix.cc
@@ -1,20 +1,20 @@
---- net/socket/tcp_socket_posix.cc.orig 2022-04-21 18:48:31 UTC
+--- net/socket/tcp_socket_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ net/socket/tcp_socket_posix.cc
-@@ -97,6 +97,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
- PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
- return false;
- }
+@@ -100,6 +100,17 @@ bool SetTCPKeepAlive(int fd, bool enable, int delay) {
+ PLOG(ERROR) << "Failed to set TCP_KEEPALIVE on fd: " << fd;
+ return false;
+ }
+#elif BUILDFLAG(IS_FREEBSD)
+ // Set seconds until first TCP keep alive.
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &delay, sizeof(delay))) {
+ PLOG(ERROR) << "Failed to set TCP_KEEPIDLE on fd: " << fd;
+ return false;
+ }
-+ // Set seconds between TCP keep alives.
++ // Set seconds between TCP keep alives.
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &delay, sizeof(delay))) {
+ PLOG(ERROR) << "Failed to set TCP_KEEPINTVL on fd: " << fd;
+ return false;
+ }
#endif
- return true;
- }
+ }
+
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index 89514745435c..e54f0028bb37 100644
--- a/www/chromium/files/patch-net_socket_udp__socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/udp_socket_posix.cc.orig 2022-05-19 14:06:27 UTC
+--- net/socket/udp_socket_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ net/socket/udp_socket_posix.cc
-@@ -621,7 +621,7 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -576,7 +576,7 @@ int UDPSocketPosix::SetDoNotFragment() {
}
void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -9,7 +9,7 @@
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
-@@ -642,7 +642,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -597,7 +597,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.
-@@ -955,7 +955,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
+@@ -910,7 +910,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/chromium/files/patch-net_third__party_quiche_BUILD.gn b/www/chromium/files/patch-net_third__party_quiche_BUILD.gn
index 349ce70c8cc0..c9157ce422ee 100644
--- a/www/chromium/files/patch-net_third__party_quiche_BUILD.gn
+++ b/www/chromium/files/patch-net_third__party_quiche_BUILD.gn
@@ -1,33 +1,11 @@
---- net/third_party/quiche/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- net/third_party/quiche/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ net/third_party/quiche/BUILD.gn
-@@ -711,7 +711,7 @@ proto_library("net_quic_test_tools_proto") {
- extra_configs = [ "//build/config/compiler:wexit_time_destructors" ]
- }
+@@ -28,7 +28,7 @@ import("//build/config/chromeos/ui_mode.gni")
+ import("//testing/libfuzzer/fuzzer_test.gni")
+ import("//third_party/protobuf/proto_library.gni")
--if (is_linux || is_chromeos) {
-+if ((is_linux || is_chromeos) && !is_bsd) {
- source_set("epoll_server") {
- sources = [
- "overrides/quiche_platform_impl/epoll_bug_impl.h",
-@@ -1102,7 +1102,7 @@ source_set("quic_test_tools_core") {
- "//third_party/quic_trace:quic_trace_proto",
- ]
+-build_epoll_based_tools = is_linux || is_chromeos
++build_epoll_based_tools = (is_linux && !is_bsd) || is_chromeos
-- if (is_linux || is_chromeos) {
-+ if ((is_linux || is_chromeos) && !is_bsd) {
- sources += [
- "src/quiche/epoll_server/fake_simple_epoll_server.cc",
- "src/quiche/epoll_server/fake_simple_epoll_server.h",
-@@ -1562,10 +1562,10 @@ source_set("quiche_tests") {
- ]
- public_deps = []
-
-- if (is_linux || is_chromeos_lacros) {
-+ if ((is_linux || is_chromeos_lacros) && !is_bsd) {
- public_deps += [ ":epoll_quic_tools" ]
- }
-- if (is_linux || is_chromeos) {
-+ if ((is_linux || is_chromeos) && !is_bsd) {
- sources += [
- "overrides/quiche_platform_impl/quiche_command_line_flags_test.cc",
- "src/quiche/epoll_server/simple_epoll_server_test.cc",
+ config("quiche_internal_config") {
+ cflags = []
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
index 73fc5d48b427..b2e1ec0c4090 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__comparision__tool.cc
+++ b/www/chromium/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-02-28 16:54:41 UTC
+--- net/tools/cert_verify_tool/cert_verify_comparision_tool.cc.orig 2022-06-17 14:20:10 UTC
+++ net/tools/cert_verify_tool/cert_verify_comparision_tool.cc
@@ -35,7 +35,7 @@
#include "net/url_request/url_request_context_builder.h"
@@ -9,7 +9,7 @@
#include "net/proxy_resolution/proxy_config.h"
#include "net/proxy_resolution/proxy_config_service_fixed.h"
#endif
-@@ -51,7 +51,7 @@ void SetUpOnNetworkThread(
+@@ -55,7 +55,7 @@ void SetUpOnNetworkThread(
base::WaitableEvent* initialization_complete_event) {
net::URLRequestContextBuilder url_request_context_builder;
url_request_context_builder.set_user_agent(GetUserAgent());
@@ -18,7 +18,7 @@
// On Linux, use a fixed ProxyConfigService, since the default one
// depends on glib.
//
-@@ -123,7 +123,7 @@ class CertVerifyImpl {
+@@ -127,7 +127,7 @@ class CertVerifyImpl {
std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFromName(
base::StringPiece impl_name,
scoped_refptr<net::CertNetFetcher> cert_net_fetcher) {
diff --git a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
index e4297a2b6fff..1c43c835029d 100644
--- a/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
+++ b/www/chromium/files/patch-net_tools_cert__verify__tool_cert__verify__tool.cc
@@ -1,4 +1,4 @@
---- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2022-02-28 16:54:41 UTC
+--- net/tools/cert_verify_tool/cert_verify_tool.cc.orig 2022-06-17 14:20:10 UTC
+++ net/tools/cert_verify_tool/cert_verify_tool.cc
@@ -30,7 +30,7 @@
#include "net/url_request/url_request_context_builder.h"
@@ -9,7 +9,7 @@
#include "net/proxy_resolution/proxy_config.h"
#include "net/proxy_resolution/proxy_config_service_fixed.h"
#endif
-@@ -56,7 +56,7 @@ void SetUpOnNetworkThread(
+@@ -60,7 +60,7 @@ void SetUpOnNetworkThread(
base::WaitableEvent* initialization_complete_event) {
net::URLRequestContextBuilder url_request_context_builder;
url_request_context_builder.set_user_agent(GetUserAgent());
@@ -18,7 +18,7 @@
// On Linux, use a fixed ProxyConfigService, since the default one
// depends on glib.
//
-@@ -206,7 +206,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
+@@ -217,7 +217,7 @@ std::unique_ptr<CertVerifyImpl> CreateCertVerifyImplFr
base::StringPiece impl_name,
scoped_refptr<net::CertNetFetcher> cert_net_fetcher,
RootStoreType root_store_type) {
@@ -27,7 +27,7 @@
if (impl_name == "platform") {
if (root_store_type != RootStoreType::kSystem) {
std::cerr << "WARNING: platform verifier not supported with "
-@@ -463,7 +463,7 @@ int main(int argc, char** argv) {
+@@ -474,7 +474,7 @@ int main(int argc, char** argv) {
std::string impls_str = command_line.GetSwitchValueASCII("impls");
if (impls_str.empty()) {
// Default value.
diff --git a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
index 73f0e82479f4..2b9e75aaa34f 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context__builder.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context_builder.cc.orig 2022-05-19 14:06:27 UTC
+--- net/url_request/url_request_context_builder.cc.orig 2022-06-17 14:20:10 UTC
+++ net/url_request/url_request_context_builder.cc
-@@ -498,7 +498,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -501,7 +501,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
}
if (!proxy_resolution_service_) {
diff --git a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc
index 1408b965110d..3d0ff023647c 100644
--- a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc
+++ b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.cc
@@ -1,6 +1,6 @@
---- printing/mojom/printing_context_mojom_traits.cc.orig 2022-02-28 16:54:41 UTC
+--- printing/mojom/printing_context_mojom_traits.cc.orig 2022-06-17 14:20:10 UTC
+++ printing/mojom/printing_context_mojom_traits.cc
-@@ -16,7 +16,7 @@
+@@ -15,7 +15,7 @@
#include "ui/gfx/geometry/mojom/geometry_mojom_traits.h"
#include "ui/gfx/geometry/size.h"
@@ -9,7 +9,7 @@
#include "mojo/public/mojom/base/values.mojom.h"
#endif
-@@ -162,7 +162,7 @@ bool StructTraits<
+@@ -147,7 +147,7 @@ bool StructTraits<
}
out->set_pages_per_sheet(data.pages_per_sheet());
diff --git a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h
index 8d439f07445f..5e565acae23a 100644
--- a/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h
+++ b/www/chromium/files/patch-printing_mojom_printing__context__mojom__traits.h
@@ -1,6 +1,6 @@
---- printing/mojom/printing_context_mojom_traits.h.orig 2022-02-28 16:54:41 UTC
+--- printing/mojom/printing_context_mojom_traits.h.orig 2022-06-17 14:20:10 UTC
+++ printing/mojom/printing_context_mojom_traits.h
-@@ -168,7 +168,7 @@ struct StructTraits<printing::mojom::PrintSettingsData
+@@ -158,7 +158,7 @@ struct StructTraits<printing::mojom::PrintSettingsData
return s.pages_per_sheet();
}
diff --git a/www/chromium/files/patch-printing_printing__features.cc b/www/chromium/files/patch-printing_printing__features.cc
deleted file mode 100644
index 0d569895cb8e..000000000000
--- a/www/chromium/files/patch-printing_printing__features.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- printing/printing_features.cc.orig 2022-02-28 16:54:41 UTC
-+++ printing/printing_features.cc
-@@ -8,7 +8,7 @@
- #include "printing/buildflags/buildflags.h"
-
- #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
-- BUILDFLAG(IS_CHROMEOS)
-+ BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- #include "base/metrics/field_trial_params.h"
- #endif
-
diff --git a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
index a201baaefe52..67372f4cebca 100644
--- a/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
+++ b/www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc
@@ -1,4 +1,4 @@
---- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-02-28 16:54:41 UTC
+--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-06-17 14:20:10 UTC
+++ remoting/codec/webrtc_video_encoder_vpx.cc
@@ -85,7 +85,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
const webrtc::DesktopSize& size) {
@@ -8,4 +8,4 @@
+#if (BUILDFLAG(IS_BSD) || BUILDFLAG(IS_LINUX)) && !BUILDFLAG(IS_CHROMEOS_LACROS)
// On Linux, using too many threads for VP8 encoding has been linked to high
// CPU usage on machines that are under stress. See http://crbug.com/1151148.
- config->g_threads = std::min(config->g_threads, 2U);
+ // 5/3/2022 update: Perf testing has shown that doubling the number of threads
diff --git a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
index 0d2aba957d12..ccb0eb5f2f5d 100644
--- a/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
+++ b/www/chromium/files/patch-remoting_host_it2me_it2me__native__messaging__host__main.cc
@@ -1,47 +1,47 @@
---- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-02-28 16:54:41 UTC
+--- remoting/host/it2me/it2me_native_messaging_host_main.cc.orig 2022-06-17 14:20:10 UTC
+++ remoting/host/it2me/it2me_native_messaging_host_main.cc
@@ -30,7 +30,7 @@
#include "remoting/host/resources.h"
#include "remoting/host/usage_stats_consent.h"
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
#include <gtk/gtk.h>
#include "base/linux_util.h"
-@@ -76,7 +76,7 @@ bool CurrentProcessHasUiAccess() {
+@@ -77,7 +77,7 @@ bool CurrentProcessHasUiAccess() {
// Creates a It2MeNativeMessagingHost instance, attaches it to stdin/stdout and
// runs the task executor until It2MeNativeMessagingHost signals shutdown.
int It2MeNativeMessagingHostMain(int argc, char** argv) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
// Initialize Xlib for multi-threaded use, allowing non-Chromium code to
// use X11 safely (such as the WebRTC capturer, GTK ...)
x11::InitXlib();
-@@ -121,7 +121,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+@@ -123,7 +123,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
remoting::LoadResources("");
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
// Required for any calls into GTK functions, such as the Disconnect and
// Continue windows. Calling with nullptr arguments because we don't have
// any command line arguments for gtk to consume.
-@@ -254,7 +254,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+@@ -257,7 +257,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
PolicyWatcher::CreateWithTaskRunner(context->file_task_runner(),
context->management_service());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
// Create an X11EventSource on all UI threads, so the global X11 connection
// (x11::Connection::Get()) can dispatch X events.
auto event_source =
-@@ -276,7 +276,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
+@@ -280,7 +280,7 @@ int It2MeNativeMessagingHostMain(int argc, char** argv
// Run the loop until channel is alive.
run_loop.Run();
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
input_task_runner->PostTask(FROM_HERE, base::BindOnce([]() {
delete ui::X11EventSource::GetInstance();
}));
diff --git a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
index d23ad854ac24..7ebdc841da3f 100644
--- a/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
+++ b/www/chromium/files/patch-remoting_host_remoting__me2me__host.cc
@@ -1,16 +1,23 @@
---- remoting/host/remoting_me2me_host.cc.orig 2022-04-21 18:48:31 UTC
+--- remoting/host/remoting_me2me_host.cc.orig 2022-06-17 14:20:10 UTC
+++ remoting/host/remoting_me2me_host.cc
@@ -124,7 +124,7 @@
#include "remoting/host/mac/permission_utils.h"
#endif // BUILDFLAG(IS_APPLE)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
#include <gtk/gtk.h>
+ #include "ui/events/platform/x11/x11_event_source.h"
+@@ -132,13 +132,13 @@
+ #endif // (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) &&
+ // defined(REMOTING_USE_X11)
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "base/linux_util.h"
-@@ -134,7 +134,7 @@
- #include "ui/gfx/x/xlib_support.h"
+ #include "remoting/host/audio_capturer_linux.h"
+ #include "remoting/host/linux/certificate_watcher.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX)
@@ -18,7 +25,7 @@
#include "remoting/host/host_utmp_logger.h"
#endif
-@@ -172,7 +172,7 @@ const char kApplicationName[] = "chromoting";
+@@ -176,7 +176,7 @@ const char kApplicationName[] = "chromoting";
const char kStdinConfigPath[] = "-";
#endif // !defined(REMOTING_MULTI_PROCESS)
@@ -27,7 +34,7 @@
// The command line switch used to pass name of the pipe to capture audio on
// linux.
const char kAudioPipeSwitchName[] = "audio-pipe-name";
-@@ -377,7 +377,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+@@ -381,7 +381,7 @@ class HostProcess : public ConfigWatcher::Delegate,
std::unique_ptr<ChromotingHostContext> context_;
@@ -35,8 +42,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
// Watch for certificate changes and kill the host when changes occur
std::unique_ptr<CertificateWatcher> cert_watcher_;
- #endif
-@@ -443,7 +443,7 @@ class HostProcess : public ConfigWatcher::Delegate,
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+@@ -447,7 +447,7 @@ class HostProcess : public ConfigWatcher::Delegate,
std::unique_ptr<HostStatusLogger> host_status_logger_;
std::unique_ptr<HostEventLogger> host_event_logger_;
@@ -45,7 +52,7 @@
std::unique_ptr<HostUTMPLogger> host_utmp_logger_;
#endif
std::unique_ptr<HostPowerSaveBlocker> power_save_blocker_;
-@@ -754,7 +754,7 @@ void HostProcess::StartOnNetworkThread() {
+@@ -758,7 +758,7 @@ void HostProcess::StartOnNetworkThread() {
void HostProcess::ShutdownOnNetworkThread() {
DCHECK(context_->network_task_runner()->BelongsToCurrentThread());
config_watcher_.reset();
@@ -54,7 +61,7 @@
cert_watcher_.reset();
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
}
-@@ -813,7 +813,7 @@ void HostProcess::CreateAuthenticatorFactory() {
+@@ -817,7 +817,7 @@ void HostProcess::CreateAuthenticatorFactory() {
DCHECK(third_party_auth_config_.token_url.is_valid());
DCHECK(third_party_auth_config_.token_validation_url.is_valid());
@@ -63,7 +70,7 @@
if (!cert_watcher_) {
cert_watcher_ = std::make_unique<CertificateWatcher>(
base::BindRepeating(&HostProcess::ShutdownHost,
-@@ -923,7 +923,7 @@ void HostProcess::StartOnUiThread() {
+@@ -927,7 +927,7 @@ void HostProcess::StartOnUiThread() {
base::BindRepeating(&HostProcess::OnPolicyUpdate, base::Unretained(this)),
base::BindRepeating(&HostProcess::OnPolicyError, base::Unretained(this)));
@@ -72,7 +79,7 @@
// If an audio pipe is specific on the command-line then initialize
// AudioCapturerLinux to capture from it.
base::FilePath audio_pipe_name = base::CommandLine::ForCurrentProcess()->
-@@ -994,7 +994,7 @@ void HostProcess::ShutdownOnUiThread() {
+@@ -998,7 +998,7 @@ void HostProcess::ShutdownOnUiThread() {
// It is now safe for the HostProcess to be deleted.
self_ = nullptr;
@@ -81,7 +88,16 @@
// Cause the global AudioPipeReader to be freed, otherwise the audio
// thread will remain in-use and prevent the process from exiting.
// TODO(wez): DesktopEnvironmentFactory should own the pipe reader.
-@@ -1704,7 +1704,7 @@ void HostProcess::StartHost() {
+@@ -1006,7 +1006,7 @@ void HostProcess::ShutdownOnUiThread() {
+ AudioCapturerLinux::InitializePipeReader(nullptr, base::FilePath());
+ #endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
+ context_->input_task_runner()->PostTask(
+ FROM_HERE,
+ base::BindOnce([]() { delete ui::X11EventSource::GetInstance(); }));
+@@ -1711,7 +1711,7 @@ void HostProcess::StartHost() {
// The feature is enabled for all Googlers using a supported platform.
desktop_environment_options_.set_enable_remote_open_url(is_googler_);
@@ -90,7 +106,7 @@
desktop_environment_options_.set_enable_remote_webauthn(is_googler_);
#endif
-@@ -1737,7 +1737,7 @@ void HostProcess::StartHost() {
+@@ -1744,7 +1744,7 @@ void HostProcess::StartHost() {
host_status_logger_ = std::make_unique<HostStatusLogger>(
host_->status_monitor(), log_to_server_.get());
@@ -99,21 +115,21 @@
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
if (cmd_line->HasSwitch(kEnableUtempter))
host_utmp_logger_ =
-@@ -1908,7 +1908,7 @@ int HostProcessMain() {
+@@ -1915,7 +1915,7 @@ int HostProcessMain() {
HOST_LOG << "Starting host process: version " << STRINGIZE(VERSION);
const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #if defined(REMOTING_USE_X11)
// Initialize Xlib for multi-threaded use, allowing non-Chromium code to
// use X11 safely (such as the WebRTC capturer, GTK ...)
- x11::InitXlib();
-@@ -1952,7 +1952,7 @@ int HostProcessMain() {
+@@ -1961,7 +1961,7 @@ int HostProcessMain() {
std::unique_ptr<net::NetworkChangeNotifier> network_change_notifier(
net::NetworkChangeNotifier::CreateIfNeeded());
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(REMOTING_USE_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(REMOTING_USE_X11)
// Create an X11EventSource on all UI threads, so the global X11 connection
// (x11::Connection::Get()) can dispatch X events.
auto event_source =
diff --git a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
new file mode 100644
index 000000000000..95c3357b6bc0
--- /dev/null
+++ b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__caller__security__utils.cc
@@ -0,0 +1,29 @@
+--- remoting/host/webauthn/remote_webauthn_caller_security_utils.cc.orig 2022-06-17 14:20:10 UTC
++++ remoting/host/webauthn/remote_webauthn_caller_security_utils.cc
+@@ -9,7 +9,7 @@
+ #include "base/strings/utf_string_conversions.h"
+ #include "build/build_config.h"
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD)
+ #include "base/containers/fixed_flat_set.h"
+ #include "base/files/file_path.h"
+ #include "base/process/process_handle.h"
+@@ -37,7 +37,7 @@ namespace {
+
+ // No static variables needed for debug builds.
+
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+
+ constexpr auto kAllowedCallerPrograms =
+ base::MakeFixedFlatSet<base::FilePath::StringPieceType>({
+@@ -76,7 +76,7 @@ bool IsLaunchedByTrustedProcess() {
+ #if !defined(NDEBUG)
+ // Just return true on debug builds for the convenience of development.
+ return true;
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ base::ProcessId parent_pid =
+ base::GetParentProcessId(base::GetCurrentProcessHandle());
+ base::FilePath parent_image_path = GetProcessImagePath(parent_pid);
diff --git a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
index bf7e2c626cb0..58f274d57c36 100644
--- a/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
+++ b/www/chromium/files/patch-remoting_host_webauthn_remote__webauthn__extension__notifier.cc
@@ -1,6 +1,15 @@
---- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2022-05-19 14:06:27 UTC
+--- remoting/host/webauthn/remote_webauthn_extension_notifier.cc.orig 2022-06-17 14:20:10 UTC
+++ remoting/host/webauthn/remote_webauthn_extension_notifier.cc
-@@ -49,14 +49,14 @@ namespace {
+@@ -23,7 +23,7 @@
+ #include "base/threading/sequenced_task_runner_handle.h"
+ #include "build/build_config.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ #include "base/environment.h"
+ #include "base/nix/xdg_util.h"
+ #include "base/strings/string_util.h"
+@@ -68,14 +68,14 @@ static constexpr char kExtensionWakeupFileContent[] =
// Caller should check if the directory exists before writing files to it. A
// directory only exists if the corresponding Chrome version is installed.
std::vector<base::FilePath> GetRemoteStateChangeDirPaths() {
@@ -14,6 +23,6 @@
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // See: chrome/common/chrome_paths_linux.cc
+ auto env = base::Environment::Create();
base::FilePath base_path;
- if (!base::PathService::Get(base::DIR_HOME, &base_path)) {
- LOG(ERROR) << "Failed to get local app data dir";
diff --git a/www/chromium/files/patch-sandbox_policy_BUILD.gn b/www/chromium/files/patch-sandbox_policy_BUILD.gn
index bc11b185025d..88f6b4be2c31 100644
--- a/www/chromium/files/patch-sandbox_policy_BUILD.gn
+++ b/www/chromium/files/patch-sandbox_policy_BUILD.gn
@@ -1,6 +1,6 @@
---- sandbox/policy/BUILD.gn.orig 2022-04-21 18:48:31 UTC
+--- sandbox/policy/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ sandbox/policy/BUILD.gn
-@@ -34,7 +34,7 @@ component("policy") {
+@@ -36,7 +36,7 @@ component("policy") {
"//sandbox/policy/mojom",
]
public_deps = [ "//sandbox:common" ]
@@ -9,7 +9,7 @@
sources += [
"linux/bpf_audio_policy_linux.cc",
"linux/bpf_audio_policy_linux.h",
-@@ -89,6 +89,27 @@ component("policy") {
+@@ -95,6 +95,27 @@ component("policy") {
"//sandbox/linux:sandbox_services",
"//sandbox/linux:seccomp_bpf",
"//sandbox/linux:suid_sandbox_client",
diff --git a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc
index 1e11d06c7cac..6f7c2411faec 100644
--- a/www/chromium/files/patch-sandbox_policy_sandbox__type.cc
+++ b/www/chromium/files/patch-sandbox_policy_sandbox__type.cc
@@ -1,4 +1,4 @@
---- sandbox/policy/sandbox_type.cc.orig 2022-05-19 14:06:27 UTC
+--- sandbox/policy/sandbox_type.cc.orig 2022-06-17 14:20:10 UTC
+++ sandbox/policy/sandbox_type.cc
@@ -39,7 +39,7 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
#endif
@@ -18,19 +18,7 @@
case Sandbox::kHardwareVideoDecoding:
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -72,8 +72,10 @@ bool IsUnsandboxedSandboxType(Sandbox sandbox_type) {
- case Sandbox::kLibassistant:
- #endif // BUILDFLAG(ENABLE_CROS_LIBASSISTANT)
- #endif // // BUILDFLAG(IS_CHROMEOS_ASH)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
-+#if !BUILDFLAG(IS_BSD)
- case Sandbox::kZygoteIntermediateSandbox:
-+#endif
- case Sandbox::kScreenAI:
- #endif
- case Sandbox::kSpeechRecognition:
-@@ -125,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -127,7 +127,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
#endif
case Sandbox::kPrintCompositor:
case Sandbox::kAudio:
@@ -39,7 +27,7 @@
case Sandbox::kVideoCapture:
#endif
#if BUILDFLAG(IS_WIN)
-@@ -136,7 +138,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
+@@ -138,7 +138,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
case Sandbox::kMediaFoundationCdm:
case Sandbox::kWindowsSystemProxyResolver:
#endif // BUILDFLAG(IS_WIN)
@@ -48,16 +36,7 @@
case Sandbox::kHardwareVideoDecoding:
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -149,7 +151,7 @@ void SetCommandLineFlagsForSandboxType(base::CommandLi
- #if BUILDFLAG(IS_MAC)
- case Sandbox::kMirroring:
- #endif // BUILDFLAG(IS_MAC)
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- case Sandbox::kScreenAI:
- #endif
- case Sandbox::kSpeechRecognition:
-@@ -255,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -257,7 +257,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
return switches::kUtilitySandbox;
case Sandbox::kAudio:
return switches::kAudioSandbox;
@@ -66,16 +45,7 @@
case Sandbox::kVideoCapture:
return switches::kVideoCaptureSandbox;
#endif
-@@ -265,7 +267,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
- return switches::kServiceSandboxWithJit;
- case Sandbox::kSpeechRecognition:
- return switches::kSpeechRecognitionSandbox;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- case Sandbox::kScreenAI:
- return switches::kScreenAISandbox;
- #endif
-@@ -285,7 +287,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
+@@ -287,7 +287,7 @@ std::string StringFromUtilitySandboxType(Sandbox sandb
case Sandbox::kMirroring:
return switches::kMirroringSandbox;
#endif
@@ -84,12 +54,7 @@
case Sandbox::kHardwareVideoDecoding:
return switches::kHardwareVideoDecodingSandbox;
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -369,15 +371,15 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
- return Sandbox::kAudio;
- if (sandbox_string == switches::kSpeechRecognitionSandbox)
- return Sandbox::kSpeechRecognition;
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+@@ -375,11 +375,11 @@ sandbox::mojom::Sandbox UtilitySandboxTypeFromString(
if (sandbox_string == switches::kScreenAISandbox)
return Sandbox::kScreenAI;
#endif
diff --git a/www/chromium/files/patch-sandbox_policy_switches.cc b/www/chromium/files/patch-sandbox_policy_switches.cc
index 1eb26bb12aa3..5b12c91f9438 100644
--- a/www/chromium/files/patch-sandbox_policy_switches.cc
+++ b/www/chromium/files/patch-sandbox_policy_switches.cc
@@ -1,6 +1,6 @@
---- sandbox/policy/switches.cc.orig 2022-05-19 14:06:27 UTC
+--- sandbox/policy/switches.cc.orig 2022-06-17 14:20:10 UTC
+++ sandbox/policy/switches.cc
-@@ -52,7 +52,7 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro
+@@ -54,7 +54,7 @@ const char kWindowsSystemProxyResolverSandbox[] = "pro
const char kMirroringSandbox[] = "mirroring";
#endif // BUILDFLAG(IS_MAC)
@@ -9,7 +9,7 @@
const char kHardwareVideoDecodingSandbox[] = "hardware_video_decoding";
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -99,7 +99,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
+@@ -101,7 +101,9 @@ const char kGpuSandboxFailuresFatal[] = "gpu-sandbox-f
// Meant to be used as a browser-level switch for testing purposes only.
const char kNoSandbox[] = "no-sandbox";
diff --git a/www/chromium/files/patch-sandbox_policy_switches.h b/www/chromium/files/patch-sandbox_policy_switches.h
index aeebbcbb5644..d3234c31c975 100644
--- a/www/chromium/files/patch-sandbox_policy_switches.h
+++ b/www/chromium/files/patch-sandbox_policy_switches.h
@@ -1,6 +1,6 @@
---- sandbox/policy/switches.h.orig 2022-05-19 14:06:27 UTC
+--- sandbox/policy/switches.h.orig 2022-06-17 14:20:10 UTC
+++ sandbox/policy/switches.h
-@@ -53,7 +53,7 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem
+@@ -56,7 +56,7 @@ SANDBOX_POLICY_EXPORT extern const char kWindowsSystem
SANDBOX_POLICY_EXPORT extern const char kMirroringSandbox[];
#endif // BUILDFLAG(IS_MAC)
@@ -9,7 +9,7 @@
SANDBOX_POLICY_EXPORT extern const char kHardwareVideoDecodingSandbox[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -75,7 +75,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
+@@ -78,7 +78,8 @@ SANDBOX_POLICY_EXPORT extern const char kDisableSetuid
SANDBOX_POLICY_EXPORT extern const char kGpuSandboxAllowSysVShm[];
SANDBOX_POLICY_EXPORT extern const char kGpuSandboxFailuresFatal[];
SANDBOX_POLICY_EXPORT extern const char kNoSandbox[];
diff --git a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
index 7507614ed649..75a1cdaffb46 100644
--- a/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
+++ b/www/chromium/files/patch-services_cert__verifier_cert__verifier__creation.cc
@@ -1,30 +1,28 @@
---- services/cert_verifier/cert_verifier_creation.cc.orig 2022-02-28 16:54:41 UTC
+--- services/cert_verifier/cert_verifier_creation.cc.orig 2022-06-17 14:20:10 UTC
+++ services/cert_verifier/cert_verifier_creation.cc
-@@ -86,7 +86,7 @@ scoped_refptr<net::CertVerifyProc> CreateCertVerifyPro
- scoped_refptr<net::CertVerifyProc> CreateOldDefaultWithoutCaching(
- scoped_refptr<net::CertNetFetcher> cert_net_fetcher) {
- scoped_refptr<net::CertVerifyProc> verify_proc;
+@@ -12,7 +12,7 @@
+ #include "net/cert_net/cert_net_fetcher_url_request.h"
+ #include "net/net_buildflags.h"
+
+-#if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \
++#if BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || BUILDFLAG(IS_BSD) || \
+ BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+ #include "net/cert/cert_verify_proc_builtin.h"
+ #include "net/cert/internal/system_trust_store.h"
+@@ -94,7 +94,7 @@ class OldDefaultCertVerifyProcFactory : public net::Ce
+ scoped_refptr<net::CertNetFetcher> cert_net_fetcher,
+ const net::ChromeRootStoreData* root_store_data) override {
+ scoped_refptr<net::CertVerifyProc> verify_proc;
-#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- verify_proc =
- net::CertVerifyProc::CreateBuiltinVerifyProc(std::move(cert_net_fetcher));
+ verify_proc = net::CreateCertVerifyProcBuiltin(
+ std::move(cert_net_fetcher), net::CreateSslSystemTrustStore());
#else
-@@ -104,7 +104,7 @@ scoped_refptr<net::CertVerifyProc> CreateNewDefaultWit
- scoped_refptr<net::CertNetFetcher> cert_net_fetcher) {
- scoped_refptr<net::CertVerifyProc> verify_proc;
- #if BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED) && \
-- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN))
-+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_BSD))
- verify_proc = net::CreateCertVerifyProcBuiltin(
- std::move(cert_net_fetcher), net::CreateSslSystemTrustStoreChromeRoot());
- #elif BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED)
-@@ -122,7 +122,8 @@ bool IsUsingCertNetFetcher() {
+@@ -272,6 +272,7 @@ std::unique_ptr<net::CertVerifierWithUpdatableProc> Cr
+ bool IsUsingCertNetFetcher() {
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || \
++ BUILDFLAG(IS_BSD) || \
BUILDFLAG(TRIAL_COMPARISON_CERT_VERIFIER_SUPPORTED) || \
-- BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED)
-+ BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \
-+ BUILDFLAG(IS_BSD)
- return true;
- #else
- return false;
+ BUILDFLAG(BUILTIN_CERT_VERIFIER_FEATURE_SUPPORTED) || \
+ BUILDFLAG(CHROME_ROOT_STORE_SUPPORTED)
diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__fido.cc b/www/chromium/files/patch-services_device_hid_hid__connection__fido.cc
index 5a6ded090276..2a0b172b142a 100644
--- a/www/chromium/files/patch-services_device_hid_hid__connection__fido.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__connection__fido.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_connection_fido.cc.orig 2022-02-07 13:39:41 UTC
+--- services/device/hid/hid_connection_fido.cc.orig 2022-06-17 14:20:10 UTC
+++ services/device/hid/hid_connection_fido.cc
-@@ -0,0 +1,198 @@
+@@ -0,0 +1,197 @@
+// Copyright (c) 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -12,7 +12,6 @@
+#include "base/location.h"
+#include "base/numerics/safe_math.h"
+#include "base/posix/eintr_wrapper.h"
-+#include "base/task/post_task.h"
+#include "base/task/single_thread_task_runner.h"
+#include "base/threading/scoped_blocking_call.h"
+#include "base/threading/thread_restrictions.h"
diff --git a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
index bdb73b369068..ae990e29ff3d 100644
--- a/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__connection__freebsd.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_connection_freebsd.cc.orig 2022-02-07 13:39:41 UTC
+--- services/device/hid/hid_connection_freebsd.cc.orig 2022-06-17 14:20:10 UTC
+++ services/device/hid/hid_connection_freebsd.cc
-@@ -0,0 +1,243 @@
+@@ -0,0 +1,242 @@
+// Copyright (c) 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -16,7 +16,6 @@
+#include "base/numerics/safe_math.h"
+#include "base/posix/eintr_wrapper.h"
+#include "base/strings/stringprintf.h"
-+#include "base/task/post_task.h"
+#include "base/task/single_thread_task_runner.h"
+#include "base/threading/scoped_blocking_call.h"
+#include "base/threading/thread_restrictions.h"
diff --git a/www/chromium/files/patch-services_device_hid_hid__service__fido.cc b/www/chromium/files/patch-services_device_hid_hid__service__fido.cc
index 35dc50e5e425..e0deca268d8a 100644
--- a/www/chromium/files/patch-services_device_hid_hid__service__fido.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__service__fido.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_service_fido.cc.orig 2022-02-07 13:39:41 UTC
+--- services/device/hid/hid_service_fido.cc.orig 2022-06-17 14:20:10 UTC
+++ services/device/hid/hid_service_fido.cc
-@@ -0,0 +1,328 @@
+@@ -0,0 +1,327 @@
+// Copyright 2020 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -38,7 +38,6 @@
+#include "base/strings/string_util.h"
+#include "base/strings/stringprintf.h"
+#include "base/strings/sys_string_conversions.h"
-+#include "base/task/post_task.h"
+#include "base/threading/scoped_blocking_call.h"
+#include "base/threading/thread_task_runner_handle.h"
+#include "components/device_event_log/device_event_log.h"
diff --git a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
index e04b2eb9c670..4ed1d48f5445 100644
--- a/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
+++ b/www/chromium/files/patch-services_device_hid_hid__service__freebsd.cc
@@ -1,6 +1,6 @@
---- services/device/hid/hid_service_freebsd.cc.orig 2022-02-07 13:39:41 UTC
+--- services/device/hid/hid_service_freebsd.cc.orig 2022-06-17 14:20:10 UTC
+++ services/device/hid/hid_service_freebsd.cc
-@@ -0,0 +1,398 @@
+@@ -0,0 +1,397 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -30,7 +30,6 @@
+#include "base/strings/sys_string_conversions.h"
+#include "base/strings/string_util.h"
+#include "base/strings/string_split.h"
-+#include "base/task/post_task.h"
+#include "base/task/single_thread_task_runner.h"
+#include "base/task/thread_pool.h"
+#include "base/threading/scoped_blocking_call.h"
diff --git a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
index 9b477e51ff61..4fdce4ce7f02 100644
--- a/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
+++ b/www/chromium/files/patch-services_device_serial_serial__io__handler__posix.cc
@@ -1,6 +1,6 @@
---- services/device/serial/serial_io_handler_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- services/device/serial/serial_io_handler_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ services/device/serial/serial_io_handler_posix.cc
-@@ -68,7 +68,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
+@@ -67,7 +67,7 @@ bool BitrateToSpeedConstant(int bitrate, speed_t* spee
BITRATE_TO_SPEED_CASE(9600)
BITRATE_TO_SPEED_CASE(19200)
BITRATE_TO_SPEED_CASE(38400)
diff --git a/www/chromium/files/patch-services_network_BUILD.gn b/www/chromium/files/patch-services_network_BUILD.gn
index 2a7e0aef461a..85e273769ebf 100644
--- a/www/chromium/files/patch-services_network_BUILD.gn
+++ b/www/chromium/files/patch-services_network_BUILD.gn
@@ -1,6 +1,6 @@
---- services/network/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- services/network/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ services/network/BUILD.gn
-@@ -328,7 +328,6 @@ if (is_linux || is_chromeos) {
+@@ -332,7 +332,6 @@ if (is_linux || is_chromeos) {
]
deps = [
"//base:base",
diff --git a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc
index 1f26208a7d6e..0db160132971 100644
--- a/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc
+++ b/www/chromium/files/patch-services_tracing_public_cpp_perfetto_perfetto__config.cc
@@ -1,6 +1,6 @@
---- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2022-02-28 16:54:41 UTC
+--- services/tracing/public/cpp/perfetto/perfetto_config.cc.orig 2022-06-17 14:20:10 UTC
+++ services/tracing/public/cpp/perfetto/perfetto_config.cc
-@@ -124,7 +124,7 @@ void AddDataSourceConfigs(
+@@ -125,7 +125,7 @@ void AddDataSourceConfigs(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
#if BUILDFLAG(IS_CHROMEOS_ASH) || \
diff --git a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
index e39571c78e5b..234059638de3 100644
--- a/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
+++ b/www/chromium/files/patch-services_video__capture_broadcasting__receiver.cc
@@ -1,20 +1,11 @@
---- services/video_capture/broadcasting_receiver.cc.orig 2022-02-28 16:54:41 UTC
+--- services/video_capture/broadcasting_receiver.cc.orig 2022-06-17 14:20:10 UTC
+++ services/video_capture/broadcasting_receiver.cc
-@@ -28,7 +28,7 @@ void CloneSharedBufferHandle(const mojo::ScopedSharedB
- void CloneSharedBufferToRawFileDescriptorHandle(
- const mojo::ScopedSharedBufferHandle& source,
- media::mojom::VideoBufferHandlePtr* target) {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // |source| is unwrapped to a |PlatformSharedMemoryRegion|, from whence a file
- // descriptor can be extracted which is then mojo-wrapped.
- base::subtle::PlatformSharedMemoryRegion platform_region =
-@@ -240,7 +240,7 @@ void BroadcastingReceiver::BufferContext::
- ConvertRawFileDescriptorToSharedBuffer() {
+@@ -234,7 +234,7 @@ void BroadcastingReceiver::BufferContext::
+ ConvertRawFileDescriptorToUnsafeShmemRegion() {
DCHECK(buffer_handle_->is_shared_memory_via_raw_file_descriptor());
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // The conversion unwraps the descriptor from its mojo handle to the raw file
- // descriptor (ie, an int). This is used to create a
- // PlatformSharedMemoryRegion which is then wrapped as a
+ const size_t handle_size =
+ buffer_handle_->get_shared_memory_via_raw_file_descriptor()
+ ->shared_memory_size_in_bytes;
diff --git a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
index 3236ed475d65..647e814932d4 100644
--- a/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
+++ b/www/chromium/files/patch-third__party_abseil-cpp_absl_base_internal_sysinfo.cc
@@ -1,4 +1,4 @@
---- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-02-07 13:39:41 UTC
+--- third_party/abseil-cpp/absl/base/internal/sysinfo.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/abseil-cpp/absl/base/internal/sysinfo.cc
@@ -30,7 +30,7 @@
#include <sys/syscall.h>
@@ -9,7 +9,7 @@
#include <sys/sysctl.h>
#endif
-@@ -308,9 +308,11 @@ static double GetNominalCPUFrequency() {
+@@ -307,9 +307,11 @@ static double GetNominalCPUFrequency() {
// a new mode (turbo mode). Essentially, those frequencies cannot
// always be relied upon. The same reasons apply to /proc/cpuinfo as
// well.
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 5bd5ca9bcd92..1c2bf54e5ff3 100644
--- a/www/chromium/files/patch-third__party_angle_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- third_party/angle/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ third_party/angle/BUILD.gn
-@@ -213,7 +213,6 @@ config("extra_warnings") {
+@@ -222,7 +222,6 @@ config("extra_warnings") {
"-Wtautological-type-limit-compare",
"-Wundefined-reinterpret-cast",
"-Wunneeded-internal-declaration",
@@ -8,7 +8,7 @@
"-Wsuggest-destructor-override",
"-Wsuggest-override",
-@@ -391,7 +390,7 @@ angle_static_library("angle_common") {
+@@ -400,7 +399,7 @@ angle_static_library("angle_common") {
all_dependent_configs = [ ":angle_disable_pool_alloc" ]
}
@@ -17,7 +17,7 @@
libs = [ "dl" ]
}
-@@ -512,6 +511,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -521,6 +520,9 @@ angle_static_library("angle_gpu_info_util") {
"Xi",
"Xext",
]
@@ -25,5 +25,5 @@
+ libs += [ "GL" ]
+ }
}
- }
+ if (angle_use_wayland && angle_has_build) {
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
index 838318b2421b..0b0463d3ce9c 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/Display.cpp.orig 2022-05-19 14:06:27 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-06-17 14:20:10 UTC
+++ third_party/angle/src/libANGLE/Display.cpp
@@ -55,7 +55,7 @@
# include "libANGLE/renderer/gl/wgl/DisplayWGL.h"
@@ -9,7 +9,7 @@
# include "libANGLE/renderer/gl/egl/DisplayEGL.h"
# if defined(ANGLE_USE_GBM)
# include "libANGLE/renderer/gl/egl/gbm/DisplayGbm.h"
-@@ -328,7 +328,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -330,7 +330,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
impl = rx::CreateDisplayCGLOrEAGL(state);
break;
@@ -18,7 +18,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0)
{
-@@ -373,7 +373,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -375,7 +375,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
#if defined(ANGLE_ENABLE_OPENGL)
# if defined(ANGLE_PLATFORM_WINDOWS)
impl = new rx::DisplayWGL(state);
@@ -27,16 +27,16 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0 ||
platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE)
-@@ -424,7 +424,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -426,7 +426,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
impl = rx::CreateVulkanWin32Display(state);
}
break;
-# elif defined(ANGLE_PLATFORM_LINUX)
+# elif defined(ANGLE_PLATFORM_LINUX) || defined(ANGLE_PLATFORM_BSD)
- # if defined(ANGLE_USE_X11)
- if (platformType == EGL_PLATFORM_X11_EXT && rx::IsVulkanXcbDisplayAvailable())
+ # if defined(ANGLE_USE_GBM)
+ if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
{
-@@ -1932,7 +1932,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -1965,7 +1965,7 @@ static ClientExtensions GenerateClientExtensions()
extensions.x11Visual = true;
#endif
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
index 9e0cb54e9bbd..8cf1aa4b9191 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_driver__utils.h
@@ -1,6 +1,6 @@
---- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-02-28 16:54:41 UTC
+--- third_party/angle/src/libANGLE/renderer/driver_utils.h.orig 2022-06-17 14:20:10 UTC
+++ third_party/angle/src/libANGLE/renderer/driver_utils.h
-@@ -179,7 +179,7 @@ inline bool IsWindows()
+@@ -183,7 +183,7 @@ inline bool IsWindows()
inline bool IsLinux()
{
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
index c83bf271ea18..26496368123b 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_renderer_vulkan_DisplayVk__api.h
@@ -1,4 +1,4 @@
---- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2022-02-07 13:39:41 UTC
+--- third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h.orig 2022-06-17 14:20:10 UTC
+++ third_party/angle/src/libANGLE/renderer/vulkan/DisplayVk_api.h
@@ -23,7 +23,7 @@ bool IsVulkanWin32DisplayAvailable();
DisplayImpl *CreateVulkanWin32Display(const egl::DisplayState &state);
@@ -6,6 +6,6 @@
-#if defined(ANGLE_PLATFORM_LINUX)
+#if defined(ANGLE_PLATFORM_POSIX)
- bool IsVulkanXcbDisplayAvailable();
- DisplayImpl *CreateVulkanXcbDisplay(const egl::DisplayState &state);
+ bool IsVulkanWaylandDisplayAvailable();
+ DisplayImpl *CreateVulkanWaylandDisplay(const egl::DisplayState &state);
diff --git a/www/chromium/files/patch-third__party_angle_util_BUILD.gn b/www/chromium/files/patch-third__party_angle_util_BUILD.gn
index 912f36e8a1d5..d23d124dc8d9 100644
--- a/www/chromium/files/patch-third__party_angle_util_BUILD.gn
+++ b/www/chromium/files/patch-third__party_angle_util_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/angle/util/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- third_party/angle/util/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+++ third_party/angle/util/BUILD.gn
-@@ -203,7 +203,7 @@ foreach(is_shared_library,
+@@ -214,7 +214,7 @@ foreach(is_shared_library,
]
libs = []
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
index 9a1fe95c2fc0..de0a6162817b 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_blink__initializer.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-02-28 16:54:41 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -71,12 +71,12 @@
+@@ -72,12 +72,12 @@
#include "third_party/blink/renderer/controller/oom_intervention_impl.h"
#endif
@@ -15,7 +15,7 @@
#include "third_party/blink/renderer/controller/highest_pmf_reporter.h"
#include "third_party/blink/renderer/controller/user_level_memory_pressure_signal_generator.h"
#endif
-@@ -156,7 +156,7 @@ void InitializeCommon(Platform* platform, mojo::Binder
+@@ -157,7 +157,7 @@ void InitializeCommon(Platform* platform, mojo::Binder
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
@@ -24,7 +24,7 @@
// Initialize UserLevelMemoryPressureSignalGenerator so it starts monitoring.
if (UserLevelMemoryPressureSignalGenerator::Enabled())
UserLevelMemoryPressureSignalGenerator::Instance();
-@@ -227,7 +227,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+@@ -228,7 +228,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
main_thread->GetTaskRunner());
#endif
diff --git a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
index 4cc481597288..4d6ac85cc1bc 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_controller_memory__usage__monitor__posix.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- third_party/blink/renderer/controller/memory_usage_monitor_posix.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/controller/memory_usage_monitor_posix.cc
-@@ -128,15 +128,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() {
+@@ -129,15 +129,17 @@ void MemoryUsageMonitorPosix::ResetFileDescriptors() {
void MemoryUsageMonitorPosix::SetProcFiles(base::File statm_file,
base::File status_file) {
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
index ef31aacc8b56..ff2257f6eaaf 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_exported_web__view__impl.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- third_party/blink/renderer/core/exported/web_view_impl.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
-@@ -405,7 +405,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
+@@ -401,7 +401,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
const blink::RendererPreferences& prefs) {
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
@@ -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'
-@@ -3168,7 +3168,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3187,7 +3187,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/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
index 1b6ec2508e5c..4ef40caac308 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc
@@ -1,15 +1,15 @@
---- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-05-19 14:06:27 UTC
+--- third_party/blink/renderer/core/frame/web_frame_test.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6281,7 +6281,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
- EXPECT_EQ(64, ComputeOffset(layout_object, 1000, 1000));
- }
-
+@@ -6321,7 +6321,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+ MoveCaretStaysHorizontallyAlignedWhenMoved
+ #endif
+ // TODO(crbug.com/1317375): Build these tests on all platforms.
-#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
+#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_BSD)
- TEST_F(WebFrameTest, SelectRangeStaysHorizontallyAlignedWhenMoved) {
+ TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) {
RegisterMockedHttpURLLoad("move_caret.html");
-@@ -6660,7 +6660,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGBasic) {
+@@ -6700,7 +6700,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGBasic) {
TEST_F(CompositedSelectionBoundsTest, SVGTextWithFragments) {
RunTest("composited_selection_bounds_svg_text_with_fragments.html");
}
diff --git a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc b/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
index c7b78f2a0dc7..e3f53f951af8 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_inspector_inspector__memory__agent.cc
+++ b/www/chromium/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-02-28 16:54:41 UTC
+--- third_party/blink/renderer/core/inspector/inspector_memory_agent.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/core/inspector/inspector_memory_agent.cc
-@@ -186,7 +186,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t
+@@ -190,7 +190,7 @@ InspectorMemoryAgent::GetSamplingProfileById(uint32_t
Vector<String> InspectorMemoryAgent::Symbolize(
const WebVector<void*>& addresses) {
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
index 2013dbe181bb..fb15f518017d 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webaudio_audio__worklet__thread__test.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-02-28 16:54:41 UTC
+--- third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/modules/webaudio/audio_worklet_thread_test.cc
-@@ -379,7 +379,7 @@ class AudioWorkletThreadPriorityTest
+@@ -378,7 +378,7 @@ class AudioWorkletThreadPriorityTest
// TODO(crbug.com/1022888): The worklet thread priority is always NORMAL
// on OS_LINUX and OS_CHROMEOS regardless of the thread priority setting.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
index ed4e9bdb1877..c53d7018e08c 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__rendering__context__base.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-05-19 14:06:27 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6057,7 +6057,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6116,7 +6116,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
constexpr bool kAllowZeroCopyImages = true;
#endif
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
index 9c645e03faeb..33e51bdf717a 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_begin__frame__provider.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-05-19 14:06:27 UTC
+--- third_party/blink/renderer/platform/graphics/begin_frame_provider.cc.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/platform/graphics/begin_frame_provider.cc
-@@ -75,7 +75,11 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
+@@ -76,7 +76,11 @@ void BeginFrameProvider::CreateCompositorFrameSinkIfNe
// Once we are using RAF, this thread is driving Display updates. Update
// priority accordingly.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5 b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
index e01df5446310..11525694b769 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json5
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-05-21 05:41:22 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-06-17 14:20:10 UTC
+++ third_party/blink/renderer/platform/runtime_enabled_features.json5
@@ -33,7 +33,7 @@
// shipped stable can have its runtime flag removed soon after.
@@ -9,16 +9,16 @@
},
// "implied_by" or "depends_on" specifies relationship to other features:
-@@ -1098,7 +1098,7 @@
+@@ -1059,7 +1059,7 @@
depends_on: ["FileSystemAccess"],
status: {"Android": "test", "default": "experimental"},
origin_trial_feature_name: "FileHandling",
-- origin_trial_os: ["win", "mac", "linux", "chromeos"],
-+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
},
{
name: "FileHandlingIcons",
-@@ -2366,7 +2366,7 @@
+@@ -2349,7 +2349,7 @@
{
name: "U2FSecurityKeyAPI",
origin_trial_feature_name: "U2FSecurityKeyAPI",
@@ -27,16 +27,16 @@
origin_trial_type: "deprecation",
},
{
-@@ -2385,7 +2385,7 @@
+@@ -2368,7 +2368,7 @@
{
name: "UnrestrictedSharedArrayBuffer",
origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
-- origin_trial_os: ["win", "mac", "linux", "chromeos"],
-+ origin_trial_os: ["win", "mac", "linux", "chromeos", "openbsd", "freebsd"],
+- origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos"],
++ origin_trial_os: ["win", "mac", "linux", "fuchsia", "chromeos", "openbsd", "freebsd"],
},
{
name: "URLPattern",
-@@ -2411,7 +2411,7 @@
+@@ -2394,7 +2394,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.
@@ -45,12 +45,12 @@
},
{
name: "UUID",
-@@ -2537,12 +2537,12 @@
+@@ -2519,12 +2519,12 @@
name: "WebAppUrlHandling",
status: "experimental",
origin_trial_feature_name: "WebAppUrlHandling",
- origin_trial_os: ["win", "mac", "linux"],
-+ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"],
++ origin_trial_os: ["win", "mac", "linux", "openbsd", "freebsd"]
},
{
name: "WebAppWindowControlsOverlay",
diff --git a/www/chromium/files/patch-third__party_dawn_generator_dawn__version__generator.py b/www/chromium/files/patch-third__party_dawn_generator_dawn__version__generator.py
deleted file mode 100644
index e04e2baa6736..000000000000
--- a/www/chromium/files/patch-third__party_dawn_generator_dawn__version__generator.py
+++ /dev/null
@@ -1,22 +0,0 @@
---- third_party/dawn/generator/dawn_version_generator.py.orig 2022-05-21 05:41:22 UTC
-+++ third_party/dawn/generator/dawn_version_generator.py
-@@ -23,11 +23,14 @@ def get_git():
-
-
- def get_gitHash(dawnDir):
-- result = subprocess.run([get_git(), 'rev-parse', 'HEAD'],
-- stdout=subprocess.PIPE,
-- cwd=dawnDir)
-- if result.returncode == 0:
-- return result.stdout.decode('utf-8').strip()
-+ try:
-+ result = subprocess.run([get_git(), "rev-parse", "HEAD"],
-+ stdout=subprocess.PIPE,
-+ cwd=dawnDir)
-+ if result.returncode == 0:
-+ return result.stdout.decode("utf-8").strip()
-+ except Exception:
-+ return ""
- # No hash was available (possibly) because the directory was not a git checkout. Dawn should
- # explicitly handle its absenece and disable features relying on the hash, i.e. caching.
- return ''
diff --git a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
index 5af75de3718d..37eb34697ad1 100644
--- a/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
+++ b/www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h
@@ -1,11 +1,11 @@
---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-03-25 21:59:56 UTC
+--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-06-17 14:20:10 UTC
+++ third_party/dawn/include/dawn/native/VulkanBackend.h
-@@ -69,7 +69,7 @@ namespace dawn::native::vulkan {
- };
+@@ -69,7 +69,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
+ };
// Can't use DAWN_PLATFORM_LINUX since header included in both Dawn and Chrome
-#ifdef __linux__
+#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__)
- // Common properties of external images represented by FDs. On successful import the file
- // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be
+ // Common properties of external images represented by FDs. On successful import the file
+ // descriptor's ownership is transferred to the Dawn implementation and they shouldn't be
diff --git a/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h b/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h
index eb3a113089bc..5a3b25383d0f 100644
--- a/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h
+++ b/www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h
@@ -1,8 +1,8 @@
---- third_party/dawn/src/dawn/common/Platform.h.orig 2022-03-25 21:59:56 UTC
+--- third_party/dawn/src/dawn/common/Platform.h.orig 2022-06-17 14:20:10 UTC
+++ third_party/dawn/src/dawn/common/Platform.h
@@ -26,6 +26,11 @@
- # error "Unsupported Windows platform."
- # endif
+ #error "Unsupported Windows platform."
+ #endif
+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
+# define DAWN_PLATFORM_BSD 1
@@ -10,5 +10,5 @@
+# define DAWN_PLATFORM_POSIX 1
+
#elif defined(__linux__)
- # define DAWN_PLATFORM_LINUX 1
- # define DAWN_PLATFORM_POSIX 1
+ #define DAWN_PLATFORM_LINUX 1
+ #define DAWN_PLATFORM_POSIX 1
diff --git a/www/chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp b/www/chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
index a38aa8527d96..a3f5e58b3437 100644
--- a/www/chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
+++ b/www/chromium/files/patch-third__party_dawn_src_dawn_native_vulkan_BackendVk.cpp
@@ -1,11 +1,11 @@
---- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-03-25 21:59:56 UTC
+--- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-06-17 14:20:10 UTC
+++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp
-@@ -37,7 +37,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha
+@@ -41,7 +41,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha
#endif
#if defined(DAWN_PLATFORM_LINUX)
--# if defined(DAWN_PLATFORM_ANDROID)
-+# if defined(DAWN_PLATFORM_ANDROID) || defined(DAWN_PLATFORM_BSD)
+-#if defined(DAWN_PLATFORM_ANDROID)
++#if defined(DAWN_PLATFORM_ANDROID) || defined(DAWN_PLATFORM_BSD)
constexpr char kVulkanLibName[] = "libvulkan.so";
- # else
+ #else
constexpr char kVulkanLibName[] = "libvulkan.so.1";
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
index d467a05edb6d..057dd911c818 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
+++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.asm
@@ -1,6 +1,6 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2022-05-20 05:38:37 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2022-06-17 14:20:10 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm
-@@ -0,0 +1,720 @@
+@@ -0,0 +1,2770 @@
+; Automatically generated by configure - do not modify!
+%define ARCH_AARCH64 0
+%define ARCH_ALPHA 0
@@ -50,7 +50,6 @@
+%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
@@ -98,7 +97,6 @@
+%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
@@ -146,7 +144,6 @@
+%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
@@ -232,7 +229,7 @@
+%define HAVE_TERMIOS_H 1
+%define HAVE_UDPLITE_H 0
+%define HAVE_UNISTD_H 1
-+%define HAVE_VALGRIND_VALGRIND_H 0 ; %define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440
++%define HAVE_VALGRIND_VALGRIND_H 0
+%define HAVE_WINDOWS_H 0
+%define HAVE_WINSOCK2_H 0
+%define HAVE_INTRINSICS_NEON 0
@@ -280,7 +277,6 @@
+%define HAVE_COMMANDLINETOARGVW 0
+%define HAVE_FCNTL 1
+%define HAVE_GETADDRINFO 0
-+%define HAVE_GETAUXVAL 0
+%define HAVE_GETHRTIME 0
+%define HAVE_GETOPT 1
+%define HAVE_GETMODULEHANDLE 0
@@ -320,7 +316,7 @@
+%define HAVE_SLEEP 0
+%define HAVE_STRERROR_R 1
+%define HAVE_SYSCONF 1
-+%define HAVE_SYSCTL 0
++%define HAVE_SYSCTL 1
+%define HAVE_USLEEP 1
+%define HAVE_UTGETOSTYPEFROMSTRING 0
+%define HAVE_VIRTUALALLOC 0
@@ -566,6 +562,7 @@
+%define CONFIG_VIDEOTOOLBOX 0
+%define CONFIG_VULKAN 0
+%define CONFIG_V4L2_M2M 0
++%define CONFIG_XVMC 0
+%define CONFIG_FTRAPV 0
+%define CONFIG_GRAY 0
+%define CONFIG_HARDCODED_TABLES 0
@@ -597,6 +594,7 @@
+%define CONFIG_FAST_UNALIGNED 1
+%define CONFIG_FFT 1
+%define CONFIG_LSP 0
++%define CONFIG_LZO 0
+%define CONFIG_MDCT 1
+%define CONFIG_PIXELUTILS 0
+%define CONFIG_NETWORK 0
@@ -641,7 +639,6 @@
+%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
@@ -670,7 +667,6 @@
+%define CONFIG_IDCTDSP 0
+%define CONFIG_IIRFILTER 0
+%define CONFIG_MDCT15 1
-+%define CONFIG_INFLATE_WRAPPER 0
+%define CONFIG_INTRAX8 0
+%define CONFIG_ISO_MEDIA 1
+%define CONFIG_IVIDSP 0
@@ -721,3 +717,2057 @@
+%define CONFIG_VP8DSP 1
+%define CONFIG_WMA_FREQS 0
+%define CONFIG_WMV2DSP 0
++%define CONFIG_AAC_ADTSTOASC_BSF 0
++%define CONFIG_AV1_FRAME_MERGE_BSF 0
++%define CONFIG_AV1_FRAME_SPLIT_BSF 0
++%define CONFIG_AV1_METADATA_BSF 0
++%define CONFIG_CHOMP_BSF 0
++%define CONFIG_DUMP_EXTRADATA_BSF 0
++%define CONFIG_DCA_CORE_BSF 0
++%define CONFIG_EAC3_CORE_BSF 0
++%define CONFIG_EXTRACT_EXTRADATA_BSF 0
++%define CONFIG_FILTER_UNITS_BSF 0
++%define CONFIG_H264_METADATA_BSF 0
++%define CONFIG_H264_MP4TOANNEXB_BSF 0
++%define CONFIG_H264_REDUNDANT_PPS_BSF 0
++%define CONFIG_HAPQA_EXTRACT_BSF 0
++%define CONFIG_HEVC_METADATA_BSF 0
++%define CONFIG_HEVC_MP4TOANNEXB_BSF 0
++%define CONFIG_IMX_DUMP_HEADER_BSF 0
++%define CONFIG_MJPEG2JPEG_BSF 0
++%define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
++%define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
++%define CONFIG_MPEG2_METADATA_BSF 0
++%define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
++%define CONFIG_MOV2TEXTSUB_BSF 0
++%define CONFIG_NOISE_BSF 0
++%define CONFIG_NULL_BSF 0
++%define CONFIG_OPUS_METADATA_BSF 0
++%define CONFIG_PCM_RECHUNK_BSF 0
++%define CONFIG_PRORES_METADATA_BSF 0
++%define CONFIG_REMOVE_EXTRADATA_BSF 0
++%define CONFIG_SETTS_BSF 0
++%define CONFIG_TEXT2MOVSUB_BSF 0
++%define CONFIG_TRACE_HEADERS_BSF 0
++%define CONFIG_TRUEHD_CORE_BSF 0
++%define CONFIG_VP9_METADATA_BSF 0
++%define CONFIG_VP9_RAW_REORDER_BSF 0
++%define CONFIG_VP9_SUPERFRAME_BSF 0
++%define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
++%define CONFIG_AASC_DECODER 0
++%define CONFIG_AIC_DECODER 0
++%define CONFIG_ALIAS_PIX_DECODER 0
++%define CONFIG_AGM_DECODER 0
++%define CONFIG_AMV_DECODER 0
++%define CONFIG_ANM_DECODER 0
++%define CONFIG_ANSI_DECODER 0
++%define CONFIG_APNG_DECODER 0
++%define CONFIG_ARBC_DECODER 0
++%define CONFIG_ARGO_DECODER 0
++%define CONFIG_ASV1_DECODER 0
++%define CONFIG_ASV2_DECODER 0
++%define CONFIG_AURA_DECODER 0
++%define CONFIG_AURA2_DECODER 0
++%define CONFIG_AVRP_DECODER 0
++%define CONFIG_AVRN_DECODER 0
++%define CONFIG_AVS_DECODER 0
++%define CONFIG_AVUI_DECODER 0
++%define CONFIG_AYUV_DECODER 0
++%define CONFIG_BETHSOFTVID_DECODER 0
++%define CONFIG_BFI_DECODER 0
++%define CONFIG_BINK_DECODER 0
++%define CONFIG_BITPACKED_DECODER 0
++%define CONFIG_BMP_DECODER 0
++%define CONFIG_BMV_VIDEO_DECODER 0
++%define CONFIG_BRENDER_PIX_DECODER 0
++%define CONFIG_C93_DECODER 0
++%define CONFIG_CAVS_DECODER 0
++%define CONFIG_CDGRAPHICS_DECODER 0
++%define CONFIG_CDTOONS_DECODER 0
++%define CONFIG_CDXL_DECODER 0
++%define CONFIG_CFHD_DECODER 0
++%define CONFIG_CINEPAK_DECODER 0
++%define CONFIG_CLEARVIDEO_DECODER 0
++%define CONFIG_CLJR_DECODER 0
++%define CONFIG_CLLC_DECODER 0
++%define CONFIG_COMFORTNOISE_DECODER 0
++%define CONFIG_CPIA_DECODER 0
++%define CONFIG_CRI_DECODER 0
++%define CONFIG_CSCD_DECODER 0
++%define CONFIG_CYUV_DECODER 0
++%define CONFIG_DDS_DECODER 0
++%define CONFIG_DFA_DECODER 0
++%define CONFIG_DIRAC_DECODER 0
++%define CONFIG_DNXHD_DECODER 0
++%define CONFIG_DPX_DECODER 0
++%define CONFIG_DSICINVIDEO_DECODER 0
++%define CONFIG_DVAUDIO_DECODER 0
++%define CONFIG_DVVIDEO_DECODER 0
++%define CONFIG_DXA_DECODER 0
++%define CONFIG_DXTORY_DECODER 0
++%define CONFIG_DXV_DECODER 0
++%define CONFIG_EACMV_DECODER 0
++%define CONFIG_EAMAD_DECODER 0
++%define CONFIG_EATGQ_DECODER 0
++%define CONFIG_EATGV_DECODER 0
++%define CONFIG_EATQI_DECODER 0
++%define CONFIG_EIGHTBPS_DECODER 0
++%define CONFIG_EIGHTSVX_EXP_DECODER 0
++%define CONFIG_EIGHTSVX_FIB_DECODER 0
++%define CONFIG_ESCAPE124_DECODER 0
++%define CONFIG_ESCAPE130_DECODER 0
++%define CONFIG_EXR_DECODER 0
++%define CONFIG_FFV1_DECODER 0
++%define CONFIG_FFVHUFF_DECODER 0
++%define CONFIG_FIC_DECODER 0
++%define CONFIG_FITS_DECODER 0
++%define CONFIG_FLASHSV_DECODER 0
++%define CONFIG_FLASHSV2_DECODER 0
++%define CONFIG_FLIC_DECODER 0
++%define CONFIG_FLV_DECODER 0
++%define CONFIG_FMVC_DECODER 0
++%define CONFIG_FOURXM_DECODER 0
++%define CONFIG_FRAPS_DECODER 0
++%define CONFIG_FRWU_DECODER 0
++%define CONFIG_G2M_DECODER 0
++%define CONFIG_GDV_DECODER 0
++%define CONFIG_GEM_DECODER 0
++%define CONFIG_GIF_DECODER 0
++%define CONFIG_H261_DECODER 0
++%define CONFIG_H263_DECODER 0
++%define CONFIG_H263I_DECODER 0
++%define CONFIG_H263P_DECODER 0
++%define CONFIG_H263_V4L2M2M_DECODER 0
++%define CONFIG_H264_DECODER 1
++%define CONFIG_H264_CRYSTALHD_DECODER 0
++%define CONFIG_H264_V4L2M2M_DECODER 0
++%define CONFIG_H264_MEDIACODEC_DECODER 0
++%define CONFIG_H264_MMAL_DECODER 0
++%define CONFIG_H264_QSV_DECODER 0
++%define CONFIG_H264_RKMPP_DECODER 0
++%define CONFIG_HAP_DECODER 0
++%define CONFIG_HEVC_DECODER 0
++%define CONFIG_HEVC_QSV_DECODER 0
++%define CONFIG_HEVC_RKMPP_DECODER 0
++%define CONFIG_HEVC_V4L2M2M_DECODER 0
++%define CONFIG_HNM4_VIDEO_DECODER 0
++%define CONFIG_HQ_HQA_DECODER 0
++%define CONFIG_HQX_DECODER 0
++%define CONFIG_HUFFYUV_DECODER 0
++%define CONFIG_HYMT_DECODER 0
++%define CONFIG_IDCIN_DECODER 0
++%define CONFIG_IFF_ILBM_DECODER 0
++%define CONFIG_IMM4_DECODER 0
++%define CONFIG_IMM5_DECODER 0
++%define CONFIG_INDEO2_DECODER 0
++%define CONFIG_INDEO3_DECODER 0
++%define CONFIG_INDEO4_DECODER 0
++%define CONFIG_INDEO5_DECODER 0
++%define CONFIG_INTERPLAY_VIDEO_DECODER 0
++%define CONFIG_IPU_DECODER 0
++%define CONFIG_JPEG2000_DECODER 0
++%define CONFIG_JPEGLS_DECODER 0
++%define CONFIG_JV_DECODER 0
++%define CONFIG_KGV1_DECODER 0
++%define CONFIG_KMVC_DECODER 0
++%define CONFIG_LAGARITH_DECODER 0
++%define CONFIG_LOCO_DECODER 0
++%define CONFIG_LSCR_DECODER 0
++%define CONFIG_M101_DECODER 0
++%define CONFIG_MAGICYUV_DECODER 0
++%define CONFIG_MDEC_DECODER 0
++%define CONFIG_MIMIC_DECODER 0
++%define CONFIG_MJPEG_DECODER 0
++%define CONFIG_MJPEGB_DECODER 0
++%define CONFIG_MMVIDEO_DECODER 0
++%define CONFIG_MOBICLIP_DECODER 0
++%define CONFIG_MOTIONPIXELS_DECODER 0
++%define CONFIG_MPEG1VIDEO_DECODER 0
++%define CONFIG_MPEG2VIDEO_DECODER 0
++%define CONFIG_MPEG4_DECODER 0
++%define CONFIG_MPEG4_CRYSTALHD_DECODER 0
++%define CONFIG_MPEG4_V4L2M2M_DECODER 0
++%define CONFIG_MPEG4_MMAL_DECODER 0
++%define CONFIG_MPEGVIDEO_DECODER 0
++%define CONFIG_MPEG1_V4L2M2M_DECODER 0
++%define CONFIG_MPEG2_MMAL_DECODER 0
++%define CONFIG_MPEG2_CRYSTALHD_DECODER 0
++%define CONFIG_MPEG2_V4L2M2M_DECODER 0
++%define CONFIG_MPEG2_QSV_DECODER 0
++%define CONFIG_MPEG2_MEDIACODEC_DECODER 0
++%define CONFIG_MSA1_DECODER 0
++%define CONFIG_MSCC_DECODER 0
++%define CONFIG_MSMPEG4V1_DECODER 0
++%define CONFIG_MSMPEG4V2_DECODER 0
++%define CONFIG_MSMPEG4V3_DECODER 0
++%define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
++%define CONFIG_MSP2_DECODER 0
++%define CONFIG_MSRLE_DECODER 0
++%define CONFIG_MSS1_DECODER 0
++%define CONFIG_MSS2_DECODER 0
++%define CONFIG_MSVIDEO1_DECODER 0
++%define CONFIG_MSZH_DECODER 0
++%define CONFIG_MTS2_DECODER 0
++%define CONFIG_MV30_DECODER 0
++%define CONFIG_MVC1_DECODER 0
++%define CONFIG_MVC2_DECODER 0
++%define CONFIG_MVDV_DECODER 0
++%define CONFIG_MVHA_DECODER 0
++%define CONFIG_MWSC_DECODER 0
++%define CONFIG_MXPEG_DECODER 0
++%define CONFIG_NOTCHLC_DECODER 0
++%define CONFIG_NUV_DECODER 0
++%define CONFIG_PAF_VIDEO_DECODER 0
++%define CONFIG_PAM_DECODER 0
++%define CONFIG_PBM_DECODER 0
++%define CONFIG_PCX_DECODER 0
++%define CONFIG_PFM_DECODER 0
++%define CONFIG_PGM_DECODER 0
++%define CONFIG_PGMYUV_DECODER 0
++%define CONFIG_PGX_DECODER 0
++%define CONFIG_PHOTOCD_DECODER 0
++%define CONFIG_PICTOR_DECODER 0
++%define CONFIG_PIXLET_DECODER 0
++%define CONFIG_PNG_DECODER 0
++%define CONFIG_PPM_DECODER 0
++%define CONFIG_PRORES_DECODER 0
++%define CONFIG_PROSUMER_DECODER 0
++%define CONFIG_PSD_DECODER 0
++%define CONFIG_PTX_DECODER 0
++%define CONFIG_QDRAW_DECODER 0
++%define CONFIG_QPEG_DECODER 0
++%define CONFIG_QTRLE_DECODER 0
++%define CONFIG_R10K_DECODER 0
++%define CONFIG_R210_DECODER 0
++%define CONFIG_RASC_DECODER 0
++%define CONFIG_RAWVIDEO_DECODER 0
++%define CONFIG_RL2_DECODER 0
++%define CONFIG_ROQ_DECODER 0
++%define CONFIG_RPZA_DECODER 0
++%define CONFIG_RSCC_DECODER 0
++%define CONFIG_RV10_DECODER 0
++%define CONFIG_RV20_DECODER 0
++%define CONFIG_RV30_DECODER 0
++%define CONFIG_RV40_DECODER 0
++%define CONFIG_S302M_DECODER 0
++%define CONFIG_SANM_DECODER 0
++%define CONFIG_SCPR_DECODER 0
++%define CONFIG_SCREENPRESSO_DECODER 0
++%define CONFIG_SGA_DECODER 0
++%define CONFIG_SGI_DECODER 0
++%define CONFIG_SGIRLE_DECODER 0
++%define CONFIG_SHEERVIDEO_DECODER 0
++%define CONFIG_SIMBIOSIS_IMX_DECODER 0
++%define CONFIG_SMACKER_DECODER 0
++%define CONFIG_SMC_DECODER 0
++%define CONFIG_SMVJPEG_DECODER 0
++%define CONFIG_SNOW_DECODER 0
++%define CONFIG_SP5X_DECODER 0
++%define CONFIG_SPEEDHQ_DECODER 0
++%define CONFIG_SPEEX_DECODER 0
++%define CONFIG_SRGC_DECODER 0
++%define CONFIG_SUNRAST_DECODER 0
++%define CONFIG_SVQ1_DECODER 0
++%define CONFIG_SVQ3_DECODER 0
++%define CONFIG_TARGA_DECODER 0
++%define CONFIG_TARGA_Y216_DECODER 0
++%define CONFIG_TDSC_DECODER 0
++%define CONFIG_THEORA_DECODER 1
++%define CONFIG_THP_DECODER 0
++%define CONFIG_TIERTEXSEQVIDEO_DECODER 0
++%define CONFIG_TIFF_DECODER 0
++%define CONFIG_TMV_DECODER 0
++%define CONFIG_TRUEMOTION1_DECODER 0
++%define CONFIG_TRUEMOTION2_DECODER 0
++%define CONFIG_TRUEMOTION2RT_DECODER 0
++%define CONFIG_TSCC_DECODER 0
++%define CONFIG_TSCC2_DECODER 0
++%define CONFIG_TXD_DECODER 0
++%define CONFIG_ULTI_DECODER 0
++%define CONFIG_UTVIDEO_DECODER 0
++%define CONFIG_V210_DECODER 0
++%define CONFIG_V210X_DECODER 0
++%define CONFIG_V308_DECODER 0
++%define CONFIG_V408_DECODER 0
++%define CONFIG_V410_DECODER 0
++%define CONFIG_VB_DECODER 0
++%define CONFIG_VBLE_DECODER 0
++%define CONFIG_VC1_DECODER 0
++%define CONFIG_VC1_CRYSTALHD_DECODER 0
++%define CONFIG_VC1IMAGE_DECODER 0
++%define CONFIG_VC1_MMAL_DECODER 0
++%define CONFIG_VC1_QSV_DECODER 0
++%define CONFIG_VC1_V4L2M2M_DECODER 0
++%define CONFIG_VCR1_DECODER 0
++%define CONFIG_VMDVIDEO_DECODER 0
++%define CONFIG_VMNC_DECODER 0
++%define CONFIG_VP3_DECODER 1
++%define CONFIG_VP4_DECODER 0
++%define CONFIG_VP5_DECODER 0
++%define CONFIG_VP6_DECODER 0
++%define CONFIG_VP6A_DECODER 0
++%define CONFIG_VP6F_DECODER 0
++%define CONFIG_VP7_DECODER 0
++%define CONFIG_VP8_DECODER 1
++%define CONFIG_VP8_RKMPP_DECODER 0
++%define CONFIG_VP8_V4L2M2M_DECODER 0
++%define CONFIG_VP9_DECODER 0
++%define CONFIG_VP9_RKMPP_DECODER 0
++%define CONFIG_VP9_V4L2M2M_DECODER 0
++%define CONFIG_VQA_DECODER 0
++%define CONFIG_WEBP_DECODER 0
++%define CONFIG_WCMV_DECODER 0
++%define CONFIG_WRAPPED_AVFRAME_DECODER 0
++%define CONFIG_WMV1_DECODER 0
++%define CONFIG_WMV2_DECODER 0
++%define CONFIG_WMV3_DECODER 0
++%define CONFIG_WMV3_CRYSTALHD_DECODER 0
++%define CONFIG_WMV3IMAGE_DECODER 0
++%define CONFIG_WNV1_DECODER 0
++%define CONFIG_XAN_WC3_DECODER 0
++%define CONFIG_XAN_WC4_DECODER 0
++%define CONFIG_XBM_DECODER 0
++%define CONFIG_XFACE_DECODER 0
++%define CONFIG_XL_DECODER 0
++%define CONFIG_XPM_DECODER 0
++%define CONFIG_XWD_DECODER 0
++%define CONFIG_Y41P_DECODER 0
++%define CONFIG_YLC_DECODER 0
++%define CONFIG_YOP_DECODER 0
++%define CONFIG_YUV4_DECODER 0
++%define CONFIG_ZERO12V_DECODER 0
++%define CONFIG_ZEROCODEC_DECODER 0
++%define CONFIG_ZLIB_DECODER 0
++%define CONFIG_ZMBV_DECODER 0
++%define CONFIG_AAC_DECODER 1
++%define CONFIG_AAC_FIXED_DECODER 0
++%define CONFIG_AAC_LATM_DECODER 0
++%define CONFIG_AC3_DECODER 0
++%define CONFIG_AC3_FIXED_DECODER 0
++%define CONFIG_ACELP_KELVIN_DECODER 0
++%define CONFIG_ALAC_DECODER 0
++%define CONFIG_ALS_DECODER 0
++%define CONFIG_AMRNB_DECODER 0
++%define CONFIG_AMRWB_DECODER 0
++%define CONFIG_APE_DECODER 0
++%define CONFIG_APTX_DECODER 0
++%define CONFIG_APTX_HD_DECODER 0
++%define CONFIG_ATRAC1_DECODER 0
++%define CONFIG_ATRAC3_DECODER 0
++%define CONFIG_ATRAC3AL_DECODER 0
++%define CONFIG_ATRAC3P_DECODER 0
++%define CONFIG_ATRAC3PAL_DECODER 0
++%define CONFIG_ATRAC9_DECODER 0
++%define CONFIG_BINKAUDIO_DCT_DECODER 0
++%define CONFIG_BINKAUDIO_RDFT_DECODER 0
++%define CONFIG_BMV_AUDIO_DECODER 0
++%define CONFIG_COOK_DECODER 0
++%define CONFIG_DCA_DECODER 0
++%define CONFIG_DOLBY_E_DECODER 0
++%define CONFIG_DSD_LSBF_DECODER 0
++%define CONFIG_DSD_MSBF_DECODER 0
++%define CONFIG_DSD_LSBF_PLANAR_DECODER 0
++%define CONFIG_DSD_MSBF_PLANAR_DECODER 0
++%define CONFIG_DSICINAUDIO_DECODER 0
++%define CONFIG_DSS_SP_DECODER 0
++%define CONFIG_DST_DECODER 0
++%define CONFIG_EAC3_DECODER 0
++%define CONFIG_EVRC_DECODER 0
++%define CONFIG_FASTAUDIO_DECODER 0
++%define CONFIG_FFWAVESYNTH_DECODER 0
++%define CONFIG_FLAC_DECODER 1
++%define CONFIG_G723_1_DECODER 0
++%define CONFIG_G729_DECODER 0
++%define CONFIG_GSM_DECODER 0
++%define CONFIG_GSM_MS_DECODER 0
++%define CONFIG_HCA_DECODER 0
++%define CONFIG_HCOM_DECODER 0
++%define CONFIG_IAC_DECODER 0
++%define CONFIG_ILBC_DECODER 0
++%define CONFIG_IMC_DECODER 0
++%define CONFIG_INTERPLAY_ACM_DECODER 0
++%define CONFIG_MACE3_DECODER 0
++%define CONFIG_MACE6_DECODER 0
++%define CONFIG_METASOUND_DECODER 0
++%define CONFIG_MLP_DECODER 0
++%define CONFIG_MP1_DECODER 0
++%define CONFIG_MP1FLOAT_DECODER 0
++%define CONFIG_MP2_DECODER 0
++%define CONFIG_MP2FLOAT_DECODER 0
++%define CONFIG_MP3FLOAT_DECODER 0
++%define CONFIG_MP3_DECODER 1
++%define CONFIG_MP3ADUFLOAT_DECODER 0
++%define CONFIG_MP3ADU_DECODER 0
++%define CONFIG_MP3ON4FLOAT_DECODER 0
++%define CONFIG_MP3ON4_DECODER 0
++%define CONFIG_MPC7_DECODER 0
++%define CONFIG_MPC8_DECODER 0
++%define CONFIG_MSNSIREN_DECODER 0
++%define CONFIG_NELLYMOSER_DECODER 0
++%define CONFIG_ON2AVC_DECODER 0
++%define CONFIG_OPUS_DECODER 0
++%define CONFIG_PAF_AUDIO_DECODER 0
++%define CONFIG_QCELP_DECODER 0
++%define CONFIG_QDM2_DECODER 0
++%define CONFIG_QDMC_DECODER 0
++%define CONFIG_RA_144_DECODER 0
++%define CONFIG_RA_288_DECODER 0
++%define CONFIG_RALF_DECODER 0
++%define CONFIG_SBC_DECODER 0
++%define CONFIG_SHORTEN_DECODER 0
++%define CONFIG_SIPR_DECODER 0
++%define CONFIG_SIREN_DECODER 0
++%define CONFIG_SMACKAUD_DECODER 0
++%define CONFIG_SONIC_DECODER 0
++%define CONFIG_TAK_DECODER 0
++%define CONFIG_TRUEHD_DECODER 0
++%define CONFIG_TRUESPEECH_DECODER 0
++%define CONFIG_TTA_DECODER 0
++%define CONFIG_TWINVQ_DECODER 0
++%define CONFIG_VMDAUDIO_DECODER 0
++%define CONFIG_VORBIS_DECODER 1
++%define CONFIG_WAVPACK_DECODER 0
++%define CONFIG_WMALOSSLESS_DECODER 0
++%define CONFIG_WMAPRO_DECODER 0
++%define CONFIG_WMAV1_DECODER 0
++%define CONFIG_WMAV2_DECODER 0
++%define CONFIG_WMAVOICE_DECODER 0
++%define CONFIG_WS_SND1_DECODER 0
++%define CONFIG_XMA1_DECODER 0
++%define CONFIG_XMA2_DECODER 0
++%define CONFIG_PCM_ALAW_DECODER 1
++%define CONFIG_PCM_BLURAY_DECODER 0
++%define CONFIG_PCM_DVD_DECODER 0
++%define CONFIG_PCM_F16LE_DECODER 0
++%define CONFIG_PCM_F24LE_DECODER 0
++%define CONFIG_PCM_F32BE_DECODER 0
++%define CONFIG_PCM_F32LE_DECODER 1
++%define CONFIG_PCM_F64BE_DECODER 0
++%define CONFIG_PCM_F64LE_DECODER 0
++%define CONFIG_PCM_LXF_DECODER 0
++%define CONFIG_PCM_MULAW_DECODER 1
++%define CONFIG_PCM_S8_DECODER 0
++%define CONFIG_PCM_S8_PLANAR_DECODER 0
++%define CONFIG_PCM_S16BE_DECODER 1
++%define CONFIG_PCM_S16BE_PLANAR_DECODER 0
++%define CONFIG_PCM_S16LE_DECODER 1
++%define CONFIG_PCM_S16LE_PLANAR_DECODER 0
++%define CONFIG_PCM_S24BE_DECODER 1
++%define CONFIG_PCM_S24DAUD_DECODER 0
++%define CONFIG_PCM_S24LE_DECODER 1
++%define CONFIG_PCM_S24LE_PLANAR_DECODER 0
++%define CONFIG_PCM_S32BE_DECODER 0
++%define CONFIG_PCM_S32LE_DECODER 1
++%define CONFIG_PCM_S32LE_PLANAR_DECODER 0
++%define CONFIG_PCM_S64BE_DECODER 0
++%define CONFIG_PCM_S64LE_DECODER 0
++%define CONFIG_PCM_SGA_DECODER 0
++%define CONFIG_PCM_U8_DECODER 1
++%define CONFIG_PCM_U16BE_DECODER 0
++%define CONFIG_PCM_U16LE_DECODER 0
++%define CONFIG_PCM_U24BE_DECODER 0
++%define CONFIG_PCM_U24LE_DECODER 0
++%define CONFIG_PCM_U32BE_DECODER 0
++%define CONFIG_PCM_U32LE_DECODER 0
++%define CONFIG_PCM_VIDC_DECODER 0
++%define CONFIG_DERF_DPCM_DECODER 0
++%define CONFIG_GREMLIN_DPCM_DECODER 0
++%define CONFIG_INTERPLAY_DPCM_DECODER 0
++%define CONFIG_ROQ_DPCM_DECODER 0
++%define CONFIG_SDX2_DPCM_DECODER 0
++%define CONFIG_SOL_DPCM_DECODER 0
++%define CONFIG_XAN_DPCM_DECODER 0
++%define CONFIG_ADPCM_4XM_DECODER 0
++%define CONFIG_ADPCM_ADX_DECODER 0
++%define CONFIG_ADPCM_AFC_DECODER 0
++%define CONFIG_ADPCM_AGM_DECODER 0
++%define CONFIG_ADPCM_AICA_DECODER 0
++%define CONFIG_ADPCM_ARGO_DECODER 0
++%define CONFIG_ADPCM_CT_DECODER 0
++%define CONFIG_ADPCM_DTK_DECODER 0
++%define CONFIG_ADPCM_EA_DECODER 0
++%define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
++%define CONFIG_ADPCM_EA_R1_DECODER 0
++%define CONFIG_ADPCM_EA_R2_DECODER 0
++%define CONFIG_ADPCM_EA_R3_DECODER 0
++%define CONFIG_ADPCM_EA_XAS_DECODER 0
++%define CONFIG_ADPCM_G722_DECODER 0
++%define CONFIG_ADPCM_G726_DECODER 0
++%define CONFIG_ADPCM_G726LE_DECODER 0
++%define CONFIG_ADPCM_IMA_ACORN_DECODER 0
++%define CONFIG_ADPCM_IMA_AMV_DECODER 0
++%define CONFIG_ADPCM_IMA_ALP_DECODER 0
++%define CONFIG_ADPCM_IMA_APC_DECODER 0
++%define CONFIG_ADPCM_IMA_APM_DECODER 0
++%define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
++%define CONFIG_ADPCM_IMA_DAT4_DECODER 0
++%define CONFIG_ADPCM_IMA_DK3_DECODER 0
++%define CONFIG_ADPCM_IMA_DK4_DECODER 0
++%define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
++%define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
++%define CONFIG_ADPCM_IMA_ISS_DECODER 0
++%define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
++%define CONFIG_ADPCM_IMA_MTF_DECODER 0
++%define CONFIG_ADPCM_IMA_OKI_DECODER 0
++%define CONFIG_ADPCM_IMA_QT_DECODER 0
++%define CONFIG_ADPCM_IMA_RAD_DECODER 0
++%define CONFIG_ADPCM_IMA_SSI_DECODER 0
++%define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
++%define CONFIG_ADPCM_IMA_WAV_DECODER 0
++%define CONFIG_ADPCM_IMA_WS_DECODER 0
++%define CONFIG_ADPCM_MS_DECODER 0
++%define CONFIG_ADPCM_MTAF_DECODER 0
++%define CONFIG_ADPCM_PSX_DECODER 0
++%define CONFIG_ADPCM_SBPRO_2_DECODER 0
++%define CONFIG_ADPCM_SBPRO_3_DECODER 0
++%define CONFIG_ADPCM_SBPRO_4_DECODER 0
++%define CONFIG_ADPCM_SWF_DECODER 0
++%define CONFIG_ADPCM_THP_DECODER 0
++%define CONFIG_ADPCM_THP_LE_DECODER 0
++%define CONFIG_ADPCM_VIMA_DECODER 0
++%define CONFIG_ADPCM_XA_DECODER 0
++%define CONFIG_ADPCM_YAMAHA_DECODER 0
++%define CONFIG_ADPCM_ZORK_DECODER 0
++%define CONFIG_SSA_DECODER 0
++%define CONFIG_ASS_DECODER 0
++%define CONFIG_CCAPTION_DECODER 0
++%define CONFIG_DVBSUB_DECODER 0
++%define CONFIG_DVDSUB_DECODER 0
++%define CONFIG_JACOSUB_DECODER 0
++%define CONFIG_MICRODVD_DECODER 0
++%define CONFIG_MOVTEXT_DECODER 0
++%define CONFIG_MPL2_DECODER 0
++%define CONFIG_PGSSUB_DECODER 0
++%define CONFIG_PJS_DECODER 0
++%define CONFIG_REALTEXT_DECODER 0
++%define CONFIG_SAMI_DECODER 0
++%define CONFIG_SRT_DECODER 0
++%define CONFIG_STL_DECODER 0
++%define CONFIG_SUBRIP_DECODER 0
++%define CONFIG_SUBVIEWER_DECODER 0
++%define CONFIG_SUBVIEWER1_DECODER 0
++%define CONFIG_TEXT_DECODER 0
++%define CONFIG_VPLAYER_DECODER 0
++%define CONFIG_WEBVTT_DECODER 0
++%define CONFIG_XSUB_DECODER 0
++%define CONFIG_AAC_AT_DECODER 0
++%define CONFIG_AC3_AT_DECODER 0
++%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
++%define CONFIG_ALAC_AT_DECODER 0
++%define CONFIG_AMR_NB_AT_DECODER 0
++%define CONFIG_EAC3_AT_DECODER 0
++%define CONFIG_GSM_MS_AT_DECODER 0
++%define CONFIG_ILBC_AT_DECODER 0
++%define CONFIG_MP1_AT_DECODER 0
++%define CONFIG_MP2_AT_DECODER 0
++%define CONFIG_MP3_AT_DECODER 0
++%define CONFIG_PCM_ALAW_AT_DECODER 0
++%define CONFIG_PCM_MULAW_AT_DECODER 0
++%define CONFIG_QDMC_AT_DECODER 0
++%define CONFIG_QDM2_AT_DECODER 0
++%define CONFIG_LIBARIBB24_DECODER 0
++%define CONFIG_LIBCELT_DECODER 0
++%define CONFIG_LIBCODEC2_DECODER 0
++%define CONFIG_LIBDAV1D_DECODER 0
++%define CONFIG_LIBDAVS2_DECODER 0
++%define CONFIG_LIBFDK_AAC_DECODER 0
++%define CONFIG_LIBGSM_DECODER 0
++%define CONFIG_LIBGSM_MS_DECODER 0
++%define CONFIG_LIBILBC_DECODER 0
++%define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
++%define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
++%define CONFIG_LIBOPENJPEG_DECODER 0
++%define CONFIG_LIBOPUS_DECODER 1
++%define CONFIG_LIBRSVG_DECODER 0
++%define CONFIG_LIBSPEEX_DECODER 0
++%define CONFIG_LIBUAVS3D_DECODER 0
++%define CONFIG_LIBVORBIS_DECODER 0
++%define CONFIG_LIBVPX_VP8_DECODER 0
++%define CONFIG_LIBVPX_VP9_DECODER 0
++%define CONFIG_LIBZVBI_TELETEXT_DECODER 0
++%define CONFIG_BINTEXT_DECODER 0
++%define CONFIG_XBIN_DECODER 0
++%define CONFIG_IDF_DECODER 0
++%define CONFIG_LIBAOM_AV1_DECODER 0
++%define CONFIG_AV1_DECODER 0
++%define CONFIG_AV1_CUVID_DECODER 0
++%define CONFIG_AV1_QSV_DECODER 0
++%define CONFIG_LIBOPENH264_DECODER 0
++%define CONFIG_H264_CUVID_DECODER 0
++%define CONFIG_HEVC_CUVID_DECODER 0
++%define CONFIG_HEVC_MEDIACODEC_DECODER 0
++%define CONFIG_MJPEG_CUVID_DECODER 0
++%define CONFIG_MJPEG_QSV_DECODER 0
++%define CONFIG_MPEG1_CUVID_DECODER 0
++%define CONFIG_MPEG2_CUVID_DECODER 0
++%define CONFIG_MPEG4_CUVID_DECODER 0
++%define CONFIG_MPEG4_MEDIACODEC_DECODER 0
++%define CONFIG_VC1_CUVID_DECODER 0
++%define CONFIG_VP8_CUVID_DECODER 0
++%define CONFIG_VP8_MEDIACODEC_DECODER 0
++%define CONFIG_VP8_QSV_DECODER 0
++%define CONFIG_VP9_CUVID_DECODER 0
++%define CONFIG_VP9_MEDIACODEC_DECODER 0
++%define CONFIG_VP9_QSV_DECODER 0
++%define CONFIG_A64MULTI_ENCODER 0
++%define CONFIG_A64MULTI5_ENCODER 0
++%define CONFIG_ALIAS_PIX_ENCODER 0
++%define CONFIG_AMV_ENCODER 0
++%define CONFIG_APNG_ENCODER 0
++%define CONFIG_ASV1_ENCODER 0
++%define CONFIG_ASV2_ENCODER 0
++%define CONFIG_AVRP_ENCODER 0
++%define CONFIG_AVUI_ENCODER 0
++%define CONFIG_AYUV_ENCODER 0
++%define CONFIG_BITPACKED_ENCODER 0
++%define CONFIG_BMP_ENCODER 0
++%define CONFIG_CFHD_ENCODER 0
++%define CONFIG_CINEPAK_ENCODER 0
++%define CONFIG_CLJR_ENCODER 0
++%define CONFIG_COMFORTNOISE_ENCODER 0
++%define CONFIG_DNXHD_ENCODER 0
++%define CONFIG_DPX_ENCODER 0
++%define CONFIG_DVVIDEO_ENCODER 0
++%define CONFIG_EXR_ENCODER 0
++%define CONFIG_FFV1_ENCODER 0
++%define CONFIG_FFVHUFF_ENCODER 0
++%define CONFIG_FITS_ENCODER 0
++%define CONFIG_FLASHSV_ENCODER 0
++%define CONFIG_FLASHSV2_ENCODER 0
++%define CONFIG_FLV_ENCODER 0
++%define CONFIG_GIF_ENCODER 0
++%define CONFIG_H261_ENCODER 0
++%define CONFIG_H263_ENCODER 0
++%define CONFIG_H263P_ENCODER 0
++%define CONFIG_HAP_ENCODER 0
++%define CONFIG_HUFFYUV_ENCODER 0
++%define CONFIG_JPEG2000_ENCODER 0
++%define CONFIG_JPEGLS_ENCODER 0
++%define CONFIG_LJPEG_ENCODER 0
++%define CONFIG_MAGICYUV_ENCODER 0
++%define CONFIG_MJPEG_ENCODER 0
++%define CONFIG_MPEG1VIDEO_ENCODER 0
++%define CONFIG_MPEG2VIDEO_ENCODER 0
++%define CONFIG_MPEG4_ENCODER 0
++%define CONFIG_MSMPEG4V2_ENCODER 0
++%define CONFIG_MSMPEG4V3_ENCODER 0
++%define CONFIG_MSVIDEO1_ENCODER 0
++%define CONFIG_PAM_ENCODER 0
++%define CONFIG_PBM_ENCODER 0
++%define CONFIG_PCX_ENCODER 0
++%define CONFIG_PFM_ENCODER 0
++%define CONFIG_PGM_ENCODER 0
++%define CONFIG_PGMYUV_ENCODER 0
++%define CONFIG_PNG_ENCODER 0
++%define CONFIG_PPM_ENCODER 0
++%define CONFIG_PRORES_ENCODER 0
++%define CONFIG_PRORES_AW_ENCODER 0
++%define CONFIG_PRORES_KS_ENCODER 0
++%define CONFIG_QTRLE_ENCODER 0
++%define CONFIG_R10K_ENCODER 0
++%define CONFIG_R210_ENCODER 0
++%define CONFIG_RAWVIDEO_ENCODER 0
++%define CONFIG_ROQ_ENCODER 0
++%define CONFIG_RPZA_ENCODER 0
++%define CONFIG_RV10_ENCODER 0
++%define CONFIG_RV20_ENCODER 0
++%define CONFIG_S302M_ENCODER 0
++%define CONFIG_SGI_ENCODER 0
++%define CONFIG_SMC_ENCODER 0
++%define CONFIG_SNOW_ENCODER 0
++%define CONFIG_SPEEDHQ_ENCODER 0
++%define CONFIG_SUNRAST_ENCODER 0
++%define CONFIG_SVQ1_ENCODER 0
++%define CONFIG_TARGA_ENCODER 0
++%define CONFIG_TIFF_ENCODER 0
++%define CONFIG_UTVIDEO_ENCODER 0
++%define CONFIG_V210_ENCODER 0
++%define CONFIG_V308_ENCODER 0
++%define CONFIG_V408_ENCODER 0
++%define CONFIG_V410_ENCODER 0
++%define CONFIG_VC2_ENCODER 0
++%define CONFIG_WRAPPED_AVFRAME_ENCODER 0
++%define CONFIG_WMV1_ENCODER 0
++%define CONFIG_WMV2_ENCODER 0
++%define CONFIG_XBM_ENCODER 0
++%define CONFIG_XFACE_ENCODER 0
++%define CONFIG_XWD_ENCODER 0
++%define CONFIG_Y41P_ENCODER 0
++%define CONFIG_YUV4_ENCODER 0
++%define CONFIG_ZLIB_ENCODER 0
++%define CONFIG_ZMBV_ENCODER 0
++%define CONFIG_AAC_ENCODER 0
++%define CONFIG_AC3_ENCODER 0
++%define CONFIG_AC3_FIXED_ENCODER 0
++%define CONFIG_ALAC_ENCODER 0
++%define CONFIG_APTX_ENCODER 0
++%define CONFIG_APTX_HD_ENCODER 0
++%define CONFIG_DCA_ENCODER 0
++%define CONFIG_EAC3_ENCODER 0
++%define CONFIG_FLAC_ENCODER 0
++%define CONFIG_G723_1_ENCODER 0
++%define CONFIG_MLP_ENCODER 0
++%define CONFIG_MP2_ENCODER 0
++%define CONFIG_MP2FIXED_ENCODER 0
++%define CONFIG_NELLYMOSER_ENCODER 0
++%define CONFIG_OPUS_ENCODER 0
++%define CONFIG_RA_144_ENCODER 0
++%define CONFIG_SBC_ENCODER 0
++%define CONFIG_SONIC_ENCODER 0
++%define CONFIG_SONIC_LS_ENCODER 0
++%define CONFIG_TRUEHD_ENCODER 0
++%define CONFIG_TTA_ENCODER 0
++%define CONFIG_VORBIS_ENCODER 0
++%define CONFIG_WAVPACK_ENCODER 0
++%define CONFIG_WMAV1_ENCODER 0
++%define CONFIG_WMAV2_ENCODER 0
++%define CONFIG_PCM_ALAW_ENCODER 0
++%define CONFIG_PCM_DVD_ENCODER 0
++%define CONFIG_PCM_F32BE_ENCODER 0
++%define CONFIG_PCM_F32LE_ENCODER 0
++%define CONFIG_PCM_F64BE_ENCODER 0
++%define CONFIG_PCM_F64LE_ENCODER 0
++%define CONFIG_PCM_MULAW_ENCODER 0
++%define CONFIG_PCM_S8_ENCODER 0
++%define CONFIG_PCM_S8_PLANAR_ENCODER 0
++%define CONFIG_PCM_S16BE_ENCODER 0
++%define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
++%define CONFIG_PCM_S16LE_ENCODER 0
++%define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
++%define CONFIG_PCM_S24BE_ENCODER 0
++%define CONFIG_PCM_S24DAUD_ENCODER 0
++%define CONFIG_PCM_S24LE_ENCODER 0
++%define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
++%define CONFIG_PCM_S32BE_ENCODER 0
++%define CONFIG_PCM_S32LE_ENCODER 0
++%define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
++%define CONFIG_PCM_S64BE_ENCODER 0
++%define CONFIG_PCM_S64LE_ENCODER 0
++%define CONFIG_PCM_U8_ENCODER 0
++%define CONFIG_PCM_U16BE_ENCODER 0
++%define CONFIG_PCM_U16LE_ENCODER 0
++%define CONFIG_PCM_U24BE_ENCODER 0
++%define CONFIG_PCM_U24LE_ENCODER 0
++%define CONFIG_PCM_U32BE_ENCODER 0
++%define CONFIG_PCM_U32LE_ENCODER 0
++%define CONFIG_PCM_VIDC_ENCODER 0
++%define CONFIG_ROQ_DPCM_ENCODER 0
++%define CONFIG_ADPCM_ADX_ENCODER 0
++%define CONFIG_ADPCM_ARGO_ENCODER 0
++%define CONFIG_ADPCM_G722_ENCODER 0
++%define CONFIG_ADPCM_G726_ENCODER 0
++%define CONFIG_ADPCM_G726LE_ENCODER 0
++%define CONFIG_ADPCM_IMA_AMV_ENCODER 0
++%define CONFIG_ADPCM_IMA_ALP_ENCODER 0
++%define CONFIG_ADPCM_IMA_APM_ENCODER 0
++%define CONFIG_ADPCM_IMA_QT_ENCODER 0
++%define CONFIG_ADPCM_IMA_SSI_ENCODER 0
++%define CONFIG_ADPCM_IMA_WAV_ENCODER 0
++%define CONFIG_ADPCM_IMA_WS_ENCODER 0
++%define CONFIG_ADPCM_MS_ENCODER 0
++%define CONFIG_ADPCM_SWF_ENCODER 0
++%define CONFIG_ADPCM_YAMAHA_ENCODER 0
++%define CONFIG_SSA_ENCODER 0
++%define CONFIG_ASS_ENCODER 0
++%define CONFIG_DVBSUB_ENCODER 0
++%define CONFIG_DVDSUB_ENCODER 0
++%define CONFIG_MOVTEXT_ENCODER 0
++%define CONFIG_SRT_ENCODER 0
++%define CONFIG_SUBRIP_ENCODER 0
++%define CONFIG_TEXT_ENCODER 0
++%define CONFIG_TTML_ENCODER 0
++%define CONFIG_WEBVTT_ENCODER 0
++%define CONFIG_XSUB_ENCODER 0
++%define CONFIG_AAC_AT_ENCODER 0
++%define CONFIG_ALAC_AT_ENCODER 0
++%define CONFIG_ILBC_AT_ENCODER 0
++%define CONFIG_PCM_ALAW_AT_ENCODER 0
++%define CONFIG_PCM_MULAW_AT_ENCODER 0
++%define CONFIG_LIBAOM_AV1_ENCODER 0
++%define CONFIG_LIBCODEC2_ENCODER 0
++%define CONFIG_LIBFDK_AAC_ENCODER 0
++%define CONFIG_LIBGSM_ENCODER 0
++%define CONFIG_LIBGSM_MS_ENCODER 0
++%define CONFIG_LIBILBC_ENCODER 0
++%define CONFIG_LIBMP3LAME_ENCODER 0
++%define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
++%define CONFIG_LIBOPENJPEG_ENCODER 0
++%define CONFIG_LIBOPUS_ENCODER 0
++%define CONFIG_LIBRAV1E_ENCODER 0
++%define CONFIG_LIBSHINE_ENCODER 0
++%define CONFIG_LIBSPEEX_ENCODER 0
++%define CONFIG_LIBSVTAV1_ENCODER 0
++%define CONFIG_LIBTHEORA_ENCODER 0
++%define CONFIG_LIBTWOLAME_ENCODER 0
++%define CONFIG_LIBVO_AMRWBENC_ENCODER 0
++%define CONFIG_LIBVORBIS_ENCODER 0
++%define CONFIG_LIBVPX_VP8_ENCODER 0
++%define CONFIG_LIBVPX_VP9_ENCODER 0
++%define CONFIG_LIBWEBP_ANIM_ENCODER 0
++%define CONFIG_LIBWEBP_ENCODER 0
++%define CONFIG_LIBX262_ENCODER 0
++%define CONFIG_LIBX264_ENCODER 0
++%define CONFIG_LIBX264RGB_ENCODER 0
++%define CONFIG_LIBX265_ENCODER 0
++%define CONFIG_LIBXAVS_ENCODER 0
++%define CONFIG_LIBXAVS2_ENCODER 0
++%define CONFIG_LIBXVID_ENCODER 0
++%define CONFIG_AAC_MF_ENCODER 0
++%define CONFIG_AC3_MF_ENCODER 0
++%define CONFIG_H263_V4L2M2M_ENCODER 0
++%define CONFIG_LIBOPENH264_ENCODER 0
++%define CONFIG_H264_AMF_ENCODER 0
++%define CONFIG_H264_MF_ENCODER 0
++%define CONFIG_H264_NVENC_ENCODER 0
++%define CONFIG_H264_OMX_ENCODER 0
++%define CONFIG_H264_QSV_ENCODER 0
++%define CONFIG_H264_V4L2M2M_ENCODER 0
++%define CONFIG_H264_VAAPI_ENCODER 0
++%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
++%define CONFIG_HEVC_AMF_ENCODER 0
++%define CONFIG_HEVC_MF_ENCODER 0
++%define CONFIG_HEVC_NVENC_ENCODER 0
++%define CONFIG_HEVC_QSV_ENCODER 0
++%define CONFIG_HEVC_V4L2M2M_ENCODER 0
++%define CONFIG_HEVC_VAAPI_ENCODER 0
++%define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
++%define CONFIG_LIBKVAZAAR_ENCODER 0
++%define CONFIG_MJPEG_QSV_ENCODER 0
++%define CONFIG_MJPEG_VAAPI_ENCODER 0
++%define CONFIG_MP3_MF_ENCODER 0
++%define CONFIG_MPEG2_QSV_ENCODER 0
++%define CONFIG_MPEG2_VAAPI_ENCODER 0
++%define CONFIG_MPEG4_OMX_ENCODER 0
++%define CONFIG_MPEG4_V4L2M2M_ENCODER 0
++%define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
++%define CONFIG_VP8_V4L2M2M_ENCODER 0
++%define CONFIG_VP8_VAAPI_ENCODER 0
++%define CONFIG_VP9_VAAPI_ENCODER 0
++%define CONFIG_VP9_QSV_ENCODER 0
++%define CONFIG_AV1_D3D11VA_HWACCEL 0
++%define CONFIG_AV1_D3D11VA2_HWACCEL 0
++%define CONFIG_AV1_DXVA2_HWACCEL 0
++%define CONFIG_AV1_NVDEC_HWACCEL 0
++%define CONFIG_AV1_VAAPI_HWACCEL 0
++%define CONFIG_H263_VAAPI_HWACCEL 0
++%define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
++%define CONFIG_H264_D3D11VA_HWACCEL 0
++%define CONFIG_H264_D3D11VA2_HWACCEL 0
++%define CONFIG_H264_DXVA2_HWACCEL 0
++%define CONFIG_H264_NVDEC_HWACCEL 0
++%define CONFIG_H264_VAAPI_HWACCEL 0
++%define CONFIG_H264_VDPAU_HWACCEL 0
++%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
++%define CONFIG_HEVC_D3D11VA_HWACCEL 0
++%define CONFIG_HEVC_D3D11VA2_HWACCEL 0
++%define CONFIG_HEVC_DXVA2_HWACCEL 0
++%define CONFIG_HEVC_NVDEC_HWACCEL 0
++%define CONFIG_HEVC_VAAPI_HWACCEL 0
++%define CONFIG_HEVC_VDPAU_HWACCEL 0
++%define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
++%define CONFIG_MJPEG_NVDEC_HWACCEL 0
++%define CONFIG_MJPEG_VAAPI_HWACCEL 0
++%define CONFIG_MPEG1_NVDEC_HWACCEL 0
++%define CONFIG_MPEG1_VDPAU_HWACCEL 0
++%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
++%define CONFIG_MPEG1_XVMC_HWACCEL 0
++%define CONFIG_MPEG2_D3D11VA_HWACCEL 0
++%define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
++%define CONFIG_MPEG2_NVDEC_HWACCEL 0
++%define CONFIG_MPEG2_DXVA2_HWACCEL 0
++%define CONFIG_MPEG2_VAAPI_HWACCEL 0
++%define CONFIG_MPEG2_VDPAU_HWACCEL 0
++%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
++%define CONFIG_MPEG2_XVMC_HWACCEL 0
++%define CONFIG_MPEG4_NVDEC_HWACCEL 0
++%define CONFIG_MPEG4_VAAPI_HWACCEL 0
++%define CONFIG_MPEG4_VDPAU_HWACCEL 0
++%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
++%define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0
++%define CONFIG_VC1_D3D11VA_HWACCEL 0
++%define CONFIG_VC1_D3D11VA2_HWACCEL 0
++%define CONFIG_VC1_DXVA2_HWACCEL 0
++%define CONFIG_VC1_NVDEC_HWACCEL 0
++%define CONFIG_VC1_VAAPI_HWACCEL 0
++%define CONFIG_VC1_VDPAU_HWACCEL 0
++%define CONFIG_VP8_NVDEC_HWACCEL 0
++%define CONFIG_VP8_VAAPI_HWACCEL 0
++%define CONFIG_VP9_D3D11VA_HWACCEL 0
++%define CONFIG_VP9_D3D11VA2_HWACCEL 0
++%define CONFIG_VP9_DXVA2_HWACCEL 0
++%define CONFIG_VP9_NVDEC_HWACCEL 0
++%define CONFIG_VP9_VAAPI_HWACCEL 0
++%define CONFIG_VP9_VDPAU_HWACCEL 0
++%define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0
++%define CONFIG_WMV3_D3D11VA_HWACCEL 0
++%define CONFIG_WMV3_D3D11VA2_HWACCEL 0
++%define CONFIG_WMV3_DXVA2_HWACCEL 0
++%define CONFIG_WMV3_NVDEC_HWACCEL 0
++%define CONFIG_WMV3_VAAPI_HWACCEL 0
++%define CONFIG_WMV3_VDPAU_HWACCEL 0
++%define CONFIG_AAC_PARSER 1
++%define CONFIG_AAC_LATM_PARSER 0
++%define CONFIG_AC3_PARSER 0
++%define CONFIG_ADX_PARSER 0
++%define CONFIG_AMR_PARSER 0
++%define CONFIG_AV1_PARSER 0
++%define CONFIG_AVS2_PARSER 0
++%define CONFIG_AVS3_PARSER 0
++%define CONFIG_BMP_PARSER 0
++%define CONFIG_CAVSVIDEO_PARSER 0
++%define CONFIG_COOK_PARSER 0
++%define CONFIG_CRI_PARSER 0
++%define CONFIG_DCA_PARSER 0
++%define CONFIG_DIRAC_PARSER 0
++%define CONFIG_DNXHD_PARSER 0
++%define CONFIG_DOLBY_E_PARSER 0
++%define CONFIG_DPX_PARSER 0
++%define CONFIG_DVAUDIO_PARSER 0
++%define CONFIG_DVBSUB_PARSER 0
++%define CONFIG_DVDSUB_PARSER 0
++%define CONFIG_DVD_NAV_PARSER 0
++%define CONFIG_FLAC_PARSER 1
++%define CONFIG_G723_1_PARSER 0
++%define CONFIG_G729_PARSER 0
++%define CONFIG_GIF_PARSER 0
++%define CONFIG_GSM_PARSER 0
++%define CONFIG_H261_PARSER 0
++%define CONFIG_H263_PARSER 0
++%define CONFIG_H264_PARSER 1
++%define CONFIG_HEVC_PARSER 0
++%define CONFIG_IPU_PARSER 0
++%define CONFIG_JPEG2000_PARSER 0
++%define CONFIG_MJPEG_PARSER 0
++%define CONFIG_MLP_PARSER 0
++%define CONFIG_MPEG4VIDEO_PARSER 0
++%define CONFIG_MPEGAUDIO_PARSER 1
++%define CONFIG_MPEGVIDEO_PARSER 0
++%define CONFIG_OPUS_PARSER 1
++%define CONFIG_PNG_PARSER 0
++%define CONFIG_PNM_PARSER 0
++%define CONFIG_RV30_PARSER 0
++%define CONFIG_RV40_PARSER 0
++%define CONFIG_SBC_PARSER 0
++%define CONFIG_SIPR_PARSER 0
++%define CONFIG_TAK_PARSER 0
++%define CONFIG_VC1_PARSER 0
++%define CONFIG_VORBIS_PARSER 1
++%define CONFIG_VP3_PARSER 1
++%define CONFIG_VP8_PARSER 1
++%define CONFIG_VP9_PARSER 1
++%define CONFIG_WEBP_PARSER 0
++%define CONFIG_XBM_PARSER 0
++%define CONFIG_XMA_PARSER 0
++%define CONFIG_ALSA_INDEV 0
++%define CONFIG_ANDROID_CAMERA_INDEV 0
++%define CONFIG_AVFOUNDATION_INDEV 0
++%define CONFIG_BKTR_INDEV 0
++%define CONFIG_DECKLINK_INDEV 0
++%define CONFIG_DSHOW_INDEV 0
++%define CONFIG_FBDEV_INDEV 0
++%define CONFIG_GDIGRAB_INDEV 0
++%define CONFIG_IEC61883_INDEV 0
++%define CONFIG_JACK_INDEV 0
++%define CONFIG_KMSGRAB_INDEV 0
++%define CONFIG_LAVFI_INDEV 0
++%define CONFIG_OPENAL_INDEV 0
++%define CONFIG_OSS_INDEV 0
++%define CONFIG_PULSE_INDEV 0
++%define CONFIG_SNDIO_INDEV 0
++%define CONFIG_V4L2_INDEV 0
++%define CONFIG_VFWCAP_INDEV 0
++%define CONFIG_XCBGRAB_INDEV 0
++%define CONFIG_LIBCDIO_INDEV 0
++%define CONFIG_LIBDC1394_INDEV 0
++%define CONFIG_ALSA_OUTDEV 0
++%define CONFIG_AUDIOTOOLBOX_OUTDEV 0
++%define CONFIG_CACA_OUTDEV 0
++%define CONFIG_DECKLINK_OUTDEV 0
++%define CONFIG_FBDEV_OUTDEV 0
++%define CONFIG_OPENGL_OUTDEV 0
++%define CONFIG_OSS_OUTDEV 0
++%define CONFIG_PULSE_OUTDEV 0
++%define CONFIG_SDL2_OUTDEV 0
++%define CONFIG_SNDIO_OUTDEV 0
++%define CONFIG_V4L2_OUTDEV 0
++%define CONFIG_XV_OUTDEV 0
++%define CONFIG_ABENCH_FILTER 0
++%define CONFIG_ACOMPRESSOR_FILTER 0
++%define CONFIG_ACONTRAST_FILTER 0
++%define CONFIG_ACOPY_FILTER 0
++%define CONFIG_ACUE_FILTER 0
++%define CONFIG_ACROSSFADE_FILTER 0
++%define CONFIG_ACROSSOVER_FILTER 0
++%define CONFIG_ACRUSHER_FILTER 0
++%define CONFIG_ADECLICK_FILTER 0
++%define CONFIG_ADECLIP_FILTER 0
++%define CONFIG_ADECORRELATE_FILTER 0
++%define CONFIG_ADELAY_FILTER 0
++%define CONFIG_ADENORM_FILTER 0
++%define CONFIG_ADERIVATIVE_FILTER 0
++%define CONFIG_ADYNAMICEQUALIZER_FILTER 0
++%define CONFIG_ADYNAMICSMOOTH_FILTER 0
++%define CONFIG_AECHO_FILTER 0
++%define CONFIG_AEMPHASIS_FILTER 0
++%define CONFIG_AEVAL_FILTER 0
++%define CONFIG_AEXCITER_FILTER 0
++%define CONFIG_AFADE_FILTER 0
++%define CONFIG_AFFTDN_FILTER 0
++%define CONFIG_AFFTFILT_FILTER 0
++%define CONFIG_AFIR_FILTER 0
++%define CONFIG_AFORMAT_FILTER 0
++%define CONFIG_AFREQSHIFT_FILTER 0
++%define CONFIG_AFWTDN_FILTER 0
++%define CONFIG_AGATE_FILTER 0
++%define CONFIG_AIIR_FILTER 0
++%define CONFIG_AINTEGRAL_FILTER 0
++%define CONFIG_AINTERLEAVE_FILTER 0
++%define CONFIG_ALATENCY_FILTER 0
++%define CONFIG_ALIMITER_FILTER 0
++%define CONFIG_ALLPASS_FILTER 0
++%define CONFIG_ALOOP_FILTER 0
++%define CONFIG_AMERGE_FILTER 0
++%define CONFIG_AMETADATA_FILTER 0
++%define CONFIG_AMIX_FILTER 0
++%define CONFIG_AMULTIPLY_FILTER 0
++%define CONFIG_ANEQUALIZER_FILTER 0
++%define CONFIG_ANLMDN_FILTER 0
++%define CONFIG_ANLMF_FILTER 0
++%define CONFIG_ANLMS_FILTER 0
++%define CONFIG_ANULL_FILTER 0
++%define CONFIG_APAD_FILTER 0
++%define CONFIG_APERMS_FILTER 0
++%define CONFIG_APHASER_FILTER 0
++%define CONFIG_APHASESHIFT_FILTER 0
++%define CONFIG_APSYCLIP_FILTER 0
++%define CONFIG_APULSATOR_FILTER 0
++%define CONFIG_AREALTIME_FILTER 0
++%define CONFIG_ARESAMPLE_FILTER 0
++%define CONFIG_AREVERSE_FILTER 0
++%define CONFIG_ARNNDN_FILTER 0
++%define CONFIG_ASDR_FILTER 0
++%define CONFIG_ASEGMENT_FILTER 0
++%define CONFIG_ASELECT_FILTER 0
++%define CONFIG_ASENDCMD_FILTER 0
++%define CONFIG_ASETNSAMPLES_FILTER 0
++%define CONFIG_ASETPTS_FILTER 0
++%define CONFIG_ASETRATE_FILTER 0
++%define CONFIG_ASETTB_FILTER 0
++%define CONFIG_ASHOWINFO_FILTER 0
++%define CONFIG_ASIDEDATA_FILTER 0
++%define CONFIG_ASOFTCLIP_FILTER 0
++%define CONFIG_ASPECTRALSTATS_FILTER 0
++%define CONFIG_ASPLIT_FILTER 0
++%define CONFIG_ASR_FILTER 0
++%define CONFIG_ASTATS_FILTER 0
++%define CONFIG_ASTREAMSELECT_FILTER 0
++%define CONFIG_ASUBBOOST_FILTER 0
++%define CONFIG_ASUBCUT_FILTER 0
++%define CONFIG_ASUPERCUT_FILTER 0
++%define CONFIG_ASUPERPASS_FILTER 0
++%define CONFIG_ASUPERSTOP_FILTER 0
++%define CONFIG_ATEMPO_FILTER 0
++%define CONFIG_ATILT_FILTER 0
++%define CONFIG_ATRIM_FILTER 0
++%define CONFIG_AXCORRELATE_FILTER 0
++%define CONFIG_AZMQ_FILTER 0
++%define CONFIG_BANDPASS_FILTER 0
++%define CONFIG_BANDREJECT_FILTER 0
++%define CONFIG_BASS_FILTER 0
++%define CONFIG_BIQUAD_FILTER 0
++%define CONFIG_BS2B_FILTER 0
++%define CONFIG_CHANNELMAP_FILTER 0
++%define CONFIG_CHANNELSPLIT_FILTER 0
++%define CONFIG_CHORUS_FILTER 0
++%define CONFIG_COMPAND_FILTER 0
++%define CONFIG_COMPENSATIONDELAY_FILTER 0
++%define CONFIG_CROSSFEED_FILTER 0
++%define CONFIG_CRYSTALIZER_FILTER 0
++%define CONFIG_DCSHIFT_FILTER 0
++%define CONFIG_DEESSER_FILTER 0
++%define CONFIG_DRMETER_FILTER 0
++%define CONFIG_DYNAUDNORM_FILTER 0
++%define CONFIG_EARWAX_FILTER 0
++%define CONFIG_EBUR128_FILTER 0
++%define CONFIG_EQUALIZER_FILTER 0
++%define CONFIG_EXTRASTEREO_FILTER 0
++%define CONFIG_FIREQUALIZER_FILTER 0
++%define CONFIG_FLANGER_FILTER 0
++%define CONFIG_HAAS_FILTER 0
++%define CONFIG_HDCD_FILTER 0
++%define CONFIG_HEADPHONE_FILTER 0
++%define CONFIG_HIGHPASS_FILTER 0
++%define CONFIG_HIGHSHELF_FILTER 0
++%define CONFIG_JOIN_FILTER 0
++%define CONFIG_LADSPA_FILTER 0
++%define CONFIG_LOUDNORM_FILTER 0
++%define CONFIG_LOWPASS_FILTER 0
++%define CONFIG_LOWSHELF_FILTER 0
++%define CONFIG_LV2_FILTER 0
++%define CONFIG_MCOMPAND_FILTER 0
++%define CONFIG_PAN_FILTER 0
++%define CONFIG_REPLAYGAIN_FILTER 0
++%define CONFIG_RUBBERBAND_FILTER 0
++%define CONFIG_SIDECHAINCOMPRESS_FILTER 0
++%define CONFIG_SIDECHAINGATE_FILTER 0
++%define CONFIG_SILENCEDETECT_FILTER 0
++%define CONFIG_SILENCEREMOVE_FILTER 0
++%define CONFIG_SOFALIZER_FILTER 0
++%define CONFIG_SPEECHNORM_FILTER 0
++%define CONFIG_STEREOTOOLS_FILTER 0
++%define CONFIG_STEREOWIDEN_FILTER 0
++%define CONFIG_SUPEREQUALIZER_FILTER 0
++%define CONFIG_SURROUND_FILTER 0
++%define CONFIG_TREBLE_FILTER 0
++%define CONFIG_TREMOLO_FILTER 0
++%define CONFIG_VIBRATO_FILTER 0
++%define CONFIG_VOLUME_FILTER 0
++%define CONFIG_VOLUMEDETECT_FILTER 0
++%define CONFIG_AEVALSRC_FILTER 0
++%define CONFIG_AFIRSRC_FILTER 0
++%define CONFIG_ANOISESRC_FILTER 0
++%define CONFIG_ANULLSRC_FILTER 0
++%define CONFIG_FLITE_FILTER 0
++%define CONFIG_HILBERT_FILTER 0
++%define CONFIG_SINC_FILTER 0
++%define CONFIG_SINE_FILTER 0
++%define CONFIG_ANULLSINK_FILTER 0
++%define CONFIG_ADDROI_FILTER 0
++%define CONFIG_ALPHAEXTRACT_FILTER 0
++%define CONFIG_ALPHAMERGE_FILTER 0
++%define CONFIG_AMPLIFY_FILTER 0
++%define CONFIG_ASS_FILTER 0
++%define CONFIG_ATADENOISE_FILTER 0
++%define CONFIG_AVGBLUR_FILTER 0
++%define CONFIG_AVGBLUR_OPENCL_FILTER 0
++%define CONFIG_AVGBLUR_VULKAN_FILTER 0
++%define CONFIG_BBOX_FILTER 0
++%define CONFIG_BENCH_FILTER 0
++%define CONFIG_BILATERAL_FILTER 0
++%define CONFIG_BITPLANENOISE_FILTER 0
++%define CONFIG_BLACKDETECT_FILTER 0
++%define CONFIG_BLACKFRAME_FILTER 0
++%define CONFIG_BLEND_FILTER 0
++%define CONFIG_BLEND_VULKAN_FILTER 0
++%define CONFIG_BM3D_FILTER 0
++%define CONFIG_BOXBLUR_FILTER 0
++%define CONFIG_BOXBLUR_OPENCL_FILTER 0
++%define CONFIG_BWDIF_FILTER 0
++%define CONFIG_CAS_FILTER 0
++%define CONFIG_CHROMABER_VULKAN_FILTER 0
++%define CONFIG_CHROMAHOLD_FILTER 0
++%define CONFIG_CHROMAKEY_FILTER 0
++%define CONFIG_CHROMANR_FILTER 0
++%define CONFIG_CHROMASHIFT_FILTER 0
++%define CONFIG_CIESCOPE_FILTER 0
++%define CONFIG_CODECVIEW_FILTER 0
++%define CONFIG_COLORBALANCE_FILTER 0
++%define CONFIG_COLORCHANNELMIXER_FILTER 0
++%define CONFIG_COLORCONTRAST_FILTER 0
++%define CONFIG_COLORCORRECT_FILTER 0
++%define CONFIG_COLORIZE_FILTER 0
++%define CONFIG_COLORKEY_FILTER 0
++%define CONFIG_COLORKEY_OPENCL_FILTER 0
++%define CONFIG_COLORHOLD_FILTER 0
++%define CONFIG_COLORLEVELS_FILTER 0
++%define CONFIG_COLORMATRIX_FILTER 0
++%define CONFIG_COLORSPACE_FILTER 0
++%define CONFIG_COLORTEMPERATURE_FILTER 0
++%define CONFIG_CONVOLUTION_FILTER 0
++%define CONFIG_CONVOLUTION_OPENCL_FILTER 0
++%define CONFIG_CONVOLVE_FILTER 0
++%define CONFIG_COPY_FILTER 0
++%define CONFIG_COREIMAGE_FILTER 0
++%define CONFIG_COVER_RECT_FILTER 0
++%define CONFIG_CROP_FILTER 0
++%define CONFIG_CROPDETECT_FILTER 0
++%define CONFIG_CUE_FILTER 0
++%define CONFIG_CURVES_FILTER 0
++%define CONFIG_DATASCOPE_FILTER 0
++%define CONFIG_DBLUR_FILTER 0
++%define CONFIG_DCTDNOIZ_FILTER 0
++%define CONFIG_DEBAND_FILTER 0
++%define CONFIG_DEBLOCK_FILTER 0
++%define CONFIG_DECIMATE_FILTER 0
++%define CONFIG_DECONVOLVE_FILTER 0
++%define CONFIG_DEDOT_FILTER 0
++%define CONFIG_DEFLATE_FILTER 0
++%define CONFIG_DEFLICKER_FILTER 0
++%define CONFIG_DEINTERLACE_QSV_FILTER 0
++%define CONFIG_DEINTERLACE_VAAPI_FILTER 0
++%define CONFIG_DEJUDDER_FILTER 0
++%define CONFIG_DELOGO_FILTER 0
++%define CONFIG_DENOISE_VAAPI_FILTER 0
++%define CONFIG_DERAIN_FILTER 0
++%define CONFIG_DESHAKE_FILTER 0
++%define CONFIG_DESHAKE_OPENCL_FILTER 0
++%define CONFIG_DESPILL_FILTER 0
++%define CONFIG_DETELECINE_FILTER 0
++%define CONFIG_DILATION_FILTER 0
++%define CONFIG_DILATION_OPENCL_FILTER 0
++%define CONFIG_DISPLACE_FILTER 0
++%define CONFIG_DNN_CLASSIFY_FILTER 0
++%define CONFIG_DNN_DETECT_FILTER 0
++%define CONFIG_DNN_PROCESSING_FILTER 0
++%define CONFIG_DOUBLEWEAVE_FILTER 0
++%define CONFIG_DRAWBOX_FILTER 0
++%define CONFIG_DRAWGRAPH_FILTER 0
++%define CONFIG_DRAWGRID_FILTER 0
++%define CONFIG_DRAWTEXT_FILTER 0
++%define CONFIG_EDGEDETECT_FILTER 0
++%define CONFIG_ELBG_FILTER 0
++%define CONFIG_ENTROPY_FILTER 0
++%define CONFIG_EPX_FILTER 0
++%define CONFIG_EQ_FILTER 0
++%define CONFIG_EROSION_FILTER 0
++%define CONFIG_EROSION_OPENCL_FILTER 0
++%define CONFIG_ESTDIF_FILTER 0
++%define CONFIG_EXPOSURE_FILTER 0
++%define CONFIG_EXTRACTPLANES_FILTER 0
++%define CONFIG_FADE_FILTER 0
++%define CONFIG_FFTDNOIZ_FILTER 0
++%define CONFIG_FFTFILT_FILTER 0
++%define CONFIG_FIELD_FILTER 0
++%define CONFIG_FIELDHINT_FILTER 0
++%define CONFIG_FIELDMATCH_FILTER 0
++%define CONFIG_FIELDORDER_FILTER 0
++%define CONFIG_FILLBORDERS_FILTER 0
++%define CONFIG_FIND_RECT_FILTER 0
++%define CONFIG_FLIP_VULKAN_FILTER 0
++%define CONFIG_FLOODFILL_FILTER 0
++%define CONFIG_FORMAT_FILTER 0
++%define CONFIG_FPS_FILTER 0
++%define CONFIG_FRAMEPACK_FILTER 0
++%define CONFIG_FRAMERATE_FILTER 0
++%define CONFIG_FRAMESTEP_FILTER 0
++%define CONFIG_FREEZEDETECT_FILTER 0
++%define CONFIG_FREEZEFRAMES_FILTER 0
++%define CONFIG_FREI0R_FILTER 0
++%define CONFIG_FSPP_FILTER 0
++%define CONFIG_GBLUR_FILTER 0
++%define CONFIG_GBLUR_VULKAN_FILTER 0
++%define CONFIG_GEQ_FILTER 0
++%define CONFIG_GRADFUN_FILTER 0
++%define CONFIG_GRAPHMONITOR_FILTER 0
++%define CONFIG_GRAYWORLD_FILTER 0
++%define CONFIG_GREYEDGE_FILTER 0
++%define CONFIG_GUIDED_FILTER 0
++%define CONFIG_HALDCLUT_FILTER 0
++%define CONFIG_HFLIP_FILTER 0
++%define CONFIG_HFLIP_VULKAN_FILTER 0
++%define CONFIG_HISTEQ_FILTER 0
++%define CONFIG_HISTOGRAM_FILTER 0
++%define CONFIG_HQDN3D_FILTER 0
++%define CONFIG_HQX_FILTER 0
++%define CONFIG_HSTACK_FILTER 0
++%define CONFIG_HSVHOLD_FILTER 0
++%define CONFIG_HSVKEY_FILTER 0
++%define CONFIG_HUE_FILTER 0
++%define CONFIG_HUESATURATION_FILTER 0
++%define CONFIG_HWDOWNLOAD_FILTER 0
++%define CONFIG_HWMAP_FILTER 0
++%define CONFIG_HWUPLOAD_FILTER 0
++%define CONFIG_HWUPLOAD_CUDA_FILTER 0
++%define CONFIG_HYSTERESIS_FILTER 0
++%define CONFIG_IDENTITY_FILTER 0
++%define CONFIG_IDET_FILTER 0
++%define CONFIG_IL_FILTER 0
++%define CONFIG_INFLATE_FILTER 0
++%define CONFIG_INTERLACE_FILTER 0
++%define CONFIG_INTERLEAVE_FILTER 0
++%define CONFIG_KERNDEINT_FILTER 0
++%define CONFIG_KIRSCH_FILTER 0
++%define CONFIG_LAGFUN_FILTER 0
++%define CONFIG_LATENCY_FILTER 0
++%define CONFIG_LENSCORRECTION_FILTER 0
++%define CONFIG_LENSFUN_FILTER 0
++%define CONFIG_LIBPLACEBO_FILTER 0
++%define CONFIG_LIBVMAF_FILTER 0
++%define CONFIG_LIMITDIFF_FILTER 0
++%define CONFIG_LIMITER_FILTER 0
++%define CONFIG_LOOP_FILTER 0
++%define CONFIG_LUMAKEY_FILTER 0
++%define CONFIG_LUT_FILTER 0
++%define CONFIG_LUT1D_FILTER 0
++%define CONFIG_LUT2_FILTER 0
++%define CONFIG_LUT3D_FILTER 0
++%define CONFIG_LUTRGB_FILTER 0
++%define CONFIG_LUTYUV_FILTER 0
++%define CONFIG_MASKEDCLAMP_FILTER 0
++%define CONFIG_MASKEDMAX_FILTER 0
++%define CONFIG_MASKEDMERGE_FILTER 0
++%define CONFIG_MASKEDMIN_FILTER 0
++%define CONFIG_MASKEDTHRESHOLD_FILTER 0
++%define CONFIG_MASKFUN_FILTER 0
++%define CONFIG_MCDEINT_FILTER 0
++%define CONFIG_MEDIAN_FILTER 0
++%define CONFIG_MERGEPLANES_FILTER 0
++%define CONFIG_MESTIMATE_FILTER 0
++%define CONFIG_METADATA_FILTER 0
++%define CONFIG_MIDEQUALIZER_FILTER 0
++%define CONFIG_MINTERPOLATE_FILTER 0
++%define CONFIG_MIX_FILTER 0
++%define CONFIG_MONOCHROME_FILTER 0
++%define CONFIG_MORPHO_FILTER 0
++%define CONFIG_MPDECIMATE_FILTER 0
++%define CONFIG_MSAD_FILTER 0
++%define CONFIG_NEGATE_FILTER 0
++%define CONFIG_NLMEANS_FILTER 0
++%define CONFIG_NLMEANS_OPENCL_FILTER 0
++%define CONFIG_NNEDI_FILTER 0
++%define CONFIG_NOFORMAT_FILTER 0
++%define CONFIG_NOISE_FILTER 0
++%define CONFIG_NORMALIZE_FILTER 0
++%define CONFIG_NULL_FILTER 0
++%define CONFIG_OCR_FILTER 0
++%define CONFIG_OCV_FILTER 0
++%define CONFIG_OSCILLOSCOPE_FILTER 0
++%define CONFIG_OVERLAY_FILTER 0
++%define CONFIG_OVERLAY_OPENCL_FILTER 0
++%define CONFIG_OVERLAY_QSV_FILTER 0
++%define CONFIG_OVERLAY_VAAPI_FILTER 0
++%define CONFIG_OVERLAY_VULKAN_FILTER 0
++%define CONFIG_OVERLAY_CUDA_FILTER 0
++%define CONFIG_OWDENOISE_FILTER 0
++%define CONFIG_PAD_FILTER 0
++%define CONFIG_PAD_OPENCL_FILTER 0
++%define CONFIG_PALETTEGEN_FILTER 0
++%define CONFIG_PALETTEUSE_FILTER 0
++%define CONFIG_PERMS_FILTER 0
++%define CONFIG_PERSPECTIVE_FILTER 0
++%define CONFIG_PHASE_FILTER 0
++%define CONFIG_PHOTOSENSITIVITY_FILTER 0
++%define CONFIG_PIXDESCTEST_FILTER 0
++%define CONFIG_PIXSCOPE_FILTER 0
++%define CONFIG_PP_FILTER 0
++%define CONFIG_PP7_FILTER 0
++%define CONFIG_PREMULTIPLY_FILTER 0
++%define CONFIG_PREWITT_FILTER 0
++%define CONFIG_PREWITT_OPENCL_FILTER 0
++%define CONFIG_PROCAMP_VAAPI_FILTER 0
++%define CONFIG_PROGRAM_OPENCL_FILTER 0
++%define CONFIG_PSEUDOCOLOR_FILTER 0
++%define CONFIG_PSNR_FILTER 0
++%define CONFIG_PULLUP_FILTER 0
++%define CONFIG_QP_FILTER 0
++%define CONFIG_RANDOM_FILTER 0
++%define CONFIG_READEIA608_FILTER 0
++%define CONFIG_READVITC_FILTER 0
++%define CONFIG_REALTIME_FILTER 0
++%define CONFIG_REMAP_FILTER 0
++%define CONFIG_REMOVEGRAIN_FILTER 0
++%define CONFIG_REMOVELOGO_FILTER 0
++%define CONFIG_REPEATFIELDS_FILTER 0
++%define CONFIG_REVERSE_FILTER 0
++%define CONFIG_RGBASHIFT_FILTER 0
++%define CONFIG_ROBERTS_FILTER 0
++%define CONFIG_ROBERTS_OPENCL_FILTER 0
++%define CONFIG_ROTATE_FILTER 0
++%define CONFIG_SAB_FILTER 0
++%define CONFIG_SCALE_FILTER 0
++%define CONFIG_SCALE_CUDA_FILTER 0
++%define CONFIG_SCALE_NPP_FILTER 0
++%define CONFIG_SCALE_QSV_FILTER 0
++%define CONFIG_SCALE_VAAPI_FILTER 0
++%define CONFIG_SCALE_VULKAN_FILTER 0
++%define CONFIG_SCALE2REF_FILTER 0
++%define CONFIG_SCALE2REF_NPP_FILTER 0
++%define CONFIG_SCDET_FILTER 0
++%define CONFIG_SCHARR_FILTER 0
++%define CONFIG_SCROLL_FILTER 0
++%define CONFIG_SEGMENT_FILTER 0
++%define CONFIG_SELECT_FILTER 0
++%define CONFIG_SELECTIVECOLOR_FILTER 0
++%define CONFIG_SENDCMD_FILTER 0
++%define CONFIG_SEPARATEFIELDS_FILTER 0
++%define CONFIG_SETDAR_FILTER 0
++%define CONFIG_SETFIELD_FILTER 0
++%define CONFIG_SETPARAMS_FILTER 0
++%define CONFIG_SETPTS_FILTER 0
++%define CONFIG_SETRANGE_FILTER 0
++%define CONFIG_SETSAR_FILTER 0
++%define CONFIG_SETTB_FILTER 0
++%define CONFIG_SHARPEN_NPP_FILTER 0
++%define CONFIG_SHARPNESS_VAAPI_FILTER 0
++%define CONFIG_SHEAR_FILTER 0
++%define CONFIG_SHOWINFO_FILTER 0
++%define CONFIG_SHOWPALETTE_FILTER 0
++%define CONFIG_SHUFFLEFRAMES_FILTER 0
++%define CONFIG_SHUFFLEPIXELS_FILTER 0
++%define CONFIG_SHUFFLEPLANES_FILTER 0
++%define CONFIG_SIDEDATA_FILTER 0
++%define CONFIG_SIGNALSTATS_FILTER 0
++%define CONFIG_SIGNATURE_FILTER 0
++%define CONFIG_SMARTBLUR_FILTER 0
++%define CONFIG_SOBEL_FILTER 0
++%define CONFIG_SOBEL_OPENCL_FILTER 0
++%define CONFIG_SPLIT_FILTER 0
++%define CONFIG_SPP_FILTER 0
++%define CONFIG_SR_FILTER 0
++%define CONFIG_SSIM_FILTER 0
++%define CONFIG_STEREO3D_FILTER 0
++%define CONFIG_STREAMSELECT_FILTER 0
++%define CONFIG_SUBTITLES_FILTER 0
++%define CONFIG_SUPER2XSAI_FILTER 0
++%define CONFIG_SWAPRECT_FILTER 0
++%define CONFIG_SWAPUV_FILTER 0
++%define CONFIG_TBLEND_FILTER 0
++%define CONFIG_TELECINE_FILTER 0
++%define CONFIG_THISTOGRAM_FILTER 0
++%define CONFIG_THRESHOLD_FILTER 0
++%define CONFIG_THUMBNAIL_FILTER 0
++%define CONFIG_THUMBNAIL_CUDA_FILTER 0
++%define CONFIG_TILE_FILTER 0
++%define CONFIG_TINTERLACE_FILTER 0
++%define CONFIG_TLUT2_FILTER 0
++%define CONFIG_TMEDIAN_FILTER 0
++%define CONFIG_TMIDEQUALIZER_FILTER 0
++%define CONFIG_TMIX_FILTER 0
++%define CONFIG_TONEMAP_FILTER 0
++%define CONFIG_TONEMAP_OPENCL_FILTER 0
++%define CONFIG_TONEMAP_VAAPI_FILTER 0
++%define CONFIG_TPAD_FILTER 0
++%define CONFIG_TRANSPOSE_FILTER 0
++%define CONFIG_TRANSPOSE_NPP_FILTER 0
++%define CONFIG_TRANSPOSE_OPENCL_FILTER 0
++%define CONFIG_TRANSPOSE_VAAPI_FILTER 0
++%define CONFIG_TRANSPOSE_VULKAN_FILTER 0
++%define CONFIG_TRIM_FILTER 0
++%define CONFIG_UNPREMULTIPLY_FILTER 0
++%define CONFIG_UNSHARP_FILTER 0
++%define CONFIG_UNSHARP_OPENCL_FILTER 0
++%define CONFIG_UNTILE_FILTER 0
++%define CONFIG_USPP_FILTER 0
++%define CONFIG_V360_FILTER 0
++%define CONFIG_VAGUEDENOISER_FILTER 0
++%define CONFIG_VARBLUR_FILTER 0
++%define CONFIG_VECTORSCOPE_FILTER 0
++%define CONFIG_VFLIP_FILTER 0
++%define CONFIG_VFLIP_VULKAN_FILTER 0
++%define CONFIG_VFRDET_FILTER 0
++%define CONFIG_VIBRANCE_FILTER 0
++%define CONFIG_VIDSTABDETECT_FILTER 0
++%define CONFIG_VIDSTABTRANSFORM_FILTER 0
++%define CONFIG_VIF_FILTER 0
++%define CONFIG_VIGNETTE_FILTER 0
++%define CONFIG_VMAFMOTION_FILTER 0
++%define CONFIG_VPP_QSV_FILTER 0
++%define CONFIG_VSTACK_FILTER 0
++%define CONFIG_W3FDIF_FILTER 0
++%define CONFIG_WAVEFORM_FILTER 0
++%define CONFIG_WEAVE_FILTER 0
++%define CONFIG_XBR_FILTER 0
++%define CONFIG_XCORRELATE_FILTER 0
++%define CONFIG_XFADE_FILTER 0
++%define CONFIG_XFADE_OPENCL_FILTER 0
++%define CONFIG_XMEDIAN_FILTER 0
++%define CONFIG_XSTACK_FILTER 0
++%define CONFIG_YADIF_FILTER 0
++%define CONFIG_YADIF_CUDA_FILTER 0
++%define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0
++%define CONFIG_YAEPBLUR_FILTER 0
++%define CONFIG_ZMQ_FILTER 0
++%define CONFIG_ZOOMPAN_FILTER 0
++%define CONFIG_ZSCALE_FILTER 0
++%define CONFIG_ALLRGB_FILTER 0
++%define CONFIG_ALLYUV_FILTER 0
++%define CONFIG_CELLAUTO_FILTER 0
++%define CONFIG_COLOR_FILTER 0
++%define CONFIG_COLORSPECTRUM_FILTER 0
++%define CONFIG_COREIMAGESRC_FILTER 0
++%define CONFIG_FREI0R_SRC_FILTER 0
++%define CONFIG_GRADIENTS_FILTER 0
++%define CONFIG_HALDCLUTSRC_FILTER 0
++%define CONFIG_LIFE_FILTER 0
++%define CONFIG_MANDELBROT_FILTER 0
++%define CONFIG_MPTESTSRC_FILTER 0
++%define CONFIG_NULLSRC_FILTER 0
++%define CONFIG_OPENCLSRC_FILTER 0
++%define CONFIG_PAL75BARS_FILTER 0
++%define CONFIG_PAL100BARS_FILTER 0
++%define CONFIG_RGBTESTSRC_FILTER 0
++%define CONFIG_SIERPINSKI_FILTER 0
++%define CONFIG_SMPTEBARS_FILTER 0
++%define CONFIG_SMPTEHDBARS_FILTER 0
++%define CONFIG_TESTSRC_FILTER 0
++%define CONFIG_TESTSRC2_FILTER 0
++%define CONFIG_YUVTESTSRC_FILTER 0
++%define CONFIG_NULLSINK_FILTER 0
++%define CONFIG_ABITSCOPE_FILTER 0
++%define CONFIG_ADRAWGRAPH_FILTER 0
++%define CONFIG_AGRAPHMONITOR_FILTER 0
++%define CONFIG_AHISTOGRAM_FILTER 0
++%define CONFIG_APHASEMETER_FILTER 0
++%define CONFIG_AVECTORSCOPE_FILTER 0
++%define CONFIG_CONCAT_FILTER 0
++%define CONFIG_SHOWCQT_FILTER 0
++%define CONFIG_SHOWFREQS_FILTER 0
++%define CONFIG_SHOWSPATIAL_FILTER 0
++%define CONFIG_SHOWSPECTRUM_FILTER 0
++%define CONFIG_SHOWSPECTRUMPIC_FILTER 0
++%define CONFIG_SHOWVOLUME_FILTER 0
++%define CONFIG_SHOWWAVES_FILTER 0
++%define CONFIG_SHOWWAVESPIC_FILTER 0
++%define CONFIG_SPECTRUMSYNTH_FILTER 0
++%define CONFIG_AMOVIE_FILTER 0
++%define CONFIG_MOVIE_FILTER 0
++%define CONFIG_AFIFO_FILTER 0
++%define CONFIG_FIFO_FILTER 0
++%define CONFIG_AA_DEMUXER 0
++%define CONFIG_AAC_DEMUXER 1
++%define CONFIG_AAX_DEMUXER 0
++%define CONFIG_AC3_DEMUXER 0
++%define CONFIG_ACE_DEMUXER 0
++%define CONFIG_ACM_DEMUXER 0
++%define CONFIG_ACT_DEMUXER 0
++%define CONFIG_ADF_DEMUXER 0
++%define CONFIG_ADP_DEMUXER 0
++%define CONFIG_ADS_DEMUXER 0
++%define CONFIG_ADX_DEMUXER 0
++%define CONFIG_AEA_DEMUXER 0
++%define CONFIG_AFC_DEMUXER 0
++%define CONFIG_AIFF_DEMUXER 0
++%define CONFIG_AIX_DEMUXER 0
++%define CONFIG_ALP_DEMUXER 0
++%define CONFIG_AMR_DEMUXER 0
++%define CONFIG_AMRNB_DEMUXER 0
++%define CONFIG_AMRWB_DEMUXER 0
++%define CONFIG_ANM_DEMUXER 0
++%define CONFIG_APC_DEMUXER 0
++%define CONFIG_APE_DEMUXER 0
++%define CONFIG_APM_DEMUXER 0
++%define CONFIG_APNG_DEMUXER 0
++%define CONFIG_APTX_DEMUXER 0
++%define CONFIG_APTX_HD_DEMUXER 0
++%define CONFIG_AQTITLE_DEMUXER 0
++%define CONFIG_ARGO_ASF_DEMUXER 0
++%define CONFIG_ARGO_BRP_DEMUXER 0
++%define CONFIG_ARGO_CVG_DEMUXER 0
++%define CONFIG_ASF_DEMUXER 0
++%define CONFIG_ASF_O_DEMUXER 0
++%define CONFIG_ASS_DEMUXER 0
++%define CONFIG_AST_DEMUXER 0
++%define CONFIG_AU_DEMUXER 0
++%define CONFIG_AV1_DEMUXER 0
++%define CONFIG_AVI_DEMUXER 0
++%define CONFIG_AVISYNTH_DEMUXER 0
++%define CONFIG_AVR_DEMUXER 0
++%define CONFIG_AVS_DEMUXER 0
++%define CONFIG_AVS2_DEMUXER 0
++%define CONFIG_AVS3_DEMUXER 0
++%define CONFIG_BETHSOFTVID_DEMUXER 0
++%define CONFIG_BFI_DEMUXER 0
++%define CONFIG_BINTEXT_DEMUXER 0
++%define CONFIG_BINK_DEMUXER 0
++%define CONFIG_BINKA_DEMUXER 0
++%define CONFIG_BIT_DEMUXER 0
++%define CONFIG_BITPACKED_DEMUXER 0
++%define CONFIG_BMV_DEMUXER 0
++%define CONFIG_BFSTM_DEMUXER 0
++%define CONFIG_BRSTM_DEMUXER 0
++%define CONFIG_BOA_DEMUXER 0
++%define CONFIG_C93_DEMUXER 0
++%define CONFIG_CAF_DEMUXER 0
++%define CONFIG_CAVSVIDEO_DEMUXER 0
++%define CONFIG_CDG_DEMUXER 0
++%define CONFIG_CDXL_DEMUXER 0
++%define CONFIG_CINE_DEMUXER 0
++%define CONFIG_CODEC2_DEMUXER 0
++%define CONFIG_CODEC2RAW_DEMUXER 0
++%define CONFIG_CONCAT_DEMUXER 0
++%define CONFIG_DASH_DEMUXER 0
++%define CONFIG_DATA_DEMUXER 0
++%define CONFIG_DAUD_DEMUXER 0
++%define CONFIG_DCSTR_DEMUXER 0
++%define CONFIG_DERF_DEMUXER 0
++%define CONFIG_DFA_DEMUXER 0
++%define CONFIG_DHAV_DEMUXER 0
++%define CONFIG_DIRAC_DEMUXER 0
++%define CONFIG_DNXHD_DEMUXER 0
++%define CONFIG_DSF_DEMUXER 0
++%define CONFIG_DSICIN_DEMUXER 0
++%define CONFIG_DSS_DEMUXER 0
++%define CONFIG_DTS_DEMUXER 0
++%define CONFIG_DTSHD_DEMUXER 0
++%define CONFIG_DV_DEMUXER 0
++%define CONFIG_DVBSUB_DEMUXER 0
++%define CONFIG_DVBTXT_DEMUXER 0
++%define CONFIG_DXA_DEMUXER 0
++%define CONFIG_EA_DEMUXER 0
++%define CONFIG_EA_CDATA_DEMUXER 0
++%define CONFIG_EAC3_DEMUXER 0
++%define CONFIG_EPAF_DEMUXER 0
++%define CONFIG_FFMETADATA_DEMUXER 0
++%define CONFIG_FILMSTRIP_DEMUXER 0
++%define CONFIG_FITS_DEMUXER 0
++%define CONFIG_FLAC_DEMUXER 1
++%define CONFIG_FLIC_DEMUXER 0
++%define CONFIG_FLV_DEMUXER 0
++%define CONFIG_LIVE_FLV_DEMUXER 0
++%define CONFIG_FOURXM_DEMUXER 0
++%define CONFIG_FRM_DEMUXER 0
++%define CONFIG_FSB_DEMUXER 0
++%define CONFIG_FWSE_DEMUXER 0
++%define CONFIG_G722_DEMUXER 0
++%define CONFIG_G723_1_DEMUXER 0
++%define CONFIG_G726_DEMUXER 0
++%define CONFIG_G726LE_DEMUXER 0
++%define CONFIG_G729_DEMUXER 0
++%define CONFIG_GDV_DEMUXER 0
++%define CONFIG_GENH_DEMUXER 0
++%define CONFIG_GIF_DEMUXER 0
++%define CONFIG_GSM_DEMUXER 0
++%define CONFIG_GXF_DEMUXER 0
++%define CONFIG_H261_DEMUXER 0
++%define CONFIG_H263_DEMUXER 0
++%define CONFIG_H264_DEMUXER 0
++%define CONFIG_HCA_DEMUXER 0
++%define CONFIG_HCOM_DEMUXER 0
++%define CONFIG_HEVC_DEMUXER 0
++%define CONFIG_HLS_DEMUXER 0
++%define CONFIG_HNM_DEMUXER 0
++%define CONFIG_ICO_DEMUXER 0
++%define CONFIG_IDCIN_DEMUXER 0
++%define CONFIG_IDF_DEMUXER 0
++%define CONFIG_IFF_DEMUXER 0
++%define CONFIG_IFV_DEMUXER 0
++%define CONFIG_ILBC_DEMUXER 0
++%define CONFIG_IMAGE2_DEMUXER 0
++%define CONFIG_IMAGE2PIPE_DEMUXER 0
++%define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0
++%define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0
++%define CONFIG_IMF_DEMUXER 0
++%define CONFIG_INGENIENT_DEMUXER 0
++%define CONFIG_IPMOVIE_DEMUXER 0
++%define CONFIG_IPU_DEMUXER 0
++%define CONFIG_IRCAM_DEMUXER 0
++%define CONFIG_ISS_DEMUXER 0
++%define CONFIG_IV8_DEMUXER 0
++%define CONFIG_IVF_DEMUXER 0
++%define CONFIG_IVR_DEMUXER 0
++%define CONFIG_JACOSUB_DEMUXER 0
++%define CONFIG_JV_DEMUXER 0
++%define CONFIG_KUX_DEMUXER 0
++%define CONFIG_KVAG_DEMUXER 0
++%define CONFIG_LMLM4_DEMUXER 0
++%define CONFIG_LOAS_DEMUXER 0
++%define CONFIG_LUODAT_DEMUXER 0
++%define CONFIG_LRC_DEMUXER 0
++%define CONFIG_LVF_DEMUXER 0
++%define CONFIG_LXF_DEMUXER 0
++%define CONFIG_M4V_DEMUXER 0
++%define CONFIG_MCA_DEMUXER 0
++%define CONFIG_MCC_DEMUXER 0
++%define CONFIG_MATROSKA_DEMUXER 1
++%define CONFIG_MGSTS_DEMUXER 0
++%define CONFIG_MICRODVD_DEMUXER 0
++%define CONFIG_MJPEG_DEMUXER 0
++%define CONFIG_MJPEG_2000_DEMUXER 0
++%define CONFIG_MLP_DEMUXER 0
++%define CONFIG_MLV_DEMUXER 0
++%define CONFIG_MM_DEMUXER 0
++%define CONFIG_MMF_DEMUXER 0
++%define CONFIG_MODS_DEMUXER 0
++%define CONFIG_MOFLEX_DEMUXER 0
++%define CONFIG_MOV_DEMUXER 1
++%define CONFIG_MP3_DEMUXER 1
++%define CONFIG_MPC_DEMUXER 0
++%define CONFIG_MPC8_DEMUXER 0
++%define CONFIG_MPEGPS_DEMUXER 0
++%define CONFIG_MPEGTS_DEMUXER 0
++%define CONFIG_MPEGTSRAW_DEMUXER 0
++%define CONFIG_MPEGVIDEO_DEMUXER 0
++%define CONFIG_MPJPEG_DEMUXER 0
++%define CONFIG_MPL2_DEMUXER 0
++%define CONFIG_MPSUB_DEMUXER 0
++%define CONFIG_MSF_DEMUXER 0
++%define CONFIG_MSNWC_TCP_DEMUXER 0
++%define CONFIG_MSP_DEMUXER 0
++%define CONFIG_MTAF_DEMUXER 0
++%define CONFIG_MTV_DEMUXER 0
++%define CONFIG_MUSX_DEMUXER 0
++%define CONFIG_MV_DEMUXER 0
++%define CONFIG_MVI_DEMUXER 0
++%define CONFIG_MXF_DEMUXER 0
++%define CONFIG_MXG_DEMUXER 0
++%define CONFIG_NC_DEMUXER 0
++%define CONFIG_NISTSPHERE_DEMUXER 0
++%define CONFIG_NSP_DEMUXER 0
++%define CONFIG_NSV_DEMUXER 0
++%define CONFIG_NUT_DEMUXER 0
++%define CONFIG_NUV_DEMUXER 0
++%define CONFIG_OBU_DEMUXER 0
++%define CONFIG_OGG_DEMUXER 1
++%define CONFIG_OMA_DEMUXER 0
++%define CONFIG_PAF_DEMUXER 0
++%define CONFIG_PCM_ALAW_DEMUXER 0
++%define CONFIG_PCM_MULAW_DEMUXER 0
++%define CONFIG_PCM_VIDC_DEMUXER 0
++%define CONFIG_PCM_F64BE_DEMUXER 0
++%define CONFIG_PCM_F64LE_DEMUXER 0
++%define CONFIG_PCM_F32BE_DEMUXER 0
++%define CONFIG_PCM_F32LE_DEMUXER 0
++%define CONFIG_PCM_S32BE_DEMUXER 0
++%define CONFIG_PCM_S32LE_DEMUXER 0
++%define CONFIG_PCM_S24BE_DEMUXER 0
++%define CONFIG_PCM_S24LE_DEMUXER 0
++%define CONFIG_PCM_S16BE_DEMUXER 0
++%define CONFIG_PCM_S16LE_DEMUXER 0
++%define CONFIG_PCM_S8_DEMUXER 0
++%define CONFIG_PCM_U32BE_DEMUXER 0
++%define CONFIG_PCM_U32LE_DEMUXER 0
++%define CONFIG_PCM_U24BE_DEMUXER 0
++%define CONFIG_PCM_U24LE_DEMUXER 0
++%define CONFIG_PCM_U16BE_DEMUXER 0
++%define CONFIG_PCM_U16LE_DEMUXER 0
++%define CONFIG_PCM_U8_DEMUXER 0
++%define CONFIG_PJS_DEMUXER 0
++%define CONFIG_PMP_DEMUXER 0
++%define CONFIG_PP_BNK_DEMUXER 0
++%define CONFIG_PVA_DEMUXER 0
++%define CONFIG_PVF_DEMUXER 0
++%define CONFIG_QCP_DEMUXER 0
++%define CONFIG_R3D_DEMUXER 0
++%define CONFIG_RAWVIDEO_DEMUXER 0
++%define CONFIG_REALTEXT_DEMUXER 0
++%define CONFIG_REDSPARK_DEMUXER 0
++%define CONFIG_RL2_DEMUXER 0
++%define CONFIG_RM_DEMUXER 0
++%define CONFIG_ROQ_DEMUXER 0
++%define CONFIG_RPL_DEMUXER 0
++%define CONFIG_RSD_DEMUXER 0
++%define CONFIG_RSO_DEMUXER 0
++%define CONFIG_RTP_DEMUXER 0
++%define CONFIG_RTSP_DEMUXER 0
++%define CONFIG_S337M_DEMUXER 0
++%define CONFIG_SAMI_DEMUXER 0
++%define CONFIG_SAP_DEMUXER 0
++%define CONFIG_SBC_DEMUXER 0
++%define CONFIG_SBG_DEMUXER 0
++%define CONFIG_SCC_DEMUXER 0
++%define CONFIG_SCD_DEMUXER 0
++%define CONFIG_SDP_DEMUXER 0
++%define CONFIG_SDR2_DEMUXER 0
++%define CONFIG_SDS_DEMUXER 0
++%define CONFIG_SDX_DEMUXER 0
++%define CONFIG_SEGAFILM_DEMUXER 0
++%define CONFIG_SER_DEMUXER 0
++%define CONFIG_SGA_DEMUXER 0
++%define CONFIG_SHORTEN_DEMUXER 0
++%define CONFIG_SIFF_DEMUXER 0
++%define CONFIG_SIMBIOSIS_IMX_DEMUXER 0
++%define CONFIG_SLN_DEMUXER 0
++%define CONFIG_SMACKER_DEMUXER 0
++%define CONFIG_SMJPEG_DEMUXER 0
++%define CONFIG_SMUSH_DEMUXER 0
++%define CONFIG_SOL_DEMUXER 0
++%define CONFIG_SOX_DEMUXER 0
++%define CONFIG_SPDIF_DEMUXER 0
++%define CONFIG_SRT_DEMUXER 0
++%define CONFIG_STR_DEMUXER 0
++%define CONFIG_STL_DEMUXER 0
++%define CONFIG_SUBVIEWER1_DEMUXER 0
++%define CONFIG_SUBVIEWER_DEMUXER 0
++%define CONFIG_SUP_DEMUXER 0
++%define CONFIG_SVAG_DEMUXER 0
++%define CONFIG_SVS_DEMUXER 0
++%define CONFIG_SWF_DEMUXER 0
++%define CONFIG_TAK_DEMUXER 0
++%define CONFIG_TEDCAPTIONS_DEMUXER 0
++%define CONFIG_THP_DEMUXER 0
++%define CONFIG_THREEDOSTR_DEMUXER 0
++%define CONFIG_TIERTEXSEQ_DEMUXER 0
++%define CONFIG_TMV_DEMUXER 0
++%define CONFIG_TRUEHD_DEMUXER 0
++%define CONFIG_TTA_DEMUXER 0
++%define CONFIG_TXD_DEMUXER 0
++%define CONFIG_TTY_DEMUXER 0
++%define CONFIG_TY_DEMUXER 0
++%define CONFIG_V210_DEMUXER 0
++%define CONFIG_V210X_DEMUXER 0
++%define CONFIG_VAG_DEMUXER 0
++%define CONFIG_VC1_DEMUXER 0
++%define CONFIG_VC1T_DEMUXER 0
++%define CONFIG_VIVIDAS_DEMUXER 0
++%define CONFIG_VIVO_DEMUXER 0
++%define CONFIG_VMD_DEMUXER 0
++%define CONFIG_VOBSUB_DEMUXER 0
++%define CONFIG_VOC_DEMUXER 0
++%define CONFIG_VPK_DEMUXER 0
++%define CONFIG_VPLAYER_DEMUXER 0
++%define CONFIG_VQF_DEMUXER 0
++%define CONFIG_W64_DEMUXER 0
++%define CONFIG_WAV_DEMUXER 1
++%define CONFIG_WC3_DEMUXER 0
++%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
++%define CONFIG_WEBVTT_DEMUXER 0
++%define CONFIG_WSAUD_DEMUXER 0
++%define CONFIG_WSD_DEMUXER 0
++%define CONFIG_WSVQA_DEMUXER 0
++%define CONFIG_WTV_DEMUXER 0
++%define CONFIG_WVE_DEMUXER 0
++%define CONFIG_WV_DEMUXER 0
++%define CONFIG_XA_DEMUXER 0
++%define CONFIG_XBIN_DEMUXER 0
++%define CONFIG_XMV_DEMUXER 0
++%define CONFIG_XVAG_DEMUXER 0
++%define CONFIG_XWMA_DEMUXER 0
++%define CONFIG_YOP_DEMUXER 0
++%define CONFIG_YUV4MPEGPIPE_DEMUXER 0
++%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
++%define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
++%define CONFIG_LIBGME_DEMUXER 0
++%define CONFIG_LIBMODPLUG_DEMUXER 0
++%define CONFIG_LIBOPENMPT_DEMUXER 0
++%define CONFIG_VAPOURSYNTH_DEMUXER 0
++%define CONFIG_A64_MUXER 0
++%define CONFIG_AC3_MUXER 0
++%define CONFIG_ADTS_MUXER 0
++%define CONFIG_ADX_MUXER 0
++%define CONFIG_AIFF_MUXER 0
++%define CONFIG_ALP_MUXER 0
++%define CONFIG_AMR_MUXER 0
++%define CONFIG_AMV_MUXER 0
++%define CONFIG_APM_MUXER 0
++%define CONFIG_APNG_MUXER 0
++%define CONFIG_APTX_MUXER 0
++%define CONFIG_APTX_HD_MUXER 0
++%define CONFIG_ARGO_ASF_MUXER 0
++%define CONFIG_ARGO_CVG_MUXER 0
++%define CONFIG_ASF_MUXER 0
++%define CONFIG_ASS_MUXER 0
++%define CONFIG_AST_MUXER 0
++%define CONFIG_ASF_STREAM_MUXER 0
++%define CONFIG_AU_MUXER 0
++%define CONFIG_AVI_MUXER 0
++%define CONFIG_AVM2_MUXER 0
++%define CONFIG_AVS2_MUXER 0
++%define CONFIG_AVS3_MUXER 0
++%define CONFIG_BIT_MUXER 0
++%define CONFIG_CAF_MUXER 0
++%define CONFIG_CAVSVIDEO_MUXER 0
++%define CONFIG_CODEC2_MUXER 0
++%define CONFIG_CODEC2RAW_MUXER 0
++%define CONFIG_CRC_MUXER 0
++%define CONFIG_DASH_MUXER 0
++%define CONFIG_DATA_MUXER 0
++%define CONFIG_DAUD_MUXER 0
++%define CONFIG_DIRAC_MUXER 0
++%define CONFIG_DNXHD_MUXER 0
++%define CONFIG_DTS_MUXER 0
++%define CONFIG_DV_MUXER 0
++%define CONFIG_EAC3_MUXER 0
++%define CONFIG_F4V_MUXER 0
++%define CONFIG_FFMETADATA_MUXER 0
++%define CONFIG_FIFO_MUXER 0
++%define CONFIG_FIFO_TEST_MUXER 0
++%define CONFIG_FILMSTRIP_MUXER 0
++%define CONFIG_FITS_MUXER 0
++%define CONFIG_FLAC_MUXER 0
++%define CONFIG_FLV_MUXER 0
++%define CONFIG_FRAMECRC_MUXER 0
++%define CONFIG_FRAMEHASH_MUXER 0
++%define CONFIG_FRAMEMD5_MUXER 0
++%define CONFIG_G722_MUXER 0
++%define CONFIG_G723_1_MUXER 0
++%define CONFIG_G726_MUXER 0
++%define CONFIG_G726LE_MUXER 0
++%define CONFIG_GIF_MUXER 0
++%define CONFIG_GSM_MUXER 0
++%define CONFIG_GXF_MUXER 0
++%define CONFIG_H261_MUXER 0
++%define CONFIG_H263_MUXER 0
++%define CONFIG_H264_MUXER 0
++%define CONFIG_HASH_MUXER 0
++%define CONFIG_HDS_MUXER 0
++%define CONFIG_HEVC_MUXER 0
++%define CONFIG_HLS_MUXER 0
++%define CONFIG_ICO_MUXER 0
++%define CONFIG_ILBC_MUXER 0
++%define CONFIG_IMAGE2_MUXER 0
++%define CONFIG_IMAGE2PIPE_MUXER 0
++%define CONFIG_IPOD_MUXER 0
++%define CONFIG_IRCAM_MUXER 0
++%define CONFIG_ISMV_MUXER 0
++%define CONFIG_IVF_MUXER 0
++%define CONFIG_JACOSUB_MUXER 0
++%define CONFIG_KVAG_MUXER 0
++%define CONFIG_LATM_MUXER 0
++%define CONFIG_LRC_MUXER 0
++%define CONFIG_M4V_MUXER 0
++%define CONFIG_MD5_MUXER 0
++%define CONFIG_MATROSKA_MUXER 0
++%define CONFIG_MATROSKA_AUDIO_MUXER 0
++%define CONFIG_MICRODVD_MUXER 0
++%define CONFIG_MJPEG_MUXER 0
++%define CONFIG_MLP_MUXER 0
++%define CONFIG_MMF_MUXER 0
++%define CONFIG_MOV_MUXER 0
++%define CONFIG_MP2_MUXER 0
++%define CONFIG_MP3_MUXER 0
++%define CONFIG_MP4_MUXER 0
++%define CONFIG_MPEG1SYSTEM_MUXER 0
++%define CONFIG_MPEG1VCD_MUXER 0
++%define CONFIG_MPEG1VIDEO_MUXER 0
++%define CONFIG_MPEG2DVD_MUXER 0
++%define CONFIG_MPEG2SVCD_MUXER 0
++%define CONFIG_MPEG2VIDEO_MUXER 0
++%define CONFIG_MPEG2VOB_MUXER 0
++%define CONFIG_MPEGTS_MUXER 0
++%define CONFIG_MPJPEG_MUXER 0
++%define CONFIG_MXF_MUXER 0
++%define CONFIG_MXF_D10_MUXER 0
++%define CONFIG_MXF_OPATOM_MUXER 0
++%define CONFIG_NULL_MUXER 0
++%define CONFIG_NUT_MUXER 0
++%define CONFIG_OBU_MUXER 0
++%define CONFIG_OGA_MUXER 0
++%define CONFIG_OGG_MUXER 0
++%define CONFIG_OGV_MUXER 0
++%define CONFIG_OMA_MUXER 0
++%define CONFIG_OPUS_MUXER 0
++%define CONFIG_PCM_ALAW_MUXER 0
++%define CONFIG_PCM_MULAW_MUXER 0
++%define CONFIG_PCM_VIDC_MUXER 0
++%define CONFIG_PCM_F64BE_MUXER 0
++%define CONFIG_PCM_F64LE_MUXER 0
++%define CONFIG_PCM_F32BE_MUXER 0
++%define CONFIG_PCM_F32LE_MUXER 0
++%define CONFIG_PCM_S32BE_MUXER 0
++%define CONFIG_PCM_S32LE_MUXER 0
++%define CONFIG_PCM_S24BE_MUXER 0
++%define CONFIG_PCM_S24LE_MUXER 0
++%define CONFIG_PCM_S16BE_MUXER 0
++%define CONFIG_PCM_S16LE_MUXER 0
++%define CONFIG_PCM_S8_MUXER 0
++%define CONFIG_PCM_U32BE_MUXER 0
++%define CONFIG_PCM_U32LE_MUXER 0
++%define CONFIG_PCM_U24BE_MUXER 0
++%define CONFIG_PCM_U24LE_MUXER 0
++%define CONFIG_PCM_U16BE_MUXER 0
++%define CONFIG_PCM_U16LE_MUXER 0
++%define CONFIG_PCM_U8_MUXER 0
++%define CONFIG_PSP_MUXER 0
++%define CONFIG_RAWVIDEO_MUXER 0
++%define CONFIG_RM_MUXER 0
++%define CONFIG_ROQ_MUXER 0
++%define CONFIG_RSO_MUXER 0
++%define CONFIG_RTP_MUXER 0
++%define CONFIG_RTP_MPEGTS_MUXER 0
++%define CONFIG_RTSP_MUXER 0
++%define CONFIG_SAP_MUXER 0
++%define CONFIG_SBC_MUXER 0
++%define CONFIG_SCC_MUXER 0
++%define CONFIG_SEGAFILM_MUXER 0
++%define CONFIG_SEGMENT_MUXER 0
++%define CONFIG_STREAM_SEGMENT_MUXER 0
++%define CONFIG_SMJPEG_MUXER 0
++%define CONFIG_SMOOTHSTREAMING_MUXER 0
++%define CONFIG_SOX_MUXER 0
++%define CONFIG_SPX_MUXER 0
++%define CONFIG_SPDIF_MUXER 0
++%define CONFIG_SRT_MUXER 0
++%define CONFIG_STREAMHASH_MUXER 0
++%define CONFIG_SUP_MUXER 0
++%define CONFIG_SWF_MUXER 0
++%define CONFIG_TEE_MUXER 0
++%define CONFIG_TG2_MUXER 0
++%define CONFIG_TGP_MUXER 0
++%define CONFIG_MKVTIMESTAMP_V2_MUXER 0
++%define CONFIG_TRUEHD_MUXER 0
++%define CONFIG_TTA_MUXER 0
++%define CONFIG_TTML_MUXER 0
++%define CONFIG_UNCODEDFRAMECRC_MUXER 0
++%define CONFIG_VC1_MUXER 0
++%define CONFIG_VC1T_MUXER 0
++%define CONFIG_VOC_MUXER 0
++%define CONFIG_W64_MUXER 0
++%define CONFIG_WAV_MUXER 0
++%define CONFIG_WEBM_MUXER 0
++%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
++%define CONFIG_WEBM_CHUNK_MUXER 0
++%define CONFIG_WEBP_MUXER 0
++%define CONFIG_WEBVTT_MUXER 0
++%define CONFIG_WSAUD_MUXER 0
++%define CONFIG_WTV_MUXER 0
++%define CONFIG_WV_MUXER 0
++%define CONFIG_YUV4MPEGPIPE_MUXER 0
++%define CONFIG_CHROMAPRINT_MUXER 0
++%define CONFIG_ASYNC_PROTOCOL 0
++%define CONFIG_BLURAY_PROTOCOL 0
++%define CONFIG_CACHE_PROTOCOL 0
++%define CONFIG_CONCAT_PROTOCOL 0
++%define CONFIG_CONCATF_PROTOCOL 0
++%define CONFIG_CRYPTO_PROTOCOL 0
++%define CONFIG_DATA_PROTOCOL 0
++%define CONFIG_FFRTMPCRYPT_PROTOCOL 0
++%define CONFIG_FFRTMPHTTP_PROTOCOL 0
++%define CONFIG_FILE_PROTOCOL 0
++%define CONFIG_FTP_PROTOCOL 0
++%define CONFIG_GOPHER_PROTOCOL 0
++%define CONFIG_GOPHERS_PROTOCOL 0
++%define CONFIG_HLS_PROTOCOL 0
++%define CONFIG_HTTP_PROTOCOL 0
++%define CONFIG_HTTPPROXY_PROTOCOL 0
++%define CONFIG_HTTPS_PROTOCOL 0
++%define CONFIG_ICECAST_PROTOCOL 0
++%define CONFIG_MMSH_PROTOCOL 0
++%define CONFIG_MMST_PROTOCOL 0
++%define CONFIG_MD5_PROTOCOL 0
++%define CONFIG_PIPE_PROTOCOL 0
++%define CONFIG_PROMPEG_PROTOCOL 0
++%define CONFIG_RTMP_PROTOCOL 0
++%define CONFIG_RTMPE_PROTOCOL 0
++%define CONFIG_RTMPS_PROTOCOL 0
++%define CONFIG_RTMPT_PROTOCOL 0
++%define CONFIG_RTMPTE_PROTOCOL 0
++%define CONFIG_RTMPTS_PROTOCOL 0
++%define CONFIG_RTP_PROTOCOL 0
++%define CONFIG_SCTP_PROTOCOL 0
++%define CONFIG_SRTP_PROTOCOL 0
++%define CONFIG_SUBFILE_PROTOCOL 0
++%define CONFIG_TEE_PROTOCOL 0
++%define CONFIG_TCP_PROTOCOL 0
++%define CONFIG_TLS_PROTOCOL 0
++%define CONFIG_UDP_PROTOCOL 0
++%define CONFIG_UDPLITE_PROTOCOL 0
++%define CONFIG_UNIX_PROTOCOL 0
++%define CONFIG_LIBAMQP_PROTOCOL 0
++%define CONFIG_LIBRIST_PROTOCOL 0
++%define CONFIG_LIBRTMP_PROTOCOL 0
++%define CONFIG_LIBRTMPE_PROTOCOL 0
++%define CONFIG_LIBRTMPS_PROTOCOL 0
++%define CONFIG_LIBRTMPT_PROTOCOL 0
++%define CONFIG_LIBRTMPTE_PROTOCOL 0
++%define CONFIG_LIBSRT_PROTOCOL 0
++%define CONFIG_LIBSSH_PROTOCOL 0
++%define CONFIG_LIBSMBCLIENT_PROTOCOL 0
++%define CONFIG_LIBZMQ_PROTOCOL 0
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h
index 0ed641c28b44..7dbbc890e2b8 100644
--- a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h
+++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config.h
@@ -1,10 +1,10 @@
---- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2022-05-20 05:38:37 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2022-06-17 14:20:10 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h
-@@ -0,0 +1,737 @@
+@@ -0,0 +1,2787 @@
+/* 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/d/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/jrummell/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define CONFIG_THIS_YEAR 2022
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -66,7 +66,6 @@
+#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
@@ -114,7 +113,6 @@
+#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
@@ -162,7 +160,6 @@
+#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
@@ -248,7 +245,7 @@
+#define HAVE_TERMIOS_H 1
+#define HAVE_UDPLITE_H 0
+#define HAVE_UNISTD_H 1
-+#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */
++#define HAVE_VALGRIND_VALGRIND_H 0
+#define HAVE_WINDOWS_H 0
+#define HAVE_WINSOCK2_H 0
+#define HAVE_INTRINSICS_NEON 0
@@ -296,7 +293,6 @@
+#define HAVE_COMMANDLINETOARGVW 0
+#define HAVE_FCNTL 1
+#define HAVE_GETADDRINFO 0
-+#define HAVE_GETAUXVAL 0
+#define HAVE_GETHRTIME 0
+#define HAVE_GETOPT 1
+#define HAVE_GETMODULEHANDLE 0
@@ -336,7 +332,7 @@
+#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_SYSCTL 1
+#define HAVE_USLEEP 1
+#define HAVE_UTGETOSTYPEFROMSTRING 0
+#define HAVE_VIRTUALALLOC 0
@@ -582,6 +578,7 @@
+#define CONFIG_VIDEOTOOLBOX 0
+#define CONFIG_VULKAN 0
+#define CONFIG_V4L2_M2M 0
++#define CONFIG_XVMC 0
+#define CONFIG_FTRAPV 0
+#define CONFIG_GRAY 0
+#define CONFIG_HARDCODED_TABLES 0
@@ -613,6 +610,7 @@
+#define CONFIG_FAST_UNALIGNED 1
+#define CONFIG_FFT 1
+#define CONFIG_LSP 0
++#define CONFIG_LZO 0
+#define CONFIG_MDCT 1
+#define CONFIG_PIXELUTILS 0
+#define CONFIG_NETWORK 0
@@ -657,7 +655,6 @@
+#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
@@ -686,7 +683,6 @@
+#define CONFIG_IDCTDSP 0
+#define CONFIG_IIRFILTER 0
+#define CONFIG_MDCT15 1
-+#define CONFIG_INFLATE_WRAPPER 0
+#define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 1
+#define CONFIG_IVIDSP 0
@@ -737,4 +733,2058 @@
+#define CONFIG_VP8DSP 1
+#define CONFIG_WMA_FREQS 0
+#define CONFIG_WMV2DSP 0
++#define CONFIG_AAC_ADTSTOASC_BSF 0
++#define CONFIG_AV1_FRAME_MERGE_BSF 0
++#define CONFIG_AV1_FRAME_SPLIT_BSF 0
++#define CONFIG_AV1_METADATA_BSF 0
++#define CONFIG_CHOMP_BSF 0
++#define CONFIG_DUMP_EXTRADATA_BSF 0
++#define CONFIG_DCA_CORE_BSF 0
++#define CONFIG_EAC3_CORE_BSF 0
++#define CONFIG_EXTRACT_EXTRADATA_BSF 0
++#define CONFIG_FILTER_UNITS_BSF 0
++#define CONFIG_H264_METADATA_BSF 0
++#define CONFIG_H264_MP4TOANNEXB_BSF 0
++#define CONFIG_H264_REDUNDANT_PPS_BSF 0
++#define CONFIG_HAPQA_EXTRACT_BSF 0
++#define CONFIG_HEVC_METADATA_BSF 0
++#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
++#define CONFIG_IMX_DUMP_HEADER_BSF 0
++#define CONFIG_MJPEG2JPEG_BSF 0
++#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
++#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
++#define CONFIG_MPEG2_METADATA_BSF 0
++#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
++#define CONFIG_MOV2TEXTSUB_BSF 0
++#define CONFIG_NOISE_BSF 0
++#define CONFIG_NULL_BSF 0
++#define CONFIG_OPUS_METADATA_BSF 0
++#define CONFIG_PCM_RECHUNK_BSF 0
++#define CONFIG_PRORES_METADATA_BSF 0
++#define CONFIG_REMOVE_EXTRADATA_BSF 0
++#define CONFIG_SETTS_BSF 0
++#define CONFIG_TEXT2MOVSUB_BSF 0
++#define CONFIG_TRACE_HEADERS_BSF 0
++#define CONFIG_TRUEHD_CORE_BSF 0
++#define CONFIG_VP9_METADATA_BSF 0
++#define CONFIG_VP9_RAW_REORDER_BSF 0
++#define CONFIG_VP9_SUPERFRAME_BSF 0
++#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
++#define CONFIG_AASC_DECODER 0
++#define CONFIG_AIC_DECODER 0
++#define CONFIG_ALIAS_PIX_DECODER 0
++#define CONFIG_AGM_DECODER 0
++#define CONFIG_AMV_DECODER 0
++#define CONFIG_ANM_DECODER 0
++#define CONFIG_ANSI_DECODER 0
++#define CONFIG_APNG_DECODER 0
++#define CONFIG_ARBC_DECODER 0
++#define CONFIG_ARGO_DECODER 0
++#define CONFIG_ASV1_DECODER 0
++#define CONFIG_ASV2_DECODER 0
++#define CONFIG_AURA_DECODER 0
++#define CONFIG_AURA2_DECODER 0
++#define CONFIG_AVRP_DECODER 0
++#define CONFIG_AVRN_DECODER 0
++#define CONFIG_AVS_DECODER 0
++#define CONFIG_AVUI_DECODER 0
++#define CONFIG_AYUV_DECODER 0
++#define CONFIG_BETHSOFTVID_DECODER 0
++#define CONFIG_BFI_DECODER 0
++#define CONFIG_BINK_DECODER 0
++#define CONFIG_BITPACKED_DECODER 0
++#define CONFIG_BMP_DECODER 0
++#define CONFIG_BMV_VIDEO_DECODER 0
++#define CONFIG_BRENDER_PIX_DECODER 0
++#define CONFIG_C93_DECODER 0
++#define CONFIG_CAVS_DECODER 0
++#define CONFIG_CDGRAPHICS_DECODER 0
++#define CONFIG_CDTOONS_DECODER 0
++#define CONFIG_CDXL_DECODER 0
++#define CONFIG_CFHD_DECODER 0
++#define CONFIG_CINEPAK_DECODER 0
++#define CONFIG_CLEARVIDEO_DECODER 0
++#define CONFIG_CLJR_DECODER 0
++#define CONFIG_CLLC_DECODER 0
++#define CONFIG_COMFORTNOISE_DECODER 0
++#define CONFIG_CPIA_DECODER 0
++#define CONFIG_CRI_DECODER 0
++#define CONFIG_CSCD_DECODER 0
++#define CONFIG_CYUV_DECODER 0
++#define CONFIG_DDS_DECODER 0
++#define CONFIG_DFA_DECODER 0
++#define CONFIG_DIRAC_DECODER 0
++#define CONFIG_DNXHD_DECODER 0
++#define CONFIG_DPX_DECODER 0
++#define CONFIG_DSICINVIDEO_DECODER 0
++#define CONFIG_DVAUDIO_DECODER 0
++#define CONFIG_DVVIDEO_DECODER 0
++#define CONFIG_DXA_DECODER 0
++#define CONFIG_DXTORY_DECODER 0
++#define CONFIG_DXV_DECODER 0
++#define CONFIG_EACMV_DECODER 0
++#define CONFIG_EAMAD_DECODER 0
++#define CONFIG_EATGQ_DECODER 0
++#define CONFIG_EATGV_DECODER 0
++#define CONFIG_EATQI_DECODER 0
++#define CONFIG_EIGHTBPS_DECODER 0
++#define CONFIG_EIGHTSVX_EXP_DECODER 0
++#define CONFIG_EIGHTSVX_FIB_DECODER 0
++#define CONFIG_ESCAPE124_DECODER 0
++#define CONFIG_ESCAPE130_DECODER 0
++#define CONFIG_EXR_DECODER 0
++#define CONFIG_FFV1_DECODER 0
++#define CONFIG_FFVHUFF_DECODER 0
++#define CONFIG_FIC_DECODER 0
++#define CONFIG_FITS_DECODER 0
++#define CONFIG_FLASHSV_DECODER 0
++#define CONFIG_FLASHSV2_DECODER 0
++#define CONFIG_FLIC_DECODER 0
++#define CONFIG_FLV_DECODER 0
++#define CONFIG_FMVC_DECODER 0
++#define CONFIG_FOURXM_DECODER 0
++#define CONFIG_FRAPS_DECODER 0
++#define CONFIG_FRWU_DECODER 0
++#define CONFIG_G2M_DECODER 0
++#define CONFIG_GDV_DECODER 0
++#define CONFIG_GEM_DECODER 0
++#define CONFIG_GIF_DECODER 0
++#define CONFIG_H261_DECODER 0
++#define CONFIG_H263_DECODER 0
++#define CONFIG_H263I_DECODER 0
++#define CONFIG_H263P_DECODER 0
++#define CONFIG_H263_V4L2M2M_DECODER 0
++#define CONFIG_H264_DECODER 1
++#define CONFIG_H264_CRYSTALHD_DECODER 0
++#define CONFIG_H264_V4L2M2M_DECODER 0
++#define CONFIG_H264_MEDIACODEC_DECODER 0
++#define CONFIG_H264_MMAL_DECODER 0
++#define CONFIG_H264_QSV_DECODER 0
++#define CONFIG_H264_RKMPP_DECODER 0
++#define CONFIG_HAP_DECODER 0
++#define CONFIG_HEVC_DECODER 0
++#define CONFIG_HEVC_QSV_DECODER 0
++#define CONFIG_HEVC_RKMPP_DECODER 0
++#define CONFIG_HEVC_V4L2M2M_DECODER 0
++#define CONFIG_HNM4_VIDEO_DECODER 0
++#define CONFIG_HQ_HQA_DECODER 0
++#define CONFIG_HQX_DECODER 0
++#define CONFIG_HUFFYUV_DECODER 0
++#define CONFIG_HYMT_DECODER 0
++#define CONFIG_IDCIN_DECODER 0
++#define CONFIG_IFF_ILBM_DECODER 0
++#define CONFIG_IMM4_DECODER 0
++#define CONFIG_IMM5_DECODER 0
++#define CONFIG_INDEO2_DECODER 0
++#define CONFIG_INDEO3_DECODER 0
++#define CONFIG_INDEO4_DECODER 0
++#define CONFIG_INDEO5_DECODER 0
++#define CONFIG_INTERPLAY_VIDEO_DECODER 0
++#define CONFIG_IPU_DECODER 0
++#define CONFIG_JPEG2000_DECODER 0
++#define CONFIG_JPEGLS_DECODER 0
++#define CONFIG_JV_DECODER 0
++#define CONFIG_KGV1_DECODER 0
++#define CONFIG_KMVC_DECODER 0
++#define CONFIG_LAGARITH_DECODER 0
++#define CONFIG_LOCO_DECODER 0
++#define CONFIG_LSCR_DECODER 0
++#define CONFIG_M101_DECODER 0
++#define CONFIG_MAGICYUV_DECODER 0
++#define CONFIG_MDEC_DECODER 0
++#define CONFIG_MIMIC_DECODER 0
++#define CONFIG_MJPEG_DECODER 0
++#define CONFIG_MJPEGB_DECODER 0
++#define CONFIG_MMVIDEO_DECODER 0
++#define CONFIG_MOBICLIP_DECODER 0
++#define CONFIG_MOTIONPIXELS_DECODER 0
++#define CONFIG_MPEG1VIDEO_DECODER 0
++#define CONFIG_MPEG2VIDEO_DECODER 0
++#define CONFIG_MPEG4_DECODER 0
++#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
++#define CONFIG_MPEG4_V4L2M2M_DECODER 0
++#define CONFIG_MPEG4_MMAL_DECODER 0
++#define CONFIG_MPEGVIDEO_DECODER 0
++#define CONFIG_MPEG1_V4L2M2M_DECODER 0
++#define CONFIG_MPEG2_MMAL_DECODER 0
++#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
++#define CONFIG_MPEG2_V4L2M2M_DECODER 0
++#define CONFIG_MPEG2_QSV_DECODER 0
++#define CONFIG_MPEG2_MEDIACODEC_DECODER 0
++#define CONFIG_MSA1_DECODER 0
++#define CONFIG_MSCC_DECODER 0
++#define CONFIG_MSMPEG4V1_DECODER 0
++#define CONFIG_MSMPEG4V2_DECODER 0
++#define CONFIG_MSMPEG4V3_DECODER 0
++#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
++#define CONFIG_MSP2_DECODER 0
++#define CONFIG_MSRLE_DECODER 0
++#define CONFIG_MSS1_DECODER 0
++#define CONFIG_MSS2_DECODER 0
++#define CONFIG_MSVIDEO1_DECODER 0
++#define CONFIG_MSZH_DECODER 0
++#define CONFIG_MTS2_DECODER 0
++#define CONFIG_MV30_DECODER 0
++#define CONFIG_MVC1_DECODER 0
++#define CONFIG_MVC2_DECODER 0
++#define CONFIG_MVDV_DECODER 0
++#define CONFIG_MVHA_DECODER 0
++#define CONFIG_MWSC_DECODER 0
++#define CONFIG_MXPEG_DECODER 0
++#define CONFIG_NOTCHLC_DECODER 0
++#define CONFIG_NUV_DECODER 0
++#define CONFIG_PAF_VIDEO_DECODER 0
++#define CONFIG_PAM_DECODER 0
++#define CONFIG_PBM_DECODER 0
++#define CONFIG_PCX_DECODER 0
++#define CONFIG_PFM_DECODER 0
++#define CONFIG_PGM_DECODER 0
++#define CONFIG_PGMYUV_DECODER 0
++#define CONFIG_PGX_DECODER 0
++#define CONFIG_PHOTOCD_DECODER 0
++#define CONFIG_PICTOR_DECODER 0
++#define CONFIG_PIXLET_DECODER 0
++#define CONFIG_PNG_DECODER 0
++#define CONFIG_PPM_DECODER 0
++#define CONFIG_PRORES_DECODER 0
++#define CONFIG_PROSUMER_DECODER 0
++#define CONFIG_PSD_DECODER 0
++#define CONFIG_PTX_DECODER 0
++#define CONFIG_QDRAW_DECODER 0
++#define CONFIG_QPEG_DECODER 0
++#define CONFIG_QTRLE_DECODER 0
++#define CONFIG_R10K_DECODER 0
++#define CONFIG_R210_DECODER 0
++#define CONFIG_RASC_DECODER 0
++#define CONFIG_RAWVIDEO_DECODER 0
++#define CONFIG_RL2_DECODER 0
++#define CONFIG_ROQ_DECODER 0
++#define CONFIG_RPZA_DECODER 0
++#define CONFIG_RSCC_DECODER 0
++#define CONFIG_RV10_DECODER 0
++#define CONFIG_RV20_DECODER 0
++#define CONFIG_RV30_DECODER 0
++#define CONFIG_RV40_DECODER 0
++#define CONFIG_S302M_DECODER 0
++#define CONFIG_SANM_DECODER 0
++#define CONFIG_SCPR_DECODER 0
++#define CONFIG_SCREENPRESSO_DECODER 0
++#define CONFIG_SGA_DECODER 0
++#define CONFIG_SGI_DECODER 0
++#define CONFIG_SGIRLE_DECODER 0
++#define CONFIG_SHEERVIDEO_DECODER 0
++#define CONFIG_SIMBIOSIS_IMX_DECODER 0
++#define CONFIG_SMACKER_DECODER 0
++#define CONFIG_SMC_DECODER 0
++#define CONFIG_SMVJPEG_DECODER 0
++#define CONFIG_SNOW_DECODER 0
++#define CONFIG_SP5X_DECODER 0
++#define CONFIG_SPEEDHQ_DECODER 0
++#define CONFIG_SPEEX_DECODER 0
++#define CONFIG_SRGC_DECODER 0
++#define CONFIG_SUNRAST_DECODER 0
++#define CONFIG_SVQ1_DECODER 0
++#define CONFIG_SVQ3_DECODER 0
++#define CONFIG_TARGA_DECODER 0
++#define CONFIG_TARGA_Y216_DECODER 0
++#define CONFIG_TDSC_DECODER 0
++#define CONFIG_THEORA_DECODER 1
++#define CONFIG_THP_DECODER 0
++#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
++#define CONFIG_TIFF_DECODER 0
++#define CONFIG_TMV_DECODER 0
++#define CONFIG_TRUEMOTION1_DECODER 0
++#define CONFIG_TRUEMOTION2_DECODER 0
++#define CONFIG_TRUEMOTION2RT_DECODER 0
++#define CONFIG_TSCC_DECODER 0
++#define CONFIG_TSCC2_DECODER 0
++#define CONFIG_TXD_DECODER 0
++#define CONFIG_ULTI_DECODER 0
++#define CONFIG_UTVIDEO_DECODER 0
++#define CONFIG_V210_DECODER 0
++#define CONFIG_V210X_DECODER 0
++#define CONFIG_V308_DECODER 0
++#define CONFIG_V408_DECODER 0
++#define CONFIG_V410_DECODER 0
++#define CONFIG_VB_DECODER 0
++#define CONFIG_VBLE_DECODER 0
++#define CONFIG_VC1_DECODER 0
++#define CONFIG_VC1_CRYSTALHD_DECODER 0
++#define CONFIG_VC1IMAGE_DECODER 0
++#define CONFIG_VC1_MMAL_DECODER 0
++#define CONFIG_VC1_QSV_DECODER 0
++#define CONFIG_VC1_V4L2M2M_DECODER 0
++#define CONFIG_VCR1_DECODER 0
++#define CONFIG_VMDVIDEO_DECODER 0
++#define CONFIG_VMNC_DECODER 0
++#define CONFIG_VP3_DECODER 1
++#define CONFIG_VP4_DECODER 0
++#define CONFIG_VP5_DECODER 0
++#define CONFIG_VP6_DECODER 0
++#define CONFIG_VP6A_DECODER 0
++#define CONFIG_VP6F_DECODER 0
++#define CONFIG_VP7_DECODER 0
++#define CONFIG_VP8_DECODER 1
++#define CONFIG_VP8_RKMPP_DECODER 0
++#define CONFIG_VP8_V4L2M2M_DECODER 0
++#define CONFIG_VP9_DECODER 0
++#define CONFIG_VP9_RKMPP_DECODER 0
++#define CONFIG_VP9_V4L2M2M_DECODER 0
++#define CONFIG_VQA_DECODER 0
++#define CONFIG_WEBP_DECODER 0
++#define CONFIG_WCMV_DECODER 0
++#define CONFIG_WRAPPED_AVFRAME_DECODER 0
++#define CONFIG_WMV1_DECODER 0
++#define CONFIG_WMV2_DECODER 0
++#define CONFIG_WMV3_DECODER 0
++#define CONFIG_WMV3_CRYSTALHD_DECODER 0
++#define CONFIG_WMV3IMAGE_DECODER 0
++#define CONFIG_WNV1_DECODER 0
++#define CONFIG_XAN_WC3_DECODER 0
++#define CONFIG_XAN_WC4_DECODER 0
++#define CONFIG_XBM_DECODER 0
++#define CONFIG_XFACE_DECODER 0
++#define CONFIG_XL_DECODER 0
++#define CONFIG_XPM_DECODER 0
++#define CONFIG_XWD_DECODER 0
++#define CONFIG_Y41P_DECODER 0
++#define CONFIG_YLC_DECODER 0
++#define CONFIG_YOP_DECODER 0
++#define CONFIG_YUV4_DECODER 0
++#define CONFIG_ZERO12V_DECODER 0
++#define CONFIG_ZEROCODEC_DECODER 0
++#define CONFIG_ZLIB_DECODER 0
++#define CONFIG_ZMBV_DECODER 0
++#define CONFIG_AAC_DECODER 1
++#define CONFIG_AAC_FIXED_DECODER 0
++#define CONFIG_AAC_LATM_DECODER 0
++#define CONFIG_AC3_DECODER 0
++#define CONFIG_AC3_FIXED_DECODER 0
++#define CONFIG_ACELP_KELVIN_DECODER 0
++#define CONFIG_ALAC_DECODER 0
++#define CONFIG_ALS_DECODER 0
++#define CONFIG_AMRNB_DECODER 0
++#define CONFIG_AMRWB_DECODER 0
++#define CONFIG_APE_DECODER 0
++#define CONFIG_APTX_DECODER 0
++#define CONFIG_APTX_HD_DECODER 0
++#define CONFIG_ATRAC1_DECODER 0
++#define CONFIG_ATRAC3_DECODER 0
++#define CONFIG_ATRAC3AL_DECODER 0
++#define CONFIG_ATRAC3P_DECODER 0
++#define CONFIG_ATRAC3PAL_DECODER 0
++#define CONFIG_ATRAC9_DECODER 0
++#define CONFIG_BINKAUDIO_DCT_DECODER 0
++#define CONFIG_BINKAUDIO_RDFT_DECODER 0
++#define CONFIG_BMV_AUDIO_DECODER 0
++#define CONFIG_COOK_DECODER 0
++#define CONFIG_DCA_DECODER 0
++#define CONFIG_DOLBY_E_DECODER 0
++#define CONFIG_DSD_LSBF_DECODER 0
++#define CONFIG_DSD_MSBF_DECODER 0
++#define CONFIG_DSD_LSBF_PLANAR_DECODER 0
++#define CONFIG_DSD_MSBF_PLANAR_DECODER 0
++#define CONFIG_DSICINAUDIO_DECODER 0
++#define CONFIG_DSS_SP_DECODER 0
++#define CONFIG_DST_DECODER 0
++#define CONFIG_EAC3_DECODER 0
++#define CONFIG_EVRC_DECODER 0
++#define CONFIG_FASTAUDIO_DECODER 0
++#define CONFIG_FFWAVESYNTH_DECODER 0
++#define CONFIG_FLAC_DECODER 1
++#define CONFIG_G723_1_DECODER 0
++#define CONFIG_G729_DECODER 0
++#define CONFIG_GSM_DECODER 0
++#define CONFIG_GSM_MS_DECODER 0
++#define CONFIG_HCA_DECODER 0
++#define CONFIG_HCOM_DECODER 0
++#define CONFIG_IAC_DECODER 0
++#define CONFIG_ILBC_DECODER 0
++#define CONFIG_IMC_DECODER 0
++#define CONFIG_INTERPLAY_ACM_DECODER 0
++#define CONFIG_MACE3_DECODER 0
++#define CONFIG_MACE6_DECODER 0
++#define CONFIG_METASOUND_DECODER 0
++#define CONFIG_MLP_DECODER 0
++#define CONFIG_MP1_DECODER 0
++#define CONFIG_MP1FLOAT_DECODER 0
++#define CONFIG_MP2_DECODER 0
++#define CONFIG_MP2FLOAT_DECODER 0
++#define CONFIG_MP3FLOAT_DECODER 0
++#define CONFIG_MP3_DECODER 1
++#define CONFIG_MP3ADUFLOAT_DECODER 0
++#define CONFIG_MP3ADU_DECODER 0
++#define CONFIG_MP3ON4FLOAT_DECODER 0
++#define CONFIG_MP3ON4_DECODER 0
++#define CONFIG_MPC7_DECODER 0
++#define CONFIG_MPC8_DECODER 0
++#define CONFIG_MSNSIREN_DECODER 0
++#define CONFIG_NELLYMOSER_DECODER 0
++#define CONFIG_ON2AVC_DECODER 0
++#define CONFIG_OPUS_DECODER 0
++#define CONFIG_PAF_AUDIO_DECODER 0
++#define CONFIG_QCELP_DECODER 0
++#define CONFIG_QDM2_DECODER 0
++#define CONFIG_QDMC_DECODER 0
++#define CONFIG_RA_144_DECODER 0
++#define CONFIG_RA_288_DECODER 0
++#define CONFIG_RALF_DECODER 0
++#define CONFIG_SBC_DECODER 0
++#define CONFIG_SHORTEN_DECODER 0
++#define CONFIG_SIPR_DECODER 0
++#define CONFIG_SIREN_DECODER 0
++#define CONFIG_SMACKAUD_DECODER 0
++#define CONFIG_SONIC_DECODER 0
++#define CONFIG_TAK_DECODER 0
++#define CONFIG_TRUEHD_DECODER 0
++#define CONFIG_TRUESPEECH_DECODER 0
++#define CONFIG_TTA_DECODER 0
++#define CONFIG_TWINVQ_DECODER 0
++#define CONFIG_VMDAUDIO_DECODER 0
++#define CONFIG_VORBIS_DECODER 1
++#define CONFIG_WAVPACK_DECODER 0
++#define CONFIG_WMALOSSLESS_DECODER 0
++#define CONFIG_WMAPRO_DECODER 0
++#define CONFIG_WMAV1_DECODER 0
++#define CONFIG_WMAV2_DECODER 0
++#define CONFIG_WMAVOICE_DECODER 0
++#define CONFIG_WS_SND1_DECODER 0
++#define CONFIG_XMA1_DECODER 0
++#define CONFIG_XMA2_DECODER 0
++#define CONFIG_PCM_ALAW_DECODER 1
++#define CONFIG_PCM_BLURAY_DECODER 0
++#define CONFIG_PCM_DVD_DECODER 0
++#define CONFIG_PCM_F16LE_DECODER 0
++#define CONFIG_PCM_F24LE_DECODER 0
++#define CONFIG_PCM_F32BE_DECODER 0
++#define CONFIG_PCM_F32LE_DECODER 1
++#define CONFIG_PCM_F64BE_DECODER 0
++#define CONFIG_PCM_F64LE_DECODER 0
++#define CONFIG_PCM_LXF_DECODER 0
++#define CONFIG_PCM_MULAW_DECODER 1
++#define CONFIG_PCM_S8_DECODER 0
++#define CONFIG_PCM_S8_PLANAR_DECODER 0
++#define CONFIG_PCM_S16BE_DECODER 1
++#define CONFIG_PCM_S16BE_PLANAR_DECODER 0
++#define CONFIG_PCM_S16LE_DECODER 1
++#define CONFIG_PCM_S16LE_PLANAR_DECODER 0
++#define CONFIG_PCM_S24BE_DECODER 1
++#define CONFIG_PCM_S24DAUD_DECODER 0
++#define CONFIG_PCM_S24LE_DECODER 1
++#define CONFIG_PCM_S24LE_PLANAR_DECODER 0
++#define CONFIG_PCM_S32BE_DECODER 0
++#define CONFIG_PCM_S32LE_DECODER 1
++#define CONFIG_PCM_S32LE_PLANAR_DECODER 0
++#define CONFIG_PCM_S64BE_DECODER 0
++#define CONFIG_PCM_S64LE_DECODER 0
++#define CONFIG_PCM_SGA_DECODER 0
++#define CONFIG_PCM_U8_DECODER 1
++#define CONFIG_PCM_U16BE_DECODER 0
++#define CONFIG_PCM_U16LE_DECODER 0
++#define CONFIG_PCM_U24BE_DECODER 0
++#define CONFIG_PCM_U24LE_DECODER 0
++#define CONFIG_PCM_U32BE_DECODER 0
++#define CONFIG_PCM_U32LE_DECODER 0
++#define CONFIG_PCM_VIDC_DECODER 0
++#define CONFIG_DERF_DPCM_DECODER 0
++#define CONFIG_GREMLIN_DPCM_DECODER 0
++#define CONFIG_INTERPLAY_DPCM_DECODER 0
++#define CONFIG_ROQ_DPCM_DECODER 0
++#define CONFIG_SDX2_DPCM_DECODER 0
++#define CONFIG_SOL_DPCM_DECODER 0
++#define CONFIG_XAN_DPCM_DECODER 0
++#define CONFIG_ADPCM_4XM_DECODER 0
++#define CONFIG_ADPCM_ADX_DECODER 0
++#define CONFIG_ADPCM_AFC_DECODER 0
++#define CONFIG_ADPCM_AGM_DECODER 0
++#define CONFIG_ADPCM_AICA_DECODER 0
++#define CONFIG_ADPCM_ARGO_DECODER 0
++#define CONFIG_ADPCM_CT_DECODER 0
++#define CONFIG_ADPCM_DTK_DECODER 0
++#define CONFIG_ADPCM_EA_DECODER 0
++#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
++#define CONFIG_ADPCM_EA_R1_DECODER 0
++#define CONFIG_ADPCM_EA_R2_DECODER 0
++#define CONFIG_ADPCM_EA_R3_DECODER 0
++#define CONFIG_ADPCM_EA_XAS_DECODER 0
++#define CONFIG_ADPCM_G722_DECODER 0
++#define CONFIG_ADPCM_G726_DECODER 0
++#define CONFIG_ADPCM_G726LE_DECODER 0
++#define CONFIG_ADPCM_IMA_ACORN_DECODER 0
++#define CONFIG_ADPCM_IMA_AMV_DECODER 0
++#define CONFIG_ADPCM_IMA_ALP_DECODER 0
++#define CONFIG_ADPCM_IMA_APC_DECODER 0
++#define CONFIG_ADPCM_IMA_APM_DECODER 0
++#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
++#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
++#define CONFIG_ADPCM_IMA_DK3_DECODER 0
++#define CONFIG_ADPCM_IMA_DK4_DECODER 0
++#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
++#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
++#define CONFIG_ADPCM_IMA_ISS_DECODER 0
++#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
++#define CONFIG_ADPCM_IMA_MTF_DECODER 0
++#define CONFIG_ADPCM_IMA_OKI_DECODER 0
++#define CONFIG_ADPCM_IMA_QT_DECODER 0
++#define CONFIG_ADPCM_IMA_RAD_DECODER 0
++#define CONFIG_ADPCM_IMA_SSI_DECODER 0
++#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
++#define CONFIG_ADPCM_IMA_WAV_DECODER 0
++#define CONFIG_ADPCM_IMA_WS_DECODER 0
++#define CONFIG_ADPCM_MS_DECODER 0
++#define CONFIG_ADPCM_MTAF_DECODER 0
++#define CONFIG_ADPCM_PSX_DECODER 0
++#define CONFIG_ADPCM_SBPRO_2_DECODER 0
++#define CONFIG_ADPCM_SBPRO_3_DECODER 0
++#define CONFIG_ADPCM_SBPRO_4_DECODER 0
++#define CONFIG_ADPCM_SWF_DECODER 0
++#define CONFIG_ADPCM_THP_DECODER 0
++#define CONFIG_ADPCM_THP_LE_DECODER 0
++#define CONFIG_ADPCM_VIMA_DECODER 0
++#define CONFIG_ADPCM_XA_DECODER 0
++#define CONFIG_ADPCM_YAMAHA_DECODER 0
++#define CONFIG_ADPCM_ZORK_DECODER 0
++#define CONFIG_SSA_DECODER 0
++#define CONFIG_ASS_DECODER 0
++#define CONFIG_CCAPTION_DECODER 0
++#define CONFIG_DVBSUB_DECODER 0
++#define CONFIG_DVDSUB_DECODER 0
++#define CONFIG_JACOSUB_DECODER 0
++#define CONFIG_MICRODVD_DECODER 0
++#define CONFIG_MOVTEXT_DECODER 0
++#define CONFIG_MPL2_DECODER 0
++#define CONFIG_PGSSUB_DECODER 0
++#define CONFIG_PJS_DECODER 0
++#define CONFIG_REALTEXT_DECODER 0
++#define CONFIG_SAMI_DECODER 0
++#define CONFIG_SRT_DECODER 0
++#define CONFIG_STL_DECODER 0
++#define CONFIG_SUBRIP_DECODER 0
++#define CONFIG_SUBVIEWER_DECODER 0
++#define CONFIG_SUBVIEWER1_DECODER 0
++#define CONFIG_TEXT_DECODER 0
++#define CONFIG_VPLAYER_DECODER 0
++#define CONFIG_WEBVTT_DECODER 0
++#define CONFIG_XSUB_DECODER 0
++#define CONFIG_AAC_AT_DECODER 0
++#define CONFIG_AC3_AT_DECODER 0
++#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
++#define CONFIG_ALAC_AT_DECODER 0
++#define CONFIG_AMR_NB_AT_DECODER 0
++#define CONFIG_EAC3_AT_DECODER 0
++#define CONFIG_GSM_MS_AT_DECODER 0
++#define CONFIG_ILBC_AT_DECODER 0
++#define CONFIG_MP1_AT_DECODER 0
++#define CONFIG_MP2_AT_DECODER 0
++#define CONFIG_MP3_AT_DECODER 0
++#define CONFIG_PCM_ALAW_AT_DECODER 0
++#define CONFIG_PCM_MULAW_AT_DECODER 0
++#define CONFIG_QDMC_AT_DECODER 0
++#define CONFIG_QDM2_AT_DECODER 0
++#define CONFIG_LIBARIBB24_DECODER 0
++#define CONFIG_LIBCELT_DECODER 0
++#define CONFIG_LIBCODEC2_DECODER 0
++#define CONFIG_LIBDAV1D_DECODER 0
++#define CONFIG_LIBDAVS2_DECODER 0
++#define CONFIG_LIBFDK_AAC_DECODER 0
++#define CONFIG_LIBGSM_DECODER 0
++#define CONFIG_LIBGSM_MS_DECODER 0
++#define CONFIG_LIBILBC_DECODER 0
++#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
++#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
++#define CONFIG_LIBOPENJPEG_DECODER 0
++#define CONFIG_LIBOPUS_DECODER 1
++#define CONFIG_LIBRSVG_DECODER 0
++#define CONFIG_LIBSPEEX_DECODER 0
++#define CONFIG_LIBUAVS3D_DECODER 0
++#define CONFIG_LIBVORBIS_DECODER 0
++#define CONFIG_LIBVPX_VP8_DECODER 0
++#define CONFIG_LIBVPX_VP9_DECODER 0
++#define CONFIG_LIBZVBI_TELETEXT_DECODER 0
++#define CONFIG_BINTEXT_DECODER 0
++#define CONFIG_XBIN_DECODER 0
++#define CONFIG_IDF_DECODER 0
++#define CONFIG_LIBAOM_AV1_DECODER 0
++#define CONFIG_AV1_DECODER 0
++#define CONFIG_AV1_CUVID_DECODER 0
++#define CONFIG_AV1_QSV_DECODER 0
++#define CONFIG_LIBOPENH264_DECODER 0
++#define CONFIG_H264_CUVID_DECODER 0
++#define CONFIG_HEVC_CUVID_DECODER 0
++#define CONFIG_HEVC_MEDIACODEC_DECODER 0
++#define CONFIG_MJPEG_CUVID_DECODER 0
++#define CONFIG_MJPEG_QSV_DECODER 0
++#define CONFIG_MPEG1_CUVID_DECODER 0
++#define CONFIG_MPEG2_CUVID_DECODER 0
++#define CONFIG_MPEG4_CUVID_DECODER 0
++#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
++#define CONFIG_VC1_CUVID_DECODER 0
++#define CONFIG_VP8_CUVID_DECODER 0
++#define CONFIG_VP8_MEDIACODEC_DECODER 0
++#define CONFIG_VP8_QSV_DECODER 0
++#define CONFIG_VP9_CUVID_DECODER 0
++#define CONFIG_VP9_MEDIACODEC_DECODER 0
++#define CONFIG_VP9_QSV_DECODER 0
++#define CONFIG_A64MULTI_ENCODER 0
++#define CONFIG_A64MULTI5_ENCODER 0
++#define CONFIG_ALIAS_PIX_ENCODER 0
++#define CONFIG_AMV_ENCODER 0
++#define CONFIG_APNG_ENCODER 0
++#define CONFIG_ASV1_ENCODER 0
++#define CONFIG_ASV2_ENCODER 0
++#define CONFIG_AVRP_ENCODER 0
++#define CONFIG_AVUI_ENCODER 0
++#define CONFIG_AYUV_ENCODER 0
++#define CONFIG_BITPACKED_ENCODER 0
++#define CONFIG_BMP_ENCODER 0
++#define CONFIG_CFHD_ENCODER 0
++#define CONFIG_CINEPAK_ENCODER 0
++#define CONFIG_CLJR_ENCODER 0
++#define CONFIG_COMFORTNOISE_ENCODER 0
++#define CONFIG_DNXHD_ENCODER 0
++#define CONFIG_DPX_ENCODER 0
++#define CONFIG_DVVIDEO_ENCODER 0
++#define CONFIG_EXR_ENCODER 0
++#define CONFIG_FFV1_ENCODER 0
++#define CONFIG_FFVHUFF_ENCODER 0
++#define CONFIG_FITS_ENCODER 0
++#define CONFIG_FLASHSV_ENCODER 0
++#define CONFIG_FLASHSV2_ENCODER 0
++#define CONFIG_FLV_ENCODER 0
++#define CONFIG_GIF_ENCODER 0
++#define CONFIG_H261_ENCODER 0
++#define CONFIG_H263_ENCODER 0
++#define CONFIG_H263P_ENCODER 0
++#define CONFIG_HAP_ENCODER 0
++#define CONFIG_HUFFYUV_ENCODER 0
++#define CONFIG_JPEG2000_ENCODER 0
++#define CONFIG_JPEGLS_ENCODER 0
++#define CONFIG_LJPEG_ENCODER 0
++#define CONFIG_MAGICYUV_ENCODER 0
++#define CONFIG_MJPEG_ENCODER 0
++#define CONFIG_MPEG1VIDEO_ENCODER 0
++#define CONFIG_MPEG2VIDEO_ENCODER 0
++#define CONFIG_MPEG4_ENCODER 0
++#define CONFIG_MSMPEG4V2_ENCODER 0
++#define CONFIG_MSMPEG4V3_ENCODER 0
++#define CONFIG_MSVIDEO1_ENCODER 0
++#define CONFIG_PAM_ENCODER 0
++#define CONFIG_PBM_ENCODER 0
++#define CONFIG_PCX_ENCODER 0
++#define CONFIG_PFM_ENCODER 0
++#define CONFIG_PGM_ENCODER 0
++#define CONFIG_PGMYUV_ENCODER 0
++#define CONFIG_PNG_ENCODER 0
++#define CONFIG_PPM_ENCODER 0
++#define CONFIG_PRORES_ENCODER 0
++#define CONFIG_PRORES_AW_ENCODER 0
++#define CONFIG_PRORES_KS_ENCODER 0
++#define CONFIG_QTRLE_ENCODER 0
++#define CONFIG_R10K_ENCODER 0
++#define CONFIG_R210_ENCODER 0
++#define CONFIG_RAWVIDEO_ENCODER 0
++#define CONFIG_ROQ_ENCODER 0
++#define CONFIG_RPZA_ENCODER 0
++#define CONFIG_RV10_ENCODER 0
++#define CONFIG_RV20_ENCODER 0
++#define CONFIG_S302M_ENCODER 0
++#define CONFIG_SGI_ENCODER 0
++#define CONFIG_SMC_ENCODER 0
++#define CONFIG_SNOW_ENCODER 0
++#define CONFIG_SPEEDHQ_ENCODER 0
++#define CONFIG_SUNRAST_ENCODER 0
++#define CONFIG_SVQ1_ENCODER 0
++#define CONFIG_TARGA_ENCODER 0
++#define CONFIG_TIFF_ENCODER 0
++#define CONFIG_UTVIDEO_ENCODER 0
++#define CONFIG_V210_ENCODER 0
++#define CONFIG_V308_ENCODER 0
++#define CONFIG_V408_ENCODER 0
++#define CONFIG_V410_ENCODER 0
++#define CONFIG_VC2_ENCODER 0
++#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
++#define CONFIG_WMV1_ENCODER 0
++#define CONFIG_WMV2_ENCODER 0
++#define CONFIG_XBM_ENCODER 0
++#define CONFIG_XFACE_ENCODER 0
++#define CONFIG_XWD_ENCODER 0
++#define CONFIG_Y41P_ENCODER 0
++#define CONFIG_YUV4_ENCODER 0
++#define CONFIG_ZLIB_ENCODER 0
++#define CONFIG_ZMBV_ENCODER 0
++#define CONFIG_AAC_ENCODER 0
++#define CONFIG_AC3_ENCODER 0
++#define CONFIG_AC3_FIXED_ENCODER 0
++#define CONFIG_ALAC_ENCODER 0
++#define CONFIG_APTX_ENCODER 0
++#define CONFIG_APTX_HD_ENCODER 0
++#define CONFIG_DCA_ENCODER 0
++#define CONFIG_EAC3_ENCODER 0
++#define CONFIG_FLAC_ENCODER 0
++#define CONFIG_G723_1_ENCODER 0
++#define CONFIG_MLP_ENCODER 0
++#define CONFIG_MP2_ENCODER 0
++#define CONFIG_MP2FIXED_ENCODER 0
++#define CONFIG_NELLYMOSER_ENCODER 0
++#define CONFIG_OPUS_ENCODER 0
++#define CONFIG_RA_144_ENCODER 0
++#define CONFIG_SBC_ENCODER 0
++#define CONFIG_SONIC_ENCODER 0
++#define CONFIG_SONIC_LS_ENCODER 0
++#define CONFIG_TRUEHD_ENCODER 0
++#define CONFIG_TTA_ENCODER 0
++#define CONFIG_VORBIS_ENCODER 0
++#define CONFIG_WAVPACK_ENCODER 0
++#define CONFIG_WMAV1_ENCODER 0
++#define CONFIG_WMAV2_ENCODER 0
++#define CONFIG_PCM_ALAW_ENCODER 0
++#define CONFIG_PCM_DVD_ENCODER 0
++#define CONFIG_PCM_F32BE_ENCODER 0
++#define CONFIG_PCM_F32LE_ENCODER 0
++#define CONFIG_PCM_F64BE_ENCODER 0
++#define CONFIG_PCM_F64LE_ENCODER 0
++#define CONFIG_PCM_MULAW_ENCODER 0
++#define CONFIG_PCM_S8_ENCODER 0
++#define CONFIG_PCM_S8_PLANAR_ENCODER 0
++#define CONFIG_PCM_S16BE_ENCODER 0
++#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
++#define CONFIG_PCM_S16LE_ENCODER 0
++#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
++#define CONFIG_PCM_S24BE_ENCODER 0
++#define CONFIG_PCM_S24DAUD_ENCODER 0
++#define CONFIG_PCM_S24LE_ENCODER 0
++#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
++#define CONFIG_PCM_S32BE_ENCODER 0
++#define CONFIG_PCM_S32LE_ENCODER 0
++#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
++#define CONFIG_PCM_S64BE_ENCODER 0
++#define CONFIG_PCM_S64LE_ENCODER 0
++#define CONFIG_PCM_U8_ENCODER 0
++#define CONFIG_PCM_U16BE_ENCODER 0
++#define CONFIG_PCM_U16LE_ENCODER 0
++#define CONFIG_PCM_U24BE_ENCODER 0
++#define CONFIG_PCM_U24LE_ENCODER 0
++#define CONFIG_PCM_U32BE_ENCODER 0
++#define CONFIG_PCM_U32LE_ENCODER 0
++#define CONFIG_PCM_VIDC_ENCODER 0
++#define CONFIG_ROQ_DPCM_ENCODER 0
++#define CONFIG_ADPCM_ADX_ENCODER 0
++#define CONFIG_ADPCM_ARGO_ENCODER 0
++#define CONFIG_ADPCM_G722_ENCODER 0
++#define CONFIG_ADPCM_G726_ENCODER 0
++#define CONFIG_ADPCM_G726LE_ENCODER 0
++#define CONFIG_ADPCM_IMA_AMV_ENCODER 0
++#define CONFIG_ADPCM_IMA_ALP_ENCODER 0
++#define CONFIG_ADPCM_IMA_APM_ENCODER 0
++#define CONFIG_ADPCM_IMA_QT_ENCODER 0
++#define CONFIG_ADPCM_IMA_SSI_ENCODER 0
++#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
++#define CONFIG_ADPCM_IMA_WS_ENCODER 0
++#define CONFIG_ADPCM_MS_ENCODER 0
++#define CONFIG_ADPCM_SWF_ENCODER 0
++#define CONFIG_ADPCM_YAMAHA_ENCODER 0
++#define CONFIG_SSA_ENCODER 0
++#define CONFIG_ASS_ENCODER 0
++#define CONFIG_DVBSUB_ENCODER 0
++#define CONFIG_DVDSUB_ENCODER 0
++#define CONFIG_MOVTEXT_ENCODER 0
++#define CONFIG_SRT_ENCODER 0
++#define CONFIG_SUBRIP_ENCODER 0
++#define CONFIG_TEXT_ENCODER 0
++#define CONFIG_TTML_ENCODER 0
++#define CONFIG_WEBVTT_ENCODER 0
++#define CONFIG_XSUB_ENCODER 0
++#define CONFIG_AAC_AT_ENCODER 0
++#define CONFIG_ALAC_AT_ENCODER 0
++#define CONFIG_ILBC_AT_ENCODER 0
++#define CONFIG_PCM_ALAW_AT_ENCODER 0
++#define CONFIG_PCM_MULAW_AT_ENCODER 0
++#define CONFIG_LIBAOM_AV1_ENCODER 0
++#define CONFIG_LIBCODEC2_ENCODER 0
++#define CONFIG_LIBFDK_AAC_ENCODER 0
++#define CONFIG_LIBGSM_ENCODER 0
++#define CONFIG_LIBGSM_MS_ENCODER 0
++#define CONFIG_LIBILBC_ENCODER 0
++#define CONFIG_LIBMP3LAME_ENCODER 0
++#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
++#define CONFIG_LIBOPENJPEG_ENCODER 0
++#define CONFIG_LIBOPUS_ENCODER 0
++#define CONFIG_LIBRAV1E_ENCODER 0
++#define CONFIG_LIBSHINE_ENCODER 0
++#define CONFIG_LIBSPEEX_ENCODER 0
++#define CONFIG_LIBSVTAV1_ENCODER 0
++#define CONFIG_LIBTHEORA_ENCODER 0
++#define CONFIG_LIBTWOLAME_ENCODER 0
++#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
++#define CONFIG_LIBVORBIS_ENCODER 0
++#define CONFIG_LIBVPX_VP8_ENCODER 0
++#define CONFIG_LIBVPX_VP9_ENCODER 0
++#define CONFIG_LIBWEBP_ANIM_ENCODER 0
++#define CONFIG_LIBWEBP_ENCODER 0
++#define CONFIG_LIBX262_ENCODER 0
++#define CONFIG_LIBX264_ENCODER 0
++#define CONFIG_LIBX264RGB_ENCODER 0
++#define CONFIG_LIBX265_ENCODER 0
++#define CONFIG_LIBXAVS_ENCODER 0
++#define CONFIG_LIBXAVS2_ENCODER 0
++#define CONFIG_LIBXVID_ENCODER 0
++#define CONFIG_AAC_MF_ENCODER 0
++#define CONFIG_AC3_MF_ENCODER 0
++#define CONFIG_H263_V4L2M2M_ENCODER 0
++#define CONFIG_LIBOPENH264_ENCODER 0
++#define CONFIG_H264_AMF_ENCODER 0
++#define CONFIG_H264_MF_ENCODER 0
++#define CONFIG_H264_NVENC_ENCODER 0
++#define CONFIG_H264_OMX_ENCODER 0
++#define CONFIG_H264_QSV_ENCODER 0
++#define CONFIG_H264_V4L2M2M_ENCODER 0
++#define CONFIG_H264_VAAPI_ENCODER 0
++#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
++#define CONFIG_HEVC_AMF_ENCODER 0
++#define CONFIG_HEVC_MF_ENCODER 0
++#define CONFIG_HEVC_NVENC_ENCODER 0
++#define CONFIG_HEVC_QSV_ENCODER 0
++#define CONFIG_HEVC_V4L2M2M_ENCODER 0
++#define CONFIG_HEVC_VAAPI_ENCODER 0
++#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
++#define CONFIG_LIBKVAZAAR_ENCODER 0
++#define CONFIG_MJPEG_QSV_ENCODER 0
++#define CONFIG_MJPEG_VAAPI_ENCODER 0
++#define CONFIG_MP3_MF_ENCODER 0
++#define CONFIG_MPEG2_QSV_ENCODER 0
++#define CONFIG_MPEG2_VAAPI_ENCODER 0
++#define CONFIG_MPEG4_OMX_ENCODER 0
++#define CONFIG_MPEG4_V4L2M2M_ENCODER 0
++#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
++#define CONFIG_VP8_V4L2M2M_ENCODER 0
++#define CONFIG_VP8_VAAPI_ENCODER 0
++#define CONFIG_VP9_VAAPI_ENCODER 0
++#define CONFIG_VP9_QSV_ENCODER 0
++#define CONFIG_AV1_D3D11VA_HWACCEL 0
++#define CONFIG_AV1_D3D11VA2_HWACCEL 0
++#define CONFIG_AV1_DXVA2_HWACCEL 0
++#define CONFIG_AV1_NVDEC_HWACCEL 0
++#define CONFIG_AV1_VAAPI_HWACCEL 0
++#define CONFIG_H263_VAAPI_HWACCEL 0
++#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_H264_D3D11VA_HWACCEL 0
++#define CONFIG_H264_D3D11VA2_HWACCEL 0
++#define CONFIG_H264_DXVA2_HWACCEL 0
++#define CONFIG_H264_NVDEC_HWACCEL 0
++#define CONFIG_H264_VAAPI_HWACCEL 0
++#define CONFIG_H264_VDPAU_HWACCEL 0
++#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_HEVC_D3D11VA_HWACCEL 0
++#define CONFIG_HEVC_D3D11VA2_HWACCEL 0
++#define CONFIG_HEVC_DXVA2_HWACCEL 0
++#define CONFIG_HEVC_NVDEC_HWACCEL 0
++#define CONFIG_HEVC_VAAPI_HWACCEL 0
++#define CONFIG_HEVC_VDPAU_HWACCEL 0
++#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_MJPEG_NVDEC_HWACCEL 0
++#define CONFIG_MJPEG_VAAPI_HWACCEL 0
++#define CONFIG_MPEG1_NVDEC_HWACCEL 0
++#define CONFIG_MPEG1_VDPAU_HWACCEL 0
++#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_MPEG1_XVMC_HWACCEL 0
++#define CONFIG_MPEG2_D3D11VA_HWACCEL 0
++#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
++#define CONFIG_MPEG2_NVDEC_HWACCEL 0
++#define CONFIG_MPEG2_DXVA2_HWACCEL 0
++#define CONFIG_MPEG2_VAAPI_HWACCEL 0
++#define CONFIG_MPEG2_VDPAU_HWACCEL 0
++#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_MPEG2_XVMC_HWACCEL 0
++#define CONFIG_MPEG4_NVDEC_HWACCEL 0
++#define CONFIG_MPEG4_VAAPI_HWACCEL 0
++#define CONFIG_MPEG4_VDPAU_HWACCEL 0
++#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_VC1_D3D11VA_HWACCEL 0
++#define CONFIG_VC1_D3D11VA2_HWACCEL 0
++#define CONFIG_VC1_DXVA2_HWACCEL 0
++#define CONFIG_VC1_NVDEC_HWACCEL 0
++#define CONFIG_VC1_VAAPI_HWACCEL 0
++#define CONFIG_VC1_VDPAU_HWACCEL 0
++#define CONFIG_VP8_NVDEC_HWACCEL 0
++#define CONFIG_VP8_VAAPI_HWACCEL 0
++#define CONFIG_VP9_D3D11VA_HWACCEL 0
++#define CONFIG_VP9_D3D11VA2_HWACCEL 0
++#define CONFIG_VP9_DXVA2_HWACCEL 0
++#define CONFIG_VP9_NVDEC_HWACCEL 0
++#define CONFIG_VP9_VAAPI_HWACCEL 0
++#define CONFIG_VP9_VDPAU_HWACCEL 0
++#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_WMV3_D3D11VA_HWACCEL 0
++#define CONFIG_WMV3_D3D11VA2_HWACCEL 0
++#define CONFIG_WMV3_DXVA2_HWACCEL 0
++#define CONFIG_WMV3_NVDEC_HWACCEL 0
++#define CONFIG_WMV3_VAAPI_HWACCEL 0
++#define CONFIG_WMV3_VDPAU_HWACCEL 0
++#define CONFIG_AAC_PARSER 1
++#define CONFIG_AAC_LATM_PARSER 0
++#define CONFIG_AC3_PARSER 0
++#define CONFIG_ADX_PARSER 0
++#define CONFIG_AMR_PARSER 0
++#define CONFIG_AV1_PARSER 0
++#define CONFIG_AVS2_PARSER 0
++#define CONFIG_AVS3_PARSER 0
++#define CONFIG_BMP_PARSER 0
++#define CONFIG_CAVSVIDEO_PARSER 0
++#define CONFIG_COOK_PARSER 0
++#define CONFIG_CRI_PARSER 0
++#define CONFIG_DCA_PARSER 0
++#define CONFIG_DIRAC_PARSER 0
++#define CONFIG_DNXHD_PARSER 0
++#define CONFIG_DOLBY_E_PARSER 0
++#define CONFIG_DPX_PARSER 0
++#define CONFIG_DVAUDIO_PARSER 0
++#define CONFIG_DVBSUB_PARSER 0
++#define CONFIG_DVDSUB_PARSER 0
++#define CONFIG_DVD_NAV_PARSER 0
++#define CONFIG_FLAC_PARSER 1
++#define CONFIG_G723_1_PARSER 0
++#define CONFIG_G729_PARSER 0
++#define CONFIG_GIF_PARSER 0
++#define CONFIG_GSM_PARSER 0
++#define CONFIG_H261_PARSER 0
++#define CONFIG_H263_PARSER 0
++#define CONFIG_H264_PARSER 1
++#define CONFIG_HEVC_PARSER 0
++#define CONFIG_IPU_PARSER 0
++#define CONFIG_JPEG2000_PARSER 0
++#define CONFIG_MJPEG_PARSER 0
++#define CONFIG_MLP_PARSER 0
++#define CONFIG_MPEG4VIDEO_PARSER 0
++#define CONFIG_MPEGAUDIO_PARSER 1
++#define CONFIG_MPEGVIDEO_PARSER 0
++#define CONFIG_OPUS_PARSER 1
++#define CONFIG_PNG_PARSER 0
++#define CONFIG_PNM_PARSER 0
++#define CONFIG_RV30_PARSER 0
++#define CONFIG_RV40_PARSER 0
++#define CONFIG_SBC_PARSER 0
++#define CONFIG_SIPR_PARSER 0
++#define CONFIG_TAK_PARSER 0
++#define CONFIG_VC1_PARSER 0
++#define CONFIG_VORBIS_PARSER 1
++#define CONFIG_VP3_PARSER 1
++#define CONFIG_VP8_PARSER 1
++#define CONFIG_VP9_PARSER 1
++#define CONFIG_WEBP_PARSER 0
++#define CONFIG_XBM_PARSER 0
++#define CONFIG_XMA_PARSER 0
++#define CONFIG_ALSA_INDEV 0
++#define CONFIG_ANDROID_CAMERA_INDEV 0
++#define CONFIG_AVFOUNDATION_INDEV 0
++#define CONFIG_BKTR_INDEV 0
++#define CONFIG_DECKLINK_INDEV 0
++#define CONFIG_DSHOW_INDEV 0
++#define CONFIG_FBDEV_INDEV 0
++#define CONFIG_GDIGRAB_INDEV 0
++#define CONFIG_IEC61883_INDEV 0
++#define CONFIG_JACK_INDEV 0
++#define CONFIG_KMSGRAB_INDEV 0
++#define CONFIG_LAVFI_INDEV 0
++#define CONFIG_OPENAL_INDEV 0
++#define CONFIG_OSS_INDEV 0
++#define CONFIG_PULSE_INDEV 0
++#define CONFIG_SNDIO_INDEV 0
++#define CONFIG_V4L2_INDEV 0
++#define CONFIG_VFWCAP_INDEV 0
++#define CONFIG_XCBGRAB_INDEV 0
++#define CONFIG_LIBCDIO_INDEV 0
++#define CONFIG_LIBDC1394_INDEV 0
++#define CONFIG_ALSA_OUTDEV 0
++#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
++#define CONFIG_CACA_OUTDEV 0
++#define CONFIG_DECKLINK_OUTDEV 0
++#define CONFIG_FBDEV_OUTDEV 0
++#define CONFIG_OPENGL_OUTDEV 0
++#define CONFIG_OSS_OUTDEV 0
++#define CONFIG_PULSE_OUTDEV 0
++#define CONFIG_SDL2_OUTDEV 0
++#define CONFIG_SNDIO_OUTDEV 0
++#define CONFIG_V4L2_OUTDEV 0
++#define CONFIG_XV_OUTDEV 0
++#define CONFIG_ABENCH_FILTER 0
++#define CONFIG_ACOMPRESSOR_FILTER 0
++#define CONFIG_ACONTRAST_FILTER 0
++#define CONFIG_ACOPY_FILTER 0
++#define CONFIG_ACUE_FILTER 0
++#define CONFIG_ACROSSFADE_FILTER 0
++#define CONFIG_ACROSSOVER_FILTER 0
++#define CONFIG_ACRUSHER_FILTER 0
++#define CONFIG_ADECLICK_FILTER 0
++#define CONFIG_ADECLIP_FILTER 0
++#define CONFIG_ADECORRELATE_FILTER 0
++#define CONFIG_ADELAY_FILTER 0
++#define CONFIG_ADENORM_FILTER 0
++#define CONFIG_ADERIVATIVE_FILTER 0
++#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
++#define CONFIG_ADYNAMICSMOOTH_FILTER 0
++#define CONFIG_AECHO_FILTER 0
++#define CONFIG_AEMPHASIS_FILTER 0
++#define CONFIG_AEVAL_FILTER 0
++#define CONFIG_AEXCITER_FILTER 0
++#define CONFIG_AFADE_FILTER 0
++#define CONFIG_AFFTDN_FILTER 0
++#define CONFIG_AFFTFILT_FILTER 0
++#define CONFIG_AFIR_FILTER 0
++#define CONFIG_AFORMAT_FILTER 0
++#define CONFIG_AFREQSHIFT_FILTER 0
++#define CONFIG_AFWTDN_FILTER 0
++#define CONFIG_AGATE_FILTER 0
++#define CONFIG_AIIR_FILTER 0
++#define CONFIG_AINTEGRAL_FILTER 0
++#define CONFIG_AINTERLEAVE_FILTER 0
++#define CONFIG_ALATENCY_FILTER 0
++#define CONFIG_ALIMITER_FILTER 0
++#define CONFIG_ALLPASS_FILTER 0
++#define CONFIG_ALOOP_FILTER 0
++#define CONFIG_AMERGE_FILTER 0
++#define CONFIG_AMETADATA_FILTER 0
++#define CONFIG_AMIX_FILTER 0
++#define CONFIG_AMULTIPLY_FILTER 0
++#define CONFIG_ANEQUALIZER_FILTER 0
++#define CONFIG_ANLMDN_FILTER 0
++#define CONFIG_ANLMF_FILTER 0
++#define CONFIG_ANLMS_FILTER 0
++#define CONFIG_ANULL_FILTER 0
++#define CONFIG_APAD_FILTER 0
++#define CONFIG_APERMS_FILTER 0
++#define CONFIG_APHASER_FILTER 0
++#define CONFIG_APHASESHIFT_FILTER 0
++#define CONFIG_APSYCLIP_FILTER 0
++#define CONFIG_APULSATOR_FILTER 0
++#define CONFIG_AREALTIME_FILTER 0
++#define CONFIG_ARESAMPLE_FILTER 0
++#define CONFIG_AREVERSE_FILTER 0
++#define CONFIG_ARNNDN_FILTER 0
++#define CONFIG_ASDR_FILTER 0
++#define CONFIG_ASEGMENT_FILTER 0
++#define CONFIG_ASELECT_FILTER 0
++#define CONFIG_ASENDCMD_FILTER 0
++#define CONFIG_ASETNSAMPLES_FILTER 0
++#define CONFIG_ASETPTS_FILTER 0
++#define CONFIG_ASETRATE_FILTER 0
++#define CONFIG_ASETTB_FILTER 0
++#define CONFIG_ASHOWINFO_FILTER 0
++#define CONFIG_ASIDEDATA_FILTER 0
++#define CONFIG_ASOFTCLIP_FILTER 0
++#define CONFIG_ASPECTRALSTATS_FILTER 0
++#define CONFIG_ASPLIT_FILTER 0
++#define CONFIG_ASR_FILTER 0
++#define CONFIG_ASTATS_FILTER 0
++#define CONFIG_ASTREAMSELECT_FILTER 0
++#define CONFIG_ASUBBOOST_FILTER 0
++#define CONFIG_ASUBCUT_FILTER 0
++#define CONFIG_ASUPERCUT_FILTER 0
++#define CONFIG_ASUPERPASS_FILTER 0
++#define CONFIG_ASUPERSTOP_FILTER 0
++#define CONFIG_ATEMPO_FILTER 0
++#define CONFIG_ATILT_FILTER 0
++#define CONFIG_ATRIM_FILTER 0
++#define CONFIG_AXCORRELATE_FILTER 0
++#define CONFIG_AZMQ_FILTER 0
++#define CONFIG_BANDPASS_FILTER 0
++#define CONFIG_BANDREJECT_FILTER 0
++#define CONFIG_BASS_FILTER 0
++#define CONFIG_BIQUAD_FILTER 0
++#define CONFIG_BS2B_FILTER 0
++#define CONFIG_CHANNELMAP_FILTER 0
++#define CONFIG_CHANNELSPLIT_FILTER 0
++#define CONFIG_CHORUS_FILTER 0
++#define CONFIG_COMPAND_FILTER 0
++#define CONFIG_COMPENSATIONDELAY_FILTER 0
++#define CONFIG_CROSSFEED_FILTER 0
++#define CONFIG_CRYSTALIZER_FILTER 0
++#define CONFIG_DCSHIFT_FILTER 0
++#define CONFIG_DEESSER_FILTER 0
++#define CONFIG_DRMETER_FILTER 0
++#define CONFIG_DYNAUDNORM_FILTER 0
++#define CONFIG_EARWAX_FILTER 0
++#define CONFIG_EBUR128_FILTER 0
++#define CONFIG_EQUALIZER_FILTER 0
++#define CONFIG_EXTRASTEREO_FILTER 0
++#define CONFIG_FIREQUALIZER_FILTER 0
++#define CONFIG_FLANGER_FILTER 0
++#define CONFIG_HAAS_FILTER 0
++#define CONFIG_HDCD_FILTER 0
++#define CONFIG_HEADPHONE_FILTER 0
++#define CONFIG_HIGHPASS_FILTER 0
++#define CONFIG_HIGHSHELF_FILTER 0
++#define CONFIG_JOIN_FILTER 0
++#define CONFIG_LADSPA_FILTER 0
++#define CONFIG_LOUDNORM_FILTER 0
++#define CONFIG_LOWPASS_FILTER 0
++#define CONFIG_LOWSHELF_FILTER 0
++#define CONFIG_LV2_FILTER 0
++#define CONFIG_MCOMPAND_FILTER 0
++#define CONFIG_PAN_FILTER 0
++#define CONFIG_REPLAYGAIN_FILTER 0
++#define CONFIG_RUBBERBAND_FILTER 0
++#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
++#define CONFIG_SIDECHAINGATE_FILTER 0
++#define CONFIG_SILENCEDETECT_FILTER 0
++#define CONFIG_SILENCEREMOVE_FILTER 0
++#define CONFIG_SOFALIZER_FILTER 0
++#define CONFIG_SPEECHNORM_FILTER 0
++#define CONFIG_STEREOTOOLS_FILTER 0
++#define CONFIG_STEREOWIDEN_FILTER 0
++#define CONFIG_SUPEREQUALIZER_FILTER 0
++#define CONFIG_SURROUND_FILTER 0
++#define CONFIG_TREBLE_FILTER 0
++#define CONFIG_TREMOLO_FILTER 0
++#define CONFIG_VIBRATO_FILTER 0
++#define CONFIG_VOLUME_FILTER 0
++#define CONFIG_VOLUMEDETECT_FILTER 0
++#define CONFIG_AEVALSRC_FILTER 0
++#define CONFIG_AFIRSRC_FILTER 0
++#define CONFIG_ANOISESRC_FILTER 0
++#define CONFIG_ANULLSRC_FILTER 0
++#define CONFIG_FLITE_FILTER 0
++#define CONFIG_HILBERT_FILTER 0
++#define CONFIG_SINC_FILTER 0
++#define CONFIG_SINE_FILTER 0
++#define CONFIG_ANULLSINK_FILTER 0
++#define CONFIG_ADDROI_FILTER 0
++#define CONFIG_ALPHAEXTRACT_FILTER 0
++#define CONFIG_ALPHAMERGE_FILTER 0
++#define CONFIG_AMPLIFY_FILTER 0
++#define CONFIG_ASS_FILTER 0
++#define CONFIG_ATADENOISE_FILTER 0
++#define CONFIG_AVGBLUR_FILTER 0
++#define CONFIG_AVGBLUR_OPENCL_FILTER 0
++#define CONFIG_AVGBLUR_VULKAN_FILTER 0
++#define CONFIG_BBOX_FILTER 0
++#define CONFIG_BENCH_FILTER 0
++#define CONFIG_BILATERAL_FILTER 0
++#define CONFIG_BITPLANENOISE_FILTER 0
++#define CONFIG_BLACKDETECT_FILTER 0
++#define CONFIG_BLACKFRAME_FILTER 0
++#define CONFIG_BLEND_FILTER 0
++#define CONFIG_BLEND_VULKAN_FILTER 0
++#define CONFIG_BM3D_FILTER 0
++#define CONFIG_BOXBLUR_FILTER 0
++#define CONFIG_BOXBLUR_OPENCL_FILTER 0
++#define CONFIG_BWDIF_FILTER 0
++#define CONFIG_CAS_FILTER 0
++#define CONFIG_CHROMABER_VULKAN_FILTER 0
++#define CONFIG_CHROMAHOLD_FILTER 0
++#define CONFIG_CHROMAKEY_FILTER 0
++#define CONFIG_CHROMANR_FILTER 0
++#define CONFIG_CHROMASHIFT_FILTER 0
++#define CONFIG_CIESCOPE_FILTER 0
++#define CONFIG_CODECVIEW_FILTER 0
++#define CONFIG_COLORBALANCE_FILTER 0
++#define CONFIG_COLORCHANNELMIXER_FILTER 0
++#define CONFIG_COLORCONTRAST_FILTER 0
++#define CONFIG_COLORCORRECT_FILTER 0
++#define CONFIG_COLORIZE_FILTER 0
++#define CONFIG_COLORKEY_FILTER 0
++#define CONFIG_COLORKEY_OPENCL_FILTER 0
++#define CONFIG_COLORHOLD_FILTER 0
++#define CONFIG_COLORLEVELS_FILTER 0
++#define CONFIG_COLORMATRIX_FILTER 0
++#define CONFIG_COLORSPACE_FILTER 0
++#define CONFIG_COLORTEMPERATURE_FILTER 0
++#define CONFIG_CONVOLUTION_FILTER 0
++#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
++#define CONFIG_CONVOLVE_FILTER 0
++#define CONFIG_COPY_FILTER 0
++#define CONFIG_COREIMAGE_FILTER 0
++#define CONFIG_COVER_RECT_FILTER 0
++#define CONFIG_CROP_FILTER 0
++#define CONFIG_CROPDETECT_FILTER 0
++#define CONFIG_CUE_FILTER 0
++#define CONFIG_CURVES_FILTER 0
++#define CONFIG_DATASCOPE_FILTER 0
++#define CONFIG_DBLUR_FILTER 0
++#define CONFIG_DCTDNOIZ_FILTER 0
++#define CONFIG_DEBAND_FILTER 0
++#define CONFIG_DEBLOCK_FILTER 0
++#define CONFIG_DECIMATE_FILTER 0
++#define CONFIG_DECONVOLVE_FILTER 0
++#define CONFIG_DEDOT_FILTER 0
++#define CONFIG_DEFLATE_FILTER 0
++#define CONFIG_DEFLICKER_FILTER 0
++#define CONFIG_DEINTERLACE_QSV_FILTER 0
++#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
++#define CONFIG_DEJUDDER_FILTER 0
++#define CONFIG_DELOGO_FILTER 0
++#define CONFIG_DENOISE_VAAPI_FILTER 0
++#define CONFIG_DERAIN_FILTER 0
++#define CONFIG_DESHAKE_FILTER 0
++#define CONFIG_DESHAKE_OPENCL_FILTER 0
++#define CONFIG_DESPILL_FILTER 0
++#define CONFIG_DETELECINE_FILTER 0
++#define CONFIG_DILATION_FILTER 0
++#define CONFIG_DILATION_OPENCL_FILTER 0
++#define CONFIG_DISPLACE_FILTER 0
++#define CONFIG_DNN_CLASSIFY_FILTER 0
++#define CONFIG_DNN_DETECT_FILTER 0
++#define CONFIG_DNN_PROCESSING_FILTER 0
++#define CONFIG_DOUBLEWEAVE_FILTER 0
++#define CONFIG_DRAWBOX_FILTER 0
++#define CONFIG_DRAWGRAPH_FILTER 0
++#define CONFIG_DRAWGRID_FILTER 0
++#define CONFIG_DRAWTEXT_FILTER 0
++#define CONFIG_EDGEDETECT_FILTER 0
++#define CONFIG_ELBG_FILTER 0
++#define CONFIG_ENTROPY_FILTER 0
++#define CONFIG_EPX_FILTER 0
++#define CONFIG_EQ_FILTER 0
++#define CONFIG_EROSION_FILTER 0
++#define CONFIG_EROSION_OPENCL_FILTER 0
++#define CONFIG_ESTDIF_FILTER 0
++#define CONFIG_EXPOSURE_FILTER 0
++#define CONFIG_EXTRACTPLANES_FILTER 0
++#define CONFIG_FADE_FILTER 0
++#define CONFIG_FFTDNOIZ_FILTER 0
++#define CONFIG_FFTFILT_FILTER 0
++#define CONFIG_FIELD_FILTER 0
++#define CONFIG_FIELDHINT_FILTER 0
++#define CONFIG_FIELDMATCH_FILTER 0
++#define CONFIG_FIELDORDER_FILTER 0
++#define CONFIG_FILLBORDERS_FILTER 0
++#define CONFIG_FIND_RECT_FILTER 0
++#define CONFIG_FLIP_VULKAN_FILTER 0
++#define CONFIG_FLOODFILL_FILTER 0
++#define CONFIG_FORMAT_FILTER 0
++#define CONFIG_FPS_FILTER 0
++#define CONFIG_FRAMEPACK_FILTER 0
++#define CONFIG_FRAMERATE_FILTER 0
++#define CONFIG_FRAMESTEP_FILTER 0
++#define CONFIG_FREEZEDETECT_FILTER 0
++#define CONFIG_FREEZEFRAMES_FILTER 0
++#define CONFIG_FREI0R_FILTER 0
++#define CONFIG_FSPP_FILTER 0
++#define CONFIG_GBLUR_FILTER 0
++#define CONFIG_GBLUR_VULKAN_FILTER 0
++#define CONFIG_GEQ_FILTER 0
++#define CONFIG_GRADFUN_FILTER 0
++#define CONFIG_GRAPHMONITOR_FILTER 0
++#define CONFIG_GRAYWORLD_FILTER 0
++#define CONFIG_GREYEDGE_FILTER 0
++#define CONFIG_GUIDED_FILTER 0
++#define CONFIG_HALDCLUT_FILTER 0
++#define CONFIG_HFLIP_FILTER 0
++#define CONFIG_HFLIP_VULKAN_FILTER 0
++#define CONFIG_HISTEQ_FILTER 0
++#define CONFIG_HISTOGRAM_FILTER 0
++#define CONFIG_HQDN3D_FILTER 0
++#define CONFIG_HQX_FILTER 0
++#define CONFIG_HSTACK_FILTER 0
++#define CONFIG_HSVHOLD_FILTER 0
++#define CONFIG_HSVKEY_FILTER 0
++#define CONFIG_HUE_FILTER 0
++#define CONFIG_HUESATURATION_FILTER 0
++#define CONFIG_HWDOWNLOAD_FILTER 0
++#define CONFIG_HWMAP_FILTER 0
++#define CONFIG_HWUPLOAD_FILTER 0
++#define CONFIG_HWUPLOAD_CUDA_FILTER 0
++#define CONFIG_HYSTERESIS_FILTER 0
++#define CONFIG_IDENTITY_FILTER 0
++#define CONFIG_IDET_FILTER 0
++#define CONFIG_IL_FILTER 0
++#define CONFIG_INFLATE_FILTER 0
++#define CONFIG_INTERLACE_FILTER 0
++#define CONFIG_INTERLEAVE_FILTER 0
++#define CONFIG_KERNDEINT_FILTER 0
++#define CONFIG_KIRSCH_FILTER 0
++#define CONFIG_LAGFUN_FILTER 0
++#define CONFIG_LATENCY_FILTER 0
++#define CONFIG_LENSCORRECTION_FILTER 0
++#define CONFIG_LENSFUN_FILTER 0
++#define CONFIG_LIBPLACEBO_FILTER 0
++#define CONFIG_LIBVMAF_FILTER 0
++#define CONFIG_LIMITDIFF_FILTER 0
++#define CONFIG_LIMITER_FILTER 0
++#define CONFIG_LOOP_FILTER 0
++#define CONFIG_LUMAKEY_FILTER 0
++#define CONFIG_LUT_FILTER 0
++#define CONFIG_LUT1D_FILTER 0
++#define CONFIG_LUT2_FILTER 0
++#define CONFIG_LUT3D_FILTER 0
++#define CONFIG_LUTRGB_FILTER 0
++#define CONFIG_LUTYUV_FILTER 0
++#define CONFIG_MASKEDCLAMP_FILTER 0
++#define CONFIG_MASKEDMAX_FILTER 0
++#define CONFIG_MASKEDMERGE_FILTER 0
++#define CONFIG_MASKEDMIN_FILTER 0
++#define CONFIG_MASKEDTHRESHOLD_FILTER 0
++#define CONFIG_MASKFUN_FILTER 0
++#define CONFIG_MCDEINT_FILTER 0
++#define CONFIG_MEDIAN_FILTER 0
++#define CONFIG_MERGEPLANES_FILTER 0
++#define CONFIG_MESTIMATE_FILTER 0
++#define CONFIG_METADATA_FILTER 0
++#define CONFIG_MIDEQUALIZER_FILTER 0
++#define CONFIG_MINTERPOLATE_FILTER 0
++#define CONFIG_MIX_FILTER 0
++#define CONFIG_MONOCHROME_FILTER 0
++#define CONFIG_MORPHO_FILTER 0
++#define CONFIG_MPDECIMATE_FILTER 0
++#define CONFIG_MSAD_FILTER 0
++#define CONFIG_NEGATE_FILTER 0
++#define CONFIG_NLMEANS_FILTER 0
++#define CONFIG_NLMEANS_OPENCL_FILTER 0
++#define CONFIG_NNEDI_FILTER 0
++#define CONFIG_NOFORMAT_FILTER 0
++#define CONFIG_NOISE_FILTER 0
++#define CONFIG_NORMALIZE_FILTER 0
++#define CONFIG_NULL_FILTER 0
++#define CONFIG_OCR_FILTER 0
++#define CONFIG_OCV_FILTER 0
++#define CONFIG_OSCILLOSCOPE_FILTER 0
++#define CONFIG_OVERLAY_FILTER 0
++#define CONFIG_OVERLAY_OPENCL_FILTER 0
++#define CONFIG_OVERLAY_QSV_FILTER 0
++#define CONFIG_OVERLAY_VAAPI_FILTER 0
++#define CONFIG_OVERLAY_VULKAN_FILTER 0
++#define CONFIG_OVERLAY_CUDA_FILTER 0
++#define CONFIG_OWDENOISE_FILTER 0
++#define CONFIG_PAD_FILTER 0
++#define CONFIG_PAD_OPENCL_FILTER 0
++#define CONFIG_PALETTEGEN_FILTER 0
++#define CONFIG_PALETTEUSE_FILTER 0
++#define CONFIG_PERMS_FILTER 0
++#define CONFIG_PERSPECTIVE_FILTER 0
++#define CONFIG_PHASE_FILTER 0
++#define CONFIG_PHOTOSENSITIVITY_FILTER 0
++#define CONFIG_PIXDESCTEST_FILTER 0
++#define CONFIG_PIXSCOPE_FILTER 0
++#define CONFIG_PP_FILTER 0
++#define CONFIG_PP7_FILTER 0
++#define CONFIG_PREMULTIPLY_FILTER 0
++#define CONFIG_PREWITT_FILTER 0
++#define CONFIG_PREWITT_OPENCL_FILTER 0
++#define CONFIG_PROCAMP_VAAPI_FILTER 0
++#define CONFIG_PROGRAM_OPENCL_FILTER 0
++#define CONFIG_PSEUDOCOLOR_FILTER 0
++#define CONFIG_PSNR_FILTER 0
++#define CONFIG_PULLUP_FILTER 0
++#define CONFIG_QP_FILTER 0
++#define CONFIG_RANDOM_FILTER 0
++#define CONFIG_READEIA608_FILTER 0
++#define CONFIG_READVITC_FILTER 0
++#define CONFIG_REALTIME_FILTER 0
++#define CONFIG_REMAP_FILTER 0
++#define CONFIG_REMOVEGRAIN_FILTER 0
++#define CONFIG_REMOVELOGO_FILTER 0
++#define CONFIG_REPEATFIELDS_FILTER 0
++#define CONFIG_REVERSE_FILTER 0
++#define CONFIG_RGBASHIFT_FILTER 0
++#define CONFIG_ROBERTS_FILTER 0
++#define CONFIG_ROBERTS_OPENCL_FILTER 0
++#define CONFIG_ROTATE_FILTER 0
++#define CONFIG_SAB_FILTER 0
++#define CONFIG_SCALE_FILTER 0
++#define CONFIG_SCALE_CUDA_FILTER 0
++#define CONFIG_SCALE_NPP_FILTER 0
++#define CONFIG_SCALE_QSV_FILTER 0
++#define CONFIG_SCALE_VAAPI_FILTER 0
++#define CONFIG_SCALE_VULKAN_FILTER 0
++#define CONFIG_SCALE2REF_FILTER 0
++#define CONFIG_SCALE2REF_NPP_FILTER 0
++#define CONFIG_SCDET_FILTER 0
++#define CONFIG_SCHARR_FILTER 0
++#define CONFIG_SCROLL_FILTER 0
++#define CONFIG_SEGMENT_FILTER 0
++#define CONFIG_SELECT_FILTER 0
++#define CONFIG_SELECTIVECOLOR_FILTER 0
++#define CONFIG_SENDCMD_FILTER 0
++#define CONFIG_SEPARATEFIELDS_FILTER 0
++#define CONFIG_SETDAR_FILTER 0
++#define CONFIG_SETFIELD_FILTER 0
++#define CONFIG_SETPARAMS_FILTER 0
++#define CONFIG_SETPTS_FILTER 0
++#define CONFIG_SETRANGE_FILTER 0
++#define CONFIG_SETSAR_FILTER 0
++#define CONFIG_SETTB_FILTER 0
++#define CONFIG_SHARPEN_NPP_FILTER 0
++#define CONFIG_SHARPNESS_VAAPI_FILTER 0
++#define CONFIG_SHEAR_FILTER 0
++#define CONFIG_SHOWINFO_FILTER 0
++#define CONFIG_SHOWPALETTE_FILTER 0
++#define CONFIG_SHUFFLEFRAMES_FILTER 0
++#define CONFIG_SHUFFLEPIXELS_FILTER 0
++#define CONFIG_SHUFFLEPLANES_FILTER 0
++#define CONFIG_SIDEDATA_FILTER 0
++#define CONFIG_SIGNALSTATS_FILTER 0
++#define CONFIG_SIGNATURE_FILTER 0
++#define CONFIG_SMARTBLUR_FILTER 0
++#define CONFIG_SOBEL_FILTER 0
++#define CONFIG_SOBEL_OPENCL_FILTER 0
++#define CONFIG_SPLIT_FILTER 0
++#define CONFIG_SPP_FILTER 0
++#define CONFIG_SR_FILTER 0
++#define CONFIG_SSIM_FILTER 0
++#define CONFIG_STEREO3D_FILTER 0
++#define CONFIG_STREAMSELECT_FILTER 0
++#define CONFIG_SUBTITLES_FILTER 0
++#define CONFIG_SUPER2XSAI_FILTER 0
++#define CONFIG_SWAPRECT_FILTER 0
++#define CONFIG_SWAPUV_FILTER 0
++#define CONFIG_TBLEND_FILTER 0
++#define CONFIG_TELECINE_FILTER 0
++#define CONFIG_THISTOGRAM_FILTER 0
++#define CONFIG_THRESHOLD_FILTER 0
++#define CONFIG_THUMBNAIL_FILTER 0
++#define CONFIG_THUMBNAIL_CUDA_FILTER 0
++#define CONFIG_TILE_FILTER 0
++#define CONFIG_TINTERLACE_FILTER 0
++#define CONFIG_TLUT2_FILTER 0
++#define CONFIG_TMEDIAN_FILTER 0
++#define CONFIG_TMIDEQUALIZER_FILTER 0
++#define CONFIG_TMIX_FILTER 0
++#define CONFIG_TONEMAP_FILTER 0
++#define CONFIG_TONEMAP_OPENCL_FILTER 0
++#define CONFIG_TONEMAP_VAAPI_FILTER 0
++#define CONFIG_TPAD_FILTER 0
++#define CONFIG_TRANSPOSE_FILTER 0
++#define CONFIG_TRANSPOSE_NPP_FILTER 0
++#define CONFIG_TRANSPOSE_OPENCL_FILTER 0
++#define CONFIG_TRANSPOSE_VAAPI_FILTER 0
++#define CONFIG_TRANSPOSE_VULKAN_FILTER 0
++#define CONFIG_TRIM_FILTER 0
++#define CONFIG_UNPREMULTIPLY_FILTER 0
++#define CONFIG_UNSHARP_FILTER 0
++#define CONFIG_UNSHARP_OPENCL_FILTER 0
++#define CONFIG_UNTILE_FILTER 0
++#define CONFIG_USPP_FILTER 0
++#define CONFIG_V360_FILTER 0
++#define CONFIG_VAGUEDENOISER_FILTER 0
++#define CONFIG_VARBLUR_FILTER 0
++#define CONFIG_VECTORSCOPE_FILTER 0
++#define CONFIG_VFLIP_FILTER 0
++#define CONFIG_VFLIP_VULKAN_FILTER 0
++#define CONFIG_VFRDET_FILTER 0
++#define CONFIG_VIBRANCE_FILTER 0
++#define CONFIG_VIDSTABDETECT_FILTER 0
++#define CONFIG_VIDSTABTRANSFORM_FILTER 0
++#define CONFIG_VIF_FILTER 0
++#define CONFIG_VIGNETTE_FILTER 0
++#define CONFIG_VMAFMOTION_FILTER 0
++#define CONFIG_VPP_QSV_FILTER 0
++#define CONFIG_VSTACK_FILTER 0
++#define CONFIG_W3FDIF_FILTER 0
++#define CONFIG_WAVEFORM_FILTER 0
++#define CONFIG_WEAVE_FILTER 0
++#define CONFIG_XBR_FILTER 0
++#define CONFIG_XCORRELATE_FILTER 0
++#define CONFIG_XFADE_FILTER 0
++#define CONFIG_XFADE_OPENCL_FILTER 0
++#define CONFIG_XMEDIAN_FILTER 0
++#define CONFIG_XSTACK_FILTER 0
++#define CONFIG_YADIF_FILTER 0
++#define CONFIG_YADIF_CUDA_FILTER 0
++#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0
++#define CONFIG_YAEPBLUR_FILTER 0
++#define CONFIG_ZMQ_FILTER 0
++#define CONFIG_ZOOMPAN_FILTER 0
++#define CONFIG_ZSCALE_FILTER 0
++#define CONFIG_ALLRGB_FILTER 0
++#define CONFIG_ALLYUV_FILTER 0
++#define CONFIG_CELLAUTO_FILTER 0
++#define CONFIG_COLOR_FILTER 0
++#define CONFIG_COLORSPECTRUM_FILTER 0
++#define CONFIG_COREIMAGESRC_FILTER 0
++#define CONFIG_FREI0R_SRC_FILTER 0
++#define CONFIG_GRADIENTS_FILTER 0
++#define CONFIG_HALDCLUTSRC_FILTER 0
++#define CONFIG_LIFE_FILTER 0
++#define CONFIG_MANDELBROT_FILTER 0
++#define CONFIG_MPTESTSRC_FILTER 0
++#define CONFIG_NULLSRC_FILTER 0
++#define CONFIG_OPENCLSRC_FILTER 0
++#define CONFIG_PAL75BARS_FILTER 0
++#define CONFIG_PAL100BARS_FILTER 0
++#define CONFIG_RGBTESTSRC_FILTER 0
++#define CONFIG_SIERPINSKI_FILTER 0
++#define CONFIG_SMPTEBARS_FILTER 0
++#define CONFIG_SMPTEHDBARS_FILTER 0
++#define CONFIG_TESTSRC_FILTER 0
++#define CONFIG_TESTSRC2_FILTER 0
++#define CONFIG_YUVTESTSRC_FILTER 0
++#define CONFIG_NULLSINK_FILTER 0
++#define CONFIG_ABITSCOPE_FILTER 0
++#define CONFIG_ADRAWGRAPH_FILTER 0
++#define CONFIG_AGRAPHMONITOR_FILTER 0
++#define CONFIG_AHISTOGRAM_FILTER 0
++#define CONFIG_APHASEMETER_FILTER 0
++#define CONFIG_AVECTORSCOPE_FILTER 0
++#define CONFIG_CONCAT_FILTER 0
++#define CONFIG_SHOWCQT_FILTER 0
++#define CONFIG_SHOWFREQS_FILTER 0
++#define CONFIG_SHOWSPATIAL_FILTER 0
++#define CONFIG_SHOWSPECTRUM_FILTER 0
++#define CONFIG_SHOWSPECTRUMPIC_FILTER 0
++#define CONFIG_SHOWVOLUME_FILTER 0
++#define CONFIG_SHOWWAVES_FILTER 0
++#define CONFIG_SHOWWAVESPIC_FILTER 0
++#define CONFIG_SPECTRUMSYNTH_FILTER 0
++#define CONFIG_AMOVIE_FILTER 0
++#define CONFIG_MOVIE_FILTER 0
++#define CONFIG_AFIFO_FILTER 0
++#define CONFIG_FIFO_FILTER 0
++#define CONFIG_AA_DEMUXER 0
++#define CONFIG_AAC_DEMUXER 1
++#define CONFIG_AAX_DEMUXER 0
++#define CONFIG_AC3_DEMUXER 0
++#define CONFIG_ACE_DEMUXER 0
++#define CONFIG_ACM_DEMUXER 0
++#define CONFIG_ACT_DEMUXER 0
++#define CONFIG_ADF_DEMUXER 0
++#define CONFIG_ADP_DEMUXER 0
++#define CONFIG_ADS_DEMUXER 0
++#define CONFIG_ADX_DEMUXER 0
++#define CONFIG_AEA_DEMUXER 0
++#define CONFIG_AFC_DEMUXER 0
++#define CONFIG_AIFF_DEMUXER 0
++#define CONFIG_AIX_DEMUXER 0
++#define CONFIG_ALP_DEMUXER 0
++#define CONFIG_AMR_DEMUXER 0
++#define CONFIG_AMRNB_DEMUXER 0
++#define CONFIG_AMRWB_DEMUXER 0
++#define CONFIG_ANM_DEMUXER 0
++#define CONFIG_APC_DEMUXER 0
++#define CONFIG_APE_DEMUXER 0
++#define CONFIG_APM_DEMUXER 0