aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Nagy <robert@openbsd.org>2022-07-24 13:19:41 +0000
committerRene Ladan <rene@FreeBSD.org>2022-08-03 14:50:51 +0000
commit2acdadaf097598eb951c388eee94a1b1c555c802 (patch)
treeda212693f3c1a1a5152d860cdcdbc21443686f9e
parent5b9287003a185c527d70c5a81751d85825665498 (diff)
downloadports-2acdadaf097598eb951c388eee94a1b1c555c802.tar.gz
ports-2acdadaf097598eb951c388eee94a1b1c555c802.zip
www/chromium: update to 104.0.5112.79
Security: 96a41723-133a-11ed-be3b-3065ec8fd3ec
-rw-r--r--www/chromium/Makefile3
-rw-r--r--www/chromium/distinfo14
-rw-r--r--www/chromium/files/patch-BUILD.gn10
-rw-r--r--www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc4
-rw-r--r--www/chromium/files/patch-base_BUILD.gn38
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h8
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc4
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_rand__util__posix.cc8
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h11
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc11
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc11
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h8
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__constants.h15
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_partition__root.cc10
-rw-r--r--www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc8
-rw-r--r--www/chromium/files/patch-base_files_file__util__posix.cc7
-rw-r--r--www/chromium/files/patch-base_i18n_icu__util.cc20
-rw-r--r--www/chromium/files/patch-base_process_memory.cc13
-rw-r--r--www/chromium/files/patch-base_process_process__posix.cc4
-rw-r--r--www/chromium/files/patch-base_process_process__unittest.cc4
-rw-r--r--www/chromium/files/patch-base_rand__util__posix.cc4
-rw-r--r--www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc6
-rw-r--r--www/chromium/files/patch-base_threading_platform__thread.h4
-rw-r--r--www/chromium/files/patch-build_config_compiler_BUILD.gn20
-rw-r--r--www/chromium/files/patch-build_config_ozone.gni4
-rw-r--r--www/chromium/files/patch-chrome_app_app__management__strings.grdp10
-rw-r--r--www/chromium/files/patch-chrome_app_chrome__main__delegate.cc32
-rw-r--r--www/chromium/files/patch-chrome_app_generated__resources.grd14
-rw-r--r--www/chromium/files/patch-chrome_app_settings__strings.grdp6
-rw-r--r--www/chromium/files/patch-chrome_browser_about__flags.cc26
-rw-r--r--www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc22
-rw-r--r--www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc71
-rw-r--r--www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__process__impl.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_browser__resources.grd10
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__browser__main.cc28
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc28
-rw-r--r--www/chromium/files/patch-chrome_browser_chrome__content__browser__client.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_defaults.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd6
-rw-r--r--www/chromium/files/patch-chrome_browser_download_download__item__model.cc6
-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_chrome__desktop__report__request__helper.cc6
-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_api_webrtc__logging__private_webrtc__logging__private__api.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_browser__context__keyed__service__factories.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc6
-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_flag__descriptions.cc16
-rw-r--r--www/chromium/files/patch-chrome_browser_flag__descriptions.h14
-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.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc17
-rw-r--r--www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h6
-rw-r--r--www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc10
-rw-r--r--www/chromium/files/patch-chrome_browser_policy_configuration__policy__handler__list__factory.cc12
-rw-r--r--www/chromium/files/patch-chrome_browser_prefs_browser__prefs.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_process__singleton__posix.cc21
-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.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_profiles_profiles__state.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts29
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts10
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html14
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts36
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css11
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html11
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_settings_route.ts4
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css11
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html11
-rw-r--r--www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html38
-rw-r--r--www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc38
-rw-r--r--www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h20
-rw-r--r--www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_themes_theme__helper.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser.h16
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_chrome__pages.cc4
-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_startup__browser__creator.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc8
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_accelerator__table.cc11
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc6
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc11
-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_profiles_profile__menu__view__base.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_views_tabs_tab__drag__controller.cc14
-rw-r--r--www/chromium/files/patch-chrome_browser_ui_webui_chrome__web__ui__controller__factory.cc14
-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_appearance__handler.cc14
-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_web__applications_web__app__provider.cc4
-rw-r--r--www/chromium/files/patch-chrome_browser_webauthn_chrome__authenticator__request__delegate.cc14
-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__switches.cc4
-rw-r--r--www/chromium/files/patch-chrome_common_chrome__switches.h4
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.cc14
-rw-r--r--www/chromium/files/patch-chrome_common_pref__names.h14
-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.cc12
-rw-r--r--www/chromium/files/patch-chrome_common_webui__url__constants.h8
-rw-r--r--www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc4
-rw-r--r--www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc4
-rw-r--r--www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.cc (renamed from www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.cc)12
-rw-r--r--www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.h20
-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.cc4
-rw-r--r--www/chromium/files/patch-chromecast_browser_cast__browser__main__parts.cc35
-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.cc4
-rw-r--r--www/chromium/files/patch-components_autofill__payments__strings.grdp6
-rw-r--r--www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc4
-rw-r--r--www/chromium/files/patch-components_autofill_core_common_autofill__payments__features.cc4
-rw-r--r--www/chromium/files/patch-components_components__chromium__strings.grd10
-rw-r--r--www/chromium/files/patch-components_components__google__chrome__strings.grd10
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc4
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.cc4
-rw-r--r--www/chromium/files/patch-components_feature__engagement_public_feature__constants.h4
-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_flags__ui_flags__state.cc4
-rw-r--r--www/chromium/files/patch-components_live__caption_caption__util.cc4
-rw-r--r--www/chromium/files/patch-components_neterror_resources_neterror.js12
-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_new__or__sad__tab__strings.grdp10
-rw-r--r--www/chromium/files/patch-components_os__crypt_os__crypt.h10
-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_login__database__unittest.cc10
-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.cc10
-rw-r--r--www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h4
-rw-r--r--www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc12
-rw-r--r--www/chromium/files/patch-components_policy_resources_policy__templates.json48
-rw-r--r--www/chromium/files/patch-components_services_screen__ai_sandbox_screen__ai__sandbox__hook__linux.cc4
-rw-r--r--www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc11
-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-components_viz_service_display_skia__renderer.cc11
-rw-r--r--www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc4
-rw-r--r--www/chromium/files/patch-content_app_content__main__runner__impl.cc18
-rw-r--r--www/chromium/files/patch-content_browser_BUILD.gn4
-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.cc22
-rw-r--r--www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc8
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc4
-rw-r--r--www/chromium/files/patch-content_browser_renderer__host_render__process__host__impl.cc4
-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_webui_web__ui__main__frame__observer.cc10
-rw-r--r--www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h6
-rw-r--r--www/chromium/files/patch-content_child_child__process.cc4
-rw-r--r--www/chromium/files/patch-content_common_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__main.cc14
-rw-r--r--www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc18
-rw-r--r--www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h6
-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.h6
-rw-r--r--www/chromium/files/patch-content_public_test_mock__render__thread.cc4
-rw-r--r--www/chromium/files/patch-content_renderer_render__process__impl.cc12
-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.cc6
-rw-r--r--www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h10
-rw-r--r--www/chromium/files/patch-content_shell_BUILD.gn4
-rw-r--r--www/chromium/files/patch-content_test_BUILD.gn6
-rw-r--r--www/chromium/files/patch-content_utility_services.cc12
-rw-r--r--www/chromium/files/patch-content_utility_utility__main.cc4
-rw-r--r--www/chromium/files/patch-device_bluetooth_bluetooth__adapter.cc11
-rw-r--r--www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni4
-rw-r--r--www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc4
-rw-r--r--www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc22
-rw-r--r--www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc4
-rw-r--r--www/chromium/files/patch-extensions_common_api___permission__features.json8
-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__factory.cc22
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_webgpu__decoder__impl.cc10
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_service_wrapped__sk__image.cc11
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc4
-rw-r--r--www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h4
-rw-r--r--www/chromium/files/patch-gpu_ipc_service_gpu__init.cc12
-rw-r--r--www/chromium/files/patch-gpu_vulkan_vulkan__util.cc11
-rw-r--r--www/chromium/files/patch-media_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_audio_BUILD.gn4
-rw-r--r--www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc10
-rw-r--r--www/chromium/files/patch-media_base_media__switches.cc10
-rw-r--r--www/chromium/files/patch-media_base_media__switches.h8
-rw-r--r--www/chromium/files/patch-media_base_supported__types.cc8
-rw-r--r--www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc4
-rw-r--r--www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc12
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc4
-rw-r--r--www/chromium/files/patch-media_gpu_vaapi_vaapi__wrapper.cc4
-rw-r--r--www/chromium/files/patch-media_media__options.gni6
-rw-r--r--www/chromium/files/patch-net_BUILD.gn22
-rw-r--r--www/chromium/files/patch-net_base_network__change__notifier.cc4
-rw-r--r--www/chromium/files/patch-net_base_sockaddr__util__posix.cc4
-rw-r--r--www/chromium/files/patch-net_cert_cert__verify__proc__unittest.cc4
-rw-r--r--www/chromium/files/patch-net_dns_host__resolver__manager.cc4
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc4
-rw-r--r--www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc8
-rw-r--r--www/chromium/files/patch-net_socket_socket__posix.cc4
-rw-r--r--www/chromium/files/patch-net_socket_udp__socket__posix.cc8
-rw-r--r--www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc11
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context.cc4
-rw-r--r--www/chromium/files/patch-net_url__request_url__request__context__builder.cc4
-rw-r--r--www/chromium/files/patch-remoting_codec_webrtc__video__encoder__vpx.cc4
-rw-r--r--www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc14
-rw-r--r--www/chromium/files/patch-third__party_angle_BUILD.gn8
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_Display.cpp10
-rw-r--r--www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp4
-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_core_exported_web__view__impl.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_frame_web__frame__test.cc6
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.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_modules_webgl_webgl__webcodecs__video__frame.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc20
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc4
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_runtime__enabled__features.json512
-rw-r--r--www/chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h6
-rw-r--r--www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni6
-rw-r--r--www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h4
-rw-r--r--www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc4
-rw-r--r--www/chromium/files/patch-third__party_dawn_include_dawn_native_VulkanBackend.h6
-rw-r--r--www/chromium/files/patch-third__party_dawn_src_dawn_common_Platform.h12
-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_ffmpeg_chromium_config_Chrome_openbsd_x64_config.asm10
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config.h8
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_x64_config__components.h24
-rw-r--r--www/chromium/files/patch-third__party_ffmpeg_libavutil_cpu.c4
-rw-r--r--www/chromium/files/patch-third__party_glfw_src_src_egl__context.c11
-rw-r--r--www/chromium/files/patch-third__party_pdfium_core_fxcrt_cfx__datetime.cpp11
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_Vulkan_BUILD.gn13
-rw-r--r--www/chromium/files/patch-third__party_swiftshader_src_WSI_BUILD.gn18
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_allocation.h11
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_get__environment.c13
-rw-r--r--www/chromium/files/patch-third__party_vulkan-deps_vulkan-loader_src_loader_vk__loader__platform.h6
-rw-r--r--www/chromium/files/patch-third__party_webrtc_modules_audio__device_BUILD.gn4
-rw-r--r--www/chromium/files/patch-third__party_zlib_BUILD.gn8
-rw-r--r--www/chromium/files/patch-tools_json__schema__compiler_feature__compiler.py5
-rw-r--r--www/chromium/files/patch-tools_protoc__wrapper_protoc__wrapper.py19
-rw-r--r--www/chromium/files/patch-ui_aura_screen__ozone.cc4
-rw-r--r--www/chromium/files/patch-ui_aura_screen__ozone.h4
-rw-r--r--www/chromium/files/patch-ui_base_ime_dummy__text__input__client.cc4
-rw-r--r--www/chromium/files/patch-ui_base_resource_resource__bundle.cc4
-rw-r--r--www/chromium/files/patch-ui_base_test_skia__gold__pixel__diff.cc10
-rw-r--r--www/chromium/files/patch-ui_base_ui__base__features.cc6
-rw-r--r--www/chromium/files/patch-ui_color_color__id.h6
-rw-r--r--www/chromium/files/patch-ui_color_native__color__mixers.cc17
-rw-r--r--www/chromium/files/patch-ui_display_screen.cc4
-rw-r--r--www/chromium/files/patch-ui_display_screen.h8
-rw-r--r--www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.cc10
-rw-r--r--www/chromium/files/patch-ui_events_keycodes_dom_keycode__converter.h4
-rw-r--r--www/chromium/files/patch-ui_gfx_BUILD.gn4
-rw-r--r--www/chromium/files/patch-ui_gl_BUILD.gn10
-rw-r--r--www/chromium/files/patch-ui_gl_generate__bindings.py4
-rw-r--r--www/chromium/files/patch-ui_gl_gl__features.cc16
-rw-r--r--www/chromium/files/patch-ui_ozone_common_egl__util.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_headless_headless__surface__factory.cc4
-rw-r--r--www/chromium/files/patch-ui_ozone_platform_headless_ozone__platform__headless.cc10
-rw-r--r--www/chromium/files/patch-ui_strings_app__locale__settings.grd6
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__bn.xtb6
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ja.xtb6
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ko.xtb6
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__ml.xtb6
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__th.xtb6
-rw-r--r--www/chromium/files/patch-ui_strings_translations_app__locale__settings__zh-CN.xtb6
-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_controls_textfield_textfield.cc14
-rw-r--r--www/chromium/files/patch-ui_views_linux__ui_linux__ui.cc8
-rw-r--r--www/chromium/files/patch-ui_views_linux__ui_linux__ui.h12
-rw-r--r--www/chromium/files/patch-ui_views_style_platform__style.cc11
-rw-r--r--www/chromium/files/patch-ui_views_widget_desktop__aura_desktop__window__tree__host__platform.cc6
-rw-r--r--www/chromium/files/patch-v8_BUILD.gn8
-rw-r--r--www/chromium/files/patch-v8_src_api_api.cc4
-rw-r--r--www/chromium/files/patch-v8_src_wasm_baseline_ia32_liftoff-assembler-ia32.h24
295 files changed, 3442 insertions, 5496 deletions
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 7a19a6cb98dd..105000c1e678 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -1,5 +1,5 @@
PORTNAME= chromium
-PORTVERSION= 103.0.5060.134
+PORTVERSION= 104.0.5112.79
CATEGORIES= www wayland
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/ \
https://nerd.hu/distfiles/:external
@@ -92,7 +92,6 @@ GN_ARGS+= clang_use_chrome_plugins=false \
enable_hangout_services_extension=true \
enable_js_type_check=false \
enable_nacl=false \
- enable_one_click_signin=true \
enable_remoting=false \
enable_wmax_tokens=false \
fatal_linker_warnings=false \
diff --git a/www/chromium/distinfo b/www/chromium/distinfo
index d449a092f418..69eec2095041 100644
--- a/www/chromium/distinfo
+++ b/www/chromium/distinfo
@@ -1,9 +1,9 @@
-TIMESTAMP = 1658300677
-SHA256 (chromium-103.0.5060.134.tar.xz) = e48a272481e41b1aae7aba71b55c41fe9e994cf71edd01c8ca1d0b604af0b571
-SIZE (chromium-103.0.5060.134.tar.xz) = 1488286096
-SHA256 (chrome-linux-103.0.5060.134-llvm13.profdata.tar.xz) = abac57f392bf42a68e94b9fcb90ac28e39e1019dccfbaf5ac5bf66210e24032c
-SIZE (chrome-linux-103.0.5060.134-llvm13.profdata.tar.xz) = 24397884
-SHA256 (chromium-103.0.5060.134-testdata.tar.xz) = 8097abf4dd8e0bd3a9e293acf5e01ea379dcab9b4154bfa57817e8bbb47b0d59
-SIZE (chromium-103.0.5060.134-testdata.tar.xz) = 260891464
+TIMESTAMP = 1659422888
+SHA256 (chromium-104.0.5112.79.tar.xz) = 9cc662f1a84c796521ee17ed2808795ca937fe7f77bc605e788f0304a81dabf3
+SIZE (chromium-104.0.5112.79.tar.xz) = 1509100404
+SHA256 (chrome-linux-104.0.5112.79-llvm13.profdata.tar.xz) = d088e4540e6bf1a077e41e6a94ab7af3dd72cfdaad1f35737559a4570b0612b1
+SIZE (chrome-linux-104.0.5112.79-llvm13.profdata.tar.xz) = 24547748
+SHA256 (chromium-104.0.5112.79-testdata.tar.xz) = 9f54026ed796e66dcbaceb31be5408c510421a0c308ab890de8bc9237f2b837c
+SIZE (chromium-104.0.5112.79-testdata.tar.xz) = 264005020
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 2ff3fd50744c..c6627a923546 100644
--- a/www/chromium/files/patch-BUILD.gn
+++ b/www/chromium/files/patch-BUILD.gn
@@ -1,4 +1,4 @@
---- BUILD.gn.orig 2022-06-17 14:20:10 UTC
+--- BUILD.gn.orig 2022-07-22 17:30:31 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",
-@@ -447,7 +446,7 @@ group("gn_all") {
+@@ -446,7 +445,7 @@ group("gn_all") {
]
}
@@ -51,7 +51,7 @@
deps += [ "//third_party/breakpad:symupload($host_toolchain)" ]
}
-@@ -1167,7 +1175,7 @@ if (!is_ios) {
+@@ -1184,7 +1192,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)" ]
}
-@@ -1176,7 +1184,7 @@ if (!is_ios) {
+@@ -1193,7 +1201,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)" ]
}
-@@ -1580,7 +1588,7 @@ group("chromium_builder_perf") {
+@@ -1592,7 +1600,7 @@ group("chromium_builder_perf") {
if (is_win) {
data_deps += [ "//chrome/installer/mini_installer:mini_installer" ]
diff --git a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
index 151948510862..2ac2dff2a8b1 100644
--- a/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
+++ b/www/chromium/files/patch-apps_ui_views_app__window__frame__view.cc
@@ -1,6 +1,6 @@
---- apps/ui/views/app_window_frame_view.cc.orig 2022-02-28 16:54:41 UTC
+--- apps/ui/views/app_window_frame_view.cc.orig 2022-07-22 17:30:31 UTC
+++ apps/ui/views/app_window_frame_view.cc
-@@ -138,7 +138,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
+@@ -137,7 +137,7 @@ gfx::Rect AppWindowFrameView::GetWindowBoundsForClient
gfx::Rect window_bounds = client_bounds;
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/chromium/files/patch-base_BUILD.gn b/www/chromium/files/patch-base_BUILD.gn
index 61aca5553be5..e5a50d632c33 100644
--- a/www/chromium/files/patch-base_BUILD.gn
+++ b/www/chromium/files/patch-base_BUILD.gn
@@ -1,15 +1,15 @@
---- base/BUILD.gn.orig 2022-06-17 14:20:10 UTC
+--- base/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ base/BUILD.gn
-@@ -1004,7 +1004,7 @@ mixed_component("base") {
+@@ -1001,7 +1001,7 @@ mixed_component("base") {
"timer/hi_res_timer_manager_posix.cc",
]
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
- "cpu_affinity_posix.cc",
- "cpu_affinity_posix.h",
-@@ -1015,6 +1015,12 @@ mixed_component("base") {
+ "profiler/stack_copier_signal.cc",
+ "profiler/stack_copier_signal.h",
+@@ -1010,6 +1010,12 @@ mixed_component("base") {
"profiler/thread_delegate_posix.h",
]
}
@@ -23,11 +23,11 @@
if (is_win) {
@@ -1496,11 +1502,23 @@ mixed_component("base") {
+ # Needed for <atomic> if using newer C++ library than sysroot, except if
# building inside the cros_sdk environment - use host_toolchain as a
# more robust check for this.
- if (!use_sysroot &&
-- (is_android || ((is_linux || is_chromeos) && !is_chromecast)) &&
-+ (is_android || ((is_linux || is_chromeos) && !is_chromecast && !is_bsd)) &&
+- if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos)) &&
++ if (!use_sysroot && (is_android || is_chromeos || (is_linux && !is_castos && !is_bsd)) &&
host_toolchain != "//build/toolchain/cros:host") {
libs += [ "atomic" ]
}
@@ -60,12 +60,12 @@
# Allow more direct string conversions on platforms with native utf8
# strings
-- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) {
-+ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) {
+- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) {
++ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) {
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -2158,6 +2176,42 @@ mixed_component("base") {
+@@ -2165,6 +2183,42 @@ mixed_component("base") {
}
}
@@ -108,7 +108,7 @@
# iOS
if (is_ios) {
sources -= [
-@@ -3452,7 +3506,7 @@ test("base_unittests") {
+@@ -3467,7 +3521,7 @@ test("base_unittests") {
}
}
@@ -117,25 +117,25 @@
sources += [
"debug/proc_maps_linux_unittest.cc",
"files/scoped_file_linux_unittest.cc",
-@@ -3500,7 +3554,7 @@ test("base_unittests") {
+@@ -3514,7 +3568,7 @@ test("base_unittests") {
+ "posix/file_descriptor_shuffle_unittest.cc",
"posix/unix_domain_socket_unittest.cc",
- "task/thread_pool/task_tracker_posix_unittest.cc",
]
- if (!is_nacl && !is_apple) {
+ if (!is_nacl && !is_apple && !is_bsd) {
sources += [
- "cpu_affinity_posix_unittest.cc",
"profiler/stack_copier_signal_unittest.cc",
-@@ -3511,7 +3565,7 @@ test("base_unittests") {
+ "profiler/thread_delegate_posix_unittest.cc",
+@@ -3524,7 +3578,7 @@ test("base_unittests") {
# Allow more direct string conversions on platforms with native utf8
# strings
-- if (is_apple || is_chromeos || is_chromecast || is_fuchsia) {
-+ if (is_apple || is_chromeos || is_chromecast || is_fuchsia || is_bsd) {
+- if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia) {
++ if (is_apple || is_chromeos || is_castos || is_cast_android || is_fuchsia || is_bsd) {
defines += [ "SYSTEM_NATIVE_UTF8" ]
}
-@@ -3683,7 +3737,7 @@ test("base_unittests") {
+@@ -3712,7 +3766,7 @@ test("base_unittests") {
}
}
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
index 57ceca3efe3a..160b0b69d02e 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator.h
@@ -1,9 +1,9 @@
---- base/allocator/partition_allocator/page_allocator.h.orig 2022-02-28 16:54:41 UTC
+--- base/allocator/partition_allocator/page_allocator.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/page_allocator.h
-@@ -194,7 +194,7 @@ BASE_EXPORT void DecommitAndZeroSystemPages(void* addr
- // Whether decommitted memory is guaranteed to be zeroed when it is
+@@ -206,7 +206,7 @@ void DecommitAndZeroSystemPages(void* address, size_t
// recommitted. Do not assume that this will not change over time.
- constexpr BASE_EXPORT bool DecommittedMemoryIsAlwaysZeroed() {
+ constexpr PA_COMPONENT_EXPORT(
+ PARTITION_ALLOC) bool DecommittedMemoryIsAlwaysZeroed() {
-#if BUILDFLAG(IS_APPLE)
+#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
return false;
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
index 483bda5e796f..d728f1cc8f28 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_page__allocator__internals__posix.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-03-25 21:59:56 UTC
+--- base/allocator/partition_allocator/page_allocator_internals_posix.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/page_allocator_internals_posix.h
-@@ -352,8 +352,12 @@ bool TryRecommitSystemPagesInternal(
+@@ -347,8 +347,12 @@ bool TryRecommitSystemPagesInternal(
void DiscardSystemPagesInternal(uintptr_t address, size_t length) {
void* ptr = reinterpret_cast<void*>(address);
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
index 6b2c32c5ae86..ba8125fd0062 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__address__space.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-05-19 14:06:27 UTC
+--- base/allocator/partition_allocator/partition_address_space.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_address_space.cc
-@@ -184,7 +184,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
+@@ -234,7 +234,7 @@ void PartitionAddressSpace::UninitConfigurablePoolForT
setup_.configurable_pool_ = 0;
}
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
index 024aa1e97b2c..5b35ab100616 100644
--- 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
@@ -1,8 +1,8 @@
---- 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.orig 2022-07-22 17:30:31 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;
- }
+@@ -86,6 +86,10 @@ void RandBytes(void* output, size_t output_length) {
+ if (getentropy(output, output_length) == 0) {
+ return;
}
+#elif BUILDFLAG(IS_BSD)
+ if (getentropy(output, output_length) == 0) {
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h
new file mode 100644
index 000000000000..dfe57178caab
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__internal__posix.h
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h.orig 2022-07-22 17:30:31 UTC
++++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h
+@@ -10,7 +10,7 @@
+
+ namespace partition_alloc::internal::base::internal {
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Current thread id is cached in thread local storage for performance reasons.
+ // In some rare cases it's important to invalidate that cache explicitly (e.g.
+ // after going through clone() syscall which does not call pthread_atfork()
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc
new file mode 100644
index 000000000000..16c4bd4b3273
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_threading_platform__thread__posix.cc
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc.orig 2022-07-22 17:30:31 UTC
++++ base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_posix.cc
+@@ -17,7 +17,7 @@
+ #include "base/allocator/partition_allocator/partition_alloc_base/threading/platform_thread_internal_posix.h"
+ #include "build/build_config.h"
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ #include <sys/syscall.h>
+ #include <atomic>
+ #endif
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc
new file mode 100644
index 000000000000..aa3133e6ce8d
--- /dev/null
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__base_time_time.cc
@@ -0,0 +1,11 @@
+--- base/allocator/partition_allocator/partition_alloc_base/time/time.cc.orig 2022-07-22 17:30:31 UTC
++++ base/allocator/partition_allocator/partition_alloc_base/time/time.cc
+@@ -6,7 +6,7 @@
+
+ #include "build/build_config.h"
+
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // time.h is a widely included header and its size impacts build time.
+ // Try not to raise this limit unless necessary. See
+ // https://chromium.googlesource.com/chromium/src/+/HEAD/docs/wmax_tokens.md
diff --git a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
index ae70ea5b47aa..d6413d76da7e 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_partition__alloc__config.h
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-05-19 14:06:27 UTC
+--- base/allocator/partition_allocator/partition_alloc_config.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_config.h
-@@ -66,7 +66,7 @@ static_assert(sizeof(void*) != 8, "");
+@@ -68,7 +68,7 @@ static_assert(sizeof(void*) != 8, "");
// POSIX is not only UNIX, e.g. macOS and other OSes. We do use Linux-specific
// features such as futex(2).
@@ -9,7 +9,7 @@
#define PA_HAS_LINUX_KERNEL
#endif
-@@ -186,7 +186,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -187,7 +187,7 @@ constexpr bool kUseLazyCommit = false;
// On these platforms, lock all the partitions before fork(), and unlock after.
// This may be required on more platforms in the future.
@@ -18,7 +18,7 @@
#define PA_HAS_ATFORK_HANDLER
#endif
-@@ -225,7 +225,7 @@ constexpr bool kUseLazyCommit = false;
+@@ -227,7 +227,7 @@ constexpr bool kUseLazyCommit = false;
//
// Also enabled on ARM64 macOS, as the 16kiB pages on this platform lead to
// larger slot spans.
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 9bb71dd6268f..ea17eb2ddaca 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,11 +1,20 @@
---- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-06-17 14:20:10 UTC
+--- base/allocator/partition_allocator/partition_alloc_constants.h.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_alloc_constants.h
-@@ -84,7 +84,7 @@ PartitionPageShift() {
+@@ -96,7 +96,7 @@ PartitionPageShift() {
return 18; // 256 KiB
}
#elif (BUILDFLAG(IS_APPLE) && defined(ARCH_CPU_64_BITS)) || \
- (BUILDFLAG(IS_LINUX) && defined(ARCH_CPU_ARM64))
+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_ARM64))
- PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR ALWAYS_INLINE size_t
+ PAGE_ALLOCATOR_CONSTANTS_DECLARE_CONSTEXPR PA_ALWAYS_INLINE size_t
PartitionPageShift() {
return PageAllocationGranularityShift() + 2;
+@@ -252,7 +252,7 @@ constexpr size_t kSuperPageBaseMask = ~kSuperPageOffse
+ #if defined(PA_HAS_64_BITS_POINTERS)
+ // The Configurable Pool is only available in 64-bit mode
+ constexpr size_t kNumPools = 3;
+-#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // Special-case macOS. Contrary to other platforms, there is no sandbox limit
+ // there, meaning that a single renderer could "happily" consume >8GiB. So the
+ // 8GiB pool size is a regression. Make the limit higher on this platform only
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 70cba6b75bf8..a46d0c1a9f27 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,6 +1,6 @@
---- base/allocator/partition_allocator/partition_root.cc.orig 2022-06-17 14:20:10 UTC
+--- base/allocator/partition_allocator/partition_root.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/partition_root.cc
-@@ -29,7 +29,7 @@
+@@ -33,7 +33,7 @@
#include "wow64apiset.h"
#endif
@@ -9,7 +9,7 @@
#include <pthread.h>
#endif
-@@ -226,7 +226,7 @@ void PartitionAllocMallocInitOnce() {
+@@ -230,7 +230,7 @@ void PartitionAllocMallocInitOnce() {
if (!g_global_init_called.compare_exchange_strong(expected, true))
return;
@@ -18,7 +18,7 @@
// When fork() is called, only the current thread continues to execute in the
// child process. If the lock is held, but *not* by this thread when fork() is
// called, we have a deadlock.
-@@ -305,7 +305,7 @@ static size_t PartitionPurgeSlotSpan(
+@@ -309,7 +309,7 @@ static size_t PartitionPurgeSlotSpan(
constexpr size_t kMaxSlotCount =
(PartitionPageSize() * kMaxPartitionPagesPerRegularSlotSpan) /
SystemPageSize();
@@ -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
-@@ -651,7 +651,7 @@ void PartitionRoot<thread_safe>::Init(PartitionOptions
+@@ -655,7 +655,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_allocator_partition__allocator_spinning__mutex.cc b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
index fc3fa41f6937..4d89110c7401 100644
--- a/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
+++ b/www/chromium/files/patch-base_allocator_partition__allocator_spinning__mutex.cc
@@ -1,6 +1,6 @@
---- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-04-21 18:48:31 UTC
+--- base/allocator/partition_allocator/spinning_mutex.cc.orig 2022-07-22 17:30:31 UTC
+++ base/allocator/partition_allocator/spinning_mutex.cc
-@@ -17,7 +17,15 @@
+@@ -18,7 +18,15 @@
#if defined(PA_HAS_LINUX_KERNEL)
#include <errno.h>
@@ -16,7 +16,7 @@
#include <sys/syscall.h>
#include <unistd.h>
#endif // defined(PA_HAS_LINUX_KERNEL)
-@@ -116,8 +124,13 @@ void SpinningMutex::FutexWait() {
+@@ -107,8 +115,13 @@ void SpinningMutex::FutexWait() {
// |kLockedContended| anymore. Note that even without spurious wakeups, the
// value of |state_| is not guaranteed when this returns, as another thread
// may get the lock before we get to run.
@@ -30,7 +30,7 @@
if (err) {
// These are programming error, check them.
-@@ -129,8 +142,14 @@ void SpinningMutex::FutexWait() {
+@@ -120,8 +133,14 @@ void SpinningMutex::FutexWait() {
void SpinningMutex::FutexWake() {
int saved_errno = errno;
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 d0148196ba56..5fafd41cb66a 100644
--- a/www/chromium/files/patch-base_files_file__util__posix.cc
+++ b/www/chromium/files/patch-base_files_file__util__posix.cc
@@ -1,12 +1,15 @@
---- base/files/file_util_posix.cc.orig 2022-06-17 14:20:10 UTC
+--- base/files/file_util_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ base/files/file_util_posix.cc
-@@ -696,32 +696,34 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
+@@ -696,32 +696,37 @@ bool CreateDirectoryAndGetError(const FilePath& full_p
File::Error* error) {
ScopedBlockingCall scoped_blocking_call(
FROM_HERE, BlockingType::MAY_BLOCK); // For call to mkdir().
+ const FilePath kFileSystemRoot("/");
std::vector<FilePath> subpaths;
++ if (DirectoryExists(full_path))
++ return true;
++
// Collect a list of all parent directories.
FilePath last_path = full_path;
- subpaths.push_back(full_path);
diff --git a/www/chromium/files/patch-base_i18n_icu__util.cc b/www/chromium/files/patch-base_i18n_icu__util.cc
index f9fe06225de0..c14c06e1c33c 100644
--- a/www/chromium/files/patch-base_i18n_icu__util.cc
+++ b/www/chromium/files/patch-base_i18n_icu__util.cc
@@ -1,20 +1,20 @@
---- base/i18n/icu_util.cc.orig 2022-06-17 14:20:10 UTC
+--- base/i18n/icu_util.cc.orig 2022-07-22 17:30:31 UTC
+++ base/i18n/icu_util.cc
-@@ -54,7 +54,7 @@
+@@ -53,7 +53,7 @@
+ #include "third_party/icu/source/common/unicode/unistr.h"
#endif
- #if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
-- ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+ ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
- !BUILDFLAG(IS_CHROMECAST))
+-#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || \
++#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD) || \
+ BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
#include "third_party/icu/source/i18n/unicode/timezone.h"
#endif
-@@ -326,7 +326,7 @@ void InitializeIcuTimeZone() {
+@@ -325,7 +325,7 @@ void InitializeIcuTimeZone() {
FuchsiaIntlProfileWatcher::GetPrimaryTimeZoneIdForIcuInitialization();
icu::TimeZone::adoptDefault(
icu::TimeZone::createTimeZone(icu::UnicodeString::fromUTF8(zone_id)));
--#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && \
-+#elif (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && \
- !BUILDFLAG(IS_CHROMECAST)
+-#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
++#elif BUILDFLAG(IS_CHROMEOS) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
// To respond to the time zone change properly, the default time zone
// cache in ICU has to be populated on starting up.
+ // See TimeZoneMonitorLinux::NotifyClientsFromImpl().
diff --git a/www/chromium/files/patch-base_process_memory.cc b/www/chromium/files/patch-base_process_memory.cc
index 13cd43d79b6c..4c75405fc8fb 100644
--- a/www/chromium/files/patch-base_process_memory.cc
+++ b/www/chromium/files/patch-base_process_memory.cc
@@ -1,15 +1,6 @@
---- base/process/memory.cc.orig 2022-02-28 16:54:41 UTC
+--- base/process/memory.cc.orig 2022-07-22 17:30:31 UTC
+++ base/process/memory.cc
-@@ -65,14 +65,16 @@ NOINLINE void OnNoMemoryInternal(size_t size) {
-
- } // namespace internal
-
-+#if !BUILDFLAG(IS_BSD)
- void TerminateBecauseOutOfMemory(size_t size) {
- internal::OnNoMemoryInternal(size);
- }
-+#endif
-
+@@ -29,7 +29,7 @@ namespace base {
// Defined in memory_mac.mm for macOS + use_allocator="none". In case of
// USE_PARTITION_ALLOC_AS_MALLOC, no need to route the call to the system
// default calloc of macOS.
diff --git a/www/chromium/files/patch-base_process_process__posix.cc b/www/chromium/files/patch-base_process_process__posix.cc
index 5154b3028c57..4f9205302896 100644
--- a/www/chromium/files/patch-base_process_process__posix.cc
+++ b/www/chromium/files/patch-base_process_process__posix.cc
@@ -1,4 +1,4 @@
---- base/process/process_posix.cc.orig 2022-05-19 14:06:27 UTC
+--- base/process/process_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ base/process/process_posix.cc
@@ -25,10 +25,15 @@
#include "build/build_config.h"
@@ -35,7 +35,7 @@
// On Mac we can wait on non child processes.
return WaitForSingleNonChildProcess(handle, timeout);
#else
-@@ -358,7 +363,55 @@ void Process::Exited(int exit_code) const {}
+@@ -379,7 +384,55 @@ void Process::Exited(int exit_code) const {
int Process::GetPriority() const {
DCHECK(IsValid());
diff --git a/www/chromium/files/patch-base_process_process__unittest.cc b/www/chromium/files/patch-base_process_process__unittest.cc
index 32da363685fc..7c23a1ea4882 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-06-17 14:20:10 UTC
+--- base/process/process_unittest.cc.orig 2022-07-22 17:30:31 UTC
+++ base/process/process_unittest.cc
-@@ -139,7 +139,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
+@@ -193,7 +193,7 @@ TEST_F(ProcessTest, CreationTimeOtherProcess) {
// was spawned and a time recorded after it was spawned. However, since the
// base::Time and process creation clocks don't match, tolerate some error.
constexpr base::TimeDelta kTolerance =
diff --git a/www/chromium/files/patch-base_rand__util__posix.cc b/www/chromium/files/patch-base_rand__util__posix.cc
index 5e00097c8aa2..ce4eedbcb4ee 100644
--- a/www/chromium/files/patch-base_rand__util__posix.cc
+++ b/www/chromium/files/patch-base_rand__util__posix.cc
@@ -1,4 +1,4 @@
---- base/rand_util_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- base/rand_util_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ base/rand_util_posix.cc
@@ -17,7 +17,7 @@
#include "base/posix/eintr_wrapper.h"
@@ -33,7 +33,7 @@
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && !BUILDFLAG(IS_NACL)
// We have to call `getrandom` via Linux Syscall Support, rather than through
// the libc wrapper, because we might not have an up-to-date libc (e.g. on
-@@ -93,11 +96,16 @@ void RandBytes(void* output, size_t output_length) {
+@@ -91,11 +94,16 @@ void RandBytes(void* output, size_t output_length) {
const bool success =
ReadFromFD(urandom_fd, static_cast<char*>(output), output_length);
CHECK(success);
diff --git a/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
index f4353c3b265d..5752dc911ef0 100644
--- a/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
+++ b/www/chromium/files/patch-base_strings_safe__sprintf__unittest.cc
@@ -1,6 +1,6 @@
---- base/strings/safe_sprintf_unittest.cc.orig 2022-02-28 16:54:41 UTC
+--- base/strings/safe_sprintf_unittest.cc.orig 2022-07-22 17:30:31 UTC
+++ base/strings/safe_sprintf_unittest.cc
-@@ -731,6 +731,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
+@@ -732,6 +732,7 @@ TEST(SafeSPrintfTest, EmbeddedNul) {
#endif
}
@@ -8,7 +8,7 @@
TEST(SafeSPrintfTest, EmitNULL) {
char buf[40];
#if defined(__GNUC__)
-@@ -747,6 +748,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
+@@ -748,6 +749,7 @@ TEST(SafeSPrintfTest, EmitNULL) {
#pragma GCC diagnostic pop
#endif
}
diff --git a/www/chromium/files/patch-base_threading_platform__thread.h b/www/chromium/files/patch-base_threading_platform__thread.h
index 7829e5be4113..c871da786e1f 100644
--- a/www/chromium/files/patch-base_threading_platform__thread.h
+++ b/www/chromium/files/patch-base_threading_platform__thread.h
@@ -1,6 +1,6 @@
---- base/threading/platform_thread.h.orig 2022-05-19 14:06:27 UTC
+--- base/threading/platform_thread.h.orig 2022-07-22 17:30:31 UTC
+++ base/threading/platform_thread.h
-@@ -211,7 +211,7 @@ class BASE_EXPORT PlatformThread {
+@@ -213,7 +213,7 @@ class BASE_EXPORT PlatformThread {
// Returns a realtime period provided by `delegate`.
static TimeDelta GetRealtimePeriod(Delegate* delegate);
diff --git a/www/chromium/files/patch-build_config_compiler_BUILD.gn b/www/chromium/files/patch-build_config_compiler_BUILD.gn
index aa5b6f12202c..50d9caf98660 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-06-17 14:20:10 UTC
+--- build/config/compiler/BUILD.gn.orig 2022-07-22 17:30:31 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
-@@ -903,7 +910,7 @@ config("compiler_cpu_abi") {
+@@ -909,7 +916,7 @@ config("compiler_cpu_abi") {
]
}
} else if (current_cpu == "arm") {
@@ -47,7 +47,7 @@
cflags += [ "--target=arm-linux-gnueabihf" ]
ldflags += [ "--target=arm-linux-gnueabihf" ]
}
-@@ -917,7 +924,7 @@ config("compiler_cpu_abi") {
+@@ -923,7 +930,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" ]
}
-@@ -1238,7 +1245,7 @@ config("compiler_deterministic") {
+@@ -1244,7 +1251,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",
-@@ -1529,12 +1536,12 @@ config("default_warnings") {
+@@ -1535,12 +1542,12 @@ config("default_warnings") {
"-Wno-ignored-pragma-optimize",
]
@@ -78,9 +78,9 @@
- if (!is_nacl && !(is_chromeos ||
+ if (!is_nacl && !is_bsd && !(is_chromeos ||
default_toolchain == "//build/toolchain/cros:target")) {
- # TODO(https://crbug.com/1316298): Re-enable once test failure is figured out
+ # TODO(https://crbug.com/1322823): Remove flags once potential miscompile is investigated.
cflags += [
-@@ -1719,7 +1726,7 @@ config("no_chromium_code") {
+@@ -1724,7 +1731,7 @@ config("no_chromium_code") {
# third-party libraries.
"-Wno-c++11-narrowing",
]
@@ -89,7 +89,7 @@
cflags += [
# Disabled for similar reasons as -Wunused-variable.
"-Wno-unused-but-set-variable",
-@@ -2233,7 +2240,7 @@ config("afdo_optimize_size") {
+@@ -2238,7 +2245,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") {
@@ -98,7 +98,7 @@
cflags = []
if (clang_emit_debug_info_for_profiling) {
# Add the following flags to generate debug info for profiling.
-@@ -2249,7 +2256,7 @@ config("afdo") {
+@@ -2254,7 +2261,7 @@ config("afdo") {
cflags += [ "-fprofile-sample-use=${rebased_clang_sample_profile}" ]
inputs = [ _clang_sample_profile ]
}
@@ -107,7 +107,7 @@
cflags = [ "-fauto-profile=${auto_profile_path}" ]
inputs = [ auto_profile_path ]
}
-@@ -2392,7 +2399,8 @@ config("symbols") {
+@@ -2395,7 +2402,8 @@ config("symbols") {
}
}
diff --git a/www/chromium/files/patch-build_config_ozone.gni b/www/chromium/files/patch-build_config_ozone.gni
index 26cc1361547f..c3d27e12d61f 100644
--- a/www/chromium/files/patch-build_config_ozone.gni
+++ b/www/chromium/files/patch-build_config_ozone.gni
@@ -1,6 +1,6 @@
---- build/config/ozone.gni.orig 2022-03-31 09:33:37 UTC
+--- build/config/ozone.gni.orig 2022-07-22 17:30:31 UTC
+++ build/config/ozone.gni
-@@ -91,7 +91,15 @@ declare_args() {
+@@ -88,7 +88,15 @@ declare_args() {
} else if (is_chromeos_lacros) {
ozone_platform = "wayland"
ozone_platform_wayland = true
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 3499a698d0af..951439da5219 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-06-17 14:20:10 UTC
+--- chrome/app/app_management_strings.grdp.orig 2022-07-22 17:30:31 UTC
+++ chrome/app/app_management_strings.grdp
-@@ -174,7 +174,7 @@
+@@ -173,7 +173,7 @@
+ You can open and edit supported files with this app from Finder or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&lt;a href="#"&gt;</ph>learn how to set default apps on your device<ph name="END_LINK">&lt;/a&gt;</ph>.
</message>
</if>
- <!-- 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">
+- <if expr="is_fuchsia or is_linux">
++ <if expr="is_fuchsia or is_posix">
<message name="IDS_APP_MANAGEMENT_FILE_HANDLING_SET_DEFAULTS_LINK" desc="Further explanation of the File Handling API, including text describing the purpose of the toggle (referencing a generic Linux file browser app) and a link to a learn more link for default filetype associations.">
You can open and edit supported files with this app from your file browser or other apps. To control which files open this app by default, <ph name="BEGIN_LINK">&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__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
index e725615c2082..e9c8dd1d6baa 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,7 +1,7 @@
---- chrome/app/chrome_main_delegate.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/app/chrome_main_delegate.cc
-@@ -117,7 +117,7 @@
- #include "chrome/app/chrome_crash_reporter_client.h"
+@@ -125,7 +125,7 @@
+ #include "components/about_ui/credit_utils.h"
#endif
-#if BUILDFLAG(ENABLE_NACL) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS))
@@ -9,7 +9,7 @@
#include "components/nacl/common/nacl_paths.h"
#include "components/nacl/zygote/nacl_fork_delegate_linux.h"
#endif
-@@ -160,12 +160,12 @@
+@@ -168,12 +168,12 @@
#include "v8/include/v8.h"
#endif
@@ -24,7 +24,7 @@
#include "chrome/browser/policy/policy_path_parser.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -308,7 +308,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
+@@ -320,7 +320,7 @@ void AdjustLinuxOOMScore(const std::string& process_ty
// and resources loaded.
bool SubprocessNeedsResourceBundle(const std::string& process_type) {
return
@@ -33,7 +33,7 @@
// The zygote process opens the resources for the renderers.
process_type == switches::kZygoteProcess ||
#endif
-@@ -348,7 +348,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
+@@ -406,7 +406,7 @@ bool HandleVersionSwitches(const base::CommandLine& co
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -42,7 +42,7 @@
// Show the man page if --help or -h is on the command line.
void HandleHelpSwitches(const base::CommandLine& command_line) {
if (command_line.HasSwitch(switches::kHelp) ||
-@@ -412,7 +412,7 @@ void InitializeUserDataDir(base::CommandLine* command_
+@@ -470,7 +470,7 @@ void InitializeUserDataDir(base::CommandLine* command_
std::string process_type =
command_line->GetSwitchValueASCII(switches::kProcessType);
@@ -51,7 +51,7 @@
// On Linux, Chrome does not support running multiple copies under different
// DISPLAYs, so the profile directory can be specified in the environment to
// support the virtual desktop use-case.
-@@ -496,7 +496,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
+@@ -554,7 +554,7 @@ void RecordMainStartupMetrics(base::TimeTicks applicat
#endif
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -60,7 +60,7 @@
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
startup_metric_utils::RecordStartupProcessCreationTime(
-@@ -668,6 +668,8 @@ void ChromeMainDelegate::PostFieldTrialInitialization(
+@@ -733,6 +733,8 @@ void ChromeMainDelegate::CommonEarlyInitialization() {
// not always enabled on Linux/ChromeOS.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
bool enable_gwp_asan = crash_reporter::IsCrashpadEnabled();
@@ -69,16 +69,16 @@
#else
bool enable_gwp_asan = true;
#endif
-@@ -806,7 +808,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -878,7 +880,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
}
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
+ // TODO(crbug.com/1052397): Revisit the macro expression once build flag
+ // switch of lacros-chrome is complete.
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -837,7 +839,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -936,7 +938,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
#if BUILDFLAG(IS_CHROMEOS)
chromeos::dbus_paths::RegisterPathProvider();
#endif
@@ -87,7 +87,7 @@
nacl::RegisterPathProvider();
#endif
-@@ -1163,7 +1165,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1316,7 +1318,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@@ -95,8 +95,8 @@
+#if BUILDFLAG(IS_POSIX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
- #if BUILDFLAG(IS_ANDROID)
-@@ -1233,7 +1235,7 @@ absl::variant<int, content::MainFunctionParams> Chrome
+ if (command_line.HasSwitch(switches::kPreCrashpadCrashTest)) {
+@@ -1393,7 +1395,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_generated__resources.grd b/www/chromium/files/patch-chrome_app_generated__resources.grd
index 809a54ddbe8e..5e9dce92b81b 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-06-17 14:20:10 UTC
+--- chrome/app/generated_resources.grd.orig 2022-07-22 17:30:31 UTC
+++ chrome/app/generated_resources.grd
@@ -2,7 +2,7 @@
@@ -18,21 +18,21 @@
<message name="IDS_BLUETOOTH_DEVICE_CREDENTIALS_TITLE" desc="Title of the Bluetooth device credentials prompt dialog.">
Device Credentials
</message>
-@@ -8669,7 +8669,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
+@@ -8737,7 +8737,7 @@ Check your passwords anytime in <ph name="GOOGLE_PASSW
Google Pay
</message>
-- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- <if expr="is_linux">
++ <if expr="is_posix">
<message name="IDS_SHOW_WINDOW_DECORATIONS" desc="The label of a radio button in the options dialog for using the system title bar and borders.">
Use system title bar and borders
</message>
-@@ -9823,7 +9823,7 @@ Please help our engineers fix this problem. Tell us wh
+@@ -9897,7 +9897,7 @@ Please help our engineers fix this problem. Tell us wh
Set as default
</message>
-- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- <if expr="is_linux">
++ <if expr="is_posix">
<message name="IDS_MINIMIZE_WINDOW_MENU" desc="The Linux browser window menu item text for minimizing the window.">
Minimize
</message>
diff --git a/www/chromium/files/patch-chrome_app_settings__strings.grdp b/www/chromium/files/patch-chrome_app_settings__strings.grdp
index 3aa6d8d7d939..ea16909c08e8 100644
--- a/www/chromium/files/patch-chrome_app_settings__strings.grdp
+++ b/www/chromium/files/patch-chrome_app_settings__strings.grdp
@@ -1,11 +1,11 @@
---- chrome/app/settings_strings.grdp.orig 2022-05-19 14:06:27 UTC
+--- chrome/app/settings_strings.grdp.orig 2022-07-22 17:30:31 UTC
+++ chrome/app/settings_strings.grdp
@@ -131,7 +131,7 @@
Theme
</message>
</if>
-- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- <if expr="is_linux">
++ <if expr="is_posix">
<message name="IDS_SETTINGS_SYSTEM_THEME" desc="Text of the label describing the system (GTK+) browser theme on Linux">
GTK+
</message>
diff --git a/www/chromium/files/patch-chrome_browser_about__flags.cc b/www/chromium/files/patch-chrome_browser_about__flags.cc
index c64416ccb5bb..49e45123da2f 100644
--- a/www/chromium/files/patch-chrome_browser_about__flags.cc
+++ b/www/chromium/files/patch-chrome_browser_about__flags.cc
@@ -1,6 +1,6 @@
---- chrome/browser/about_flags.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/about_flags.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/about_flags.cc
-@@ -202,7 +202,7 @@
+@@ -203,7 +203,7 @@
#include "ui/native_theme/native_theme_features.h"
#include "ui/ui_features.h"
@@ -9,7 +9,7 @@
#include "base/allocator/buildflags.h"
#endif
-@@ -275,7 +275,7 @@
+@@ -277,7 +277,7 @@
#include "chrome/browser/supervised_user/supervised_user_features/supervised_user_features.h" // nogncheck
#endif // ENABLE_SUPERVISED_USERS
@@ -18,7 +18,7 @@
#include "ui/ozone/buildflags.h"
#include "ui/ozone/public/ozone_switches.h"
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -364,7 +364,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
+@@ -366,7 +366,7 @@ const FeatureEntry::Choice kUseAngleChoicesMac[] = {
gl::kANGLEImplementationMetalName}};
#endif
@@ -27,7 +27,7 @@
const FeatureEntry::Choice kOzonePlatformHintRuntimeChoices[] = {
{flag_descriptions::kOzonePlatformHintChoiceDefault, "", ""},
{flag_descriptions::kOzonePlatformHintChoiceAuto,
-@@ -1055,7 +1055,7 @@ const FeatureEntry::FeatureVariation kJourneysOnDevice
+@@ -1137,7 +1137,7 @@ const FeatureEntry::FeatureVariation
};
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -36,8 +36,8 @@
const FeatureEntry::FeatureParam kOmniboxDocumentProviderServerScoring[] = {
{"DocumentUseServerScore", "true"},
{"DocumentUseClientScore", "false"},
-@@ -3681,7 +3681,7 @@ const FeatureEntry kFeatureEntries[] = {
- FEATURE_VALUE_TYPE(chromeos::kLacrosTtsSupport)},
+@@ -3841,7 +3841,7 @@ const FeatureEntry kFeatureEntries[] = {
+ FEATURE_VALUE_TYPE(base::kOneGroupPerRenderer)},
#endif // BUILDFLAG(IS_CHROMEOS)
-#if BUILDFLAG(IS_LINUX)
@@ -45,7 +45,7 @@
{
"enable-accelerated-video-decode",
flag_descriptions::kAcceleratedVideoDecodeName,
-@@ -4283,7 +4283,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4449,7 +4449,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kWebShare)},
#endif // BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
@@ -54,7 +54,7 @@
{"ozone-platform-hint", flag_descriptions::kOzonePlatformHintName,
flag_descriptions::kOzonePlatformHintDescription, kOsLinux,
MULTI_VALUE_TYPE(kOzonePlatformHintRuntimeChoices)},
-@@ -4302,7 +4302,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -4468,7 +4468,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,
-@@ -4979,7 +4979,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -5159,7 +5159,7 @@ const FeatureEntry kFeatureEntries[] = {
"OmniboxBundledExperimentV1")},
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -72,7 +72,7 @@
{"omnibox-experimental-keyword-mode",
flag_descriptions::kOmniboxExperimentalKeywordModeName,
flag_descriptions::kOmniboxExperimentalKeywordModeDescription, kOsDesktop,
-@@ -6378,7 +6378,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -6582,7 +6582,7 @@ const FeatureEntry kFeatureEntries[] = {
FEATURE_VALUE_TYPE(features::kMouseSubframeNoImplicitCapture)},
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -81,7 +81,7 @@
{"global-media-controls-modern-ui",
flag_descriptions::kGlobalMediaControlsModernUIName,
flag_descriptions::kGlobalMediaControlsModernUIDescription,
-@@ -7251,7 +7251,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7495,7 +7495,7 @@ const FeatureEntry kFeatureEntries[] = {
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -90,7 +90,7 @@
{"quick-commands", flag_descriptions::kQuickCommandsName,
flag_descriptions::kQuickCommandsDescription, kOsDesktop,
FEATURE_VALUE_TYPE(features::kQuickCommands)},
-@@ -7547,7 +7547,7 @@ const FeatureEntry kFeatureEntries[] = {
+@@ -7803,7 +7803,7 @@ const FeatureEntry kFeatureEntries[] = {
#if BUILDFLAG(IS_WIN) || \
(BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) || \
diff --git a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
index 8ca400175f0c..70b237a4f6d9 100644
--- a/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
+++ b/www/chromium/files/patch-chrome_browser_after__startup__task__utils.cc
@@ -1,15 +1,6 @@
---- chrome/browser/after_startup_task_utils.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/after_startup_task_utils.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/after_startup_task_utils.cc
-@@ -25,7 +25,7 @@
-
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- #include "ui/views/linux_ui/linux_ui.h"
- #endif
-
-@@ -111,7 +111,7 @@ void SetBrowserStartupIsComplete() {
+@@ -105,7 +105,7 @@ void SetBrowserStartupIsComplete() {
g_startup_complete_flag.Get().Set();
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || \
@@ -18,12 +9,3 @@
// Process::Current().CreationTime() is not available on all platforms.
const base::Time process_creation_time =
base::Process::Current().CreationTime();
-@@ -130,7 +130,7 @@ void SetBrowserStartupIsComplete() {
-
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
- // Make sure we complete the startup notification sequence, or launchers will
- // get confused by not receiving the expected message from the main process.
- views::LinuxUI* linux_ui = views::LinuxUI::instance();
diff --git a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc b/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
deleted file mode 100644
index 44576274c06e..000000000000
--- a/www/chromium/files/patch-chrome_browser_apps_platform__apps_api_music__manager__private_device__id__linux.cc
+++ /dev/null
@@ -1,71 +0,0 @@
---- chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc.orig 2022-04-21 18:48:31 UTC
-+++ chrome/browser/apps/platform_apps/api/music_manager_private/device_id_linux.cc
-@@ -4,6 +4,15 @@
-
- #include "chrome/browser/apps/platform_apps/api/music_manager_private/device_id.h"
-
-+#include "build/build_config.h"
-+
-+#if defined(OS_BSD)
-+#include <sys/types.h>
-+#include <net/if_dl.h>
-+#include <netinet/in.h>
-+#include <sys/socket.h>
-+#endif
-+
- #include <ifaddrs.h>
- #include <net/if.h>
- #include <stddef.h>
-@@ -105,11 +114,33 @@ class MacAddressProcessor {
- const char* const prefixes[],
- size_t prefixes_count) {
- const int MAC_LENGTH = 6;
-+#if defined(OS_BSD)
-+ struct ifaddrs *ifap, *ifinfo;
-+#else
- struct ifreq ifinfo;
-+#endif
-
- memset(&ifinfo, 0, sizeof(ifinfo));
-- strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
-
-+#if defined(OS_BSD)
-+ int result = getifaddrs(&ifap);
-+ if (result != 0)
-+ return true;
-+ result = 1; // no MAC found yet
-+ for (ifinfo = ifap; ifinfo != NULL; ifinfo = ifinfo->ifa_next) {
-+ struct sockaddr* sa = ifinfo->ifa_addr;
-+ if (sa->sa_family == AF_LINK &&
-+ !strncmp(ifinfo->ifa_name, ifaddr->ifa_name,
-+ sizeof(ifinfo->ifa_name) - 1)) {
-+ result = 0;
-+ break;
-+ }
-+ }
-+
-+ char mac_address[6];
-+ strncpy(mac_address, (const char*)LLADDR((struct sockaddr_dl*)ifinfo->ifa_addr), sizeof(mac_address));
-+#else
-+ strncpy(ifinfo.ifr_name, ifaddr->ifa_name, sizeof(ifinfo.ifr_name) - 1);
- int sd = socket(AF_INET, SOCK_DGRAM, 0);
- int result = ioctl(sd, SIOCGIFHWADDR, &ifinfo);
- close(sd);
-@@ -119,11 +150,17 @@ class MacAddressProcessor {
-
- const char* mac_address =
- static_cast<const char*>(ifinfo.ifr_hwaddr.sa_data);
-+#endif
- if (!is_valid_mac_address_.Run(mac_address, MAC_LENGTH))
- return true;
-
-+#if defined(OS_BSD)
-+ if (!IsValidPrefix(ifinfo->ifa_name, prefixes, prefixes_count))
-+ return true;
-+#else
- if (!IsValidPrefix(ifinfo.ifr_name, prefixes, prefixes_count))
- return true;
-+#endif
-
- // Got one!
- found_mac_address_ =
diff --git a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
index ce52b29e9679..6f088ee13b15 100644
--- a/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_background_background__mode__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/background/background_mode_manager.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/background/background_mode_manager.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/background/background_mode_manager.cc
-@@ -900,7 +900,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
+@@ -894,7 +894,7 @@ gfx::ImageSkia GetStatusTrayIcon() {
return gfx::ImageSkia();
return family->CreateExact(size).AsImageSkia();
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 74f8da11f951..07fe0677fcd3 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-06-17 14:20:10 UTC
+--- chrome/browser/browser_process_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/browser_process_impl.cc
-@@ -208,7 +208,7 @@
+@@ -210,7 +210,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
-@@ -1153,7 +1153,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
+@@ -1166,7 +1166,7 @@ void BrowserProcessImpl::PreMainMessageLoopRun() {
ApplyMetricsReportingPolicy();
@@ -18,7 +18,7 @@
ChromeJsErrorReportProcessor::Create();
#endif
-@@ -1405,7 +1405,7 @@ void BrowserProcessImpl::Unpin() {
+@@ -1418,7 +1418,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__resources.grd b/www/chromium/files/patch-chrome_browser_browser__resources.grd
index 2e2aebe2dfa9..9b1896d38d86 100644
--- a/www/chromium/files/patch-chrome_browser_browser__resources.grd
+++ b/www/chromium/files/patch-chrome_browser_browser__resources.grd
@@ -1,11 +1,11 @@
---- chrome/browser/browser_resources.grd.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/browser_resources.grd.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/browser_resources.grd
-@@ -125,7 +125,7 @@
+@@ -124,7 +124,7 @@
+ <if expr="chromeos_ash">
<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. -->
-- <if expr="is_linux and not chromeos_ash or chromeos_lacros">
-+ <if expr="is_posix and not chromeos_ash or chromeos_lacros">
+- <if expr="is_linux or chromeos_lacros">
++ <if expr="is_posix or chromeos_lacros">
<include name="IDR_PLUGIN_DB_JSON" file="resources\plugin_metadata\plugins_linux.json" type="BINDATA" />
</if>
<if expr="chromeos_ash">
diff --git a/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc b/www/chromium/files/patch-chrome_browser_chrome__browser__interface__binders.cc
index 53c50bc0a333..03193cbce1e5 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-06-17 14:20:10 UTC
+--- chrome/browser/chrome_browser_interface_binders.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/chrome_browser_interface_binders.cc
-@@ -110,13 +110,13 @@
+@@ -111,13 +111,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
-@@ -183,7 +183,7 @@
+@@ -180,7 +180,7 @@
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -25,7 +25,7 @@
#include "chrome/browser/ui/webui/discards/discards.mojom.h"
#include "chrome/browser/ui/webui/discards/discards_ui.h"
#include "chrome/browser/ui/webui/discards/site_data.mojom.h"
-@@ -752,7 +752,7 @@ void PopulateChromeFrameBinders(
+@@ -758,7 +758,7 @@ void PopulateChromeFrameBinders(
#endif // BUILDFLAG(ENABLE_SPEECH_SERVICE)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -34,7 +34,7 @@
if (!render_frame_host->GetParent()) {
map->Add<chrome::mojom::DraggableRegions>(
base::BindRepeating(&DraggableRegionsHostImpl::CreateIfAllowed));
-@@ -760,7 +760,7 @@ void PopulateChromeFrameBinders(
+@@ -766,7 +766,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>(
-@@ -815,14 +815,14 @@ void PopulateChromeWebUIFrameBinders(
+@@ -821,14 +821,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
-@@ -1163,7 +1163,7 @@ void PopulateChromeWebUIFrameBinders(
+@@ -1177,7 +1177,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 478d89ed72f3..6f586fa6e47c 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-06-17 14:20:10 UTC
+--- chrome/browser/chrome_browser_main.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/chrome_browser_main.cc
-@@ -231,11 +231,11 @@
+@@ -236,11 +236,11 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -14,16 +14,16 @@
#include "components/crash/core/app/breakpad_linux.h"
#include "components/crash/core/app/crashpad.h"
#endif
-@@ -270,7 +270,7 @@
-
+@@ -276,7 +276,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
#include "chrome/browser/metrics/desktop_session_duration/desktop_session_duration_tracker.h"
#include "chrome/browser/metrics/desktop_session_duration/touch_mode_stats_tracker.h"
-@@ -1019,7 +1019,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+ #include "chrome/browser/profiles/profile_activity_metrics_recorder.h"
+@@ -1024,7 +1024,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 .
-@@ -1032,7 +1032,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
+@@ -1037,7 +1037,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
}
#endif // !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS_ASH)
@@ -41,12 +41,12 @@
// Set the product channel for crash reports.
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetChannelCrashKey(
-@@ -1053,7 +1053,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
-
+@@ -1059,7 +1059,7 @@ int ChromeBrowserMainParts::PreCreateThreadsImpl() {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD) || \
- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
+ #if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
+- BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA)
++ BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_FUCHSIA) || BUILDFLAG(IS_BSD)
metrics::DesktopSessionDurationTracker::Initialize();
ProfileActivityMetricsRecorder::Initialize();
+ TouchModeStatsTracker::Initialize(
diff --git a/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc b/www/chromium/files/patch-chrome_browser_chrome__content__browser__client.cc
index 223119fd9585..37b58f44eb8d 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-06-17 14:20:10 UTC
+--- chrome/browser/chrome_content_browser_client.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/chrome_content_browser_client.cc
-@@ -381,7 +381,7 @@
+@@ -380,7 +380,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"
-@@ -454,17 +454,17 @@
+@@ -456,17 +456,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"
-@@ -472,12 +472,12 @@
+@@ -474,12 +474,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)
-@@ -501,11 +501,11 @@
+@@ -503,11 +503,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"
-@@ -892,7 +892,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
+@@ -898,7 +898,7 @@ blink::mojom::AutoplayPolicy GetAutoplayPolicyForWebCo
int GetCrashSignalFD(const base::CommandLine& command_line) {
return crashpad::CrashHandlerHost::Get()->GetDeathSignalSocket();
}
@@ -68,7 +68,7 @@
breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
const std::string& process_type) {
base::FilePath dumps_path;
-@@ -1410,7 +1410,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1418,7 +1418,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
main_parts = std::make_unique<ChromeBrowserMainPartsLacros>(
is_integration_test, &startup_data_);
@@ -77,7 +77,7 @@
main_parts = std::make_unique<ChromeBrowserMainPartsLinux>(
is_integration_test, &startup_data_);
#elif BUILDFLAG(IS_ANDROID)
-@@ -1444,7 +1444,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1452,7 +1452,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
-@@ -1461,7 +1461,7 @@ ChromeContentBrowserClient::CreateBrowserMainParts(boo
+@@ -1473,7 +1473,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>());
-@@ -2230,6 +2230,8 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2242,6 +2242,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()) {
-@@ -2547,7 +2549,7 @@ void ChromeContentBrowserClient::AppendExtraCommandLin
+@@ -2557,7 +2559,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) &&
-@@ -3960,7 +3962,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
+@@ -3971,7 +3973,7 @@ void ChromeContentBrowserClient::GetAdditionalFileSyst
}
}
@@ -122,7 +122,7 @@
void ChromeContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
const base::CommandLine& command_line,
int child_process_id,
-@@ -4371,14 +4373,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4398,14 +4400,14 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
&throttles);
}
@@ -139,7 +139,7 @@
MaybeAddThrottle(enterprise_connectors::DeviceTrustNavigationThrottle::
MaybeCreateThrottleFor(handle),
&throttles);
-@@ -4411,7 +4413,7 @@ ChromeContentBrowserClient::CreateThrottlesForNavigati
+@@ -4438,7 +4440,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 fc1d0ff538ca..295332910843 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-06-17 14:20:10 UTC
+--- chrome/browser/chrome_content_browser_client.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/chrome_content_browser_client.h
-@@ -420,7 +420,7 @@ class ChromeContentBrowserClient : public content::Con
+@@ -421,7 +421,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_defaults.cc b/www/chromium/files/patch-chrome_browser_defaults.cc
index 95e8a8dd3414..d03a43578178 100644
--- a/www/chromium/files/patch-chrome_browser_defaults.cc
+++ b/www/chromium/files/patch-chrome_browser_defaults.cc
@@ -1,6 +1,6 @@
---- chrome/browser/defaults.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/defaults.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/defaults.cc
-@@ -48,7 +48,7 @@ const bool kSyncAutoStarts = true;
+@@ -52,7 +52,7 @@ const bool kSyncAutoStarts = true;
const bool kSyncAutoStarts = false;
#endif
diff --git a/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd b/www/chromium/files/patch-chrome_browser_dev__ui__browser__resources.grd
index d41f7b1f7e2f..a9cf58e1eece 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-06-17 14:20:10 UTC
+--- chrome/browser/dev_ui_browser_resources.grd.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/dev_ui_browser_resources.grd
-@@ -41,7 +41,7 @@ This file specifies browser resources for developer-fa
+@@ -39,7 +39,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 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" />
+ <include name="IDR_SANDBOX_INTERNALS_JS" file="${root_gen_dir}\chrome\browser\resources\sandbox_internals\tsc\sandbox_internals.js" use_base_dir="false" type="BINDATA" />
</if>
diff --git a/www/chromium/files/patch-chrome_browser_download_download__item__model.cc b/www/chromium/files/patch-chrome_browser_download_download__item__model.cc
index 6f6f53a1f27f..43b19db0fed8 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-06-17 14:20:10 UTC
+--- chrome/browser/download/download_item_model.cc.orig 2022-07-28 04:43:52 UTC
+++ chrome/browser/download/download_item_model.cc
-@@ -671,7 +671,7 @@ bool DownloadItemModel::IsCommandChecked(
+@@ -704,7 +704,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();
-@@ -711,7 +711,7 @@ void DownloadItemModel::ExecuteCommand(DownloadCommand
+@@ -744,7 +744,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_extensions_BUILD.gn b/www/chromium/files/patch-chrome_browser_extensions_BUILD.gn
index 737f36d6551e..c422c1a6d7ef 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-06-17 14:20:10 UTC
+--- chrome/browser/extensions/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/BUILD.gn
-@@ -1281,6 +1281,10 @@ static_library("extensions") {
+@@ -1296,6 +1296,10 @@ static_library("extensions") {
deps += [ "//chrome/services/printing/public/mojom" ]
}
diff --git a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
index 59e2bb1525d0..6ddb4b1c7de4 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_enterprise__reporting__private_chrome__desktop__report__request__helper.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/api/enterprise_reporting_private/chrome_desktop_report_request_helper.cc
@@ -24,7 +24,7 @@
#include "base/win/registry.h"
@@ -9,7 +9,7 @@
#include "base/environment.h"
#include "base/nix/xdg_util.h"
#endif
-@@ -208,7 +208,7 @@ base::FilePath GetEndpointVerificationDir() {
+@@ -256,7 +256,7 @@ base::FilePath GetEndpointVerificationDir() {
bool got_path = false;
#if BUILDFLAG(IS_WIN)
got_path = base::PathService::Get(base::DIR_LOCAL_APP_DATA, &path);
@@ -18,7 +18,7 @@
std::unique_ptr<base::Environment> env(base::Environment::Create());
path = base::nix::GetXDGDirectory(env.get(), base::nix::kXdgConfigHomeEnvVar,
base::nix::kDotConfigDir);
-@@ -219,7 +219,7 @@ base::FilePath GetEndpointVerificationDir() {
+@@ -267,7 +267,7 @@ base::FilePath GetEndpointVerificationDir() {
if (!got_path)
return path;
diff --git a/www/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 0f7b19fef295..505f6a6b3b18 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-06-17 14:20:10 UTC
+--- chrome/browser/extensions/api/settings_private/prefs_util.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/api/settings_private/prefs_util.cc
-@@ -187,7 +187,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -186,7 +186,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
-@@ -201,7 +201,7 @@ const PrefsUtil::TypedPrefMap& PrefsUtil::GetAllowlist
+@@ -200,7 +200,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_api_webrtc__logging__private_webrtc__logging__private__api.cc b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
index c70ae09c36a8..643e85fb5537 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_api_webrtc__logging__private_webrtc__logging__private__api.cc
@@ -1,4 +1,4 @@
---- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/api/webrtc_logging_private/webrtc_logging_private_api.cc
@@ -29,7 +29,7 @@
#include "extensions/browser/process_manager.h"
@@ -18,7 +18,7 @@
if (extension) {
enabled_by_permissions =
extension->permissions_data()->active_permissions().HasAPIPermission(
-@@ -579,7 +579,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
+@@ -580,7 +580,7 @@ void WebrtcLoggingPrivateStartEventLoggingFunction::Fi
ExtensionFunction::ResponseAction
WebrtcLoggingPrivateGetLogsDirectoryFunction::Run() {
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 62824e0b0fa3..38d3f2c79b14 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-06-17 14:20:10 UTC
+--- chrome/browser/extensions/browser_context_keyed_service_factories.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/browser_context_keyed_service_factories.cc
-@@ -52,7 +52,7 @@
+@@ -53,7 +53,7 @@
#include "extensions/browser/api/networking_private/networking_private_delegate_factory.h"
#include "ppapi/buildflags/buildflags.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/extensions/api/system_indicator/system_indicator_manager_factory.h"
#endif
-@@ -131,7 +131,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+@@ -132,7 +132,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
#endif
extensions::SettingsPrivateEventRouterFactory::GetInstance();
extensions::SettingsOverridesAPI::GetFactoryInstance();
diff --git a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
index ced8d597037c..f7956a996d22 100644
--- a/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_extensions_external__provider__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/extensions/external_provider_impl.cc.orig 2022-03-25 21:59:56 UTC
+--- chrome/browser/extensions/external_provider_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/extensions/external_provider_impl.cc
-@@ -818,7 +818,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -821,7 +821,7 @@ void ExternalProviderImpl::CreateExternalProviders(
if (!profile->GetPrefs()->GetBoolean(pref_names::kBlockExternalExtensions)) {
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
provider_list->push_back(std::make_unique<ExternalProviderImpl>(
service,
base::MakeRefCounted<ExternalPrefLoader>(
-@@ -846,7 +846,7 @@ void ExternalProviderImpl::CreateExternalProviders(
+@@ -849,7 +849,7 @@ void ExternalProviderImpl::CreateExternalProviders(
bundled_extension_creation_flags));
// Define a per-user source of external extensions.
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 de4b90789eb5..b543e2d173fe 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-06-17 14:20:10 UTC
+--- chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/file_system_access/chrome_file_system_access_permission_context.cc
-@@ -219,7 +219,7 @@ const struct {
+@@ -224,7 +224,7 @@ const struct {
{base::DIR_HOME, FILE_PATH_LITERAL("Library/Mobile Documents"),
kDontBlockChildren},
#endif
diff --git a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
index 05d76b6df0e6..5211293e72de 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.cc
@@ -1,15 +1,15 @@
---- chrome/browser/flag_descriptions.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/flag_descriptions.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/flag_descriptions.cc
-@@ -5709,7 +5709,7 @@ const char kSideSearchDSESupportDescription[] =
+@@ -5867,7 +5867,7 @@ const char kSideSearchDSESupportDescription[] =
// Random platform combinations -----------------------------------------------
#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)";
-@@ -5735,7 +5735,7 @@ const char kWebShareDescription[] =
+ const char kDesktopDetailedLanguageSettingsName[] =
+ "Detailed Language Settings (Desktop)";
+@@ -5888,7 +5888,7 @@ const char kWebShareDescription[] =
"platforms.";
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -18,7 +18,7 @@
const char kOzonePlatformHintChoiceDefault[] = "Default";
const char kOzonePlatformHintChoiceAuto[] = "Auto";
const char kOzonePlatformHintChoiceX11[] = "X11";
-@@ -5747,7 +5747,7 @@ const char kOzonePlatformHintDescription[] =
+@@ -5900,7 +5900,7 @@ const char kOzonePlatformHintDescription[] =
"\"X11\". \"Auto\" selects Wayland if possible, X11 otherwise. ";
#endif // BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS)
@@ -27,7 +27,7 @@
const char kCleanUndecryptablePasswordsLinuxName[] =
"Cleanup local undecryptable passwords during initial sync flow";
const char kCleanUndecryptablePasswordsLinuxDescription[] =
-@@ -5760,7 +5760,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
+@@ -5913,7 +5913,7 @@ const char kForcePasswordInitialSyncWhenDecryptionFail
"storage and requests initial sync.";
#endif // BUILDFLAG(IS_LINUX)
@@ -36,7 +36,7 @@
const char kSkipUndecryptablePasswordsName[] =
"Skip undecryptable passwords to use the available decryptable "
"passwords.";
-@@ -5875,7 +5875,7 @@ const char kElasticOverscrollDescription[] =
+@@ -6028,7 +6028,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 c562addb2caf..33cc38e7e4fd 100644
--- a/www/chromium/files/patch-chrome_browser_flag__descriptions.h
+++ b/www/chromium/files/patch-chrome_browser_flag__descriptions.h
@@ -1,15 +1,15 @@
---- chrome/browser/flag_descriptions.h.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/flag_descriptions.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/flag_descriptions.h
-@@ -3279,7 +3279,7 @@ extern const char kSideSearchDSESupportDescription[];
+@@ -3370,7 +3370,7 @@ extern const char kSideSearchDSESupportDescription[];
// Random platform combinations -----------------------------------------------
#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[];
-@@ -3298,7 +3298,7 @@ extern const char kWebShareName[];
+ extern const char kDesktopDetailedLanguageSettingsName[];
+ extern const char kDesktopDetailedLanguageSettingsDescription[];
+@@ -3386,7 +3386,7 @@ extern const char kWebShareName[];
extern const char kWebShareDescription[];
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
@@ -18,7 +18,7 @@
extern const char kOzonePlatformHintChoiceDefault[];
extern const char kOzonePlatformHintChoiceAuto[];
extern const char kOzonePlatformHintChoiceX11[];
-@@ -3314,7 +3314,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
+@@ -3402,7 +3402,7 @@ extern const char kForcePasswordInitialSyncWhenDecrypt
extern const char kForcePasswordInitialSyncWhenDecryptionFailsDescription[];
#endif // BUILDFLAG(IS_LINUX)
@@ -27,7 +27,7 @@
extern const char kSkipUndecryptablePasswordsName[];
extern const char kSkipUndecryptablePasswordsDescription[];
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-@@ -3395,7 +3395,7 @@ extern const char kElasticOverscrollDescription[];
+@@ -3483,7 +3483,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 336a741b996e..e715e8096493 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-06-17 14:20:10 UTC
+--- chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc
-@@ -60,8 +60,10 @@
+@@ -58,8 +58,10 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -12,7 +12,7 @@
#include "base/linux_util.h"
#include "base/strings/string_split.h"
-@@ -227,7 +229,7 @@ void RecordStartupMetrics() {
+@@ -223,7 +225,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 3b3454b1ab3c..72f274cf1064 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-06-17 14:20:10 UTC
+--- chrome/browser/metrics/chrome_metrics_service_client.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/chrome_metrics_service_client.cc
-@@ -787,7 +787,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -789,7 +789,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>());
-@@ -876,7 +876,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
+@@ -878,7 +878,7 @@ void ChromeMetricsServiceClient::RegisterMetricsServic
std::make_unique<PowerMetricsProvider>());
#endif
@@ -18,7 +18,7 @@
metrics_service_->RegisterMetricsProvider(
metrics::CreateDesktopSessionMetricsProvider());
metrics_service_->RegisterMetricsProvider(
-@@ -1055,7 +1055,7 @@ bool ChromeMetricsServiceClient::RegisterForProfileEve
+@@ -1057,7 +1057,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_metrics_power_process__metrics__recorder__util.cc b/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
index d8d02e8bf313..167de82c10fa 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__metrics__recorder__util.cc
@@ -1,11 +1,11 @@
---- 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.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/power/process_metrics_recorder_util.cc
-@@ -41,7 +41,7 @@ void RecordProcessHistograms(const char* histogram_suf
- kCPUUsageHistogramMax, kCPUUsageHistogramBucketCount);
- #endif
+@@ -59,7 +59,7 @@ void RecordProcessHistograms(const char* histogram_suf
+ const ProcessMonitor::Metrics& metrics) {
+ RecordAverageCPUUsage(histogram_suffix, metrics.cpu_usage);
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
base::UmaHistogramCounts10000(
- base::StrCat({"PerformanceMonitor.IdleWakeups.", histogram_suffix}),
+ base::StrCat({"PerformanceMonitor.IdleWakeups2.", histogram_suffix}),
metrics.idle_wakeups);
diff --git a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
index 8ca94aafbb07..7e6199d7c063 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
+++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.cc
@@ -1,17 +1,26 @@
---- chrome/browser/metrics/power/process_monitor.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/metrics/power/process_monitor.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/power/process_monitor.cc
-@@ -59,7 +59,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
- metrics.precise_cpu_usage = process_metrics.GetPreciseCPUUsage();
+@@ -64,7 +64,7 @@ ProcessMonitor::Metrics SampleMetrics(base::ProcessMet
#endif
+
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
metrics.idle_wakeups = process_metrics.GetIdleWakeupsPerSecond();
#endif
#if BUILDFLAG(IS_MAC)
-@@ -114,7 +114,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
+@@ -81,7 +81,7 @@ void ScaleMetrics(ProcessMonitor::Metrics* metrics, do
+ metrics->cpu_usage *= factor;
+
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_AIX)
++ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
+ metrics->idle_wakeups *= factor;
#endif
+@@ -130,7 +130,7 @@ ProcessMonitor::Metrics& operator+=(ProcessMonitor::Me
+ lhs.cpu_usage += rhs.cpu_usage;
+
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h
index 5c14d103a0f9..0d2fcb7c1afe 100644
--- a/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h
+++ b/www/chromium/files/patch-chrome_browser_metrics_power_process__monitor.h
@@ -1,7 +1,7 @@
---- chrome/browser/metrics/power/process_monitor.h.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/metrics/power/process_monitor.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/metrics/power/process_monitor.h
-@@ -76,7 +76,7 @@ class ProcessMonitor : public content::BrowserChildPro
- #endif
+@@ -70,7 +70,7 @@ class ProcessMonitor : public content::BrowserChildPro
+ double cpu_usage = 0.0;
#if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
- BUILDFLAG(IS_AIX)
diff --git a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
index 2c8698541206..ec676e11d6dc 100644
--- a/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
+++ b/www/chromium/files/patch-chrome_browser_net_system__network__context__manager.cc
@@ -1,6 +1,6 @@
---- chrome/browser/net/system_network_context_manager.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/net/system_network_context_manager.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/net/system_network_context_manager.cc
-@@ -90,7 +90,7 @@
+@@ -91,7 +91,7 @@
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
#include "chrome/common/chrome_paths_internal.h"
#include "chrome/grit/chromium_strings.h"
#include "ui/base/l10n/l10n_util.h"
-@@ -172,7 +172,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
+@@ -173,7 +173,7 @@ network::mojom::HttpAuthDynamicParamsPtr CreateHttpAut
auth_dynamic_params->basic_over_http_enabled =
local_state->GetBoolean(prefs::kBasicAuthOverHttpEnabled);
@@ -18,7 +18,7 @@
auth_dynamic_params->delegate_by_kdc_policy =
local_state->GetBoolean(prefs::kAuthNegotiateDelegateByKdcPolicy);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -466,7 +466,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
+@@ -474,7 +474,7 @@ SystemNetworkContextManager::SystemNetworkContextManag
pref_change_registrar_.Add(prefs::kAllHttpAuthSchemesAllowedForOrigins,
auth_pref_callback);
@@ -27,7 +27,7 @@
pref_change_registrar_.Add(prefs::kAuthNegotiateDelegateByKdcPolicy,
auth_pref_callback);
#endif // BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_CHROMEOS)
-@@ -533,7 +533,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
+@@ -541,7 +541,7 @@ void SystemNetworkContextManager::RegisterPrefs(PrefRe
registry->RegisterStringPref(prefs::kAuthServerAllowlist, std::string());
registry->RegisterStringPref(prefs::kAuthNegotiateDelegateAllowlist,
std::string());
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 a9763e11d754..243527ebcbe5 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,6 +1,6 @@
---- 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.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/policy/configuration_policy_handler_list_factory.cc
-@@ -186,7 +186,7 @@
+@@ -188,7 +188,7 @@
#endif // BUILDFLAG(ENABLE_SPELLCHECK)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
#include "chrome/browser/web_applications/policy/web_app_settings_policy_handler.h"
#endif
-@@ -1562,7 +1562,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1566,7 +1566,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 },
-@@ -1626,7 +1626,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
+@@ -1627,7 +1627,7 @@ const PolicyToPreferenceMapEntry kSimplePolicyMap[] =
base::Value::Type::BOOLEAN },
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -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)
-@@ -2299,7 +2299,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2300,7 +2300,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) ||
-@@ -2318,7 +2318,7 @@ std::unique_ptr<ConfigurationPolicyHandlerList> BuildH
+@@ -2319,7 +2319,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 75c4ed1a175b..fa298b162ad2 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-06-17 14:20:10 UTC
+--- chrome/browser/prefs/browser_prefs.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/prefs/browser_prefs.cc
-@@ -434,14 +434,14 @@
+@@ -438,14 +438,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
-@@ -1177,7 +1177,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
+@@ -1221,7 +1221,7 @@ void RegisterLocalState(PrefRegistrySimple* registry)
#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING)
#endif // BUILDFLAG(IS_WIN)
@@ -26,7 +26,7 @@
(BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS))
web_app::url_handler_prefs::RegisterLocalStatePrefs(registry);
#endif
-@@ -1492,7 +1492,7 @@ void RegisterProfilePrefs(user_prefs::PrefRegistrySync
+@@ -1543,7 +1543,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__job__worker.cc b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc
index 7bcb6159f42c..66c0b9e4b39e 100644
--- a/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc
+++ b/www/chromium/files/patch-chrome_browser_printing_print__job__worker.cc
@@ -1,6 +1,6 @@
---- chrome/browser/printing/print_job_worker.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/printing/print_job_worker.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/printing/print_job_worker.cc
-@@ -216,7 +216,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::
+@@ -209,7 +209,7 @@ void PrintJobWorker::UpdatePrintSettings(base::Value::
crash_key = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend->GetPrinterDriverInfo(printer_name));
diff --git a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
index a9b497799e69..6eedca91938a 100644
--- a/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
+++ b/www/chromium/files/patch-chrome_browser_process__singleton__posix.cc
@@ -1,6 +1,6 @@
---- chrome/browser/process_singleton_posix.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/process_singleton_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/process_singleton_posix.cc
-@@ -96,12 +96,12 @@
+@@ -96,7 +96,7 @@
#include "net/base/network_interfaces.h"
#include "ui/base/l10n/l10n_util.h"
@@ -9,13 +9,7 @@
#include "chrome/browser/ui/process_singleton_dialog_linux.h"
#endif
- #if defined(TOOLKIT_VIEWS) && \
-- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- #include "ui/views/linux_ui/linux_ui.h"
- #endif
-
-@@ -355,7 +355,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
+@@ -350,7 +350,7 @@ bool DisplayProfileInUseError(const base::FilePath& lo
if (g_disable_prompt)
return g_user_opted_unlock_in_use_profile;
@@ -24,12 +18,3 @@
std::u16string relaunch_button_text =
l10n_util::GetStringUTF16(IDS_PROFILE_IN_USE_LINUX_RELAUNCH);
return ShowProcessSingletonDialog(error, relaunch_button_text);
-@@ -924,7 +924,7 @@ ProcessSingleton::NotifyResult ProcessSingleton::Notif
- return PROCESS_NONE;
- } else if (strncmp(buf, kACKToken, std::size(kACKToken) - 1) == 0) {
- #if defined(TOOLKIT_VIEWS) && \
-- (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS))
-+ (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD))
- // Likely NULL in unit tests.
- views::LinuxUI* linux_ui = views::LinuxUI::instance();
- if (linux_ui)
diff --git a/www/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 52c3aba74cf3..222f3898df6a 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-06-17 14:20:10 UTC
+--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc
-@@ -406,7 +406,7 @@ void ChromeBrowserMainExtraPartsProfiles::
+@@ -414,7 +414,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 d066c4e0c6b5..df9ed9f6799f 100644
--- a/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_profiles_profile__impl.cc
@@ -1,4 +1,4 @@
---- chrome/browser/profiles/profile_impl.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/profiles/profile_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/profiles/profile_impl.cc
@@ -259,6 +259,10 @@
#include "chrome/browser/spellchecker/spellcheck_service.h"
@@ -11,7 +11,7 @@
using bookmarks::BookmarkModel;
using content::BrowserThread;
using content::DownloadManagerDelegate;
-@@ -845,7 +849,17 @@ void ProfileImpl::DoFinalInit(CreateMode create_mode)
+@@ -847,7 +851,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 31386232e3d3..6eb8961c3863 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-06-17 14:20:10 UTC
+--- chrome/browser/profiles/profiles_state.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/profiles/profiles_state.cc
-@@ -177,7 +177,7 @@ bool IsGuestModeRequested(const base::CommandLine& com
+@@ -178,7 +178,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_sandbox__internals_sandbox__internals.ts b/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts
new file mode 100644
index 000000000000..529bf50f38a8
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_resources_sandbox__internals_sandbox__internals.ts
@@ -0,0 +1,29 @@
+--- chrome/browser/resources/sandbox_internals/sandbox_internals.ts.orig 2022-07-22 17:30:31 UTC
++++ chrome/browser/resources/sandbox_internals/sandbox_internals.ts
+@@ -2,7 +2,7 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+
+-// <if expr="is_linux or chromeos_ash or chromeos_lacros">
++// <if expr="is_posix or chromeos_ash or chromeos_lacros">
+ import './strings.m.js';
+
+ import {loadTimeData} from 'chrome://resources/js/load_time_data.m.js';
+@@ -121,7 +121,7 @@ function androidHandler() {
+ }
+ // </if>
+
+-// <if expr="is_linux or chromeos_ash or chromeos_lacros">
++// <if expr="is_posix or chromeos_ash or chromeos_lacros">
+
+ /**
+ * Adds a status row that reports either Yes or No.
+@@ -182,7 +182,7 @@ document.addEventListener('DOMContentLoaded', () => {
+ // <if expr="is_android">
+ androidHandler();
+ // </if>
+- // <if expr="is_linux or chromeos_ash or chromeos_lacros">
++ // <if expr="is_posix or chromeos_ash or chromeos_lacros">
+ linuxHandler();
+ // </if>
+ });
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
index 503b3d11307a..60dba63415d0 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__browser__proxy.ts
@@ -1,11 +1,11 @@
---- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_browser_proxy.ts
@@ -16,7 +16,7 @@ export interface AppearanceBrowserProxy {
useDefaultTheme(): void;
-- // <if expr="is_linux and not chromeos_ash">
-+ // <if expr="is_bsd and not chromeos_ash">
+- // <if expr="is_linux">
++ // <if expr="is_bsd">
useSystemTheme(): void;
// </if>
@@ -13,8 +13,8 @@
chrome.send('useDefaultTheme');
}
-- // <if expr="is_linux and not chromeos_ash">
-+ // <if expr="is_bsd and not chromeos_ash">
+- // <if expr="is_linux">
++ // <if expr="is_bsd">
useSystemTheme() {
chrome.send('useSystemTheme');
}
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
index 7990e1a34ff0..d407a2923519 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.html
@@ -1,11 +1,11 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.html.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.html
@@ -27,7 +27,7 @@
<cr-link-row class="first" hidden="[[!pageVisibility.setTheme]]"
label="$i18n{themes}" sub-label="[[themeSublabel_]]"
on-click="openThemeUrl_" external></cr-link-row>
--<if expr="not is_linux or chromeos_ash or chromeos_lacros">
-+<if expr="not is_posix or chromeos_ash or chromeos_lacros">
+-<if expr="not is_linux">
++<if expr="not is_posix">
<template is="dom-if" if="[[prefs.extensions.theme.id.value]]">
<div class="separator"></div>
<cr-button id="useDefault" on-click="onUseDefaultTap_">
@@ -13,8 +13,8 @@
</cr-button>
</template>
</if>
--<if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+<if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+-<if expr="is_linux">
++<if expr="is_posix">
<div class="settings-row continuation"
hidden="[[!showThemesSecondary_(
prefs.extensions.theme.id.value, useSystemTheme_)]]"
@@ -22,8 +22,8 @@
pref="{{prefs.bookmark_bar.show_on_all_tabs}}"
label="$i18n{showBookmarksBar}">
</settings-toggle-button>
--<if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+<if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+-<if expr="is_linux">
++<if expr="is_posix">
<div class="hr" hidden="[[!pageVisibility.bookmarksBar]]"></div>
<settings-toggle-button
hidden="[[!showCustomChromeFrame_]]"
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
index 20b321bd4c5b..e40e0db506b1 100644
--- a/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_appearance__page_appearance__page.ts
@@ -1,51 +1,51 @@
---- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/resources/settings/appearance_page/appearance_page.ts.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/settings/appearance_page/appearance_page.ts
-@@ -146,7 +146,7 @@ export class SettingsAppearancePageElement extends
+@@ -145,7 +145,7 @@ export class SettingsAppearancePageElement extends
'prefs.autogenerated.theme.policy.color.controlledBy)',
},
-- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- // <if expr="is_linux">
++ // <if expr="is_posix">
/**
* Whether to show the "Custom Chrome Frame" setting.
*/
-@@ -168,7 +168,7 @@ export class SettingsAppearancePageElement extends
+@@ -167,7 +167,7 @@ export class SettingsAppearancePageElement extends
'themeChanged_(' +
'prefs.extensions.theme.id.value, useSystemTheme_, isForcedTheme_)',
-- // <if expr="is_linux and not chromeos_ash">
-+ // <if expr="is_posix and not chromeos_ash">
+- // <if expr="is_linux">
++ // <if expr="is_posix">
// NOTE: this pref only exists on Linux.
'useSystemThemePrefChanged_(prefs.extensions.theme.use_system.value)',
// </if>
-@@ -187,7 +187,7 @@ export class SettingsAppearancePageElement extends
+@@ -186,7 +186,7 @@ export class SettingsAppearancePageElement extends
private showReaderModeOption_: boolean;
private isForcedTheme_: boolean;
-- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- // <if expr="is_linux">
++ // <if expr="is_posix">
private showCustomChromeFrame_: boolean;
// </if>
-@@ -265,7 +265,7 @@ export class SettingsAppearancePageElement extends
+@@ -264,7 +264,7 @@ export class SettingsAppearancePageElement extends
this.appearanceBrowserProxy_.useDefaultTheme();
}
-- // <if expr="is_linux and not chromeos_ash">
-+ // <if expr="is_posix and not chromeos_ash">
+- // <if expr="is_linux">
++ // <if expr="is_posix">
private useSystemThemePrefChanged_(useSystemTheme: boolean) {
this.useSystemTheme_ = useSystemTheme;
}
-@@ -326,10 +326,10 @@ export class SettingsAppearancePageElement extends
+@@ -325,10 +325,10 @@ export class SettingsAppearancePageElement extends
}
let i18nId;
-- // <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ // <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- // <if expr="is_linux">
++ // <if expr="is_posix">
i18nId = useSystemTheme ? 'systemTheme' : 'classicTheme';
// </if>
-- // <if expr="not is_linux or chromeos_ash or chromeos_lacros">
-+ // <if expr="not is_posix or chromeos_ash or chromeos_lacros">
+- // <if expr="not is_linux">
++ // <if expr="not is_posix">
i18nId = 'chooseFromWebStore';
// </if>
this.themeSublabel_ = this.i18n(i18nId);
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
new file mode 100644
index 000000000000..3b36bfc5147a
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared.css
@@ -0,0 +1,11 @@
+--- chrome/browser/resources/settings/autofill_page/passwords_shared.css.orig 2022-07-22 17:30:31 UTC
++++ chrome/browser/resources/settings/autofill_page/passwords_shared.css
+@@ -70,7 +70,7 @@ cr-input.password-input::part(input),
+ * necessary to prevent Chrome from using the operating system's font
+ * instead of the Material Design font.
+ * TODO(dbeam): why not font: inherit? */
+-<if expr="is_linux or chromeos_ash or chromeos_lacros">
++<if expr="is_posix or chromeos_ash or chromeos_lacros">
+ font-family: 'DejaVu Sans Mono', monospace;
+ </if>
+ <if expr="is_win">
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html b/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html
deleted file mode 100644
index 86eb435f271b..000000000000
--- a/www/chromium/files/patch-chrome_browser_resources_settings_autofill__page_passwords__shared__css.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/resources/settings/autofill_page/passwords_shared_css.html.orig 2022-02-28 16:54:41 UTC
-+++ chrome/browser/resources/settings/autofill_page/passwords_shared_css.html
-@@ -64,7 +64,7 @@
- * necessary to prevent Chrome from using the operating system's font
- * instead of the Material Design font.
- * TODO(dbeam): why not font: inherit? */
--<if expr="chromeos_ash or chromeos_lacros or is_linux">
-+<if expr="chromeos_ash or chromeos_lacros or is_posix">
- font-family: 'DejaVu Sans Mono', monospace;
- </if>
- <if expr="is_win">
diff --git a/www/chromium/files/patch-chrome_browser_resources_settings_route.ts b/www/chromium/files/patch-chrome_browser_resources_settings_route.ts
index b6a965119496..96f0e2a1f4af 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-06-17 14:20:10 UTC
+--- chrome/browser/resources/settings/route.ts.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/resources/settings/route.ts
-@@ -190,7 +190,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
+@@ -185,7 +185,7 @@ function createBrowserSettingsRoutes(): SettingsRoutes
r.ACCESSIBILITY = r.ADVANCED.createSection('/accessibility', 'a11y');
diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css
new file mode 100644
index 000000000000..87281547034e
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared.css
@@ -0,0 +1,11 @@
+--- chrome/browser/resources/signin/signin_shared.css.orig 2022-07-22 17:30:31 UTC
++++ chrome/browser/resources/signin/signin_shared.css
+@@ -37,7 +37,7 @@ cr-button + cr-button {
+ margin-inline-start: 8px;
+ }
+
+-<if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
++<if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
+ .action-container {
+ flex-flow: row-reverse;
+ justify-content: flex-start;
diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html b/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html
deleted file mode 100644
index c76a00d636c6..000000000000
--- a/www/chromium/files/patch-chrome_browser_resources_signin_signin__shared__css.html
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/resources/signin/signin_shared_css.html.orig 2021-06-11 09:30:40 UTC
-+++ chrome/browser/resources/signin/signin_shared_css.html
-@@ -30,7 +30,7 @@
- margin-inline-start: 8px;
- }
-
--<if expr="is_macosx or is_linux">
-+<if expr="is_macosx or is_posix">
- .action-container {
- flex-flow: row-reverse;
- justify-content: flex-start;
diff --git a/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
new file mode 100644
index 000000000000..31df4ed9f6d6
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_resources_signin_sync__confirmation_sync__confirmation__app.html
@@ -0,0 +1,38 @@
+--- chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html.orig 2022-07-22 17:30:31 UTC
++++ chrome/browser/resources/signin/sync_confirmation/sync_confirmation_app.html
+@@ -298,7 +298,7 @@
+ consent-confirmation autofocus>
+ $i18n{syncConfirmationConfirmLabel}
+ </cr-button>
+- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
++ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
+ <cr-button id="settingsButton" on-click="onGoToSettings_"
+ disabled="[[anyButtonClicked_]]" consent-confirmation>
+ $i18n{syncConfirmationSettingsLabel}
+@@ -308,7 +308,7 @@
+ disabled="[[anyButtonClicked_]]" hidden="[[syncForced_]]">
+ $i18n{syncConfirmationUndoLabel}
+ </cr-button>
+- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
++ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
+ <cr-button id="settingsButton" on-click="onGoToSettings_"
+ disabled="[[anyButtonClicked_]]" consent-confirmation>
+ $i18n{syncConfirmationSettingsLabel}
+@@ -356,7 +356,7 @@
+ consent-confirmation>
+ $i18n{syncConfirmationConfirmLabel}
+ </cr-button>
+- <if expr="is_macosx or is_linux or chromeos_ash or chromeos_lacros">
++ <if expr="is_macosx or is_posix or chromeos_ash or chromeos_lacros">
+ <cr-button id="settingsButton" on-click="onGoToSettings_"
+ disabled="[[anyButtonClicked_]]" consent-confirmation>
+ $i18n{syncConfirmationSettingsLabel}
+@@ -366,7 +366,7 @@
+ disabled="[[anyButtonClicked_]]" hidden="[[syncForced_]]">
+ $i18n{syncConfirmationUndoLabel}
+ </cr-button>
+- <if expr="not (is_macosx or is_linux or chromeos_ash or chromeos_lacros)">
++ <if expr="not (is_macosx or is_posix or chromeos_ash or chromeos_lacros)">
+ <cr-button id="settingsButton" on-click="onGoToSettings_"
+ disabled="[[anyButtonClicked_]]" consent-confirmation>
+ $i18n{syncConfirmationSettingsLabel}
diff --git a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
index e838c9848c9e..608073247f7b 100644
--- a/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
+++ b/www/chromium/files/patch-chrome_browser_sharing_sharing__device__registration.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/sharing/sharing_device_registration.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/sharing/sharing_device_registration.cc
-@@ -327,7 +327,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
+@@ -326,7 +326,7 @@ bool SharingDeviceRegistration::IsSmsFetcherSupported(
bool SharingDeviceRegistration::IsRemoteCopySupported() const {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc b/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
deleted file mode 100644
index f70285bf99a2..000000000000
--- a/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.cc
+++ /dev/null
@@ -1,38 +0,0 @@
---- chrome/browser/signin/primary_account_policy_manager.cc.orig 2022-06-17 14:20:10 UTC
-+++ chrome/browser/signin/primary_account_policy_manager.cc
-@@ -23,7 +23,7 @@
- #include "google_apis/gaia/gaia_auth_util.h"
- #include "ui/base/l10n/l10n_util.h"
-
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- #include "chrome/browser/profiles/profile_manager.h"
- #include "chrome/browser/ui/browser.h"
- #include "chrome/browser/ui/browser_finder.h"
-@@ -35,7 +35,7 @@
- #include "chrome/browser/ui/webui/profile_helper.h"
- #endif
-
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // Manager that presents the profile will be deleted dialog on the first active
- // browser window.
- class PrimaryAccountPolicyManager::DeleteProfileDialogManager
-@@ -250,7 +250,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
- break;
- }
- case signin::Tribool::kFalse:
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // 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
-@@ -281,7 +281,7 @@ void PrimaryAccountPolicyManager::EnsurePrimaryAccount
- #endif // !BUILDFLAG(IS_CHROMEOS_ASH)
- }
-
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- // Shows the delete profile dialog on the first browser active window.
- void PrimaryAccountPolicyManager::ShowDeleteProfileDialog(
- Profile* profile,
diff --git a/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h b/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h
deleted file mode 100644
index 130138098df4..000000000000
--- a/www/chromium/files/patch-chrome_browser_signin_primary__account__policy__manager.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- chrome/browser/signin/primary_account_policy_manager.h.orig 2022-05-19 14:06:27 UTC
-+++ chrome/browser/signin/primary_account_policy_manager.h
-@@ -44,7 +44,7 @@ class PrimaryAccountPolicyManager : public KeyedServic
- Profile* profile,
- signin_metrics::ProfileSignout clear_primary_account_source);
-
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- class DeleteProfileDialogManager;
-
- // SHows the delete profile dialog.
-@@ -68,7 +68,7 @@ class PrimaryAccountPolicyManager : public KeyedServic
- // profile-specific local prefs (like kGoogleServicesUsernamePattern).
- PrefChangeRegistrar local_state_pref_registrar_;
-
--#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
-+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
- std::unique_ptr<DeleteProfileDialogManager> delete_profile_dialog_manager_;
- bool hide_ui_for_testing_ = false;
- #endif
diff --git a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
index c04fa13da6b9..d3290a87107c 100644
--- a/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
+++ b/www/chromium/files/patch-chrome_browser_sync_device__info__sync__client__impl.cc
@@ -1,6 +1,6 @@
---- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/sync/device_info_sync_client_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/sync/device_info_sync_client_impl.cc
-@@ -40,7 +40,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD
+@@ -38,7 +38,7 @@ std::string DeviceInfoSyncClientImpl::GetSigninScopedD
// in lacros-chrome once build flag switch of lacros-chrome is
// complete.
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
index 8aa7e5d70afe..8bb75a6947c3 100644
--- a/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
+++ b/www/chromium/files/patch-chrome_browser_themes_theme__helper.cc
@@ -1,4 +1,4 @@
---- chrome/browser/themes/theme_helper.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/themes/theme_helper.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/themes/theme_helper.cc
@@ -24,7 +24,7 @@
#include "ui/native_theme/common_theme.h"
@@ -9,7 +9,7 @@
#include "ui/views/linux_ui/linux_ui.h"
#endif
-@@ -494,7 +494,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
+@@ -498,7 +498,7 @@ bool ThemeHelper::UseDarkModeColors(const CustomThemeS
ui::NativeTheme const* native_theme =
ui::NativeTheme::GetInstanceForNativeUi();
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser.h b/www/chromium/files/patch-chrome_browser_ui_browser.h
index b8a35a466f16..27dd9c0640d3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser.h
@@ -1,11 +1,11 @@
---- chrome/browser/ui/browser.h.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/browser.h.orig 2022-07-22 17:30:31 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();
+@@ -282,7 +282,7 @@ class Browser : public TabStripModelObserver,
+ int32_t restore_id = kDefaultRestoreId;
#endif
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // When the browser window is shown, the desktop environment is notified
+ // using this ID. In response, the desktop will stop playing the "waiting
+ // for startup" animation (if any).
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc b/www/chromium/files/patch-chrome_browser_ui_browser__command__controller.cc
index 475c34166459..7c4696ba8336 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,4 +1,4 @@
---- chrome/browser/ui/browser_command_controller.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/browser_command_controller.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/browser_command_controller.cc
@@ -97,7 +97,7 @@
@@ -9,7 +9,7 @@
#include "ui/base/ime/linux/text_edit_key_bindings_delegate_auralinux.h"
#endif
-@@ -288,7 +288,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
+@@ -320,7 +320,7 @@ bool BrowserCommandController::IsReservedCommandOrKey(
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,7 +18,7 @@
// If this key was registered by the user as a content editing hotkey, then
// it is not reserved.
ui::TextEditKeyBindingsDelegateAuraLinux* delegate =
-@@ -524,7 +524,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
+@@ -556,7 +556,7 @@ bool BrowserCommandController::ExecuteCommandWithDispo
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -27,7 +27,7 @@
case IDC_MINIMIZE_WINDOW:
browser_->window()->Minimize();
break;
-@@ -1087,7 +1087,7 @@ void BrowserCommandController::InitCommandState() {
+@@ -1122,7 +1122,7 @@ void BrowserCommandController::InitCommandState() {
#endif
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h
index 17ca9be374e6..e31a059d60d9 100644
--- a/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h
+++ b/www/chromium/files/patch-chrome_browser_ui_browser__dialogs.h
@@ -1,6 +1,6 @@
---- chrome/browser/ui/browser_dialogs.h.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/browser_dialogs.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/browser_dialogs.h
-@@ -26,7 +26,7 @@
+@@ -27,7 +27,7 @@
#include "ui/base/models/dialog_model.h"
#include "ui/gfx/native_widget_types.h"
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 543c6c1e4458..babaefe684e0 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-06-17 14:20:10 UTC
+--- chrome/browser/ui/chrome_pages.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/chrome_pages.cc
-@@ -566,7 +566,7 @@ void ShowBrowserSigninOrSettings(Browser* browser,
+@@ -568,7 +568,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 29634fb51731..73385d686af5 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-06-17 14:20:10 UTC
+--- chrome/browser/ui/signin_view_controller.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/signin_view_controller.cc
-@@ -273,7 +273,7 @@ void SigninViewController::ShowModalEnterpriseConfirma
+@@ -262,7 +262,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_startup__browser__creator.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator.cc
index 077c2a9282c5..ec5e0ff2d8e5 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-06-17 14:20:10 UTC
+--- chrome/browser/ui/startup/startup_browser_creator.cc.orig 2022-07-22 17:30:31 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
-@@ -1014,7 +1014,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1016,7 +1016,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) &&
-@@ -1204,7 +1204,7 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
+@@ -1206,7 +1206,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_startup_startup__browser__creator__impl.cc b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
new file mode 100644
index 000000000000..146917347e2f
--- /dev/null
+++ b/www/chromium/files/patch-chrome_browser_ui_startup_startup__browser__creator__impl.cc
@@ -0,0 +1,11 @@
+--- chrome/browser/ui/startup/startup_browser_creator_impl.cc.orig 2022-07-22 17:30:31 UTC
++++ chrome/browser/ui/startup/startup_browser_creator_impl.cc
+@@ -241,7 +241,7 @@ Browser* StartupBrowserCreatorImpl::OpenTabsInBrowser(
+ // at the state of the MessageLoop.
+ Browser::CreateParams params = Browser::CreateParams(profile_, false);
+ params.creation_source = Browser::CreationSource::kStartupCreator;
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ params.startup_id = command_line_.GetSwitchValueASCII("desktop-startup-id");
+ #endif
+ browser = Browser::Create(params);
diff --git a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
index 2ba23e5a47b7..d0d8d5354dc3 100644
--- a/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_tab__helpers.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/tab_helpers.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/tab_helpers.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/tab_helpers.cc
-@@ -196,7 +196,7 @@
+@@ -198,7 +198,7 @@
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
#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"
-@@ -532,13 +532,13 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -536,13 +536,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) ||
-@@ -553,7 +553,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
+@@ -557,7 +557,7 @@ void TabHelpers::AttachTabHelpers(WebContents* web_con
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
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 e21d9769aab0..1f0bb1f3a1cd 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,4 +1,4 @@
---- chrome/browser/ui/views/accelerator_table.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/ui/views/accelerator_table.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/accelerator_table.cc
@@ -61,11 +61,11 @@ const AcceleratorMapping kAcceleratorMap[] = {
{ui::VKEY_S, ui::EF_PLATFORM_ACCELERATOR, IDC_SAVE_PAGE},
@@ -32,3 +32,12 @@
{ui::VKEY_BROWSER_BACK, ui::EF_NONE, IDC_BACK},
{ui::VKEY_BROWSER_FORWARD, ui::EF_NONE, IDC_FORWARD},
{ui::VKEY_BROWSER_HOME, ui::EF_NONE, IDC_HOME},
+@@ -238,7 +238,7 @@ const AcceleratorMapping kAcceleratorMap[] = {
+ {ui::VKEY_SPACE, ui::EF_CONTROL_DOWN, IDC_TOGGLE_QUICK_COMMANDS},
+ #endif // !BUILDFLAG(IS_CHROMEOS)
+ #endif // !BUILDFLAG(IS_MAC)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ {ui::VKEY_S, ui::EF_CONTROL_DOWN | ui::EF_SHIFT_DOWN,
+ IDC_RUN_SCREEN_AI_VISUAL_ANNOTATIONS},
+ #endif
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
index 7678829fa636..4e0a6bba92a4 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_apps_chrome__native__app__window__views__aura.cc
@@ -1,4 +1,4 @@
---- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/apps/chrome_native_app_window_views_aura.cc
@@ -19,7 +19,7 @@
#include "ui/gfx/image/image_skia.h"
@@ -9,7 +9,7 @@
#include "chrome/browser/shell_integration_linux.h"
#endif
-@@ -50,7 +50,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
+@@ -55,7 +55,7 @@ void ChromeNativeAppWindowViewsAura::OnBeforeWidgetIni
const AppWindow::CreateParams& create_params,
views::Widget::InitParams* init_params,
views::Widget* widget) {
diff --git a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
index 52bc71a149c4..55cbb146ad8b 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_download_download__item__view.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/browser/ui/views/download/download_item_view.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/download/download_item_view.cc
-@@ -195,7 +195,7 @@ bool UseNewWarnings() {
+@@ -188,7 +188,7 @@ bool UseNewWarnings() {
}
int GetFilenameStyle(const views::Label& label) {
@@ -9,7 +9,7 @@
if (UseNewWarnings())
return STYLE_EMPHASIZED;
#endif
-@@ -203,7 +203,7 @@ int GetFilenameStyle(const views::Label& label) {
+@@ -196,7 +196,7 @@ int GetFilenameStyle(const views::Label& label) {
}
int GetFilenameStyle(const views::StyledLabel& label) {
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
deleted file mode 100644
index 571992fbd269..000000000000
--- a/www/chromium/files/patch-chrome_browser_ui_views_frame_browser__desktop__window__tree__host__linux.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc.orig 2022-06-17 14:20:10 UTC
-+++ chrome/browser/ui/views/frame/browser_desktop_window_tree_host_linux.cc
-@@ -145,7 +145,7 @@ bool BrowserDesktopWindowTreeHostLinux::SupportsClient
- }
-
- void BrowserDesktopWindowTreeHostLinux::UpdateFrameHints() {
--#if BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- auto* view = static_cast<BrowserFrameViewLinux*>(
- native_frame_->browser_frame()->GetFrameView());
- auto* layout = view->layout();
diff --git a/www/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 78bb5a55ec2d..4a671eea4f4c 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-06-17 14:20:10 UTC
+--- chrome/browser/ui/views/frame/browser_view.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/frame/browser_view.cc
-@@ -1964,7 +1964,7 @@ void BrowserView::TabDraggingStatusChanged(bool is_dra
+@@ -1968,7 +1968,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_profiles_profile__menu__view__base.cc b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
index 501b649783ba..dca6a37abb19 100644
--- a/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_views_profiles_profile__menu__view__base.cc
@@ -1,6 +1,6 @@
---- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/browser/ui/views/profiles/profile_menu_view_base.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/views/profiles/profile_menu_view_base.cc
-@@ -610,7 +610,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
+@@ -606,7 +606,7 @@ void ProfileMenuViewBase::SetProfileIdentityInfo(
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
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 f8a3357ffeac..7ef6da7a9116 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-06-17 14:20:10 UTC
+--- chrome/browser/ui/views/tabs/tab_drag_controller.cc.orig 2022-07-22 17:30:31 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.
@@ -9,7 +9,7 @@
can_release_capture_ = false;
#endif
start_point_in_screen_ = gfx::Point(source_view_offset, mouse_offset.y());
-@@ -1021,7 +1021,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
+@@ -1023,7 +1023,7 @@ TabDragController::DragBrowserToNewTabStrip(TabDragCon
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -18,16 +18,16 @@
// EndMoveLoop is going to snap the window back to its original location.
// Hide it so users don't see this. Hiding a window in Linux aura causes
// it to lose capture so skip it.
-@@ -1977,7 +1977,7 @@ void TabDragController::CompleteDrag() {
+@@ -1979,7 +1979,7 @@ void TabDragController::CompleteDrag() {
}
// If source window was maximized - maximize the new window as well.
--#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && \
-+#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD) && \
- !BUILDFLAG(IS_CHROMEOS_LACROS) && !BUILDFLAG(IS_MAC)
+-#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC)
++#if !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
// Keeping maximized state breaks snap to Grid on Windows when dragging
// tabs from maximized windows. TODO:(crbug.com/727051) Explore doing this
-@@ -2362,7 +2362,7 @@ TabDragController::Liveness TabDragController::GetLoca
+ // for other desktop OS's. kMaximizedStateRetainedOnTabDrag in
+@@ -2375,7 +2375,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 b4f64221bb59..b0fae317f67f 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-06-17 14:20:10 UTC
+--- chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc.orig 2022-08-02 06:45:26 UTC
+++ chrome/browser/ui/webui/chrome_web_ui_controller_factory.cc
-@@ -299,7 +299,7 @@
+@@ -305,7 +305,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
-@@ -324,17 +324,17 @@
+@@ -330,17 +330,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
-@@ -680,7 +680,7 @@ bool IsAboutUI(const GURL& url) {
+@@ -693,7 +693,7 @@ bool IsAboutUI(const GURL& url) {
#if !BUILDFLAG(IS_ANDROID)
|| url.host_piece() == chrome::kChromeUITermsHost
#endif
@@ -39,7 +39,7 @@
|| url.host_piece() == chrome::kChromeUILinuxProxyConfigHost
#endif
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1096,7 +1096,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1120,7 +1120,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
#endif // !defined(USE_REAL_DBUS_CLIENTS)
#endif // !defined(OFFICIAL_BUILD)
#endif // BUILDFLAG(IS_CHROMEOS_ASH)
@@ -48,7 +48,7 @@
if (url.host_piece() == chrome::kChromeUIWebUIJsErrorHost)
return &NewWebUI<WebUIJsErrorUI>;
#endif
-@@ -1154,7 +1154,7 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1178,7 +1178,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)
-@@ -1213,27 +1213,27 @@ WebUIFactoryFunction GetWebUIFactoryFunction(WebUI* we
+@@ -1237,27 +1237,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_ntp_app__launcher__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_ntp_app__launcher__handler.cc
index de30d3e44763..3528efb3b7a3 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-06-17 14:20:10 UTC
+--- chrome/browser/ui/webui/ntp/app_launcher_handler.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/webui/ntp/app_launcher_handler.cc
-@@ -322,7 +322,7 @@ base::Value::Dict AppLauncherHandler::CreateExtensionI
+@@ -325,7 +325,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
-@@ -1398,7 +1398,7 @@ void AppLauncherHandler::InstallOsHooks(const web_app:
+@@ -1434,7 +1434,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_appearance__handler.cc b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
index 9e5a36b8b3a9..8a7eb21e2985 100644
--- a/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
+++ b/www/chromium/files/patch-chrome_browser_ui_webui_settings_appearance__handler.cc
@@ -1,15 +1,15 @@
---- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-04-21 18:48:31 UTC
+--- chrome/browser/ui/webui/settings/appearance_handler.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/ui/webui/settings/appearance_handler.cc
-@@ -31,7 +31,7 @@ void AppearanceHandler::RegisterMessages() {
+@@ -29,7 +29,7 @@ void AppearanceHandler::RegisterMessages() {
+ "useDefaultTheme",
+ base::BindRepeating(&AppearanceHandler::HandleUseDefaultTheme,
base::Unretained(this)));
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
- // of lacros-chrome is complete.
--#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMEOS_LACROS)) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
web_ui()->RegisterMessageCallback(
"useSystemTheme",
base::BindRepeating(&AppearanceHandler::HandleUseSystemTheme,
-@@ -45,7 +45,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
+@@ -43,7 +43,7 @@ void AppearanceHandler::HandleUseDefaultTheme(const ba
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
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 1056f2c08bae..7fa1bc8cc912 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-06-17 14:20:10 UTC
+--- chrome/browser/ui/webui/settings/settings_localized_strings_provider.cc.orig 2022-07-22 17:30:31 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
-@@ -372,7 +372,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -373,7 +373,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},
-@@ -380,7 +380,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -381,7 +381,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)
-@@ -401,7 +401,7 @@ void AddAppearanceStrings(content::WebUIDataSource* ht
+@@ -402,7 +402,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_web__applications_web__app__provider.cc b/www/chromium/files/patch-chrome_browser_web__applications_web__app__provider.cc
index 98b63fd85a9f..8d4ec88a2bf9 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-06-17 14:20:10 UTC
+--- chrome/browser/web_applications/web_app_provider.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/web_applications/web_app_provider.cc
-@@ -281,7 +281,7 @@ void WebAppProvider::CreateSubsystems(Profile* profile
+@@ -274,7 +274,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 9810900717e1..39b7ecb0b197 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,11 +1,11 @@
---- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/browser/webauthn/chrome_authenticator_request_delegate.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/browser/webauthn/chrome_authenticator_request_delegate.cc
-@@ -670,7 +670,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
+@@ -673,7 +673,7 @@ void ChromeAuthenticatorRequestDelegate::ConfigureCabl
+ }
+ }
- // TODO(crbug.com/1052397): Revisit the macro expression once build flag
- // switch of lacros-chrome is complete.
--#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX)
-+#if BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
+ // No caBLEv1 on Linux. It tends to crash bluez.
if (std::any_of(pairings_from_extension.begin(),
pairings_from_extension.end(),
- [](const device::CableDiscoveryData& v) -> bool {
diff --git a/www/chromium/files/patch-chrome_common_chrome__features.cc b/www/chromium/files/patch-chrome_common_chrome__features.cc
index d76d025c188a..727a781b7979 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__features.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/common/chrome_features.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/chrome_features.cc
-@@ -104,7 +104,7 @@ const base::Feature kAsyncDns {
+@@ -102,7 +102,7 @@ const base::Feature kAsyncDns {
};
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
// Enables or disables the Autofill survey triggered by opening a prompt to
// save address info.
const base::Feature kAutofillAddressSurvey{"AutofillAddressSurvey",
-@@ -119,7 +119,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP
+@@ -117,7 +117,7 @@ const base::Feature kAutofillPasswordSurvey{"AutofillP
base::FEATURE_DISABLED_BY_DEFAULT};
#endif
@@ -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.
-@@ -287,7 +287,7 @@ const base::Feature kDesktopPWAsEnforceWebAppSettingsP
+@@ -293,7 +293,7 @@ const base::Feature kDesktopPWAsDetailedInstallDialog{
// 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
-@@ -303,7 +303,7 @@ const base::Feature kDesktopPWAsWebBundles{"DesktopPWA
+@@ -309,7 +309,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};
-@@ -327,7 +327,7 @@ const base::Feature kDmTokenDeletion{"DmTokenDeletion"
+@@ -329,7 +329,7 @@ const base::Feature kKeepForceInstalledPreinstalledApp
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
-@@ -343,7 +343,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
+@@ -345,7 +345,7 @@ const base::FeatureParam<bool> kDnsOverHttpsFallbackPa
const base::FeatureParam<bool> kDnsOverHttpsShowUiParam {
&kDnsOverHttps, "ShowUi",
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
@@ -54,7 +54,7 @@
true
#else
false
-@@ -639,7 +639,7 @@ const base::Feature kIncognitoParamFilterEnabled{
+@@ -624,7 +624,7 @@ const base::Feature kUpdateHistoryEntryPointsInIncogni
const base::Feature kIPHInWebUIDemo{"IPHInWebUIDemo",
base::FEATURE_DISABLED_BY_DEFAULT};
@@ -63,7 +63,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
const base::Feature kLinuxLowMemoryMonitor{"LinuxLowMemoryMonitor",
base::FEATURE_DISABLED_BY_DEFAULT};
-@@ -652,7 +652,7 @@ constexpr base::FeatureParam<int> kLinuxLowMemoryMonit
+@@ -637,7 +637,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 ec04c20c41ca..c11bd7f7032c 100644
--- a/www/chromium/files/patch-chrome_common_chrome__features.h
+++ b/www/chromium/files/patch-chrome_common_chrome__features.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_features.h.orig 2022-06-17 14:20:10 UTC
+--- chrome/common/chrome_features.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/chrome_features.h
-@@ -91,7 +91,7 @@ extern const base::Feature kArcPiGhostWindow;
+@@ -89,7 +89,7 @@ extern const base::Feature kArcPiGhostWindow;
COMPONENT_EXPORT(CHROME_FEATURES) extern const base::Feature kAsyncDns;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kAutofillAddressSurvey;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -100,7 +100,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -98,7 +98,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kAutofillPasswordSurvey;
#endif
@@ -18,7 +18,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kBackgroundModeAllowRestart;
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-@@ -220,7 +220,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -223,7 +223,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kDesktopPWAsWebBundles;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -27,7 +27,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kDesktopPWAsWebAppSettingsPage;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -449,7 +449,7 @@ extern const base::Feature kIncognitoParamFilterEnable
+@@ -437,7 +437,7 @@ extern const base::Feature kUpdateHistoryEntryPointsIn
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kIPHInWebUIDemo;
@@ -36,7 +36,7 @@
COMPONENT_EXPORT(CHROME_FEATURES)
extern const base::Feature kLinuxLowMemoryMonitor;
COMPONENT_EXPORT(CHROME_FEATURES)
-@@ -458,7 +458,7 @@ COMPONENT_EXPORT(CHROME_FEATURES)
+@@ -446,7 +446,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__switches.cc b/www/chromium/files/patch-chrome_common_chrome__switches.cc
index c24f2985a599..2e20ce7c0e08 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.cc
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.cc
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/chrome_switches.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/chrome_switches.cc
-@@ -786,14 +786,14 @@ const char kAllowNaClSocketAPI[] = "allow-n
+@@ -796,14 +796,14 @@ const char kAllowNaClSocketAPI[] = "allow-nacl-socket-
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_common_chrome__switches.h b/www/chromium/files/patch-chrome_common_chrome__switches.h
index 86da70b918a2..7b130bd84741 100644
--- a/www/chromium/files/patch-chrome_common_chrome__switches.h
+++ b/www/chromium/files/patch-chrome_common_chrome__switches.h
@@ -1,6 +1,6 @@
---- chrome/common/chrome_switches.h.orig 2022-05-19 14:06:27 UTC
+--- chrome/common/chrome_switches.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/chrome_switches.h
-@@ -245,12 +245,12 @@ extern const char kAllowNaClSocketAPI[];
+@@ -251,12 +251,12 @@ extern const char kAllowNaClSocketAPI[];
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-chrome_common_pref__names.cc b/www/chromium/files/patch-chrome_common_pref__names.cc
index 487a233935a2..8af3895a8b65 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-06-17 14:20:10 UTC
+--- chrome/common/pref_names.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/pref_names.cc
-@@ -1220,7 +1220,7 @@ const char kUseAshProxy[] = "lacros.proxy.use_ash_prox
+@@ -1222,7 +1222,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
-@@ -1315,7 +1315,7 @@ const char kShowUpdatePromotionInfoBar[] =
+@@ -1317,7 +1317,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";
-@@ -1810,7 +1810,7 @@ const char kDownloadDirUpgraded[] = "download.director
+@@ -1812,7 +1812,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
-@@ -2111,7 +2111,7 @@ const char kWebAppsPreferences[] = "web_apps.web_app_i
+@@ -2113,7 +2113,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";
-@@ -2241,7 +2241,7 @@ const char kAmbientAuthenticationInPrivateModesEnabled
+@@ -2243,7 +2243,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[] =
-@@ -3246,7 +3246,7 @@ const char kBlockAutoplayEnabled[] = "media.block_auto
+@@ -3258,7 +3258,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 177307b9df53..8b8e4cfa53be 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-06-17 14:20:10 UTC
+--- chrome/common/pref_names.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/pref_names.h
-@@ -381,7 +381,7 @@ extern const char kUseAshProxy[];
+@@ -382,7 +382,7 @@ extern const char kUseAshProxy[];
#endif // BUILDFLAG(IS_CHROMEOS_LACROS)
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
extern const char kUsesSystemTheme[];
#endif
extern const char kCurrentThemePackFilename[];
-@@ -406,7 +406,7 @@ extern const char kShowUpdatePromotionInfoBar[];
+@@ -407,7 +407,7 @@ extern const char kShowUpdatePromotionInfoBar[];
#endif
// 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)
-@@ -595,7 +595,7 @@ extern const char kDownloadAllowedURLsForOpenByPolicy[
+@@ -596,7 +596,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)
-@@ -706,7 +706,7 @@ extern const char kWebAppsUninstalledDefaultChromeApps
+@@ -707,7 +707,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
-@@ -844,7 +844,7 @@ extern const char kGloballyScopeHTTPAuthCacheEnabled[]
+@@ -846,7 +846,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)
-@@ -1108,7 +1108,7 @@ extern const char kBlockAutoplayEnabled[];
+@@ -1111,7 +1111,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 a8825a007ff9..0a066eaaf812 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-06-17 14:20:10 UTC
+--- chrome/common/url_constants.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/url_constants.cc
-@@ -479,7 +479,7 @@ const char kPhoneHubPermissionLearnMoreURL[] =
+@@ -477,7 +477,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 86516c868a4b..a595b87cb079 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-06-17 14:20:10 UTC
+--- chrome/common/url_constants.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/url_constants.h
-@@ -449,7 +449,7 @@ extern const char kOutdatedPluginLearnMoreURL[];
+@@ -447,7 +447,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 94010631f0ad..e35cea15cbab 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-06-17 14:20:10 UTC
+--- chrome/common/webui_url_constants.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/webui_url_constants.cc
-@@ -451,18 +451,18 @@ const char kOsUIHelpAppURL[] = "os://help-app";
+@@ -454,18 +454,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
-@@ -477,14 +477,14 @@ const char kChromeUILinuxProxyConfigHost[] = "linux-pr
+@@ -480,14 +480,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[] =
-@@ -499,7 +499,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
+@@ -502,7 +502,7 @@ const char kChromeUIProfilePickerUrl[] = "chrome://pro
const char kChromeUIProfilePickerStartupQuery[] = "startup";
#endif
@@ -48,7 +48,7 @@
defined(TOOLKIT_VIEWS)) || \
defined(USE_AURA)
const char kChromeUITabModalConfirmDialogHost[] = "tab-modal-confirm-dialog";
-@@ -574,7 +574,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
+@@ -577,7 +577,7 @@ const char kPrivacySandboxSubPagePath[] = "/privacySan
#endif
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -57,7 +57,7 @@
const char kChromeUIWebAppSettingsURL[] = "chrome://app-settings/";
const char kChromeUIWebAppSettingsHost[] = "app-settings";
#endif
-@@ -778,7 +778,7 @@ const char* const kChromeDebugURLs[] = {
+@@ -782,7 +782,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 337e54139e46..b2c295ad77bd 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-06-17 14:20:10 UTC
+--- chrome/common/webui_url_constants.h.orig 2022-07-22 17:30:31 UTC
+++ chrome/common/webui_url_constants.h
-@@ -384,24 +384,24 @@ extern const char kOsUIHelpAppURL[];
+@@ -388,24 +388,24 @@ extern const char kOsUIHelpAppURL[];
extern const char kOsUIVersionURL[];
#endif
@@ -29,7 +29,7 @@
extern const char kChromeUIWebAppSettingsURL[];
extern const char kChromeUIWebAppSettingsHost[];
#endif
-@@ -416,14 +416,14 @@ extern const char kChromeUILinuxProxyConfigHost[];
+@@ -420,14 +420,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[];
-@@ -435,7 +435,7 @@ extern const char kChromeUIProfilePickerUrl[];
+@@ -439,7 +439,7 @@ extern const char kChromeUIProfilePickerUrl[];
extern const char kChromeUIProfilePickerStartupQuery[];
#endif
diff --git a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
index 521f657924be..ae502ab49cbe 100644
--- a/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
+++ b/www/chromium/files/patch-chrome_renderer_chrome__render__frame__observer.cc
@@ -1,6 +1,6 @@
---- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/renderer/chrome_render_frame_observer.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/renderer/chrome_render_frame_observer.cc
-@@ -331,7 +331,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
+@@ -329,7 +329,7 @@ void ChromeRenderFrameObserver::OnDestruct() {
void ChromeRenderFrameObserver::DraggableRegionsChanged() {
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
index fd1c34fc9974..67810c0d7651 100644
--- a/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
+++ b/www/chromium/files/patch-chrome_services_printing_print__backend__service__impl.cc
@@ -1,6 +1,6 @@
---- chrome/services/printing/print_backend_service_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- chrome/services/printing/print_backend_service_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/services/printing/print_backend_service_impl.cc
-@@ -603,7 +603,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
+@@ -604,7 +604,7 @@ void PrintBackendServiceImpl::UpdatePrintSettings(
crash_keys_ = std::make_unique<crash_keys::ScopedPrinterInfo>(
print_backend_->GetPrinterDriverInfo(*printer_name));
diff --git a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
index 6a8602dc1797..93abb67c26c3 100644
--- a/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
+++ b/www/chromium/files/patch-chrome_services_speech_audio__source__fetcher__impl.cc
@@ -1,6 +1,6 @@
---- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2022-02-28 16:54:41 UTC
+--- chrome/services/speech/audio_source_fetcher_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/services/speech/audio_source_fetcher_impl.cc
-@@ -68,7 +68,7 @@ void AudioSourceFetcherImpl::Start(
+@@ -69,7 +69,7 @@ void AudioSourceFetcherImpl::Start(
// TODO(crbug.com/1185978): Check implementation / sandbox policy on Mac and
// Windows.
diff --git a/www/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_browser_system__signals__service__host__impl.cc
index bb370b5b8570..8a03d8acf037 100644
--- 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_browser_system__signals__service__host__impl.cc
@@ -1,7 +1,7 @@
---- 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
+--- chrome/services/system_signals/public/cpp/browser/system_signals_service_host_impl.cc.orig 2022-07-22 17:30:31 UTC
++++ chrome/services/system_signals/public/cpp/browser/system_signals_service_host_impl.cc
@@ -12,7 +12,7 @@
- #include "content/public/browser/service_process_host.h"
+ #include "content/public/browser/service_process_host.h" // nogncheck
#elif BUILDFLAG(IS_MAC)
#include "chrome/services/system_signals/mac/mac_system_signals_service.h"
-#elif BUILDFLAG(IS_LINUX)
@@ -9,12 +9,12 @@
#include "chrome/services/system_signals/linux/linux_system_signals_service.h"
#endif
-@@ -39,7 +39,7 @@ SystemSignalsServiceHost::GetService() {
- return &remote_service_;
+@@ -39,7 +39,7 @@ SystemSignalsServiceHostImpl::GetService() {
+ return remote_service_.get();
}
-#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC)
+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_BSD)
device_signals::mojom::SystemSignalsService*
- SystemSignalsServiceHost::GetService() {
+ SystemSignalsServiceHostImpl::GetService() {
diff --git a/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.h b/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.h
new file mode 100644
index 000000000000..bd95ae8d3441
--- /dev/null
+++ b/www/chromium/files/patch-chrome_services_system__signals_public_cpp_browser_system__signals__service__host__impl.h
@@ -0,0 +1,20 @@
+--- chrome/services/system_signals/public/cpp/browser/system_signals_service_host_impl.h.orig 2022-07-22 17:30:31 UTC
++++ chrome/services/system_signals/public/cpp/browser/system_signals_service_host_impl.h
+@@ -11,7 +11,7 @@
+ #if BUILDFLAG(IS_WIN)
+ #include "components/device_signals/core/common/mojom/system_signals.mojom.h"
+ #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>
+ #include "components/device_signals/core/common/mojom/system_signals.mojom-forward.h"
+ #endif
+@@ -34,7 +34,7 @@ class SystemSignalsServiceHostImpl
+ private:
+ #if BUILDFLAG(IS_WIN)
+ mojo::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_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
deleted file mode 100644
index 772a3c12e8e4..000000000000
--- a/www/chromium/files/patch-chrome_services_system__signals_public_cpp_system__signals__service__host.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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 e52a7851d696..a396055a411f 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-06-17 14:20:10 UTC
+--- chrome/test/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ chrome/test/BUILD.gn
-@@ -9488,7 +9488,7 @@ test("chrome_app_unittests") {
+@@ -9557,7 +9557,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
index c166f08ee18e..6f403e8839d8 100644
--- 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
@@ -1,6 +1,6 @@
---- chrome/test/interaction/interaction_sequence_browser_util.cc.orig 2022-06-17 14:20:10 UTC
+--- chrome/test/interaction/interaction_sequence_browser_util.cc.orig 2022-07-22 17:30:31 UTC
+++ chrome/test/interaction/interaction_sequence_browser_util.cc
-@@ -53,7 +53,7 @@ class RenderFrameHost;
+@@ -52,7 +52,7 @@ class RenderFrameHost;
namespace {
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 731841914719..3e4bf9065dd6 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,4 +1,4 @@
---- chromecast/browser/cast_browser_main_parts.cc.orig 2022-06-17 14:20:10 UTC
+--- chromecast/browser/cast_browser_main_parts.cc.orig 2022-07-22 17:30:31 UTC
+++ chromecast/browser/cast_browser_main_parts.cc
@@ -91,7 +91,7 @@
#include "ui/base/ui_base_switches.h"
@@ -9,16 +9,7 @@
#include <fontconfig/fontconfig.h>
#include <signal.h>
#include <sys/prctl.h>
-@@ -146,7 +146,7 @@
- #include "extensions/browser/extension_prefs.h" // nogncheck
- #endif
-
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE)
- #include "chromecast/browser/exo/wayland_server_controller.h"
- #endif
-
-@@ -282,7 +282,7 @@ class CastViewsDelegate : public views::ViewsDelegate
+@@ -278,7 +278,7 @@ class CastViewsDelegate : public views::ViewsDelegate
#endif // defined(USE_AURA)
@@ -27,7 +18,7 @@
base::FilePath GetApplicationFontsDir() {
std::unique_ptr<base::Environment> env(base::Environment::Create());
-@@ -328,7 +328,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
+@@ -324,7 +324,7 @@ const DefaultCommandLineSwitch kDefaultSwitches[] = {
{cc::switches::kDisableThreadedAnimation, ""},
#endif // BUILDFLAG(IS_ANDROID)
#endif // BUILDFLAG(IS_CAST_AUDIO_ONLY)
@@ -36,7 +27,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.
-@@ -516,7 +516,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
+@@ -512,7 +512,7 @@ void CastBrowserMainParts::ToolkitInitialized() {
views_delegate_ = std::make_unique<CastViewsDelegate>();
#endif // defined(USE_AURA)
@@ -45,21 +36,3 @@
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)) {
-@@ -747,7 +747,7 @@ int CastBrowserMainParts::PreMainMessageLoopRun() {
- cast_browser_process_->browser_context());
- #endif
-
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE)
- wayland_server_controller_ =
- std::make_unique<WaylandServerController>(window_manager_.get());
- #endif
-@@ -822,7 +822,7 @@ void CastBrowserMainParts::PostMainMessageLoopRun() {
-
- cast_browser_process_->cast_service()->Stop();
-
--#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(USE_OZONE)
-+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(USE_OZONE)
- wayland_server_controller_.reset();
- #endif
- #if BUILDFLAG(ENABLE_CHROMECAST_EXTENSIONS)
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 57484e1e13f9..f70a32aef06a 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-06-17 14:20:10 UTC
+--- chromecast/renderer/cast_content_renderer_client.cc.orig 2022-07-22 17:30:31 UTC
+++ chromecast/renderer/cast_content_renderer_client.cc
-@@ -190,7 +190,7 @@ void CastContentRendererClient::RenderFrameCreated(
+@@ -191,7 +191,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
index deb1e3ffd6fb..f2e1fd2a6794 100644
--- 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
@@ -1,6 +1,6 @@
---- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-06-17 14:20:10 UTC
+--- components/autofill_assistant/browser/autofill_assistant_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ components/autofill_assistant/browser/autofill_assistant_impl.cc
-@@ -113,7 +113,7 @@ void AutofillAssistantImpl::GetCapabilitiesByHashPrefi
+@@ -121,7 +121,7 @@ void AutofillAssistantImpl::GetCapabilitiesByHashPrefi
client_context.set_platform_type(ClientContextProto::PLATFORM_TYPE_ANDROID);
#endif
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC) || \
diff --git a/www/chromium/files/patch-components_autofill__payments__strings.grdp b/www/chromium/files/patch-components_autofill__payments__strings.grdp
index 35d6cf55921f..918a7001fc8b 100644
--- a/www/chromium/files/patch-components_autofill__payments__strings.grdp
+++ b/www/chromium/files/patch-components_autofill__payments__strings.grdp
@@ -1,11 +1,11 @@
---- components/autofill_payments_strings.grdp.orig 2022-06-17 14:20:10 UTC
+--- components/autofill_payments_strings.grdp.orig 2022-07-22 17:30:31 UTC
+++ components/autofill_payments_strings.grdp
@@ -127,7 +127,7 @@
<message name="IDS_AUTOFILL_FIX_FLOW_PROMPT_SAVE_CARD_LABEL" desc="Text to show on the button to save the card to Google when the fix flow dialog is shown after the Autofill save card prompt." formatter_data="android_java">
Save card
</message>
-- <if expr="is_linux and not chromeos_ash">
-+ <if expr="is_posix and not chromeos_ash">
+- <if expr="is_linux">
++ <if expr="is_posix">
<then>
<message name="IDS_AUTOFILL_SAVE_CARD_PROMPT_TITLE_TO_CLOUD" desc="Title text for the Autofill save card prompt when the card is to be saved by uploading it to Google Payments and also saved locally. The prompt can be either a bubble or an infobar.">
Do you want to save this card to your Google Account?
diff --git a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
index b3d0ac86f391..c55baf840559 100644
--- a/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
+++ b/www/chromium/files/patch-components_autofill_core_browser_personal__data__manager.cc
@@ -1,6 +1,6 @@
---- components/autofill/core/browser/personal_data_manager.cc.orig 2022-05-19 14:06:27 UTC
+--- components/autofill/core/browser/personal_data_manager.cc.orig 2022-07-22 17:30:31 UTC
+++ components/autofill/core/browser/personal_data_manager.cc
-@@ -1975,7 +1975,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
+@@ -1983,7 +1983,8 @@ bool PersonalDataManager::ShouldShowCardsFromAccountOp
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/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 a758e7a15a79..7903ec7d423a 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-06-17 14:20:10 UTC
+--- components/autofill/core/common/autofill_payments_features.cc.orig 2022-07-22 17:30:31 UTC
+++ components/autofill/core/common/autofill_payments_features.cc
-@@ -227,7 +227,7 @@ const base::FeatureParam<int>
+@@ -223,7 +223,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_components__chromium__strings.grd b/www/chromium/files/patch-components_components__chromium__strings.grd
index cb9930716629..d88e2bafa1a4 100644
--- a/www/chromium/files/patch-components_components__chromium__strings.grd
+++ b/www/chromium/files/patch-components_components__chromium__strings.grd
@@ -1,11 +1,11 @@
---- components/components_chromium_strings.grd.orig 2022-05-19 14:06:27 UTC
+--- components/components_chromium_strings.grd.orig 2022-07-22 17:30:31 UTC
+++ components/components_chromium_strings.grd
-@@ -224,7 +224,7 @@
+@@ -223,7 +223,7 @@
+ </message>
</if>
<!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
- <!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash and not chromeos_lacros` once fixed. -->
-- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- <if expr="is_linux">
++ <if expr="is_posix">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
Go to
the Chromium menu &gt;
diff --git a/www/chromium/files/patch-components_components__google__chrome__strings.grd b/www/chromium/files/patch-components_components__google__chrome__strings.grd
index 6e617fe72157..779ac3540136 100644
--- a/www/chromium/files/patch-components_components__google__chrome__strings.grd
+++ b/www/chromium/files/patch-components_components__google__chrome__strings.grd
@@ -1,11 +1,11 @@
---- components/components_google_chrome_strings.grd.orig 2022-05-19 14:06:27 UTC
+--- components/components_google_chrome_strings.grd.orig 2022-07-22 17:30:31 UTC
+++ components/components_google_chrome_strings.grd
-@@ -231,7 +231,7 @@
+@@ -230,7 +230,7 @@
+ </message>
</if>
<!-- The ChromeOS version of this string is defined in //components/error_page_strings.grdp. -->
- <!-- TODO(crbug.com/1307455): Remove ` and not chromeos_ash and not chromeos_lacros` once fixed. -->
-- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- <if expr="is_linux">
++ <if expr="is_posix">
<message name="IDS_ERRORPAGES_SUGGESTION_PROXY_DISABLE_PLATFORM" desc="Linux instructions for disabling use of a proxy server.">
Go to
the Chrome menu &gt;
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
index 76220f64241d..6413065ac7db 100644
--- a/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
+++ b/www/chromium/files/patch-components_feature__engagement_public_feature__configurations.cc
@@ -1,4 +1,4 @@
---- components/feature_engagement/public/feature_configurations.cc.orig 2022-05-19 14:06:27 UTC
+--- components/feature_engagement/public/feature_configurations.cc.orig 2022-07-22 17:30:31 UTC
+++ components/feature_engagement/public/feature_configurations.cc
@@ -35,7 +35,7 @@ FeatureConfig CreateAlwaysTriggerConfig(const base::Fe
absl::optional<FeatureConfig> GetClientSideFeatureConfig(
@@ -9,7 +9,7 @@
if (kIPHPasswordsAccountStorageFeature.name == feature->name) {
absl::optional<FeatureConfig> config = FeatureConfig();
config->valid = true;
-@@ -849,7 +849,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
+@@ -889,7 +889,8 @@ absl::optional<FeatureConfig> GetClientSideFeatureConf
#endif // BUILDFLAG(IS_ANDROID)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
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 15d3d2fe9c67..bdcff7224d75 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,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.cc.orig 2022-06-17 14:20:10 UTC
+--- components/feature_engagement/public/feature_constants.cc.orig 2022-07-22 17:30:31 UTC
+++ components/feature_engagement/public/feature_constants.cc
@@ -23,7 +23,7 @@ const base::Feature kIPHDummyFeature{"IPH_Dummy",
base::FEATURE_DISABLED_BY_DEFAULT};
@@ -9,7 +9,7 @@
const base::Feature kIPHDesktopSharedHighlightingFeature{
"IPH_DesktopSharedHighlighting", base::FEATURE_DISABLED_BY_DEFAULT};
const base::Feature kIPHDesktopTabGroupsNewGroupFeature{
-@@ -293,7 +293,7 @@ const base::Feature kIPHFollowWhileBrowsingFeature{
+@@ -298,7 +298,7 @@ const base::Feature kIPHFollowWhileBrowsingFeature{
"IPH_FollowWhileBrowsing", base::FEATURE_DISABLED_BY_DEFAULT};
#endif // BUILDFLAG(IS_IOS)
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 5a706daeca67..3a50e7f75ab7 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,4 +1,4 @@
---- components/feature_engagement/public/feature_constants.h.orig 2022-06-17 14:20:10 UTC
+--- components/feature_engagement/public/feature_constants.h.orig 2022-07-22 17:30:31 UTC
+++ components/feature_engagement/public/feature_constants.h
@@ -32,7 +32,7 @@ extern const base::Feature kIPHDummyFeature;
extern const base::Feature kEnableIPH;
@@ -9,7 +9,7 @@
extern const base::Feature kIPHDesktopSharedHighlightingFeature;
extern const base::Feature kIPHDesktopTabGroupsNewGroupFeature;
extern const base::Feature kIPHFocusHelpBubbleScreenReaderPromoFeature;
-@@ -178,7 +178,7 @@ extern const base::Feature kIPHPasswordSuggestionsFeat
+@@ -180,7 +180,7 @@ extern const base::Feature kIPHPasswordSuggestionsFeat
extern const base::Feature kIPHFollowWhileBrowsingFeature;
#endif // BUILDFLAG(IS_IOS)
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 5d99f4a6d541..26a4a21d51a2 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,6 +1,6 @@
---- components/feature_engagement/public/feature_list.cc.orig 2022-06-17 14:20:10 UTC
+--- components/feature_engagement/public/feature_list.cc.orig 2022-07-22 17:30:31 UTC
+++ components/feature_engagement/public/feature_list.cc
-@@ -121,7 +121,7 @@ const base::Feature* const kAllFeatures[] = {
+@@ -123,7 +123,7 @@ const base::Feature* const kAllFeatures[] = {
&kIPHFollowWhileBrowsingFeature,
#endif // BUILDFLAG(IS_IOS)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -9,7 +9,7 @@
&kIPHDesktopTabGroupsNewGroupFeature,
&kIPHFocusHelpBubbleScreenReaderPromoFeature,
&kIPHGMCCastStartStopFeature,
-@@ -143,7 +143,8 @@ const base::Feature* const kAllFeatures[] = {
+@@ -145,7 +145,8 @@ const base::Feature* const kAllFeatures[] = {
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-components_feature__engagement_public_feature__list.h b/www/chromium/files/patch-components_feature__engagement_public_feature__list.h
index f62d8c0d1d20..3984de4f52dc 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-06-17 14:20:10 UTC
+--- components/feature_engagement/public/feature_list.h.orig 2022-07-22 17:30:31 UTC
+++ components/feature_engagement/public/feature_list.h
-@@ -225,7 +225,7 @@ DEFINE_VARIATION_PARAM(kIPHFollowWhileBrowsingFeature,
+@@ -228,7 +228,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");
-@@ -254,7 +254,8 @@ DEFINE_VARIATION_PARAM(kIPHIntentChipFeature, "IPH_Int
+@@ -257,7 +257,8 @@ DEFINE_VARIATION_PARAM(kIPHIntentChipFeature, "IPH_Int
// BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_FUCHSIA)
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
@@ -19,7 +19,7 @@
DEFINE_VARIATION_PARAM(kIPHAutofillVirtualCardSuggestionFeature,
"IPH_AutofillVirtualCardSuggestion");
#endif // BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) ||
-@@ -360,7 +361,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -364,7 +365,7 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
VARIATION_ENTRY(kIPHPasswordSuggestionsFeature),
VARIATION_ENTRY(kIPHFollowWhileBrowsingFeature),
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
@@ -28,7 +28,7 @@
VARIATION_ENTRY(kIPHDesktopTabGroupsNewGroupFeature),
VARIATION_ENTRY(kIPHFocusModeFeature),
VARIATION_ENTRY(kIPHGlobalMediaControls),
-@@ -383,7 +384,8 @@ constexpr flags_ui::FeatureEntry::FeatureVariation
+@@ -387,7 +388,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_flags__ui_flags__state.cc b/www/chromium/files/patch-components_flags__ui_flags__state.cc
index 1bb08041928c..cd97ff23d6fc 100644
--- a/www/chromium/files/patch-components_flags__ui_flags__state.cc
+++ b/www/chromium/files/patch-components_flags__ui_flags__state.cc
@@ -1,6 +1,6 @@
---- components/flags_ui/flags_state.cc.orig 2022-06-17 14:20:10 UTC
+--- components/flags_ui/flags_state.cc.orig 2022-07-22 17:30:31 UTC
+++ components/flags_ui/flags_state.cc
-@@ -624,7 +624,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
+@@ -672,7 +672,7 @@ unsigned short FlagsState::GetCurrentPlatform() {
return kOsCrOS;
#elif BUILDFLAG(IS_CHROMEOS_LACROS)
return kOsLacros;
diff --git a/www/chromium/files/patch-components_live__caption_caption__util.cc b/www/chromium/files/patch-components_live__caption_caption__util.cc
index 44520d9e7302..4f676dab69e8 100644
--- a/www/chromium/files/patch-components_live__caption_caption__util.cc
+++ b/www/chromium/files/patch-components_live__caption_caption__util.cc
@@ -1,6 +1,6 @@
---- components/live_caption/caption_util.cc.orig 2022-05-19 14:06:27 UTC
+--- components/live_caption/caption_util.cc.orig 2022-07-22 17:30:31 UTC
+++ components/live_caption/caption_util.cc
-@@ -142,7 +142,7 @@ bool IsLiveCaptionFeatureSupported() {
+@@ -140,7 +140,7 @@ bool IsLiveCaptionFeatureSupported() {
return false;
#endif
diff --git a/www/chromium/files/patch-components_neterror_resources_neterror.js b/www/chromium/files/patch-components_neterror_resources_neterror.js
index eaf8aa01bb6b..a2e3f1732075 100644
--- a/www/chromium/files/patch-components_neterror_resources_neterror.js
+++ b/www/chromium/files/patch-components_neterror_resources_neterror.js
@@ -1,11 +1,11 @@
---- components/neterror/resources/neterror.js.orig 2021-12-14 11:45:03 UTC
+--- components/neterror/resources/neterror.js.orig 2022-07-22 17:30:31 UTC
+++ components/neterror/resources/neterror.js
-@@ -129,7 +129,7 @@ function detailsButtonClick() {
- }
+@@ -130,7 +130,7 @@ function detailsButtonClick() {
let primaryControlOnLeft = true;
--// <if expr="is_macosx or is_ios or is_linux or is_android">
-+// <if expr="is_macosx or is_ios or is_linux or is_android or is_bsd">
+ // clang-format off
+-// <if expr="is_macosx or is_ios or is_linux or chromeos_ash or chromeos_lacros or is_android">
++// <if expr="is_macosx or is_ios or is_bsd or chromeos_ash or chromeos_lacros or is_android">
+ // clang-format on
primaryControlOnLeft = false;
// </if>
-
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 151940bea908..321df4cb8adb 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-06-17 14:20:10 UTC
+--- components/network_session_configurator/browser/network_session_configurator.cc.orig 2022-07-22 17:30:31 UTC
+++ components/network_session_configurator/browser/network_session_configurator.cc
-@@ -823,7 +823,7 @@ net::URLRequestContextBuilder::HttpCacheParams::Type C
+@@ -824,7 +824,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 f542cf9e6e33..18940d11e041 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-06-17 14:20:10 UTC
+--- components/network_session_configurator/browser/network_session_configurator_unittest.cc.orig 2022-07-22 17:30:31 UTC
+++ components/network_session_configurator/browser/network_session_configurator_unittest.cc
-@@ -832,7 +832,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
+@@ -833,7 +833,7 @@ TEST_F(NetworkSessionConfiguratorTest, HostRules) {
}
TEST_F(NetworkSessionConfiguratorTest, DefaultCacheBackend) {
diff --git a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
index 9a5e50653897..e781a06fe05c 100644
--- a/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
+++ b/www/chromium/files/patch-components_new__or__sad__tab__strings.grdp
@@ -1,11 +1,11 @@
---- components/new_or_sad_tab_strings.grdp.orig 2022-05-19 14:06:27 UTC
+--- components/new_or_sad_tab_strings.grdp.orig 2022-07-22 17:30:31 UTC
+++ components/new_or_sad_tab_strings.grdp
@@ -66,7 +66,7 @@
Close other tabs or apps
</message>
</if>
-- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- <if expr="is_linux">
++ <if expr="is_posix">
<message name="IDS_SAD_TAB_RELOAD_CLOSE_TABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other Chrome tabs or programs running on their computer.">
Close other tabs or programs
</message>
@@ -13,8 +13,8 @@
Close other apps
</message>
</if>
-- <if expr="is_linux and not chromeos_ash and not chromeos_lacros">
-+ <if expr="is_posix and not chromeos_ash and not chromeos_lacros">
+- <if expr="is_linux">
++ <if expr="is_posix">
<message name="IDS_SAD_TAB_RELOAD_CLOSE_NOTABS" desc="One of the bullet points displayed on the web page if a reload failed to fix the issue, advising the user to close other programs running on their computer (Linux).">
Close other programs
</message>
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 5ea36009e617..46c6f7a3d8d4 100644
--- a/www/chromium/files/patch-components_os__crypt_os__crypt.h
+++ b/www/chromium/files/patch-components_os__crypt_os__crypt.h
@@ -1,4 +1,4 @@
---- components/os_crypt/os_crypt.h.orig 2022-06-17 14:20:10 UTC
+--- components/os_crypt/os_crypt.h.orig 2022-07-22 17:30:31 UTC
+++ components/os_crypt/os_crypt.h
@@ -15,7 +15,7 @@
#include "build/build_config.h"
@@ -31,8 +31,8 @@
COMPONENT_EXPORT(OS_CRYPT) void SetLegacyEncryptionForTesting(bool legacy);
COMPONENT_EXPORT(OS_CRYPT) void ResetStateForTesting();
#endif // BUILDFLAG(IS_WIN)
--#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
-+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST))
+-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
COMPONENT_EXPORT(OS_CRYPT)
void UseMockKeyStorageForTesting(
base::OnceCallback<std::unique_ptr<KeyStorageLinux>()>
@@ -49,8 +49,8 @@
void ResetStateForTesting();
#endif
--#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
-+#if ((BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CHROMECAST))
+-#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
++#if (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
// For unit testing purposes, inject methods to be used.
// |storage_provider_factory| provides the desired |KeyStorage|
// implementation. If the provider returns |nullptr|, a hardcoded password
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 3dec4797afa5..1bcd9337f5c7 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-06-17 14:20:10 UTC
+--- components/password_manager/core/browser/login_database.cc.orig 2022-07-22 17:30:31 UTC
+++ components/password_manager/core/browser/login_database.cc
-@@ -699,7 +699,7 @@ std::string GeneratePlaceholders(size_t count) {
+@@ -731,7 +731,7 @@ std::string GeneratePlaceholders(size_t count) {
return result;
}
@@ -9,7 +9,7 @@
// Fills |form| with necessary data required to be removed from the database
// and returns it.
PasswordForm GetFormForRemoval(sql::Statement& statement) {
-@@ -716,7 +716,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
+@@ -748,7 +748,7 @@ PasswordForm GetFormForRemoval(sql::Statement& stateme
// Whether we should try to return the decryptable passwords while the
// encryption service fails for some passwords.
bool ShouldReturnPartialPasswords() {
@@ -18,7 +18,7 @@
return base::FeatureList::IsEnabled(features::kSkipUndecryptablePasswords);
#else
return false;
-@@ -1545,7 +1545,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
+@@ -1577,7 +1577,7 @@ bool LoginDatabase::DeleteAndRecreateDatabaseFile() {
}
DatabaseCleanupResult LoginDatabase::DeleteUndecryptableLogins() {
diff --git a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
index d19ad10e6ae4..2593cb6b6e82 100644
--- a/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
+++ b/www/chromium/files/patch-components_password__manager_core_browser_login__database__unittest.cc
@@ -1,11 +1,11 @@
---- components/password_manager/core/browser/login_database_unittest.cc.orig 2022-04-21 18:48:31 UTC
+--- components/password_manager/core/browser/login_database_unittest.cc.orig 2022-07-22 17:30:31 UTC
+++ components/password_manager/core/browser/login_database_unittest.cc
@@ -2092,7 +2092,7 @@ TEST_F(LoginDatabaseUndecryptableLoginsTest, DeleteUnd
base::HistogramTester histogram_tester;
ASSERT_TRUE(db.Init());
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
// Make sure that we can't get any logins when database is corrupted.
// Disabling the checks in chromecast because encryption is unavailable.
std::vector<std::unique_ptr<PasswordForm>> result;
@@ -13,8 +13,8 @@
#endif
// Check histograms.
--#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST))
-+#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CHROMECAST)) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS))
++#if BUILDFLAG(IS_MAC) || (BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)) || BUILDFLAG(IS_BSD)
histogram_tester.ExpectUniqueSample("PasswordManager.CleanedUpPasswords", 2,
1);
histogram_tester.ExpectUniqueSample(
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 ba6673758771..ff5f63d24717 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-06-17 14:20:10 UTC
+--- components/password_manager/core/browser/sync/password_sync_bridge.cc.orig 2022-07-22 17:30:31 UTC
+++ components/password_manager/core/browser/sync/password_sync_bridge.cc
-@@ -153,7 +153,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -157,7 +157,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
-@@ -162,7 +162,7 @@ bool ShouldRecoverPasswordsDuringMerge() {
+@@ -166,7 +166,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 0a7de79656e1..cd21cf8a64f7 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-06-17 14:20:10 UTC
+--- components/password_manager/core/common/password_manager_features.cc.orig 2022-07-22 17:30:31 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 = {
-@@ -152,7 +152,7 @@ const base::Feature kRecoverFromNeverSaveAndroid = {
+@@ -164,7 +164,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 = {
-@@ -169,7 +169,7 @@ const base::Feature kSupportForAddPasswordsInSettings
- "SupportForAddPasswordsInSettings", base::FEATURE_DISABLED_BY_DEFAULT};
- #endif
+@@ -176,7 +176,7 @@ const base::Feature kSkipUndecryptablePasswords = {
+ const base::Feature kSupportForAddPasswordsInSettings = {
+ "SupportForAddPasswordsInSettings", base::FEATURE_ENABLED_BY_DEFAULT};
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
diff --git a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
index 548ec7b00afc..c1ca462e09da 100644
--- a/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
+++ b/www/chromium/files/patch-components_password__manager_core_common_password__manager__features.h
@@ -1,4 +1,4 @@
---- components/password_manager/core/common/password_manager_features.h.orig 2022-05-19 14:06:27 UTC
+--- components/password_manager/core/common/password_manager_features.h.orig 2022-07-22 17:30:31 UTC
+++ components/password_manager/core/common/password_manager_features.h
@@ -31,7 +31,7 @@ extern const base::Feature KEnablePasswordGenerationFo
extern const base::Feature kEnablePasswordManagerWithinFencedFrame;
@@ -9,7 +9,7 @@
extern const base::Feature kForceInitialSyncWhenDecryptionFails;
#endif
extern const base::Feature kInferConfirmationPasswordField;
-@@ -50,11 +50,11 @@ extern const base::Feature kPasswordsAccountStorageRev
+@@ -51,11 +51,11 @@ extern const base::Feature kPasswordsAccountStorageRev
extern const base::Feature kPasswordScriptsFetching;
extern const base::Feature kRecoverFromNeverSaveAndroid;
extern const base::Feature kSecondaryServerFieldPredictions;
diff --git a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
index 06680693e265..2b1a3183decf 100644
--- a/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
+++ b/www/chromium/files/patch-components_policy_core_common_cloud_cloud__policy__util.cc
@@ -1,4 +1,4 @@
---- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-05-19 14:06:27 UTC
+--- components/policy/core/common/cloud/cloud_policy_util.cc.orig 2022-07-22 17:30:31 UTC
+++ components/policy/core/common/cloud/cloud_policy_util.cc
@@ -20,7 +20,7 @@
#endif
@@ -25,7 +25,7 @@
#include <utility>
#include "base/check.h"
-@@ -78,7 +82,7 @@ namespace em = enterprise_management;
+@@ -82,7 +86,7 @@ namespace em = enterprise_management;
std::string GetMachineName() {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
@@ -34,7 +34,7 @@
char hostname[HOST_NAME_MAX];
if (gethostname(hostname, HOST_NAME_MAX) == 0) // Success.
return hostname;
-@@ -136,7 +140,7 @@ std::string GetMachineName() {
+@@ -140,7 +144,7 @@ std::string GetMachineName() {
std::string GetOSVersion() {
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_APPLE) || \
@@ -43,12 +43,12 @@
return base::SysInfo::OperatingSystemVersion();
#elif BUILDFLAG(IS_WIN)
base::win::OSInfo::VersionNumber version_number =
-@@ -159,7 +163,7 @@ std::string GetOSArchitecture() {
+@@ -163,7 +167,7 @@ std::string GetOSArchitecture() {
}
std::string GetOSUsername() {
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_APPLE)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_BSD)
struct passwd* creds = getpwuid(getuid());
if (!creds || !creds->pw_name)
return std::string();
diff --git a/www/chromium/files/patch-components_policy_resources_policy__templates.json b/www/chromium/files/patch-components_policy_resources_policy__templates.json
index 4650aa2a3db9..da0949d31b26 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-06-17 14:20:10 UTC
+--- components/policy/resources/policy_templates.json.orig 2022-07-22 17:30:31 UTC
+++ components/policy/resources/policy_templates.json
-@@ -1437,7 +1437,7 @@
+@@ -1440,7 +1440,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,
-@@ -2565,7 +2565,7 @@
+@@ -2568,7 +2568,7 @@
'owners': ['file://remoting/OWNERS', 'jamiewalch@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -18,7 +18,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': False,
-@@ -4331,7 +4331,7 @@
+@@ -4334,7 +4334,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,
-@@ -4360,7 +4360,7 @@
+@@ -4363,7 +4363,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,
-@@ -5324,7 +5324,7 @@
+@@ -5327,7 +5327,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,
-@@ -5385,7 +5385,7 @@
+@@ -5388,7 +5388,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,
-@@ -5451,7 +5451,7 @@
+@@ -5454,7 +5454,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,
-@@ -10677,7 +10677,7 @@
+@@ -10680,7 +10680,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,
-@@ -10771,7 +10771,7 @@
+@@ -10774,7 +10774,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,
-@@ -12774,7 +12774,7 @@
+@@ -12777,7 +12777,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,
-@@ -13632,7 +13632,7 @@
+@@ -13635,7 +13635,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,
-@@ -20597,7 +20597,7 @@
+@@ -20602,7 +20602,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,
-@@ -20628,7 +20628,7 @@
+@@ -20633,7 +20633,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,
-@@ -20662,7 +20662,7 @@
+@@ -20667,7 +20667,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,
-@@ -21432,7 +21432,7 @@
+@@ -21437,7 +21437,7 @@
'owners': ['fbeaufort@chromium.org', 'beccahughes@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
@@ -135,7 +135,7 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -25706,7 +25706,7 @@
+@@ -25751,7 +25751,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,
-@@ -27050,7 +27050,7 @@ If this policy is left unset, privacy screen is disabl
+@@ -27095,7 +27095,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,
-@@ -27074,7 +27074,7 @@ If set to False, <ph name="PRODUCT_NAME">$1<ex>Google
+@@ -27119,7 +27119,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,
-@@ -28172,7 +28172,7 @@ If you disable this policy, web page scrolling to spec
+@@ -28217,7 +28217,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,
-@@ -29418,7 +29418,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
+@@ -29463,7 +29463,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
},
],
'default': True,
@@ -180,12 +180,12 @@
'features': {
'dynamic_refresh': True,
'per_profile': True,
-@@ -29551,7 +29551,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
+@@ -29596,7 +29596,7 @@ When this policy is set, <ph name="PRODUCT_OS_NAME">$2
'owners': ['mattm@chromium.org'],
'type': 'main',
'schema': { 'type': 'boolean' },
-- 'future_on': ['chrome.win', 'chrome.mac', 'chrome.linux'],
-+ 'future_on': ['chrome.win', 'chrome.mac', 'chrome.linux', 'chrome.openbsd', 'chrome.freebsd'],
+- 'supported_on': ['chrome.win:104-', 'chrome.mac:104-', 'chrome.linux:104-'],
++ 'supported_on': ['chrome.win:104-', 'chrome.mac:104-', 'chrome.linux:104-', 'chrome.openbsd:104-', 'chrome.freebsd:104-'],
'features': {
'dynamic_refresh': True,
'per_profile': True,
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 41f3c97311f9..ee0d7b2f0992 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,4 +1,4 @@
---- 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.orig 2022-07-22 17:30:31 UTC
+++ components/services/screen_ai/sandbox/screen_ai_sandbox_hook_linux.cc
@@ -36,6 +36,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
}
@@ -8,7 +8,7 @@
auto* instance = sandbox::policy::SandboxLinux::GetInstance();
std::vector<BrokerFilePermission> permissions{
-@@ -52,6 +53,7 @@ bool ScreenAIPreSandboxHook(sandbox::policy::SandboxLi
+@@ -59,6 +60,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_translate_core_browser_translate__prefs.cc b/www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc
deleted file mode 100644
index 55e7a54f3a04..000000000000
--- a/www/chromium/files/patch-components_translate_core_browser_translate__prefs.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- components/translate/core/browser/translate_prefs.cc.orig 2022-02-28 16:54:41 UTC
-+++ components/translate/core/browser/translate_prefs.cc
-@@ -905,7 +905,7 @@ bool TranslatePrefs::CanTranslateLanguage(
- bool TranslatePrefs::IsDetailedLanguageSettingsEnabled() {
- #if BUILDFLAG(IS_ANDROID)
- return base::FeatureList::IsEnabled(language::kDetailedLanguageSettings);
--#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX)
-+#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return base::FeatureList::IsEnabled(
- language::kDesktopDetailedLanguageSettings);
- #else
diff --git a/www/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 0bb456540868..b2576b2c3f7a 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-06-17 14:20:10 UTC
+--- components/viz/service/display_embedder/skia_output_surface_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ components/viz/service/display_embedder/skia_output_surface_impl.cc
-@@ -1145,7 +1145,7 @@ GrBackendFormat SkiaOutputSurfaceImpl::GetGrBackendFor
+@@ -1142,7 +1142,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 db81d3f41ab7..60a9b79b134d 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-06-17 14:20:10 UTC
+--- components/viz/service/display_embedder/software_output_surface.cc.orig 2022-07-22 17:30:31 UTC
+++ components/viz/service/display_embedder/software_output_surface.cc
-@@ -114,7 +114,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
+@@ -93,7 +93,7 @@ void SoftwareOutputSurface::SwapBuffersCallback(base::
now.SnappedToNextTick(refresh_timebase_, refresh_interval_) - now;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
if (needs_swap_size_notifications_)
client_->DidSwapWithSize(pixel_size);
#endif
-@@ -145,7 +145,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
+@@ -120,7 +120,7 @@ gfx::OverlayTransform SoftwareOutputSurface::GetDispla
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/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 d4e2a47f7605..fc2941684d49 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-06-17 14:20:10 UTC
+--- components/viz/service/display_embedder/software_output_surface.h.orig 2022-07-22 17:30:31 UTC
+++ components/viz/service/display_embedder/software_output_surface.h
-@@ -53,7 +53,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
+@@ -47,7 +47,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
gfx::OverlayTransform GetDisplayTransform() override;
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -9,7 +9,7 @@
void SetNeedsSwapSizeNotifications(
bool needs_swap_size_notifications) override;
#endif
-@@ -75,7 +75,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
+@@ -69,7 +69,7 @@ class VIZ_SERVICE_EXPORT SoftwareOutputSurface : publi
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
new file mode 100644
index 000000000000..7f2280fe28ea
--- /dev/null
+++ b/www/chromium/files/patch-components_viz_service_display_skia__renderer.cc
@@ -0,0 +1,11 @@
+--- components/viz/service/display/skia_renderer.cc.orig 2022-07-22 17:30:31 UTC
++++ components/viz/service/display/skia_renderer.cc
+@@ -1021,7 +1021,7 @@ void SkiaRenderer::ClearFramebuffer() {
+ if (current_frame()->current_render_pass->has_transparent_background) {
+ ClearCanvas(SkColorSetARGB(0, 0, 0, 0));
+ } else {
+-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX)
++#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ // On DEBUG builds, opaque render passes are cleared to blue
+ // to easily see regions that were not drawn on the screen.
+ // ClearCavas() call causes slight pixel difference, so linux-ref and
diff --git a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
index ca213c615d05..c701aae87550 100644
--- a/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
+++ b/www/chromium/files/patch-components_viz_service_frame__sinks_root__compositor__frame__sink__impl.cc
@@ -1,4 +1,4 @@
---- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ components/viz/service/frame_sinks/root_compositor_frame_sink_impl.cc
@@ -97,7 +97,7 @@ RootCompositorFrameSinkImpl::Create(
@@ -9,7 +9,7 @@
// For X11, we need notify client about swap completion after resizing, so the
// client can use it for synchronize with X11 WM.
output_surface->SetNeedsSwapSizeNotifications(true);
-@@ -581,7 +581,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
+@@ -579,7 +579,7 @@ void RootCompositorFrameSinkImpl::DisplayDidCompleteSw
display_client_->DidCompleteSwapWithSize(pixel_size);
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
diff --git a/www/chromium/files/patch-content_app_content__main__runner__impl.cc b/www/chromium/files/patch-content_app_content__main__runner__impl.cc
index 72c42f514b4f..9d293294cde9 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,4 +1,4 @@
---- content/app/content_main_runner_impl.cc.orig 2022-06-17 14:20:10 UTC
+--- content/app/content_main_runner_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ content/app/content_main_runner_impl.cc
@@ -128,13 +128,13 @@
#include "base/posix/global_descriptors.h"
@@ -27,7 +27,7 @@
#if BUILDFLAG(IS_ANDROID)
#include "base/system/sys_info.h"
#include "content/browser/android/battery_metrics.h"
-@@ -356,7 +360,7 @@ void InitializeZygoteSandboxForBrowserProcess(
+@@ -360,7 +364,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
-@@ -392,7 +396,7 @@ void PreloadLibraryCdms() {
+@@ -396,7 +400,7 @@ void PreloadLibraryCdms() {
}
#endif // BUILDFLAG(ENABLE_LIBRARY_CDMS)
@@ -45,7 +45,7 @@
void PreSandboxInit() {
// Pre-acquire resources needed by BoringSSL. See
// https://boringssl.googlesource.com/boringssl/+/HEAD/SANDBOXING.md
-@@ -408,6 +412,11 @@ void PreSandboxInit() {
+@@ -412,6 +416,11 @@ void PreSandboxInit() {
#endif
InitializeWebRtcModule();
@@ -57,7 +57,7 @@
// Set the android SkFontMgr for blink. We need to ensure this is done
// before the sandbox is initialized to allow the font manager to access
// font configuration files on disk.
-@@ -577,7 +586,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
+@@ -594,7 +603,7 @@ int NO_STACK_PROTECTOR RunZygote(ContentMainDelegate*
delegate->ZygoteStarting(&zygote_fork_delegates);
media::InitializeMediaLibrary();
@@ -66,7 +66,7 @@
PreSandboxInit();
#endif
-@@ -763,11 +772,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -783,11 +792,10 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
kFieldTrialDescriptor + base::GlobalDescriptors::kBaseDescriptor);
#endif // !BUILDFLAG(IS_ANDROID)
@@ -80,7 +80,7 @@
#endif // !BUILDFLAG(IS_WIN)
-@@ -944,6 +952,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
+@@ -964,6 +972,16 @@ int ContentMainRunnerImpl::Initialize(ContentMainParam
}
#endif
@@ -97,7 +97,7 @@
delegate_->SandboxInitialized(process_type);
#if BUILDFLAG(USE_ZYGOTE_HANDLE)
-@@ -999,7 +1017,7 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1021,7 +1039,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
-@@ -1032,6 +1050,11 @@ int NO_STACK_PROTECTOR ContentMainRunnerImpl::Run() {
+@@ -1054,6 +1072,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 0e0a5450823d..d9eff69f81e7 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-06-17 14:20:10 UTC
+--- content/browser/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ content/browser/BUILD.gn
-@@ -2407,6 +2407,13 @@ source_set("browser") {
+@@ -2419,6 +2419,13 @@ source_set("browser") {
]
}
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 c1f5f1ecd32f..7fe1499926cb 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-06-17 14:20:10 UTC
+--- content/browser/browser_main_loop.cc.orig 2022-07-22 17:30:31 UTC
+++ content/browser/browser_main_loop.cc
-@@ -243,6 +243,12 @@
+@@ -241,6 +241,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
-@@ -540,6 +546,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -524,6 +530,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
-@@ -567,7 +579,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -551,7 +563,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() <
-@@ -578,7 +590,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -562,7 +574,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 0f54c1724e7e..3d04caffdc6f 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,4 +1,4 @@
---- content/browser/child_process_launcher_helper_linux.cc.orig 2022-06-17 14:20:10 UTC
+--- content/browser/child_process_launcher_helper_linux.cc.orig 2022-07-22 17:30:31 UTC
+++ content/browser/child_process_launcher_helper_linux.cc
@@ -20,7 +20,9 @@
#include "content/public/common/result_codes.h"
@@ -13,7 +13,7 @@
@@ -74,6 +76,7 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
int* launch_result) {
*is_synchronous_launch = true;
-
+ Process process;
+#if !BUILDFLAG(IS_BSD)
ZygoteHandle zygote_handle =
base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kNoZygote)
@@ -26,22 +26,26 @@
if (handle) {
// It could be a renderer process or an utility process.
int oom_score = content::kMiscOomScore;
-@@ -96,13 +98,13 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
+@@ -96,15 +98,17 @@ ChildProcessLauncherHelper::LaunchProcessOnLauncherThr
oom_score = content::kLowestRendererOomScore;
ZygoteHostImpl::GetInstance()->AdjustRendererOOMScore(handle, oom_score);
}
-#endif
- Process process;
process.process = base::Process(handle);
process.zygote = zygote_handle;
- return process;
+ } else {
++#endif
+ process.process = base::LaunchProcess(*command_line(), options);
+ *launch_result = process.process.IsValid() ? LAUNCH_RESULT_SUCCESS
+ : LAUNCH_RESULT_FAILURE;
++#if !BUILDFLAG(IS_BSD)
}
+#endif
- Process process;
- process.process = base::LaunchProcess(*command_line(), options);
-@@ -120,10 +122,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
+ #if BUILDFLAG(IS_CHROMEOS)
+ if (GetProcessType() == switches::kRendererProcess) {
+@@ -124,10 +128,14 @@ ChildProcessTerminationInfo ChildProcessLauncherHelper
const ChildProcessLauncherHelper::Process& process,
bool known_dead) {
ChildProcessTerminationInfo info;
@@ -56,7 +60,7 @@
info.status = base::GetKnownDeadTerminationStatus(process.process.Handle(),
&info.exit_code);
} else {
-@@ -147,13 +153,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
+@@ -151,13 +159,17 @@ void ChildProcessLauncherHelper::ForceNormalProcessTer
DCHECK(CurrentlyOnProcessLauncherTaskRunner());
process.process.Terminate(RESULT_CODE_NORMAL_EXIT, false);
// On POSIX, we must additionally reap the child.
diff --git a/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc b/www/chromium/files/patch-content_browser_gpu_gpu__process__host.cc
index 660992a77dea..fe9f7a6a6fa7 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-06-17 14:20:10 UTC
+--- content/browser/gpu/gpu_process_host.cc.orig 2022-07-22 17:30:31 UTC
+++ content/browser/gpu/gpu_process_host.cc
-@@ -102,7 +102,7 @@
+@@ -101,7 +101,7 @@
#include "ui/ozone/public/ozone_switches.h"
#endif
@@ -9,7 +9,7 @@
#include "ui/gfx/switches.h"
#endif
-@@ -254,6 +254,7 @@ static const char* const kSwitchNames[] = {
+@@ -253,6 +253,7 @@ static const char* const kSwitchNames[] = {
switches::kEnableBackgroundThreadPool,
switches::kEnableGpuRasterization,
switches::kEnableLogging,
@@ -17,7 +17,7 @@
switches::kEnableDeJelly,
switches::kDeJellyScreenWidth,
switches::kDoubleBufferCompositing,
-@@ -290,7 +291,7 @@ static const char* const kSwitchNames[] = {
+@@ -286,7 +287,7 @@ static const char* const kSwitchNames[] = {
switches::kOzoneDumpFile,
switches::kDisableBufferBWCompression,
#endif
diff --git a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
index a58bbaf8cf9f..55cc6c74c2a8 100644
--- a/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
+++ b/www/chromium/files/patch-content_browser_renderer__host_delegated__frame__host.cc
@@ -1,6 +1,6 @@
---- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-04-21 18:48:31 UTC
+--- content/browser/renderer_host/delegated_frame_host.cc.orig 2022-07-22 17:30:31 UTC
+++ content/browser/renderer_host/delegated_frame_host.cc
-@@ -289,7 +289,7 @@ void DelegatedFrameHost::EmbedSurface(
+@@ -295,7 +295,7 @@ void DelegatedFrameHost::EmbedSurface(
if (!primary_surface_id ||
primary_surface_id->local_surface_id() != local_surface_id_) {
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 a712450c8147..e4dc45c1b621 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,4 +1,4 @@
---- 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.orig 2022-07-22 17:30:31 UTC
+++ content/browser/renderer_host/render_process_host_impl.cc
@@ -211,7 +211,7 @@
#include "third_party/blink/public/mojom/android_font_lookup/android_font_lookup.mojom.h"
@@ -27,7 +27,7 @@
if (auto font_receiver = receiver.As<font_service::mojom::FontService>()) {
ConnectToFontService(std::move(font_receiver));
return;
-@@ -3212,6 +3212,7 @@ void RenderProcessHostImpl::PropagateBrowserCommandLin
+@@ -3211,6 +3211,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 c7e7c39501b4..6f02871f63b0 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-06-17 14:20:10 UTC
+--- content/browser/renderer_host/render_process_host_impl.h.orig 2022-07-22 17:30:31 UTC
+++ content/browser/renderer_host/render_process_host_impl.h
-@@ -466,7 +466,7 @@ class CONTENT_EXPORT RenderProcessHostImpl
+@@ -470,7 +470,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 55f1ef78958f..dfd28e777fb7 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-06-17 14:20:10 UTC
+--- content/browser/renderer_host/render_widget_host_view_aura.cc.orig 2022-07-22 17:30:31 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())
-@@ -1583,7 +1583,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
+@@ -1579,7 +1579,7 @@ bool RenderWidgetHostViewAura::ShouldDoLearning() {
return GetTextInputManager() && GetTextInputManager()->should_do_learning();
}
@@ -27,7 +27,7 @@
bool RenderWidgetHostViewAura::SetCompositionFromExistingText(
const gfx::Range& range,
const std::vector<ui::ImeTextSpan>& ui_ime_text_spans) {
-@@ -2396,7 +2396,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
+@@ -2397,7 +2397,7 @@ bool RenderWidgetHostViewAura::NeedsInputGrab() {
}
bool RenderWidgetHostViewAura::NeedsMouseCapture() {
@@ -36,7 +36,7 @@
return NeedsInputGrab();
#else
return false;
-@@ -2573,7 +2573,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
+@@ -2574,7 +2574,7 @@ void RenderWidgetHostViewAura::ForwardKeyboardEventWit
if (!target_host)
return;
diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
index 3532116043be..6be4cb14061e 100644
--- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
+++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.cc
@@ -1,4 +1,4 @@
---- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-05-19 14:06:27 UTC
+--- content/browser/webui/web_ui_main_frame_observer.cc.orig 2022-07-22 17:30:31 UTC
+++ content/browser/webui/web_ui_main_frame_observer.cc
@@ -13,7 +13,7 @@
#include "content/public/browser/navigation_handle.h"
@@ -18,16 +18,16 @@
// Remove the pieces of the URL we don't want to send back with the error
// reports. In particular, do not send query or fragments as those can have
// privacy-sensitive information in them.
-@@ -67,7 +67,7 @@ void WebUIMainFrameObserver::DidFinishNavigation(
- web_ui_->DisallowJavascriptOnAllHandlers();
- }
+@@ -55,7 +55,7 @@ WebUIMainFrameObserver::WebUIMainFrameObserver(WebUIIm
+
+ WebUIMainFrameObserver::~WebUIMainFrameObserver() = default;
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
void WebUIMainFrameObserver::OnDidAddMessageToConsole(
RenderFrameHost* source_frame,
blink::mojom::ConsoleMessageLevel log_level,
-@@ -175,7 +175,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation(
+@@ -163,7 +163,7 @@ void WebUIMainFrameObserver::ReadyToCommitNavigation(
// TODO(crbug.com/1129544) This is currently disabled due to Windows DLL
// thunking issues. Fix & re-enable.
diff --git a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
index e9c4572d0519..20f198f06ca5 100644
--- a/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
+++ b/www/chromium/files/patch-content_browser_webui_web__ui__main__frame__observer.h
@@ -1,6 +1,6 @@
---- content/browser/webui/web_ui_main_frame_observer.h.orig 2022-02-28 16:54:41 UTC
+--- content/browser/webui/web_ui_main_frame_observer.h.orig 2022-07-22 17:30:31 UTC
+++ content/browser/webui/web_ui_main_frame_observer.h
-@@ -45,7 +45,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W
+@@ -44,7 +44,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W
// TODO(crbug.com/1129544) This is currently disabled due to Windows DLL
// thunking issues. Fix & re-enable.
@@ -9,7 +9,7 @@
// On official Google builds, capture and report JavaScript error messages on
// WebUI surfaces back to Google. This allows us to fix JavaScript errors and
// exceptions.
-@@ -61,7 +61,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W
+@@ -60,7 +60,7 @@ class CONTENT_EXPORT WebUIMainFrameObserver : public W
void ReadyToCommitNavigation(NavigationHandle* navigation_handle) override;
private:
diff --git a/www/chromium/files/patch-content_child_child__process.cc b/www/chromium/files/patch-content_child_child__process.cc
index 5026048a86d7..415ff4285227 100644
--- a/www/chromium/files/patch-content_child_child__process.cc
+++ b/www/chromium/files/patch-content_child_child__process.cc
@@ -1,6 +1,6 @@
---- content/child/child_process.cc.orig 2022-05-19 14:06:27 UTC
+--- content/child/child_process.cc.orig 2022-07-22 17:30:31 UTC
+++ content/child/child_process.cc
-@@ -68,7 +68,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr
+@@ -67,7 +67,7 @@ ChildProcess::ChildProcess(base::ThreadPriority io_thr
DCHECK(!g_lazy_child_process_tls.Pointer()->Get());
g_lazy_child_process_tls.Pointer()->Set(this);
diff --git a/www/chromium/files/patch-content_common_BUILD.gn b/www/chromium/files/patch-content_common_BUILD.gn
index abaa8142474d..f1fa7ceea492 100644
--- a/www/chromium/files/patch-content_common_BUILD.gn
+++ b/www/chromium/files/patch-content_common_BUILD.gn
@@ -1,6 +1,6 @@
---- content/common/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- content/common/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ content/common/BUILD.gn
-@@ -403,6 +403,9 @@ if (is_linux || is_chromeos) {
+@@ -402,6 +402,9 @@ if (is_linux || is_chromeos) {
public = [ "set_process_title_linux.h" ]
sources = [ "set_process_title_linux.cc" ]
deps = [ "//base" ]
diff --git a/www/chromium/files/patch-content_gpu_gpu__main.cc b/www/chromium/files/patch-content_gpu_gpu__main.cc
index c7c3757f1819..ab88635089ef 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-06-17 14:20:10 UTC
+--- content/gpu/gpu_main.cc.orig 2022-07-22 17:30:31 UTC
+++ content/gpu/gpu_main.cc
-@@ -88,7 +88,7 @@
+@@ -86,7 +86,7 @@
#include "sandbox/win/src/sandbox.h"
#endif
@@ -9,7 +9,7 @@
#include "content/gpu/gpu_sandbox_hook_linux.h"
#include "sandbox/policy/linux/sandbox_linux.h"
#include "sandbox/policy/sandbox_type.h"
-@@ -110,7 +110,7 @@ namespace content {
+@@ -108,7 +108,7 @@ namespace content {
namespace {
@@ -18,7 +18,7 @@
bool StartSandboxLinux(gpu::GpuWatchdogThread*,
const gpu::GPUInfo*,
const gpu::GpuPreferences&);
-@@ -172,7 +172,7 @@ class ContentSandboxHelper : public gpu::GpuSandboxHel
+@@ -170,7 +170,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_);
-@@ -268,7 +268,7 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -266,7 +266,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
-@@ -411,17 +411,19 @@ int GpuMain(MainFunctionParams parameters) {
+@@ -404,17 +404,19 @@ int GpuMain(MainFunctionParams parameters) {
namespace {
@@ -57,7 +57,7 @@
// SandboxLinux::InitializeSandbox() must always be called
// with only one thread.
-@@ -456,11 +458,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
+@@ -449,11 +451,13 @@ bool StartSandboxLinux(gpu::GpuWatchdogThread* watchdo
*base::CommandLine::ForCurrentProcess()),
base::BindOnce(GpuProcessPreSandboxHook), sandbox_options);
diff --git a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
index 6ed0a67dc944..3c19495edadf 100644
--- a/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
+++ b/www/chromium/files/patch-content_gpu_gpu__sandbox__hook__linux.cc
@@ -1,14 +1,14 @@
---- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-05-19 14:06:27 UTC
+--- content/gpu/gpu_sandbox_hook_linux.cc.orig 2022-07-22 17:30:31 UTC
+++ content/gpu/gpu_sandbox_hook_linux.cc
-@@ -104,6 +104,7 @@ static const char kLibV4lEncPluginPath[] =
-
- constexpr int dlopen_flag = RTLD_NOW | RTLD_GLOBAL | RTLD_NODELETE;
+@@ -114,6 +114,7 @@ void AddStandardChromeOsPermissions(
+ permissions->push_back(BrokerFilePermission::ReadOnly(kAngleGlesPath));
+ }
+#if !defined(OS_BSD)
void AddV4L2GpuPermissions(
std::vector<BrokerFilePermission>* permissions,
const sandbox::policy::SandboxSeccompBPF::Options& options) {
-@@ -420,8 +421,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
+@@ -431,8 +432,10 @@ std::vector<BrokerFilePermission> FilePermissionsForGp
AddStandardGpuPermissions(&permissions);
return permissions;
}
@@ -19,7 +19,7 @@
// Preload the Mali library.
if (UseChromecastSandboxAllowlist()) {
for (const char* path : kAllowedChromecastPaths) {
-@@ -463,6 +466,7 @@ void LoadArmGpuLibraries() {
+@@ -474,6 +477,7 @@ void LoadArmGpuLibraries() {
dlopen(driver_paths[i], dlopen_flag);
}
}
@@ -27,7 +27,7 @@
}
bool LoadAmdGpuLibraries() {
-@@ -528,12 +532,14 @@ void LoadV4L2Libraries(
+@@ -539,12 +543,14 @@ void LoadV4L2Libraries(
}
void LoadChromecastV4L2Libraries() {
@@ -42,7 +42,7 @@
}
bool LoadLibrariesForGpu(
-@@ -560,6 +566,7 @@ bool LoadLibrariesForGpu(
+@@ -571,6 +577,7 @@ bool LoadLibrariesForGpu(
return true;
}
@@ -50,7 +50,7 @@
sandbox::syscall_broker::BrokerCommandSet CommandSetForGPU(
const sandbox::policy::SandboxLinux::Options& options) {
sandbox::syscall_broker::BrokerCommandSet command_set;
-@@ -582,13 +589,17 @@ bool BrokerProcessPreSandboxHook(
+@@ -593,13 +600,17 @@ bool BrokerProcessPreSandboxHook(
SetProcessTitleFromCommandLine(nullptr);
return true;
}
diff --git a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
index 955acc89d457..49f8ee07eeb1 100644
--- a/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_ppapi__plugin_ppapi__blink__platform__impl.h
@@ -1,4 +1,4 @@
---- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-02-28 16:54:41 UTC
+--- content/ppapi_plugin/ppapi_blink_platform_impl.h.orig 2022-07-22 17:30:31 UTC
+++ content/ppapi_plugin/ppapi_blink_platform_impl.h
@@ -12,7 +12,7 @@
#include "build/build_config.h"
@@ -9,8 +9,8 @@
#include "components/services/font/public/cpp/font_loader.h"
#include "third_party/skia/include/core/SkRefCnt.h"
#endif
-@@ -39,11 +39,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
- blink::WebThemeEngine* ThemeEngine() override;
+@@ -38,11 +38,11 @@ class PpapiBlinkPlatformImpl : public BlinkPlatformImp
+ blink::WebString DefaultLocale() override;
private:
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_MAC)
diff --git a/www/chromium/files/patch-content_public_common_content__features.cc b/www/chromium/files/patch-content_public_common_content__features.cc
index 810c599221d1..c54655b82251 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-06-17 14:20:10 UTC
+--- content/public/common/content_features.cc.orig 2022-07-22 17:30:31 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
-@@ -1029,7 +1029,7 @@ const base::Feature kWebAssemblyBaseline{"WebAssemblyB
+@@ -1035,7 +1035,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.
-@@ -1059,7 +1059,7 @@ const base::Feature kWebAssemblyTiering{"WebAssemblyTi
+@@ -1071,7 +1071,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
-@@ -1140,7 +1140,11 @@ const base::Feature kWebUIReportOnlyTrustedTypes{
+@@ -1147,7 +1147,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 6576958c187c..a318696d7b6a 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-06-17 14:20:10 UTC
+--- content/public/common/content_features.h.orig 2022-07-22 17:30:31 UTC
+++ content/public/common/content_features.h
-@@ -257,7 +257,7 @@ CONTENT_EXPORT extern const base::Feature kV8VmFuture;
+@@ -259,7 +259,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 9a2153259489..7e743c1f4e24 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-06-17 14:20:10 UTC
+--- content/public/common/content_switches.cc.orig 2022-07-22 17:30:31 UTC
+++ content/public/common/content_switches.cc
-@@ -365,6 +365,8 @@ const char kEnableGpuMemoryBufferVideoFrames[] =
+@@ -369,6 +369,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.
-@@ -975,7 +977,7 @@ const char kEnableAutomation[] = "enable-automation";
+@@ -972,7 +974,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 e9d4d9f91b71..121b776fb5e6 100644
--- a/www/chromium/files/patch-content_public_common_content__switches.h
+++ b/www/chromium/files/patch-content_public_common_content__switches.h
@@ -1,6 +1,6 @@
---- content/public/common/content_switches.h.orig 2022-06-17 14:20:10 UTC
+--- content/public/common/content_switches.h.orig 2022-07-22 17:30:31 UTC
+++ content/public/common/content_switches.h
-@@ -117,6 +117,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu
+@@ -118,6 +118,7 @@ CONTENT_EXPORT extern const char kEnableBlinkTestFeatu
CONTENT_EXPORT extern const char kEnableGpuMemoryBufferVideoFrames[];
CONTENT_EXPORT extern const char kEnableLCDText[];
CONTENT_EXPORT extern const char kEnableLogging[];
@@ -8,7 +8,7 @@
CONTENT_EXPORT extern const char kEnableNetworkInformationDownlinkMax[];
CONTENT_EXPORT extern const char kEnableCanvas2DLayers[];
CONTENT_EXPORT extern const char kEnablePluginPlaceholderTesting[];
-@@ -264,7 +265,7 @@ CONTENT_EXPORT extern const char kRendererWaitForJavaD
+@@ -263,7 +264,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_public_test_mock__render__thread.cc b/www/chromium/files/patch-content_public_test_mock__render__thread.cc
index 443a588c56e2..18b5da418b1b 100644
--- a/www/chromium/files/patch-content_public_test_mock__render__thread.cc
+++ b/www/chromium/files/patch-content_public_test_mock__render__thread.cc
@@ -1,6 +1,6 @@
---- content/public/test/mock_render_thread.cc.orig 2022-02-28 16:54:41 UTC
+--- content/public/test/mock_render_thread.cc.orig 2022-07-22 17:30:31 UTC
+++ content/public/test/mock_render_thread.cc
-@@ -64,7 +64,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
+@@ -63,7 +63,7 @@ class MockRenderMessageFilterImpl : public mojom::Rend
std::move(callback).Run(false);
}
diff --git a/www/chromium/files/patch-content_renderer_render__process__impl.cc b/www/chromium/files/patch-content_renderer_render__process__impl.cc
index 89d3a847c717..582c59b45912 100644
--- a/www/chromium/files/patch-content_renderer_render__process__impl.cc
+++ b/www/chromium/files/patch-content_renderer_render__process__impl.cc
@@ -1,6 +1,6 @@
---- content/renderer/render_process_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- content/renderer/render_process_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ content/renderer/render_process_impl.cc
-@@ -47,7 +47,7 @@
+@@ -46,7 +46,7 @@
#if BUILDFLAG(IS_WIN)
#include "base/win/win_util.h"
#endif
@@ -9,7 +9,7 @@
#include "v8/include/v8-wasm-trap-handler-posix.h"
#endif
-@@ -146,7 +146,7 @@ RenderProcessImpl::RenderProcessImpl()
+@@ -138,7 +138,7 @@ RenderProcessImpl::RenderProcessImpl()
SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtection,
"--no-wasm-write-protect-code-memory");
@@ -18,9 +18,9 @@
SetV8FlagIfFeature(features::kWebAssemblyCodeProtectionPku,
"--wasm-memory-protection-keys");
SetV8FlagIfNotFeature(features::kWebAssemblyCodeProtectionPku,
-@@ -229,7 +229,7 @@ RenderProcessImpl::RenderProcessImpl()
- SetV8FlagIfNotFeature(features::kWebAssemblyDynamicTiering,
- "--no-wasm-dynamic-tiering");
+@@ -224,7 +224,7 @@ RenderProcessImpl::RenderProcessImpl()
+
+ v8::V8::SetFlagsFromString("--freeze-flags-after-init");
-#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)) && defined(ARCH_CPU_X86_64)
+#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)) && defined(ARCH_CPU_X86_64)
diff --git a/www/chromium/files/patch-content_renderer_render__thread__impl.cc b/www/chromium/files/patch-content_renderer_render__thread__impl.cc
index d90cb036286b..3ed21c265bec 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-06-17 14:20:10 UTC
+--- content/renderer/render_thread_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ content/renderer/render_thread_impl.cc
-@@ -190,7 +190,7 @@
+@@ -187,7 +187,7 @@
#if BUILDFLAG(IS_MAC)
#include <malloc/malloc.h>
@@ -9,7 +9,7 @@
#include <malloc.h>
#endif
-@@ -717,7 +717,7 @@ void RenderThreadImpl::Init() {
+@@ -669,7 +669,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(
-@@ -740,7 +740,7 @@ void RenderThreadImpl::Init() {
+@@ -692,7 +692,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(
-@@ -1099,7 +1099,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1039,7 +1039,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) &&
-@@ -1110,7 +1110,7 @@ media::GpuVideoAcceleratorFactories* RenderThreadImpl:
+@@ -1050,7 +1050,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 dca05fa29d81..cd7e92e4f28e 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,4 +1,4 @@
---- content/renderer/renderer_blink_platform_impl.cc.orig 2022-06-17 14:20:10 UTC
+--- content/renderer/renderer_blink_platform_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ content/renderer/renderer_blink_platform_impl.cc
@@ -110,7 +110,7 @@
@@ -27,7 +27,7 @@
if (sandboxEnabled()) {
#if BUILDFLAG(IS_MAC)
sandbox_support_ = std::make_unique<WebSandboxSupportMac>();
-@@ -284,7 +284,8 @@ RendererBlinkPlatformImpl::WrapSharedURLLoaderFactory(
+@@ -278,7 +278,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()) {
-@@ -299,7 +300,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
+@@ -293,7 +294,7 @@ blink::BlameContext* RendererBlinkPlatformImpl::GetTop
}
blink::WebSandboxSupport* RendererBlinkPlatformImpl::GetSandboxSupport() {
diff --git a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
index ec0508ae1454..1696ad00b92b 100644
--- a/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
+++ b/www/chromium/files/patch-content_renderer_renderer__blink__platform__impl.h
@@ -1,15 +1,15 @@
---- content/renderer/renderer_blink_platform_impl.h.orig 2022-03-25 21:59:56 UTC
+--- content/renderer/renderer_blink_platform_impl.h.orig 2022-07-22 17:30:31 UTC
+++ content/renderer/renderer_blink_platform_impl.h
-@@ -30,7 +30,7 @@
+@@ -29,7 +29,7 @@
+ #include "third_party/blink/public/common/user_agent/user_agent_metadata.h"
#include "third_party/blink/public/mojom/cache_storage/cache_storage.mojom.h"
- #include "third_party/blink/public/mojom/loader/code_cache.mojom.h"
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
#include "components/services/font/public/cpp/font_loader.h" // nogncheck
#include "third_party/skia/include/core/SkRefCnt.h" // nogncheck
#endif
-@@ -276,7 +276,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -253,7 +253,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
void Collect3DContextInformation(blink::Platform::GraphicsInfo* gl_info,
const gpu::GPUInfo& gpu_info) const;
@@ -18,7 +18,7 @@
std::unique_ptr<blink::WebSandboxSupport> sandbox_support_;
#endif
-@@ -304,7 +304,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
+@@ -275,7 +275,7 @@ class CONTENT_EXPORT RendererBlinkPlatformImpl : publi
mutable base::WaitableEvent io_thread_id_ready_event_;
base::PlatformThreadId io_thread_id_ = base::kInvalidThreadId;
diff --git a/www/chromium/files/patch-content_shell_BUILD.gn b/www/chromium/files/patch-content_shell_BUILD.gn
index 2e72e582baab..8abb1411df77 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-06-17 14:20:10 UTC
+--- content/shell/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ content/shell/BUILD.gn
-@@ -879,7 +879,7 @@ group("content_shell_crash_test") {
+@@ -880,7 +880,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_test_BUILD.gn b/www/chromium/files/patch-content_test_BUILD.gn
index 434f6b6e977c..c635fb7ee1aa 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-06-17 14:20:10 UTC
+--- content/test/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ content/test/BUILD.gn
-@@ -1955,7 +1955,7 @@ static_library("run_all_unittests") {
+@@ -2025,7 +2025,7 @@ static_library("run_all_unittests") {
":test_support",
"//base/test:test_support",
]
@@ -9,7 +9,7 @@
deps += [ "//content/common:set_process_title_linux" ]
}
}
-@@ -2917,7 +2917,7 @@ test("content_unittests") {
+@@ -2994,7 +2994,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 7c22404390f0..52ef008f17cc 100644
--- a/www/chromium/files/patch-content_utility_services.cc
+++ b/www/chromium/files/patch-content_utility_services.cc
@@ -1,6 +1,6 @@
---- content/utility/services.cc.orig 2022-06-17 14:20:10 UTC
+--- content/utility/services.cc.orig 2022-07-22 17:30:31 UTC
+++ content/utility/services.cc
-@@ -67,7 +67,7 @@
+@@ -63,7 +63,7 @@
extern sandbox::TargetServices* g_utility_target_services;
#endif // BUILDFLAG(IS_WIN)
@@ -9,7 +9,7 @@
#include "sandbox/linux/services/libc_interceptor.h"
#include "sandbox/policy/mojom/sandbox.mojom.h"
#include "sandbox/policy/sandbox_type.h"
-@@ -89,7 +89,7 @@ extern sandbox::TargetServices* g_utility_target_servi
+@@ -85,7 +85,7 @@ extern sandbox::TargetServices* g_utility_target_servi
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
@@ -18,7 +18,7 @@
(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
+@@ -198,7 +198,7 @@ auto RunAudio(mojo::PendingReceiver<audio::mojom::Audi
<< "task_policy_set TASK_QOS_POLICY";
#endif
@@ -27,7 +27,7 @@
auto* command_line = base::CommandLine::ForCurrentProcess();
if (sandbox::policy::SandboxTypeFromCommandLine(*command_line) ==
sandbox::mojom::Sandbox::kNoSandbox) {
-@@ -300,7 +300,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
+@@ -288,7 +288,7 @@ auto RunOOPArcVideoAcceleratorFactoryService(
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
@@ -36,7 +36,7 @@
(BUILDFLAG(USE_VAAPI) || BUILDFLAG(USE_V4L2_CODEC))
auto RunStableVideoDecoderFactoryService(
mojo::PendingReceiver<media::stable::mojom::StableVideoDecoderFactory>
-@@ -354,7 +354,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
+@@ -342,7 +342,7 @@ void RegisterMainThreadServices(mojo::ServiceFactory&
#endif // BUILDFLAG(IS_CHROMEOS_ASH) && (BUILDFLAG(USE_VAAPI) ||
// BUILDFLAG(USE_V4L2_CODEC))
diff --git a/www/chromium/files/patch-content_utility_utility__main.cc b/www/chromium/files/patch-content_utility_utility__main.cc
index c28b1490a69a..40d5204bcd3e 100644
--- a/www/chromium/files/patch-content_utility_utility__main.cc
+++ b/www/chromium/files/patch-content_utility_utility__main.cc
@@ -1,4 +1,4 @@
---- content/utility/utility_main.cc.orig 2022-06-17 14:20:10 UTC
+--- content/utility/utility_main.cc.orig 2022-07-22 17:30:31 UTC
+++ content/utility/utility_main.cc
@@ -31,17 +31,19 @@
#include "third_party/icu/source/common/unicode/unistr.h"
@@ -32,7 +32,7 @@
+
#if BUILDFLAG(IS_CHROMEOS_ASH)
#include "ash/services/ime/ime_sandbox_hook.h"
- #include "chromeos/assistant/buildflags.h"
+ #include "chromeos/ash/components/assistant/buildflags.h"
@@ -129,7 +135,7 @@ int UtilityMain(MainFunctionParams parameters) {
}
}
diff --git a/www/chromium/files/patch-device_bluetooth_bluetooth__adapter.cc b/www/chromium/files/patch-device_bluetooth_bluetooth__adapter.cc
new file mode 100644
index 000000000000..7c56e7a42afc
--- /dev/null
+++ b/www/chromium/files/patch-device_bluetooth_bluetooth__adapter.cc
@@ -0,0 +1,11 @@
+--- device/bluetooth/bluetooth_adapter.cc.orig 2022-07-28 06:05:58 UTC
++++ device/bluetooth/bluetooth_adapter.cc
+@@ -32,7 +32,7 @@ BluetoothAdapter::ServiceOptions::ServiceOptions() = d
+ BluetoothAdapter::ServiceOptions::~ServiceOptions() = default;
+
+ #if !BUILDFLAG(IS_ANDROID) && !BUILDFLAG(IS_CHROMEOS) && !BUILDFLAG(IS_MAC) && \
+- !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX)
++ !BUILDFLAG(IS_WIN) && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ // static
+ scoped_refptr<BluetoothAdapter> BluetoothAdapter::CreateAdapter() {
+ return nullptr;
diff --git a/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni b/www/chromium/files/patch-device_bluetooth_cast__bluetooth.gni
index febddef647a9..13d396c003b1 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 2022-06-17 14:20:10 UTC
+--- device/bluetooth/cast_bluetooth.gni.orig 2022-07-22 17:30:31 UTC
+++ device/bluetooth/cast_bluetooth.gni
@@ -2,5 +2,5 @@ import("//build/config/features.gni")
declare_args() {
force_cast_bluetooth = false
-- use_bluez = (is_linux || is_chromeos) && !is_castos
+- use_bluez = (is_linux && !is_castos) || is_chromeos
+ use_bluez = use_dbus && !is_bsd
}
diff --git a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
index f10bd9435db8..b46656cec5ba 100644
--- a/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
+++ b/www/chromium/files/patch-extensions_browser_api_messaging_message__service.cc
@@ -1,4 +1,4 @@
---- extensions/browser/api/messaging/message_service.cc.orig 2022-03-25 21:59:56 UTC
+--- extensions/browser/api/messaging/message_service.cc.orig 2022-07-22 17:30:31 UTC
+++ extensions/browser/api/messaging/message_service.cc
@@ -74,7 +74,7 @@ namespace {
const char kReceivingEndDoesntExistError[] =
@@ -9,7 +9,7 @@
const char kMissingPermissionError[] =
"Access to native messaging requires nativeMessaging permission.";
const char kProhibitedByPoliciesError[] =
-@@ -447,7 +447,7 @@ void MessageService::OpenChannelToNativeApp(
+@@ -437,7 +437,7 @@ void MessageService::OpenChannelToNativeApp(
return;
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || \
diff --git a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
index 14a81f209f24..a8264f040565 100644
--- a/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
+++ b/www/chromium/files/patch-extensions_browser_api_networking__private_networking__private__delegate__factory.cc
@@ -1,20 +1,20 @@
---- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2022-02-28 16:54:41 UTC
+--- extensions/browser/api/networking_private/networking_private_delegate_factory.cc.orig 2022-07-22 17:30:31 UTC
+++ extensions/browser/api/networking_private/networking_private_delegate_factory.cc
-@@ -12,7 +12,7 @@
-
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -14,7 +14,7 @@
#include "extensions/browser/api/networking_private/networking_private_chromeos.h"
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #elif BUILDFLAG(IS_CHROMEOS_LACROS)
+ #include "extensions/browser/api/networking_private/networking_private_lacros.h"
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
#include "extensions/browser/api/networking_private/networking_private_linux.h"
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
#include "components/wifi/wifi_service.h"
-@@ -62,7 +62,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
- NetworkingPrivateDelegate* delegate;
- #if BUILDFLAG(IS_CHROMEOS_ASH)
+@@ -66,7 +66,7 @@ KeyedService* NetworkingPrivateDelegateFactory::BuildS
delegate = new NetworkingPrivateChromeOS(browser_context);
--#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+ #elif BUILDFLAG(IS_CHROMEOS_LACROS)
+ delegate = new NetworkingPrivateLacros(browser_context);
+-#elif BUILDFLAG(IS_LINUX)
++#elif BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
delegate = new NetworkingPrivateLinux();
#elif BUILDFLAG(IS_WIN) || BUILDFLAG(IS_MAC)
std::unique_ptr<wifi::WiFiService> wifi_service(wifi::WiFiService::Create());
diff --git a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
index 24266e335de2..f9658546a82c 100644
--- a/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
+++ b/www/chromium/files/patch-extensions_browser_browser__context__keyed__service__factories.cc
@@ -1,6 +1,6 @@
---- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-03-25 21:59:56 UTC
+--- extensions/browser/browser_context_keyed_service_factories.cc.orig 2022-07-22 17:30:31 UTC
+++ extensions/browser/browser_context_keyed_service_factories.cc
-@@ -89,7 +89,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
+@@ -88,7 +88,7 @@ void EnsureBrowserContextKeyedServiceFactoriesBuilt()
IdleManagerFactory::GetInstance();
ManagementAPI::GetFactoryInstance();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_WIN) || \
diff --git a/www/chromium/files/patch-extensions_common_api___permission__features.json b/www/chromium/files/patch-extensions_common_api___permission__features.json
index a5d8edf8fdba..bb7d227d3afc 100644
--- a/www/chromium/files/patch-extensions_common_api___permission__features.json
+++ b/www/chromium/files/patch-extensions_common_api___permission__features.json
@@ -1,11 +1,11 @@
---- extensions/common/api/_permission_features.json.orig 2022-05-19 14:06:27 UTC
+--- extensions/common/api/_permission_features.json.orig 2022-07-22 17:30:31 UTC
+++ extensions/common/api/_permission_features.json
@@ -140,7 +140,7 @@
{
"channel": "stable",
"extension_types": ["platform_app"],
- "platforms": ["chromeos", "win", "mac", "linux"],
-+ "platforms": ["chromeos", "win", "mac", "linux", "openbsd"],
++ "platforms": ["chromeos", "win", "mac", "linux", "openbsd", "freebsd"],
"allowlist": [
"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/387169
"A3BC37E2148AC4E99BE4B16AF9D42DD1E592BBBE", // http://crbug.com/387169
@@ -14,7 +14,7 @@
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
- "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"],
-+ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd"],
++ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"],
"allowlist": [
"0DE0F05680A4A056BCEC864ED8DDA84296F82B40", // http://crbug.com/434651
"1C93BD3CF875F4A73C0B2A163BB8FBDA8B8B3D80", // http://crbug.com/293683
@@ -23,7 +23,7 @@
"channel": "stable",
"extension_types": ["extension", "legacy_packaged_app", "platform_app"],
- "platforms": ["chromeos", "mac", "win", "linux", "fuchsia"],
-+ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd"],
++ "platforms": ["chromeos", "mac", "win", "linux", "fuchsia", "openbsd", "freebsd"],
"allowlist": [
// DO NOT ADD ANY MORE ENTRIES HERE.
// networkingPrivate is being migrated to networking.onc.
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 6da7029eab09..f5ba7d5d4726 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-06-17 14:20:10 UTC
+--- gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc.orig 2022-07-22 17:30:31 UTC
+++ gpu/command_buffer/service/shared_image_backing_factory_angle_vulkan.cc
-@@ -576,7 +576,7 @@ bool SharedImageBackingFactoryAngleVulkan::CanUseAngle
+@@ -703,7 +703,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__factory.cc b/www/chromium/files/patch-gpu_command__buffer_service_shared__image__factory.cc
index f1172d9981fd..39fa3dfeeca7 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,4 +1,4 @@
---- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-06-17 14:20:10 UTC
+--- gpu/command_buffer/service/shared_image_factory.cc.orig 2022-07-22 17:30:31 UTC
+++ gpu/command_buffer/service/shared_image_factory.cc
@@ -50,7 +50,7 @@
#endif
@@ -9,21 +9,21 @@
BUILDFLAG(ENABLE_VULKAN)
#include "gpu/command_buffer/service/external_vk_image_factory.h"
#include "gpu/command_buffer/service/shared_image_backing_factory_ozone.h"
-@@ -86,7 +86,7 @@
+@@ -86,7 +86,7 @@ namespace gpu {
- namespace gpu {
+ namespace {
--#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)
+-#if defined(USE_OZONE) && BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
++#if defined(USE_OZONE) && (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
-@@ -387,7 +387,7 @@ SharedImageFactory::SharedImageFactory(
+ bool ShouldUseExternalVulkanImageFactory() {
+ #if BUILDFLAG(ENABLE_VULKAN)
+@@ -381,7 +381,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_CASTOS)
+-#if BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_CASTOS)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !BUILDFLAG(IS_CASTOS)
// Desktop Linux, not ChromeOS.
if (ShouldUseOzoneFactory()) {
+ auto ozone_factory =
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 d950b892da48..123f41ddaeea 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,11 +1,11 @@
---- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-06-17 14:20:10 UTC
+--- gpu/command_buffer/service/webgpu_decoder_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ gpu/command_buffer/service/webgpu_decoder_impl.cc
-@@ -1421,7 +1421,7 @@ error::Error WebGPUDecoderImpl::HandleRequestAdapter(
+@@ -1064,7 +1064,7 @@ void WebGPUDecoderImpl::RequestAdapterImpl(
if (gr_context_type_ != GrContextType::kVulkan &&
use_webgpu_adapter_ != WebGPUAdapterName::kCompat) {
-#if BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- SendAdapterProperties(request_adapter_serial, -1, nullptr,
- "WebGPU on Linux requires command-line flag "
- "--enable-features=Vulkan,UseSkiaRenderer");
+ callback(WGPURequestAdapterStatus_Unavailable, nullptr,
+ "WebGPU on Linux requires command-line flag "
+ "--enable-features=Vulkan",
diff --git a/www/chromium/files/patch-gpu_command__buffer_service_wrapped__sk__image.cc b/www/chromium/files/patch-gpu_command__buffer_service_wrapped__sk__image.cc
new file mode 100644
index 000000000000..f5cfd6b362c3
--- /dev/null
+++ b/www/chromium/files/patch-gpu_command__buffer_service_wrapped__sk__image.cc
@@ -0,0 +1,11 @@
+--- gpu/command_buffer/service/wrapped_sk_image.cc.orig 2022-07-22 17:30:31 UTC
++++ gpu/command_buffer/service/wrapped_sk_image.cc
+@@ -277,7 +277,7 @@ class WrappedSkImage : public ClearTrackingSharedImage
+ DCHECK_NE(format(), viz::ResourceFormat::ETC1);
+ auto mipmap = usage() & SHARED_IMAGE_USAGE_MIPMAP ? GrMipMapped::kYes
+ : GrMipMapped::kNo;
+-#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX)
++#if DCHECK_IS_ON() && !BUILDFLAG(IS_LINUX) && !BUILDFLAG(IS_BSD)
+ // Initializing to bright green makes it obvious if the pixels are not
+ // properly set before they are displayed (e.g. https://crbug.com/956555).
+ // We don't do this on release builds because there is a slight overhead.
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
index b33c6ef2cd11..380ff3266102 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.cc
@@ -1,4 +1,4 @@
---- gpu/command_buffer/tests/gl_test_utils.cc.orig 2022-04-21 18:48:31 UTC
+--- gpu/command_buffer/tests/gl_test_utils.cc.orig 2022-07-22 17:30:31 UTC
+++ gpu/command_buffer/tests/gl_test_utils.cc
@@ -24,7 +24,7 @@
#include "ui/gl/gl_version_info.h"
@@ -9,7 +9,7 @@
#include "ui/gl/gl_image_native_pixmap.h"
#endif
-@@ -454,7 +454,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
+@@ -458,7 +458,7 @@ void GpuCommandBufferTestEGL::RestoreGLDefault() {
window_system_binding_info_ = gl::GLWindowSystemBindingInfo();
}
diff --git a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
index 6afa4605bfc9..dd993b33380c 100644
--- a/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
+++ b/www/chromium/files/patch-gpu_command__buffer_tests_gl__test__utils.h
@@ -1,6 +1,6 @@
---- gpu/command_buffer/tests/gl_test_utils.h.orig 2022-03-25 21:59:56 UTC
+--- gpu/command_buffer/tests/gl_test_utils.h.orig 2022-07-22 17:30:31 UTC
+++ gpu/command_buffer/tests/gl_test_utils.h
-@@ -120,7 +120,7 @@ class GpuCommandBufferTestEGL {
+@@ -122,7 +122,7 @@ class GpuCommandBufferTestEGL {
return gfx::HasExtension(gl_extensions_, extension);
}
diff --git a/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc b/www/chromium/files/patch-gpu_ipc_service_gpu__init.cc
index 7e3d02be826b..d79fde6e8d3f 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-06-17 14:20:10 UTC
+--- gpu/ipc/service/gpu_init.cc.orig 2022-07-22 17:30:31 UTC
+++ gpu/ipc/service/gpu_init.cc
-@@ -318,7 +318,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -315,7 +315,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
-@@ -368,7 +368,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -365,7 +365,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.
-@@ -417,7 +417,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -414,7 +414,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
if (gl_initialized && gl_use_swiftshader_ &&
!gl::IsSoftwareGLImplementation(gl::GetGLImplementationParts())) {
@@ -45,7 +45,7 @@
VLOG(1) << "Quit GPU process launch to fallback to SwiftShader cleanly "
<< "on Linux";
return false;
-@@ -637,7 +637,7 @@ bool GpuInit::InitializeAndStartSandbox(base::CommandL
+@@ -638,7 +638,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.
-@@ -867,7 +867,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
+@@ -872,7 +872,7 @@ void GpuInit::InitializeInProcess(base::CommandLine* c
InitializePlatformOverlaySettings(&gpu_info_, gpu_feature_info_);
diff --git a/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc
new file mode 100644
index 000000000000..dad05cf23aa4
--- /dev/null
+++ b/www/chromium/files/patch-gpu_vulkan_vulkan__util.cc
@@ -0,0 +1,11 @@
+--- gpu/vulkan/vulkan_util.cc.orig 2022-07-22 17:30:31 UTC
++++ gpu/vulkan/vulkan_util.cc
+@@ -199,7 +199,7 @@ bool CheckVulkanCompabilities(const VulkanInfo& vulkan
+ }
+ }
+
+-#if BUILDFLAG(IS_LINUX) && !defined(OZONE_PLATFORM_IS_X11)
++#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)) && !defined(OZONE_PLATFORM_IS_X11)
+ // Vulkan is only supported with X11 on Linux for now.
+ return false;
+ #else
diff --git a/www/chromium/files/patch-media_BUILD.gn b/www/chromium/files/patch-media_BUILD.gn
index 4c101c6ee7fa..bb01e466dc1e 100644
--- a/www/chromium/files/patch-media_BUILD.gn
+++ b/www/chromium/files/patch-media_BUILD.gn
@@ -1,6 +1,6 @@
---- media/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- media/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ media/BUILD.gn
-@@ -76,6 +76,9 @@ config("media_config") {
+@@ -75,6 +75,9 @@ config("media_config") {
defines += [ "DLOPEN_PULSEAUDIO" ]
}
}
diff --git a/www/chromium/files/patch-media_audio_BUILD.gn b/www/chromium/files/patch-media_audio_BUILD.gn
index ec409b677f70..7a25ea8bc0d8 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-06-17 14:20:10 UTC
+--- media/audio/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ media/audio/BUILD.gn
-@@ -245,9 +245,20 @@ source_set("audio") {
+@@ -248,9 +248,20 @@ source_set("audio") {
]
}
diff --git a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
index c4cff1b5df2b..b6a27b9fd517 100644
--- a/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
+++ b/www/chromium/files/patch-media_audio_sndio_audio__manager__sndio.cc
@@ -1,6 +1,6 @@
---- media/audio/sndio/audio_manager_sndio.cc.orig 2022-02-28 16:54:41 UTC
+--- media/audio/sndio/audio_manager_sndio.cc.orig 2022-07-22 17:30:31 UTC
+++ media/audio/sndio/audio_manager_sndio.cc
-@@ -0,0 +1,181 @@
+@@ -0,0 +1,177 @@
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
@@ -70,13 +70,9 @@
+ const std::string& device_id) {
+ static const int kDefaultInputBufferSize = 1024;
+
-+ int user_buffer_size = GetUserBufferSize();
-+ int buffer_size = user_buffer_size ?
-+ user_buffer_size : kDefaultInputBufferSize;
-+
+ return AudioParameters(
+ AudioParameters::AUDIO_PCM_LOW_LATENCY, CHANNEL_LAYOUT_STEREO,
-+ kDefaultSampleRate, buffer_size);
++ kDefaultSampleRate, kDefaultInputBufferSize);
+}
+
+AudioManagerSndio::AudioManagerSndio(std::unique_ptr<AudioThread> audio_thread,
diff --git a/www/chromium/files/patch-media_base_media__switches.cc b/www/chromium/files/patch-media_base_media__switches.cc
index 5d4027c634a4..58d0d7fb8170 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-06-17 14:20:10 UTC
+--- media/base/media_switches.cc.orig 2022-07-22 17:30:31 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
-@@ -439,7 +439,7 @@ const base::Feature kGav1VideoDecoder{"Gav1VideoDecode
+@@ -448,7 +448,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
-@@ -471,7 +471,7 @@ constexpr base::FeatureParam<kCrosGlobalMediaControlsP
+@@ -480,7 +480,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
-@@ -508,7 +508,7 @@ const base::Feature kUseR16Texture{"use-r16-texture",
+@@ -517,7 +517,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",
-@@ -922,7 +922,7 @@ const base::Feature MEDIA_EXPORT kDeprecateLowUsageCod
+@@ -932,7 +932,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 13ca017f2761..9068fb415bc0 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-06-17 14:20:10 UTC
+--- media/base/media_switches.h.orig 2022-07-22 17:30:31 UTC
+++ media/base/media_switches.h
-@@ -199,7 +199,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr
+@@ -198,7 +198,7 @@ MEDIA_EXPORT extern const base::Feature kUseDecoderStr
MEDIA_EXPORT extern const base::Feature kUseFakeDeviceForMediaStream;
MEDIA_EXPORT extern const base::Feature kUseMediaHistoryStore;
MEDIA_EXPORT extern const base::Feature kUseR16Texture;
@@ -8,8 +8,8 @@
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
MEDIA_EXPORT extern const base::Feature kVaapiVideoDecodeLinux;
MEDIA_EXPORT extern const base::Feature kVaapiVideoEncodeLinux;
- #endif // BUILDFLAG(IS_LINUX)
-@@ -306,7 +306,7 @@ MEDIA_EXPORT extern const base::FeatureParam<
+ MEDIA_EXPORT extern const base::Feature kVaapiIgnoreDriverChecks;
+@@ -304,7 +304,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 d7c8969d0d4a..d8f59f15f706 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-17 14:20:10 UTC
+--- media/base/supported_types.cc.orig 2022-07-22 17:30:31 UTC
+++ media/base/supported_types.cc
@@ -205,7 +205,7 @@ bool IsHevcProfileSupported(const VideoType& type) {
return false;
@@ -6,6 +6,6 @@
#if BUILDFLAG(ENABLE_PLATFORM_HEVC)
-#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX)
+#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
- return GetSupplementalProfileCache()->IsProfileSupported(type.profile);
- #elif BUILDFLAG(IS_MAC)
- if (__builtin_available(macOS 11.0, *))
+ #if BUILDFLAG(IS_CHROMEOS_LACROS)
+ // TODO(b/171813538): For Lacros, the supplemental profile cache will be
+ // asking lacros-gpu, but we will be doing decoding in ash-gpu. Until the
diff --git a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
index 7a42f3a96782..7402d276b904 100644
--- a/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
+++ b/www/chromium/files/patch-media_capture_video_linux_fake__v4l2__impl.cc
@@ -1,6 +1,6 @@
---- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-05-19 14:06:27 UTC
+--- media/capture/video/linux/fake_v4l2_impl.cc.orig 2022-07-22 17:30:31 UTC
+++ media/capture/video/linux/fake_v4l2_impl.cc
-@@ -425,7 +425,7 @@ int FakeV4L2Impl::close(int fd) {
+@@ -427,7 +427,7 @@ int FakeV4L2Impl::close(int fd) {
return kSuccessReturnValue;
}
diff --git a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
index 6b68d7ec9228..e525343d6ed4 100644
--- a/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
+++ b/www/chromium/files/patch-media_gpu_chromeos_video__decoder__pipeline.cc
@@ -1,6 +1,6 @@
---- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-05-19 14:06:27 UTC
+--- media/gpu/chromeos/video_decoder_pipeline.cc.orig 2022-07-22 17:30:31 UTC
+++ media/gpu/chromeos/video_decoder_pipeline.cc
-@@ -647,7 +647,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -656,7 +656,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
}
}
@@ -9,12 +9,12 @@
// Linux should always use a custom allocator (to allocate buffers using
// libva) and a PlatformVideoFramePool.
CHECK(allocator.has_value());
-@@ -669,7 +669,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
+@@ -678,7 +678,7 @@ VideoDecoderPipeline::PickDecoderOutputFormat(
#error "Unsupported platform"
#endif
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || BUILDFLAG(IS_BSD)
+-#if BUILDFLAG(IS_LINUX)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_BSD)
// viable_candidate should always be set unless using L1 protected content,
- // which isn't an option on linux or lacros.
+ // which isn't an option on linux.
CHECK(viable_candidate);
diff --git a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
index 207e7787a3a2..43f528eb8fd7 100644
--- a/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
+++ b/www/chromium/files/patch-media_gpu_vaapi_vaapi__video__decoder.cc
@@ -1,6 +1,6 @@
---- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-02-28 16:54:41 UTC
+--- media/gpu/vaapi/vaapi_video_decoder.cc.orig 2022-07-22 17:30:31 UTC
+++ media/gpu/vaapi/vaapi_video_decoder.cc
-@@ -772,7 +772,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
+@@ -765,7 +765,7 @@ void VaapiVideoDecoder::ApplyResolutionChangeWithScree
const gfx::Size decoder_natural_size =
aspect_ratio_.GetNaturalSize(decoder_visible_rect);
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 a0a7f1ca4935..390fa72f23d0 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-06-17 14:20:10 UTC
+--- media/gpu/vaapi/vaapi_wrapper.cc.orig 2022-07-22 17:30:31 UTC
+++ media/gpu/vaapi/vaapi_wrapper.cc
-@@ -590,7 +590,7 @@ VADisplayState::VADisplayState()
+@@ -592,7 +592,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 af85b063a3a2..76a1bb96dc42 100644
--- a/www/chromium/files/patch-media_media__options.gni
+++ b/www/chromium/files/patch-media_media__options.gni
@@ -1,6 +1,6 @@
---- media/media_options.gni.orig 2022-06-17 14:20:10 UTC
+--- media/media_options.gni.orig 2022-07-22 17:30:31 UTC
+++ media/media_options.gni
-@@ -125,9 +125,12 @@ declare_args() {
+@@ -123,9 +123,12 @@ declare_args() {
# Enables runtime selection of ALSA library for audio.
use_alsa = false
@@ -14,7 +14,7 @@
(!is_castos || is_cast_audio_only)) {
use_alsa = true
-@@ -142,6 +145,10 @@ declare_args() {
+@@ -140,6 +143,10 @@ declare_args() {
if (!use_cras && !is_chromecast && !is_asan && !is_tsan) {
use_pulseaudio = true
}
diff --git a/www/chromium/files/patch-net_BUILD.gn b/www/chromium/files/patch-net_BUILD.gn
index 3ea3984b877e..d4100bd05ca0 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-06-17 14:20:10 UTC
+--- net/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ net/BUILD.gn
@@ -104,7 +104,7 @@ net_configs = [
"//build/config/compiler:wexit_time_destructors",
@@ -9,7 +9,7 @@
net_configs += [ "//build/config/linux:libresolv" ]
}
-@@ -1201,6 +1201,15 @@ component("net") {
+@@ -1199,6 +1199,15 @@ component("net") {
]
}
@@ -25,7 +25,7 @@
if (is_mac) {
sources += [
"base/network_notification_thread_mac.cc",
-@@ -1333,7 +1342,7 @@ component("net") {
+@@ -1331,7 +1340,7 @@ component("net") {
}
}
@@ -34,7 +34,7 @@
sources += [
"base/network_change_notifier_posix.cc",
"base/network_change_notifier_posix.h",
-@@ -1366,7 +1375,7 @@ component("net") {
+@@ -1364,7 +1373,7 @@ component("net") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
@@ -43,7 +43,7 @@
sources += [
"base/network_interfaces_getifaddrs.cc",
"base/network_interfaces_getifaddrs.h",
-@@ -4373,7 +4382,7 @@ test("net_unittests") {
+@@ -4372,7 +4381,7 @@ test("net_unittests") {
]
}
@@ -52,7 +52,7 @@
sources += [
"base/address_tracker_linux_unittest.cc",
"base/network_interfaces_linux_unittest.cc",
-@@ -4445,6 +4454,10 @@ test("net_unittests") {
+@@ -4447,6 +4456,10 @@ test("net_unittests") {
"//url:buildflags",
]
@@ -63,16 +63,16 @@
if (enable_websockets) {
deps += [ "//net/server:tests" ]
}
-@@ -4517,7 +4530,7 @@ test("net_unittests") {
+@@ -4519,7 +4532,7 @@ test("net_unittests") {
]
}
- if (is_linux || is_chromeos) {
+ if ((is_linux || is_chromeos) && !is_bsd) {
- sources += [
- "quic/platform/impl/quic_flags_test.cc",
- "tools/quic/quic_http_proxy_backend_stream_test.cc",
-@@ -4665,7 +4678,7 @@ test("net_unittests") {
+ sources += [ "tools/quic/quic_simple_server_test.cc" ]
+ }
+
+@@ -4661,7 +4674,7 @@ test("net_unittests") {
}
# Use getifaddrs() on POSIX platforms, except Linux.
diff --git a/www/chromium/files/patch-net_base_network__change__notifier.cc b/www/chromium/files/patch-net_base_network__change__notifier.cc
index 8fb7f56c1547..04e02abc4641 100644
--- a/www/chromium/files/patch-net_base_network__change__notifier.cc
+++ b/www/chromium/files/patch-net_base_network__change__notifier.cc
@@ -1,4 +1,4 @@
---- net/base/network_change_notifier.cc.orig 2022-05-19 14:06:27 UTC
+--- net/base/network_change_notifier.cc.orig 2022-07-22 17:30:31 UTC
+++ net/base/network_change_notifier.cc
@@ -39,7 +39,7 @@
#include "net/base/network_change_notifier_linux.h"
@@ -9,7 +9,7 @@
#include "net/base/network_change_notifier_posix.h"
#elif BUILDFLAG(IS_FUCHSIA)
#include "net/base/network_change_notifier_fuchsia.h"
-@@ -331,6 +331,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
+@@ -327,6 +327,9 @@ std::unique_ptr<NetworkChangeNotifier> NetworkChangeNo
#elif BUILDFLAG(IS_FUCHSIA)
return std::make_unique<NetworkChangeNotifierFuchsia>(
/*require_wlan=*/false);
diff --git a/www/chromium/files/patch-net_base_sockaddr__util__posix.cc b/www/chromium/files/patch-net_base_sockaddr__util__posix.cc
index 24c932b83326..825c0490c3f1 100644
--- a/www/chromium/files/patch-net_base_sockaddr__util__posix.cc
+++ b/www/chromium/files/patch-net_base_sockaddr__util__posix.cc
@@ -1,6 +1,6 @@
---- net/base/sockaddr_util_posix.cc.orig 2022-06-17 14:20:10 UTC
+--- net/base/sockaddr_util_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ net/base/sockaddr_util_posix.cc
-@@ -40,7 +40,8 @@ bool FillUnixAddress(const std::string& socket_path,
+@@ -41,7 +41,8 @@ bool FillUnixAddress(const std::string& socket_path,
return true;
}
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 80ffa8812960..c8472c49856e 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-06-17 14:20:10 UTC
+--- net/cert/cert_verify_proc_unittest.cc.orig 2022-07-22 17:30:31 UTC
+++ net/cert/cert_verify_proc_unittest.cc
-@@ -240,7 +240,7 @@ const std::vector<CertVerifyProcType> kAllCertVerifier
+@@ -232,7 +232,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_dns_host__resolver__manager.cc b/www/chromium/files/patch-net_dns_host__resolver__manager.cc
index 09afd4db5f2a..faef864dd7e4 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-06-17 14:20:10 UTC
+--- net/dns/host_resolver_manager.cc.orig 2022-07-22 17:30:31 UTC
+++ net/dns/host_resolver_manager.cc
-@@ -3156,7 +3156,7 @@ HostResolverManager::HostResolverManager(
+@@ -3145,7 +3145,7 @@ HostResolverManager::HostResolverManager(
}
if (system_dns_config_notifier_)
system_dns_config_notifier_->AddObserver(this);
diff --git a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
index d4d5987a5991..17d870c0dd12 100644
--- a/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_configured__proxy__resolution__service.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-05-19 14:06:27 UTC
+--- net/proxy_resolution/configured_proxy_resolution_service.cc.orig 2022-07-22 17:30:31 UTC
+++ net/proxy_resolution/configured_proxy_resolution_service.cc
@@ -53,7 +53,7 @@
#elif BUILDFLAG(IS_MAC)
@@ -18,7 +18,7 @@
constexpr net::NetworkTrafficAnnotationTag kSystemProxyConfigTrafficAnnotation =
net::DefineNetworkTrafficAnnotation("proxy_config_system", R"(
semantics {
-@@ -1423,7 +1423,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon
+@@ -1417,7 +1417,7 @@ ConfiguredProxyResolutionService::CreateSystemProxyCon
<< "profile_io_data.cc::CreateProxyConfigService and this should "
<< "be used only for examples.";
return std::make_unique<UnsetProxyConfigService>();
diff --git a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
index 938e6e6d2516..03b4e20201aa 100644
--- a/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
+++ b/www/chromium/files/patch-net_proxy__resolution_proxy__config__service__linux.cc
@@ -1,4 +1,4 @@
---- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-05-19 14:06:27 UTC
+--- net/proxy_resolution/proxy_config_service_linux.cc.orig 2022-07-22 17:30:31 UTC
+++ net/proxy_resolution/proxy_config_service_linux.cc
@@ -6,7 +6,9 @@
@@ -10,7 +10,7 @@
#include <unistd.h>
#include <map>
-@@ -506,6 +508,7 @@ bool SettingGetterImplGSettings::CheckVersion(
+@@ -500,6 +502,7 @@ bool SettingGetterImplGSettings::CheckVersion(
}
#endif // defined(USE_GIO)
@@ -18,7 +18,7 @@
// Converts |value| from a decimal string to an int. If there was a failure
// parsing, returns |default_value|.
int StringToIntOrDefault(base::StringPiece value, int default_value) {
-@@ -1007,6 +1010,7 @@ class SettingGetterImplKDE : public ProxyConfigService
+@@ -1028,6 +1031,7 @@ class SettingGetterImplKDE : public ProxyConfigService
// events on.
scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
};
@@ -26,7 +26,7 @@
} // namespace
-@@ -1223,9 +1227,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
+@@ -1245,9 +1249,11 @@ ProxyConfigServiceLinux::Delegate::Delegate(
case base::nix::DESKTOP_ENVIRONMENT_KDE3:
case base::nix::DESKTOP_ENVIRONMENT_KDE4:
case base::nix::DESKTOP_ENVIRONMENT_KDE5:
diff --git a/www/chromium/files/patch-net_socket_socket__posix.cc b/www/chromium/files/patch-net_socket_socket__posix.cc
index 8d528ce90eb3..665305fd5623 100644
--- a/www/chromium/files/patch-net_socket_socket__posix.cc
+++ b/www/chromium/files/patch-net_socket_socket__posix.cc
@@ -1,6 +1,6 @@
---- net/socket/socket_posix.cc.orig 2022-02-28 16:54:41 UTC
+--- net/socket/socket_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ net/socket/socket_posix.cc
-@@ -519,7 +519,7 @@ void SocketPosix::ReadCompleted() {
+@@ -516,7 +516,7 @@ void SocketPosix::ReadCompleted() {
}
int SocketPosix::DoWrite(IOBuffer* buf, int buf_len) {
diff --git a/www/chromium/files/patch-net_socket_udp__socket__posix.cc b/www/chromium/files/patch-net_socket_udp__socket__posix.cc
index e54f0028bb37..2f509c62c21e 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-06-17 14:20:10 UTC
+--- net/socket/udp_socket_posix.cc.orig 2022-07-22 17:30:31 UTC
+++ net/socket/udp_socket_posix.cc
-@@ -576,7 +576,7 @@ int UDPSocketPosix::SetDoNotFragment() {
+@@ -563,7 +563,7 @@ int UDPSocketPosix::SetDoNotFragment() {
}
void UDPSocketPosix::SetMsgConfirm(bool confirm) {
@@ -9,7 +9,7 @@
if (confirm) {
sendto_flags_ |= MSG_CONFIRM;
} else {
-@@ -597,7 +597,7 @@ int UDPSocketPosix::SetBroadcast(bool broadcast) {
+@@ -584,7 +584,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.
-@@ -910,7 +910,7 @@ int UDPSocketPosix::DoBind(const IPEndPoint& address)
+@@ -897,7 +897,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_tools_quic_quic__http__proxy__backend.cc b/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
deleted file mode 100644
index 2aee8fe4a921..000000000000
--- a/www/chromium/files/patch-net_tools_quic_quic__http__proxy__backend.cc
+++ /dev/null
@@ -1,11 +0,0 @@
---- net/tools/quic/quic_http_proxy_backend.cc.orig 2022-02-28 16:54:41 UTC
-+++ net/tools/quic/quic_http_proxy_backend.cc
-@@ -161,7 +161,7 @@ void QuicHttpProxyBackend::InitializeURLRequestContext
- // Enable HTTP2, but disable QUIC on the backend
- context_builder.SetSpdyAndQuicEnabled(true /* http2 */, false /* quic */);
-
--#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
-+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
- // On Linux, use a fixed ProxyConfigService, since the default one
- // depends on glib.
- context_builder.set_proxy_config_service(
diff --git a/www/chromium/files/patch-net_url__request_url__request__context.cc b/www/chromium/files/patch-net_url__request_url__request__context.cc
index d48e834a054d..c7b6e09b3421 100644
--- a/www/chromium/files/patch-net_url__request_url__request__context.cc
+++ b/www/chromium/files/patch-net_url__request_url__request__context.cc
@@ -1,6 +1,6 @@
---- net/url_request/url_request_context.cc.orig 2022-05-19 14:06:27 UTC
+--- net/url_request/url_request_context.cc.orig 2022-07-22 17:30:31 UTC
+++ net/url_request/url_request_context.cc
-@@ -91,7 +91,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
+@@ -64,7 +64,7 @@ const HttpNetworkSessionContext* URLRequestContext::Ge
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
#if !BUILDFLAG(IS_WIN) && \
diff --git a/www/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 2b9e75aaa34f..eee552e5fb3e 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-06-17 14:20:10 UTC
+--- net/url_request/url_request_context_builder.cc.orig 2022-07-22 17:30:31 UTC
+++ net/url_request/url_request_context_builder.cc
-@@ -501,7 +501,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
+@@ -500,7 +500,7 @@ std::unique_ptr<URLRequestContext> URLRequestContextBu
}
if (!proxy_resolution_service_) {
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 67372f4cebca..33fed8324975 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,6 +1,6 @@
---- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-06-17 14:20:10 UTC
+--- remoting/codec/webrtc_video_encoder_vpx.cc.orig 2022-07-22 17:30:31 UTC
+++ remoting/codec/webrtc_video_encoder_vpx.cc
-@@ -85,7 +85,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
+@@ -86,7 +86,7 @@ void SetVp8CodecParameters(vpx_codec_enc_cfg_t* config
const webrtc::DesktopSize& size) {
SetCommonCodecParameters(config, size);
diff --git a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
index 8a5da112e475..42c61c4feafe 100644
--- a/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
+++ b/www/chromium/files/patch-services_resource__coordinator_memory__instrumentation_queued__request__dispatcher.cc
@@ -1,4 +1,4 @@
---- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-03-25 21:59:56 UTC
+--- services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc.orig 2022-07-22 17:30:31 UTC
+++ services/resource_coordinator/memory_instrumentation/queued_request_dispatcher.cc
@@ -52,7 +52,7 @@ uint32_t CalculatePrivateFootprintKb(const mojom::RawO
uint32_t shared_resident_kb) {
@@ -9,7 +9,7 @@
uint64_t rss_anon_bytes = os_dump.platform_private_footprint->rss_anon_bytes;
uint64_t vm_swap_bytes = os_dump.platform_private_footprint->vm_swap_bytes;
return (rss_anon_bytes + vm_swap_bytes) / 1024;
-@@ -91,7 +91,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
+@@ -80,7 +80,7 @@ memory_instrumentation::mojom::OSMemDumpPtr CreatePubl
os_dump->is_peak_rss_resettable = internal_os_dump.is_peak_rss_resettable;
os_dump->private_footprint_kb =
CalculatePrivateFootprintKb(internal_os_dump, shared_resident_kb);
@@ -18,7 +18,7 @@
os_dump->private_footprint_swap_kb =
internal_os_dump.platform_private_footprint->vm_swap_bytes / 1024;
#endif
-@@ -270,7 +270,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -259,7 +259,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
// On most platforms each process can dump data about their own process
// so ask each process to do so Linux is special see below.
@@ -27,7 +27,7 @@
request->pending_responses.insert({client_info.pid, ResponseType::kOSDump});
client->RequestOSMemoryDump(request->memory_map_option(),
{base::kNullProcessId},
-@@ -285,7 +285,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
+@@ -274,7 +274,7 @@ void QueuedRequestDispatcher::SetUpAndDispatch(
// In some cases, OS stats can only be dumped from a privileged process to
// get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -36,7 +36,7 @@
std::vector<base::ProcessId> pids;
mojom::ClientProcess* browser_client = nullptr;
base::ProcessId browser_client_pid = base::kNullProcessId;
-@@ -331,7 +331,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
+@@ -320,7 +320,7 @@ void QueuedRequestDispatcher::SetUpAndDispatchVmRegion
const OsCallback& os_callback) {
// On Linux, OS stats can only be dumped from a privileged process to
// get around to sandboxing/selinux restrictions (see crbug.com/461788).
@@ -45,7 +45,7 @@
mojom::ClientProcess* browser_client = nullptr;
base::ProcessId browser_client_pid = 0;
for (const auto& client_info : clients) {
-@@ -382,7 +382,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
+@@ -371,7 +371,7 @@ QueuedRequestDispatcher::FinalizeVmRegionRequest(
// each client process provides 1 OS dump, % the case where the client is
// disconnected mid dump.
OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
@@ -54,7 +54,7 @@
for (auto& kv : extra_os_dumps) {
auto pid = kv.first == base::kNullProcessId ? original_pid : kv.first;
DCHECK(results.find(pid) == results.end());
-@@ -444,7 +444,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest*
+@@ -433,7 +433,7 @@ void QueuedRequestDispatcher::Finalize(QueuedRequest*
// crash). In the latter case (OS_LINUX) we expect the full map to come
// from the browser process response.
OSMemDumpMap& extra_os_dumps = response.second.os_dumps;
diff --git a/www/chromium/files/patch-third__party_angle_BUILD.gn b/www/chromium/files/patch-third__party_angle_BUILD.gn
index 1c2bf54e5ff3..627bc209fa67 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-06-17 14:20:10 UTC
+--- third_party/angle/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ third_party/angle/BUILD.gn
-@@ -222,7 +222,6 @@ config("extra_warnings") {
+@@ -223,7 +223,6 @@ config("extra_warnings") {
"-Wtautological-type-limit-compare",
"-Wundefined-reinterpret-cast",
"-Wunneeded-internal-declaration",
@@ -8,7 +8,7 @@
"-Wsuggest-destructor-override",
"-Wsuggest-override",
-@@ -400,7 +399,7 @@ angle_static_library("angle_common") {
+@@ -401,7 +400,7 @@ angle_static_library("angle_common") {
all_dependent_configs = [ ":angle_disable_pool_alloc" ]
}
@@ -17,7 +17,7 @@
libs = [ "dl" ]
}
-@@ -521,6 +520,9 @@ angle_static_library("angle_gpu_info_util") {
+@@ -522,6 +521,9 @@ angle_static_library("angle_gpu_info_util") {
"Xi",
"Xext",
]
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 0b0463d3ce9c..7ee489108a0d 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-06-17 14:20:10 UTC
+--- third_party/angle/src/libANGLE/Display.cpp.orig 2022-07-22 17:30:31 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"
-@@ -330,7 +330,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -326,7 +326,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
impl = rx::CreateDisplayCGLOrEAGL(state);
break;
@@ -18,7 +18,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0)
{
-@@ -375,7 +375,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -369,7 +369,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
#if defined(ANGLE_ENABLE_OPENGL)
# if defined(ANGLE_PLATFORM_WINDOWS)
impl = new rx::DisplayWGL(state);
@@ -27,7 +27,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == 0 ||
platformType == EGL_PLATFORM_VULKAN_DISPLAY_MODE_HEADLESS_ANGLE)
-@@ -426,7 +426,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
+@@ -420,7 +420,7 @@ rx::DisplayImpl *CreateDisplayFromAttribs(EGLAttrib di
impl = rx::CreateVulkanWin32Display(state);
}
break;
@@ -36,7 +36,7 @@
# if defined(ANGLE_USE_GBM)
if (platformType == EGL_PLATFORM_GBM_KHR && rx::IsVulkanGbmDisplayAvailable())
{
-@@ -1965,7 +1965,7 @@ static ClientExtensions GenerateClientExtensions()
+@@ -1955,7 +1955,7 @@ static ClientExtensions GenerateClientExtensions()
extensions.x11Visual = true;
#endif
diff --git a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
index 326b45bf5f85..ae00ae38d0b4 100644
--- a/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
+++ b/www/chromium/files/patch-third__party_angle_src_libANGLE_formatutils.cpp
@@ -1,6 +1,6 @@
---- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-05-19 14:06:27 UTC
+--- third_party/angle/src/libANGLE/formatutils.cpp.orig 2022-07-22 17:30:31 UTC
+++ third_party/angle/src/libANGLE/formatutils.cpp
-@@ -1393,7 +1393,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
+@@ -1391,7 +1391,7 @@ static InternalFormatInfoMap BuildInternalFormatInfoMa
AddYUVFormat(&map, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8R8_2PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported);
AddYUVFormat(&map, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, true, 8, 8, 8, 0, 0, GL_G8_B8_R8_3PLANE_420_UNORM_ANGLE, GL_UNSIGNED_BYTE, GL_UNSIGNED_NORMALIZED, false, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, RequireExt<&Extensions::yuvInternalFormatANGLE>, NeverSupported, NeverSupported);
diff --git a/www/chromium/files/patch-third__party_angle_util_BUILD.gn b/www/chromium/files/patch-third__party_angle_util_BUILD.gn
index d23d124dc8d9..3d2ec7b5c464 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-06-17 14:20:10 UTC
+--- third_party/angle/util/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ third_party/angle/util/BUILD.gn
-@@ -214,7 +214,7 @@ foreach(is_shared_library,
+@@ -246,7 +246,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 de0a6162817b..bd02eeff8f3f 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-06-17 14:20:10 UTC
+--- third_party/blink/renderer/controller/blink_initializer.cc.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/controller/blink_initializer.cc
-@@ -72,12 +72,12 @@
+@@ -73,12 +73,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
-@@ -157,7 +157,7 @@ void InitializeCommon(Platform* platform, mojo::Binder
+@@ -166,7 +166,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();
-@@ -228,7 +228,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
+@@ -240,7 +240,7 @@ void BlinkInitializer::RegisterInterfaces(mojo::Binder
main_thread->GetTaskRunner());
#endif
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 ff2257f6eaaf..ff0aa2880c70 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,4 +1,4 @@
---- 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.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/core/exported/web_view_impl.cc
@@ -401,7 +401,7 @@ SkFontHinting RendererPreferencesToSkiaHinting(
const blink::RendererPreferences& prefs) {
@@ -9,7 +9,7 @@
if (!prefs.should_antialias_text) {
// When anti-aliasing is off, GTK maps all non-zero hinting settings to
// 'Normal' hinting so we do the same. Otherwise, folks who have 'Slight'
-@@ -3187,7 +3187,7 @@ void WebViewImpl::UpdateFontRenderingFromRendererPrefs
+@@ -3203,7 +3203,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 4ef40caac308..4b8ae3a6d627 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,6 +1,6 @@
---- 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.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/core/frame/web_frame_test.cc
-@@ -6321,7 +6321,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
+@@ -6331,7 +6331,7 @@ TEST_F(WebFrameTest, DISABLED_PositionForPointTest) {
MoveCaretStaysHorizontallyAlignedWhenMoved
#endif
// TODO(crbug.com/1317375): Build these tests on all platforms.
@@ -9,7 +9,7 @@
TEST_F(WebFrameTest, MAYBE_SelectRangeStaysHorizontallyAlignedWhenMoved) {
RegisterMockedHttpURLLoad("move_caret.html");
-@@ -6700,7 +6700,7 @@ TEST_F(CompositedSelectionBoundsTest, SVGBasic) {
+@@ -6710,7 +6710,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_scroll_scrollbar__theme__aura.cc b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
index b66dff4e1d7b..0976e0e3f31e 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_core_scroll_scrollbar__theme__aura.cc
@@ -1,4 +1,4 @@
---- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-02-28 16:54:41 UTC
+--- third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/core/scroll/scrollbar_theme_aura.cc
@@ -151,7 +151,7 @@ bool ScrollbarThemeAura::SupportsDragSnapBack() const
// is true for at least GTK and QT apps).
@@ -9,7 +9,7 @@
return false;
#else
return true;
-@@ -326,7 +326,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr
+@@ -325,7 +325,7 @@ bool ScrollbarThemeAura::ShouldCenterOnThumb(const Scr
const WebMouseEvent& event) {
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
diff --git a/www/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 c53d7018e08c..cd5ab78446e0 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-06-17 14:20:10 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/modules/webgl/webgl_rendering_context_base.cc
-@@ -6116,7 +6116,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
+@@ -6100,7 +6100,7 @@ void WebGLRenderingContextBase::TexImageHelperMediaVid
constexpr bool kAllowZeroCopyImages = true;
#endif
diff --git a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
index 53e2ad6d2740..cd162e1f2ea1 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_modules_webgl_webgl__webcodecs__video__frame.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-04-21 18:48:31 UTC
+--- third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/modules/webgl/webgl_webcodecs_video_frame.cc
-@@ -100,7 +100,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin
+@@ -101,7 +101,7 @@ bool WebGLWebCodecsVideoFrame::Supported(WebGLRenderin
// TODO(crbug.com/1052397): Revisit once build flag switch of lacros-chrome is
// complete.
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) || \
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
index ddd0caedeb39..db6da3f5b6da 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_BUILD.gn
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/BUILD.gn.orig 2022-05-19 14:06:27 UTC
+--- third_party/blink/renderer/platform/BUILD.gn.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/platform/BUILD.gn
-@@ -1879,7 +1879,7 @@ static_library("test_support") {
+@@ -1880,7 +1880,7 @@ static_library("test_support") {
]
# fuzzed_data_provider may not work with a custom toolchain.
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
new file mode 100644
index 000000000000..1e36a597ee4d
--- /dev/null
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_fonts_font__platform__data.cc
@@ -0,0 +1,20 @@
+--- third_party/blink/renderer/platform/fonts/font_platform_data.cc.orig 2022-07-22 17:30:31 UTC
++++ third_party/blink/renderer/platform/fonts/font_platform_data.cc
+@@ -46,7 +46,7 @@
+ namespace blink {
+ namespace {
+
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ // Getting the system font render style takes a significant amount of time on
+ // Linux because looking up fonts using fontconfig can be very slow. We fetch
+ // the render style for each font family and text size, while it's very
+@@ -120,7 +120,7 @@ FontPlatformData::FontPlatformData(sk_sp<SkTypeface> t
+ style_ = WebFontRenderStyle::GetDefault();
+ #if !BUILDFLAG(IS_WIN)
+ WebFontRenderStyle system_style;
+-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS)
++#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_BSD)
+ bool override_font_name_and_size =
+ base::FeatureList::IsEnabled(kOptimizeLinuxFonts);
+ #else
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
index ace11f828f41..ebd86e15f802 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_graphics_video__frame__submitter.cc
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-05-19 14:06:27 UTC
+--- third_party/blink/renderer/platform/graphics/video_frame_submitter.cc.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/platform/graphics/video_frame_submitter.cc
-@@ -329,7 +329,7 @@ void VideoFrameSubmitter::OnBeginFrame(
+@@ -332,7 +332,7 @@ void VideoFrameSubmitter::OnBeginFrame(
continue;
auto& feedback =
timing_details.find(frame_token)->value.presentation_feedback;
diff --git a/www/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 11525694b769..79663fd3c3be 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-06-17 14:20:10 UTC
+--- third_party/blink/renderer/platform/runtime_enabled_features.json5.orig 2022-07-22 17:30:31 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,7 +9,7 @@
},
// "implied_by" or "depends_on" specifies relationship to other features:
-@@ -1059,7 +1059,7 @@
+@@ -1069,7 +1069,7 @@
depends_on: ["FileSystemAccess"],
status: {"Android": "test", "default": "experimental"},
origin_trial_feature_name: "FileHandling",
@@ -18,7 +18,7 @@
},
{
name: "FileHandlingIcons",
-@@ -2349,7 +2349,7 @@
+@@ -2403,7 +2403,7 @@
{
name: "U2FSecurityKeyAPI",
origin_trial_feature_name: "U2FSecurityKeyAPI",
@@ -27,7 +27,7 @@
origin_trial_type: "deprecation",
},
{
-@@ -2368,7 +2368,7 @@
+@@ -2422,7 +2422,7 @@
{
name: "UnrestrictedSharedArrayBuffer",
origin_trial_feature_name: "UnrestrictedSharedArrayBuffer",
@@ -36,7 +36,7 @@
},
{
name: "URLPattern",
-@@ -2394,7 +2394,7 @@
+@@ -2444,7 +2444,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,7 +45,7 @@
},
{
name: "UUID",
-@@ -2519,12 +2519,12 @@
+@@ -2569,12 +2569,12 @@
name: "WebAppUrlHandling",
status: "experimental",
origin_trial_feature_name: "WebAppUrlHandling",
diff --git a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h
index 7d176575cd08..b184b8b79210 100644
--- a/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h
+++ b/www/chromium/files/patch-third__party_blink_renderer_platform_wtf_math__extras.h
@@ -1,6 +1,6 @@
---- third_party/blink/renderer/platform/wtf/math_extras.h.orig 2022-02-07 13:39:41 UTC
+--- third_party/blink/renderer/platform/wtf/math_extras.h.orig 2022-07-22 17:30:31 UTC
+++ third_party/blink/renderer/platform/wtf/math_extras.h
-@@ -127,6 +127,10 @@ constexpr float Grad2turn(float g) {
+@@ -128,6 +128,10 @@ constexpr float Grad2turn(float g) {
return g * (1.0f / 400.0f);
}
@@ -11,7 +11,7 @@
constexpr double RoundHalfTowardsPositiveInfinity(double value) {
return std::floor(value + 0.5);
}
-@@ -134,6 +138,9 @@ constexpr double RoundHalfTowardsPositiveInfinity(doub
+@@ -135,6 +139,9 @@ constexpr double RoundHalfTowardsPositiveInfinity(doub
constexpr float RoundHalfTowardsPositiveInfinity(float value) {
return std::floor(value + 0.5f);
}
diff --git a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni
index 55d45f5df6ed..46fe2b5a0632 100644
--- a/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni
+++ b/www/chromium/files/patch-third__party_boringssl_BUILD.generated.gni
@@ -1,6 +1,6 @@
---- third_party/boringssl/BUILD.generated.gni.orig 2022-05-19 14:06:27 UTC
+--- third_party/boringssl/BUILD.generated.gni.orig 2022-07-22 17:30:31 UTC
+++ third_party/boringssl/BUILD.generated.gni
-@@ -81,6 +81,7 @@ crypto_sources = [
+@@ -78,6 +78,7 @@ crypto_sources = [
"src/crypto/cpu_aarch64_apple.c",
"src/crypto/cpu_aarch64_fuchsia.c",
"src/crypto/cpu_aarch64_linux.c",
@@ -8,7 +8,7 @@
"src/crypto/cpu_aarch64_win.c",
"src/crypto/cpu_arm.c",
"src/crypto/cpu_arm_linux.c",
-@@ -186,6 +187,7 @@ crypto_sources = [
+@@ -184,6 +185,7 @@ crypto_sources = [
"src/crypto/rand_extra/deterministic.c",
"src/crypto/rand_extra/forkunsafe.c",
"src/crypto/rand_extra/fuchsia.c",
diff --git a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h
index 9271328ece25..54bc562d67b7 100644
--- a/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h
+++ b/www/chromium/files/patch-third__party_boringssl_src_include_openssl_base.h
@@ -1,6 +1,6 @@
---- third_party/boringssl/src/include/openssl/base.h.orig 2022-02-07 13:39:41 UTC
+--- third_party/boringssl/src/include/openssl/base.h.orig 2022-07-22 17:30:31 UTC
+++ third_party/boringssl/src/include/openssl/base.h
-@@ -153,6 +153,11 @@ extern "C" {
+@@ -155,6 +155,11 @@ extern "C" {
#define OPENSSL_FUCHSIA
#endif
diff --git a/www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc b/www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
index ab705ee46ed1..f6a27c5e4420 100644
--- a/www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
+++ b/www/chromium/files/patch-third__party_crashpad_crashpad_minidump_minidump__misc__info__writer.cc
@@ -1,6 +1,6 @@
---- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2022-02-28 16:54:41 UTC
+--- third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc.orig 2022-07-22 17:30:31 UTC
+++ third_party/crashpad/crashpad/minidump/minidump_misc_info_writer.cc
-@@ -119,6 +119,10 @@ std::string MinidumpMiscInfoDebugBuildString() {
+@@ -159,6 +159,10 @@ std::string MinidumpMiscInfoDebugBuildString() {
static constexpr char kOS[] = "win";
#elif BUILDFLAG(IS_FUCHSIA)
static constexpr char kOS[] = "fuchsia";
diff --git a/www/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 37eb34697ad1..a9540b506096 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,9 +1,9 @@
---- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-06-17 14:20:10 UTC
+--- third_party/dawn/include/dawn/native/VulkanBackend.h.orig 2022-07-22 17:30:31 UTC
+++ third_party/dawn/include/dawn/native/VulkanBackend.h
-@@ -69,7 +69,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
+@@ -70,7 +70,7 @@ struct ExternalImageExportInfoVk : ExternalImageExport
};
- // Can't use DAWN_PLATFORM_LINUX since header included in both Dawn and Chrome
+ // Can't use DAWN_PLATFORM_IS(LINUX) since header included in both Dawn and Chrome
-#ifdef __linux__
+#if defined(__linux__) || defined(__OpenBSD__) || defined(__FreeBSD__)
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 5a3b25383d0f..f9441bdf30c1 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,14 +1,14 @@
---- third_party/dawn/src/dawn/common/Platform.h.orig 2022-06-17 14:20:10 UTC
+--- third_party/dawn/src/dawn/common/Platform.h.orig 2022-07-22 17:30:31 UTC
+++ third_party/dawn/src/dawn/common/Platform.h
@@ -26,6 +26,11 @@
#error "Unsupported Windows platform."
#endif
+#elif defined(__OpenBSD__) || defined(__FreeBSD__)
-+# define DAWN_PLATFORM_BSD 1
-+# define DAWN_PLATFORM_LINUX 1
-+# define DAWN_PLATFORM_POSIX 1
++#define DAWN_PLATFORM_IS_LINUX 1
++#define DAWN_PLATFORM_IS_BSD 1
++#define DAWN_PLATFORM_IS_POSIX 1
+
#elif defined(__linux__)
- #define DAWN_PLATFORM_LINUX 1
- #define DAWN_PLATFORM_POSIX 1
+ #define DAWN_PLATFORM_IS_LINUX 1
+ #define DAWN_PLATFORM_IS_POSIX 1
diff --git a/www/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 a3f5e58b3437..9d4fa090d6d0 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-06-17 14:20:10 UTC
+--- third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp.orig 2022-07-22 17:30:31 UTC
+++ third_party/dawn/src/dawn/native/vulkan/BackendVk.cpp
-@@ -41,7 +41,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha
+@@ -42,7 +42,7 @@ constexpr char kSwiftshaderLibName[] = "libvk_swiftsha
#endif
- #if defined(DAWN_PLATFORM_LINUX)
--#if defined(DAWN_PLATFORM_ANDROID)
-+#if defined(DAWN_PLATFORM_ANDROID) || defined(DAWN_PLATFORM_BSD)
+ #if DAWN_PLATFORM_IS(LINUX)
+-#if DAWN_PLATFORM_IS(ANDROID)
++#if DAWN_PLATFORM_IS(ANDROID) || DAWN_PLATFORM_IS(BSD)
constexpr char kVulkanLibName[] = "libvulkan.so";
#else
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 057dd911c818..96437337df10 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-06-17 14:20:10 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm.orig 2022-07-28 06:05:58 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.asm
-@@ -0,0 +1,2770 @@
+@@ -0,0 +1,720 @@
+; Automatically generated by configure - do not modify!
+%define ARCH_AARCH64 0
+%define ARCH_ALPHA 0
@@ -50,6 +50,7 @@
+%define HAVE_AVX 1
+%define HAVE_AVX2 1
+%define HAVE_AVX512 1
++%define HAVE_AVX512ICL 1
+%define HAVE_FMA3 1
+%define HAVE_FMA4 1
+%define HAVE_MMX 1
@@ -97,6 +98,7 @@
+%define HAVE_AVX_EXTERNAL 1
+%define HAVE_AVX2_EXTERNAL 1
+%define HAVE_AVX512_EXTERNAL 1
++%define HAVE_AVX512ICL_EXTERNAL 0
+%define HAVE_FMA3_EXTERNAL 1
+%define HAVE_FMA4_EXTERNAL 1
+%define HAVE_MMX_EXTERNAL 1
@@ -144,6 +146,7 @@
+%define HAVE_AVX_INLINE 1
+%define HAVE_AVX2_INLINE 1
+%define HAVE_AVX512_INLINE 1
++%define HAVE_AVX512ICL_INLINE 1
+%define HAVE_FMA3_INLINE 1
+%define HAVE_FMA4_INLINE 1
+%define HAVE_MMX_INLINE 1
@@ -229,7 +232,7 @@
+%define HAVE_TERMIOS_H 1
+%define HAVE_UDPLITE_H 0
+%define HAVE_UNISTD_H 1
-+%define HAVE_VALGRIND_VALGRIND_H 0
++%define HAVE_VALGRIND_VALGRIND_H 0 ; %define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440
+%define HAVE_WINDOWS_H 0
+%define HAVE_WINSOCK2_H 0
+%define HAVE_INTRINSICS_NEON 0
@@ -277,6 +280,7 @@
+%define HAVE_COMMANDLINETOARGVW 0
+%define HAVE_FCNTL 1
+%define HAVE_GETADDRINFO 0
++%define HAVE_GETAUXVAL 0
+%define HAVE_GETHRTIME 0
+%define HAVE_GETOPT 1
+%define HAVE_GETMODULEHANDLE 0
@@ -316,7 +320,7 @@
+%define HAVE_SLEEP 0
+%define HAVE_STRERROR_R 1
+%define HAVE_SYSCONF 1
-+%define HAVE_SYSCTL 1
++%define HAVE_SYSCTL 0
+%define HAVE_USLEEP 1
+%define HAVE_UTGETOSTYPEFROMSTRING 0
+%define HAVE_VIRTUALALLOC 0
@@ -562,7 +566,6 @@
+%define CONFIG_VIDEOTOOLBOX 0
+%define CONFIG_VULKAN 0
+%define CONFIG_V4L2_M2M 0
-+%define CONFIG_XVMC 0
+%define CONFIG_FTRAPV 0
+%define CONFIG_GRAY 0
+%define CONFIG_HARDCODED_TABLES 0
@@ -594,7 +597,6 @@
+%define CONFIG_FAST_UNALIGNED 1
+%define CONFIG_FFT 1
+%define CONFIG_LSP 0
-+%define CONFIG_LZO 0
+%define CONFIG_MDCT 1
+%define CONFIG_PIXELUTILS 0
+%define CONFIG_NETWORK 0
@@ -639,6 +641,7 @@
+%define CONFIG_CBS_JPEG 0
+%define CONFIG_CBS_MPEG2 0
+%define CONFIG_CBS_VP9 0
++%define CONFIG_DEFLATE_WRAPPER 0
+%define CONFIG_DIRAC_PARSE 1
+%define CONFIG_DNN 0
+%define CONFIG_DOVI_RPU 0
@@ -667,6 +670,7 @@
+%define CONFIG_IDCTDSP 0
+%define CONFIG_IIRFILTER 0
+%define CONFIG_MDCT15 1
++%define CONFIG_INFLATE_WRAPPER 0
+%define CONFIG_INTRAX8 0
+%define CONFIG_ISO_MEDIA 1
+%define CONFIG_IVIDSP 0
@@ -717,2057 +721,3 @@
+%define CONFIG_VP8DSP 1
+%define CONFIG_WMA_FREQS 0
+%define CONFIG_WMV2DSP 0
-+%define CONFIG_AAC_ADTSTOASC_BSF 0
-+%define CONFIG_AV1_FRAME_MERGE_BSF 0
-+%define CONFIG_AV1_FRAME_SPLIT_BSF 0
-+%define CONFIG_AV1_METADATA_BSF 0
-+%define CONFIG_CHOMP_BSF 0
-+%define CONFIG_DUMP_EXTRADATA_BSF 0
-+%define CONFIG_DCA_CORE_BSF 0
-+%define CONFIG_EAC3_CORE_BSF 0
-+%define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+%define CONFIG_FILTER_UNITS_BSF 0
-+%define CONFIG_H264_METADATA_BSF 0
-+%define CONFIG_H264_MP4TOANNEXB_BSF 0
-+%define CONFIG_H264_REDUNDANT_PPS_BSF 0
-+%define CONFIG_HAPQA_EXTRACT_BSF 0
-+%define CONFIG_HEVC_METADATA_BSF 0
-+%define CONFIG_HEVC_MP4TOANNEXB_BSF 0
-+%define CONFIG_IMX_DUMP_HEADER_BSF 0
-+%define CONFIG_MJPEG2JPEG_BSF 0
-+%define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+%define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
-+%define CONFIG_MPEG2_METADATA_BSF 0
-+%define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
-+%define CONFIG_MOV2TEXTSUB_BSF 0
-+%define CONFIG_NOISE_BSF 0
-+%define CONFIG_NULL_BSF 0
-+%define CONFIG_OPUS_METADATA_BSF 0
-+%define CONFIG_PCM_RECHUNK_BSF 0
-+%define CONFIG_PRORES_METADATA_BSF 0
-+%define CONFIG_REMOVE_EXTRADATA_BSF 0
-+%define CONFIG_SETTS_BSF 0
-+%define CONFIG_TEXT2MOVSUB_BSF 0
-+%define CONFIG_TRACE_HEADERS_BSF 0
-+%define CONFIG_TRUEHD_CORE_BSF 0
-+%define CONFIG_VP9_METADATA_BSF 0
-+%define CONFIG_VP9_RAW_REORDER_BSF 0
-+%define CONFIG_VP9_SUPERFRAME_BSF 0
-+%define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
-+%define CONFIG_AASC_DECODER 0
-+%define CONFIG_AIC_DECODER 0
-+%define CONFIG_ALIAS_PIX_DECODER 0
-+%define CONFIG_AGM_DECODER 0
-+%define CONFIG_AMV_DECODER 0
-+%define CONFIG_ANM_DECODER 0
-+%define CONFIG_ANSI_DECODER 0
-+%define CONFIG_APNG_DECODER 0
-+%define CONFIG_ARBC_DECODER 0
-+%define CONFIG_ARGO_DECODER 0
-+%define CONFIG_ASV1_DECODER 0
-+%define CONFIG_ASV2_DECODER 0
-+%define CONFIG_AURA_DECODER 0
-+%define CONFIG_AURA2_DECODER 0
-+%define CONFIG_AVRP_DECODER 0
-+%define CONFIG_AVRN_DECODER 0
-+%define CONFIG_AVS_DECODER 0
-+%define CONFIG_AVUI_DECODER 0
-+%define CONFIG_AYUV_DECODER 0
-+%define CONFIG_BETHSOFTVID_DECODER 0
-+%define CONFIG_BFI_DECODER 0
-+%define CONFIG_BINK_DECODER 0
-+%define CONFIG_BITPACKED_DECODER 0
-+%define CONFIG_BMP_DECODER 0
-+%define CONFIG_BMV_VIDEO_DECODER 0
-+%define CONFIG_BRENDER_PIX_DECODER 0
-+%define CONFIG_C93_DECODER 0
-+%define CONFIG_CAVS_DECODER 0
-+%define CONFIG_CDGRAPHICS_DECODER 0
-+%define CONFIG_CDTOONS_DECODER 0
-+%define CONFIG_CDXL_DECODER 0
-+%define CONFIG_CFHD_DECODER 0
-+%define CONFIG_CINEPAK_DECODER 0
-+%define CONFIG_CLEARVIDEO_DECODER 0
-+%define CONFIG_CLJR_DECODER 0
-+%define CONFIG_CLLC_DECODER 0
-+%define CONFIG_COMFORTNOISE_DECODER 0
-+%define CONFIG_CPIA_DECODER 0
-+%define CONFIG_CRI_DECODER 0
-+%define CONFIG_CSCD_DECODER 0
-+%define CONFIG_CYUV_DECODER 0
-+%define CONFIG_DDS_DECODER 0
-+%define CONFIG_DFA_DECODER 0
-+%define CONFIG_DIRAC_DECODER 0
-+%define CONFIG_DNXHD_DECODER 0
-+%define CONFIG_DPX_DECODER 0
-+%define CONFIG_DSICINVIDEO_DECODER 0
-+%define CONFIG_DVAUDIO_DECODER 0
-+%define CONFIG_DVVIDEO_DECODER 0
-+%define CONFIG_DXA_DECODER 0
-+%define CONFIG_DXTORY_DECODER 0
-+%define CONFIG_DXV_DECODER 0
-+%define CONFIG_EACMV_DECODER 0
-+%define CONFIG_EAMAD_DECODER 0
-+%define CONFIG_EATGQ_DECODER 0
-+%define CONFIG_EATGV_DECODER 0
-+%define CONFIG_EATQI_DECODER 0
-+%define CONFIG_EIGHTBPS_DECODER 0
-+%define CONFIG_EIGHTSVX_EXP_DECODER 0
-+%define CONFIG_EIGHTSVX_FIB_DECODER 0
-+%define CONFIG_ESCAPE124_DECODER 0
-+%define CONFIG_ESCAPE130_DECODER 0
-+%define CONFIG_EXR_DECODER 0
-+%define CONFIG_FFV1_DECODER 0
-+%define CONFIG_FFVHUFF_DECODER 0
-+%define CONFIG_FIC_DECODER 0
-+%define CONFIG_FITS_DECODER 0
-+%define CONFIG_FLASHSV_DECODER 0
-+%define CONFIG_FLASHSV2_DECODER 0
-+%define CONFIG_FLIC_DECODER 0
-+%define CONFIG_FLV_DECODER 0
-+%define CONFIG_FMVC_DECODER 0
-+%define CONFIG_FOURXM_DECODER 0
-+%define CONFIG_FRAPS_DECODER 0
-+%define CONFIG_FRWU_DECODER 0
-+%define CONFIG_G2M_DECODER 0
-+%define CONFIG_GDV_DECODER 0
-+%define CONFIG_GEM_DECODER 0
-+%define CONFIG_GIF_DECODER 0
-+%define CONFIG_H261_DECODER 0
-+%define CONFIG_H263_DECODER 0
-+%define CONFIG_H263I_DECODER 0
-+%define CONFIG_H263P_DECODER 0
-+%define CONFIG_H263_V4L2M2M_DECODER 0
-+%define CONFIG_H264_DECODER 1
-+%define CONFIG_H264_CRYSTALHD_DECODER 0
-+%define CONFIG_H264_V4L2M2M_DECODER 0
-+%define CONFIG_H264_MEDIACODEC_DECODER 0
-+%define CONFIG_H264_MMAL_DECODER 0
-+%define CONFIG_H264_QSV_DECODER 0
-+%define CONFIG_H264_RKMPP_DECODER 0
-+%define CONFIG_HAP_DECODER 0
-+%define CONFIG_HEVC_DECODER 0
-+%define CONFIG_HEVC_QSV_DECODER 0
-+%define CONFIG_HEVC_RKMPP_DECODER 0
-+%define CONFIG_HEVC_V4L2M2M_DECODER 0
-+%define CONFIG_HNM4_VIDEO_DECODER 0
-+%define CONFIG_HQ_HQA_DECODER 0
-+%define CONFIG_HQX_DECODER 0
-+%define CONFIG_HUFFYUV_DECODER 0
-+%define CONFIG_HYMT_DECODER 0
-+%define CONFIG_IDCIN_DECODER 0
-+%define CONFIG_IFF_ILBM_DECODER 0
-+%define CONFIG_IMM4_DECODER 0
-+%define CONFIG_IMM5_DECODER 0
-+%define CONFIG_INDEO2_DECODER 0
-+%define CONFIG_INDEO3_DECODER 0
-+%define CONFIG_INDEO4_DECODER 0
-+%define CONFIG_INDEO5_DECODER 0
-+%define CONFIG_INTERPLAY_VIDEO_DECODER 0
-+%define CONFIG_IPU_DECODER 0
-+%define CONFIG_JPEG2000_DECODER 0
-+%define CONFIG_JPEGLS_DECODER 0
-+%define CONFIG_JV_DECODER 0
-+%define CONFIG_KGV1_DECODER 0
-+%define CONFIG_KMVC_DECODER 0
-+%define CONFIG_LAGARITH_DECODER 0
-+%define CONFIG_LOCO_DECODER 0
-+%define CONFIG_LSCR_DECODER 0
-+%define CONFIG_M101_DECODER 0
-+%define CONFIG_MAGICYUV_DECODER 0
-+%define CONFIG_MDEC_DECODER 0
-+%define CONFIG_MIMIC_DECODER 0
-+%define CONFIG_MJPEG_DECODER 0
-+%define CONFIG_MJPEGB_DECODER 0
-+%define CONFIG_MMVIDEO_DECODER 0
-+%define CONFIG_MOBICLIP_DECODER 0
-+%define CONFIG_MOTIONPIXELS_DECODER 0
-+%define CONFIG_MPEG1VIDEO_DECODER 0
-+%define CONFIG_MPEG2VIDEO_DECODER 0
-+%define CONFIG_MPEG4_DECODER 0
-+%define CONFIG_MPEG4_CRYSTALHD_DECODER 0
-+%define CONFIG_MPEG4_V4L2M2M_DECODER 0
-+%define CONFIG_MPEG4_MMAL_DECODER 0
-+%define CONFIG_MPEGVIDEO_DECODER 0
-+%define CONFIG_MPEG1_V4L2M2M_DECODER 0
-+%define CONFIG_MPEG2_MMAL_DECODER 0
-+%define CONFIG_MPEG2_CRYSTALHD_DECODER 0
-+%define CONFIG_MPEG2_V4L2M2M_DECODER 0
-+%define CONFIG_MPEG2_QSV_DECODER 0
-+%define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-+%define CONFIG_MSA1_DECODER 0
-+%define CONFIG_MSCC_DECODER 0
-+%define CONFIG_MSMPEG4V1_DECODER 0
-+%define CONFIG_MSMPEG4V2_DECODER 0
-+%define CONFIG_MSMPEG4V3_DECODER 0
-+%define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
-+%define CONFIG_MSP2_DECODER 0
-+%define CONFIG_MSRLE_DECODER 0
-+%define CONFIG_MSS1_DECODER 0
-+%define CONFIG_MSS2_DECODER 0
-+%define CONFIG_MSVIDEO1_DECODER 0
-+%define CONFIG_MSZH_DECODER 0
-+%define CONFIG_MTS2_DECODER 0
-+%define CONFIG_MV30_DECODER 0
-+%define CONFIG_MVC1_DECODER 0
-+%define CONFIG_MVC2_DECODER 0
-+%define CONFIG_MVDV_DECODER 0
-+%define CONFIG_MVHA_DECODER 0
-+%define CONFIG_MWSC_DECODER 0
-+%define CONFIG_MXPEG_DECODER 0
-+%define CONFIG_NOTCHLC_DECODER 0
-+%define CONFIG_NUV_DECODER 0
-+%define CONFIG_PAF_VIDEO_DECODER 0
-+%define CONFIG_PAM_DECODER 0
-+%define CONFIG_PBM_DECODER 0
-+%define CONFIG_PCX_DECODER 0
-+%define CONFIG_PFM_DECODER 0
-+%define CONFIG_PGM_DECODER 0
-+%define CONFIG_PGMYUV_DECODER 0
-+%define CONFIG_PGX_DECODER 0
-+%define CONFIG_PHOTOCD_DECODER 0
-+%define CONFIG_PICTOR_DECODER 0
-+%define CONFIG_PIXLET_DECODER 0
-+%define CONFIG_PNG_DECODER 0
-+%define CONFIG_PPM_DECODER 0
-+%define CONFIG_PRORES_DECODER 0
-+%define CONFIG_PROSUMER_DECODER 0
-+%define CONFIG_PSD_DECODER 0
-+%define CONFIG_PTX_DECODER 0
-+%define CONFIG_QDRAW_DECODER 0
-+%define CONFIG_QPEG_DECODER 0
-+%define CONFIG_QTRLE_DECODER 0
-+%define CONFIG_R10K_DECODER 0
-+%define CONFIG_R210_DECODER 0
-+%define CONFIG_RASC_DECODER 0
-+%define CONFIG_RAWVIDEO_DECODER 0
-+%define CONFIG_RL2_DECODER 0
-+%define CONFIG_ROQ_DECODER 0
-+%define CONFIG_RPZA_DECODER 0
-+%define CONFIG_RSCC_DECODER 0
-+%define CONFIG_RV10_DECODER 0
-+%define CONFIG_RV20_DECODER 0
-+%define CONFIG_RV30_DECODER 0
-+%define CONFIG_RV40_DECODER 0
-+%define CONFIG_S302M_DECODER 0
-+%define CONFIG_SANM_DECODER 0
-+%define CONFIG_SCPR_DECODER 0
-+%define CONFIG_SCREENPRESSO_DECODER 0
-+%define CONFIG_SGA_DECODER 0
-+%define CONFIG_SGI_DECODER 0
-+%define CONFIG_SGIRLE_DECODER 0
-+%define CONFIG_SHEERVIDEO_DECODER 0
-+%define CONFIG_SIMBIOSIS_IMX_DECODER 0
-+%define CONFIG_SMACKER_DECODER 0
-+%define CONFIG_SMC_DECODER 0
-+%define CONFIG_SMVJPEG_DECODER 0
-+%define CONFIG_SNOW_DECODER 0
-+%define CONFIG_SP5X_DECODER 0
-+%define CONFIG_SPEEDHQ_DECODER 0
-+%define CONFIG_SPEEX_DECODER 0
-+%define CONFIG_SRGC_DECODER 0
-+%define CONFIG_SUNRAST_DECODER 0
-+%define CONFIG_SVQ1_DECODER 0
-+%define CONFIG_SVQ3_DECODER 0
-+%define CONFIG_TARGA_DECODER 0
-+%define CONFIG_TARGA_Y216_DECODER 0
-+%define CONFIG_TDSC_DECODER 0
-+%define CONFIG_THEORA_DECODER 1
-+%define CONFIG_THP_DECODER 0
-+%define CONFIG_TIERTEXSEQVIDEO_DECODER 0
-+%define CONFIG_TIFF_DECODER 0
-+%define CONFIG_TMV_DECODER 0
-+%define CONFIG_TRUEMOTION1_DECODER 0
-+%define CONFIG_TRUEMOTION2_DECODER 0
-+%define CONFIG_TRUEMOTION2RT_DECODER 0
-+%define CONFIG_TSCC_DECODER 0
-+%define CONFIG_TSCC2_DECODER 0
-+%define CONFIG_TXD_DECODER 0
-+%define CONFIG_ULTI_DECODER 0
-+%define CONFIG_UTVIDEO_DECODER 0
-+%define CONFIG_V210_DECODER 0
-+%define CONFIG_V210X_DECODER 0
-+%define CONFIG_V308_DECODER 0
-+%define CONFIG_V408_DECODER 0
-+%define CONFIG_V410_DECODER 0
-+%define CONFIG_VB_DECODER 0
-+%define CONFIG_VBLE_DECODER 0
-+%define CONFIG_VC1_DECODER 0
-+%define CONFIG_VC1_CRYSTALHD_DECODER 0
-+%define CONFIG_VC1IMAGE_DECODER 0
-+%define CONFIG_VC1_MMAL_DECODER 0
-+%define CONFIG_VC1_QSV_DECODER 0
-+%define CONFIG_VC1_V4L2M2M_DECODER 0
-+%define CONFIG_VCR1_DECODER 0
-+%define CONFIG_VMDVIDEO_DECODER 0
-+%define CONFIG_VMNC_DECODER 0
-+%define CONFIG_VP3_DECODER 1
-+%define CONFIG_VP4_DECODER 0
-+%define CONFIG_VP5_DECODER 0
-+%define CONFIG_VP6_DECODER 0
-+%define CONFIG_VP6A_DECODER 0
-+%define CONFIG_VP6F_DECODER 0
-+%define CONFIG_VP7_DECODER 0
-+%define CONFIG_VP8_DECODER 1
-+%define CONFIG_VP8_RKMPP_DECODER 0
-+%define CONFIG_VP8_V4L2M2M_DECODER 0
-+%define CONFIG_VP9_DECODER 0
-+%define CONFIG_VP9_RKMPP_DECODER 0
-+%define CONFIG_VP9_V4L2M2M_DECODER 0
-+%define CONFIG_VQA_DECODER 0
-+%define CONFIG_WEBP_DECODER 0
-+%define CONFIG_WCMV_DECODER 0
-+%define CONFIG_WRAPPED_AVFRAME_DECODER 0
-+%define CONFIG_WMV1_DECODER 0
-+%define CONFIG_WMV2_DECODER 0
-+%define CONFIG_WMV3_DECODER 0
-+%define CONFIG_WMV3_CRYSTALHD_DECODER 0
-+%define CONFIG_WMV3IMAGE_DECODER 0
-+%define CONFIG_WNV1_DECODER 0
-+%define CONFIG_XAN_WC3_DECODER 0
-+%define CONFIG_XAN_WC4_DECODER 0
-+%define CONFIG_XBM_DECODER 0
-+%define CONFIG_XFACE_DECODER 0
-+%define CONFIG_XL_DECODER 0
-+%define CONFIG_XPM_DECODER 0
-+%define CONFIG_XWD_DECODER 0
-+%define CONFIG_Y41P_DECODER 0
-+%define CONFIG_YLC_DECODER 0
-+%define CONFIG_YOP_DECODER 0
-+%define CONFIG_YUV4_DECODER 0
-+%define CONFIG_ZERO12V_DECODER 0
-+%define CONFIG_ZEROCODEC_DECODER 0
-+%define CONFIG_ZLIB_DECODER 0
-+%define CONFIG_ZMBV_DECODER 0
-+%define CONFIG_AAC_DECODER 1
-+%define CONFIG_AAC_FIXED_DECODER 0
-+%define CONFIG_AAC_LATM_DECODER 0
-+%define CONFIG_AC3_DECODER 0
-+%define CONFIG_AC3_FIXED_DECODER 0
-+%define CONFIG_ACELP_KELVIN_DECODER 0
-+%define CONFIG_ALAC_DECODER 0
-+%define CONFIG_ALS_DECODER 0
-+%define CONFIG_AMRNB_DECODER 0
-+%define CONFIG_AMRWB_DECODER 0
-+%define CONFIG_APE_DECODER 0
-+%define CONFIG_APTX_DECODER 0
-+%define CONFIG_APTX_HD_DECODER 0
-+%define CONFIG_ATRAC1_DECODER 0
-+%define CONFIG_ATRAC3_DECODER 0
-+%define CONFIG_ATRAC3AL_DECODER 0
-+%define CONFIG_ATRAC3P_DECODER 0
-+%define CONFIG_ATRAC3PAL_DECODER 0
-+%define CONFIG_ATRAC9_DECODER 0
-+%define CONFIG_BINKAUDIO_DCT_DECODER 0
-+%define CONFIG_BINKAUDIO_RDFT_DECODER 0
-+%define CONFIG_BMV_AUDIO_DECODER 0
-+%define CONFIG_COOK_DECODER 0
-+%define CONFIG_DCA_DECODER 0
-+%define CONFIG_DOLBY_E_DECODER 0
-+%define CONFIG_DSD_LSBF_DECODER 0
-+%define CONFIG_DSD_MSBF_DECODER 0
-+%define CONFIG_DSD_LSBF_PLANAR_DECODER 0
-+%define CONFIG_DSD_MSBF_PLANAR_DECODER 0
-+%define CONFIG_DSICINAUDIO_DECODER 0
-+%define CONFIG_DSS_SP_DECODER 0
-+%define CONFIG_DST_DECODER 0
-+%define CONFIG_EAC3_DECODER 0
-+%define CONFIG_EVRC_DECODER 0
-+%define CONFIG_FASTAUDIO_DECODER 0
-+%define CONFIG_FFWAVESYNTH_DECODER 0
-+%define CONFIG_FLAC_DECODER 1
-+%define CONFIG_G723_1_DECODER 0
-+%define CONFIG_G729_DECODER 0
-+%define CONFIG_GSM_DECODER 0
-+%define CONFIG_GSM_MS_DECODER 0
-+%define CONFIG_HCA_DECODER 0
-+%define CONFIG_HCOM_DECODER 0
-+%define CONFIG_IAC_DECODER 0
-+%define CONFIG_ILBC_DECODER 0
-+%define CONFIG_IMC_DECODER 0
-+%define CONFIG_INTERPLAY_ACM_DECODER 0
-+%define CONFIG_MACE3_DECODER 0
-+%define CONFIG_MACE6_DECODER 0
-+%define CONFIG_METASOUND_DECODER 0
-+%define CONFIG_MLP_DECODER 0
-+%define CONFIG_MP1_DECODER 0
-+%define CONFIG_MP1FLOAT_DECODER 0
-+%define CONFIG_MP2_DECODER 0
-+%define CONFIG_MP2FLOAT_DECODER 0
-+%define CONFIG_MP3FLOAT_DECODER 0
-+%define CONFIG_MP3_DECODER 1
-+%define CONFIG_MP3ADUFLOAT_DECODER 0
-+%define CONFIG_MP3ADU_DECODER 0
-+%define CONFIG_MP3ON4FLOAT_DECODER 0
-+%define CONFIG_MP3ON4_DECODER 0
-+%define CONFIG_MPC7_DECODER 0
-+%define CONFIG_MPC8_DECODER 0
-+%define CONFIG_MSNSIREN_DECODER 0
-+%define CONFIG_NELLYMOSER_DECODER 0
-+%define CONFIG_ON2AVC_DECODER 0
-+%define CONFIG_OPUS_DECODER 0
-+%define CONFIG_PAF_AUDIO_DECODER 0
-+%define CONFIG_QCELP_DECODER 0
-+%define CONFIG_QDM2_DECODER 0
-+%define CONFIG_QDMC_DECODER 0
-+%define CONFIG_RA_144_DECODER 0
-+%define CONFIG_RA_288_DECODER 0
-+%define CONFIG_RALF_DECODER 0
-+%define CONFIG_SBC_DECODER 0
-+%define CONFIG_SHORTEN_DECODER 0
-+%define CONFIG_SIPR_DECODER 0
-+%define CONFIG_SIREN_DECODER 0
-+%define CONFIG_SMACKAUD_DECODER 0
-+%define CONFIG_SONIC_DECODER 0
-+%define CONFIG_TAK_DECODER 0
-+%define CONFIG_TRUEHD_DECODER 0
-+%define CONFIG_TRUESPEECH_DECODER 0
-+%define CONFIG_TTA_DECODER 0
-+%define CONFIG_TWINVQ_DECODER 0
-+%define CONFIG_VMDAUDIO_DECODER 0
-+%define CONFIG_VORBIS_DECODER 1
-+%define CONFIG_WAVPACK_DECODER 0
-+%define CONFIG_WMALOSSLESS_DECODER 0
-+%define CONFIG_WMAPRO_DECODER 0
-+%define CONFIG_WMAV1_DECODER 0
-+%define CONFIG_WMAV2_DECODER 0
-+%define CONFIG_WMAVOICE_DECODER 0
-+%define CONFIG_WS_SND1_DECODER 0
-+%define CONFIG_XMA1_DECODER 0
-+%define CONFIG_XMA2_DECODER 0
-+%define CONFIG_PCM_ALAW_DECODER 1
-+%define CONFIG_PCM_BLURAY_DECODER 0
-+%define CONFIG_PCM_DVD_DECODER 0
-+%define CONFIG_PCM_F16LE_DECODER 0
-+%define CONFIG_PCM_F24LE_DECODER 0
-+%define CONFIG_PCM_F32BE_DECODER 0
-+%define CONFIG_PCM_F32LE_DECODER 1
-+%define CONFIG_PCM_F64BE_DECODER 0
-+%define CONFIG_PCM_F64LE_DECODER 0
-+%define CONFIG_PCM_LXF_DECODER 0
-+%define CONFIG_PCM_MULAW_DECODER 1
-+%define CONFIG_PCM_S8_DECODER 0
-+%define CONFIG_PCM_S8_PLANAR_DECODER 0
-+%define CONFIG_PCM_S16BE_DECODER 1
-+%define CONFIG_PCM_S16BE_PLANAR_DECODER 0
-+%define CONFIG_PCM_S16LE_DECODER 1
-+%define CONFIG_PCM_S16LE_PLANAR_DECODER 0
-+%define CONFIG_PCM_S24BE_DECODER 1
-+%define CONFIG_PCM_S24DAUD_DECODER 0
-+%define CONFIG_PCM_S24LE_DECODER 1
-+%define CONFIG_PCM_S24LE_PLANAR_DECODER 0
-+%define CONFIG_PCM_S32BE_DECODER 0
-+%define CONFIG_PCM_S32LE_DECODER 1
-+%define CONFIG_PCM_S32LE_PLANAR_DECODER 0
-+%define CONFIG_PCM_S64BE_DECODER 0
-+%define CONFIG_PCM_S64LE_DECODER 0
-+%define CONFIG_PCM_SGA_DECODER 0
-+%define CONFIG_PCM_U8_DECODER 1
-+%define CONFIG_PCM_U16BE_DECODER 0
-+%define CONFIG_PCM_U16LE_DECODER 0
-+%define CONFIG_PCM_U24BE_DECODER 0
-+%define CONFIG_PCM_U24LE_DECODER 0
-+%define CONFIG_PCM_U32BE_DECODER 0
-+%define CONFIG_PCM_U32LE_DECODER 0
-+%define CONFIG_PCM_VIDC_DECODER 0
-+%define CONFIG_DERF_DPCM_DECODER 0
-+%define CONFIG_GREMLIN_DPCM_DECODER 0
-+%define CONFIG_INTERPLAY_DPCM_DECODER 0
-+%define CONFIG_ROQ_DPCM_DECODER 0
-+%define CONFIG_SDX2_DPCM_DECODER 0
-+%define CONFIG_SOL_DPCM_DECODER 0
-+%define CONFIG_XAN_DPCM_DECODER 0
-+%define CONFIG_ADPCM_4XM_DECODER 0
-+%define CONFIG_ADPCM_ADX_DECODER 0
-+%define CONFIG_ADPCM_AFC_DECODER 0
-+%define CONFIG_ADPCM_AGM_DECODER 0
-+%define CONFIG_ADPCM_AICA_DECODER 0
-+%define CONFIG_ADPCM_ARGO_DECODER 0
-+%define CONFIG_ADPCM_CT_DECODER 0
-+%define CONFIG_ADPCM_DTK_DECODER 0
-+%define CONFIG_ADPCM_EA_DECODER 0
-+%define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
-+%define CONFIG_ADPCM_EA_R1_DECODER 0
-+%define CONFIG_ADPCM_EA_R2_DECODER 0
-+%define CONFIG_ADPCM_EA_R3_DECODER 0
-+%define CONFIG_ADPCM_EA_XAS_DECODER 0
-+%define CONFIG_ADPCM_G722_DECODER 0
-+%define CONFIG_ADPCM_G726_DECODER 0
-+%define CONFIG_ADPCM_G726LE_DECODER 0
-+%define CONFIG_ADPCM_IMA_ACORN_DECODER 0
-+%define CONFIG_ADPCM_IMA_AMV_DECODER 0
-+%define CONFIG_ADPCM_IMA_ALP_DECODER 0
-+%define CONFIG_ADPCM_IMA_APC_DECODER 0
-+%define CONFIG_ADPCM_IMA_APM_DECODER 0
-+%define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
-+%define CONFIG_ADPCM_IMA_DAT4_DECODER 0
-+%define CONFIG_ADPCM_IMA_DK3_DECODER 0
-+%define CONFIG_ADPCM_IMA_DK4_DECODER 0
-+%define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
-+%define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
-+%define CONFIG_ADPCM_IMA_ISS_DECODER 0
-+%define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
-+%define CONFIG_ADPCM_IMA_MTF_DECODER 0
-+%define CONFIG_ADPCM_IMA_OKI_DECODER 0
-+%define CONFIG_ADPCM_IMA_QT_DECODER 0
-+%define CONFIG_ADPCM_IMA_RAD_DECODER 0
-+%define CONFIG_ADPCM_IMA_SSI_DECODER 0
-+%define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
-+%define CONFIG_ADPCM_IMA_WAV_DECODER 0
-+%define CONFIG_ADPCM_IMA_WS_DECODER 0
-+%define CONFIG_ADPCM_MS_DECODER 0
-+%define CONFIG_ADPCM_MTAF_DECODER 0
-+%define CONFIG_ADPCM_PSX_DECODER 0
-+%define CONFIG_ADPCM_SBPRO_2_DECODER 0
-+%define CONFIG_ADPCM_SBPRO_3_DECODER 0
-+%define CONFIG_ADPCM_SBPRO_4_DECODER 0
-+%define CONFIG_ADPCM_SWF_DECODER 0
-+%define CONFIG_ADPCM_THP_DECODER 0
-+%define CONFIG_ADPCM_THP_LE_DECODER 0
-+%define CONFIG_ADPCM_VIMA_DECODER 0
-+%define CONFIG_ADPCM_XA_DECODER 0
-+%define CONFIG_ADPCM_YAMAHA_DECODER 0
-+%define CONFIG_ADPCM_ZORK_DECODER 0
-+%define CONFIG_SSA_DECODER 0
-+%define CONFIG_ASS_DECODER 0
-+%define CONFIG_CCAPTION_DECODER 0
-+%define CONFIG_DVBSUB_DECODER 0
-+%define CONFIG_DVDSUB_DECODER 0
-+%define CONFIG_JACOSUB_DECODER 0
-+%define CONFIG_MICRODVD_DECODER 0
-+%define CONFIG_MOVTEXT_DECODER 0
-+%define CONFIG_MPL2_DECODER 0
-+%define CONFIG_PGSSUB_DECODER 0
-+%define CONFIG_PJS_DECODER 0
-+%define CONFIG_REALTEXT_DECODER 0
-+%define CONFIG_SAMI_DECODER 0
-+%define CONFIG_SRT_DECODER 0
-+%define CONFIG_STL_DECODER 0
-+%define CONFIG_SUBRIP_DECODER 0
-+%define CONFIG_SUBVIEWER_DECODER 0
-+%define CONFIG_SUBVIEWER1_DECODER 0
-+%define CONFIG_TEXT_DECODER 0
-+%define CONFIG_VPLAYER_DECODER 0
-+%define CONFIG_WEBVTT_DECODER 0
-+%define CONFIG_XSUB_DECODER 0
-+%define CONFIG_AAC_AT_DECODER 0
-+%define CONFIG_AC3_AT_DECODER 0
-+%define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
-+%define CONFIG_ALAC_AT_DECODER 0
-+%define CONFIG_AMR_NB_AT_DECODER 0
-+%define CONFIG_EAC3_AT_DECODER 0
-+%define CONFIG_GSM_MS_AT_DECODER 0
-+%define CONFIG_ILBC_AT_DECODER 0
-+%define CONFIG_MP1_AT_DECODER 0
-+%define CONFIG_MP2_AT_DECODER 0
-+%define CONFIG_MP3_AT_DECODER 0
-+%define CONFIG_PCM_ALAW_AT_DECODER 0
-+%define CONFIG_PCM_MULAW_AT_DECODER 0
-+%define CONFIG_QDMC_AT_DECODER 0
-+%define CONFIG_QDM2_AT_DECODER 0
-+%define CONFIG_LIBARIBB24_DECODER 0
-+%define CONFIG_LIBCELT_DECODER 0
-+%define CONFIG_LIBCODEC2_DECODER 0
-+%define CONFIG_LIBDAV1D_DECODER 0
-+%define CONFIG_LIBDAVS2_DECODER 0
-+%define CONFIG_LIBFDK_AAC_DECODER 0
-+%define CONFIG_LIBGSM_DECODER 0
-+%define CONFIG_LIBGSM_MS_DECODER 0
-+%define CONFIG_LIBILBC_DECODER 0
-+%define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
-+%define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-+%define CONFIG_LIBOPENJPEG_DECODER 0
-+%define CONFIG_LIBOPUS_DECODER 1
-+%define CONFIG_LIBRSVG_DECODER 0
-+%define CONFIG_LIBSPEEX_DECODER 0
-+%define CONFIG_LIBUAVS3D_DECODER 0
-+%define CONFIG_LIBVORBIS_DECODER 0
-+%define CONFIG_LIBVPX_VP8_DECODER 0
-+%define CONFIG_LIBVPX_VP9_DECODER 0
-+%define CONFIG_LIBZVBI_TELETEXT_DECODER 0
-+%define CONFIG_BINTEXT_DECODER 0
-+%define CONFIG_XBIN_DECODER 0
-+%define CONFIG_IDF_DECODER 0
-+%define CONFIG_LIBAOM_AV1_DECODER 0
-+%define CONFIG_AV1_DECODER 0
-+%define CONFIG_AV1_CUVID_DECODER 0
-+%define CONFIG_AV1_QSV_DECODER 0
-+%define CONFIG_LIBOPENH264_DECODER 0
-+%define CONFIG_H264_CUVID_DECODER 0
-+%define CONFIG_HEVC_CUVID_DECODER 0
-+%define CONFIG_HEVC_MEDIACODEC_DECODER 0
-+%define CONFIG_MJPEG_CUVID_DECODER 0
-+%define CONFIG_MJPEG_QSV_DECODER 0
-+%define CONFIG_MPEG1_CUVID_DECODER 0
-+%define CONFIG_MPEG2_CUVID_DECODER 0
-+%define CONFIG_MPEG4_CUVID_DECODER 0
-+%define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-+%define CONFIG_VC1_CUVID_DECODER 0
-+%define CONFIG_VP8_CUVID_DECODER 0
-+%define CONFIG_VP8_MEDIACODEC_DECODER 0
-+%define CONFIG_VP8_QSV_DECODER 0
-+%define CONFIG_VP9_CUVID_DECODER 0
-+%define CONFIG_VP9_MEDIACODEC_DECODER 0
-+%define CONFIG_VP9_QSV_DECODER 0
-+%define CONFIG_A64MULTI_ENCODER 0
-+%define CONFIG_A64MULTI5_ENCODER 0
-+%define CONFIG_ALIAS_PIX_ENCODER 0
-+%define CONFIG_AMV_ENCODER 0
-+%define CONFIG_APNG_ENCODER 0
-+%define CONFIG_ASV1_ENCODER 0
-+%define CONFIG_ASV2_ENCODER 0
-+%define CONFIG_AVRP_ENCODER 0
-+%define CONFIG_AVUI_ENCODER 0
-+%define CONFIG_AYUV_ENCODER 0
-+%define CONFIG_BITPACKED_ENCODER 0
-+%define CONFIG_BMP_ENCODER 0
-+%define CONFIG_CFHD_ENCODER 0
-+%define CONFIG_CINEPAK_ENCODER 0
-+%define CONFIG_CLJR_ENCODER 0
-+%define CONFIG_COMFORTNOISE_ENCODER 0
-+%define CONFIG_DNXHD_ENCODER 0
-+%define CONFIG_DPX_ENCODER 0
-+%define CONFIG_DVVIDEO_ENCODER 0
-+%define CONFIG_EXR_ENCODER 0
-+%define CONFIG_FFV1_ENCODER 0
-+%define CONFIG_FFVHUFF_ENCODER 0
-+%define CONFIG_FITS_ENCODER 0
-+%define CONFIG_FLASHSV_ENCODER 0
-+%define CONFIG_FLASHSV2_ENCODER 0
-+%define CONFIG_FLV_ENCODER 0
-+%define CONFIG_GIF_ENCODER 0
-+%define CONFIG_H261_ENCODER 0
-+%define CONFIG_H263_ENCODER 0
-+%define CONFIG_H263P_ENCODER 0
-+%define CONFIG_HAP_ENCODER 0
-+%define CONFIG_HUFFYUV_ENCODER 0
-+%define CONFIG_JPEG2000_ENCODER 0
-+%define CONFIG_JPEGLS_ENCODER 0
-+%define CONFIG_LJPEG_ENCODER 0
-+%define CONFIG_MAGICYUV_ENCODER 0
-+%define CONFIG_MJPEG_ENCODER 0
-+%define CONFIG_MPEG1VIDEO_ENCODER 0
-+%define CONFIG_MPEG2VIDEO_ENCODER 0
-+%define CONFIG_MPEG4_ENCODER 0
-+%define CONFIG_MSMPEG4V2_ENCODER 0
-+%define CONFIG_MSMPEG4V3_ENCODER 0
-+%define CONFIG_MSVIDEO1_ENCODER 0
-+%define CONFIG_PAM_ENCODER 0
-+%define CONFIG_PBM_ENCODER 0
-+%define CONFIG_PCX_ENCODER 0
-+%define CONFIG_PFM_ENCODER 0
-+%define CONFIG_PGM_ENCODER 0
-+%define CONFIG_PGMYUV_ENCODER 0
-+%define CONFIG_PNG_ENCODER 0
-+%define CONFIG_PPM_ENCODER 0
-+%define CONFIG_PRORES_ENCODER 0
-+%define CONFIG_PRORES_AW_ENCODER 0
-+%define CONFIG_PRORES_KS_ENCODER 0
-+%define CONFIG_QTRLE_ENCODER 0
-+%define CONFIG_R10K_ENCODER 0
-+%define CONFIG_R210_ENCODER 0
-+%define CONFIG_RAWVIDEO_ENCODER 0
-+%define CONFIG_ROQ_ENCODER 0
-+%define CONFIG_RPZA_ENCODER 0
-+%define CONFIG_RV10_ENCODER 0
-+%define CONFIG_RV20_ENCODER 0
-+%define CONFIG_S302M_ENCODER 0
-+%define CONFIG_SGI_ENCODER 0
-+%define CONFIG_SMC_ENCODER 0
-+%define CONFIG_SNOW_ENCODER 0
-+%define CONFIG_SPEEDHQ_ENCODER 0
-+%define CONFIG_SUNRAST_ENCODER 0
-+%define CONFIG_SVQ1_ENCODER 0
-+%define CONFIG_TARGA_ENCODER 0
-+%define CONFIG_TIFF_ENCODER 0
-+%define CONFIG_UTVIDEO_ENCODER 0
-+%define CONFIG_V210_ENCODER 0
-+%define CONFIG_V308_ENCODER 0
-+%define CONFIG_V408_ENCODER 0
-+%define CONFIG_V410_ENCODER 0
-+%define CONFIG_VC2_ENCODER 0
-+%define CONFIG_WRAPPED_AVFRAME_ENCODER 0
-+%define CONFIG_WMV1_ENCODER 0
-+%define CONFIG_WMV2_ENCODER 0
-+%define CONFIG_XBM_ENCODER 0
-+%define CONFIG_XFACE_ENCODER 0
-+%define CONFIG_XWD_ENCODER 0
-+%define CONFIG_Y41P_ENCODER 0
-+%define CONFIG_YUV4_ENCODER 0
-+%define CONFIG_ZLIB_ENCODER 0
-+%define CONFIG_ZMBV_ENCODER 0
-+%define CONFIG_AAC_ENCODER 0
-+%define CONFIG_AC3_ENCODER 0
-+%define CONFIG_AC3_FIXED_ENCODER 0
-+%define CONFIG_ALAC_ENCODER 0
-+%define CONFIG_APTX_ENCODER 0
-+%define CONFIG_APTX_HD_ENCODER 0
-+%define CONFIG_DCA_ENCODER 0
-+%define CONFIG_EAC3_ENCODER 0
-+%define CONFIG_FLAC_ENCODER 0
-+%define CONFIG_G723_1_ENCODER 0
-+%define CONFIG_MLP_ENCODER 0
-+%define CONFIG_MP2_ENCODER 0
-+%define CONFIG_MP2FIXED_ENCODER 0
-+%define CONFIG_NELLYMOSER_ENCODER 0
-+%define CONFIG_OPUS_ENCODER 0
-+%define CONFIG_RA_144_ENCODER 0
-+%define CONFIG_SBC_ENCODER 0
-+%define CONFIG_SONIC_ENCODER 0
-+%define CONFIG_SONIC_LS_ENCODER 0
-+%define CONFIG_TRUEHD_ENCODER 0
-+%define CONFIG_TTA_ENCODER 0
-+%define CONFIG_VORBIS_ENCODER 0
-+%define CONFIG_WAVPACK_ENCODER 0
-+%define CONFIG_WMAV1_ENCODER 0
-+%define CONFIG_WMAV2_ENCODER 0
-+%define CONFIG_PCM_ALAW_ENCODER 0
-+%define CONFIG_PCM_DVD_ENCODER 0
-+%define CONFIG_PCM_F32BE_ENCODER 0
-+%define CONFIG_PCM_F32LE_ENCODER 0
-+%define CONFIG_PCM_F64BE_ENCODER 0
-+%define CONFIG_PCM_F64LE_ENCODER 0
-+%define CONFIG_PCM_MULAW_ENCODER 0
-+%define CONFIG_PCM_S8_ENCODER 0
-+%define CONFIG_PCM_S8_PLANAR_ENCODER 0
-+%define CONFIG_PCM_S16BE_ENCODER 0
-+%define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
-+%define CONFIG_PCM_S16LE_ENCODER 0
-+%define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
-+%define CONFIG_PCM_S24BE_ENCODER 0
-+%define CONFIG_PCM_S24DAUD_ENCODER 0
-+%define CONFIG_PCM_S24LE_ENCODER 0
-+%define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
-+%define CONFIG_PCM_S32BE_ENCODER 0
-+%define CONFIG_PCM_S32LE_ENCODER 0
-+%define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
-+%define CONFIG_PCM_S64BE_ENCODER 0
-+%define CONFIG_PCM_S64LE_ENCODER 0
-+%define CONFIG_PCM_U8_ENCODER 0
-+%define CONFIG_PCM_U16BE_ENCODER 0
-+%define CONFIG_PCM_U16LE_ENCODER 0
-+%define CONFIG_PCM_U24BE_ENCODER 0
-+%define CONFIG_PCM_U24LE_ENCODER 0
-+%define CONFIG_PCM_U32BE_ENCODER 0
-+%define CONFIG_PCM_U32LE_ENCODER 0
-+%define CONFIG_PCM_VIDC_ENCODER 0
-+%define CONFIG_ROQ_DPCM_ENCODER 0
-+%define CONFIG_ADPCM_ADX_ENCODER 0
-+%define CONFIG_ADPCM_ARGO_ENCODER 0
-+%define CONFIG_ADPCM_G722_ENCODER 0
-+%define CONFIG_ADPCM_G726_ENCODER 0
-+%define CONFIG_ADPCM_G726LE_ENCODER 0
-+%define CONFIG_ADPCM_IMA_AMV_ENCODER 0
-+%define CONFIG_ADPCM_IMA_ALP_ENCODER 0
-+%define CONFIG_ADPCM_IMA_APM_ENCODER 0
-+%define CONFIG_ADPCM_IMA_QT_ENCODER 0
-+%define CONFIG_ADPCM_IMA_SSI_ENCODER 0
-+%define CONFIG_ADPCM_IMA_WAV_ENCODER 0
-+%define CONFIG_ADPCM_IMA_WS_ENCODER 0
-+%define CONFIG_ADPCM_MS_ENCODER 0
-+%define CONFIG_ADPCM_SWF_ENCODER 0
-+%define CONFIG_ADPCM_YAMAHA_ENCODER 0
-+%define CONFIG_SSA_ENCODER 0
-+%define CONFIG_ASS_ENCODER 0
-+%define CONFIG_DVBSUB_ENCODER 0
-+%define CONFIG_DVDSUB_ENCODER 0
-+%define CONFIG_MOVTEXT_ENCODER 0
-+%define CONFIG_SRT_ENCODER 0
-+%define CONFIG_SUBRIP_ENCODER 0
-+%define CONFIG_TEXT_ENCODER 0
-+%define CONFIG_TTML_ENCODER 0
-+%define CONFIG_WEBVTT_ENCODER 0
-+%define CONFIG_XSUB_ENCODER 0
-+%define CONFIG_AAC_AT_ENCODER 0
-+%define CONFIG_ALAC_AT_ENCODER 0
-+%define CONFIG_ILBC_AT_ENCODER 0
-+%define CONFIG_PCM_ALAW_AT_ENCODER 0
-+%define CONFIG_PCM_MULAW_AT_ENCODER 0
-+%define CONFIG_LIBAOM_AV1_ENCODER 0
-+%define CONFIG_LIBCODEC2_ENCODER 0
-+%define CONFIG_LIBFDK_AAC_ENCODER 0
-+%define CONFIG_LIBGSM_ENCODER 0
-+%define CONFIG_LIBGSM_MS_ENCODER 0
-+%define CONFIG_LIBILBC_ENCODER 0
-+%define CONFIG_LIBMP3LAME_ENCODER 0
-+%define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+%define CONFIG_LIBOPENJPEG_ENCODER 0
-+%define CONFIG_LIBOPUS_ENCODER 0
-+%define CONFIG_LIBRAV1E_ENCODER 0
-+%define CONFIG_LIBSHINE_ENCODER 0
-+%define CONFIG_LIBSPEEX_ENCODER 0
-+%define CONFIG_LIBSVTAV1_ENCODER 0
-+%define CONFIG_LIBTHEORA_ENCODER 0
-+%define CONFIG_LIBTWOLAME_ENCODER 0
-+%define CONFIG_LIBVO_AMRWBENC_ENCODER 0
-+%define CONFIG_LIBVORBIS_ENCODER 0
-+%define CONFIG_LIBVPX_VP8_ENCODER 0
-+%define CONFIG_LIBVPX_VP9_ENCODER 0
-+%define CONFIG_LIBWEBP_ANIM_ENCODER 0
-+%define CONFIG_LIBWEBP_ENCODER 0
-+%define CONFIG_LIBX262_ENCODER 0
-+%define CONFIG_LIBX264_ENCODER 0
-+%define CONFIG_LIBX264RGB_ENCODER 0
-+%define CONFIG_LIBX265_ENCODER 0
-+%define CONFIG_LIBXAVS_ENCODER 0
-+%define CONFIG_LIBXAVS2_ENCODER 0
-+%define CONFIG_LIBXVID_ENCODER 0
-+%define CONFIG_AAC_MF_ENCODER 0
-+%define CONFIG_AC3_MF_ENCODER 0
-+%define CONFIG_H263_V4L2M2M_ENCODER 0
-+%define CONFIG_LIBOPENH264_ENCODER 0
-+%define CONFIG_H264_AMF_ENCODER 0
-+%define CONFIG_H264_MF_ENCODER 0
-+%define CONFIG_H264_NVENC_ENCODER 0
-+%define CONFIG_H264_OMX_ENCODER 0
-+%define CONFIG_H264_QSV_ENCODER 0
-+%define CONFIG_H264_V4L2M2M_ENCODER 0
-+%define CONFIG_H264_VAAPI_ENCODER 0
-+%define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
-+%define CONFIG_HEVC_AMF_ENCODER 0
-+%define CONFIG_HEVC_MF_ENCODER 0
-+%define CONFIG_HEVC_NVENC_ENCODER 0
-+%define CONFIG_HEVC_QSV_ENCODER 0
-+%define CONFIG_HEVC_V4L2M2M_ENCODER 0
-+%define CONFIG_HEVC_VAAPI_ENCODER 0
-+%define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
-+%define CONFIG_LIBKVAZAAR_ENCODER 0
-+%define CONFIG_MJPEG_QSV_ENCODER 0
-+%define CONFIG_MJPEG_VAAPI_ENCODER 0
-+%define CONFIG_MP3_MF_ENCODER 0
-+%define CONFIG_MPEG2_QSV_ENCODER 0
-+%define CONFIG_MPEG2_VAAPI_ENCODER 0
-+%define CONFIG_MPEG4_OMX_ENCODER 0
-+%define CONFIG_MPEG4_V4L2M2M_ENCODER 0
-+%define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
-+%define CONFIG_VP8_V4L2M2M_ENCODER 0
-+%define CONFIG_VP8_VAAPI_ENCODER 0
-+%define CONFIG_VP9_VAAPI_ENCODER 0
-+%define CONFIG_VP9_QSV_ENCODER 0
-+%define CONFIG_AV1_D3D11VA_HWACCEL 0
-+%define CONFIG_AV1_D3D11VA2_HWACCEL 0
-+%define CONFIG_AV1_DXVA2_HWACCEL 0
-+%define CONFIG_AV1_NVDEC_HWACCEL 0
-+%define CONFIG_AV1_VAAPI_HWACCEL 0
-+%define CONFIG_H263_VAAPI_HWACCEL 0
-+%define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-+%define CONFIG_H264_D3D11VA_HWACCEL 0
-+%define CONFIG_H264_D3D11VA2_HWACCEL 0
-+%define CONFIG_H264_DXVA2_HWACCEL 0
-+%define CONFIG_H264_NVDEC_HWACCEL 0
-+%define CONFIG_H264_VAAPI_HWACCEL 0
-+%define CONFIG_H264_VDPAU_HWACCEL 0
-+%define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
-+%define CONFIG_HEVC_D3D11VA_HWACCEL 0
-+%define CONFIG_HEVC_D3D11VA2_HWACCEL 0
-+%define CONFIG_HEVC_DXVA2_HWACCEL 0
-+%define CONFIG_HEVC_NVDEC_HWACCEL 0
-+%define CONFIG_HEVC_VAAPI_HWACCEL 0
-+%define CONFIG_HEVC_VDPAU_HWACCEL 0
-+%define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
-+%define CONFIG_MJPEG_NVDEC_HWACCEL 0
-+%define CONFIG_MJPEG_VAAPI_HWACCEL 0
-+%define CONFIG_MPEG1_NVDEC_HWACCEL 0
-+%define CONFIG_MPEG1_VDPAU_HWACCEL 0
-+%define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
-+%define CONFIG_MPEG1_XVMC_HWACCEL 0
-+%define CONFIG_MPEG2_D3D11VA_HWACCEL 0
-+%define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
-+%define CONFIG_MPEG2_NVDEC_HWACCEL 0
-+%define CONFIG_MPEG2_DXVA2_HWACCEL 0
-+%define CONFIG_MPEG2_VAAPI_HWACCEL 0
-+%define CONFIG_MPEG2_VDPAU_HWACCEL 0
-+%define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
-+%define CONFIG_MPEG2_XVMC_HWACCEL 0
-+%define CONFIG_MPEG4_NVDEC_HWACCEL 0
-+%define CONFIG_MPEG4_VAAPI_HWACCEL 0
-+%define CONFIG_MPEG4_VDPAU_HWACCEL 0
-+%define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-+%define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0
-+%define CONFIG_VC1_D3D11VA_HWACCEL 0
-+%define CONFIG_VC1_D3D11VA2_HWACCEL 0
-+%define CONFIG_VC1_DXVA2_HWACCEL 0
-+%define CONFIG_VC1_NVDEC_HWACCEL 0
-+%define CONFIG_VC1_VAAPI_HWACCEL 0
-+%define CONFIG_VC1_VDPAU_HWACCEL 0
-+%define CONFIG_VP8_NVDEC_HWACCEL 0
-+%define CONFIG_VP8_VAAPI_HWACCEL 0
-+%define CONFIG_VP9_D3D11VA_HWACCEL 0
-+%define CONFIG_VP9_D3D11VA2_HWACCEL 0
-+%define CONFIG_VP9_DXVA2_HWACCEL 0
-+%define CONFIG_VP9_NVDEC_HWACCEL 0
-+%define CONFIG_VP9_VAAPI_HWACCEL 0
-+%define CONFIG_VP9_VDPAU_HWACCEL 0
-+%define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0
-+%define CONFIG_WMV3_D3D11VA_HWACCEL 0
-+%define CONFIG_WMV3_D3D11VA2_HWACCEL 0
-+%define CONFIG_WMV3_DXVA2_HWACCEL 0
-+%define CONFIG_WMV3_NVDEC_HWACCEL 0
-+%define CONFIG_WMV3_VAAPI_HWACCEL 0
-+%define CONFIG_WMV3_VDPAU_HWACCEL 0
-+%define CONFIG_AAC_PARSER 1
-+%define CONFIG_AAC_LATM_PARSER 0
-+%define CONFIG_AC3_PARSER 0
-+%define CONFIG_ADX_PARSER 0
-+%define CONFIG_AMR_PARSER 0
-+%define CONFIG_AV1_PARSER 0
-+%define CONFIG_AVS2_PARSER 0
-+%define CONFIG_AVS3_PARSER 0
-+%define CONFIG_BMP_PARSER 0
-+%define CONFIG_CAVSVIDEO_PARSER 0
-+%define CONFIG_COOK_PARSER 0
-+%define CONFIG_CRI_PARSER 0
-+%define CONFIG_DCA_PARSER 0
-+%define CONFIG_DIRAC_PARSER 0
-+%define CONFIG_DNXHD_PARSER 0
-+%define CONFIG_DOLBY_E_PARSER 0
-+%define CONFIG_DPX_PARSER 0
-+%define CONFIG_DVAUDIO_PARSER 0
-+%define CONFIG_DVBSUB_PARSER 0
-+%define CONFIG_DVDSUB_PARSER 0
-+%define CONFIG_DVD_NAV_PARSER 0
-+%define CONFIG_FLAC_PARSER 1
-+%define CONFIG_G723_1_PARSER 0
-+%define CONFIG_G729_PARSER 0
-+%define CONFIG_GIF_PARSER 0
-+%define CONFIG_GSM_PARSER 0
-+%define CONFIG_H261_PARSER 0
-+%define CONFIG_H263_PARSER 0
-+%define CONFIG_H264_PARSER 1
-+%define CONFIG_HEVC_PARSER 0
-+%define CONFIG_IPU_PARSER 0
-+%define CONFIG_JPEG2000_PARSER 0
-+%define CONFIG_MJPEG_PARSER 0
-+%define CONFIG_MLP_PARSER 0
-+%define CONFIG_MPEG4VIDEO_PARSER 0
-+%define CONFIG_MPEGAUDIO_PARSER 1
-+%define CONFIG_MPEGVIDEO_PARSER 0
-+%define CONFIG_OPUS_PARSER 1
-+%define CONFIG_PNG_PARSER 0
-+%define CONFIG_PNM_PARSER 0
-+%define CONFIG_RV30_PARSER 0
-+%define CONFIG_RV40_PARSER 0
-+%define CONFIG_SBC_PARSER 0
-+%define CONFIG_SIPR_PARSER 0
-+%define CONFIG_TAK_PARSER 0
-+%define CONFIG_VC1_PARSER 0
-+%define CONFIG_VORBIS_PARSER 1
-+%define CONFIG_VP3_PARSER 1
-+%define CONFIG_VP8_PARSER 1
-+%define CONFIG_VP9_PARSER 1
-+%define CONFIG_WEBP_PARSER 0
-+%define CONFIG_XBM_PARSER 0
-+%define CONFIG_XMA_PARSER 0
-+%define CONFIG_ALSA_INDEV 0
-+%define CONFIG_ANDROID_CAMERA_INDEV 0
-+%define CONFIG_AVFOUNDATION_INDEV 0
-+%define CONFIG_BKTR_INDEV 0
-+%define CONFIG_DECKLINK_INDEV 0
-+%define CONFIG_DSHOW_INDEV 0
-+%define CONFIG_FBDEV_INDEV 0
-+%define CONFIG_GDIGRAB_INDEV 0
-+%define CONFIG_IEC61883_INDEV 0
-+%define CONFIG_JACK_INDEV 0
-+%define CONFIG_KMSGRAB_INDEV 0
-+%define CONFIG_LAVFI_INDEV 0
-+%define CONFIG_OPENAL_INDEV 0
-+%define CONFIG_OSS_INDEV 0
-+%define CONFIG_PULSE_INDEV 0
-+%define CONFIG_SNDIO_INDEV 0
-+%define CONFIG_V4L2_INDEV 0
-+%define CONFIG_VFWCAP_INDEV 0
-+%define CONFIG_XCBGRAB_INDEV 0
-+%define CONFIG_LIBCDIO_INDEV 0
-+%define CONFIG_LIBDC1394_INDEV 0
-+%define CONFIG_ALSA_OUTDEV 0
-+%define CONFIG_AUDIOTOOLBOX_OUTDEV 0
-+%define CONFIG_CACA_OUTDEV 0
-+%define CONFIG_DECKLINK_OUTDEV 0
-+%define CONFIG_FBDEV_OUTDEV 0
-+%define CONFIG_OPENGL_OUTDEV 0
-+%define CONFIG_OSS_OUTDEV 0
-+%define CONFIG_PULSE_OUTDEV 0
-+%define CONFIG_SDL2_OUTDEV 0
-+%define CONFIG_SNDIO_OUTDEV 0
-+%define CONFIG_V4L2_OUTDEV 0
-+%define CONFIG_XV_OUTDEV 0
-+%define CONFIG_ABENCH_FILTER 0
-+%define CONFIG_ACOMPRESSOR_FILTER 0
-+%define CONFIG_ACONTRAST_FILTER 0
-+%define CONFIG_ACOPY_FILTER 0
-+%define CONFIG_ACUE_FILTER 0
-+%define CONFIG_ACROSSFADE_FILTER 0
-+%define CONFIG_ACROSSOVER_FILTER 0
-+%define CONFIG_ACRUSHER_FILTER 0
-+%define CONFIG_ADECLICK_FILTER 0
-+%define CONFIG_ADECLIP_FILTER 0
-+%define CONFIG_ADECORRELATE_FILTER 0
-+%define CONFIG_ADELAY_FILTER 0
-+%define CONFIG_ADENORM_FILTER 0
-+%define CONFIG_ADERIVATIVE_FILTER 0
-+%define CONFIG_ADYNAMICEQUALIZER_FILTER 0
-+%define CONFIG_ADYNAMICSMOOTH_FILTER 0
-+%define CONFIG_AECHO_FILTER 0
-+%define CONFIG_AEMPHASIS_FILTER 0
-+%define CONFIG_AEVAL_FILTER 0
-+%define CONFIG_AEXCITER_FILTER 0
-+%define CONFIG_AFADE_FILTER 0
-+%define CONFIG_AFFTDN_FILTER 0
-+%define CONFIG_AFFTFILT_FILTER 0
-+%define CONFIG_AFIR_FILTER 0
-+%define CONFIG_AFORMAT_FILTER 0
-+%define CONFIG_AFREQSHIFT_FILTER 0
-+%define CONFIG_AFWTDN_FILTER 0
-+%define CONFIG_AGATE_FILTER 0
-+%define CONFIG_AIIR_FILTER 0
-+%define CONFIG_AINTEGRAL_FILTER 0
-+%define CONFIG_AINTERLEAVE_FILTER 0
-+%define CONFIG_ALATENCY_FILTER 0
-+%define CONFIG_ALIMITER_FILTER 0
-+%define CONFIG_ALLPASS_FILTER 0
-+%define CONFIG_ALOOP_FILTER 0
-+%define CONFIG_AMERGE_FILTER 0
-+%define CONFIG_AMETADATA_FILTER 0
-+%define CONFIG_AMIX_FILTER 0
-+%define CONFIG_AMULTIPLY_FILTER 0
-+%define CONFIG_ANEQUALIZER_FILTER 0
-+%define CONFIG_ANLMDN_FILTER 0
-+%define CONFIG_ANLMF_FILTER 0
-+%define CONFIG_ANLMS_FILTER 0
-+%define CONFIG_ANULL_FILTER 0
-+%define CONFIG_APAD_FILTER 0
-+%define CONFIG_APERMS_FILTER 0
-+%define CONFIG_APHASER_FILTER 0
-+%define CONFIG_APHASESHIFT_FILTER 0
-+%define CONFIG_APSYCLIP_FILTER 0
-+%define CONFIG_APULSATOR_FILTER 0
-+%define CONFIG_AREALTIME_FILTER 0
-+%define CONFIG_ARESAMPLE_FILTER 0
-+%define CONFIG_AREVERSE_FILTER 0
-+%define CONFIG_ARNNDN_FILTER 0
-+%define CONFIG_ASDR_FILTER 0
-+%define CONFIG_ASEGMENT_FILTER 0
-+%define CONFIG_ASELECT_FILTER 0
-+%define CONFIG_ASENDCMD_FILTER 0
-+%define CONFIG_ASETNSAMPLES_FILTER 0
-+%define CONFIG_ASETPTS_FILTER 0
-+%define CONFIG_ASETRATE_FILTER 0
-+%define CONFIG_ASETTB_FILTER 0
-+%define CONFIG_ASHOWINFO_FILTER 0
-+%define CONFIG_ASIDEDATA_FILTER 0
-+%define CONFIG_ASOFTCLIP_FILTER 0
-+%define CONFIG_ASPECTRALSTATS_FILTER 0
-+%define CONFIG_ASPLIT_FILTER 0
-+%define CONFIG_ASR_FILTER 0
-+%define CONFIG_ASTATS_FILTER 0
-+%define CONFIG_ASTREAMSELECT_FILTER 0
-+%define CONFIG_ASUBBOOST_FILTER 0
-+%define CONFIG_ASUBCUT_FILTER 0
-+%define CONFIG_ASUPERCUT_FILTER 0
-+%define CONFIG_ASUPERPASS_FILTER 0
-+%define CONFIG_ASUPERSTOP_FILTER 0
-+%define CONFIG_ATEMPO_FILTER 0
-+%define CONFIG_ATILT_FILTER 0
-+%define CONFIG_ATRIM_FILTER 0
-+%define CONFIG_AXCORRELATE_FILTER 0
-+%define CONFIG_AZMQ_FILTER 0
-+%define CONFIG_BANDPASS_FILTER 0
-+%define CONFIG_BANDREJECT_FILTER 0
-+%define CONFIG_BASS_FILTER 0
-+%define CONFIG_BIQUAD_FILTER 0
-+%define CONFIG_BS2B_FILTER 0
-+%define CONFIG_CHANNELMAP_FILTER 0
-+%define CONFIG_CHANNELSPLIT_FILTER 0
-+%define CONFIG_CHORUS_FILTER 0
-+%define CONFIG_COMPAND_FILTER 0
-+%define CONFIG_COMPENSATIONDELAY_FILTER 0
-+%define CONFIG_CROSSFEED_FILTER 0
-+%define CONFIG_CRYSTALIZER_FILTER 0
-+%define CONFIG_DCSHIFT_FILTER 0
-+%define CONFIG_DEESSER_FILTER 0
-+%define CONFIG_DRMETER_FILTER 0
-+%define CONFIG_DYNAUDNORM_FILTER 0
-+%define CONFIG_EARWAX_FILTER 0
-+%define CONFIG_EBUR128_FILTER 0
-+%define CONFIG_EQUALIZER_FILTER 0
-+%define CONFIG_EXTRASTEREO_FILTER 0
-+%define CONFIG_FIREQUALIZER_FILTER 0
-+%define CONFIG_FLANGER_FILTER 0
-+%define CONFIG_HAAS_FILTER 0
-+%define CONFIG_HDCD_FILTER 0
-+%define CONFIG_HEADPHONE_FILTER 0
-+%define CONFIG_HIGHPASS_FILTER 0
-+%define CONFIG_HIGHSHELF_FILTER 0
-+%define CONFIG_JOIN_FILTER 0
-+%define CONFIG_LADSPA_FILTER 0
-+%define CONFIG_LOUDNORM_FILTER 0
-+%define CONFIG_LOWPASS_FILTER 0
-+%define CONFIG_LOWSHELF_FILTER 0
-+%define CONFIG_LV2_FILTER 0
-+%define CONFIG_MCOMPAND_FILTER 0
-+%define CONFIG_PAN_FILTER 0
-+%define CONFIG_REPLAYGAIN_FILTER 0
-+%define CONFIG_RUBBERBAND_FILTER 0
-+%define CONFIG_SIDECHAINCOMPRESS_FILTER 0
-+%define CONFIG_SIDECHAINGATE_FILTER 0
-+%define CONFIG_SILENCEDETECT_FILTER 0
-+%define CONFIG_SILENCEREMOVE_FILTER 0
-+%define CONFIG_SOFALIZER_FILTER 0
-+%define CONFIG_SPEECHNORM_FILTER 0
-+%define CONFIG_STEREOTOOLS_FILTER 0
-+%define CONFIG_STEREOWIDEN_FILTER 0
-+%define CONFIG_SUPEREQUALIZER_FILTER 0
-+%define CONFIG_SURROUND_FILTER 0
-+%define CONFIG_TREBLE_FILTER 0
-+%define CONFIG_TREMOLO_FILTER 0
-+%define CONFIG_VIBRATO_FILTER 0
-+%define CONFIG_VOLUME_FILTER 0
-+%define CONFIG_VOLUMEDETECT_FILTER 0
-+%define CONFIG_AEVALSRC_FILTER 0
-+%define CONFIG_AFIRSRC_FILTER 0
-+%define CONFIG_ANOISESRC_FILTER 0
-+%define CONFIG_ANULLSRC_FILTER 0
-+%define CONFIG_FLITE_FILTER 0
-+%define CONFIG_HILBERT_FILTER 0
-+%define CONFIG_SINC_FILTER 0
-+%define CONFIG_SINE_FILTER 0
-+%define CONFIG_ANULLSINK_FILTER 0
-+%define CONFIG_ADDROI_FILTER 0
-+%define CONFIG_ALPHAEXTRACT_FILTER 0
-+%define CONFIG_ALPHAMERGE_FILTER 0
-+%define CONFIG_AMPLIFY_FILTER 0
-+%define CONFIG_ASS_FILTER 0
-+%define CONFIG_ATADENOISE_FILTER 0
-+%define CONFIG_AVGBLUR_FILTER 0
-+%define CONFIG_AVGBLUR_OPENCL_FILTER 0
-+%define CONFIG_AVGBLUR_VULKAN_FILTER 0
-+%define CONFIG_BBOX_FILTER 0
-+%define CONFIG_BENCH_FILTER 0
-+%define CONFIG_BILATERAL_FILTER 0
-+%define CONFIG_BITPLANENOISE_FILTER 0
-+%define CONFIG_BLACKDETECT_FILTER 0
-+%define CONFIG_BLACKFRAME_FILTER 0
-+%define CONFIG_BLEND_FILTER 0
-+%define CONFIG_BLEND_VULKAN_FILTER 0
-+%define CONFIG_BM3D_FILTER 0
-+%define CONFIG_BOXBLUR_FILTER 0
-+%define CONFIG_BOXBLUR_OPENCL_FILTER 0
-+%define CONFIG_BWDIF_FILTER 0
-+%define CONFIG_CAS_FILTER 0
-+%define CONFIG_CHROMABER_VULKAN_FILTER 0
-+%define CONFIG_CHROMAHOLD_FILTER 0
-+%define CONFIG_CHROMAKEY_FILTER 0
-+%define CONFIG_CHROMANR_FILTER 0
-+%define CONFIG_CHROMASHIFT_FILTER 0
-+%define CONFIG_CIESCOPE_FILTER 0
-+%define CONFIG_CODECVIEW_FILTER 0
-+%define CONFIG_COLORBALANCE_FILTER 0
-+%define CONFIG_COLORCHANNELMIXER_FILTER 0
-+%define CONFIG_COLORCONTRAST_FILTER 0
-+%define CONFIG_COLORCORRECT_FILTER 0
-+%define CONFIG_COLORIZE_FILTER 0
-+%define CONFIG_COLORKEY_FILTER 0
-+%define CONFIG_COLORKEY_OPENCL_FILTER 0
-+%define CONFIG_COLORHOLD_FILTER 0
-+%define CONFIG_COLORLEVELS_FILTER 0
-+%define CONFIG_COLORMATRIX_FILTER 0
-+%define CONFIG_COLORSPACE_FILTER 0
-+%define CONFIG_COLORTEMPERATURE_FILTER 0
-+%define CONFIG_CONVOLUTION_FILTER 0
-+%define CONFIG_CONVOLUTION_OPENCL_FILTER 0
-+%define CONFIG_CONVOLVE_FILTER 0
-+%define CONFIG_COPY_FILTER 0
-+%define CONFIG_COREIMAGE_FILTER 0
-+%define CONFIG_COVER_RECT_FILTER 0
-+%define CONFIG_CROP_FILTER 0
-+%define CONFIG_CROPDETECT_FILTER 0
-+%define CONFIG_CUE_FILTER 0
-+%define CONFIG_CURVES_FILTER 0
-+%define CONFIG_DATASCOPE_FILTER 0
-+%define CONFIG_DBLUR_FILTER 0
-+%define CONFIG_DCTDNOIZ_FILTER 0
-+%define CONFIG_DEBAND_FILTER 0
-+%define CONFIG_DEBLOCK_FILTER 0
-+%define CONFIG_DECIMATE_FILTER 0
-+%define CONFIG_DECONVOLVE_FILTER 0
-+%define CONFIG_DEDOT_FILTER 0
-+%define CONFIG_DEFLATE_FILTER 0
-+%define CONFIG_DEFLICKER_FILTER 0
-+%define CONFIG_DEINTERLACE_QSV_FILTER 0
-+%define CONFIG_DEINTERLACE_VAAPI_FILTER 0
-+%define CONFIG_DEJUDDER_FILTER 0
-+%define CONFIG_DELOGO_FILTER 0
-+%define CONFIG_DENOISE_VAAPI_FILTER 0
-+%define CONFIG_DERAIN_FILTER 0
-+%define CONFIG_DESHAKE_FILTER 0
-+%define CONFIG_DESHAKE_OPENCL_FILTER 0
-+%define CONFIG_DESPILL_FILTER 0
-+%define CONFIG_DETELECINE_FILTER 0
-+%define CONFIG_DILATION_FILTER 0
-+%define CONFIG_DILATION_OPENCL_FILTER 0
-+%define CONFIG_DISPLACE_FILTER 0
-+%define CONFIG_DNN_CLASSIFY_FILTER 0
-+%define CONFIG_DNN_DETECT_FILTER 0
-+%define CONFIG_DNN_PROCESSING_FILTER 0
-+%define CONFIG_DOUBLEWEAVE_FILTER 0
-+%define CONFIG_DRAWBOX_FILTER 0
-+%define CONFIG_DRAWGRAPH_FILTER 0
-+%define CONFIG_DRAWGRID_FILTER 0
-+%define CONFIG_DRAWTEXT_FILTER 0
-+%define CONFIG_EDGEDETECT_FILTER 0
-+%define CONFIG_ELBG_FILTER 0
-+%define CONFIG_ENTROPY_FILTER 0
-+%define CONFIG_EPX_FILTER 0
-+%define CONFIG_EQ_FILTER 0
-+%define CONFIG_EROSION_FILTER 0
-+%define CONFIG_EROSION_OPENCL_FILTER 0
-+%define CONFIG_ESTDIF_FILTER 0
-+%define CONFIG_EXPOSURE_FILTER 0
-+%define CONFIG_EXTRACTPLANES_FILTER 0
-+%define CONFIG_FADE_FILTER 0
-+%define CONFIG_FFTDNOIZ_FILTER 0
-+%define CONFIG_FFTFILT_FILTER 0
-+%define CONFIG_FIELD_FILTER 0
-+%define CONFIG_FIELDHINT_FILTER 0
-+%define CONFIG_FIELDMATCH_FILTER 0
-+%define CONFIG_FIELDORDER_FILTER 0
-+%define CONFIG_FILLBORDERS_FILTER 0
-+%define CONFIG_FIND_RECT_FILTER 0
-+%define CONFIG_FLIP_VULKAN_FILTER 0
-+%define CONFIG_FLOODFILL_FILTER 0
-+%define CONFIG_FORMAT_FILTER 0
-+%define CONFIG_FPS_FILTER 0
-+%define CONFIG_FRAMEPACK_FILTER 0
-+%define CONFIG_FRAMERATE_FILTER 0
-+%define CONFIG_FRAMESTEP_FILTER 0
-+%define CONFIG_FREEZEDETECT_FILTER 0
-+%define CONFIG_FREEZEFRAMES_FILTER 0
-+%define CONFIG_FREI0R_FILTER 0
-+%define CONFIG_FSPP_FILTER 0
-+%define CONFIG_GBLUR_FILTER 0
-+%define CONFIG_GBLUR_VULKAN_FILTER 0
-+%define CONFIG_GEQ_FILTER 0
-+%define CONFIG_GRADFUN_FILTER 0
-+%define CONFIG_GRAPHMONITOR_FILTER 0
-+%define CONFIG_GRAYWORLD_FILTER 0
-+%define CONFIG_GREYEDGE_FILTER 0
-+%define CONFIG_GUIDED_FILTER 0
-+%define CONFIG_HALDCLUT_FILTER 0
-+%define CONFIG_HFLIP_FILTER 0
-+%define CONFIG_HFLIP_VULKAN_FILTER 0
-+%define CONFIG_HISTEQ_FILTER 0
-+%define CONFIG_HISTOGRAM_FILTER 0
-+%define CONFIG_HQDN3D_FILTER 0
-+%define CONFIG_HQX_FILTER 0
-+%define CONFIG_HSTACK_FILTER 0
-+%define CONFIG_HSVHOLD_FILTER 0
-+%define CONFIG_HSVKEY_FILTER 0
-+%define CONFIG_HUE_FILTER 0
-+%define CONFIG_HUESATURATION_FILTER 0
-+%define CONFIG_HWDOWNLOAD_FILTER 0
-+%define CONFIG_HWMAP_FILTER 0
-+%define CONFIG_HWUPLOAD_FILTER 0
-+%define CONFIG_HWUPLOAD_CUDA_FILTER 0
-+%define CONFIG_HYSTERESIS_FILTER 0
-+%define CONFIG_IDENTITY_FILTER 0
-+%define CONFIG_IDET_FILTER 0
-+%define CONFIG_IL_FILTER 0
-+%define CONFIG_INFLATE_FILTER 0
-+%define CONFIG_INTERLACE_FILTER 0
-+%define CONFIG_INTERLEAVE_FILTER 0
-+%define CONFIG_KERNDEINT_FILTER 0
-+%define CONFIG_KIRSCH_FILTER 0
-+%define CONFIG_LAGFUN_FILTER 0
-+%define CONFIG_LATENCY_FILTER 0
-+%define CONFIG_LENSCORRECTION_FILTER 0
-+%define CONFIG_LENSFUN_FILTER 0
-+%define CONFIG_LIBPLACEBO_FILTER 0
-+%define CONFIG_LIBVMAF_FILTER 0
-+%define CONFIG_LIMITDIFF_FILTER 0
-+%define CONFIG_LIMITER_FILTER 0
-+%define CONFIG_LOOP_FILTER 0
-+%define CONFIG_LUMAKEY_FILTER 0
-+%define CONFIG_LUT_FILTER 0
-+%define CONFIG_LUT1D_FILTER 0
-+%define CONFIG_LUT2_FILTER 0
-+%define CONFIG_LUT3D_FILTER 0
-+%define CONFIG_LUTRGB_FILTER 0
-+%define CONFIG_LUTYUV_FILTER 0
-+%define CONFIG_MASKEDCLAMP_FILTER 0
-+%define CONFIG_MASKEDMAX_FILTER 0
-+%define CONFIG_MASKEDMERGE_FILTER 0
-+%define CONFIG_MASKEDMIN_FILTER 0
-+%define CONFIG_MASKEDTHRESHOLD_FILTER 0
-+%define CONFIG_MASKFUN_FILTER 0
-+%define CONFIG_MCDEINT_FILTER 0
-+%define CONFIG_MEDIAN_FILTER 0
-+%define CONFIG_MERGEPLANES_FILTER 0
-+%define CONFIG_MESTIMATE_FILTER 0
-+%define CONFIG_METADATA_FILTER 0
-+%define CONFIG_MIDEQUALIZER_FILTER 0
-+%define CONFIG_MINTERPOLATE_FILTER 0
-+%define CONFIG_MIX_FILTER 0
-+%define CONFIG_MONOCHROME_FILTER 0
-+%define CONFIG_MORPHO_FILTER 0
-+%define CONFIG_MPDECIMATE_FILTER 0
-+%define CONFIG_MSAD_FILTER 0
-+%define CONFIG_NEGATE_FILTER 0
-+%define CONFIG_NLMEANS_FILTER 0
-+%define CONFIG_NLMEANS_OPENCL_FILTER 0
-+%define CONFIG_NNEDI_FILTER 0
-+%define CONFIG_NOFORMAT_FILTER 0
-+%define CONFIG_NOISE_FILTER 0
-+%define CONFIG_NORMALIZE_FILTER 0
-+%define CONFIG_NULL_FILTER 0
-+%define CONFIG_OCR_FILTER 0
-+%define CONFIG_OCV_FILTER 0
-+%define CONFIG_OSCILLOSCOPE_FILTER 0
-+%define CONFIG_OVERLAY_FILTER 0
-+%define CONFIG_OVERLAY_OPENCL_FILTER 0
-+%define CONFIG_OVERLAY_QSV_FILTER 0
-+%define CONFIG_OVERLAY_VAAPI_FILTER 0
-+%define CONFIG_OVERLAY_VULKAN_FILTER 0
-+%define CONFIG_OVERLAY_CUDA_FILTER 0
-+%define CONFIG_OWDENOISE_FILTER 0
-+%define CONFIG_PAD_FILTER 0
-+%define CONFIG_PAD_OPENCL_FILTER 0
-+%define CONFIG_PALETTEGEN_FILTER 0
-+%define CONFIG_PALETTEUSE_FILTER 0
-+%define CONFIG_PERMS_FILTER 0
-+%define CONFIG_PERSPECTIVE_FILTER 0
-+%define CONFIG_PHASE_FILTER 0
-+%define CONFIG_PHOTOSENSITIVITY_FILTER 0
-+%define CONFIG_PIXDESCTEST_FILTER 0
-+%define CONFIG_PIXSCOPE_FILTER 0
-+%define CONFIG_PP_FILTER 0
-+%define CONFIG_PP7_FILTER 0
-+%define CONFIG_PREMULTIPLY_FILTER 0
-+%define CONFIG_PREWITT_FILTER 0
-+%define CONFIG_PREWITT_OPENCL_FILTER 0
-+%define CONFIG_PROCAMP_VAAPI_FILTER 0
-+%define CONFIG_PROGRAM_OPENCL_FILTER 0
-+%define CONFIG_PSEUDOCOLOR_FILTER 0
-+%define CONFIG_PSNR_FILTER 0
-+%define CONFIG_PULLUP_FILTER 0
-+%define CONFIG_QP_FILTER 0
-+%define CONFIG_RANDOM_FILTER 0
-+%define CONFIG_READEIA608_FILTER 0
-+%define CONFIG_READVITC_FILTER 0
-+%define CONFIG_REALTIME_FILTER 0
-+%define CONFIG_REMAP_FILTER 0
-+%define CONFIG_REMOVEGRAIN_FILTER 0
-+%define CONFIG_REMOVELOGO_FILTER 0
-+%define CONFIG_REPEATFIELDS_FILTER 0
-+%define CONFIG_REVERSE_FILTER 0
-+%define CONFIG_RGBASHIFT_FILTER 0
-+%define CONFIG_ROBERTS_FILTER 0
-+%define CONFIG_ROBERTS_OPENCL_FILTER 0
-+%define CONFIG_ROTATE_FILTER 0
-+%define CONFIG_SAB_FILTER 0
-+%define CONFIG_SCALE_FILTER 0
-+%define CONFIG_SCALE_CUDA_FILTER 0
-+%define CONFIG_SCALE_NPP_FILTER 0
-+%define CONFIG_SCALE_QSV_FILTER 0
-+%define CONFIG_SCALE_VAAPI_FILTER 0
-+%define CONFIG_SCALE_VULKAN_FILTER 0
-+%define CONFIG_SCALE2REF_FILTER 0
-+%define CONFIG_SCALE2REF_NPP_FILTER 0
-+%define CONFIG_SCDET_FILTER 0
-+%define CONFIG_SCHARR_FILTER 0
-+%define CONFIG_SCROLL_FILTER 0
-+%define CONFIG_SEGMENT_FILTER 0
-+%define CONFIG_SELECT_FILTER 0
-+%define CONFIG_SELECTIVECOLOR_FILTER 0
-+%define CONFIG_SENDCMD_FILTER 0
-+%define CONFIG_SEPARATEFIELDS_FILTER 0
-+%define CONFIG_SETDAR_FILTER 0
-+%define CONFIG_SETFIELD_FILTER 0
-+%define CONFIG_SETPARAMS_FILTER 0
-+%define CONFIG_SETPTS_FILTER 0
-+%define CONFIG_SETRANGE_FILTER 0
-+%define CONFIG_SETSAR_FILTER 0
-+%define CONFIG_SETTB_FILTER 0
-+%define CONFIG_SHARPEN_NPP_FILTER 0
-+%define CONFIG_SHARPNESS_VAAPI_FILTER 0
-+%define CONFIG_SHEAR_FILTER 0
-+%define CONFIG_SHOWINFO_FILTER 0
-+%define CONFIG_SHOWPALETTE_FILTER 0
-+%define CONFIG_SHUFFLEFRAMES_FILTER 0
-+%define CONFIG_SHUFFLEPIXELS_FILTER 0
-+%define CONFIG_SHUFFLEPLANES_FILTER 0
-+%define CONFIG_SIDEDATA_FILTER 0
-+%define CONFIG_SIGNALSTATS_FILTER 0
-+%define CONFIG_SIGNATURE_FILTER 0
-+%define CONFIG_SMARTBLUR_FILTER 0
-+%define CONFIG_SOBEL_FILTER 0
-+%define CONFIG_SOBEL_OPENCL_FILTER 0
-+%define CONFIG_SPLIT_FILTER 0
-+%define CONFIG_SPP_FILTER 0
-+%define CONFIG_SR_FILTER 0
-+%define CONFIG_SSIM_FILTER 0
-+%define CONFIG_STEREO3D_FILTER 0
-+%define CONFIG_STREAMSELECT_FILTER 0
-+%define CONFIG_SUBTITLES_FILTER 0
-+%define CONFIG_SUPER2XSAI_FILTER 0
-+%define CONFIG_SWAPRECT_FILTER 0
-+%define CONFIG_SWAPUV_FILTER 0
-+%define CONFIG_TBLEND_FILTER 0
-+%define CONFIG_TELECINE_FILTER 0
-+%define CONFIG_THISTOGRAM_FILTER 0
-+%define CONFIG_THRESHOLD_FILTER 0
-+%define CONFIG_THUMBNAIL_FILTER 0
-+%define CONFIG_THUMBNAIL_CUDA_FILTER 0
-+%define CONFIG_TILE_FILTER 0
-+%define CONFIG_TINTERLACE_FILTER 0
-+%define CONFIG_TLUT2_FILTER 0
-+%define CONFIG_TMEDIAN_FILTER 0
-+%define CONFIG_TMIDEQUALIZER_FILTER 0
-+%define CONFIG_TMIX_FILTER 0
-+%define CONFIG_TONEMAP_FILTER 0
-+%define CONFIG_TONEMAP_OPENCL_FILTER 0
-+%define CONFIG_TONEMAP_VAAPI_FILTER 0
-+%define CONFIG_TPAD_FILTER 0
-+%define CONFIG_TRANSPOSE_FILTER 0
-+%define CONFIG_TRANSPOSE_NPP_FILTER 0
-+%define CONFIG_TRANSPOSE_OPENCL_FILTER 0
-+%define CONFIG_TRANSPOSE_VAAPI_FILTER 0
-+%define CONFIG_TRANSPOSE_VULKAN_FILTER 0
-+%define CONFIG_TRIM_FILTER 0
-+%define CONFIG_UNPREMULTIPLY_FILTER 0
-+%define CONFIG_UNSHARP_FILTER 0
-+%define CONFIG_UNSHARP_OPENCL_FILTER 0
-+%define CONFIG_UNTILE_FILTER 0
-+%define CONFIG_USPP_FILTER 0
-+%define CONFIG_V360_FILTER 0
-+%define CONFIG_VAGUEDENOISER_FILTER 0
-+%define CONFIG_VARBLUR_FILTER 0
-+%define CONFIG_VECTORSCOPE_FILTER 0
-+%define CONFIG_VFLIP_FILTER 0
-+%define CONFIG_VFLIP_VULKAN_FILTER 0
-+%define CONFIG_VFRDET_FILTER 0
-+%define CONFIG_VIBRANCE_FILTER 0
-+%define CONFIG_VIDSTABDETECT_FILTER 0
-+%define CONFIG_VIDSTABTRANSFORM_FILTER 0
-+%define CONFIG_VIF_FILTER 0
-+%define CONFIG_VIGNETTE_FILTER 0
-+%define CONFIG_VMAFMOTION_FILTER 0
-+%define CONFIG_VPP_QSV_FILTER 0
-+%define CONFIG_VSTACK_FILTER 0
-+%define CONFIG_W3FDIF_FILTER 0
-+%define CONFIG_WAVEFORM_FILTER 0
-+%define CONFIG_WEAVE_FILTER 0
-+%define CONFIG_XBR_FILTER 0
-+%define CONFIG_XCORRELATE_FILTER 0
-+%define CONFIG_XFADE_FILTER 0
-+%define CONFIG_XFADE_OPENCL_FILTER 0
-+%define CONFIG_XMEDIAN_FILTER 0
-+%define CONFIG_XSTACK_FILTER 0
-+%define CONFIG_YADIF_FILTER 0
-+%define CONFIG_YADIF_CUDA_FILTER 0
-+%define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0
-+%define CONFIG_YAEPBLUR_FILTER 0
-+%define CONFIG_ZMQ_FILTER 0
-+%define CONFIG_ZOOMPAN_FILTER 0
-+%define CONFIG_ZSCALE_FILTER 0
-+%define CONFIG_ALLRGB_FILTER 0
-+%define CONFIG_ALLYUV_FILTER 0
-+%define CONFIG_CELLAUTO_FILTER 0
-+%define CONFIG_COLOR_FILTER 0
-+%define CONFIG_COLORSPECTRUM_FILTER 0
-+%define CONFIG_COREIMAGESRC_FILTER 0
-+%define CONFIG_FREI0R_SRC_FILTER 0
-+%define CONFIG_GRADIENTS_FILTER 0
-+%define CONFIG_HALDCLUTSRC_FILTER 0
-+%define CONFIG_LIFE_FILTER 0
-+%define CONFIG_MANDELBROT_FILTER 0
-+%define CONFIG_MPTESTSRC_FILTER 0
-+%define CONFIG_NULLSRC_FILTER 0
-+%define CONFIG_OPENCLSRC_FILTER 0
-+%define CONFIG_PAL75BARS_FILTER 0
-+%define CONFIG_PAL100BARS_FILTER 0
-+%define CONFIG_RGBTESTSRC_FILTER 0
-+%define CONFIG_SIERPINSKI_FILTER 0
-+%define CONFIG_SMPTEBARS_FILTER 0
-+%define CONFIG_SMPTEHDBARS_FILTER 0
-+%define CONFIG_TESTSRC_FILTER 0
-+%define CONFIG_TESTSRC2_FILTER 0
-+%define CONFIG_YUVTESTSRC_FILTER 0
-+%define CONFIG_NULLSINK_FILTER 0
-+%define CONFIG_ABITSCOPE_FILTER 0
-+%define CONFIG_ADRAWGRAPH_FILTER 0
-+%define CONFIG_AGRAPHMONITOR_FILTER 0
-+%define CONFIG_AHISTOGRAM_FILTER 0
-+%define CONFIG_APHASEMETER_FILTER 0
-+%define CONFIG_AVECTORSCOPE_FILTER 0
-+%define CONFIG_CONCAT_FILTER 0
-+%define CONFIG_SHOWCQT_FILTER 0
-+%define CONFIG_SHOWFREQS_FILTER 0
-+%define CONFIG_SHOWSPATIAL_FILTER 0
-+%define CONFIG_SHOWSPECTRUM_FILTER 0
-+%define CONFIG_SHOWSPECTRUMPIC_FILTER 0
-+%define CONFIG_SHOWVOLUME_FILTER 0
-+%define CONFIG_SHOWWAVES_FILTER 0
-+%define CONFIG_SHOWWAVESPIC_FILTER 0
-+%define CONFIG_SPECTRUMSYNTH_FILTER 0
-+%define CONFIG_AMOVIE_FILTER 0
-+%define CONFIG_MOVIE_FILTER 0
-+%define CONFIG_AFIFO_FILTER 0
-+%define CONFIG_FIFO_FILTER 0
-+%define CONFIG_AA_DEMUXER 0
-+%define CONFIG_AAC_DEMUXER 1
-+%define CONFIG_AAX_DEMUXER 0
-+%define CONFIG_AC3_DEMUXER 0
-+%define CONFIG_ACE_DEMUXER 0
-+%define CONFIG_ACM_DEMUXER 0
-+%define CONFIG_ACT_DEMUXER 0
-+%define CONFIG_ADF_DEMUXER 0
-+%define CONFIG_ADP_DEMUXER 0
-+%define CONFIG_ADS_DEMUXER 0
-+%define CONFIG_ADX_DEMUXER 0
-+%define CONFIG_AEA_DEMUXER 0
-+%define CONFIG_AFC_DEMUXER 0
-+%define CONFIG_AIFF_DEMUXER 0
-+%define CONFIG_AIX_DEMUXER 0
-+%define CONFIG_ALP_DEMUXER 0
-+%define CONFIG_AMR_DEMUXER 0
-+%define CONFIG_AMRNB_DEMUXER 0
-+%define CONFIG_AMRWB_DEMUXER 0
-+%define CONFIG_ANM_DEMUXER 0
-+%define CONFIG_APC_DEMUXER 0
-+%define CONFIG_APE_DEMUXER 0
-+%define CONFIG_APM_DEMUXER 0
-+%define CONFIG_APNG_DEMUXER 0
-+%define CONFIG_APTX_DEMUXER 0
-+%define CONFIG_APTX_HD_DEMUXER 0
-+%define CONFIG_AQTITLE_DEMUXER 0
-+%define CONFIG_ARGO_ASF_DEMUXER 0
-+%define CONFIG_ARGO_BRP_DEMUXER 0
-+%define CONFIG_ARGO_CVG_DEMUXER 0
-+%define CONFIG_ASF_DEMUXER 0
-+%define CONFIG_ASF_O_DEMUXER 0
-+%define CONFIG_ASS_DEMUXER 0
-+%define CONFIG_AST_DEMUXER 0
-+%define CONFIG_AU_DEMUXER 0
-+%define CONFIG_AV1_DEMUXER 0
-+%define CONFIG_AVI_DEMUXER 0
-+%define CONFIG_AVISYNTH_DEMUXER 0
-+%define CONFIG_AVR_DEMUXER 0
-+%define CONFIG_AVS_DEMUXER 0
-+%define CONFIG_AVS2_DEMUXER 0
-+%define CONFIG_AVS3_DEMUXER 0
-+%define CONFIG_BETHSOFTVID_DEMUXER 0
-+%define CONFIG_BFI_DEMUXER 0
-+%define CONFIG_BINTEXT_DEMUXER 0
-+%define CONFIG_BINK_DEMUXER 0
-+%define CONFIG_BINKA_DEMUXER 0
-+%define CONFIG_BIT_DEMUXER 0
-+%define CONFIG_BITPACKED_DEMUXER 0
-+%define CONFIG_BMV_DEMUXER 0
-+%define CONFIG_BFSTM_DEMUXER 0
-+%define CONFIG_BRSTM_DEMUXER 0
-+%define CONFIG_BOA_DEMUXER 0
-+%define CONFIG_C93_DEMUXER 0
-+%define CONFIG_CAF_DEMUXER 0
-+%define CONFIG_CAVSVIDEO_DEMUXER 0
-+%define CONFIG_CDG_DEMUXER 0
-+%define CONFIG_CDXL_DEMUXER 0
-+%define CONFIG_CINE_DEMUXER 0
-+%define CONFIG_CODEC2_DEMUXER 0
-+%define CONFIG_CODEC2RAW_DEMUXER 0
-+%define CONFIG_CONCAT_DEMUXER 0
-+%define CONFIG_DASH_DEMUXER 0
-+%define CONFIG_DATA_DEMUXER 0
-+%define CONFIG_DAUD_DEMUXER 0
-+%define CONFIG_DCSTR_DEMUXER 0
-+%define CONFIG_DERF_DEMUXER 0
-+%define CONFIG_DFA_DEMUXER 0
-+%define CONFIG_DHAV_DEMUXER 0
-+%define CONFIG_DIRAC_DEMUXER 0
-+%define CONFIG_DNXHD_DEMUXER 0
-+%define CONFIG_DSF_DEMUXER 0
-+%define CONFIG_DSICIN_DEMUXER 0
-+%define CONFIG_DSS_DEMUXER 0
-+%define CONFIG_DTS_DEMUXER 0
-+%define CONFIG_DTSHD_DEMUXER 0
-+%define CONFIG_DV_DEMUXER 0
-+%define CONFIG_DVBSUB_DEMUXER 0
-+%define CONFIG_DVBTXT_DEMUXER 0
-+%define CONFIG_DXA_DEMUXER 0
-+%define CONFIG_EA_DEMUXER 0
-+%define CONFIG_EA_CDATA_DEMUXER 0
-+%define CONFIG_EAC3_DEMUXER 0
-+%define CONFIG_EPAF_DEMUXER 0
-+%define CONFIG_FFMETADATA_DEMUXER 0
-+%define CONFIG_FILMSTRIP_DEMUXER 0
-+%define CONFIG_FITS_DEMUXER 0
-+%define CONFIG_FLAC_DEMUXER 1
-+%define CONFIG_FLIC_DEMUXER 0
-+%define CONFIG_FLV_DEMUXER 0
-+%define CONFIG_LIVE_FLV_DEMUXER 0
-+%define CONFIG_FOURXM_DEMUXER 0
-+%define CONFIG_FRM_DEMUXER 0
-+%define CONFIG_FSB_DEMUXER 0
-+%define CONFIG_FWSE_DEMUXER 0
-+%define CONFIG_G722_DEMUXER 0
-+%define CONFIG_G723_1_DEMUXER 0
-+%define CONFIG_G726_DEMUXER 0
-+%define CONFIG_G726LE_DEMUXER 0
-+%define CONFIG_G729_DEMUXER 0
-+%define CONFIG_GDV_DEMUXER 0
-+%define CONFIG_GENH_DEMUXER 0
-+%define CONFIG_GIF_DEMUXER 0
-+%define CONFIG_GSM_DEMUXER 0
-+%define CONFIG_GXF_DEMUXER 0
-+%define CONFIG_H261_DEMUXER 0
-+%define CONFIG_H263_DEMUXER 0
-+%define CONFIG_H264_DEMUXER 0
-+%define CONFIG_HCA_DEMUXER 0
-+%define CONFIG_HCOM_DEMUXER 0
-+%define CONFIG_HEVC_DEMUXER 0
-+%define CONFIG_HLS_DEMUXER 0
-+%define CONFIG_HNM_DEMUXER 0
-+%define CONFIG_ICO_DEMUXER 0
-+%define CONFIG_IDCIN_DEMUXER 0
-+%define CONFIG_IDF_DEMUXER 0
-+%define CONFIG_IFF_DEMUXER 0
-+%define CONFIG_IFV_DEMUXER 0
-+%define CONFIG_ILBC_DEMUXER 0
-+%define CONFIG_IMAGE2_DEMUXER 0
-+%define CONFIG_IMAGE2PIPE_DEMUXER 0
-+%define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0
-+%define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0
-+%define CONFIG_IMF_DEMUXER 0
-+%define CONFIG_INGENIENT_DEMUXER 0
-+%define CONFIG_IPMOVIE_DEMUXER 0
-+%define CONFIG_IPU_DEMUXER 0
-+%define CONFIG_IRCAM_DEMUXER 0
-+%define CONFIG_ISS_DEMUXER 0
-+%define CONFIG_IV8_DEMUXER 0
-+%define CONFIG_IVF_DEMUXER 0
-+%define CONFIG_IVR_DEMUXER 0
-+%define CONFIG_JACOSUB_DEMUXER 0
-+%define CONFIG_JV_DEMUXER 0
-+%define CONFIG_KUX_DEMUXER 0
-+%define CONFIG_KVAG_DEMUXER 0
-+%define CONFIG_LMLM4_DEMUXER 0
-+%define CONFIG_LOAS_DEMUXER 0
-+%define CONFIG_LUODAT_DEMUXER 0
-+%define CONFIG_LRC_DEMUXER 0
-+%define CONFIG_LVF_DEMUXER 0
-+%define CONFIG_LXF_DEMUXER 0
-+%define CONFIG_M4V_DEMUXER 0
-+%define CONFIG_MCA_DEMUXER 0
-+%define CONFIG_MCC_DEMUXER 0
-+%define CONFIG_MATROSKA_DEMUXER 1
-+%define CONFIG_MGSTS_DEMUXER 0
-+%define CONFIG_MICRODVD_DEMUXER 0
-+%define CONFIG_MJPEG_DEMUXER 0
-+%define CONFIG_MJPEG_2000_DEMUXER 0
-+%define CONFIG_MLP_DEMUXER 0
-+%define CONFIG_MLV_DEMUXER 0
-+%define CONFIG_MM_DEMUXER 0
-+%define CONFIG_MMF_DEMUXER 0
-+%define CONFIG_MODS_DEMUXER 0
-+%define CONFIG_MOFLEX_DEMUXER 0
-+%define CONFIG_MOV_DEMUXER 1
-+%define CONFIG_MP3_DEMUXER 1
-+%define CONFIG_MPC_DEMUXER 0
-+%define CONFIG_MPC8_DEMUXER 0
-+%define CONFIG_MPEGPS_DEMUXER 0
-+%define CONFIG_MPEGTS_DEMUXER 0
-+%define CONFIG_MPEGTSRAW_DEMUXER 0
-+%define CONFIG_MPEGVIDEO_DEMUXER 0
-+%define CONFIG_MPJPEG_DEMUXER 0
-+%define CONFIG_MPL2_DEMUXER 0
-+%define CONFIG_MPSUB_DEMUXER 0
-+%define CONFIG_MSF_DEMUXER 0
-+%define CONFIG_MSNWC_TCP_DEMUXER 0
-+%define CONFIG_MSP_DEMUXER 0
-+%define CONFIG_MTAF_DEMUXER 0
-+%define CONFIG_MTV_DEMUXER 0
-+%define CONFIG_MUSX_DEMUXER 0
-+%define CONFIG_MV_DEMUXER 0
-+%define CONFIG_MVI_DEMUXER 0
-+%define CONFIG_MXF_DEMUXER 0
-+%define CONFIG_MXG_DEMUXER 0
-+%define CONFIG_NC_DEMUXER 0
-+%define CONFIG_NISTSPHERE_DEMUXER 0
-+%define CONFIG_NSP_DEMUXER 0
-+%define CONFIG_NSV_DEMUXER 0
-+%define CONFIG_NUT_DEMUXER 0
-+%define CONFIG_NUV_DEMUXER 0
-+%define CONFIG_OBU_DEMUXER 0
-+%define CONFIG_OGG_DEMUXER 1
-+%define CONFIG_OMA_DEMUXER 0
-+%define CONFIG_PAF_DEMUXER 0
-+%define CONFIG_PCM_ALAW_DEMUXER 0
-+%define CONFIG_PCM_MULAW_DEMUXER 0
-+%define CONFIG_PCM_VIDC_DEMUXER 0
-+%define CONFIG_PCM_F64BE_DEMUXER 0
-+%define CONFIG_PCM_F64LE_DEMUXER 0
-+%define CONFIG_PCM_F32BE_DEMUXER 0
-+%define CONFIG_PCM_F32LE_DEMUXER 0
-+%define CONFIG_PCM_S32BE_DEMUXER 0
-+%define CONFIG_PCM_S32LE_DEMUXER 0
-+%define CONFIG_PCM_S24BE_DEMUXER 0
-+%define CONFIG_PCM_S24LE_DEMUXER 0
-+%define CONFIG_PCM_S16BE_DEMUXER 0
-+%define CONFIG_PCM_S16LE_DEMUXER 0
-+%define CONFIG_PCM_S8_DEMUXER 0
-+%define CONFIG_PCM_U32BE_DEMUXER 0
-+%define CONFIG_PCM_U32LE_DEMUXER 0
-+%define CONFIG_PCM_U24BE_DEMUXER 0
-+%define CONFIG_PCM_U24LE_DEMUXER 0
-+%define CONFIG_PCM_U16BE_DEMUXER 0
-+%define CONFIG_PCM_U16LE_DEMUXER 0
-+%define CONFIG_PCM_U8_DEMUXER 0
-+%define CONFIG_PJS_DEMUXER 0
-+%define CONFIG_PMP_DEMUXER 0
-+%define CONFIG_PP_BNK_DEMUXER 0
-+%define CONFIG_PVA_DEMUXER 0
-+%define CONFIG_PVF_DEMUXER 0
-+%define CONFIG_QCP_DEMUXER 0
-+%define CONFIG_R3D_DEMUXER 0
-+%define CONFIG_RAWVIDEO_DEMUXER 0
-+%define CONFIG_REALTEXT_DEMUXER 0
-+%define CONFIG_REDSPARK_DEMUXER 0
-+%define CONFIG_RL2_DEMUXER 0
-+%define CONFIG_RM_DEMUXER 0
-+%define CONFIG_ROQ_DEMUXER 0
-+%define CONFIG_RPL_DEMUXER 0
-+%define CONFIG_RSD_DEMUXER 0
-+%define CONFIG_RSO_DEMUXER 0
-+%define CONFIG_RTP_DEMUXER 0
-+%define CONFIG_RTSP_DEMUXER 0
-+%define CONFIG_S337M_DEMUXER 0
-+%define CONFIG_SAMI_DEMUXER 0
-+%define CONFIG_SAP_DEMUXER 0
-+%define CONFIG_SBC_DEMUXER 0
-+%define CONFIG_SBG_DEMUXER 0
-+%define CONFIG_SCC_DEMUXER 0
-+%define CONFIG_SCD_DEMUXER 0
-+%define CONFIG_SDP_DEMUXER 0
-+%define CONFIG_SDR2_DEMUXER 0
-+%define CONFIG_SDS_DEMUXER 0
-+%define CONFIG_SDX_DEMUXER 0
-+%define CONFIG_SEGAFILM_DEMUXER 0
-+%define CONFIG_SER_DEMUXER 0
-+%define CONFIG_SGA_DEMUXER 0
-+%define CONFIG_SHORTEN_DEMUXER 0
-+%define CONFIG_SIFF_DEMUXER 0
-+%define CONFIG_SIMBIOSIS_IMX_DEMUXER 0
-+%define CONFIG_SLN_DEMUXER 0
-+%define CONFIG_SMACKER_DEMUXER 0
-+%define CONFIG_SMJPEG_DEMUXER 0
-+%define CONFIG_SMUSH_DEMUXER 0
-+%define CONFIG_SOL_DEMUXER 0
-+%define CONFIG_SOX_DEMUXER 0
-+%define CONFIG_SPDIF_DEMUXER 0
-+%define CONFIG_SRT_DEMUXER 0
-+%define CONFIG_STR_DEMUXER 0
-+%define CONFIG_STL_DEMUXER 0
-+%define CONFIG_SUBVIEWER1_DEMUXER 0
-+%define CONFIG_SUBVIEWER_DEMUXER 0
-+%define CONFIG_SUP_DEMUXER 0
-+%define CONFIG_SVAG_DEMUXER 0
-+%define CONFIG_SVS_DEMUXER 0
-+%define CONFIG_SWF_DEMUXER 0
-+%define CONFIG_TAK_DEMUXER 0
-+%define CONFIG_TEDCAPTIONS_DEMUXER 0
-+%define CONFIG_THP_DEMUXER 0
-+%define CONFIG_THREEDOSTR_DEMUXER 0
-+%define CONFIG_TIERTEXSEQ_DEMUXER 0
-+%define CONFIG_TMV_DEMUXER 0
-+%define CONFIG_TRUEHD_DEMUXER 0
-+%define CONFIG_TTA_DEMUXER 0
-+%define CONFIG_TXD_DEMUXER 0
-+%define CONFIG_TTY_DEMUXER 0
-+%define CONFIG_TY_DEMUXER 0
-+%define CONFIG_V210_DEMUXER 0
-+%define CONFIG_V210X_DEMUXER 0
-+%define CONFIG_VAG_DEMUXER 0
-+%define CONFIG_VC1_DEMUXER 0
-+%define CONFIG_VC1T_DEMUXER 0
-+%define CONFIG_VIVIDAS_DEMUXER 0
-+%define CONFIG_VIVO_DEMUXER 0
-+%define CONFIG_VMD_DEMUXER 0
-+%define CONFIG_VOBSUB_DEMUXER 0
-+%define CONFIG_VOC_DEMUXER 0
-+%define CONFIG_VPK_DEMUXER 0
-+%define CONFIG_VPLAYER_DEMUXER 0
-+%define CONFIG_VQF_DEMUXER 0
-+%define CONFIG_W64_DEMUXER 0
-+%define CONFIG_WAV_DEMUXER 1
-+%define CONFIG_WC3_DEMUXER 0
-+%define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
-+%define CONFIG_WEBVTT_DEMUXER 0
-+%define CONFIG_WSAUD_DEMUXER 0
-+%define CONFIG_WSD_DEMUXER 0
-+%define CONFIG_WSVQA_DEMUXER 0
-+%define CONFIG_WTV_DEMUXER 0
-+%define CONFIG_WVE_DEMUXER 0
-+%define CONFIG_WV_DEMUXER 0
-+%define CONFIG_XA_DEMUXER 0
-+%define CONFIG_XBIN_DEMUXER 0
-+%define CONFIG_XMV_DEMUXER 0
-+%define CONFIG_XVAG_DEMUXER 0
-+%define CONFIG_XWMA_DEMUXER 0
-+%define CONFIG_YOP_DEMUXER 0
-+%define CONFIG_YUV4MPEGPIPE_DEMUXER 0
-+%define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
-+%define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
-+%define CONFIG_LIBGME_DEMUXER 0
-+%define CONFIG_LIBMODPLUG_DEMUXER 0
-+%define CONFIG_LIBOPENMPT_DEMUXER 0
-+%define CONFIG_VAPOURSYNTH_DEMUXER 0
-+%define CONFIG_A64_MUXER 0
-+%define CONFIG_AC3_MUXER 0
-+%define CONFIG_ADTS_MUXER 0
-+%define CONFIG_ADX_MUXER 0
-+%define CONFIG_AIFF_MUXER 0
-+%define CONFIG_ALP_MUXER 0
-+%define CONFIG_AMR_MUXER 0
-+%define CONFIG_AMV_MUXER 0
-+%define CONFIG_APM_MUXER 0
-+%define CONFIG_APNG_MUXER 0
-+%define CONFIG_APTX_MUXER 0
-+%define CONFIG_APTX_HD_MUXER 0
-+%define CONFIG_ARGO_ASF_MUXER 0
-+%define CONFIG_ARGO_CVG_MUXER 0
-+%define CONFIG_ASF_MUXER 0
-+%define CONFIG_ASS_MUXER 0
-+%define CONFIG_AST_MUXER 0
-+%define CONFIG_ASF_STREAM_MUXER 0
-+%define CONFIG_AU_MUXER 0
-+%define CONFIG_AVI_MUXER 0
-+%define CONFIG_AVM2_MUXER 0
-+%define CONFIG_AVS2_MUXER 0
-+%define CONFIG_AVS3_MUXER 0
-+%define CONFIG_BIT_MUXER 0
-+%define CONFIG_CAF_MUXER 0
-+%define CONFIG_CAVSVIDEO_MUXER 0
-+%define CONFIG_CODEC2_MUXER 0
-+%define CONFIG_CODEC2RAW_MUXER 0
-+%define CONFIG_CRC_MUXER 0
-+%define CONFIG_DASH_MUXER 0
-+%define CONFIG_DATA_MUXER 0
-+%define CONFIG_DAUD_MUXER 0
-+%define CONFIG_DIRAC_MUXER 0
-+%define CONFIG_DNXHD_MUXER 0
-+%define CONFIG_DTS_MUXER 0
-+%define CONFIG_DV_MUXER 0
-+%define CONFIG_EAC3_MUXER 0
-+%define CONFIG_F4V_MUXER 0
-+%define CONFIG_FFMETADATA_MUXER 0
-+%define CONFIG_FIFO_MUXER 0
-+%define CONFIG_FIFO_TEST_MUXER 0
-+%define CONFIG_FILMSTRIP_MUXER 0
-+%define CONFIG_FITS_MUXER 0
-+%define CONFIG_FLAC_MUXER 0
-+%define CONFIG_FLV_MUXER 0
-+%define CONFIG_FRAMECRC_MUXER 0
-+%define CONFIG_FRAMEHASH_MUXER 0
-+%define CONFIG_FRAMEMD5_MUXER 0
-+%define CONFIG_G722_MUXER 0
-+%define CONFIG_G723_1_MUXER 0
-+%define CONFIG_G726_MUXER 0
-+%define CONFIG_G726LE_MUXER 0
-+%define CONFIG_GIF_MUXER 0
-+%define CONFIG_GSM_MUXER 0
-+%define CONFIG_GXF_MUXER 0
-+%define CONFIG_H261_MUXER 0
-+%define CONFIG_H263_MUXER 0
-+%define CONFIG_H264_MUXER 0
-+%define CONFIG_HASH_MUXER 0
-+%define CONFIG_HDS_MUXER 0
-+%define CONFIG_HEVC_MUXER 0
-+%define CONFIG_HLS_MUXER 0
-+%define CONFIG_ICO_MUXER 0
-+%define CONFIG_ILBC_MUXER 0
-+%define CONFIG_IMAGE2_MUXER 0
-+%define CONFIG_IMAGE2PIPE_MUXER 0
-+%define CONFIG_IPOD_MUXER 0
-+%define CONFIG_IRCAM_MUXER 0
-+%define CONFIG_ISMV_MUXER 0
-+%define CONFIG_IVF_MUXER 0
-+%define CONFIG_JACOSUB_MUXER 0
-+%define CONFIG_KVAG_MUXER 0
-+%define CONFIG_LATM_MUXER 0
-+%define CONFIG_LRC_MUXER 0
-+%define CONFIG_M4V_MUXER 0
-+%define CONFIG_MD5_MUXER 0
-+%define CONFIG_MATROSKA_MUXER 0
-+%define CONFIG_MATROSKA_AUDIO_MUXER 0
-+%define CONFIG_MICRODVD_MUXER 0
-+%define CONFIG_MJPEG_MUXER 0
-+%define CONFIG_MLP_MUXER 0
-+%define CONFIG_MMF_MUXER 0
-+%define CONFIG_MOV_MUXER 0
-+%define CONFIG_MP2_MUXER 0
-+%define CONFIG_MP3_MUXER 0
-+%define CONFIG_MP4_MUXER 0
-+%define CONFIG_MPEG1SYSTEM_MUXER 0
-+%define CONFIG_MPEG1VCD_MUXER 0
-+%define CONFIG_MPEG1VIDEO_MUXER 0
-+%define CONFIG_MPEG2DVD_MUXER 0
-+%define CONFIG_MPEG2SVCD_MUXER 0
-+%define CONFIG_MPEG2VIDEO_MUXER 0
-+%define CONFIG_MPEG2VOB_MUXER 0
-+%define CONFIG_MPEGTS_MUXER 0
-+%define CONFIG_MPJPEG_MUXER 0
-+%define CONFIG_MXF_MUXER 0
-+%define CONFIG_MXF_D10_MUXER 0
-+%define CONFIG_MXF_OPATOM_MUXER 0
-+%define CONFIG_NULL_MUXER 0
-+%define CONFIG_NUT_MUXER 0
-+%define CONFIG_OBU_MUXER 0
-+%define CONFIG_OGA_MUXER 0
-+%define CONFIG_OGG_MUXER 0
-+%define CONFIG_OGV_MUXER 0
-+%define CONFIG_OMA_MUXER 0
-+%define CONFIG_OPUS_MUXER 0
-+%define CONFIG_PCM_ALAW_MUXER 0
-+%define CONFIG_PCM_MULAW_MUXER 0
-+%define CONFIG_PCM_VIDC_MUXER 0
-+%define CONFIG_PCM_F64BE_MUXER 0
-+%define CONFIG_PCM_F64LE_MUXER 0
-+%define CONFIG_PCM_F32BE_MUXER 0
-+%define CONFIG_PCM_F32LE_MUXER 0
-+%define CONFIG_PCM_S32BE_MUXER 0
-+%define CONFIG_PCM_S32LE_MUXER 0
-+%define CONFIG_PCM_S24BE_MUXER 0
-+%define CONFIG_PCM_S24LE_MUXER 0
-+%define CONFIG_PCM_S16BE_MUXER 0
-+%define CONFIG_PCM_S16LE_MUXER 0
-+%define CONFIG_PCM_S8_MUXER 0
-+%define CONFIG_PCM_U32BE_MUXER 0
-+%define CONFIG_PCM_U32LE_MUXER 0
-+%define CONFIG_PCM_U24BE_MUXER 0
-+%define CONFIG_PCM_U24LE_MUXER 0
-+%define CONFIG_PCM_U16BE_MUXER 0
-+%define CONFIG_PCM_U16LE_MUXER 0
-+%define CONFIG_PCM_U8_MUXER 0
-+%define CONFIG_PSP_MUXER 0
-+%define CONFIG_RAWVIDEO_MUXER 0
-+%define CONFIG_RM_MUXER 0
-+%define CONFIG_ROQ_MUXER 0
-+%define CONFIG_RSO_MUXER 0
-+%define CONFIG_RTP_MUXER 0
-+%define CONFIG_RTP_MPEGTS_MUXER 0
-+%define CONFIG_RTSP_MUXER 0
-+%define CONFIG_SAP_MUXER 0
-+%define CONFIG_SBC_MUXER 0
-+%define CONFIG_SCC_MUXER 0
-+%define CONFIG_SEGAFILM_MUXER 0
-+%define CONFIG_SEGMENT_MUXER 0
-+%define CONFIG_STREAM_SEGMENT_MUXER 0
-+%define CONFIG_SMJPEG_MUXER 0
-+%define CONFIG_SMOOTHSTREAMING_MUXER 0
-+%define CONFIG_SOX_MUXER 0
-+%define CONFIG_SPX_MUXER 0
-+%define CONFIG_SPDIF_MUXER 0
-+%define CONFIG_SRT_MUXER 0
-+%define CONFIG_STREAMHASH_MUXER 0
-+%define CONFIG_SUP_MUXER 0
-+%define CONFIG_SWF_MUXER 0
-+%define CONFIG_TEE_MUXER 0
-+%define CONFIG_TG2_MUXER 0
-+%define CONFIG_TGP_MUXER 0
-+%define CONFIG_MKVTIMESTAMP_V2_MUXER 0
-+%define CONFIG_TRUEHD_MUXER 0
-+%define CONFIG_TTA_MUXER 0
-+%define CONFIG_TTML_MUXER 0
-+%define CONFIG_UNCODEDFRAMECRC_MUXER 0
-+%define CONFIG_VC1_MUXER 0
-+%define CONFIG_VC1T_MUXER 0
-+%define CONFIG_VOC_MUXER 0
-+%define CONFIG_W64_MUXER 0
-+%define CONFIG_WAV_MUXER 0
-+%define CONFIG_WEBM_MUXER 0
-+%define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
-+%define CONFIG_WEBM_CHUNK_MUXER 0
-+%define CONFIG_WEBP_MUXER 0
-+%define CONFIG_WEBVTT_MUXER 0
-+%define CONFIG_WSAUD_MUXER 0
-+%define CONFIG_WTV_MUXER 0
-+%define CONFIG_WV_MUXER 0
-+%define CONFIG_YUV4MPEGPIPE_MUXER 0
-+%define CONFIG_CHROMAPRINT_MUXER 0
-+%define CONFIG_ASYNC_PROTOCOL 0
-+%define CONFIG_BLURAY_PROTOCOL 0
-+%define CONFIG_CACHE_PROTOCOL 0
-+%define CONFIG_CONCAT_PROTOCOL 0
-+%define CONFIG_CONCATF_PROTOCOL 0
-+%define CONFIG_CRYPTO_PROTOCOL 0
-+%define CONFIG_DATA_PROTOCOL 0
-+%define CONFIG_FFRTMPCRYPT_PROTOCOL 0
-+%define CONFIG_FFRTMPHTTP_PROTOCOL 0
-+%define CONFIG_FILE_PROTOCOL 0
-+%define CONFIG_FTP_PROTOCOL 0
-+%define CONFIG_GOPHER_PROTOCOL 0
-+%define CONFIG_GOPHERS_PROTOCOL 0
-+%define CONFIG_HLS_PROTOCOL 0
-+%define CONFIG_HTTP_PROTOCOL 0
-+%define CONFIG_HTTPPROXY_PROTOCOL 0
-+%define CONFIG_HTTPS_PROTOCOL 0
-+%define CONFIG_ICECAST_PROTOCOL 0
-+%define CONFIG_MMSH_PROTOCOL 0
-+%define CONFIG_MMST_PROTOCOL 0
-+%define CONFIG_MD5_PROTOCOL 0
-+%define CONFIG_PIPE_PROTOCOL 0
-+%define CONFIG_PROMPEG_PROTOCOL 0
-+%define CONFIG_RTMP_PROTOCOL 0
-+%define CONFIG_RTMPE_PROTOCOL 0
-+%define CONFIG_RTMPS_PROTOCOL 0
-+%define CONFIG_RTMPT_PROTOCOL 0
-+%define CONFIG_RTMPTE_PROTOCOL 0
-+%define CONFIG_RTMPTS_PROTOCOL 0
-+%define CONFIG_RTP_PROTOCOL 0
-+%define CONFIG_SCTP_PROTOCOL 0
-+%define CONFIG_SRTP_PROTOCOL 0
-+%define CONFIG_SUBFILE_PROTOCOL 0
-+%define CONFIG_TEE_PROTOCOL 0
-+%define CONFIG_TCP_PROTOCOL 0
-+%define CONFIG_TLS_PROTOCOL 0
-+%define CONFIG_UDP_PROTOCOL 0
-+%define CONFIG_UDPLITE_PROTOCOL 0
-+%define CONFIG_UNIX_PROTOCOL 0
-+%define CONFIG_LIBAMQP_PROTOCOL 0
-+%define CONFIG_LIBRIST_PROTOCOL 0
-+%define CONFIG_LIBRTMP_PROTOCOL 0
-+%define CONFIG_LIBRTMPE_PROTOCOL 0
-+%define CONFIG_LIBRTMPS_PROTOCOL 0
-+%define CONFIG_LIBRTMPT_PROTOCOL 0
-+%define CONFIG_LIBRTMPTE_PROTOCOL 0
-+%define CONFIG_LIBSRT_PROTOCOL 0
-+%define CONFIG_LIBSSH_PROTOCOL 0
-+%define CONFIG_LIBSMBCLIENT_PROTOCOL 0
-+%define CONFIG_LIBZMQ_PROTOCOL 0
diff --git a/www/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 7dbbc890e2b8..7483a1fc1b9e 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-06-17 14:20:10 UTC
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h.orig 2022-07-28 06:05:58 UTC
+++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config.h
-@@ -0,0 +1,2787 @@
+@@ -0,0 +1,737 @@
+/* Automatically generated by configure - do not modify! */
+#ifndef FFMPEG_CONFIG_H
+#define FFMPEG_CONFIG_H
-+/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-lzo --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/usr/local/google/home/jrummell/chromium/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags=-O2 --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags=-m32 --extra-ldflags=-m32 --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
++/* #define FFMPEG_CONFIGURATION "--disable-everything --disable-all --disable-doc --disable-htmlpages --disable-manpages --disable-podpages --disable-txtpages --disable-static --enable-avcodec --enable-avformat --enable-avutil --enable-fft --enable-rdft --enable-static --enable-libopus --disable-debug --disable-bzlib --disable-error-resilience --disable-iconv --disable-network --disable-schannel --disable-sdl2 --disable-symver --disable-xlib --disable-zlib --disable-securetransport --disable-faan --disable-alsa --disable-autodetect --enable-decoder='vorbis,libopus,flac' --enable-decoder='pcm_u8,pcm_s16le,pcm_s24le,pcm_s32le,pcm_f32le,mp3' --enable-decoder='pcm_s16be,pcm_s24be,pcm_mulaw,pcm_alaw' --enable-demuxer='ogg,matroska,wav,flac,mp3,mov' --enable-parser='opus,vorbis,flac,mpegaudio,vp9' --extra-cflags=-I/d/code/chrome/src/third_party/opus/src/include --disable-linux-perf --x86asmexe=nasm --optflags='\"-O2\"' --enable-decoder='theora,vp8' --enable-parser='vp3,vp8' --arch=i686 --extra-cflags='\"-m32\"' --extra-ldflags='\"-m32\"' --enable-pic --cc=clang --cxx=clang++ --ld=clang --enable-decoder='aac,h264' --enable-demuxer=aac --enable-parser='aac,h264'" -- elide long configuration string from binary */
+#define FFMPEG_LICENSE "LGPL version 2.1 or later"
+#define CONFIG_THIS_YEAR 2022
+#define FFMPEG_DATADIR "/usr/local/share/ffmpeg"
@@ -66,6 +66,7 @@
+#define HAVE_AVX 1
+#define HAVE_AVX2 1
+#define HAVE_AVX512 1
++#define HAVE_AVX512ICL 1
+#define HAVE_FMA3 1
+#define HAVE_FMA4 1
+#define HAVE_MMX 1
@@ -113,6 +114,7 @@
+#define HAVE_AVX_EXTERNAL 1
+#define HAVE_AVX2_EXTERNAL 1
+#define HAVE_AVX512_EXTERNAL 1
++#define HAVE_AVX512ICL_EXTERNAL 0
+#define HAVE_FMA3_EXTERNAL 1
+#define HAVE_FMA4_EXTERNAL 1
+#define HAVE_MMX_EXTERNAL 1
@@ -160,6 +162,7 @@
+#define HAVE_AVX_INLINE 1
+#define HAVE_AVX2_INLINE 1
+#define HAVE_AVX512_INLINE 1
++#define HAVE_AVX512ICL_INLINE 1
+#define HAVE_FMA3_INLINE 1
+#define HAVE_FMA4_INLINE 1
+#define HAVE_MMX_INLINE 1
@@ -245,7 +248,7 @@
+#define HAVE_TERMIOS_H 1
+#define HAVE_UDPLITE_H 0
+#define HAVE_UNISTD_H 1
-+#define HAVE_VALGRIND_VALGRIND_H 0
++#define HAVE_VALGRIND_VALGRIND_H 0 /* #define HAVE_VALGRIND_VALGRIND_H 0 -- forced to 0. See https://crbug.com/590440 */
+#define HAVE_WINDOWS_H 0
+#define HAVE_WINSOCK2_H 0
+#define HAVE_INTRINSICS_NEON 0
@@ -293,6 +296,7 @@
+#define HAVE_COMMANDLINETOARGVW 0
+#define HAVE_FCNTL 1
+#define HAVE_GETADDRINFO 0
++#define HAVE_GETAUXVAL 0
+#define HAVE_GETHRTIME 0
+#define HAVE_GETOPT 1
+#define HAVE_GETMODULEHANDLE 0
@@ -332,7 +336,7 @@
+#define HAVE_SLEEP 0
+#define HAVE_STRERROR_R 1
+#define HAVE_SYSCONF 1
-+#define HAVE_SYSCTL 1
++#define HAVE_SYSCTL 0 /* #define HAVE_SYSCTL 0 -- forced to 0 for Fuchsia */
+#define HAVE_USLEEP 1
+#define HAVE_UTGETOSTYPEFROMSTRING 0
+#define HAVE_VIRTUALALLOC 0
@@ -578,7 +582,6 @@
+#define CONFIG_VIDEOTOOLBOX 0
+#define CONFIG_VULKAN 0
+#define CONFIG_V4L2_M2M 0
-+#define CONFIG_XVMC 0
+#define CONFIG_FTRAPV 0
+#define CONFIG_GRAY 0
+#define CONFIG_HARDCODED_TABLES 0
@@ -610,7 +613,6 @@
+#define CONFIG_FAST_UNALIGNED 1
+#define CONFIG_FFT 1
+#define CONFIG_LSP 0
-+#define CONFIG_LZO 0
+#define CONFIG_MDCT 1
+#define CONFIG_PIXELUTILS 0
+#define CONFIG_NETWORK 0
@@ -655,6 +657,7 @@
+#define CONFIG_CBS_JPEG 0
+#define CONFIG_CBS_MPEG2 0
+#define CONFIG_CBS_VP9 0
++#define CONFIG_DEFLATE_WRAPPER 0
+#define CONFIG_DIRAC_PARSE 1
+#define CONFIG_DNN 0
+#define CONFIG_DOVI_RPU 0
@@ -683,6 +686,7 @@
+#define CONFIG_IDCTDSP 0
+#define CONFIG_IIRFILTER 0
+#define CONFIG_MDCT15 1
++#define CONFIG_INFLATE_WRAPPER 0
+#define CONFIG_INTRAX8 0
+#define CONFIG_ISO_MEDIA 1
+#define CONFIG_IVIDSP 0
@@ -733,2058 +737,4 @@
+#define CONFIG_VP8DSP 1
+#define CONFIG_WMA_FREQS 0
+#define CONFIG_WMV2DSP 0
-+#define CONFIG_AAC_ADTSTOASC_BSF 0
-+#define CONFIG_AV1_FRAME_MERGE_BSF 0
-+#define CONFIG_AV1_FRAME_SPLIT_BSF 0
-+#define CONFIG_AV1_METADATA_BSF 0
-+#define CONFIG_CHOMP_BSF 0
-+#define CONFIG_DUMP_EXTRADATA_BSF 0
-+#define CONFIG_DCA_CORE_BSF 0
-+#define CONFIG_EAC3_CORE_BSF 0
-+#define CONFIG_EXTRACT_EXTRADATA_BSF 0
-+#define CONFIG_FILTER_UNITS_BSF 0
-+#define CONFIG_H264_METADATA_BSF 0
-+#define CONFIG_H264_MP4TOANNEXB_BSF 0
-+#define CONFIG_H264_REDUNDANT_PPS_BSF 0
-+#define CONFIG_HAPQA_EXTRACT_BSF 0
-+#define CONFIG_HEVC_METADATA_BSF 0
-+#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
-+#define CONFIG_IMX_DUMP_HEADER_BSF 0
-+#define CONFIG_MJPEG2JPEG_BSF 0
-+#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
-+#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
-+#define CONFIG_MPEG2_METADATA_BSF 0
-+#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
-+#define CONFIG_MOV2TEXTSUB_BSF 0
-+#define CONFIG_NOISE_BSF 0
-+#define CONFIG_NULL_BSF 0
-+#define CONFIG_OPUS_METADATA_BSF 0
-+#define CONFIG_PCM_RECHUNK_BSF 0
-+#define CONFIG_PRORES_METADATA_BSF 0
-+#define CONFIG_REMOVE_EXTRADATA_BSF 0
-+#define CONFIG_SETTS_BSF 0
-+#define CONFIG_TEXT2MOVSUB_BSF 0
-+#define CONFIG_TRACE_HEADERS_BSF 0
-+#define CONFIG_TRUEHD_CORE_BSF 0
-+#define CONFIG_VP9_METADATA_BSF 0
-+#define CONFIG_VP9_RAW_REORDER_BSF 0
-+#define CONFIG_VP9_SUPERFRAME_BSF 0
-+#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
-+#define CONFIG_AASC_DECODER 0
-+#define CONFIG_AIC_DECODER 0
-+#define CONFIG_ALIAS_PIX_DECODER 0
-+#define CONFIG_AGM_DECODER 0
-+#define CONFIG_AMV_DECODER 0
-+#define CONFIG_ANM_DECODER 0
-+#define CONFIG_ANSI_DECODER 0
-+#define CONFIG_APNG_DECODER 0
-+#define CONFIG_ARBC_DECODER 0
-+#define CONFIG_ARGO_DECODER 0
-+#define CONFIG_ASV1_DECODER 0
-+#define CONFIG_ASV2_DECODER 0
-+#define CONFIG_AURA_DECODER 0
-+#define CONFIG_AURA2_DECODER 0
-+#define CONFIG_AVRP_DECODER 0
-+#define CONFIG_AVRN_DECODER 0
-+#define CONFIG_AVS_DECODER 0
-+#define CONFIG_AVUI_DECODER 0
-+#define CONFIG_AYUV_DECODER 0
-+#define CONFIG_BETHSOFTVID_DECODER 0
-+#define CONFIG_BFI_DECODER 0
-+#define CONFIG_BINK_DECODER 0
-+#define CONFIG_BITPACKED_DECODER 0
-+#define CONFIG_BMP_DECODER 0
-+#define CONFIG_BMV_VIDEO_DECODER 0
-+#define CONFIG_BRENDER_PIX_DECODER 0
-+#define CONFIG_C93_DECODER 0
-+#define CONFIG_CAVS_DECODER 0
-+#define CONFIG_CDGRAPHICS_DECODER 0
-+#define CONFIG_CDTOONS_DECODER 0
-+#define CONFIG_CDXL_DECODER 0
-+#define CONFIG_CFHD_DECODER 0
-+#define CONFIG_CINEPAK_DECODER 0
-+#define CONFIG_CLEARVIDEO_DECODER 0
-+#define CONFIG_CLJR_DECODER 0
-+#define CONFIG_CLLC_DECODER 0
-+#define CONFIG_COMFORTNOISE_DECODER 0
-+#define CONFIG_CPIA_DECODER 0
-+#define CONFIG_CRI_DECODER 0
-+#define CONFIG_CSCD_DECODER 0
-+#define CONFIG_CYUV_DECODER 0
-+#define CONFIG_DDS_DECODER 0
-+#define CONFIG_DFA_DECODER 0
-+#define CONFIG_DIRAC_DECODER 0
-+#define CONFIG_DNXHD_DECODER 0
-+#define CONFIG_DPX_DECODER 0
-+#define CONFIG_DSICINVIDEO_DECODER 0
-+#define CONFIG_DVAUDIO_DECODER 0
-+#define CONFIG_DVVIDEO_DECODER 0
-+#define CONFIG_DXA_DECODER 0
-+#define CONFIG_DXTORY_DECODER 0
-+#define CONFIG_DXV_DECODER 0
-+#define CONFIG_EACMV_DECODER 0
-+#define CONFIG_EAMAD_DECODER 0
-+#define CONFIG_EATGQ_DECODER 0
-+#define CONFIG_EATGV_DECODER 0
-+#define CONFIG_EATQI_DECODER 0
-+#define CONFIG_EIGHTBPS_DECODER 0
-+#define CONFIG_EIGHTSVX_EXP_DECODER 0
-+#define CONFIG_EIGHTSVX_FIB_DECODER 0
-+#define CONFIG_ESCAPE124_DECODER 0
-+#define CONFIG_ESCAPE130_DECODER 0
-+#define CONFIG_EXR_DECODER 0
-+#define CONFIG_FFV1_DECODER 0
-+#define CONFIG_FFVHUFF_DECODER 0
-+#define CONFIG_FIC_DECODER 0
-+#define CONFIG_FITS_DECODER 0
-+#define CONFIG_FLASHSV_DECODER 0
-+#define CONFIG_FLASHSV2_DECODER 0
-+#define CONFIG_FLIC_DECODER 0
-+#define CONFIG_FLV_DECODER 0
-+#define CONFIG_FMVC_DECODER 0
-+#define CONFIG_FOURXM_DECODER 0
-+#define CONFIG_FRAPS_DECODER 0
-+#define CONFIG_FRWU_DECODER 0
-+#define CONFIG_G2M_DECODER 0
-+#define CONFIG_GDV_DECODER 0
-+#define CONFIG_GEM_DECODER 0
-+#define CONFIG_GIF_DECODER 0
-+#define CONFIG_H261_DECODER 0
-+#define CONFIG_H263_DECODER 0
-+#define CONFIG_H263I_DECODER 0
-+#define CONFIG_H263P_DECODER 0
-+#define CONFIG_H263_V4L2M2M_DECODER 0
-+#define CONFIG_H264_DECODER 1
-+#define CONFIG_H264_CRYSTALHD_DECODER 0
-+#define CONFIG_H264_V4L2M2M_DECODER 0
-+#define CONFIG_H264_MEDIACODEC_DECODER 0
-+#define CONFIG_H264_MMAL_DECODER 0
-+#define CONFIG_H264_QSV_DECODER 0
-+#define CONFIG_H264_RKMPP_DECODER 0
-+#define CONFIG_HAP_DECODER 0
-+#define CONFIG_HEVC_DECODER 0
-+#define CONFIG_HEVC_QSV_DECODER 0
-+#define CONFIG_HEVC_RKMPP_DECODER 0
-+#define CONFIG_HEVC_V4L2M2M_DECODER 0
-+#define CONFIG_HNM4_VIDEO_DECODER 0
-+#define CONFIG_HQ_HQA_DECODER 0
-+#define CONFIG_HQX_DECODER 0
-+#define CONFIG_HUFFYUV_DECODER 0
-+#define CONFIG_HYMT_DECODER 0
-+#define CONFIG_IDCIN_DECODER 0
-+#define CONFIG_IFF_ILBM_DECODER 0
-+#define CONFIG_IMM4_DECODER 0
-+#define CONFIG_IMM5_DECODER 0
-+#define CONFIG_INDEO2_DECODER 0
-+#define CONFIG_INDEO3_DECODER 0
-+#define CONFIG_INDEO4_DECODER 0
-+#define CONFIG_INDEO5_DECODER 0
-+#define CONFIG_INTERPLAY_VIDEO_DECODER 0
-+#define CONFIG_IPU_DECODER 0
-+#define CONFIG_JPEG2000_DECODER 0
-+#define CONFIG_JPEGLS_DECODER 0
-+#define CONFIG_JV_DECODER 0
-+#define CONFIG_KGV1_DECODER 0
-+#define CONFIG_KMVC_DECODER 0
-+#define CONFIG_LAGARITH_DECODER 0
-+#define CONFIG_LOCO_DECODER 0
-+#define CONFIG_LSCR_DECODER 0
-+#define CONFIG_M101_DECODER 0
-+#define CONFIG_MAGICYUV_DECODER 0
-+#define CONFIG_MDEC_DECODER 0
-+#define CONFIG_MIMIC_DECODER 0
-+#define CONFIG_MJPEG_DECODER 0
-+#define CONFIG_MJPEGB_DECODER 0
-+#define CONFIG_MMVIDEO_DECODER 0
-+#define CONFIG_MOBICLIP_DECODER 0
-+#define CONFIG_MOTIONPIXELS_DECODER 0
-+#define CONFIG_MPEG1VIDEO_DECODER 0
-+#define CONFIG_MPEG2VIDEO_DECODER 0
-+#define CONFIG_MPEG4_DECODER 0
-+#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
-+#define CONFIG_MPEG4_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG4_MMAL_DECODER 0
-+#define CONFIG_MPEGVIDEO_DECODER 0
-+#define CONFIG_MPEG1_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG2_MMAL_DECODER 0
-+#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
-+#define CONFIG_MPEG2_V4L2M2M_DECODER 0
-+#define CONFIG_MPEG2_QSV_DECODER 0
-+#define CONFIG_MPEG2_MEDIACODEC_DECODER 0
-+#define CONFIG_MSA1_DECODER 0
-+#define CONFIG_MSCC_DECODER 0
-+#define CONFIG_MSMPEG4V1_DECODER 0
-+#define CONFIG_MSMPEG4V2_DECODER 0
-+#define CONFIG_MSMPEG4V3_DECODER 0
-+#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
-+#define CONFIG_MSP2_DECODER 0
-+#define CONFIG_MSRLE_DECODER 0
-+#define CONFIG_MSS1_DECODER 0
-+#define CONFIG_MSS2_DECODER 0
-+#define CONFIG_MSVIDEO1_DECODER 0
-+#define CONFIG_MSZH_DECODER 0
-+#define CONFIG_MTS2_DECODER 0
-+#define CONFIG_MV30_DECODER 0
-+#define CONFIG_MVC1_DECODER 0
-+#define CONFIG_MVC2_DECODER 0
-+#define CONFIG_MVDV_DECODER 0
-+#define CONFIG_MVHA_DECODER 0
-+#define CONFIG_MWSC_DECODER 0
-+#define CONFIG_MXPEG_DECODER 0
-+#define CONFIG_NOTCHLC_DECODER 0
-+#define CONFIG_NUV_DECODER 0
-+#define CONFIG_PAF_VIDEO_DECODER 0
-+#define CONFIG_PAM_DECODER 0
-+#define CONFIG_PBM_DECODER 0
-+#define CONFIG_PCX_DECODER 0
-+#define CONFIG_PFM_DECODER 0
-+#define CONFIG_PGM_DECODER 0
-+#define CONFIG_PGMYUV_DECODER 0
-+#define CONFIG_PGX_DECODER 0
-+#define CONFIG_PHOTOCD_DECODER 0
-+#define CONFIG_PICTOR_DECODER 0
-+#define CONFIG_PIXLET_DECODER 0
-+#define CONFIG_PNG_DECODER 0
-+#define CONFIG_PPM_DECODER 0
-+#define CONFIG_PRORES_DECODER 0
-+#define CONFIG_PROSUMER_DECODER 0
-+#define CONFIG_PSD_DECODER 0
-+#define CONFIG_PTX_DECODER 0
-+#define CONFIG_QDRAW_DECODER 0
-+#define CONFIG_QPEG_DECODER 0
-+#define CONFIG_QTRLE_DECODER 0
-+#define CONFIG_R10K_DECODER 0
-+#define CONFIG_R210_DECODER 0
-+#define CONFIG_RASC_DECODER 0
-+#define CONFIG_RAWVIDEO_DECODER 0
-+#define CONFIG_RL2_DECODER 0
-+#define CONFIG_ROQ_DECODER 0
-+#define CONFIG_RPZA_DECODER 0
-+#define CONFIG_RSCC_DECODER 0
-+#define CONFIG_RV10_DECODER 0
-+#define CONFIG_RV20_DECODER 0
-+#define CONFIG_RV30_DECODER 0
-+#define CONFIG_RV40_DECODER 0
-+#define CONFIG_S302M_DECODER 0
-+#define CONFIG_SANM_DECODER 0
-+#define CONFIG_SCPR_DECODER 0
-+#define CONFIG_SCREENPRESSO_DECODER 0
-+#define CONFIG_SGA_DECODER 0
-+#define CONFIG_SGI_DECODER 0
-+#define CONFIG_SGIRLE_DECODER 0
-+#define CONFIG_SHEERVIDEO_DECODER 0
-+#define CONFIG_SIMBIOSIS_IMX_DECODER 0
-+#define CONFIG_SMACKER_DECODER 0
-+#define CONFIG_SMC_DECODER 0
-+#define CONFIG_SMVJPEG_DECODER 0
-+#define CONFIG_SNOW_DECODER 0
-+#define CONFIG_SP5X_DECODER 0
-+#define CONFIG_SPEEDHQ_DECODER 0
-+#define CONFIG_SPEEX_DECODER 0
-+#define CONFIG_SRGC_DECODER 0
-+#define CONFIG_SUNRAST_DECODER 0
-+#define CONFIG_SVQ1_DECODER 0
-+#define CONFIG_SVQ3_DECODER 0
-+#define CONFIG_TARGA_DECODER 0
-+#define CONFIG_TARGA_Y216_DECODER 0
-+#define CONFIG_TDSC_DECODER 0
-+#define CONFIG_THEORA_DECODER 1
-+#define CONFIG_THP_DECODER 0
-+#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
-+#define CONFIG_TIFF_DECODER 0
-+#define CONFIG_TMV_DECODER 0
-+#define CONFIG_TRUEMOTION1_DECODER 0
-+#define CONFIG_TRUEMOTION2_DECODER 0
-+#define CONFIG_TRUEMOTION2RT_DECODER 0
-+#define CONFIG_TSCC_DECODER 0
-+#define CONFIG_TSCC2_DECODER 0
-+#define CONFIG_TXD_DECODER 0
-+#define CONFIG_ULTI_DECODER 0
-+#define CONFIG_UTVIDEO_DECODER 0
-+#define CONFIG_V210_DECODER 0
-+#define CONFIG_V210X_DECODER 0
-+#define CONFIG_V308_DECODER 0
-+#define CONFIG_V408_DECODER 0
-+#define CONFIG_V410_DECODER 0
-+#define CONFIG_VB_DECODER 0
-+#define CONFIG_VBLE_DECODER 0
-+#define CONFIG_VC1_DECODER 0
-+#define CONFIG_VC1_CRYSTALHD_DECODER 0
-+#define CONFIG_VC1IMAGE_DECODER 0
-+#define CONFIG_VC1_MMAL_DECODER 0
-+#define CONFIG_VC1_QSV_DECODER 0
-+#define CONFIG_VC1_V4L2M2M_DECODER 0
-+#define CONFIG_VCR1_DECODER 0
-+#define CONFIG_VMDVIDEO_DECODER 0
-+#define CONFIG_VMNC_DECODER 0
-+#define CONFIG_VP3_DECODER 1
-+#define CONFIG_VP4_DECODER 0
-+#define CONFIG_VP5_DECODER 0
-+#define CONFIG_VP6_DECODER 0
-+#define CONFIG_VP6A_DECODER 0
-+#define CONFIG_VP6F_DECODER 0
-+#define CONFIG_VP7_DECODER 0
-+#define CONFIG_VP8_DECODER 1
-+#define CONFIG_VP8_RKMPP_DECODER 0
-+#define CONFIG_VP8_V4L2M2M_DECODER 0
-+#define CONFIG_VP9_DECODER 0
-+#define CONFIG_VP9_RKMPP_DECODER 0
-+#define CONFIG_VP9_V4L2M2M_DECODER 0
-+#define CONFIG_VQA_DECODER 0
-+#define CONFIG_WEBP_DECODER 0
-+#define CONFIG_WCMV_DECODER 0
-+#define CONFIG_WRAPPED_AVFRAME_DECODER 0
-+#define CONFIG_WMV1_DECODER 0
-+#define CONFIG_WMV2_DECODER 0
-+#define CONFIG_WMV3_DECODER 0
-+#define CONFIG_WMV3_CRYSTALHD_DECODER 0
-+#define CONFIG_WMV3IMAGE_DECODER 0
-+#define CONFIG_WNV1_DECODER 0
-+#define CONFIG_XAN_WC3_DECODER 0
-+#define CONFIG_XAN_WC4_DECODER 0
-+#define CONFIG_XBM_DECODER 0
-+#define CONFIG_XFACE_DECODER 0
-+#define CONFIG_XL_DECODER 0
-+#define CONFIG_XPM_DECODER 0
-+#define CONFIG_XWD_DECODER 0
-+#define CONFIG_Y41P_DECODER 0
-+#define CONFIG_YLC_DECODER 0
-+#define CONFIG_YOP_DECODER 0
-+#define CONFIG_YUV4_DECODER 0
-+#define CONFIG_ZERO12V_DECODER 0
-+#define CONFIG_ZEROCODEC_DECODER 0
-+#define CONFIG_ZLIB_DECODER 0
-+#define CONFIG_ZMBV_DECODER 0
-+#define CONFIG_AAC_DECODER 1
-+#define CONFIG_AAC_FIXED_DECODER 0
-+#define CONFIG_AAC_LATM_DECODER 0
-+#define CONFIG_AC3_DECODER 0
-+#define CONFIG_AC3_FIXED_DECODER 0
-+#define CONFIG_ACELP_KELVIN_DECODER 0
-+#define CONFIG_ALAC_DECODER 0
-+#define CONFIG_ALS_DECODER 0
-+#define CONFIG_AMRNB_DECODER 0
-+#define CONFIG_AMRWB_DECODER 0
-+#define CONFIG_APE_DECODER 0
-+#define CONFIG_APTX_DECODER 0
-+#define CONFIG_APTX_HD_DECODER 0
-+#define CONFIG_ATRAC1_DECODER 0
-+#define CONFIG_ATRAC3_DECODER 0
-+#define CONFIG_ATRAC3AL_DECODER 0
-+#define CONFIG_ATRAC3P_DECODER 0
-+#define CONFIG_ATRAC3PAL_DECODER 0
-+#define CONFIG_ATRAC9_DECODER 0
-+#define CONFIG_BINKAUDIO_DCT_DECODER 0
-+#define CONFIG_BINKAUDIO_RDFT_DECODER 0
-+#define CONFIG_BMV_AUDIO_DECODER 0
-+#define CONFIG_COOK_DECODER 0
-+#define CONFIG_DCA_DECODER 0
-+#define CONFIG_DOLBY_E_DECODER 0
-+#define CONFIG_DSD_LSBF_DECODER 0
-+#define CONFIG_DSD_MSBF_DECODER 0
-+#define CONFIG_DSD_LSBF_PLANAR_DECODER 0
-+#define CONFIG_DSD_MSBF_PLANAR_DECODER 0
-+#define CONFIG_DSICINAUDIO_DECODER 0
-+#define CONFIG_DSS_SP_DECODER 0
-+#define CONFIG_DST_DECODER 0
-+#define CONFIG_EAC3_DECODER 0
-+#define CONFIG_EVRC_DECODER 0
-+#define CONFIG_FASTAUDIO_DECODER 0
-+#define CONFIG_FFWAVESYNTH_DECODER 0
-+#define CONFIG_FLAC_DECODER 1
-+#define CONFIG_G723_1_DECODER 0
-+#define CONFIG_G729_DECODER 0
-+#define CONFIG_GSM_DECODER 0
-+#define CONFIG_GSM_MS_DECODER 0
-+#define CONFIG_HCA_DECODER 0
-+#define CONFIG_HCOM_DECODER 0
-+#define CONFIG_IAC_DECODER 0
-+#define CONFIG_ILBC_DECODER 0
-+#define CONFIG_IMC_DECODER 0
-+#define CONFIG_INTERPLAY_ACM_DECODER 0
-+#define CONFIG_MACE3_DECODER 0
-+#define CONFIG_MACE6_DECODER 0
-+#define CONFIG_METASOUND_DECODER 0
-+#define CONFIG_MLP_DECODER 0
-+#define CONFIG_MP1_DECODER 0
-+#define CONFIG_MP1FLOAT_DECODER 0
-+#define CONFIG_MP2_DECODER 0
-+#define CONFIG_MP2FLOAT_DECODER 0
-+#define CONFIG_MP3FLOAT_DECODER 0
-+#define CONFIG_MP3_DECODER 1
-+#define CONFIG_MP3ADUFLOAT_DECODER 0
-+#define CONFIG_MP3ADU_DECODER 0
-+#define CONFIG_MP3ON4FLOAT_DECODER 0
-+#define CONFIG_MP3ON4_DECODER 0
-+#define CONFIG_MPC7_DECODER 0
-+#define CONFIG_MPC8_DECODER 0
-+#define CONFIG_MSNSIREN_DECODER 0
-+#define CONFIG_NELLYMOSER_DECODER 0
-+#define CONFIG_ON2AVC_DECODER 0
-+#define CONFIG_OPUS_DECODER 0
-+#define CONFIG_PAF_AUDIO_DECODER 0
-+#define CONFIG_QCELP_DECODER 0
-+#define CONFIG_QDM2_DECODER 0
-+#define CONFIG_QDMC_DECODER 0
-+#define CONFIG_RA_144_DECODER 0
-+#define CONFIG_RA_288_DECODER 0
-+#define CONFIG_RALF_DECODER 0
-+#define CONFIG_SBC_DECODER 0
-+#define CONFIG_SHORTEN_DECODER 0
-+#define CONFIG_SIPR_DECODER 0
-+#define CONFIG_SIREN_DECODER 0
-+#define CONFIG_SMACKAUD_DECODER 0
-+#define CONFIG_SONIC_DECODER 0
-+#define CONFIG_TAK_DECODER 0
-+#define CONFIG_TRUEHD_DECODER 0
-+#define CONFIG_TRUESPEECH_DECODER 0
-+#define CONFIG_TTA_DECODER 0
-+#define CONFIG_TWINVQ_DECODER 0
-+#define CONFIG_VMDAUDIO_DECODER 0
-+#define CONFIG_VORBIS_DECODER 1
-+#define CONFIG_WAVPACK_DECODER 0
-+#define CONFIG_WMALOSSLESS_DECODER 0
-+#define CONFIG_WMAPRO_DECODER 0
-+#define CONFIG_WMAV1_DECODER 0
-+#define CONFIG_WMAV2_DECODER 0
-+#define CONFIG_WMAVOICE_DECODER 0
-+#define CONFIG_WS_SND1_DECODER 0
-+#define CONFIG_XMA1_DECODER 0
-+#define CONFIG_XMA2_DECODER 0
-+#define CONFIG_PCM_ALAW_DECODER 1
-+#define CONFIG_PCM_BLURAY_DECODER 0
-+#define CONFIG_PCM_DVD_DECODER 0
-+#define CONFIG_PCM_F16LE_DECODER 0
-+#define CONFIG_PCM_F24LE_DECODER 0
-+#define CONFIG_PCM_F32BE_DECODER 0
-+#define CONFIG_PCM_F32LE_DECODER 1
-+#define CONFIG_PCM_F64BE_DECODER 0
-+#define CONFIG_PCM_F64LE_DECODER 0
-+#define CONFIG_PCM_LXF_DECODER 0
-+#define CONFIG_PCM_MULAW_DECODER 1
-+#define CONFIG_PCM_S8_DECODER 0
-+#define CONFIG_PCM_S8_PLANAR_DECODER 0
-+#define CONFIG_PCM_S16BE_DECODER 1
-+#define CONFIG_PCM_S16BE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S16LE_DECODER 1
-+#define CONFIG_PCM_S16LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S24BE_DECODER 1
-+#define CONFIG_PCM_S24DAUD_DECODER 0
-+#define CONFIG_PCM_S24LE_DECODER 1
-+#define CONFIG_PCM_S24LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S32BE_DECODER 0
-+#define CONFIG_PCM_S32LE_DECODER 1
-+#define CONFIG_PCM_S32LE_PLANAR_DECODER 0
-+#define CONFIG_PCM_S64BE_DECODER 0
-+#define CONFIG_PCM_S64LE_DECODER 0
-+#define CONFIG_PCM_SGA_DECODER 0
-+#define CONFIG_PCM_U8_DECODER 1
-+#define CONFIG_PCM_U16BE_DECODER 0
-+#define CONFIG_PCM_U16LE_DECODER 0
-+#define CONFIG_PCM_U24BE_DECODER 0
-+#define CONFIG_PCM_U24LE_DECODER 0
-+#define CONFIG_PCM_U32BE_DECODER 0
-+#define CONFIG_PCM_U32LE_DECODER 0
-+#define CONFIG_PCM_VIDC_DECODER 0
-+#define CONFIG_DERF_DPCM_DECODER 0
-+#define CONFIG_GREMLIN_DPCM_DECODER 0
-+#define CONFIG_INTERPLAY_DPCM_DECODER 0
-+#define CONFIG_ROQ_DPCM_DECODER 0
-+#define CONFIG_SDX2_DPCM_DECODER 0
-+#define CONFIG_SOL_DPCM_DECODER 0
-+#define CONFIG_XAN_DPCM_DECODER 0
-+#define CONFIG_ADPCM_4XM_DECODER 0
-+#define CONFIG_ADPCM_ADX_DECODER 0
-+#define CONFIG_ADPCM_AFC_DECODER 0
-+#define CONFIG_ADPCM_AGM_DECODER 0
-+#define CONFIG_ADPCM_AICA_DECODER 0
-+#define CONFIG_ADPCM_ARGO_DECODER 0
-+#define CONFIG_ADPCM_CT_DECODER 0
-+#define CONFIG_ADPCM_DTK_DECODER 0
-+#define CONFIG_ADPCM_EA_DECODER 0
-+#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
-+#define CONFIG_ADPCM_EA_R1_DECODER 0
-+#define CONFIG_ADPCM_EA_R2_DECODER 0
-+#define CONFIG_ADPCM_EA_R3_DECODER 0
-+#define CONFIG_ADPCM_EA_XAS_DECODER 0
-+#define CONFIG_ADPCM_G722_DECODER 0
-+#define CONFIG_ADPCM_G726_DECODER 0
-+#define CONFIG_ADPCM_G726LE_DECODER 0
-+#define CONFIG_ADPCM_IMA_ACORN_DECODER 0
-+#define CONFIG_ADPCM_IMA_AMV_DECODER 0
-+#define CONFIG_ADPCM_IMA_ALP_DECODER 0
-+#define CONFIG_ADPCM_IMA_APC_DECODER 0
-+#define CONFIG_ADPCM_IMA_APM_DECODER 0
-+#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
-+#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK3_DECODER 0
-+#define CONFIG_ADPCM_IMA_DK4_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
-+#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_ISS_DECODER 0
-+#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
-+#define CONFIG_ADPCM_IMA_MTF_DECODER 0
-+#define CONFIG_ADPCM_IMA_OKI_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_DECODER 0
-+#define CONFIG_ADPCM_IMA_RAD_DECODER 0
-+#define CONFIG_ADPCM_IMA_SSI_DECODER 0
-+#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
-+#define CONFIG_ADPCM_IMA_WAV_DECODER 0
-+#define CONFIG_ADPCM_IMA_WS_DECODER 0
-+#define CONFIG_ADPCM_MS_DECODER 0
-+#define CONFIG_ADPCM_MTAF_DECODER 0
-+#define CONFIG_ADPCM_PSX_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_2_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_3_DECODER 0
-+#define CONFIG_ADPCM_SBPRO_4_DECODER 0
-+#define CONFIG_ADPCM_SWF_DECODER 0
-+#define CONFIG_ADPCM_THP_DECODER 0
-+#define CONFIG_ADPCM_THP_LE_DECODER 0
-+#define CONFIG_ADPCM_VIMA_DECODER 0
-+#define CONFIG_ADPCM_XA_DECODER 0
-+#define CONFIG_ADPCM_YAMAHA_DECODER 0
-+#define CONFIG_ADPCM_ZORK_DECODER 0
-+#define CONFIG_SSA_DECODER 0
-+#define CONFIG_ASS_DECODER 0
-+#define CONFIG_CCAPTION_DECODER 0
-+#define CONFIG_DVBSUB_DECODER 0
-+#define CONFIG_DVDSUB_DECODER 0
-+#define CONFIG_JACOSUB_DECODER 0
-+#define CONFIG_MICRODVD_DECODER 0
-+#define CONFIG_MOVTEXT_DECODER 0
-+#define CONFIG_MPL2_DECODER 0
-+#define CONFIG_PGSSUB_DECODER 0
-+#define CONFIG_PJS_DECODER 0
-+#define CONFIG_REALTEXT_DECODER 0
-+#define CONFIG_SAMI_DECODER 0
-+#define CONFIG_SRT_DECODER 0
-+#define CONFIG_STL_DECODER 0
-+#define CONFIG_SUBRIP_DECODER 0
-+#define CONFIG_SUBVIEWER_DECODER 0
-+#define CONFIG_SUBVIEWER1_DECODER 0
-+#define CONFIG_TEXT_DECODER 0
-+#define CONFIG_VPLAYER_DECODER 0
-+#define CONFIG_WEBVTT_DECODER 0
-+#define CONFIG_XSUB_DECODER 0
-+#define CONFIG_AAC_AT_DECODER 0
-+#define CONFIG_AC3_AT_DECODER 0
-+#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
-+#define CONFIG_ALAC_AT_DECODER 0
-+#define CONFIG_AMR_NB_AT_DECODER 0
-+#define CONFIG_EAC3_AT_DECODER 0
-+#define CONFIG_GSM_MS_AT_DECODER 0
-+#define CONFIG_ILBC_AT_DECODER 0
-+#define CONFIG_MP1_AT_DECODER 0
-+#define CONFIG_MP2_AT_DECODER 0
-+#define CONFIG_MP3_AT_DECODER 0
-+#define CONFIG_PCM_ALAW_AT_DECODER 0
-+#define CONFIG_PCM_MULAW_AT_DECODER 0
-+#define CONFIG_QDMC_AT_DECODER 0
-+#define CONFIG_QDM2_AT_DECODER 0
-+#define CONFIG_LIBARIBB24_DECODER 0
-+#define CONFIG_LIBCELT_DECODER 0
-+#define CONFIG_LIBCODEC2_DECODER 0
-+#define CONFIG_LIBDAV1D_DECODER 0
-+#define CONFIG_LIBDAVS2_DECODER 0
-+#define CONFIG_LIBFDK_AAC_DECODER 0
-+#define CONFIG_LIBGSM_DECODER 0
-+#define CONFIG_LIBGSM_MS_DECODER 0
-+#define CONFIG_LIBILBC_DECODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
-+#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
-+#define CONFIG_LIBOPENJPEG_DECODER 0
-+#define CONFIG_LIBOPUS_DECODER 1
-+#define CONFIG_LIBRSVG_DECODER 0
-+#define CONFIG_LIBSPEEX_DECODER 0
-+#define CONFIG_LIBUAVS3D_DECODER 0
-+#define CONFIG_LIBVORBIS_DECODER 0
-+#define CONFIG_LIBVPX_VP8_DECODER 0
-+#define CONFIG_LIBVPX_VP9_DECODER 0
-+#define CONFIG_LIBZVBI_TELETEXT_DECODER 0
-+#define CONFIG_BINTEXT_DECODER 0
-+#define CONFIG_XBIN_DECODER 0
-+#define CONFIG_IDF_DECODER 0
-+#define CONFIG_LIBAOM_AV1_DECODER 0
-+#define CONFIG_AV1_DECODER 0
-+#define CONFIG_AV1_CUVID_DECODER 0
-+#define CONFIG_AV1_QSV_DECODER 0
-+#define CONFIG_LIBOPENH264_DECODER 0
-+#define CONFIG_H264_CUVID_DECODER 0
-+#define CONFIG_HEVC_CUVID_DECODER 0
-+#define CONFIG_HEVC_MEDIACODEC_DECODER 0
-+#define CONFIG_MJPEG_CUVID_DECODER 0
-+#define CONFIG_MJPEG_QSV_DECODER 0
-+#define CONFIG_MPEG1_CUVID_DECODER 0
-+#define CONFIG_MPEG2_CUVID_DECODER 0
-+#define CONFIG_MPEG4_CUVID_DECODER 0
-+#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
-+#define CONFIG_VC1_CUVID_DECODER 0
-+#define CONFIG_VP8_CUVID_DECODER 0
-+#define CONFIG_VP8_MEDIACODEC_DECODER 0
-+#define CONFIG_VP8_QSV_DECODER 0
-+#define CONFIG_VP9_CUVID_DECODER 0
-+#define CONFIG_VP9_MEDIACODEC_DECODER 0
-+#define CONFIG_VP9_QSV_DECODER 0
-+#define CONFIG_A64MULTI_ENCODER 0
-+#define CONFIG_A64MULTI5_ENCODER 0
-+#define CONFIG_ALIAS_PIX_ENCODER 0
-+#define CONFIG_AMV_ENCODER 0
-+#define CONFIG_APNG_ENCODER 0
-+#define CONFIG_ASV1_ENCODER 0
-+#define CONFIG_ASV2_ENCODER 0
-+#define CONFIG_AVRP_ENCODER 0
-+#define CONFIG_AVUI_ENCODER 0
-+#define CONFIG_AYUV_ENCODER 0
-+#define CONFIG_BITPACKED_ENCODER 0
-+#define CONFIG_BMP_ENCODER 0
-+#define CONFIG_CFHD_ENCODER 0
-+#define CONFIG_CINEPAK_ENCODER 0
-+#define CONFIG_CLJR_ENCODER 0
-+#define CONFIG_COMFORTNOISE_ENCODER 0
-+#define CONFIG_DNXHD_ENCODER 0
-+#define CONFIG_DPX_ENCODER 0
-+#define CONFIG_DVVIDEO_ENCODER 0
-+#define CONFIG_EXR_ENCODER 0
-+#define CONFIG_FFV1_ENCODER 0
-+#define CONFIG_FFVHUFF_ENCODER 0
-+#define CONFIG_FITS_ENCODER 0
-+#define CONFIG_FLASHSV_ENCODER 0
-+#define CONFIG_FLASHSV2_ENCODER 0
-+#define CONFIG_FLV_ENCODER 0
-+#define CONFIG_GIF_ENCODER 0
-+#define CONFIG_H261_ENCODER 0
-+#define CONFIG_H263_ENCODER 0
-+#define CONFIG_H263P_ENCODER 0
-+#define CONFIG_HAP_ENCODER 0
-+#define CONFIG_HUFFYUV_ENCODER 0
-+#define CONFIG_JPEG2000_ENCODER 0
-+#define CONFIG_JPEGLS_ENCODER 0
-+#define CONFIG_LJPEG_ENCODER 0
-+#define CONFIG_MAGICYUV_ENCODER 0
-+#define CONFIG_MJPEG_ENCODER 0
-+#define CONFIG_MPEG1VIDEO_ENCODER 0
-+#define CONFIG_MPEG2VIDEO_ENCODER 0
-+#define CONFIG_MPEG4_ENCODER 0
-+#define CONFIG_MSMPEG4V2_ENCODER 0
-+#define CONFIG_MSMPEG4V3_ENCODER 0
-+#define CONFIG_MSVIDEO1_ENCODER 0
-+#define CONFIG_PAM_ENCODER 0
-+#define CONFIG_PBM_ENCODER 0
-+#define CONFIG_PCX_ENCODER 0
-+#define CONFIG_PFM_ENCODER 0
-+#define CONFIG_PGM_ENCODER 0
-+#define CONFIG_PGMYUV_ENCODER 0
-+#define CONFIG_PNG_ENCODER 0
-+#define CONFIG_PPM_ENCODER 0
-+#define CONFIG_PRORES_ENCODER 0
-+#define CONFIG_PRORES_AW_ENCODER 0
-+#define CONFIG_PRORES_KS_ENCODER 0
-+#define CONFIG_QTRLE_ENCODER 0
-+#define CONFIG_R10K_ENCODER 0
-+#define CONFIG_R210_ENCODER 0
-+#define CONFIG_RAWVIDEO_ENCODER 0
-+#define CONFIG_ROQ_ENCODER 0
-+#define CONFIG_RPZA_ENCODER 0
-+#define CONFIG_RV10_ENCODER 0
-+#define CONFIG_RV20_ENCODER 0
-+#define CONFIG_S302M_ENCODER 0
-+#define CONFIG_SGI_ENCODER 0
-+#define CONFIG_SMC_ENCODER 0
-+#define CONFIG_SNOW_ENCODER 0
-+#define CONFIG_SPEEDHQ_ENCODER 0
-+#define CONFIG_SUNRAST_ENCODER 0
-+#define CONFIG_SVQ1_ENCODER 0
-+#define CONFIG_TARGA_ENCODER 0
-+#define CONFIG_TIFF_ENCODER 0
-+#define CONFIG_UTVIDEO_ENCODER 0
-+#define CONFIG_V210_ENCODER 0
-+#define CONFIG_V308_ENCODER 0
-+#define CONFIG_V408_ENCODER 0
-+#define CONFIG_V410_ENCODER 0
-+#define CONFIG_VC2_ENCODER 0
-+#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
-+#define CONFIG_WMV1_ENCODER 0
-+#define CONFIG_WMV2_ENCODER 0
-+#define CONFIG_XBM_ENCODER 0
-+#define CONFIG_XFACE_ENCODER 0
-+#define CONFIG_XWD_ENCODER 0
-+#define CONFIG_Y41P_ENCODER 0
-+#define CONFIG_YUV4_ENCODER 0
-+#define CONFIG_ZLIB_ENCODER 0
-+#define CONFIG_ZMBV_ENCODER 0
-+#define CONFIG_AAC_ENCODER 0
-+#define CONFIG_AC3_ENCODER 0
-+#define CONFIG_AC3_FIXED_ENCODER 0
-+#define CONFIG_ALAC_ENCODER 0
-+#define CONFIG_APTX_ENCODER 0
-+#define CONFIG_APTX_HD_ENCODER 0
-+#define CONFIG_DCA_ENCODER 0
-+#define CONFIG_EAC3_ENCODER 0
-+#define CONFIG_FLAC_ENCODER 0
-+#define CONFIG_G723_1_ENCODER 0
-+#define CONFIG_MLP_ENCODER 0
-+#define CONFIG_MP2_ENCODER 0
-+#define CONFIG_MP2FIXED_ENCODER 0
-+#define CONFIG_NELLYMOSER_ENCODER 0
-+#define CONFIG_OPUS_ENCODER 0
-+#define CONFIG_RA_144_ENCODER 0
-+#define CONFIG_SBC_ENCODER 0
-+#define CONFIG_SONIC_ENCODER 0
-+#define CONFIG_SONIC_LS_ENCODER 0
-+#define CONFIG_TRUEHD_ENCODER 0
-+#define CONFIG_TTA_ENCODER 0
-+#define CONFIG_VORBIS_ENCODER 0
-+#define CONFIG_WAVPACK_ENCODER 0
-+#define CONFIG_WMAV1_ENCODER 0
-+#define CONFIG_WMAV2_ENCODER 0
-+#define CONFIG_PCM_ALAW_ENCODER 0
-+#define CONFIG_PCM_DVD_ENCODER 0
-+#define CONFIG_PCM_F32BE_ENCODER 0
-+#define CONFIG_PCM_F32LE_ENCODER 0
-+#define CONFIG_PCM_F64BE_ENCODER 0
-+#define CONFIG_PCM_F64LE_ENCODER 0
-+#define CONFIG_PCM_MULAW_ENCODER 0
-+#define CONFIG_PCM_S8_ENCODER 0
-+#define CONFIG_PCM_S8_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16BE_ENCODER 0
-+#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S16LE_ENCODER 0
-+#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S24BE_ENCODER 0
-+#define CONFIG_PCM_S24DAUD_ENCODER 0
-+#define CONFIG_PCM_S24LE_ENCODER 0
-+#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S32BE_ENCODER 0
-+#define CONFIG_PCM_S32LE_ENCODER 0
-+#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
-+#define CONFIG_PCM_S64BE_ENCODER 0
-+#define CONFIG_PCM_S64LE_ENCODER 0
-+#define CONFIG_PCM_U8_ENCODER 0
-+#define CONFIG_PCM_U16BE_ENCODER 0
-+#define CONFIG_PCM_U16LE_ENCODER 0
-+#define CONFIG_PCM_U24BE_ENCODER 0
-+#define CONFIG_PCM_U24LE_ENCODER 0
-+#define CONFIG_PCM_U32BE_ENCODER 0
-+#define CONFIG_PCM_U32LE_ENCODER 0
-+#define CONFIG_PCM_VIDC_ENCODER 0
-+#define CONFIG_ROQ_DPCM_ENCODER 0
-+#define CONFIG_ADPCM_ADX_ENCODER 0
-+#define CONFIG_ADPCM_ARGO_ENCODER 0
-+#define CONFIG_ADPCM_G722_ENCODER 0
-+#define CONFIG_ADPCM_G726_ENCODER 0
-+#define CONFIG_ADPCM_G726LE_ENCODER 0
-+#define CONFIG_ADPCM_IMA_AMV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_ALP_ENCODER 0
-+#define CONFIG_ADPCM_IMA_APM_ENCODER 0
-+#define CONFIG_ADPCM_IMA_QT_ENCODER 0
-+#define CONFIG_ADPCM_IMA_SSI_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
-+#define CONFIG_ADPCM_IMA_WS_ENCODER 0
-+#define CONFIG_ADPCM_MS_ENCODER 0
-+#define CONFIG_ADPCM_SWF_ENCODER 0
-+#define CONFIG_ADPCM_YAMAHA_ENCODER 0
-+#define CONFIG_SSA_ENCODER 0
-+#define CONFIG_ASS_ENCODER 0
-+#define CONFIG_DVBSUB_ENCODER 0
-+#define CONFIG_DVDSUB_ENCODER 0
-+#define CONFIG_MOVTEXT_ENCODER 0
-+#define CONFIG_SRT_ENCODER 0
-+#define CONFIG_SUBRIP_ENCODER 0
-+#define CONFIG_TEXT_ENCODER 0
-+#define CONFIG_TTML_ENCODER 0
-+#define CONFIG_WEBVTT_ENCODER 0
-+#define CONFIG_XSUB_ENCODER 0
-+#define CONFIG_AAC_AT_ENCODER 0
-+#define CONFIG_ALAC_AT_ENCODER 0
-+#define CONFIG_ILBC_AT_ENCODER 0
-+#define CONFIG_PCM_ALAW_AT_ENCODER 0
-+#define CONFIG_PCM_MULAW_AT_ENCODER 0
-+#define CONFIG_LIBAOM_AV1_ENCODER 0
-+#define CONFIG_LIBCODEC2_ENCODER 0
-+#define CONFIG_LIBFDK_AAC_ENCODER 0
-+#define CONFIG_LIBGSM_ENCODER 0
-+#define CONFIG_LIBGSM_MS_ENCODER 0
-+#define CONFIG_LIBILBC_ENCODER 0
-+#define CONFIG_LIBMP3LAME_ENCODER 0
-+#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
-+#define CONFIG_LIBOPENJPEG_ENCODER 0
-+#define CONFIG_LIBOPUS_ENCODER 0
-+#define CONFIG_LIBRAV1E_ENCODER 0
-+#define CONFIG_LIBSHINE_ENCODER 0
-+#define CONFIG_LIBSPEEX_ENCODER 0
-+#define CONFIG_LIBSVTAV1_ENCODER 0
-+#define CONFIG_LIBTHEORA_ENCODER 0
-+#define CONFIG_LIBTWOLAME_ENCODER 0
-+#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
-+#define CONFIG_LIBVORBIS_ENCODER 0
-+#define CONFIG_LIBVPX_VP8_ENCODER 0
-+#define CONFIG_LIBVPX_VP9_ENCODER 0
-+#define CONFIG_LIBWEBP_ANIM_ENCODER 0
-+#define CONFIG_LIBWEBP_ENCODER 0
-+#define CONFIG_LIBX262_ENCODER 0
-+#define CONFIG_LIBX264_ENCODER 0
-+#define CONFIG_LIBX264RGB_ENCODER 0
-+#define CONFIG_LIBX265_ENCODER 0
-+#define CONFIG_LIBXAVS_ENCODER 0
-+#define CONFIG_LIBXAVS2_ENCODER 0
-+#define CONFIG_LIBXVID_ENCODER 0
-+#define CONFIG_AAC_MF_ENCODER 0
-+#define CONFIG_AC3_MF_ENCODER 0
-+#define CONFIG_H263_V4L2M2M_ENCODER 0
-+#define CONFIG_LIBOPENH264_ENCODER 0
-+#define CONFIG_H264_AMF_ENCODER 0
-+#define CONFIG_H264_MF_ENCODER 0
-+#define CONFIG_H264_NVENC_ENCODER 0
-+#define CONFIG_H264_OMX_ENCODER 0
-+#define CONFIG_H264_QSV_ENCODER 0
-+#define CONFIG_H264_V4L2M2M_ENCODER 0
-+#define CONFIG_H264_VAAPI_ENCODER 0
-+#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_HEVC_AMF_ENCODER 0
-+#define CONFIG_HEVC_MF_ENCODER 0
-+#define CONFIG_HEVC_NVENC_ENCODER 0
-+#define CONFIG_HEVC_QSV_ENCODER 0
-+#define CONFIG_HEVC_V4L2M2M_ENCODER 0
-+#define CONFIG_HEVC_VAAPI_ENCODER 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_LIBKVAZAAR_ENCODER 0
-+#define CONFIG_MJPEG_QSV_ENCODER 0
-+#define CONFIG_MJPEG_VAAPI_ENCODER 0
-+#define CONFIG_MP3_MF_ENCODER 0
-+#define CONFIG_MPEG2_QSV_ENCODER 0
-+#define CONFIG_MPEG2_VAAPI_ENCODER 0
-+#define CONFIG_MPEG4_OMX_ENCODER 0
-+#define CONFIG_MPEG4_V4L2M2M_ENCODER 0
-+#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
-+#define CONFIG_VP8_V4L2M2M_ENCODER 0
-+#define CONFIG_VP8_VAAPI_ENCODER 0
-+#define CONFIG_VP9_VAAPI_ENCODER 0
-+#define CONFIG_VP9_QSV_ENCODER 0
-+#define CONFIG_AV1_D3D11VA_HWACCEL 0
-+#define CONFIG_AV1_D3D11VA2_HWACCEL 0
-+#define CONFIG_AV1_DXVA2_HWACCEL 0
-+#define CONFIG_AV1_NVDEC_HWACCEL 0
-+#define CONFIG_AV1_VAAPI_HWACCEL 0
-+#define CONFIG_H263_VAAPI_HWACCEL 0
-+#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_H264_D3D11VA_HWACCEL 0
-+#define CONFIG_H264_D3D11VA2_HWACCEL 0
-+#define CONFIG_H264_DXVA2_HWACCEL 0
-+#define CONFIG_H264_NVDEC_HWACCEL 0
-+#define CONFIG_H264_VAAPI_HWACCEL 0
-+#define CONFIG_H264_VDPAU_HWACCEL 0
-+#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_HEVC_D3D11VA_HWACCEL 0
-+#define CONFIG_HEVC_D3D11VA2_HWACCEL 0
-+#define CONFIG_HEVC_DXVA2_HWACCEL 0
-+#define CONFIG_HEVC_NVDEC_HWACCEL 0
-+#define CONFIG_HEVC_VAAPI_HWACCEL 0
-+#define CONFIG_HEVC_VDPAU_HWACCEL 0
-+#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MJPEG_NVDEC_HWACCEL 0
-+#define CONFIG_MJPEG_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG1_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG1_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MPEG1_XVMC_HWACCEL 0
-+#define CONFIG_MPEG2_D3D11VA_HWACCEL 0
-+#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
-+#define CONFIG_MPEG2_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG2_DXVA2_HWACCEL 0
-+#define CONFIG_MPEG2_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG2_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_MPEG2_XVMC_HWACCEL 0
-+#define CONFIG_MPEG4_NVDEC_HWACCEL 0
-+#define CONFIG_MPEG4_VAAPI_HWACCEL 0
-+#define CONFIG_MPEG4_VDPAU_HWACCEL 0
-+#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_VC1_D3D11VA_HWACCEL 0
-+#define CONFIG_VC1_D3D11VA2_HWACCEL 0
-+#define CONFIG_VC1_DXVA2_HWACCEL 0
-+#define CONFIG_VC1_NVDEC_HWACCEL 0
-+#define CONFIG_VC1_VAAPI_HWACCEL 0
-+#define CONFIG_VC1_VDPAU_HWACCEL 0
-+#define CONFIG_VP8_NVDEC_HWACCEL 0
-+#define CONFIG_VP8_VAAPI_HWACCEL 0
-+#define CONFIG_VP9_D3D11VA_HWACCEL 0
-+#define CONFIG_VP9_D3D11VA2_HWACCEL 0
-+#define CONFIG_VP9_DXVA2_HWACCEL 0
-+#define CONFIG_VP9_NVDEC_HWACCEL 0
-+#define CONFIG_VP9_VAAPI_HWACCEL 0
-+#define CONFIG_VP9_VDPAU_HWACCEL 0
-+#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0
-+#define CONFIG_WMV3_D3D11VA_HWACCEL 0
-+#define CONFIG_WMV3_D3D11VA2_HWACCEL 0
-+#define CONFIG_WMV3_DXVA2_HWACCEL 0
-+#define CONFIG_WMV3_NVDEC_HWACCEL 0
-+#define CONFIG_WMV3_VAAPI_HWACCEL 0
-+#define CONFIG_WMV3_VDPAU_HWACCEL 0
-+#define CONFIG_AAC_PARSER 1
-+#define CONFIG_AAC_LATM_PARSER 0
-+#define CONFIG_AC3_PARSER 0
-+#define CONFIG_ADX_PARSER 0
-+#define CONFIG_AMR_PARSER 0
-+#define CONFIG_AV1_PARSER 0
-+#define CONFIG_AVS2_PARSER 0
-+#define CONFIG_AVS3_PARSER 0
-+#define CONFIG_BMP_PARSER 0
-+#define CONFIG_CAVSVIDEO_PARSER 0
-+#define CONFIG_COOK_PARSER 0
-+#define CONFIG_CRI_PARSER 0
-+#define CONFIG_DCA_PARSER 0
-+#define CONFIG_DIRAC_PARSER 0
-+#define CONFIG_DNXHD_PARSER 0
-+#define CONFIG_DOLBY_E_PARSER 0
-+#define CONFIG_DPX_PARSER 0
-+#define CONFIG_DVAUDIO_PARSER 0
-+#define CONFIG_DVBSUB_PARSER 0
-+#define CONFIG_DVDSUB_PARSER 0
-+#define CONFIG_DVD_NAV_PARSER 0
-+#define CONFIG_FLAC_PARSER 1
-+#define CONFIG_G723_1_PARSER 0
-+#define CONFIG_G729_PARSER 0
-+#define CONFIG_GIF_PARSER 0
-+#define CONFIG_GSM_PARSER 0
-+#define CONFIG_H261_PARSER 0
-+#define CONFIG_H263_PARSER 0
-+#define CONFIG_H264_PARSER 1
-+#define CONFIG_HEVC_PARSER 0
-+#define CONFIG_IPU_PARSER 0
-+#define CONFIG_JPEG2000_PARSER 0
-+#define CONFIG_MJPEG_PARSER 0
-+#define CONFIG_MLP_PARSER 0
-+#define CONFIG_MPEG4VIDEO_PARSER 0
-+#define CONFIG_MPEGAUDIO_PARSER 1
-+#define CONFIG_MPEGVIDEO_PARSER 0
-+#define CONFIG_OPUS_PARSER 1
-+#define CONFIG_PNG_PARSER 0
-+#define CONFIG_PNM_PARSER 0
-+#define CONFIG_RV30_PARSER 0
-+#define CONFIG_RV40_PARSER 0
-+#define CONFIG_SBC_PARSER 0
-+#define CONFIG_SIPR_PARSER 0
-+#define CONFIG_TAK_PARSER 0
-+#define CONFIG_VC1_PARSER 0
-+#define CONFIG_VORBIS_PARSER 1
-+#define CONFIG_VP3_PARSER 1
-+#define CONFIG_VP8_PARSER 1
-+#define CONFIG_VP9_PARSER 1
-+#define CONFIG_WEBP_PARSER 0
-+#define CONFIG_XBM_PARSER 0
-+#define CONFIG_XMA_PARSER 0
-+#define CONFIG_ALSA_INDEV 0
-+#define CONFIG_ANDROID_CAMERA_INDEV 0
-+#define CONFIG_AVFOUNDATION_INDEV 0
-+#define CONFIG_BKTR_INDEV 0
-+#define CONFIG_DECKLINK_INDEV 0
-+#define CONFIG_DSHOW_INDEV 0
-+#define CONFIG_FBDEV_INDEV 0
-+#define CONFIG_GDIGRAB_INDEV 0
-+#define CONFIG_IEC61883_INDEV 0
-+#define CONFIG_JACK_INDEV 0
-+#define CONFIG_KMSGRAB_INDEV 0
-+#define CONFIG_LAVFI_INDEV 0
-+#define CONFIG_OPENAL_INDEV 0
-+#define CONFIG_OSS_INDEV 0
-+#define CONFIG_PULSE_INDEV 0
-+#define CONFIG_SNDIO_INDEV 0
-+#define CONFIG_V4L2_INDEV 0
-+#define CONFIG_VFWCAP_INDEV 0
-+#define CONFIG_XCBGRAB_INDEV 0
-+#define CONFIG_LIBCDIO_INDEV 0
-+#define CONFIG_LIBDC1394_INDEV 0
-+#define CONFIG_ALSA_OUTDEV 0
-+#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
-+#define CONFIG_CACA_OUTDEV 0
-+#define CONFIG_DECKLINK_OUTDEV 0
-+#define CONFIG_FBDEV_OUTDEV 0
-+#define CONFIG_OPENGL_OUTDEV 0
-+#define CONFIG_OSS_OUTDEV 0
-+#define CONFIG_PULSE_OUTDEV 0
-+#define CONFIG_SDL2_OUTDEV 0
-+#define CONFIG_SNDIO_OUTDEV 0
-+#define CONFIG_V4L2_OUTDEV 0
-+#define CONFIG_XV_OUTDEV 0
-+#define CONFIG_ABENCH_FILTER 0
-+#define CONFIG_ACOMPRESSOR_FILTER 0
-+#define CONFIG_ACONTRAST_FILTER 0
-+#define CONFIG_ACOPY_FILTER 0
-+#define CONFIG_ACUE_FILTER 0
-+#define CONFIG_ACROSSFADE_FILTER 0
-+#define CONFIG_ACROSSOVER_FILTER 0
-+#define CONFIG_ACRUSHER_FILTER 0
-+#define CONFIG_ADECLICK_FILTER 0
-+#define CONFIG_ADECLIP_FILTER 0
-+#define CONFIG_ADECORRELATE_FILTER 0
-+#define CONFIG_ADELAY_FILTER 0
-+#define CONFIG_ADENORM_FILTER 0
-+#define CONFIG_ADERIVATIVE_FILTER 0
-+#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
-+#define CONFIG_ADYNAMICSMOOTH_FILTER 0
-+#define CONFIG_AECHO_FILTER 0
-+#define CONFIG_AEMPHASIS_FILTER 0
-+#define CONFIG_AEVAL_FILTER 0
-+#define CONFIG_AEXCITER_FILTER 0
-+#define CONFIG_AFADE_FILTER 0
-+#define CONFIG_AFFTDN_FILTER 0
-+#define CONFIG_AFFTFILT_FILTER 0
-+#define CONFIG_AFIR_FILTER 0
-+#define CONFIG_AFORMAT_FILTER 0
-+#define CONFIG_AFREQSHIFT_FILTER 0
-+#define CONFIG_AFWTDN_FILTER 0
-+#define CONFIG_AGATE_FILTER 0
-+#define CONFIG_AIIR_FILTER 0
-+#define CONFIG_AINTEGRAL_FILTER 0
-+#define CONFIG_AINTERLEAVE_FILTER 0
-+#define CONFIG_ALATENCY_FILTER 0
-+#define CONFIG_ALIMITER_FILTER 0
-+#define CONFIG_ALLPASS_FILTER 0
-+#define CONFIG_ALOOP_FILTER 0
-+#define CONFIG_AMERGE_FILTER 0
-+#define CONFIG_AMETADATA_FILTER 0
-+#define CONFIG_AMIX_FILTER 0
-+#define CONFIG_AMULTIPLY_FILTER 0
-+#define CONFIG_ANEQUALIZER_FILTER 0
-+#define CONFIG_ANLMDN_FILTER 0
-+#define CONFIG_ANLMF_FILTER 0
-+#define CONFIG_ANLMS_FILTER 0
-+#define CONFIG_ANULL_FILTER 0
-+#define CONFIG_APAD_FILTER 0
-+#define CONFIG_APERMS_FILTER 0
-+#define CONFIG_APHASER_FILTER 0
-+#define CONFIG_APHASESHIFT_FILTER 0
-+#define CONFIG_APSYCLIP_FILTER 0
-+#define CONFIG_APULSATOR_FILTER 0
-+#define CONFIG_AREALTIME_FILTER 0
-+#define CONFIG_ARESAMPLE_FILTER 0
-+#define CONFIG_AREVERSE_FILTER 0
-+#define CONFIG_ARNNDN_FILTER 0
-+#define CONFIG_ASDR_FILTER 0
-+#define CONFIG_ASEGMENT_FILTER 0
-+#define CONFIG_ASELECT_FILTER 0
-+#define CONFIG_ASENDCMD_FILTER 0
-+#define CONFIG_ASETNSAMPLES_FILTER 0
-+#define CONFIG_ASETPTS_FILTER 0
-+#define CONFIG_ASETRATE_FILTER 0
-+#define CONFIG_ASETTB_FILTER 0
-+#define CONFIG_ASHOWINFO_FILTER 0
-+#define CONFIG_ASIDEDATA_FILTER 0
-+#define CONFIG_ASOFTCLIP_FILTER 0
-+#define CONFIG_ASPECTRALSTATS_FILTER 0
-+#define CONFIG_ASPLIT_FILTER 0
-+#define CONFIG_ASR_FILTER 0
-+#define CONFIG_ASTATS_FILTER 0
-+#define CONFIG_ASTREAMSELECT_FILTER 0
-+#define CONFIG_ASUBBOOST_FILTER 0
-+#define CONFIG_ASUBCUT_FILTER 0
-+#define CONFIG_ASUPERCUT_FILTER 0
-+#define CONFIG_ASUPERPASS_FILTER 0
-+#define CONFIG_ASUPERSTOP_FILTER 0
-+#define CONFIG_ATEMPO_FILTER 0
-+#define CONFIG_ATILT_FILTER 0
-+#define CONFIG_ATRIM_FILTER 0
-+#define CONFIG_AXCORRELATE_FILTER 0
-+#define CONFIG_AZMQ_FILTER 0
-+#define CONFIG_BANDPASS_FILTER 0
-+#define CONFIG_BANDREJECT_FILTER 0
-+#define CONFIG_BASS_FILTER 0
-+#define CONFIG_BIQUAD_FILTER 0
-+#define CONFIG_BS2B_FILTER 0
-+#define CONFIG_CHANNELMAP_FILTER 0
-+#define CONFIG_CHANNELSPLIT_FILTER 0
-+#define CONFIG_CHORUS_FILTER 0
-+#define CONFIG_COMPAND_FILTER 0
-+#define CONFIG_COMPENSATIONDELAY_FILTER 0
-+#define CONFIG_CROSSFEED_FILTER 0
-+#define CONFIG_CRYSTALIZER_FILTER 0
-+#define CONFIG_DCSHIFT_FILTER 0
-+#define CONFIG_DEESSER_FILTER 0
-+#define CONFIG_DRMETER_FILTER 0
-+#define CONFIG_DYNAUDNORM_FILTER 0
-+#define CONFIG_EARWAX_FILTER 0
-+#define CONFIG_EBUR128_FILTER 0
-+#define CONFIG_EQUALIZER_FILTER 0
-+#define CONFIG_EXTRASTEREO_FILTER 0
-+#define CONFIG_FIREQUALIZER_FILTER 0
-+#define CONFIG_FLANGER_FILTER 0
-+#define CONFIG_HAAS_FILTER 0
-+#define CONFIG_HDCD_FILTER 0
-+#define CONFIG_HEADPHONE_FILTER 0
-+#define CONFIG_HIGHPASS_FILTER 0
-+#define CONFIG_HIGHSHELF_FILTER 0
-+#define CONFIG_JOIN_FILTER 0
-+#define CONFIG_LADSPA_FILTER 0
-+#define CONFIG_LOUDNORM_FILTER 0
-+#define CONFIG_LOWPASS_FILTER 0
-+#define CONFIG_LOWSHELF_FILTER 0
-+#define CONFIG_LV2_FILTER 0
-+#define CONFIG_MCOMPAND_FILTER 0
-+#define CONFIG_PAN_FILTER 0
-+#define CONFIG_REPLAYGAIN_FILTER 0
-+#define CONFIG_RUBBERBAND_FILTER 0
-+#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
-+#define CONFIG_SIDECHAINGATE_FILTER 0
-+#define CONFIG_SILENCEDETECT_FILTER 0
-+#define CONFIG_SILENCEREMOVE_FILTER 0
-+#define CONFIG_SOFALIZER_FILTER 0
-+#define CONFIG_SPEECHNORM_FILTER 0
-+#define CONFIG_STEREOTOOLS_FILTER 0
-+#define CONFIG_STEREOWIDEN_FILTER 0
-+#define CONFIG_SUPEREQUALIZER_FILTER 0
-+#define CONFIG_SURROUND_FILTER 0
-+#define CONFIG_TREBLE_FILTER 0
-+#define CONFIG_TREMOLO_FILTER 0
-+#define CONFIG_VIBRATO_FILTER 0
-+#define CONFIG_VOLUME_FILTER 0
-+#define CONFIG_VOLUMEDETECT_FILTER 0
-+#define CONFIG_AEVALSRC_FILTER 0
-+#define CONFIG_AFIRSRC_FILTER 0
-+#define CONFIG_ANOISESRC_FILTER 0
-+#define CONFIG_ANULLSRC_FILTER 0
-+#define CONFIG_FLITE_FILTER 0
-+#define CONFIG_HILBERT_FILTER 0
-+#define CONFIG_SINC_FILTER 0
-+#define CONFIG_SINE_FILTER 0
-+#define CONFIG_ANULLSINK_FILTER 0
-+#define CONFIG_ADDROI_FILTER 0
-+#define CONFIG_ALPHAEXTRACT_FILTER 0
-+#define CONFIG_ALPHAMERGE_FILTER 0
-+#define CONFIG_AMPLIFY_FILTER 0
-+#define CONFIG_ASS_FILTER 0
-+#define CONFIG_ATADENOISE_FILTER 0
-+#define CONFIG_AVGBLUR_FILTER 0
-+#define CONFIG_AVGBLUR_OPENCL_FILTER 0
-+#define CONFIG_AVGBLUR_VULKAN_FILTER 0
-+#define CONFIG_BBOX_FILTER 0
-+#define CONFIG_BENCH_FILTER 0
-+#define CONFIG_BILATERAL_FILTER 0
-+#define CONFIG_BITPLANENOISE_FILTER 0
-+#define CONFIG_BLACKDETECT_FILTER 0
-+#define CONFIG_BLACKFRAME_FILTER 0
-+#define CONFIG_BLEND_FILTER 0
-+#define CONFIG_BLEND_VULKAN_FILTER 0
-+#define CONFIG_BM3D_FILTER 0
-+#define CONFIG_BOXBLUR_FILTER 0
-+#define CONFIG_BOXBLUR_OPENCL_FILTER 0
-+#define CONFIG_BWDIF_FILTER 0
-+#define CONFIG_CAS_FILTER 0
-+#define CONFIG_CHROMABER_VULKAN_FILTER 0
-+#define CONFIG_CHROMAHOLD_FILTER 0
-+#define CONFIG_CHROMAKEY_FILTER 0
-+#define CONFIG_CHROMANR_FILTER 0
-+#define CONFIG_CHROMASHIFT_FILTER 0
-+#define CONFIG_CIESCOPE_FILTER 0
-+#define CONFIG_CODECVIEW_FILTER 0
-+#define CONFIG_COLORBALANCE_FILTER 0
-+#define CONFIG_COLORCHANNELMIXER_FILTER 0
-+#define CONFIG_COLORCONTRAST_FILTER 0
-+#define CONFIG_COLORCORRECT_FILTER 0
-+#define CONFIG_COLORIZE_FILTER 0
-+#define CONFIG_COLORKEY_FILTER 0
-+#define CONFIG_COLORKEY_OPENCL_FILTER 0
-+#define CONFIG_COLORHOLD_FILTER 0
-+#define CONFIG_COLORLEVELS_FILTER 0
-+#define CONFIG_COLORMATRIX_FILTER 0
-+#define CONFIG_COLORSPACE_FILTER 0
-+#define CONFIG_COLORTEMPERATURE_FILTER 0
-+#define CONFIG_CONVOLUTION_FILTER 0
-+#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
-+#define CONFIG_CONVOLVE_FILTER 0
-+#define CONFIG_COPY_FILTER 0
-+#define CONFIG_COREIMAGE_FILTER 0
-+#define CONFIG_COVER_RECT_FILTER 0
-+#define CONFIG_CROP_FILTER 0
-+#define CONFIG_CROPDETECT_FILTER 0
-+#define CONFIG_CUE_FILTER 0
-+#define CONFIG_CURVES_FILTER 0
-+#define CONFIG_DATASCOPE_FILTER 0
-+#define CONFIG_DBLUR_FILTER 0
-+#define CONFIG_DCTDNOIZ_FILTER 0
-+#define CONFIG_DEBAND_FILTER 0
-+#define CONFIG_DEBLOCK_FILTER 0
-+#define CONFIG_DECIMATE_FILTER 0
-+#define CONFIG_DECONVOLVE_FILTER 0
-+#define CONFIG_DEDOT_FILTER 0
-+#define CONFIG_DEFLATE_FILTER 0
-+#define CONFIG_DEFLICKER_FILTER 0
-+#define CONFIG_DEINTERLACE_QSV_FILTER 0
-+#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
-+#define CONFIG_DEJUDDER_FILTER 0
-+#define CONFIG_DELOGO_FILTER 0
-+#define CONFIG_DENOISE_VAAPI_FILTER 0
-+#define CONFIG_DERAIN_FILTER 0
-+#define CONFIG_DESHAKE_FILTER 0
-+#define CONFIG_DESHAKE_OPENCL_FILTER 0
-+#define CONFIG_DESPILL_FILTER 0
-+#define CONFIG_DETELECINE_FILTER 0
-+#define CONFIG_DILATION_FILTER 0
-+#define CONFIG_DILATION_OPENCL_FILTER 0
-+#define CONFIG_DISPLACE_FILTER 0
-+#define CONFIG_DNN_CLASSIFY_FILTER 0
-+#define CONFIG_DNN_DETECT_FILTER 0
-+#define CONFIG_DNN_PROCESSING_FILTER 0
-+#define CONFIG_DOUBLEWEAVE_FILTER 0
-+#define CONFIG_DRAWBOX_FILTER 0
-+#define CONFIG_DRAWGRAPH_FILTER 0
-+#define CONFIG_DRAWGRID_FILTER 0
-+#define CONFIG_DRAWTEXT_FILTER 0
-+#define CONFIG_EDGEDETECT_FILTER 0
-+#define CONFIG_ELBG_FILTER 0
-+#define CONFIG_ENTROPY_FILTER 0
-+#define CONFIG_EPX_FILTER 0
-+#define CONFIG_EQ_FILTER 0
-+#define CONFIG_EROSION_FILTER 0
-+#define CONFIG_EROSION_OPENCL_FILTER 0
-+#define CONFIG_ESTDIF_FILTER 0
-+#define CONFIG_EXPOSURE_FILTER 0
-+#define CONFIG_EXTRACTPLANES_FILTER 0
-+#define CONFIG_FADE_FILTER 0
-+#define CONFIG_FFTDNOIZ_FILTER 0
-+#define CONFIG_FFTFILT_FILTER 0
-+#define CONFIG_FIELD_FILTER 0
-+#define CONFIG_FIELDHINT_FILTER 0
-+#define CONFIG_FIELDMATCH_FILTER 0
-+#define CONFIG_FIELDORDER_FILTER 0
-+#define CONFIG_FILLBORDERS_FILTER 0
-+#define CONFIG_FIND_RECT_FILTER 0
-+#define CONFIG_FLIP_VULKAN_FILTER 0
-+#define CONFIG_FLOODFILL_FILTER 0
-+#define CONFIG_FORMAT_FILTER 0
-+#define CONFIG_FPS_FILTER 0
-+#define CONFIG_FRAMEPACK_FILTER 0
-+#define CONFIG_FRAMERATE_FILTER 0
-+#define CONFIG_FRAMESTEP_FILTER 0
-+#define CONFIG_FREEZEDETECT_FILTER 0
-+#define CONFIG_FREEZEFRAMES_FILTER 0
-+#define CONFIG_FREI0R_FILTER 0
-+#define CONFIG_FSPP_FILTER 0
-+#define CONFIG_GBLUR_FILTER 0
-+#define CONFIG_GBLUR_VULKAN_FILTER 0
-+#define CONFIG_GEQ_FILTER 0
-+#define CONFIG_GRADFUN_FILTER 0
-+#define CONFIG_GRAPHMONITOR_FILTER 0
-+#define CONFIG_GRAYWORLD_FILTER 0
-+#define CONFIG_GREYEDGE_FILTER 0
-+#define CONFIG_GUIDED_FILTER 0
-+#define CONFIG_HALDCLUT_FILTER 0
-+#define CONFIG_HFLIP_FILTER 0
-+#define CONFIG_HFLIP_VULKAN_FILTER 0
-+#define CONFIG_HISTEQ_FILTER 0
-+#define CONFIG_HISTOGRAM_FILTER 0
-+#define CONFIG_HQDN3D_FILTER 0
-+#define CONFIG_HQX_FILTER 0
-+#define CONFIG_HSTACK_FILTER 0
-+#define CONFIG_HSVHOLD_FILTER 0
-+#define CONFIG_HSVKEY_FILTER 0
-+#define CONFIG_HUE_FILTER 0
-+#define CONFIG_HUESATURATION_FILTER 0
-+#define CONFIG_HWDOWNLOAD_FILTER 0
-+#define CONFIG_HWMAP_FILTER 0
-+#define CONFIG_HWUPLOAD_FILTER 0
-+#define CONFIG_HWUPLOAD_CUDA_FILTER 0
-+#define CONFIG_HYSTERESIS_FILTER 0
-+#define CONFIG_IDENTITY_FILTER 0
-+#define CONFIG_IDET_FILTER 0
-+#define CONFIG_IL_FILTER 0
-+#define CONFIG_INFLATE_FILTER 0
-+#define CONFIG_INTERLACE_FILTER 0
-+#define CONFIG_INTERLEAVE_FILTER 0
-+#define CONFIG_KERNDEINT_FILTER 0
-+#define CONFIG_KIRSCH_FILTER 0
-+#define CONFIG_LAGFUN_FILTER 0
-+#define CONFIG_LATENCY_FILTER 0
-+#define CONFIG_LENSCORRECTION_FILTER 0
-+#define CONFIG_LENSFUN_FILTER 0
-+#define CONFIG_LIBPLACEBO_FILTER 0
-+#define CONFIG_LIBVMAF_FILTER 0
-+#define CONFIG_LIMITDIFF_FILTER 0
-+#define CONFIG_LIMITER_FILTER 0
-+#define CONFIG_LOOP_FILTER 0
-+#define CONFIG_LUMAKEY_FILTER 0
-+#define CONFIG_LUT_FILTER 0
-+#define CONFIG_LUT1D_FILTER 0
-+#define CONFIG_LUT2_FILTER 0
-+#define CONFIG_LUT3D_FILTER 0
-+#define CONFIG_LUTRGB_FILTER 0
-+#define CONFIG_LUTYUV_FILTER 0
-+#define CONFIG_MASKEDCLAMP_FILTER 0
-+#define CONFIG_MASKEDMAX_FILTER 0
-+#define CONFIG_MASKEDMERGE_FILTER 0
-+#define CONFIG_MASKEDMIN_FILTER 0
-+#define CONFIG_MASKEDTHRESHOLD_FILTER 0
-+#define CONFIG_MASKFUN_FILTER 0
-+#define CONFIG_MCDEINT_FILTER 0
-+#define CONFIG_MEDIAN_FILTER 0
-+#define CONFIG_MERGEPLANES_FILTER 0
-+#define CONFIG_MESTIMATE_FILTER 0
-+#define CONFIG_METADATA_FILTER 0
-+#define CONFIG_MIDEQUALIZER_FILTER 0
-+#define CONFIG_MINTERPOLATE_FILTER 0
-+#define CONFIG_MIX_FILTER 0
-+#define CONFIG_MONOCHROME_FILTER 0
-+#define CONFIG_MORPHO_FILTER 0
-+#define CONFIG_MPDECIMATE_FILTER 0
-+#define CONFIG_MSAD_FILTER 0
-+#define CONFIG_NEGATE_FILTER 0
-+#define CONFIG_NLMEANS_FILTER 0
-+#define CONFIG_NLMEANS_OPENCL_FILTER 0
-+#define CONFIG_NNEDI_FILTER 0
-+#define CONFIG_NOFORMAT_FILTER 0
-+#define CONFIG_NOISE_FILTER 0
-+#define CONFIG_NORMALIZE_FILTER 0
-+#define CONFIG_NULL_FILTER 0
-+#define CONFIG_OCR_FILTER 0
-+#define CONFIG_OCV_FILTER 0
-+#define CONFIG_OSCILLOSCOPE_FILTER 0
-+#define CONFIG_OVERLAY_FILTER 0
-+#define CONFIG_OVERLAY_OPENCL_FILTER 0
-+#define CONFIG_OVERLAY_QSV_FILTER 0
-+#define CONFIG_OVERLAY_VAAPI_FILTER 0
-+#define CONFIG_OVERLAY_VULKAN_FILTER 0
-+#define CONFIG_OVERLAY_CUDA_FILTER 0
-+#define CONFIG_OWDENOISE_FILTER 0
-+#define CONFIG_PAD_FILTER 0
-+#define CONFIG_PAD_OPENCL_FILTER 0
-+#define CONFIG_PALETTEGEN_FILTER 0
-+#define CONFIG_PALETTEUSE_FILTER 0
-+#define CONFIG_PERMS_FILTER 0
-+#define CONFIG_PERSPECTIVE_FILTER 0
-+#define CONFIG_PHASE_FILTER 0
-+#define CONFIG_PHOTOSENSITIVITY_FILTER 0
-+#define CONFIG_PIXDESCTEST_FILTER 0
-+#define CONFIG_PIXSCOPE_FILTER 0
-+#define CONFIG_PP_FILTER 0
-+#define CONFIG_PP7_FILTER 0
-+#define CONFIG_PREMULTIPLY_FILTER 0
-+#define CONFIG_PREWITT_FILTER 0
-+#define CONFIG_PREWITT_OPENCL_FILTER 0
-+#define CONFIG_PROCAMP_VAAPI_FILTER 0
-+#define CONFIG_PROGRAM_OPENCL_FILTER 0
-+#define CONFIG_PSEUDOCOLOR_FILTER 0
-+#define CONFIG_PSNR_FILTER 0
-+#define CONFIG_PULLUP_FILTER 0
-+#define CONFIG_QP_FILTER 0
-+#define CONFIG_RANDOM_FILTER 0
-+#define CONFIG_READEIA608_FILTER 0
-+#define CONFIG_READVITC_FILTER 0
-+#define CONFIG_REALTIME_FILTER 0
-+#define CONFIG_REMAP_FILTER 0
-+#define CONFIG_REMOVEGRAIN_FILTER 0
-+#define CONFIG_REMOVELOGO_FILTER 0
-+#define CONFIG_REPEATFIELDS_FILTER 0
-+#define CONFIG_REVERSE_FILTER 0
-+#define CONFIG_RGBASHIFT_FILTER 0
-+#define CONFIG_ROBERTS_FILTER 0
-+#define CONFIG_ROBERTS_OPENCL_FILTER 0
-+#define CONFIG_ROTATE_FILTER 0
-+#define CONFIG_SAB_FILTER 0
-+#define CONFIG_SCALE_FILTER 0
-+#define CONFIG_SCALE_CUDA_FILTER 0
-+#define CONFIG_SCALE_NPP_FILTER 0
-+#define CONFIG_SCALE_QSV_FILTER 0
-+#define CONFIG_SCALE_VAAPI_FILTER 0
-+#define CONFIG_SCALE_VULKAN_FILTER 0
-+#define CONFIG_SCALE2REF_FILTER 0
-+#define CONFIG_SCALE2REF_NPP_FILTER 0
-+#define CONFIG_SCDET_FILTER 0
-+#define CONFIG_SCHARR_FILTER 0
-+#define CONFIG_SCROLL_FILTER 0
-+#define CONFIG_SEGMENT_FILTER 0
-+#define CONFIG_SELECT_FILTER 0
-+#define CONFIG_SELECTIVECOLOR_FILTER 0
-+#define CONFIG_SENDCMD_FILTER 0
-+#define CONFIG_SEPARATEFIELDS_FILTER 0
-+#define CONFIG_SETDAR_FILTER 0
-+#define CONFIG_SETFIELD_FILTER 0
-+#define CONFIG_SETPARAMS_FILTER 0
-+#define CONFIG_SETPTS_FILTER 0
-+#define CONFIG_SETRANGE_FILTER 0
-+#define CONFIG_SETSAR_FILTER 0
-+#define CONFIG_SETTB_FILTER 0
-+#define CONFIG_SHARPEN_NPP_FILTER 0
-+#define CONFIG_SHARPNESS_VAAPI_FILTER 0
-+#define CONFIG_SHEAR_FILTER 0
-+#define CONFIG_SHOWINFO_FILTER 0
-+#define CONFIG_SHOWPALETTE_FILTER 0
-+#define CONFIG_SHUFFLEFRAMES_FILTER 0
-+#define CONFIG_SHUFFLEPIXELS_FILTER 0
-+#define CONFIG_SHUFFLEPLANES_FILTER 0
-+#define CONFIG_SIDEDATA_FILTER 0
-+#define CONFIG_SIGNALSTATS_FILTER 0
-+#define CONFIG_SIGNATURE_FILTER 0
-+#define CONFIG_SMARTBLUR_FILTER 0
-+#define CONFIG_SOBEL_FILTER 0
-+#define CONFIG_SOBEL_OPENCL_FILTER 0
-+#define CONFIG_SPLIT_FILTER 0
-+#define CONFIG_SPP_FILTER 0
-+#define CONFIG_SR_FILTER 0
-+#define CONFIG_SSIM_FILTER 0
-+#define CONFIG_STEREO3D_FILTER 0
-+#define CONFIG_STREAMSELECT_FILTER 0
-+#define CONFIG_SUBTITLES_FILTER 0
-+#define CONFIG_SUPER2XSAI_FILTER 0
-+#define CONFIG_SWAPRECT_FILTER 0
-+#define CONFIG_SWAPUV_FILTER 0
-+#define CONFIG_TBLEND_FILTER 0
-+#define CONFIG_TELECINE_FILTER 0
-+#define CONFIG_THISTOGRAM_FILTER 0
-+#define CONFIG_THRESHOLD_FILTER 0
-+#define CONFIG_THUMBNAIL_FILTER 0
-+#define CONFIG_THUMBNAIL_CUDA_FILTER 0
-+#define CONFIG_TILE_FILTER 0
-+#define CONFIG_TINTERLACE_FILTER 0
-+#define CONFIG_TLUT2_FILTER 0
-+#define CONFIG_TMEDIAN_FILTER 0
-+#define CONFIG_TMIDEQUALIZER_FILTER 0
-+#define CONFIG_TMIX_FILTER 0
-+#define CONFIG_TONEMAP_FILTER 0
-+#define CONFIG_TONEMAP_OPENCL_FILTER 0
-+#define CONFIG_TONEMAP_VAAPI_FILTER 0
-+#define CONFIG_TPAD_FILTER 0
-+#define CONFIG_TRANSPOSE_FILTER 0
-+#define CONFIG_TRANSPOSE_NPP_FILTER 0
-+#define CONFIG_TRANSPOSE_OPENCL_FILTER 0
-+#define CONFIG_TRANSPOSE_VAAPI_FILTER 0
-+#define CONFIG_TRANSPOSE_VULKAN_FILTER 0
-+#define CONFIG_TRIM_FILTER 0
-+#define CONFIG_UNPREMULTIPLY_FILTER 0
-+#define CONFIG_UNSHARP_FILTER 0
-+#define CONFIG_UNSHARP_OPENCL_FILTER 0
-+#define CONFIG_UNTILE_FILTER 0
-+#define CONFIG_USPP_FILTER 0
-+#define CONFIG_V360_FILTER 0
-+#define CONFIG_VAGUEDENOISER_FILTER 0
-+#define CONFIG_VARBLUR_FILTER 0
-+#define CONFIG_VECTORSCOPE_FILTER 0
-+#define CONFIG_VFLIP_FILTER 0
-+#define CONFIG_VFLIP_VULKAN_FILTER 0
-+#define CONFIG_VFRDET_FILTER 0
-+#define CONFIG_VIBRANCE_FILTER 0
-+#define CONFIG_VIDSTABDETECT_FILTER 0
-+#define CONFIG_VIDSTABTRANSFORM_FILTER 0
-+#define CONFIG_VIF_FILTER 0
-+#define CONFIG_VIGNETTE_FILTER 0
-+#define CONFIG_VMAFMOTION_FILTER 0
-+#define CONFIG_VPP_QSV_FILTER 0
-+#define CONFIG_VSTACK_FILTER 0
-+#define CONFIG_W3FDIF_FILTER 0
-+#define CONFIG_WAVEFORM_FILTER 0
-+#define CONFIG_WEAVE_FILTER 0
-+#define CONFIG_XBR_FILTER 0
-+#define CONFIG_XCORRELATE_FILTER 0
-+#define CONFIG_XFADE_FILTER 0
-+#define CONFIG_XFADE_OPENCL_FILTER 0
-+#define CONFIG_XMEDIAN_FILTER 0
-+#define CONFIG_XSTACK_FILTER 0
-+#define CONFIG_YADIF_FILTER 0
-+#define CONFIG_YADIF_CUDA_FILTER 0
-+#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0
-+#define CONFIG_YAEPBLUR_FILTER 0
-+#define CONFIG_ZMQ_FILTER 0
-+#define CONFIG_ZOOMPAN_FILTER 0
-+#define CONFIG_ZSCALE_FILTER 0
-+#define CONFIG_ALLRGB_FILTER 0
-+#define CONFIG_ALLYUV_FILTER 0
-+#define CONFIG_CELLAUTO_FILTER 0
-+#define CONFIG_COLOR_FILTER 0
-+#define CONFIG_COLORSPECTRUM_FILTER 0
-+#define CONFIG_COREIMAGESRC_FILTER 0
-+#define CONFIG_FREI0R_SRC_FILTER 0
-+#define CONFIG_GRADIENTS_FILTER 0
-+#define CONFIG_HALDCLUTSRC_FILTER 0
-+#define CONFIG_LIFE_FILTER 0
-+#define CONFIG_MANDELBROT_FILTER 0
-+#define CONFIG_MPTESTSRC_FILTER 0
-+#define CONFIG_NULLSRC_FILTER 0
-+#define CONFIG_OPENCLSRC_FILTER 0
-+#define CONFIG_PAL75BARS_FILTER 0
-+#define CONFIG_PAL100BARS_FILTER 0
-+#define CONFIG_RGBTESTSRC_FILTER 0
-+#define CONFIG_SIERPINSKI_FILTER 0
-+#define CONFIG_SMPTEBARS_FILTER 0
-+#define CONFIG_SMPTEHDBARS_FILTER 0
-+#define CONFIG_TESTSRC_FILTER 0
-+#define CONFIG_TESTSRC2_FILTER 0
-+#define CONFIG_YUVTESTSRC_FILTER 0
-+#define CONFIG_NULLSINK_FILTER 0
-+#define CONFIG_ABITSCOPE_FILTER 0
-+#define CONFIG_ADRAWGRAPH_FILTER 0
-+#define CONFIG_AGRAPHMONITOR_FILTER 0
-+#define CONFIG_AHISTOGRAM_FILTER 0
-+#define CONFIG_APHASEMETER_FILTER 0
-+#define CONFIG_AVECTORSCOPE_FILTER 0
-+#define CONFIG_CONCAT_FILTER 0
-+#define CONFIG_SHOWCQT_FILTER 0
-+#define CONFIG_SHOWFREQS_FILTER 0
-+#define CONFIG_SHOWSPATIAL_FILTER 0
-+#define CONFIG_SHOWSPECTRUM_FILTER 0
-+#define CONFIG_SHOWSPECTRUMPIC_FILTER 0
-+#define CONFIG_SHOWVOLUME_FILTER 0
-+#define CONFIG_SHOWWAVES_FILTER 0
-+#define CONFIG_SHOWWAVESPIC_FILTER 0
-+#define CONFIG_SPECTRUMSYNTH_FILTER 0
-+#define CONFIG_AMOVIE_FILTER 0
-+#define CONFIG_MOVIE_FILTER 0
-+#define CONFIG_AFIFO_FILTER 0
-+#define CONFIG_FIFO_FILTER 0
-+#define CONFIG_AA_DEMUXER 0
-+#define CONFIG_AAC_DEMUXER 1
-+#define CONFIG_AAX_DEMUXER 0
-+#define CONFIG_AC3_DEMUXER 0
-+#define CONFIG_ACE_DEMUXER 0
-+#define CONFIG_ACM_DEMUXER 0
-+#define CONFIG_ACT_DEMUXER 0
-+#define CONFIG_ADF_DEMUXER 0
-+#define CONFIG_ADP_DEMUXER 0
-+#define CONFIG_ADS_DEMUXER 0
-+#define CONFIG_ADX_DEMUXER 0
-+#define CONFIG_AEA_DEMUXER 0
-+#define CONFIG_AFC_DEMUXER 0
-+#define CONFIG_AIFF_DEMUXER 0
-+#define CONFIG_AIX_DEMUXER 0
-+#define CONFIG_ALP_DEMUXER 0
-+#define CONFIG_AMR_DEMUXER 0
-+#define CONFIG_AMRNB_DEMUXER 0
-+#define CONFIG_AMRWB_DEMUXER 0
-+#define CONFIG_ANM_DEMUXER 0
-+#define CONFIG_APC_DEMUXER 0
-+#define CONFIG_APE_DEMUXER 0
-+#define CONFIG_APM_DEMUXER 0
-+#define CONFIG_APNG_DEMUXER 0
-+#define CONFIG_APTX_DEMUXER 0
-+#define CONFIG_APTX_HD_DEMUXER 0
-+#define CONFIG_AQTITLE_DEMUXER 0
-+#define CONFIG_ARGO_ASF_DEMUXER 0
-+#define CONFIG_ARGO_BRP_DEMUXER 0
-+#define CONFIG_ARGO_CVG_DEMUXER 0
-+#define CONFIG_ASF_DEMUXER 0
-+#define CONFIG_ASF_O_DEMUXER 0
-+#define CONFIG_ASS_DEMUXER 0
-+#define CONFIG_AST_DEMUXER 0
-+#define CONFIG_AU_DEMUXER 0
-+#define CONFIG_AV1_DEMUXER 0
-+#define CONFIG_AVI_DEMUXER 0
-+#define CONFIG_AVISYNTH_DEMUXER 0
-+#define CONFIG_AVR_DEMUXER 0
-+#define CONFIG_AVS_DEMUXER 0
-+#define CONFIG_AVS2_DEMUXER 0
-+#define CONFIG_AVS3_DEMUXER 0
-+#define CONFIG_BETHSOFTVID_DEMUXER 0
-+#define CONFIG_BFI_DEMUXER 0
-+#define CONFIG_BINTEXT_DEMUXER 0
-+#define CONFIG_BINK_DEMUXER 0
-+#define CONFIG_BINKA_DEMUXER 0
-+#define CONFIG_BIT_DEMUXER 0
-+#define CONFIG_BITPACKED_DEMUXER 0
-+#define CONFIG_BMV_DEMUXER 0
-+#define CONFIG_BFSTM_DEMUXER 0
-+#define CONFIG_BRSTM_DEMUXER 0
-+#define CONFIG_BOA_DEMUXER 0
-+#define CONFIG_C93_DEMUXER 0
-+#define CONFIG_CAF_DEMUXER 0
-+#define CONFIG_CAVSVIDEO_DEMUXER 0
-+#define CONFIG_CDG_DEMUXER 0
-+#define CONFIG_CDXL_DEMUXER 0
-+#define CONFIG_CINE_DEMUXER 0
-+#define CONFIG_CODEC2_DEMUXER 0
-+#define CONFIG_CODEC2RAW_DEMUXER 0
-+#define CONFIG_CONCAT_DEMUXER 0
-+#define CONFIG_DASH_DEMUXER 0
-+#define CONFIG_DATA_DEMUXER 0
-+#define CONFIG_DAUD_DEMUXER 0
-+#define CONFIG_DCSTR_DEMUXER 0
-+#define CONFIG_DERF_DEMUXER 0
-+#define CONFIG_DFA_DEMUXER 0
-+#define CONFIG_DHAV_DEMUXER 0
-+#define CONFIG_DIRAC_DEMUXER 0
-+#define CONFIG_DNXHD_DEMUXER 0
-+#define CONFIG_DSF_DEMUXER 0
-+#define CONFIG_DSICIN_DEMUXER 0
-+#define CONFIG_DSS_DEMUXER 0
-+#define CONFIG_DTS_DEMUXER 0
-+#define CONFIG_DTSHD_DEMUXER 0
-+#define CONFIG_DV_DEMUXER 0
-+#define CONFIG_DVBSUB_DEMUXER 0
-+#define CONFIG_DVBTXT_DEMUXER 0
-+#define CONFIG_DXA_DEMUXER 0
-+#define CONFIG_EA_DEMUXER 0
-+#define CONFIG_EA_CDATA_DEMUXER 0
-+#define CONFIG_EAC3_DEMUXER 0
-+#define CONFIG_EPAF_DEMUXER 0
-+#define CONFIG_FFMETADATA_DEMUXER 0
-+#define CONFIG_FILMSTRIP_DEMUXER 0
-+#define CONFIG_FITS_DEMUXER 0
-+#define CONFIG_FLAC_DEMUXER 1
-+#define CONFIG_FLIC_DEMUXER 0
-+#define CONFIG_FLV_DEMUXER 0
-+#define CONFIG_LIVE_FLV_DEMUXER 0
-+#define CONFIG_FOURXM_DEMUXER 0
-+#define CONFIG_FRM_DEMUXER 0
-+#define CONFIG_FSB_DEMUXER 0
-+#define CONFIG_FWSE_DEMUXER 0
-+#define CONFIG_G722_DEMUXER 0
-+#define CONFIG_G723_1_DEMUXER 0
-+#define CONFIG_G726_DEMUXER 0
-+#define CONFIG_G726LE_DEMUXER 0
-+#define CONFIG_G729_DEMUXER 0
-+#define CONFIG_GDV_DEMUXER 0
-+#define CONFIG_GENH_DEMUXER 0
-+#define CONFIG_GIF_DEMUXER 0
-+#define CONFIG_GSM_DEMUXER 0
-+#define CONFIG_GXF_DEMUXER 0
-+#define CONFIG_H261_DEMUXER 0
-+#define CONFIG_H263_DEMUXER 0
-+#define CONFIG_H264_DEMUXER 0
-+#define CONFIG_HCA_DEMUXER 0
-+#define CONFIG_HCOM_DEMUXER 0
-+#define CONFIG_HEVC_DEMUXER 0
-+#define CONFIG_HLS_DEMUXER 0
-+#define CONFIG_HNM_DEMUXER 0
-+#define CONFIG_ICO_DEMUXER 0
-+#define CONFIG_IDCIN_DEMUXER 0
-+#define CONFIG_IDF_DEMUXER 0
-+#define CONFIG_IFF_DEMUXER 0
-+#define CONFIG_IFV_DEMUXER 0
-+#define CONFIG_ILBC_DEMUXER 0
-+#define CONFIG_IMAGE2_DEMUXER 0
-+#define CONFIG_IMAGE2PIPE_DEMUXER 0
-+#define CONFIG_IMAGE2_ALIAS_PIX_DEMUXER 0
-+#define CONFIG_IMAGE2_BRENDER_PIX_DEMUXER 0
-+#define CONFIG_IMF_DEMUXER 0
-+#define CONFIG_INGENIENT_DEMUXER 0
-+#define CONFIG_IPMOVIE_DEMUXER 0
-+#define CONFIG_IPU_DEMUXER 0
-+#define CONFIG_IRCAM_DEMUXER 0
-+#define CONFIG_ISS_DEMUXER 0
-+#define CONFIG_IV8_DEMUXER 0
-+#define CONFIG_IVF_DEMUXER 0
-+#define CONFIG_IVR_DEMUXER 0
-+#define CONFIG_JACOSUB_DEMUXER 0
-+#define CONFIG_JV_DEMUXER 0
-+#define CONFIG_KUX_DEMUXER 0
-+#define CONFIG_KVAG_DEMUXER 0
-+#define CONFIG_LMLM4_DEMUXER 0
-+#define CONFIG_LOAS_DEMUXER 0
-+#define CONFIG_LUODAT_DEMUXER 0
-+#define CONFIG_LRC_DEMUXER 0
-+#define CONFIG_LVF_DEMUXER 0
-+#define CONFIG_LXF_DEMUXER 0
-+#define CONFIG_M4V_DEMUXER 0
-+#define CONFIG_MCA_DEMUXER 0
-+#define CONFIG_MCC_DEMUXER 0
-+#define CONFIG_MATROSKA_DEMUXER 1
-+#define CONFIG_MGSTS_DEMUXER 0
-+#define CONFIG_MICRODVD_DEMUXER 0
-+#define CONFIG_MJPEG_DEMUXER 0
-+#define CONFIG_MJPEG_2000_DEMUXER 0
-+#define CONFIG_MLP_DEMUXER 0
-+#define CONFIG_MLV_DEMUXER 0
-+#define CONFIG_MM_DEMUXER 0
-+#define CONFIG_MMF_DEMUXER 0
-+#define CONFIG_MODS_DEMUXER 0
-+#define CONFIG_MOFLEX_DEMUXER 0
-+#define CONFIG_MOV_DEMUXER 1
-+#define CONFIG_MP3_DEMUXER 1
-+#define CONFIG_MPC_DEMUXER 0
-+#define CONFIG_MPC8_DEMUXER 0
-+#define CONFIG_MPEGPS_DEMUXER 0
-+#define CONFIG_MPEGTS_DEMUXER 0
-+#define CONFIG_MPEGTSRAW_DEMUXER 0
-+#define CONFIG_MPEGVIDEO_DEMUXER 0
-+#define CONFIG_MPJPEG_DEMUXER 0
-+#define CONFIG_MPL2_DEMUXER 0
-+#define CONFIG_MPSUB_DEMUXER 0
-+#define CONFIG_MSF_DEMUXER 0
-+#define CONFIG_MSNWC_TCP_DEMUXER 0
-+#define CONFIG_MSP_DEMUXER 0
-+#define CONFIG_MTAF_DEMUXER 0
-+#define CONFIG_MTV_DEMUXER 0
-+#define CONFIG_MUSX_DEMUXER 0
-+#define CONFIG_MV_DEMUXER 0
-+#define CONFIG_MVI_DEMUXER 0
-+#define CONFIG_MXF_DEMUXER 0
-+#define CONFIG_MXG_DEMUXER 0
-+#define CONFIG_NC_DEMUXER 0
-+#define CONFIG_NISTSPHERE_DEMUXER 0
-+#define CONFIG_NSP_DEMUXER 0
-+#define CONFIG_NSV_DEMUXER 0
-+#define CONFIG_NUT_DEMUXER 0
-+#define CONFIG_NUV_DEMUXER 0
-+#define CONFIG_OBU_DEMUXER 0
-+#define CONFIG_OGG_DEMUXER 1
-+#define CONFIG_OMA_DEMUXER 0
-+#define CONFIG_PAF_DEMUXER 0
-+#define CONFIG_PCM_ALAW_DEMUXER 0
-+#define CONFIG_PCM_MULAW_DEMUXER 0
-+#define CONFIG_PCM_VIDC_DEMUXER 0
-+#define CONFIG_PCM_F64BE_DEMUXER 0
-+#define CONFIG_PCM_F64LE_DEMUXER 0
-+#define CONFIG_PCM_F32BE_DEMUXER 0
-+#define CONFIG_PCM_F32LE_DEMUXER 0
-+#define CONFIG_PCM_S32BE_DEMUXER 0
-+#define CONFIG_PCM_S32LE_DEMUXER 0
-+#define CONFIG_PCM_S24BE_DEMUXER 0
-+#define CONFIG_PCM_S24LE_DEMUXER 0
-+#define CONFIG_PCM_S16BE_DEMUXER 0
-+#define CONFIG_PCM_S16LE_DEMUXER 0
-+#define CONFIG_PCM_S8_DEMUXER 0
-+#define CONFIG_PCM_U32BE_DEMUXER 0
-+#define CONFIG_PCM_U32LE_DEMUXER 0
-+#define CONFIG_PCM_U24BE_DEMUXER 0
-+#define CONFIG_PCM_U24LE_DEMUXER 0
-+#define CONFIG_PCM_U16BE_DEMUXER 0
-+#define CONFIG_PCM_U16LE_DEMUXER 0
-+#define CONFIG_PCM_U8_DEMUXER 0
-+#define CONFIG_PJS_DEMUXER 0
-+#define CONFIG_PMP_DEMUXER 0
-+#define CONFIG_PP_BNK_DEMUXER 0
-+#define CONFIG_PVA_DEMUXER 0
-+#define CONFIG_PVF_DEMUXER 0
-+#define CONFIG_QCP_DEMUXER 0
-+#define CONFIG_R3D_DEMUXER 0
-+#define CONFIG_RAWVIDEO_DEMUXER 0
-+#define CONFIG_REALTEXT_DEMUXER 0
-+#define CONFIG_REDSPARK_DEMUXER 0
-+#define CONFIG_RL2_DEMUXER 0
-+#define CONFIG_RM_DEMUXER 0
-+#define CONFIG_ROQ_DEMUXER 0
-+#define CONFIG_RPL_DEMUXER 0
-+#define CONFIG_RSD_DEMUXER 0
-+#define CONFIG_RSO_DEMUXER 0
-+#define CONFIG_RTP_DEMUXER 0
-+#define CONFIG_RTSP_DEMUXER 0
-+#define CONFIG_S337M_DEMUXER 0
-+#define CONFIG_SAMI_DEMUXER 0
-+#define CONFIG_SAP_DEMUXER 0
-+#define CONFIG_SBC_DEMUXER 0
-+#define CONFIG_SBG_DEMUXER 0
-+#define CONFIG_SCC_DEMUXER 0
-+#define CONFIG_SCD_DEMUXER 0
-+#define CONFIG_SDP_DEMUXER 0
-+#define CONFIG_SDR2_DEMUXER 0
-+#define CONFIG_SDS_DEMUXER 0
-+#define CONFIG_SDX_DEMUXER 0
-+#define CONFIG_SEGAFILM_DEMUXER 0
-+#define CONFIG_SER_DEMUXER 0
-+#define CONFIG_SGA_DEMUXER 0
-+#define CONFIG_SHORTEN_DEMUXER 0
-+#define CONFIG_SIFF_DEMUXER 0
-+#define CONFIG_SIMBIOSIS_IMX_DEMUXER 0
-+#define CONFIG_SLN_DEMUXER 0
-+#define CONFIG_SMACKER_DEMUXER 0
-+#define CONFIG_SMJPEG_DEMUXER 0
-+#define CONFIG_SMUSH_DEMUXER 0
-+#define CONFIG_SOL_DEMUXER 0
-+#define CONFIG_SOX_DEMUXER 0
-+#define CONFIG_SPDIF_DEMUXER 0
-+#define CONFIG_SRT_DEMUXER 0
-+#define CONFIG_STR_DEMUXER 0
-+#define CONFIG_STL_DEMUXER 0
-+#define CONFIG_SUBVIEWER1_DEMUXER 0
-+#define CONFIG_SUBVIEWER_DEMUXER 0
-+#define CONFIG_SUP_DEMUXER 0
-+#define CONFIG_SVAG_DEMUXER 0
-+#define CONFIG_SVS_DEMUXER 0
-+#define CONFIG_SWF_DEMUXER 0
-+#define CONFIG_TAK_DEMUXER 0
-+#define CONFIG_TEDCAPTIONS_DEMUXER 0
-+#define CONFIG_THP_DEMUXER 0
-+#define CONFIG_THREEDOSTR_DEMUXER 0
-+#define CONFIG_TIERTEXSEQ_DEMUXER 0
-+#define CONFIG_TMV_DEMUXER 0
-+#define CONFIG_TRUEHD_DEMUXER 0
-+#define CONFIG_TTA_DEMUXER 0
-+#define CONFIG_TXD_DEMUXER 0
-+#define CONFIG_TTY_DEMUXER 0
-+#define CONFIG_TY_DEMUXER 0
-+#define CONFIG_V210_DEMUXER 0
-+#define CONFIG_V210X_DEMUXER 0
-+#define CONFIG_VAG_DEMUXER 0
-+#define CONFIG_VC1_DEMUXER 0
-+#define CONFIG_VC1T_DEMUXER 0
-+#define CONFIG_VIVIDAS_DEMUXER 0
-+#define CONFIG_VIVO_DEMUXER 0
-+#define CONFIG_VMD_DEMUXER 0
-+#define CONFIG_VOBSUB_DEMUXER 0
-+#define CONFIG_VOC_DEMUXER 0
-+#define CONFIG_VPK_DEMUXER 0
-+#define CONFIG_VPLAYER_DEMUXER 0
-+#define CONFIG_VQF_DEMUXER 0
-+#define CONFIG_W64_DEMUXER 0
-+#define CONFIG_WAV_DEMUXER 1
-+#define CONFIG_WC3_DEMUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_DEMUXER 0
-+#define CONFIG_WEBVTT_DEMUXER 0
-+#define CONFIG_WSAUD_DEMUXER 0
-+#define CONFIG_WSD_DEMUXER 0
-+#define CONFIG_WSVQA_DEMUXER 0
-+#define CONFIG_WTV_DEMUXER 0
-+#define CONFIG_WVE_DEMUXER 0
-+#define CONFIG_WV_DEMUXER 0
-+#define CONFIG_XA_DEMUXER 0
-+#define CONFIG_XBIN_DEMUXER 0
-+#define CONFIG_XMV_DEMUXER 0
-+#define CONFIG_XVAG_DEMUXER 0
-+#define CONFIG_XWMA_DEMUXER 0
-+#define CONFIG_YOP_DEMUXER 0
-+#define CONFIG_YUV4MPEGPIPE_DEMUXER 0
-+#define CONFIG_IMAGE_BMP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_CRI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DDS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_DPX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_EXR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GEM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_GIF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_J2K_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_JPEGLS_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PAM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PCX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGMYUV_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PGX_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PHOTOCD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PICTOR_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PNG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_PSD_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_QDRAW_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SGI_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SVG_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_SUNRAST_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_TIFF_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_WEBP_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XBM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XPM_PIPE_DEMUXER 0
-+#define CONFIG_IMAGE_XWD_PIPE_DEMUXER 0
-+#define CONFIG_LIBGME_DEMUXER 0
-+#define CONFIG_LIBMODPLUG_DEMUXER 0
-+#define CONFIG_LIBOPENMPT_DEMUXER 0
-+#define CONFIG_VAPOURSYNTH_DEMUXER 0
-+#define CONFIG_A64_MUXER 0
-+#define CONFIG_AC3_MUXER 0
-+#define CONFIG_ADTS_MUXER 0
-+#define CONFIG_ADX_MUXER 0
-+#define CONFIG_AIFF_MUXER 0
-+#define CONFIG_ALP_MUXER 0
-+#define CONFIG_AMR_MUXER 0
-+#define CONFIG_AMV_MUXER 0
-+#define CONFIG_APM_MUXER 0
-+#define CONFIG_APNG_MUXER 0
-+#define CONFIG_APTX_MUXER 0
-+#define CONFIG_APTX_HD_MUXER 0
-+#define CONFIG_ARGO_ASF_MUXER 0
-+#define CONFIG_ARGO_CVG_MUXER 0
-+#define CONFIG_ASF_MUXER 0
-+#define CONFIG_ASS_MUXER 0
-+#define CONFIG_AST_MUXER 0
-+#define CONFIG_ASF_STREAM_MUXER 0
-+#define CONFIG_AU_MUXER 0
-+#define CONFIG_AVI_MUXER 0
-+#define CONFIG_AVM2_MUXER 0
-+#define CONFIG_AVS2_MUXER 0
-+#define CONFIG_AVS3_MUXER 0
-+#define CONFIG_BIT_MUXER 0
-+#define CONFIG_CAF_MUXER 0
-+#define CONFIG_CAVSVIDEO_MUXER 0
-+#define CONFIG_CODEC2_MUXER 0
-+#define CONFIG_CODEC2RAW_MUXER 0
-+#define CONFIG_CRC_MUXER 0
-+#define CONFIG_DASH_MUXER 0
-+#define CONFIG_DATA_MUXER 0
-+#define CONFIG_DAUD_MUXER 0
-+#define CONFIG_DIRAC_MUXER 0
-+#define CONFIG_DNXHD_MUXER 0
-+#define CONFIG_DTS_MUXER 0
-+#define CONFIG_DV_MUXER 0
-+#define CONFIG_EAC3_MUXER 0
-+#define CONFIG_F4V_MUXER 0
-+#define CONFIG_FFMETADATA_MUXER 0
-+#define CONFIG_FIFO_MUXER 0
-+#define CONFIG_FIFO_TEST_MUXER 0
-+#define CONFIG_FILMSTRIP_MUXER 0
-+#define CONFIG_FITS_MUXER 0
-+#define CONFIG_FLAC_MUXER 0
-+#define CONFIG_FLV_MUXER 0
-+#define CONFIG_FRAMECRC_MUXER 0
-+#define CONFIG_FRAMEHASH_MUXER 0
-+#define CONFIG_FRAMEMD5_MUXER 0
-+#define CONFIG_G722_MUXER 0
-+#define CONFIG_G723_1_MUXER 0
-+#define CONFIG_G726_MUXER 0
-+#define CONFIG_G726LE_MUXER 0
-+#define CONFIG_GIF_MUXER 0
-+#define CONFIG_GSM_MUXER 0
-+#define CONFIG_GXF_MUXER 0
-+#define CONFIG_H261_MUXER 0
-+#define CONFIG_H263_MUXER 0
-+#define CONFIG_H264_MUXER 0
-+#define CONFIG_HASH_MUXER 0
-+#define CONFIG_HDS_MUXER 0
-+#define CONFIG_HEVC_MUXER 0
-+#define CONFIG_HLS_MUXER 0
-+#define CONFIG_ICO_MUXER 0
-+#define CONFIG_ILBC_MUXER 0
-+#define CONFIG_IMAGE2_MUXER 0
-+#define CONFIG_IMAGE2PIPE_MUXER 0
-+#define CONFIG_IPOD_MUXER 0
-+#define CONFIG_IRCAM_MUXER 0
-+#define CONFIG_ISMV_MUXER 0
-+#define CONFIG_IVF_MUXER 0
-+#define CONFIG_JACOSUB_MUXER 0
-+#define CONFIG_KVAG_MUXER 0
-+#define CONFIG_LATM_MUXER 0
-+#define CONFIG_LRC_MUXER 0
-+#define CONFIG_M4V_MUXER 0
-+#define CONFIG_MD5_MUXER 0
-+#define CONFIG_MATROSKA_MUXER 0
-+#define CONFIG_MATROSKA_AUDIO_MUXER 0
-+#define CONFIG_MICRODVD_MUXER 0
-+#define CONFIG_MJPEG_MUXER 0
-+#define CONFIG_MLP_MUXER 0
-+#define CONFIG_MMF_MUXER 0
-+#define CONFIG_MOV_MUXER 0
-+#define CONFIG_MP2_MUXER 0
-+#define CONFIG_MP3_MUXER 0
-+#define CONFIG_MP4_MUXER 0
-+#define CONFIG_MPEG1SYSTEM_MUXER 0
-+#define CONFIG_MPEG1VCD_MUXER 0
-+#define CONFIG_MPEG1VIDEO_MUXER 0
-+#define CONFIG_MPEG2DVD_MUXER 0
-+#define CONFIG_MPEG2SVCD_MUXER 0
-+#define CONFIG_MPEG2VIDEO_MUXER 0
-+#define CONFIG_MPEG2VOB_MUXER 0
-+#define CONFIG_MPEGTS_MUXER 0
-+#define CONFIG_MPJPEG_MUXER 0
-+#define CONFIG_MXF_MUXER 0
-+#define CONFIG_MXF_D10_MUXER 0
-+#define CONFIG_MXF_OPATOM_MUXER 0
-+#define CONFIG_NULL_MUXER 0
-+#define CONFIG_NUT_MUXER 0
-+#define CONFIG_OBU_MUXER 0
-+#define CONFIG_OGA_MUXER 0
-+#define CONFIG_OGG_MUXER 0
-+#define CONFIG_OGV_MUXER 0
-+#define CONFIG_OMA_MUXER 0
-+#define CONFIG_OPUS_MUXER 0
-+#define CONFIG_PCM_ALAW_MUXER 0
-+#define CONFIG_PCM_MULAW_MUXER 0
-+#define CONFIG_PCM_VIDC_MUXER 0
-+#define CONFIG_PCM_F64BE_MUXER 0
-+#define CONFIG_PCM_F64LE_MUXER 0
-+#define CONFIG_PCM_F32BE_MUXER 0
-+#define CONFIG_PCM_F32LE_MUXER 0
-+#define CONFIG_PCM_S32BE_MUXER 0
-+#define CONFIG_PCM_S32LE_MUXER 0
-+#define CONFIG_PCM_S24BE_MUXER 0
-+#define CONFIG_PCM_S24LE_MUXER 0
-+#define CONFIG_PCM_S16BE_MUXER 0
-+#define CONFIG_PCM_S16LE_MUXER 0
-+#define CONFIG_PCM_S8_MUXER 0
-+#define CONFIG_PCM_U32BE_MUXER 0
-+#define CONFIG_PCM_U32LE_MUXER 0
-+#define CONFIG_PCM_U24BE_MUXER 0
-+#define CONFIG_PCM_U24LE_MUXER 0
-+#define CONFIG_PCM_U16BE_MUXER 0
-+#define CONFIG_PCM_U16LE_MUXER 0
-+#define CONFIG_PCM_U8_MUXER 0
-+#define CONFIG_PSP_MUXER 0
-+#define CONFIG_RAWVIDEO_MUXER 0
-+#define CONFIG_RM_MUXER 0
-+#define CONFIG_ROQ_MUXER 0
-+#define CONFIG_RSO_MUXER 0
-+#define CONFIG_RTP_MUXER 0
-+#define CONFIG_RTP_MPEGTS_MUXER 0
-+#define CONFIG_RTSP_MUXER 0
-+#define CONFIG_SAP_MUXER 0
-+#define CONFIG_SBC_MUXER 0
-+#define CONFIG_SCC_MUXER 0
-+#define CONFIG_SEGAFILM_MUXER 0
-+#define CONFIG_SEGMENT_MUXER 0
-+#define CONFIG_STREAM_SEGMENT_MUXER 0
-+#define CONFIG_SMJPEG_MUXER 0
-+#define CONFIG_SMOOTHSTREAMING_MUXER 0
-+#define CONFIG_SOX_MUXER 0
-+#define CONFIG_SPX_MUXER 0
-+#define CONFIG_SPDIF_MUXER 0
-+#define CONFIG_SRT_MUXER 0
-+#define CONFIG_STREAMHASH_MUXER 0
-+#define CONFIG_SUP_MUXER 0
-+#define CONFIG_SWF_MUXER 0
-+#define CONFIG_TEE_MUXER 0
-+#define CONFIG_TG2_MUXER 0
-+#define CONFIG_TGP_MUXER 0
-+#define CONFIG_MKVTIMESTAMP_V2_MUXER 0
-+#define CONFIG_TRUEHD_MUXER 0
-+#define CONFIG_TTA_MUXER 0
-+#define CONFIG_TTML_MUXER 0
-+#define CONFIG_UNCODEDFRAMECRC_MUXER 0
-+#define CONFIG_VC1_MUXER 0
-+#define CONFIG_VC1T_MUXER 0
-+#define CONFIG_VOC_MUXER 0
-+#define CONFIG_W64_MUXER 0
-+#define CONFIG_WAV_MUXER 0
-+#define CONFIG_WEBM_MUXER 0
-+#define CONFIG_WEBM_DASH_MANIFEST_MUXER 0
-+#define CONFIG_WEBM_CHUNK_MUXER 0
-+#define CONFIG_WEBP_MUXER 0
-+#define CONFIG_WEBVTT_MUXER 0
-+#define CONFIG_WSAUD_MUXER 0
-+#define CONFIG_WTV_MUXER 0
-+#define CONFIG_WV_MUXER 0
-+#define CONFIG_YUV4MPEGPIPE_MUXER 0
-+#define CONFIG_CHROMAPRINT_MUXER 0
-+#define CONFIG_ASYNC_PROTOCOL 0
-+#define CONFIG_BLURAY_PROTOCOL 0
-+#define CONFIG_CACHE_PROTOCOL 0
-+#define CONFIG_CONCAT_PROTOCOL 0
-+#define CONFIG_CONCATF_PROTOCOL 0
-+#define CONFIG_CRYPTO_PROTOCOL 0
-+#define CONFIG_DATA_PROTOCOL 0
-+#define CONFIG_FFRTMPCRYPT_PROTOCOL 0
-+#define CONFIG_FFRTMPHTTP_PROTOCOL 0
-+#define CONFIG_FILE_PROTOCOL 0
-+#define CONFIG_FTP_PROTOCOL 0
-+#define CONFIG_GOPHER_PROTOCOL 0
-+#define CONFIG_GOPHERS_PROTOCOL 0
-+#define CONFIG_HLS_PROTOCOL 0
-+#define CONFIG_HTTP_PROTOCOL 0
-+#define CONFIG_HTTPPROXY_PROTOCOL 0
-+#define CONFIG_HTTPS_PROTOCOL 0
-+#define CONFIG_ICECAST_PROTOCOL 0
-+#define CONFIG_MMSH_PROTOCOL 0
-+#define CONFIG_MMST_PROTOCOL 0
-+#define CONFIG_MD5_PROTOCOL 0
-+#define CONFIG_PIPE_PROTOCOL 0
-+#define CONFIG_PROMPEG_PROTOCOL 0
-+#define CONFIG_RTMP_PROTOCOL 0
-+#define CONFIG_RTMPE_PROTOCOL 0
-+#define CONFIG_RTMPS_PROTOCOL 0
-+#define CONFIG_RTMPT_PROTOCOL 0
-+#define CONFIG_RTMPTE_PROTOCOL 0
-+#define CONFIG_RTMPTS_PROTOCOL 0
-+#define CONFIG_RTP_PROTOCOL 0
-+#define CONFIG_SCTP_PROTOCOL 0
-+#define CONFIG_SRTP_PROTOCOL 0
-+#define CONFIG_SUBFILE_PROTOCOL 0
-+#define CONFIG_TEE_PROTOCOL 0
-+#define CONFIG_TCP_PROTOCOL 0
-+#define CONFIG_TLS_PROTOCOL 0
-+#define CONFIG_UDP_PROTOCOL 0
-+#define CONFIG_UDPLITE_PROTOCOL 0
-+#define CONFIG_UNIX_PROTOCOL 0
-+#define CONFIG_LIBAMQP_PROTOCOL 0
-+#define CONFIG_LIBRIST_PROTOCOL 0
-+#define CONFIG_LIBRTMP_PROTOCOL 0
-+#define CONFIG_LIBRTMPE_PROTOCOL 0
-+#define CONFIG_LIBRTMPS_PROTOCOL 0
-+#define CONFIG_LIBRTMPT_PROTOCOL 0
-+#define CONFIG_LIBRTMPTE_PROTOCOL 0
-+#define CONFIG_LIBSRT_PROTOCOL 0
-+#define CONFIG_LIBSSH_PROTOCOL 0
-+#define CONFIG_LIBSMBCLIENT_PROTOCOL 0
-+#define CONFIG_LIBZMQ_PROTOCOL 0
+#endif /* FFMPEG_CONFIG_H */
diff --git a/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h
new file mode 100644
index 000000000000..55a1ea24b721
--- /dev/null
+++ b/www/chromium/files/patch-third__party_ffmpeg_chromium_config_Chrome_openbsd_ia32_config__components.h
@@ -0,0 +1,2066 @@
+--- third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h.orig 2022-07-28 06:07:04 UTC
++++ third_party/ffmpeg/chromium/config/Chrome/openbsd/ia32/config_components.h
+@@ -0,0 +1,2063 @@
++/* Automatically generated by configure - do not modify! */
++#ifndef FFMPEG_CONFIG_COMPONENTS_H
++#define FFMPEG_CONFIG_COMPONENTS_H
++#define CONFIG_AAC_ADTSTOASC_BSF 0
++#define CONFIG_AV1_FRAME_MERGE_BSF 0
++#define CONFIG_AV1_FRAME_SPLIT_BSF 0
++#define CONFIG_AV1_METADATA_BSF 0
++#define CONFIG_CHOMP_BSF 0
++#define CONFIG_DUMP_EXTRADATA_BSF 0
++#define CONFIG_DCA_CORE_BSF 0
++#define CONFIG_DV_ERROR_MARKER_BSF 0
++#define CONFIG_EAC3_CORE_BSF 0
++#define CONFIG_EXTRACT_EXTRADATA_BSF 0
++#define CONFIG_FILTER_UNITS_BSF 0
++#define CONFIG_H264_METADATA_BSF 0
++#define CONFIG_H264_MP4TOANNEXB_BSF 0
++#define CONFIG_H264_REDUNDANT_PPS_BSF 0
++#define CONFIG_HAPQA_EXTRACT_BSF 0
++#define CONFIG_HEVC_METADATA_BSF 0
++#define CONFIG_HEVC_MP4TOANNEXB_BSF 0
++#define CONFIG_IMX_DUMP_HEADER_BSF 0
++#define CONFIG_MJPEG2JPEG_BSF 0
++#define CONFIG_MJPEGA_DUMP_HEADER_BSF 0
++#define CONFIG_MP3_HEADER_DECOMPRESS_BSF 0
++#define CONFIG_MPEG2_METADATA_BSF 0
++#define CONFIG_MPEG4_UNPACK_BFRAMES_BSF 0
++#define CONFIG_MOV2TEXTSUB_BSF 0
++#define CONFIG_NOISE_BSF 0
++#define CONFIG_NULL_BSF 0
++#define CONFIG_OPUS_METADATA_BSF 0
++#define CONFIG_PCM_RECHUNK_BSF 0
++#define CONFIG_PRORES_METADATA_BSF 0
++#define CONFIG_REMOVE_EXTRADATA_BSF 0
++#define CONFIG_SETTS_BSF 0
++#define CONFIG_TEXT2MOVSUB_BSF 0
++#define CONFIG_TRACE_HEADERS_BSF 0
++#define CONFIG_TRUEHD_CORE_BSF 0
++#define CONFIG_VP9_METADATA_BSF 0
++#define CONFIG_VP9_RAW_REORDER_BSF 0
++#define CONFIG_VP9_SUPERFRAME_BSF 0
++#define CONFIG_VP9_SUPERFRAME_SPLIT_BSF 0
++#define CONFIG_AASC_DECODER 0
++#define CONFIG_AIC_DECODER 0
++#define CONFIG_ALIAS_PIX_DECODER 0
++#define CONFIG_AGM_DECODER 0
++#define CONFIG_AMV_DECODER 0
++#define CONFIG_ANM_DECODER 0
++#define CONFIG_ANSI_DECODER 0
++#define CONFIG_APNG_DECODER 0
++#define CONFIG_ARBC_DECODER 0
++#define CONFIG_ARGO_DECODER 0
++#define CONFIG_ASV1_DECODER 0
++#define CONFIG_ASV2_DECODER 0
++#define CONFIG_AURA_DECODER 0
++#define CONFIG_AURA2_DECODER 0
++#define CONFIG_AVRP_DECODER 0
++#define CONFIG_AVRN_DECODER 0
++#define CONFIG_AVS_DECODER 0
++#define CONFIG_AVUI_DECODER 0
++#define CONFIG_AYUV_DECODER 0
++#define CONFIG_BETHSOFTVID_DECODER 0
++#define CONFIG_BFI_DECODER 0
++#define CONFIG_BINK_DECODER 0
++#define CONFIG_BITPACKED_DECODER 0
++#define CONFIG_BMP_DECODER 0
++#define CONFIG_BMV_VIDEO_DECODER 0
++#define CONFIG_BRENDER_PIX_DECODER 0
++#define CONFIG_C93_DECODER 0
++#define CONFIG_CAVS_DECODER 0
++#define CONFIG_CDGRAPHICS_DECODER 0
++#define CONFIG_CDTOONS_DECODER 0
++#define CONFIG_CDXL_DECODER 0
++#define CONFIG_CFHD_DECODER 0
++#define CONFIG_CINEPAK_DECODER 0
++#define CONFIG_CLEARVIDEO_DECODER 0
++#define CONFIG_CLJR_DECODER 0
++#define CONFIG_CLLC_DECODER 0
++#define CONFIG_COMFORTNOISE_DECODER 0
++#define CONFIG_CPIA_DECODER 0
++#define CONFIG_CRI_DECODER 0
++#define CONFIG_CSCD_DECODER 0
++#define CONFIG_CYUV_DECODER 0
++#define CONFIG_DDS_DECODER 0
++#define CONFIG_DFA_DECODER 0
++#define CONFIG_DIRAC_DECODER 0
++#define CONFIG_DNXHD_DECODER 0
++#define CONFIG_DPX_DECODER 0
++#define CONFIG_DSICINVIDEO_DECODER 0
++#define CONFIG_DVAUDIO_DECODER 0
++#define CONFIG_DVVIDEO_DECODER 0
++#define CONFIG_DXA_DECODER 0
++#define CONFIG_DXTORY_DECODER 0
++#define CONFIG_DXV_DECODER 0
++#define CONFIG_EACMV_DECODER 0
++#define CONFIG_EAMAD_DECODER 0
++#define CONFIG_EATGQ_DECODER 0
++#define CONFIG_EATGV_DECODER 0
++#define CONFIG_EATQI_DECODER 0
++#define CONFIG_EIGHTBPS_DECODER 0
++#define CONFIG_EIGHTSVX_EXP_DECODER 0
++#define CONFIG_EIGHTSVX_FIB_DECODER 0
++#define CONFIG_ESCAPE124_DECODER 0
++#define CONFIG_ESCAPE130_DECODER 0
++#define CONFIG_EXR_DECODER 0
++#define CONFIG_FFV1_DECODER 0
++#define CONFIG_FFVHUFF_DECODER 0
++#define CONFIG_FIC_DECODER 0
++#define CONFIG_FITS_DECODER 0
++#define CONFIG_FLASHSV_DECODER 0
++#define CONFIG_FLASHSV2_DECODER 0
++#define CONFIG_FLIC_DECODER 0
++#define CONFIG_FLV_DECODER 0
++#define CONFIG_FMVC_DECODER 0
++#define CONFIG_FOURXM_DECODER 0
++#define CONFIG_FRAPS_DECODER 0
++#define CONFIG_FRWU_DECODER 0
++#define CONFIG_G2M_DECODER 0
++#define CONFIG_GDV_DECODER 0
++#define CONFIG_GEM_DECODER 0
++#define CONFIG_GIF_DECODER 0
++#define CONFIG_H261_DECODER 0
++#define CONFIG_H263_DECODER 0
++#define CONFIG_H263I_DECODER 0
++#define CONFIG_H263P_DECODER 0
++#define CONFIG_H263_V4L2M2M_DECODER 0
++#define CONFIG_H264_DECODER 1
++#define CONFIG_H264_CRYSTALHD_DECODER 0
++#define CONFIG_H264_V4L2M2M_DECODER 0
++#define CONFIG_H264_MEDIACODEC_DECODER 0
++#define CONFIG_H264_MMAL_DECODER 0
++#define CONFIG_H264_QSV_DECODER 0
++#define CONFIG_H264_RKMPP_DECODER 0
++#define CONFIG_HAP_DECODER 0
++#define CONFIG_HEVC_DECODER 0
++#define CONFIG_HEVC_QSV_DECODER 0
++#define CONFIG_HEVC_RKMPP_DECODER 0
++#define CONFIG_HEVC_V4L2M2M_DECODER 0
++#define CONFIG_HNM4_VIDEO_DECODER 0
++#define CONFIG_HQ_HQA_DECODER 0
++#define CONFIG_HQX_DECODER 0
++#define CONFIG_HUFFYUV_DECODER 0
++#define CONFIG_HYMT_DECODER 0
++#define CONFIG_IDCIN_DECODER 0
++#define CONFIG_IFF_ILBM_DECODER 0
++#define CONFIG_IMM4_DECODER 0
++#define CONFIG_IMM5_DECODER 0
++#define CONFIG_INDEO2_DECODER 0
++#define CONFIG_INDEO3_DECODER 0
++#define CONFIG_INDEO4_DECODER 0
++#define CONFIG_INDEO5_DECODER 0
++#define CONFIG_INTERPLAY_VIDEO_DECODER 0
++#define CONFIG_IPU_DECODER 0
++#define CONFIG_JPEG2000_DECODER 0
++#define CONFIG_JPEGLS_DECODER 0
++#define CONFIG_JV_DECODER 0
++#define CONFIG_KGV1_DECODER 0
++#define CONFIG_KMVC_DECODER 0
++#define CONFIG_LAGARITH_DECODER 0
++#define CONFIG_LOCO_DECODER 0
++#define CONFIG_LSCR_DECODER 0
++#define CONFIG_M101_DECODER 0
++#define CONFIG_MAGICYUV_DECODER 0
++#define CONFIG_MDEC_DECODER 0
++#define CONFIG_MIMIC_DECODER 0
++#define CONFIG_MJPEG_DECODER 0
++#define CONFIG_MJPEGB_DECODER 0
++#define CONFIG_MMVIDEO_DECODER 0
++#define CONFIG_MOBICLIP_DECODER 0
++#define CONFIG_MOTIONPIXELS_DECODER 0
++#define CONFIG_MPEG1VIDEO_DECODER 0
++#define CONFIG_MPEG2VIDEO_DECODER 0
++#define CONFIG_MPEG4_DECODER 0
++#define CONFIG_MPEG4_CRYSTALHD_DECODER 0
++#define CONFIG_MPEG4_V4L2M2M_DECODER 0
++#define CONFIG_MPEG4_MMAL_DECODER 0
++#define CONFIG_MPEGVIDEO_DECODER 0
++#define CONFIG_MPEG1_V4L2M2M_DECODER 0
++#define CONFIG_MPEG2_MMAL_DECODER 0
++#define CONFIG_MPEG2_CRYSTALHD_DECODER 0
++#define CONFIG_MPEG2_V4L2M2M_DECODER 0
++#define CONFIG_MPEG2_QSV_DECODER 0
++#define CONFIG_MPEG2_MEDIACODEC_DECODER 0
++#define CONFIG_MSA1_DECODER 0
++#define CONFIG_MSCC_DECODER 0
++#define CONFIG_MSMPEG4V1_DECODER 0
++#define CONFIG_MSMPEG4V2_DECODER 0
++#define CONFIG_MSMPEG4V3_DECODER 0
++#define CONFIG_MSMPEG4_CRYSTALHD_DECODER 0
++#define CONFIG_MSP2_DECODER 0
++#define CONFIG_MSRLE_DECODER 0
++#define CONFIG_MSS1_DECODER 0
++#define CONFIG_MSS2_DECODER 0
++#define CONFIG_MSVIDEO1_DECODER 0
++#define CONFIG_MSZH_DECODER 0
++#define CONFIG_MTS2_DECODER 0
++#define CONFIG_MV30_DECODER 0
++#define CONFIG_MVC1_DECODER 0
++#define CONFIG_MVC2_DECODER 0
++#define CONFIG_MVDV_DECODER 0
++#define CONFIG_MVHA_DECODER 0
++#define CONFIG_MWSC_DECODER 0
++#define CONFIG_MXPEG_DECODER 0
++#define CONFIG_NOTCHLC_DECODER 0
++#define CONFIG_NUV_DECODER 0
++#define CONFIG_PAF_VIDEO_DECODER 0
++#define CONFIG_PAM_DECODER 0
++#define CONFIG_PBM_DECODER 0
++#define CONFIG_PCX_DECODER 0
++#define CONFIG_PFM_DECODER 0
++#define CONFIG_PGM_DECODER 0
++#define CONFIG_PGMYUV_DECODER 0
++#define CONFIG_PGX_DECODER 0
++#define CONFIG_PHOTOCD_DECODER 0
++#define CONFIG_PICTOR_DECODER 0
++#define CONFIG_PIXLET_DECODER 0
++#define CONFIG_PNG_DECODER 0
++#define CONFIG_PPM_DECODER 0
++#define CONFIG_PRORES_DECODER 0
++#define CONFIG_PROSUMER_DECODER 0
++#define CONFIG_PSD_DECODER 0
++#define CONFIG_PTX_DECODER 0
++#define CONFIG_QDRAW_DECODER 0
++#define CONFIG_QPEG_DECODER 0
++#define CONFIG_QTRLE_DECODER 0
++#define CONFIG_R10K_DECODER 0
++#define CONFIG_R210_DECODER 0
++#define CONFIG_RASC_DECODER 0
++#define CONFIG_RAWVIDEO_DECODER 0
++#define CONFIG_RL2_DECODER 0
++#define CONFIG_ROQ_DECODER 0
++#define CONFIG_RPZA_DECODER 0
++#define CONFIG_RSCC_DECODER 0
++#define CONFIG_RV10_DECODER 0
++#define CONFIG_RV20_DECODER 0
++#define CONFIG_RV30_DECODER 0
++#define CONFIG_RV40_DECODER 0
++#define CONFIG_S302M_DECODER 0
++#define CONFIG_SANM_DECODER 0
++#define CONFIG_SCPR_DECODER 0
++#define CONFIG_SCREENPRESSO_DECODER 0
++#define CONFIG_SGA_DECODER 0
++#define CONFIG_SGI_DECODER 0
++#define CONFIG_SGIRLE_DECODER 0
++#define CONFIG_SHEERVIDEO_DECODER 0
++#define CONFIG_SIMBIOSIS_IMX_DECODER 0
++#define CONFIG_SMACKER_DECODER 0
++#define CONFIG_SMC_DECODER 0
++#define CONFIG_SMVJPEG_DECODER 0
++#define CONFIG_SNOW_DECODER 0
++#define CONFIG_SP5X_DECODER 0
++#define CONFIG_SPEEDHQ_DECODER 0
++#define CONFIG_SPEEX_DECODER 0
++#define CONFIG_SRGC_DECODER 0
++#define CONFIG_SUNRAST_DECODER 0
++#define CONFIG_SVQ1_DECODER 0
++#define CONFIG_SVQ3_DECODER 0
++#define CONFIG_TARGA_DECODER 0
++#define CONFIG_TARGA_Y216_DECODER 0
++#define CONFIG_TDSC_DECODER 0
++#define CONFIG_THEORA_DECODER 1
++#define CONFIG_THP_DECODER 0
++#define CONFIG_TIERTEXSEQVIDEO_DECODER 0
++#define CONFIG_TIFF_DECODER 0
++#define CONFIG_TMV_DECODER 0
++#define CONFIG_TRUEMOTION1_DECODER 0
++#define CONFIG_TRUEMOTION2_DECODER 0
++#define CONFIG_TRUEMOTION2RT_DECODER 0
++#define CONFIG_TSCC_DECODER 0
++#define CONFIG_TSCC2_DECODER 0
++#define CONFIG_TXD_DECODER 0
++#define CONFIG_ULTI_DECODER 0
++#define CONFIG_UTVIDEO_DECODER 0
++#define CONFIG_V210_DECODER 0
++#define CONFIG_V210X_DECODER 0
++#define CONFIG_V308_DECODER 0
++#define CONFIG_V408_DECODER 0
++#define CONFIG_V410_DECODER 0
++#define CONFIG_VB_DECODER 0
++#define CONFIG_VBLE_DECODER 0
++#define CONFIG_VC1_DECODER 0
++#define CONFIG_VC1_CRYSTALHD_DECODER 0
++#define CONFIG_VC1IMAGE_DECODER 0
++#define CONFIG_VC1_MMAL_DECODER 0
++#define CONFIG_VC1_QSV_DECODER 0
++#define CONFIG_VC1_V4L2M2M_DECODER 0
++#define CONFIG_VCR1_DECODER 0
++#define CONFIG_VMDVIDEO_DECODER 0
++#define CONFIG_VMNC_DECODER 0
++#define CONFIG_VP3_DECODER 1
++#define CONFIG_VP4_DECODER 0
++#define CONFIG_VP5_DECODER 0
++#define CONFIG_VP6_DECODER 0
++#define CONFIG_VP6A_DECODER 0
++#define CONFIG_VP6F_DECODER 0
++#define CONFIG_VP7_DECODER 0
++#define CONFIG_VP8_DECODER 1
++#define CONFIG_VP8_RKMPP_DECODER 0
++#define CONFIG_VP8_V4L2M2M_DECODER 0
++#define CONFIG_VP9_DECODER 0
++#define CONFIG_VP9_RKMPP_DECODER 0
++#define CONFIG_VP9_V4L2M2M_DECODER 0
++#define CONFIG_VQA_DECODER 0
++#define CONFIG_WEBP_DECODER 0
++#define CONFIG_WCMV_DECODER 0
++#define CONFIG_WRAPPED_AVFRAME_DECODER 0
++#define CONFIG_WMV1_DECODER 0
++#define CONFIG_WMV2_DECODER 0
++#define CONFIG_WMV3_DECODER 0
++#define CONFIG_WMV3_CRYSTALHD_DECODER 0
++#define CONFIG_WMV3IMAGE_DECODER 0
++#define CONFIG_WNV1_DECODER 0
++#define CONFIG_XAN_WC3_DECODER 0
++#define CONFIG_XAN_WC4_DECODER 0
++#define CONFIG_XBM_DECODER 0
++#define CONFIG_XFACE_DECODER 0
++#define CONFIG_XL_DECODER 0
++#define CONFIG_XPM_DECODER 0
++#define CONFIG_XWD_DECODER 0
++#define CONFIG_Y41P_DECODER 0
++#define CONFIG_YLC_DECODER 0
++#define CONFIG_YOP_DECODER 0
++#define CONFIG_YUV4_DECODER 0
++#define CONFIG_ZERO12V_DECODER 0
++#define CONFIG_ZEROCODEC_DECODER 0
++#define CONFIG_ZLIB_DECODER 0
++#define CONFIG_ZMBV_DECODER 0
++#define CONFIG_AAC_DECODER 1
++#define CONFIG_AAC_FIXED_DECODER 0
++#define CONFIG_AAC_LATM_DECODER 0
++#define CONFIG_AC3_DECODER 0
++#define CONFIG_AC3_FIXED_DECODER 0
++#define CONFIG_ACELP_KELVIN_DECODER 0
++#define CONFIG_ALAC_DECODER 0
++#define CONFIG_ALS_DECODER 0
++#define CONFIG_AMRNB_DECODER 0
++#define CONFIG_AMRWB_DECODER 0
++#define CONFIG_APE_DECODER 0
++#define CONFIG_APTX_DECODER 0
++#define CONFIG_APTX_HD_DECODER 0
++#define CONFIG_ATRAC1_DECODER 0
++#define CONFIG_ATRAC3_DECODER 0
++#define CONFIG_ATRAC3AL_DECODER 0
++#define CONFIG_ATRAC3P_DECODER 0
++#define CONFIG_ATRAC3PAL_DECODER 0
++#define CONFIG_ATRAC9_DECODER 0
++#define CONFIG_BINKAUDIO_DCT_DECODER 0
++#define CONFIG_BINKAUDIO_RDFT_DECODER 0
++#define CONFIG_BMV_AUDIO_DECODER 0
++#define CONFIG_COOK_DECODER 0
++#define CONFIG_DCA_DECODER 0
++#define CONFIG_DFPWM_DECODER 0
++#define CONFIG_DOLBY_E_DECODER 0
++#define CONFIG_DSD_LSBF_DECODER 0
++#define CONFIG_DSD_MSBF_DECODER 0
++#define CONFIG_DSD_LSBF_PLANAR_DECODER 0
++#define CONFIG_DSD_MSBF_PLANAR_DECODER 0
++#define CONFIG_DSICINAUDIO_DECODER 0
++#define CONFIG_DSS_SP_DECODER 0
++#define CONFIG_DST_DECODER 0
++#define CONFIG_EAC3_DECODER 0
++#define CONFIG_EVRC_DECODER 0
++#define CONFIG_FASTAUDIO_DECODER 0
++#define CONFIG_FFWAVESYNTH_DECODER 0
++#define CONFIG_FLAC_DECODER 1
++#define CONFIG_G723_1_DECODER 0
++#define CONFIG_G729_DECODER 0
++#define CONFIG_GSM_DECODER 0
++#define CONFIG_GSM_MS_DECODER 0
++#define CONFIG_HCA_DECODER 0
++#define CONFIG_HCOM_DECODER 0
++#define CONFIG_IAC_DECODER 0
++#define CONFIG_ILBC_DECODER 0
++#define CONFIG_IMC_DECODER 0
++#define CONFIG_INTERPLAY_ACM_DECODER 0
++#define CONFIG_MACE3_DECODER 0
++#define CONFIG_MACE6_DECODER 0
++#define CONFIG_METASOUND_DECODER 0
++#define CONFIG_MLP_DECODER 0
++#define CONFIG_MP1_DECODER 0
++#define CONFIG_MP1FLOAT_DECODER 0
++#define CONFIG_MP2_DECODER 0
++#define CONFIG_MP2FLOAT_DECODER 0
++#define CONFIG_MP3FLOAT_DECODER 0
++#define CONFIG_MP3_DECODER 1
++#define CONFIG_MP3ADUFLOAT_DECODER 0
++#define CONFIG_MP3ADU_DECODER 0
++#define CONFIG_MP3ON4FLOAT_DECODER 0
++#define CONFIG_MP3ON4_DECODER 0
++#define CONFIG_MPC7_DECODER 0
++#define CONFIG_MPC8_DECODER 0
++#define CONFIG_MSNSIREN_DECODER 0
++#define CONFIG_NELLYMOSER_DECODER 0
++#define CONFIG_ON2AVC_DECODER 0
++#define CONFIG_OPUS_DECODER 0
++#define CONFIG_PAF_AUDIO_DECODER 0
++#define CONFIG_QCELP_DECODER 0
++#define CONFIG_QDM2_DECODER 0
++#define CONFIG_QDMC_DECODER 0
++#define CONFIG_RA_144_DECODER 0
++#define CONFIG_RA_288_DECODER 0
++#define CONFIG_RALF_DECODER 0
++#define CONFIG_SBC_DECODER 0
++#define CONFIG_SHORTEN_DECODER 0
++#define CONFIG_SIPR_DECODER 0
++#define CONFIG_SIREN_DECODER 0
++#define CONFIG_SMACKAUD_DECODER 0
++#define CONFIG_SONIC_DECODER 0
++#define CONFIG_TAK_DECODER 0
++#define CONFIG_TRUEHD_DECODER 0
++#define CONFIG_TRUESPEECH_DECODER 0
++#define CONFIG_TTA_DECODER 0
++#define CONFIG_TWINVQ_DECODER 0
++#define CONFIG_VMDAUDIO_DECODER 0
++#define CONFIG_VORBIS_DECODER 1
++#define CONFIG_WAVPACK_DECODER 0
++#define CONFIG_WMALOSSLESS_DECODER 0
++#define CONFIG_WMAPRO_DECODER 0
++#define CONFIG_WMAV1_DECODER 0
++#define CONFIG_WMAV2_DECODER 0
++#define CONFIG_WMAVOICE_DECODER 0
++#define CONFIG_WS_SND1_DECODER 0
++#define CONFIG_XMA1_DECODER 0
++#define CONFIG_XMA2_DECODER 0
++#define CONFIG_PCM_ALAW_DECODER 1
++#define CONFIG_PCM_BLURAY_DECODER 0
++#define CONFIG_PCM_DVD_DECODER 0
++#define CONFIG_PCM_F16LE_DECODER 0
++#define CONFIG_PCM_F24LE_DECODER 0
++#define CONFIG_PCM_F32BE_DECODER 0
++#define CONFIG_PCM_F32LE_DECODER 1
++#define CONFIG_PCM_F64BE_DECODER 0
++#define CONFIG_PCM_F64LE_DECODER 0
++#define CONFIG_PCM_LXF_DECODER 0
++#define CONFIG_PCM_MULAW_DECODER 1
++#define CONFIG_PCM_S8_DECODER 0
++#define CONFIG_PCM_S8_PLANAR_DECODER 0
++#define CONFIG_PCM_S16BE_DECODER 1
++#define CONFIG_PCM_S16BE_PLANAR_DECODER 0
++#define CONFIG_PCM_S16LE_DECODER 1
++#define CONFIG_PCM_S16LE_PLANAR_DECODER 0
++#define CONFIG_PCM_S24BE_DECODER 1
++#define CONFIG_PCM_S24DAUD_DECODER 0
++#define CONFIG_PCM_S24LE_DECODER 1
++#define CONFIG_PCM_S24LE_PLANAR_DECODER 0
++#define CONFIG_PCM_S32BE_DECODER 0
++#define CONFIG_PCM_S32LE_DECODER 1
++#define CONFIG_PCM_S32LE_PLANAR_DECODER 0
++#define CONFIG_PCM_S64BE_DECODER 0
++#define CONFIG_PCM_S64LE_DECODER 0
++#define CONFIG_PCM_SGA_DECODER 0
++#define CONFIG_PCM_U8_DECODER 1
++#define CONFIG_PCM_U16BE_DECODER 0
++#define CONFIG_PCM_U16LE_DECODER 0
++#define CONFIG_PCM_U24BE_DECODER 0
++#define CONFIG_PCM_U24LE_DECODER 0
++#define CONFIG_PCM_U32BE_DECODER 0
++#define CONFIG_PCM_U32LE_DECODER 0
++#define CONFIG_PCM_VIDC_DECODER 0
++#define CONFIG_DERF_DPCM_DECODER 0
++#define CONFIG_GREMLIN_DPCM_DECODER 0
++#define CONFIG_INTERPLAY_DPCM_DECODER 0
++#define CONFIG_ROQ_DPCM_DECODER 0
++#define CONFIG_SDX2_DPCM_DECODER 0
++#define CONFIG_SOL_DPCM_DECODER 0
++#define CONFIG_XAN_DPCM_DECODER 0
++#define CONFIG_ADPCM_4XM_DECODER 0
++#define CONFIG_ADPCM_ADX_DECODER 0
++#define CONFIG_ADPCM_AFC_DECODER 0
++#define CONFIG_ADPCM_AGM_DECODER 0
++#define CONFIG_ADPCM_AICA_DECODER 0
++#define CONFIG_ADPCM_ARGO_DECODER 0
++#define CONFIG_ADPCM_CT_DECODER 0
++#define CONFIG_ADPCM_DTK_DECODER 0
++#define CONFIG_ADPCM_EA_DECODER 0
++#define CONFIG_ADPCM_EA_MAXIS_XA_DECODER 0
++#define CONFIG_ADPCM_EA_R1_DECODER 0
++#define CONFIG_ADPCM_EA_R2_DECODER 0
++#define CONFIG_ADPCM_EA_R3_DECODER 0
++#define CONFIG_ADPCM_EA_XAS_DECODER 0
++#define CONFIG_ADPCM_G722_DECODER 0
++#define CONFIG_ADPCM_G726_DECODER 0
++#define CONFIG_ADPCM_G726LE_DECODER 0
++#define CONFIG_ADPCM_IMA_ACORN_DECODER 0
++#define CONFIG_ADPCM_IMA_AMV_DECODER 0
++#define CONFIG_ADPCM_IMA_ALP_DECODER 0
++#define CONFIG_ADPCM_IMA_APC_DECODER 0
++#define CONFIG_ADPCM_IMA_APM_DECODER 0
++#define CONFIG_ADPCM_IMA_CUNNING_DECODER 0
++#define CONFIG_ADPCM_IMA_DAT4_DECODER 0
++#define CONFIG_ADPCM_IMA_DK3_DECODER 0
++#define CONFIG_ADPCM_IMA_DK4_DECODER 0
++#define CONFIG_ADPCM_IMA_EA_EACS_DECODER 0
++#define CONFIG_ADPCM_IMA_EA_SEAD_DECODER 0
++#define CONFIG_ADPCM_IMA_ISS_DECODER 0
++#define CONFIG_ADPCM_IMA_MOFLEX_DECODER 0
++#define CONFIG_ADPCM_IMA_MTF_DECODER 0
++#define CONFIG_ADPCM_IMA_OKI_DECODER 0
++#define CONFIG_ADPCM_IMA_QT_DECODER 0
++#define CONFIG_ADPCM_IMA_RAD_DECODER 0
++#define CONFIG_ADPCM_IMA_SSI_DECODER 0
++#define CONFIG_ADPCM_IMA_SMJPEG_DECODER 0
++#define CONFIG_ADPCM_IMA_WAV_DECODER 0
++#define CONFIG_ADPCM_IMA_WS_DECODER 0
++#define CONFIG_ADPCM_MS_DECODER 0
++#define CONFIG_ADPCM_MTAF_DECODER 0
++#define CONFIG_ADPCM_PSX_DECODER 0
++#define CONFIG_ADPCM_SBPRO_2_DECODER 0
++#define CONFIG_ADPCM_SBPRO_3_DECODER 0
++#define CONFIG_ADPCM_SBPRO_4_DECODER 0
++#define CONFIG_ADPCM_SWF_DECODER 0
++#define CONFIG_ADPCM_THP_DECODER 0
++#define CONFIG_ADPCM_THP_LE_DECODER 0
++#define CONFIG_ADPCM_VIMA_DECODER 0
++#define CONFIG_ADPCM_XA_DECODER 0
++#define CONFIG_ADPCM_YAMAHA_DECODER 0
++#define CONFIG_ADPCM_ZORK_DECODER 0
++#define CONFIG_SSA_DECODER 0
++#define CONFIG_ASS_DECODER 0
++#define CONFIG_CCAPTION_DECODER 0
++#define CONFIG_DVBSUB_DECODER 0
++#define CONFIG_DVDSUB_DECODER 0
++#define CONFIG_JACOSUB_DECODER 0
++#define CONFIG_MICRODVD_DECODER 0
++#define CONFIG_MOVTEXT_DECODER 0
++#define CONFIG_MPL2_DECODER 0
++#define CONFIG_PGSSUB_DECODER 0
++#define CONFIG_PJS_DECODER 0
++#define CONFIG_REALTEXT_DECODER 0
++#define CONFIG_SAMI_DECODER 0
++#define CONFIG_SRT_DECODER 0
++#define CONFIG_STL_DECODER 0
++#define CONFIG_SUBRIP_DECODER 0
++#define CONFIG_SUBVIEWER_DECODER 0
++#define CONFIG_SUBVIEWER1_DECODER 0
++#define CONFIG_TEXT_DECODER 0
++#define CONFIG_VPLAYER_DECODER 0
++#define CONFIG_WEBVTT_DECODER 0
++#define CONFIG_XSUB_DECODER 0
++#define CONFIG_AAC_AT_DECODER 0
++#define CONFIG_AC3_AT_DECODER 0
++#define CONFIG_ADPCM_IMA_QT_AT_DECODER 0
++#define CONFIG_ALAC_AT_DECODER 0
++#define CONFIG_AMR_NB_AT_DECODER 0
++#define CONFIG_EAC3_AT_DECODER 0
++#define CONFIG_GSM_MS_AT_DECODER 0
++#define CONFIG_ILBC_AT_DECODER 0
++#define CONFIG_MP1_AT_DECODER 0
++#define CONFIG_MP2_AT_DECODER 0
++#define CONFIG_MP3_AT_DECODER 0
++#define CONFIG_PCM_ALAW_AT_DECODER 0
++#define CONFIG_PCM_MULAW_AT_DECODER 0
++#define CONFIG_QDMC_AT_DECODER 0
++#define CONFIG_QDM2_AT_DECODER 0
++#define CONFIG_LIBARIBB24_DECODER 0
++#define CONFIG_LIBCELT_DECODER 0
++#define CONFIG_LIBCODEC2_DECODER 0
++#define CONFIG_LIBDAV1D_DECODER 0
++#define CONFIG_LIBDAVS2_DECODER 0
++#define CONFIG_LIBFDK_AAC_DECODER 0
++#define CONFIG_LIBGSM_DECODER 0
++#define CONFIG_LIBGSM_MS_DECODER 0
++#define CONFIG_LIBILBC_DECODER 0
++#define CONFIG_LIBOPENCORE_AMRNB_DECODER 0
++#define CONFIG_LIBOPENCORE_AMRWB_DECODER 0
++#define CONFIG_LIBOPENJPEG_DECODER 0
++#define CONFIG_LIBOPUS_DECODER 1
++#define CONFIG_LIBRSVG_DECODER 0
++#define CONFIG_LIBSPEEX_DECODER 0
++#define CONFIG_LIBUAVS3D_DECODER 0
++#define CONFIG_LIBVORBIS_DECODER 0
++#define CONFIG_LIBVPX_VP8_DECODER 0
++#define CONFIG_LIBVPX_VP9_DECODER 0
++#define CONFIG_LIBZVBI_TELETEXT_DECODER 0
++#define CONFIG_BINTEXT_DECODER 0
++#define CONFIG_XBIN_DECODER 0
++#define CONFIG_IDF_DECODER 0
++#define CONFIG_LIBAOM_AV1_DECODER 0
++#define CONFIG_AV1_DECODER 0
++#define CONFIG_AV1_CUVID_DECODER 0
++#define CONFIG_AV1_QSV_DECODER 0
++#define CONFIG_LIBOPENH264_DECODER 0
++#define CONFIG_H264_CUVID_DECODER 0
++#define CONFIG_HEVC_CUVID_DECODER 0
++#define CONFIG_HEVC_MEDIACODEC_DECODER 0
++#define CONFIG_MJPEG_CUVID_DECODER 0
++#define CONFIG_MJPEG_QSV_DECODER 0
++#define CONFIG_MPEG1_CUVID_DECODER 0
++#define CONFIG_MPEG2_CUVID_DECODER 0
++#define CONFIG_MPEG4_CUVID_DECODER 0
++#define CONFIG_MPEG4_MEDIACODEC_DECODER 0
++#define CONFIG_VC1_CUVID_DECODER 0
++#define CONFIG_VP8_CUVID_DECODER 0
++#define CONFIG_VP8_MEDIACODEC_DECODER 0
++#define CONFIG_VP8_QSV_DECODER 0
++#define CONFIG_VP9_CUVID_DECODER 0
++#define CONFIG_VP9_MEDIACODEC_DECODER 0
++#define CONFIG_VP9_QSV_DECODER 0
++#define CONFIG_A64MULTI_ENCODER 0
++#define CONFIG_A64MULTI5_ENCODER 0
++#define CONFIG_ALIAS_PIX_ENCODER 0
++#define CONFIG_AMV_ENCODER 0
++#define CONFIG_APNG_ENCODER 0
++#define CONFIG_ASV1_ENCODER 0
++#define CONFIG_ASV2_ENCODER 0
++#define CONFIG_AVRP_ENCODER 0
++#define CONFIG_AVUI_ENCODER 0
++#define CONFIG_AYUV_ENCODER 0
++#define CONFIG_BITPACKED_ENCODER 0
++#define CONFIG_BMP_ENCODER 0
++#define CONFIG_CFHD_ENCODER 0
++#define CONFIG_CINEPAK_ENCODER 0
++#define CONFIG_CLJR_ENCODER 0
++#define CONFIG_COMFORTNOISE_ENCODER 0
++#define CONFIG_DNXHD_ENCODER 0
++#define CONFIG_DPX_ENCODER 0
++#define CONFIG_DVVIDEO_ENCODER 0
++#define CONFIG_EXR_ENCODER 0
++#define CONFIG_FFV1_ENCODER 0
++#define CONFIG_FFVHUFF_ENCODER 0
++#define CONFIG_FITS_ENCODER 0
++#define CONFIG_FLASHSV_ENCODER 0
++#define CONFIG_FLASHSV2_ENCODER 0
++#define CONFIG_FLV_ENCODER 0
++#define CONFIG_GIF_ENCODER 0
++#define CONFIG_H261_ENCODER 0
++#define CONFIG_H263_ENCODER 0
++#define CONFIG_H263P_ENCODER 0
++#define CONFIG_HAP_ENCODER 0
++#define CONFIG_HUFFYUV_ENCODER 0
++#define CONFIG_JPEG2000_ENCODER 0
++#define CONFIG_JPEGLS_ENCODER 0
++#define CONFIG_LJPEG_ENCODER 0
++#define CONFIG_MAGICYUV_ENCODER 0
++#define CONFIG_MJPEG_ENCODER 0
++#define CONFIG_MPEG1VIDEO_ENCODER 0
++#define CONFIG_MPEG2VIDEO_ENCODER 0
++#define CONFIG_MPEG4_ENCODER 0
++#define CONFIG_MSMPEG4V2_ENCODER 0
++#define CONFIG_MSMPEG4V3_ENCODER 0
++#define CONFIG_MSVIDEO1_ENCODER 0
++#define CONFIG_PAM_ENCODER 0
++#define CONFIG_PBM_ENCODER 0
++#define CONFIG_PCX_ENCODER 0
++#define CONFIG_PFM_ENCODER 0
++#define CONFIG_PGM_ENCODER 0
++#define CONFIG_PGMYUV_ENCODER 0
++#define CONFIG_PNG_ENCODER 0
++#define CONFIG_PPM_ENCODER 0
++#define CONFIG_PRORES_ENCODER 0
++#define CONFIG_PRORES_AW_ENCODER 0
++#define CONFIG_PRORES_KS_ENCODER 0
++#define CONFIG_QTRLE_ENCODER 0
++#define CONFIG_R10K_ENCODER 0
++#define CONFIG_R210_ENCODER 0
++#define CONFIG_RAWVIDEO_ENCODER 0
++#define CONFIG_ROQ_ENCODER 0
++#define CONFIG_RPZA_ENCODER 0
++#define CONFIG_RV10_ENCODER 0
++#define CONFIG_RV20_ENCODER 0
++#define CONFIG_S302M_ENCODER 0
++#define CONFIG_SGI_ENCODER 0
++#define CONFIG_SMC_ENCODER 0
++#define CONFIG_SNOW_ENCODER 0
++#define CONFIG_SPEEDHQ_ENCODER 0
++#define CONFIG_SUNRAST_ENCODER 0
++#define CONFIG_SVQ1_ENCODER 0
++#define CONFIG_TARGA_ENCODER 0
++#define CONFIG_TIFF_ENCODER 0
++#define CONFIG_UTVIDEO_ENCODER 0
++#define CONFIG_V210_ENCODER 0
++#define CONFIG_V308_ENCODER 0
++#define CONFIG_V408_ENCODER 0
++#define CONFIG_V410_ENCODER 0
++#define CONFIG_VC2_ENCODER 0
++#define CONFIG_WRAPPED_AVFRAME_ENCODER 0
++#define CONFIG_WMV1_ENCODER 0
++#define CONFIG_WMV2_ENCODER 0
++#define CONFIG_XBM_ENCODER 0
++#define CONFIG_XFACE_ENCODER 0
++#define CONFIG_XWD_ENCODER 0
++#define CONFIG_Y41P_ENCODER 0
++#define CONFIG_YUV4_ENCODER 0
++#define CONFIG_ZLIB_ENCODER 0
++#define CONFIG_ZMBV_ENCODER 0
++#define CONFIG_AAC_ENCODER 0
++#define CONFIG_AC3_ENCODER 0
++#define CONFIG_AC3_FIXED_ENCODER 0
++#define CONFIG_ALAC_ENCODER 0
++#define CONFIG_APTX_ENCODER 0
++#define CONFIG_APTX_HD_ENCODER 0
++#define CONFIG_DCA_ENCODER 0
++#define CONFIG_DFPWM_ENCODER 0
++#define CONFIG_EAC3_ENCODER 0
++#define CONFIG_FLAC_ENCODER 0
++#define CONFIG_G723_1_ENCODER 0
++#define CONFIG_MLP_ENCODER 0
++#define CONFIG_MP2_ENCODER 0
++#define CONFIG_MP2FIXED_ENCODER 0
++#define CONFIG_NELLYMOSER_ENCODER 0
++#define CONFIG_OPUS_ENCODER 0
++#define CONFIG_RA_144_ENCODER 0
++#define CONFIG_SBC_ENCODER 0
++#define CONFIG_SONIC_ENCODER 0
++#define CONFIG_SONIC_LS_ENCODER 0
++#define CONFIG_TRUEHD_ENCODER 0
++#define CONFIG_TTA_ENCODER 0
++#define CONFIG_VORBIS_ENCODER 0
++#define CONFIG_WAVPACK_ENCODER 0
++#define CONFIG_WMAV1_ENCODER 0
++#define CONFIG_WMAV2_ENCODER 0
++#define CONFIG_PCM_ALAW_ENCODER 0
++#define CONFIG_PCM_BLURAY_ENCODER 0
++#define CONFIG_PCM_DVD_ENCODER 0
++#define CONFIG_PCM_F32BE_ENCODER 0
++#define CONFIG_PCM_F32LE_ENCODER 0
++#define CONFIG_PCM_F64BE_ENCODER 0
++#define CONFIG_PCM_F64LE_ENCODER 0
++#define CONFIG_PCM_MULAW_ENCODER 0
++#define CONFIG_PCM_S8_ENCODER 0
++#define CONFIG_PCM_S8_PLANAR_ENCODER 0
++#define CONFIG_PCM_S16BE_ENCODER 0
++#define CONFIG_PCM_S16BE_PLANAR_ENCODER 0
++#define CONFIG_PCM_S16LE_ENCODER 0
++#define CONFIG_PCM_S16LE_PLANAR_ENCODER 0
++#define CONFIG_PCM_S24BE_ENCODER 0
++#define CONFIG_PCM_S24DAUD_ENCODER 0
++#define CONFIG_PCM_S24LE_ENCODER 0
++#define CONFIG_PCM_S24LE_PLANAR_ENCODER 0
++#define CONFIG_PCM_S32BE_ENCODER 0
++#define CONFIG_PCM_S32LE_ENCODER 0
++#define CONFIG_PCM_S32LE_PLANAR_ENCODER 0
++#define CONFIG_PCM_S64BE_ENCODER 0
++#define CONFIG_PCM_S64LE_ENCODER 0
++#define CONFIG_PCM_U8_ENCODER 0
++#define CONFIG_PCM_U16BE_ENCODER 0
++#define CONFIG_PCM_U16LE_ENCODER 0
++#define CONFIG_PCM_U24BE_ENCODER 0
++#define CONFIG_PCM_U24LE_ENCODER 0
++#define CONFIG_PCM_U32BE_ENCODER 0
++#define CONFIG_PCM_U32LE_ENCODER 0
++#define CONFIG_PCM_VIDC_ENCODER 0
++#define CONFIG_ROQ_DPCM_ENCODER 0
++#define CONFIG_ADPCM_ADX_ENCODER 0
++#define CONFIG_ADPCM_ARGO_ENCODER 0
++#define CONFIG_ADPCM_G722_ENCODER 0
++#define CONFIG_ADPCM_G726_ENCODER 0
++#define CONFIG_ADPCM_G726LE_ENCODER 0
++#define CONFIG_ADPCM_IMA_AMV_ENCODER 0
++#define CONFIG_ADPCM_IMA_ALP_ENCODER 0
++#define CONFIG_ADPCM_IMA_APM_ENCODER 0
++#define CONFIG_ADPCM_IMA_QT_ENCODER 0
++#define CONFIG_ADPCM_IMA_SSI_ENCODER 0
++#define CONFIG_ADPCM_IMA_WAV_ENCODER 0
++#define CONFIG_ADPCM_IMA_WS_ENCODER 0
++#define CONFIG_ADPCM_MS_ENCODER 0
++#define CONFIG_ADPCM_SWF_ENCODER 0
++#define CONFIG_ADPCM_YAMAHA_ENCODER 0
++#define CONFIG_SSA_ENCODER 0
++#define CONFIG_ASS_ENCODER 0
++#define CONFIG_DVBSUB_ENCODER 0
++#define CONFIG_DVDSUB_ENCODER 0
++#define CONFIG_MOVTEXT_ENCODER 0
++#define CONFIG_SRT_ENCODER 0
++#define CONFIG_SUBRIP_ENCODER 0
++#define CONFIG_TEXT_ENCODER 0
++#define CONFIG_TTML_ENCODER 0
++#define CONFIG_WEBVTT_ENCODER 0
++#define CONFIG_XSUB_ENCODER 0
++#define CONFIG_AAC_AT_ENCODER 0
++#define CONFIG_ALAC_AT_ENCODER 0
++#define CONFIG_ILBC_AT_ENCODER 0
++#define CONFIG_PCM_ALAW_AT_ENCODER 0
++#define CONFIG_PCM_MULAW_AT_ENCODER 0
++#define CONFIG_LIBAOM_AV1_ENCODER 0
++#define CONFIG_LIBCODEC2_ENCODER 0
++#define CONFIG_LIBFDK_AAC_ENCODER 0
++#define CONFIG_LIBGSM_ENCODER 0
++#define CONFIG_LIBGSM_MS_ENCODER 0
++#define CONFIG_LIBILBC_ENCODER 0
++#define CONFIG_LIBMP3LAME_ENCODER 0
++#define CONFIG_LIBOPENCORE_AMRNB_ENCODER 0
++#define CONFIG_LIBOPENJPEG_ENCODER 0
++#define CONFIG_LIBOPUS_ENCODER 0
++#define CONFIG_LIBRAV1E_ENCODER 0
++#define CONFIG_LIBSHINE_ENCODER 0
++#define CONFIG_LIBSPEEX_ENCODER 0
++#define CONFIG_LIBSVTAV1_ENCODER 0
++#define CONFIG_LIBTHEORA_ENCODER 0
++#define CONFIG_LIBTWOLAME_ENCODER 0
++#define CONFIG_LIBVO_AMRWBENC_ENCODER 0
++#define CONFIG_LIBVORBIS_ENCODER 0
++#define CONFIG_LIBVPX_VP8_ENCODER 0
++#define CONFIG_LIBVPX_VP9_ENCODER 0
++#define CONFIG_LIBWEBP_ANIM_ENCODER 0
++#define CONFIG_LIBWEBP_ENCODER 0
++#define CONFIG_LIBX262_ENCODER 0
++#define CONFIG_LIBX264_ENCODER 0
++#define CONFIG_LIBX264RGB_ENCODER 0
++#define CONFIG_LIBX265_ENCODER 0
++#define CONFIG_LIBXAVS_ENCODER 0
++#define CONFIG_LIBXAVS2_ENCODER 0
++#define CONFIG_LIBXVID_ENCODER 0
++#define CONFIG_AAC_MF_ENCODER 0
++#define CONFIG_AC3_MF_ENCODER 0
++#define CONFIG_H263_V4L2M2M_ENCODER 0
++#define CONFIG_LIBOPENH264_ENCODER 0
++#define CONFIG_H264_AMF_ENCODER 0
++#define CONFIG_H264_MF_ENCODER 0
++#define CONFIG_H264_NVENC_ENCODER 0
++#define CONFIG_H264_OMX_ENCODER 0
++#define CONFIG_H264_QSV_ENCODER 0
++#define CONFIG_H264_V4L2M2M_ENCODER 0
++#define CONFIG_H264_VAAPI_ENCODER 0
++#define CONFIG_H264_VIDEOTOOLBOX_ENCODER 0
++#define CONFIG_HEVC_AMF_ENCODER 0
++#define CONFIG_HEVC_MF_ENCODER 0
++#define CONFIG_HEVC_NVENC_ENCODER 0
++#define CONFIG_HEVC_QSV_ENCODER 0
++#define CONFIG_HEVC_V4L2M2M_ENCODER 0
++#define CONFIG_HEVC_VAAPI_ENCODER 0
++#define CONFIG_HEVC_VIDEOTOOLBOX_ENCODER 0
++#define CONFIG_LIBKVAZAAR_ENCODER 0
++#define CONFIG_MJPEG_QSV_ENCODER 0
++#define CONFIG_MJPEG_VAAPI_ENCODER 0
++#define CONFIG_MP3_MF_ENCODER 0
++#define CONFIG_MPEG2_QSV_ENCODER 0
++#define CONFIG_MPEG2_VAAPI_ENCODER 0
++#define CONFIG_MPEG4_OMX_ENCODER 0
++#define CONFIG_MPEG4_V4L2M2M_ENCODER 0
++#define CONFIG_PRORES_VIDEOTOOLBOX_ENCODER 0
++#define CONFIG_VP8_V4L2M2M_ENCODER 0
++#define CONFIG_VP8_VAAPI_ENCODER 0
++#define CONFIG_VP9_VAAPI_ENCODER 0
++#define CONFIG_VP9_QSV_ENCODER 0
++#define CONFIG_AV1_D3D11VA_HWACCEL 0
++#define CONFIG_AV1_D3D11VA2_HWACCEL 0
++#define CONFIG_AV1_DXVA2_HWACCEL 0
++#define CONFIG_AV1_NVDEC_HWACCEL 0
++#define CONFIG_AV1_VAAPI_HWACCEL 0
++#define CONFIG_H263_VAAPI_HWACCEL 0
++#define CONFIG_H263_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_H264_D3D11VA_HWACCEL 0
++#define CONFIG_H264_D3D11VA2_HWACCEL 0
++#define CONFIG_H264_DXVA2_HWACCEL 0
++#define CONFIG_H264_NVDEC_HWACCEL 0
++#define CONFIG_H264_VAAPI_HWACCEL 0
++#define CONFIG_H264_VDPAU_HWACCEL 0
++#define CONFIG_H264_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_HEVC_D3D11VA_HWACCEL 0
++#define CONFIG_HEVC_D3D11VA2_HWACCEL 0
++#define CONFIG_HEVC_DXVA2_HWACCEL 0
++#define CONFIG_HEVC_NVDEC_HWACCEL 0
++#define CONFIG_HEVC_VAAPI_HWACCEL 0
++#define CONFIG_HEVC_VDPAU_HWACCEL 0
++#define CONFIG_HEVC_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_MJPEG_NVDEC_HWACCEL 0
++#define CONFIG_MJPEG_VAAPI_HWACCEL 0
++#define CONFIG_MPEG1_NVDEC_HWACCEL 0
++#define CONFIG_MPEG1_VDPAU_HWACCEL 0
++#define CONFIG_MPEG1_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_MPEG2_D3D11VA_HWACCEL 0
++#define CONFIG_MPEG2_D3D11VA2_HWACCEL 0
++#define CONFIG_MPEG2_NVDEC_HWACCEL 0
++#define CONFIG_MPEG2_DXVA2_HWACCEL 0
++#define CONFIG_MPEG2_VAAPI_HWACCEL 0
++#define CONFIG_MPEG2_VDPAU_HWACCEL 0
++#define CONFIG_MPEG2_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_MPEG4_NVDEC_HWACCEL 0
++#define CONFIG_MPEG4_VAAPI_HWACCEL 0
++#define CONFIG_MPEG4_VDPAU_HWACCEL 0
++#define CONFIG_MPEG4_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_PRORES_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_VC1_D3D11VA_HWACCEL 0
++#define CONFIG_VC1_D3D11VA2_HWACCEL 0
++#define CONFIG_VC1_DXVA2_HWACCEL 0
++#define CONFIG_VC1_NVDEC_HWACCEL 0
++#define CONFIG_VC1_VAAPI_HWACCEL 0
++#define CONFIG_VC1_VDPAU_HWACCEL 0
++#define CONFIG_VP8_NVDEC_HWACCEL 0
++#define CONFIG_VP8_VAAPI_HWACCEL 0
++#define CONFIG_VP9_D3D11VA_HWACCEL 0
++#define CONFIG_VP9_D3D11VA2_HWACCEL 0
++#define CONFIG_VP9_DXVA2_HWACCEL 0
++#define CONFIG_VP9_NVDEC_HWACCEL 0
++#define CONFIG_VP9_VAAPI_HWACCEL 0
++#define CONFIG_VP9_VDPAU_HWACCEL 0
++#define CONFIG_VP9_VIDEOTOOLBOX_HWACCEL 0
++#define CONFIG_WMV3_D3D11VA_HWACCEL 0
++#define CONFIG_WMV3_D3D11VA2_HWACCEL 0
++#define CONFIG_WMV3_DXVA2_HWACCEL 0
++#define CONFIG_WMV3_NVDEC_HWACCEL 0
++#define CONFIG_WMV3_VAAPI_HWACCEL 0
++#define CONFIG_WMV3_VDPAU_HWACCEL 0
++#define CONFIG_AAC_PARSER 1
++#define CONFIG_AAC_LATM_PARSER 0
++#define CONFIG_AC3_PARSER 0
++#define CONFIG_ADX_PARSER 0
++#define CONFIG_AMR_PARSER 0
++#define CONFIG_AV1_PARSER 0
++#define CONFIG_AVS2_PARSER 0
++#define CONFIG_AVS3_PARSER 0
++#define CONFIG_BMP_PARSER 0
++#define CONFIG_CAVSVIDEO_PARSER 0
++#define CONFIG_COOK_PARSER 0
++#define CONFIG_CRI_PARSER 0
++#define CONFIG_DCA_PARSER 0
++#define CONFIG_DIRAC_PARSER 0
++#define CONFIG_DNXHD_PARSER 0
++#define CONFIG_DOLBY_E_PARSER 0
++#define CONFIG_DPX_PARSER 0
++#define CONFIG_DVAUDIO_PARSER 0
++#define CONFIG_DVBSUB_PARSER 0
++#define CONFIG_DVDSUB_PARSER 0
++#define CONFIG_DVD_NAV_PARSER 0
++#define CONFIG_FLAC_PARSER 1
++#define CONFIG_G723_1_PARSER 0
++#define CONFIG_G729_PARSER 0
++#define CONFIG_GIF_PARSER 0
++#define CONFIG_GSM_PARSER 0
++#define CONFIG_H261_PARSER 0
++#define CONFIG_H263_PARSER 0
++#define CONFIG_H264_PARSER 1
++#define CONFIG_HEVC_PARSER 0
++#define CONFIG_IPU_PARSER 0
++#define CONFIG_JPEG2000_PARSER 0
++#define CONFIG_MJPEG_PARSER 0
++#define CONFIG_MLP_PARSER 0
++#define CONFIG_MPEG4VIDEO_PARSER 0
++#define CONFIG_MPEGAUDIO_PARSER 1
++#define CONFIG_MPEGVIDEO_PARSER 0
++#define CONFIG_OPUS_PARSER 1
++#define CONFIG_PNG_PARSER 0
++#define CONFIG_PNM_PARSER 0
++#define CONFIG_RV30_PARSER 0
++#define CONFIG_RV40_PARSER 0
++#define CONFIG_SBC_PARSER 0
++#define CONFIG_SIPR_PARSER 0
++#define CONFIG_TAK_PARSER 0
++#define CONFIG_VC1_PARSER 0
++#define CONFIG_VORBIS_PARSER 1
++#define CONFIG_VP3_PARSER 1
++#define CONFIG_VP8_PARSER 1
++#define CONFIG_VP9_PARSER 1
++#define CONFIG_WEBP_PARSER 0
++#define CONFIG_XBM_PARSER 0
++#define CONFIG_XMA_PARSER 0
++#define CONFIG_ALSA_INDEV 0
++#define CONFIG_ANDROID_CAMERA_INDEV 0
++#define CONFIG_AVFOUNDATION_INDEV 0
++#define CONFIG_BKTR_INDEV 0
++#define CONFIG_DECKLINK_INDEV 0
++#define CONFIG_DSHOW_INDEV 0
++#define CONFIG_FBDEV_INDEV 0
++#define CONFIG_GDIGRAB_INDEV 0
++#define CONFIG_IEC61883_INDEV 0
++#define CONFIG_JACK_INDEV 0
++#define CONFIG_KMSGRAB_INDEV 0
++#define CONFIG_LAVFI_INDEV 0
++#define CONFIG_OPENAL_INDEV 0
++#define CONFIG_OSS_INDEV 0
++#define CONFIG_PULSE_INDEV 0
++#define CONFIG_SNDIO_INDEV 0
++#define CONFIG_V4L2_INDEV 0
++#define CONFIG_VFWCAP_INDEV 0
++#define CONFIG_XCBGRAB_INDEV 0
++#define CONFIG_LIBCDIO_INDEV 0
++#define CONFIG_LIBDC1394_INDEV 0
++#define CONFIG_ALSA_OUTDEV 0
++#define CONFIG_AUDIOTOOLBOX_OUTDEV 0
++#define CONFIG_CACA_OUTDEV 0
++#define CONFIG_DECKLINK_OUTDEV 0
++#define CONFIG_FBDEV_OUTDEV 0
++#define CONFIG_OPENGL_OUTDEV 0
++#define CONFIG_OSS_OUTDEV 0
++#define CONFIG_PULSE_OUTDEV 0
++#define CONFIG_SDL2_OUTDEV 0
++#define CONFIG_SNDIO_OUTDEV 0
++#define CONFIG_V4L2_OUTDEV 0
++#define CONFIG_XV_OUTDEV 0
++#define CONFIG_ABENCH_FILTER 0
++#define CONFIG_ACOMPRESSOR_FILTER 0
++#define CONFIG_ACONTRAST_FILTER 0
++#define CONFIG_ACOPY_FILTER 0
++#define CONFIG_ACUE_FILTER 0
++#define CONFIG_ACROSSFADE_FILTER 0
++#define CONFIG_ACROSSOVER_FILTER 0
++#define CONFIG_ACRUSHER_FILTER 0
++#define CONFIG_ADECLICK_FILTER 0
++#define CONFIG_ADECLIP_FILTER 0
++#define CONFIG_ADECORRELATE_FILTER 0
++#define CONFIG_ADELAY_FILTER 0
++#define CONFIG_ADENORM_FILTER 0
++#define CONFIG_ADERIVATIVE_FILTER 0
++#define CONFIG_ADYNAMICEQUALIZER_FILTER 0
++#define CONFIG_ADYNAMICSMOOTH_FILTER 0
++#define CONFIG_AECHO_FILTER 0
++#define CONFIG_AEMPHASIS_FILTER 0
++#define CONFIG_AEVAL_FILTER 0
++#define CONFIG_AEXCITER_FILTER 0
++#define CONFIG_AFADE_FILTER 0
++#define CONFIG_AFFTDN_FILTER 0
++#define CONFIG_AFFTFILT_FILTER 0
++#define CONFIG_AFIR_FILTER 0
++#define CONFIG_AFORMAT_FILTER 0
++#define CONFIG_AFREQSHIFT_FILTER 0
++#define CONFIG_AFWTDN_FILTER 0
++#define CONFIG_AGATE_FILTER 0
++#define CONFIG_AIIR_FILTER 0
++#define CONFIG_AINTEGRAL_FILTER 0
++#define CONFIG_AINTERLEAVE_FILTER 0
++#define CONFIG_ALATENCY_FILTER 0
++#define CONFIG_ALIMITER_FILTER 0
++#define CONFIG_ALLPASS_FILTER 0
++#define CONFIG_ALOOP_FILTER 0
++#define CONFIG_AMERGE_FILTER 0
++#define CONFIG_AMETADATA_FILTER 0
++#define CONFIG_AMIX_FILTER 0
++#define CONFIG_AMULTIPLY_FILTER 0
++#define CONFIG_ANEQUALIZER_FILTER 0
++#define CONFIG_ANLMDN_FILTER 0
++#define CONFIG_ANLMF_FILTER 0
++#define CONFIG_ANLMS_FILTER 0
++#define CONFIG_ANULL_FILTER 0
++#define CONFIG_APAD_FILTER 0
++#define CONFIG_APERMS_FILTER 0
++#define CONFIG_APHASER_FILTER 0
++#define CONFIG_APHASESHIFT_FILTER 0
++#define CONFIG_APSYCLIP_FILTER 0
++#define CONFIG_APULSATOR_FILTER 0
++#define CONFIG_AREALTIME_FILTER 0
++#define CONFIG_ARESAMPLE_FILTER 0
++#define CONFIG_AREVERSE_FILTER 0
++#define CONFIG_ARNNDN_FILTER 0
++#define CONFIG_ASDR_FILTER 0
++#define CONFIG_ASEGMENT_FILTER 0
++#define CONFIG_ASELECT_FILTER 0
++#define CONFIG_ASENDCMD_FILTER 0
++#define CONFIG_ASETNSAMPLES_FILTER 0
++#define CONFIG_ASETPTS_FILTER 0
++#define CONFIG_ASETRATE_FILTER 0
++#define CONFIG_ASETTB_FILTER 0
++#define CONFIG_ASHOWINFO_FILTER 0
++#define CONFIG_ASIDEDATA_FILTER 0
++#define CONFIG_ASOFTCLIP_FILTER 0
++#define CONFIG_ASPECTRALSTATS_FILTER 0
++#define CONFIG_ASPLIT_FILTER 0
++#define CONFIG_ASR_FILTER 0
++#define CONFIG_ASTATS_FILTER 0
++#define CONFIG_ASTREAMSELECT_FILTER 0
++#define CONFIG_ASUBBOOST_FILTER 0
++#define CONFIG_ASUBCUT_FILTER 0
++#define CONFIG_ASUPERCUT_FILTER 0
++#define CONFIG_ASUPERPASS_FILTER 0
++#define CONFIG_ASUPERSTOP_FILTER 0
++#define CONFIG_ATEMPO_FILTER 0
++#define CONFIG_ATILT_FILTER 0
++#define CONFIG_ATRIM_FILTER 0
++#define CONFIG_AXCORRELATE_FILTER 0
++#define CONFIG_AZMQ_FILTER 0
++#define CONFIG_BANDPASS_FILTER 0
++#define CONFIG_BANDREJECT_FILTER 0
++#define CONFIG_BASS_FILTER 0
++#define CONFIG_BIQUAD_FILTER 0
++#define CONFIG_BS2B_FILTER 0
++#define CONFIG_CHANNELMAP_FILTER 0
++#define CONFIG_CHANNELSPLIT_FILTER 0
++#define CONFIG_CHORUS_FILTER 0
++#define CONFIG_COMPAND_FILTER 0
++#define CONFIG_COMPENSATIONDELAY_FILTER 0
++#define CONFIG_CROSSFEED_FILTER 0
++#define CONFIG_CRYSTALIZER_FILTER 0
++#define CONFIG_DCSHIFT_FILTER 0
++#define CONFIG_DEESSER_FILTER 0
++#define CONFIG_DIALOGUENHANCE_FILTER 0
++#define CONFIG_DRMETER_FILTER 0
++#define CONFIG_DYNAUDNORM_FILTER 0
++#define CONFIG_EARWAX_FILTER 0
++#define CONFIG_EBUR128_FILTER 0
++#define CONFIG_EQUALIZER_FILTER 0
++#define CONFIG_EXTRASTEREO_FILTER 0
++#define CONFIG_FIREQUALIZER_FILTER 0
++#define CONFIG_FLANGER_FILTER 0
++#define CONFIG_HAAS_FILTER 0
++#define CONFIG_HDCD_FILTER 0
++#define CONFIG_HEADPHONE_FILTER 0
++#define CONFIG_HIGHPASS_FILTER 0
++#define CONFIG_HIGHSHELF_FILTER 0
++#define CONFIG_JOIN_FILTER 0
++#define CONFIG_LADSPA_FILTER 0
++#define CONFIG_LOUDNORM_FILTER 0
++#define CONFIG_LOWPASS_FILTER 0
++#define CONFIG_LOWSHELF_FILTER 0
++#define CONFIG_LV2_FILTER 0
++#define CONFIG_MCOMPAND_FILTER 0
++#define CONFIG_PAN_FILTER 0
++#define CONFIG_REPLAYGAIN_FILTER 0
++#define CONFIG_RUBBERBAND_FILTER 0
++#define CONFIG_SIDECHAINCOMPRESS_FILTER 0
++#define CONFIG_SIDECHAINGATE_FILTER 0
++#define CONFIG_SILENCEDETECT_FILTER 0
++#define CONFIG_SILENCEREMOVE_FILTER 0
++#define CONFIG_SOFALIZER_FILTER 0
++#define CONFIG_SPEECHNORM_FILTER 0
++#define CONFIG_STEREOTOOLS_FILTER 0
++#define CONFIG_STEREOWIDEN_FILTER 0
++#define CONFIG_SUPEREQUALIZER_FILTER 0
++#define CONFIG_SURROUND_FILTER 0
++#define CONFIG_TREBLE_FILTER 0
++#define CONFIG_TREMOLO_FILTER 0
++#define CONFIG_VIBRATO_FILTER 0
++#define CONFIG_VOLUME_FILTER 0
++#define CONFIG_VOLUMEDETECT_FILTER 0
++#define CONFIG_AEVALSRC_FILTER 0
++#define CONFIG_AFIRSRC_FILTER 0
++#define CONFIG_ANOISESRC_FILTER 0
++#define CONFIG_ANULLSRC_FILTER 0
++#define CONFIG_FLITE_FILTER 0
++#define CONFIG_HILBERT_FILTER 0
++#define CONFIG_SINC_FILTER 0
++#define CONFIG_SINE_FILTER 0
++#define CONFIG_ANULLSINK_FILTER 0
++#define CONFIG_ADDROI_FILTER 0
++#define CONFIG_ALPHAEXTRACT_FILTER 0
++#define CONFIG_ALPHAMERGE_FILTER 0
++#define CONFIG_AMPLIFY_FILTER 0
++#define CONFIG_ASS_FILTER 0
++#define CONFIG_ATADENOISE_FILTER 0
++#define CONFIG_AVGBLUR_FILTER 0
++#define CONFIG_AVGBLUR_OPENCL_FILTER 0
++#define CONFIG_AVGBLUR_VULKAN_FILTER 0
++#define CONFIG_BBOX_FILTER 0
++#define CONFIG_BENCH_FILTER 0
++#define CONFIG_BILATERAL_FILTER 0
++#define CONFIG_BITPLANENOISE_FILTER 0
++#define CONFIG_BLACKDETECT_FILTER 0
++#define CONFIG_BLACKFRAME_FILTER 0
++#define CONFIG_BLEND_FILTER 0
++#define CONFIG_BLEND_VULKAN_FILTER 0
++#define CONFIG_BM3D_FILTER 0
++#define CONFIG_BOXBLUR_FILTER 0
++#define CONFIG_BOXBLUR_OPENCL_FILTER 0
++#define CONFIG_BWDIF_FILTER 0
++#define CONFIG_CAS_FILTER 0
++#define CONFIG_CHROMABER_VULKAN_FILTER 0
++#define CONFIG_CHROMAHOLD_FILTER 0
++#define CONFIG_CHROMAKEY_FILTER 0
++#define CONFIG_CHROMANR_FILTER 0
++#define CONFIG_CHROMASHIFT_FILTER 0
++#define CONFIG_CIESCOPE_FILTER 0
++#define CONFIG_CODECVIEW_FILTER 0
++#define CONFIG_COLORBALANCE_FILTER 0
++#define CONFIG_COLORCHANNELMIXER_FILTER 0
++#define CONFIG_COLORCONTRAST_FILTER 0
++#define CONFIG_COLORCORRECT_FILTER 0
++#define CONFIG_COLORIZE_FILTER 0
++#define CONFIG_COLORKEY_FILTER 0
++#define CONFIG_COLORKEY_OPENCL_FILTER 0
++#define CONFIG_COLORHOLD_FILTER 0
++#define CONFIG_COLORLEVELS_FILTER 0
++#define CONFIG_COLORMATRIX_FILTER 0
++#define CONFIG_COLORSPACE_FILTER 0
++#define CONFIG_COLORTEMPERATURE_FILTER 0
++#define CONFIG_CONVOLUTION_FILTER 0
++#define CONFIG_CONVOLUTION_OPENCL_FILTER 0
++#define CONFIG_CONVOLVE_FILTER 0
++#define CONFIG_COPY_FILTER 0
++#define CONFIG_COREIMAGE_FILTER 0
++#define CONFIG_COVER_RECT_FILTER 0
++#define CONFIG_CROP_FILTER 0
++#define CONFIG_CROPDETECT_FILTER 0
++#define CONFIG_CUE_FILTER 0
++#define CONFIG_CURVES_FILTER 0
++#define CONFIG_DATASCOPE_FILTER 0
++#define CONFIG_DBLUR_FILTER 0
++#define CONFIG_DCTDNOIZ_FILTER 0
++#define CONFIG_DEBAND_FILTER 0
++#define CONFIG_DEBLOCK_FILTER 0
++#define CONFIG_DECIMATE_FILTER 0
++#define CONFIG_DECONVOLVE_FILTER 0
++#define CONFIG_DEDOT_FILTER 0
++#define CONFIG_DEFLATE_FILTER 0
++#define CONFIG_DEFLICKER_FILTER 0
++#define CONFIG_DEINTERLACE_QSV_FILTER 0
++#define CONFIG_DEINTERLACE_VAAPI_FILTER 0
++#define CONFIG_DEJUDDER_FILTER 0
++#define CONFIG_DELOGO_FILTER 0
++#define CONFIG_DENOISE_VAAPI_FILTER 0
++#define CONFIG_DERAIN_FILTER 0
++#define CONFIG_DESHAKE_FILTER 0
++#define CONFIG_DESHAKE_OPENCL_FILTER 0
++#define CONFIG_DESPILL_FILTER 0
++#define CONFIG_DETELECINE_FILTER 0
++#define CONFIG_DILATION_FILTER 0
++#define CONFIG_DILATION_OPENCL_FILTER 0
++#define CONFIG_DISPLACE_FILTER 0
++#define CONFIG_DNN_CLASSIFY_FILTER 0
++#define CONFIG_DNN_DETECT_FILTER 0
++#define CONFIG_DNN_PROCESSING_FILTER 0
++#define CONFIG_DOUBLEWEAVE_FILTER 0
++#define CONFIG_DRAWBOX_FILTER 0
++#define CONFIG_DRAWGRAPH_FILTER 0
++#define CONFIG_DRAWGRID_FILTER 0
++#define CONFIG_DRAWTEXT_FILTER 0
++#define CONFIG_EDGEDETECT_FILTER 0
++#define CONFIG_ELBG_FILTER 0
++#define CONFIG_ENTROPY_FILTER 0
++#define CONFIG_EPX_FILTER 0
++#define CONFIG_EQ_FILTER 0
++#define CONFIG_EROSION_FILTER 0
++#define CONFIG_EROSION_OPENCL_FILTER 0
++#define CONFIG_ESTDIF_FILTER 0
++#define CONFIG_EXPOSURE_FILTER 0
++#define CONFIG_EXTRACTPLANES_FILTER 0
++#define CONFIG_FADE_FILTER 0
++#define CONFIG_FFTDNOIZ_FILTER 0
++#define CONFIG_FFTFILT_FILTER 0
++#define CONFIG_FIELD_FILTER 0
++#define CONFIG_FIELDHINT_FILTER 0
++#define CONFIG_FIELDMATCH_FILTER 0
++#define CONFIG_FIELDORDER_FILTER 0
++#define CONFIG_FILLBORDERS_FILTER 0
++#define CONFIG_FIND_RECT_FILTER 0
++#define CONFIG_FLIP_VULKAN_FILTER 0
++#define CONFIG_FLOODFILL_FILTER 0
++#define CONFIG_FORMAT_FILTER 0
++#define CONFIG_FPS_FILTER 0
++#define CONFIG_FRAMEPACK_FILTER 0
++#define CONFIG_FRAMERATE_FILTER 0
++#define CONFIG_FRAMESTEP_FILTER 0
++#define CONFIG_FREEZEDETECT_FILTER 0
++#define CONFIG_FREEZEFRAMES_FILTER 0
++#define CONFIG_FREI0R_FILTER 0
++#define CONFIG_FSPP_FILTER 0
++#define CONFIG_GBLUR_FILTER 0
++#define CONFIG_GBLUR_VULKAN_FILTER 0
++#define CONFIG_GEQ_FILTER 0
++#define CONFIG_GRADFUN_FILTER 0
++#define CONFIG_GRAPHMONITOR_FILTER 0
++#define CONFIG_GRAYWORLD_FILTER 0
++#define CONFIG_GREYEDGE_FILTER 0
++#define CONFIG_GUIDED_FILTER 0
++#define CONFIG_HALDCLUT_FILTER 0
++#define CONFIG_HFLIP_FILTER 0
++#define CONFIG_HFLIP_VULKAN_FILTER 0
++#define CONFIG_HISTEQ_FILTER 0
++#define CONFIG_HISTOGRAM_FILTER 0
++#define CONFIG_HQDN3D_FILTER 0
++#define CONFIG_HQX_FILTER 0
++#define CONFIG_HSTACK_FILTER 0
++#define CONFIG_HSVHOLD_FILTER 0
++#define CONFIG_HSVKEY_FILTER 0
++#define CONFIG_HUE_FILTER 0
++#define CONFIG_HUESATURATION_FILTER 0
++#define CONFIG_HWDOWNLOAD_FILTER 0
++#define CONFIG_HWMAP_FILTER 0
++#define CONFIG_HWUPLOAD_FILTER 0
++#define CONFIG_HWUPLOAD_CUDA_FILTER 0
++#define CONFIG_HYSTERESIS_FILTER 0
++#define CONFIG_IDENTITY_FILTER 0
++#define CONFIG_IDET_FILTER 0
++#define CONFIG_IL_FILTER 0
++#define CONFIG_INFLATE_FILTER 0
++#define CONFIG_INTERLACE_FILTER 0
++#define CONFIG_INTERLEAVE_FILTER 0
++#define CONFIG_KERNDEINT_FILTER 0
++#define CONFIG_KIRSCH_FILTER 0
++#define CONFIG_LAGFUN_FILTER 0
++#define CONFIG_LATENCY_FILTER 0
++#define CONFIG_LENSCORRECTION_FILTER 0
++#define CONFIG_LENSFUN_FILTER 0
++#define CONFIG_LIBPLACEBO_FILTER 0
++#define CONFIG_LIBVMAF_FILTER 0
++#define CONFIG_LIMITDIFF_FILTER 0
++#define CONFIG_LIMITER_FILTER 0
++#define CONFIG_LOOP_FILTER 0
++#define CONFIG_LUMAKEY_FILTER 0
++#define CONFIG_LUT_FILTER 0
++#define CONFIG_LUT1D_FILTER 0
++#define CONFIG_LUT2_FILTER 0
++#define CONFIG_LUT3D_FILTER 0
++#define CONFIG_LUTRGB_FILTER 0
++#define CONFIG_LUTYUV_FILTER 0
++#define CONFIG_MASKEDCLAMP_FILTER 0
++#define CONFIG_MASKEDMAX_FILTER 0
++#define CONFIG_MASKEDMERGE_FILTER 0
++#define CONFIG_MASKEDMIN_FILTER 0
++#define CONFIG_MASKEDTHRESHOLD_FILTER 0
++#define CONFIG_MASKFUN_FILTER 0
++#define CONFIG_MCDEINT_FILTER 0
++#define CONFIG_MEDIAN_FILTER 0
++#define CONFIG_MERGEPLANES_FILTER 0
++#define CONFIG_MESTIMATE_FILTER 0
++#define CONFIG_METADATA_FILTER 0
++#define CONFIG_MIDEQUALIZER_FILTER 0
++#define CONFIG_MINTERPOLATE_FILTER 0
++#define CONFIG_MIX_FILTER 0
++#define CONFIG_MONOCHROME_FILTER 0
++#define CONFIG_MORPHO_FILTER 0
++#define CONFIG_MPDECIMATE_FILTER 0
++#define CONFIG_MSAD_FILTER 0
++#define CONFIG_NEGATE_FILTER 0
++#define CONFIG_NLMEANS_FILTER 0
++#define CONFIG_NLMEANS_OPENCL_FILTER 0
++#define CONFIG_NNEDI_FILTER 0
++#define CONFIG_NOFORMAT_FILTER 0
++#define CONFIG_NOISE_FILTER 0
++#define CONFIG_NORMALIZE_FILTER 0
++#define CONFIG_NULL_FILTER 0
++#define CONFIG_OCR_FILTER 0
++#define CONFIG_OCV_FILTER 0
++#define CONFIG_OSCILLOSCOPE_FILTER 0
++#define CONFIG_OVERLAY_FILTER 0
++#define CONFIG_OVERLAY_OPENCL_FILTER 0
++#define CONFIG_OVERLAY_QSV_FILTER 0
++#define CONFIG_OVERLAY_VAAPI_FILTER 0
++#define CONFIG_OVERLAY_VULKAN_FILTER 0
++#define CONFIG_OVERLAY_CUDA_FILTER 0
++#define CONFIG_OWDENOISE_FILTER 0
++#define CONFIG_PAD_FILTER 0
++#define CONFIG_PAD_OPENCL_FILTER 0
++#define CONFIG_PALETTEGEN_FILTER 0
++#define CONFIG_PALETTEUSE_FILTER 0
++#define CONFIG_PERMS_FILTER 0
++#define CONFIG_PERSPECTIVE_FILTER 0
++#define CONFIG_PHASE_FILTER 0
++#define CONFIG_PHOTOSENSITIVITY_FILTER 0
++#define CONFIG_PIXDESCTEST_FILTER 0
++#define CONFIG_PIXSCOPE_FILTER 0
++#define CONFIG_PP_FILTER 0
++#define CONFIG_PP7_FILTER 0
++#define CONFIG_PREMULTIPLY_FILTER 0
++#define CONFIG_PREWITT_FILTER 0
++#define CONFIG_PREWITT_OPENCL_FILTER 0
++#define CONFIG_PROCAMP_VAAPI_FILTER 0
++#define CONFIG_PROGRAM_OPENCL_FILTER 0
++#define CONFIG_PSEUDOCOLOR_FILTER 0
++#define CONFIG_PSNR_FILTER 0
++#define CONFIG_PULLUP_FILTER 0
++#define CONFIG_QP_FILTER 0
++#define CONFIG_RANDOM_FILTER 0
++#define CONFIG_READEIA608_FILTER 0
++#define CONFIG_READVITC_FILTER 0
++#define CONFIG_REALTIME_FILTER 0
++#define CONFIG_REMAP_FILTER 0
++#define CONFIG_REMOVEGRAIN_FILTER 0
++#define CONFIG_REMOVELOGO_FILTER 0
++#define CONFIG_REPEATFIELDS_FILTER 0
++#define CONFIG_REVERSE_FILTER 0
++#define CONFIG_RGBASHIFT_FILTER 0
++#define CONFIG_ROBERTS_FILTER 0
++#define CONFIG_ROBERTS_OPENCL_FILTER 0
++#define CONFIG_ROTATE_FILTER 0
++#define CONFIG_SAB_FILTER 0
++#define CONFIG_SCALE_FILTER 0
++#define CONFIG_SCALE_CUDA_FILTER 0
++#define CONFIG_SCALE_NPP_FILTER 0
++#define CONFIG_SCALE_QSV_FILTER 0
++#define CONFIG_SCALE_VAAPI_FILTER 0
++#define CONFIG_SCALE_VULKAN_FILTER 0
++#define CONFIG_SCALE2REF_FILTER 0
++#define CONFIG_SCALE2REF_NPP_FILTER 0
++#define CONFIG_SCDET_FILTER 0
++#define CONFIG_SCHARR_FILTER 0
++#define CONFIG_SCROLL_FILTER 0
++#define CONFIG_SEGMENT_FILTER 0
++#define CONFIG_SELECT_FILTER 0
++#define CONFIG_SELECTIVECOLOR_FILTER 0
++#define CONFIG_SENDCMD_FILTER 0
++#define CONFIG_SEPARATEFIELDS_FILTER 0
++#define CONFIG_SETDAR_FILTER 0
++#define CONFIG_SETFIELD_FILTER 0
++#define CONFIG_SETPARAMS_FILTER 0
++#define CONFIG_SETPTS_FILTER 0
++#define CONFIG_SETRANGE_FILTER 0
++#define CONFIG_SETSAR_FILTER 0
++#define CONFIG_SETTB_FILTER 0
++#define CONFIG_SHARPEN_NPP_FILTER 0
++#define CONFIG_SHARPNESS_VAAPI_FILTER 0
++#define CONFIG_SHEAR_FILTER 0
++#define CONFIG_SHOWINFO_FILTER 0
++#define CONFIG_SHOWPALETTE_FILTER 0
++#define CONFIG_SHUFFLEFRAMES_FILTER 0
++#define CONFIG_SHUFFLEPIXELS_FILTER 0
++#define CONFIG_SHUFFLEPLANES_FILTER 0
++#define CONFIG_SIDEDATA_FILTER 0
++#define CONFIG_SIGNALSTATS_FILTER 0
++#define CONFIG_SIGNATURE_FILTER 0
++#define CONFIG_SMARTBLUR_FILTER 0
++#define CONFIG_SOBEL_FILTER 0
++#define CONFIG_SOBEL_OPENCL_FILTER 0
++#define CONFIG_SPLIT_FILTER 0
++#define CONFIG_SPP_FILTER 0
++#define CONFIG_SR_FILTER 0
++#define CONFIG_SSIM_FILTER 0
++#define CONFIG_STEREO3D_FILTER 0
++#define CONFIG_STREAMSELECT_FILTER 0
++#define CONFIG_SUBTITLES_FILTER 0
++#define CONFIG_SUPER2XSAI_FILTER 0
++#define CONFIG_SWAPRECT_FILTER 0
++#define CONFIG_SWAPUV_FILTER 0
++#define CONFIG_TBLEND_FILTER 0
++#define CONFIG_TELECINE_FILTER 0
++#define CONFIG_THISTOGRAM_FILTER 0
++#define CONFIG_THRESHOLD_FILTER 0
++#define CONFIG_THUMBNAIL_FILTER 0
++#define CONFIG_THUMBNAIL_CUDA_FILTER 0
++#define CONFIG_TILE_FILTER 0
++#define CONFIG_TINTERLACE_FILTER 0
++#define CONFIG_TLUT2_FILTER 0
++#define CONFIG_TMEDIAN_FILTER 0
++#define CONFIG_TMIDEQUALIZER_FILTER 0
++#define CONFIG_TMIX_FILTER 0
++#define CONFIG_TONEMAP_FILTER 0
++#define CONFIG_TONEMAP_OPENCL_FILTER 0
++#define CONFIG_TONEMAP_VAAPI_FILTER 0
++#define CONFIG_TPAD_FILTER 0
++#define CONFIG_TRANSPOSE_FILTER 0
++#define CONFIG_TRANSPOSE_NPP_FILTER 0
++#define CONFIG_TRANSPOSE_OPENCL_FILTER 0
++#define CONFIG_TRANSPOSE_VAAPI_FILTER 0
++#define CONFIG_TRANSPOSE_VULKAN_FILTER 0
++#define CONFIG_TRIM_FILTER 0
++#define CONFIG_UNPREMULTIPLY_FILTER 0
++#define CONFIG_UNSHARP_FILTER 0
++#define CONFIG_UNSHARP_OPENCL_FILTER 0
++#define CONFIG_UNTILE_FILTER 0
++#define CONFIG_USPP_FILTER 0
++#define CONFIG_V360_FILTER 0
++#define CONFIG_VAGUEDENOISER_FILTER 0
++#define CONFIG_VARBLUR_FILTER 0
++#define CONFIG_VECTORSCOPE_FILTER 0
++#define CONFIG_VFLIP_FILTER 0
++#define CONFIG_VFLIP_VULKAN_FILTER 0
++#define CONFIG_VFRDET_FILTER 0
++#define CONFIG_VIBRANCE_FILTER 0
++#define CONFIG_VIDSTABDETECT_FILTER 0
++#define CONFIG_VIDSTABTRANSFORM_FILTER 0
++#define CONFIG_VIF_FILTER 0
++#define CONFIG_VIGNETTE_FILTER 0
++#define CONFIG_VMAFMOTION_FILTER 0
++#define CONFIG_VPP_QSV_FILTER 0
++#define CONFIG_VSTACK_FILTER 0
++#define CONFIG_W3FDIF_FILTER 0
++#define CONFIG_WAVEFORM_FILTER 0
++#define CONFIG_WEAVE_FILTER 0
++#define CONFIG_XBR_FILTER 0
++#define CONFIG_XCORRELATE_FILTER 0
++#define CONFIG_XFADE_FILTER 0
++#define CONFIG_XFADE_OPENCL_FILTER 0
++#define CONFIG_XMEDIAN_FILTER 0
++#define CONFIG_XSTACK_FILTER 0
++#define CONFIG_YADIF_FILTER 0
++#define CONFIG_YADIF_CUDA_FILTER 0
++#define CONFIG_YADIF_VIDEOTOOLBOX_FILTER 0
++#define CONFIG_YAEPBLUR_FILTER 0
++#define CONFIG_ZMQ_FILTER 0
++#define CONFIG_ZOOMPAN_FILTER 0
++#define CONFIG_ZSCALE_FILTER 0
++#define CONFIG_ALLRGB_FILTER 0
++#define CONFIG_ALLYUV_FILTER 0
++#define CONFIG_CELLAUTO_FILTER 0
++#define CONFIG_COLOR_FILTER 0
++#define CONFIG_COLORSPECTRUM_FILTER 0
++#define CONFIG_COREIMAGESRC_FILTER 0
++#define CONFIG_FREI0R_SRC_FILTER 0
++#define CONFIG_GRADIENTS_FILTER 0
++#define CONFIG_HALDCLUTSRC_FILTER 0
++#define CONFIG_LIFE_FILTER 0
++#define CONFIG_MANDELBROT_FILTER 0
++#define CONFIG_MPTESTSRC_FILTER 0
++#define CONFIG_NULLSRC_FILTER 0
++#define CONFIG_OPENCLSRC_FILTER 0
++#define CONFIG_PAL75BARS_FILTER 0
++#define CONFIG_PAL100BARS_FILTER 0
++#define CONFIG_RGBTESTSRC_FILTER 0
++#define CONFIG_SIERPINSKI_FILTER 0
++#define CONFIG_SMPTEBARS_FILTER 0
++#define CONFIG_SMPTEHDBARS_FILTER 0
++#define CONFIG_TESTSRC_FILTER 0
++#define CONFIG_TESTSRC2_FILTER 0
++#define CONFIG_YUVTESTSRC_FILTER 0</