From 89f728c8d43c114646e2d848fc64c319cb118964 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 15 Apr 2020 14:10:26 -0400 Subject: [PATCH] more 81 changes --- ...mium-53-ffmpeg-no-deprecation-errors.patch | 22 ++++++++ ...-80.0.3987.87-missing-cstdint-header.patch | 12 +++++ chromium-81-gcc-constexpr.patch | 19 +++++++ chromium-81-gcc-noexcept.patch | 13 +++++ chromium-81-vaapi-r737459.patch | 52 +++++++++++++++++++ chromium-81-vaapi-r738595.patch | 31 +++++++++++ ...mium-81.0.4044.92-fix-vaapi-on-intel.patch | 31 ++++------- ...m-81.0.4044.92-missing-memory-header.patch | 11 ++++ chromium.spec | 45 ++++++++++++---- 9 files changed, 204 insertions(+), 32 deletions(-) create mode 100644 chromium-53-ffmpeg-no-deprecation-errors.patch create mode 100644 chromium-81-gcc-constexpr.patch create mode 100644 chromium-81-gcc-noexcept.patch create mode 100644 chromium-81-vaapi-r737459.patch create mode 100644 chromium-81-vaapi-r738595.patch rename fixvaapionintel.patch => chromium-81.0.4044.92-fix-vaapi-on-intel.patch (57%) create mode 100644 chromium-81.0.4044.92-missing-memory-header.patch diff --git a/chromium-53-ffmpeg-no-deprecation-errors.patch b/chromium-53-ffmpeg-no-deprecation-errors.patch new file mode 100644 index 00000000..d5e41e3e --- /dev/null +++ b/chromium-53-ffmpeg-no-deprecation-errors.patch @@ -0,0 +1,22 @@ +--- chromium-60.0.3112.40/build/linux/unbundle/ffmpeg.gn.ffmpeg-deprecation 2017-06-25 13:24:47.390218631 +0200 ++++ chromium-60.0.3112.40/build/linux/unbundle/ffmpeg.gn 2017-06-25 13:32:48.528583949 +0200 +@@ -19,6 +19,12 @@ + flags = [ "USE_SYSTEM_FFMPEG=true" ] + } + ++config("ffmpeg_deprecations") { ++ if (is_linux) { ++ cflags = [ "-Wno-error=deprecated-declarations" ] ++ } ++} ++ + shim_headers("ffmpeg_shim") { + root_path = "." + headers = [ +@@ -33,5 +39,5 @@ + ":ffmpeg_features", + ":ffmpeg_shim", + ] +- public_configs = [ ":system_ffmpeg" ] ++ public_configs = [ ":system_ffmpeg", ":ffmpeg_deprecations" ] + } diff --git a/chromium-80.0.3987.87-missing-cstdint-header.patch b/chromium-80.0.3987.87-missing-cstdint-header.patch index e61042f4..755bff52 100644 --- a/chromium-80.0.3987.87-missing-cstdint-header.patch +++ b/chromium-80.0.3987.87-missing-cstdint-header.patch @@ -53,3 +53,15 @@ diff -up chromium-80.0.3987.106/third_party/webrtc/modules/include/module_common #include #include "absl/types/optional.h" +diff -up chromium-81.0.4044.92/ui/gfx/linux/drm_util_linux.h.missing-cstdint chromium-81.0.4044.92/ui/gfx/linux/drm_util_linux.h +--- chromium-81.0.4044.92/ui/gfx/linux/drm_util_linux.h.missing-cstdint 2020-04-13 15:33:24.879106867 -0400 ++++ chromium-81.0.4044.92/ui/gfx/linux/drm_util_linux.h 2020-04-13 15:33:47.453689695 -0400 +@@ -7,6 +7,8 @@ + + #include "ui/gfx/buffer_types.h" + ++#include ++ + namespace ui { + + int GetFourCCFormatFromBufferFormat(gfx::BufferFormat format); diff --git a/chromium-81-gcc-constexpr.patch b/chromium-81-gcc-constexpr.patch new file mode 100644 index 00000000..a9c1507c --- /dev/null +++ b/chromium-81-gcc-constexpr.patch @@ -0,0 +1,19 @@ +diff --git a/ui/views/layout/layout_types.h b/ui/views/layout/layout_types.h +index 8f9dbf4..ba118b9 100644 +--- a/ui/views/layout/layout_types.h ++++ b/ui/views/layout/layout_types.h +@@ -45,12 +45,12 @@ class VIEWS_EXPORT SizeBounds { + ~SizeBounds() = default; + + constexpr const base::Optional& width() const { return width_; } +- constexpr void set_width(base::Optional width) { ++ inline void set_width(base::Optional width) { + width_ = std::move(width); + } + + constexpr const base::Optional& height() const { return height_; } +- constexpr void set_height(base::Optional height) { ++ inline void set_height(base::Optional height) { + height_ = std::move(height); + } + diff --git a/chromium-81-gcc-noexcept.patch b/chromium-81-gcc-noexcept.patch new file mode 100644 index 00000000..a6fc8aff --- /dev/null +++ b/chromium-81-gcc-noexcept.patch @@ -0,0 +1,13 @@ +diff --git a/components/paint_preview/browser/paint_preview_client.cc b/components/paint_preview/browser/paint_preview_client.cc +index 38ab6be..dccf07f 100644 +--- a/components/paint_preview/browser/paint_preview_client.cc ++++ b/components/paint_preview/browser/paint_preview_client.cc +@@ -78,7 +78,7 @@ PaintPreviewClient::PaintPreviewData::PaintPreviewData() = default; + PaintPreviewClient::PaintPreviewData::~PaintPreviewData() = default; + + PaintPreviewClient::PaintPreviewData& PaintPreviewClient::PaintPreviewData:: +-operator=(PaintPreviewData&& rhs) noexcept = default; ++operator=(PaintPreviewData&& rhs) = default; + PaintPreviewClient::PaintPreviewData::PaintPreviewData( + PaintPreviewData&& other) noexcept = default; + diff --git a/chromium-81-vaapi-r737459.patch b/chromium-81-vaapi-r737459.patch new file mode 100644 index 00000000..cb10f3ed --- /dev/null +++ b/chromium-81-vaapi-r737459.patch @@ -0,0 +1,52 @@ +From 98e343ab369e4262511b5fce547728e3e5eefba8 Mon Sep 17 00:00:00 2001 +From: Hidehiko Abe +Date: Fri, 31 Jan 2020 21:27:40 +0000 +Subject: [PATCH] Use same condition for field declaration and its use. + +cros_supported_configs_ is defined iff OS_CHROMEOS is defined. +However, it is used iff USE_CHROMEOS_MEDIA_ACCELERATION regardless of +OS_CHROMEOS. +This CL aligns the conditions. + +BUG=1047719 +TEST=Build locally. + +Change-Id: I08fe8532c1778ff8c77c7a9d9cdd96ff2a83272f +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2030924 +Reviewed-by: Xiaohan Wang +Reviewed-by: Miguel Casas +Commit-Queue: Miguel Casas +Cr-Commit-Position: refs/heads/master@{#737459} +--- + +--- a/media/mojo/services/gpu_mojo_media_client.cc ++++ b/media/mojo/services/gpu_mojo_media_client.cc +@@ -157,7 +157,7 @@ GpuMojoMediaClient::GetSupportedVideoDec + supported_config_map[VideoDecoderImplementation::kAlternate] = + *d3d11_supported_configs_; + +-#elif BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) ++#elif defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) + if (base::FeatureList::IsEnabled(kChromeosVideoDecoder)) { + if (!cros_supported_configs_) { + cros_supported_configs_ = +--- a/media/mojo/services/gpu_mojo_media_client.h ++++ b/media/mojo/services/gpu_mojo_media_client.h +@@ -74,16 +74,13 @@ class GpuMojoMediaClient : public MojoMe + #if defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) + // Indirectly owned by GpuChildThread. + gpu::GpuMemoryBufferFactory* const gpu_memory_buffer_factory_; ++ base::Optional cros_supported_configs_; + #endif // defined(OS_CHROMEOS) && BUILDFLAG(USE_CHROMEOS_MEDIA_ACCELERATION) + CdmProxyFactoryCB cdm_proxy_factory_cb_; + #if defined(OS_WIN) + base::Optional d3d11_supported_configs_; + #endif // defined(OS_WIN) + +-#if defined(OS_CHROMEOS) +- base::Optional cros_supported_configs_; +-#endif // defined(OS_CHROMEOS) +- + DISALLOW_COPY_AND_ASSIGN(GpuMojoMediaClient); + }; + diff --git a/chromium-81-vaapi-r738595.patch b/chromium-81-vaapi-r738595.patch new file mode 100644 index 00000000..03822dac --- /dev/null +++ b/chromium-81-vaapi-r738595.patch @@ -0,0 +1,31 @@ +From 5b2ff215473e0526b5b24aeff4ad90d369b21c75 Mon Sep 17 00:00:00 2001 +From: Julien Isorce +Date: Wed, 05 Feb 2020 17:59:59 +0000 +Subject: [PATCH] Fix vaapi with GLX + +The signature of ui's gl::GLImageGLX has changed a little bit +since "mplement GpuMemoryBuffers for EGL and GLX": + https://chromium-review.googlesource.com/c/chromium/src/+/1984712 + +Bug: 1031269 +Test: build with use_vaapi=true and run with --use-gl=desktop, see +Change-Id: I80b07294b9abdfa8233aaf79f7d9ec4c58117090 +https: //chromium.googlesource.com/chromium/src.git/+/refs/heads/master/docs/gpu/vaapi.md#vaapi-on-linux +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2036494 +Reviewed-by: Thomas Anderson +Reviewed-by: Miguel Casas +Commit-Queue: Julien Isorce +Cr-Commit-Position: refs/heads/master@{#738595} +--- + +--- a/media/gpu/vaapi/vaapi_picture_tfp.cc ++++ b/media/gpu/vaapi/vaapi_picture_tfp.cc +@@ -57,7 +57,7 @@ bool VaapiTFPPicture::Initialize() { + if (make_context_current_cb_ && !make_context_current_cb_.Run()) + return false; + +- glx_image_ = new gl::GLImageGLX(size_, GL_RGB); ++ glx_image_ = new gl::GLImageGLX(size_, gfx::BufferFormat::BGRX_8888); + if (!glx_image_->Initialize(x_pixmap_)) { + // x_pixmap_ will be freed in the destructor. + DLOG(ERROR) << "Failed creating a GLX Pixmap for TFP"; diff --git a/fixvaapionintel.patch b/chromium-81.0.4044.92-fix-vaapi-on-intel.patch similarity index 57% rename from fixvaapionintel.patch rename to chromium-81.0.4044.92-fix-vaapi-on-intel.patch index a94886ac..8c9814ec 100644 --- a/fixvaapionintel.patch +++ b/chromium-81.0.4044.92-fix-vaapi-on-intel.patch @@ -1,17 +1,7 @@ -From 9ff06536caf7ea51aad9fd2bb649c858eaf7ee84 Mon Sep 17 00:00:00 2001 -From: Akarshan Biswas -Date: Sat, 26 Oct 2019 10:06:30 +0530 -Subject: [PATCH] Move offending function to chromeos only - ---- - media/gpu/vaapi/vaapi_video_decode_accelerator.cc | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -index f04b60f58..3e7865503 100644 ---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -@@ -63,6 +63,7 @@ void ReportToUMA(VAVDADecoderFailure failure) { +diff -up chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +--- chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc.vaapi-intel-fix 2020-04-03 00:11:34.000000000 -0400 ++++ chromium-81.0.4044.92/media/gpu/vaapi/vaapi_video_decode_accelerator.cc 2020-04-13 15:42:35.830413667 -0400 +@@ -63,6 +63,7 @@ void ReportToUMA(VAVDADecoderFailure fai VAVDA_DECODER_FAILURES_MAX + 1); } @@ -23,11 +13,11 @@ index f04b60f58..3e7865503 100644 cpuid.model() >= kGeminiLakeModelId; return is_geminilake_or_later; } -+#endif - - } // namespace ++#endif -@@ -1091,6 +1093,8 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { + // Returns the size of a rectangle whose upper left corner is at the origin (0, + // 0) and whose bottom right corner is the same as that of |rect|. This is +@@ -1204,6 +1206,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) return BufferAllocationMode::kNormal; @@ -36,7 +26,7 @@ index f04b60f58..3e7865503 100644 // On Gemini Lake, Kaby Lake and later we can pass to libva the client's // PictureBuffers to decode onto, which skips the use of the Vpp unit and its // associated format reconciliation copy, avoiding all internal buffer -@@ -1107,6 +1111,7 @@ VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { +@@ -1220,6 +1224,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe num_extra_pics_ = 3; return BufferAllocationMode::kNone; } @@ -44,6 +34,3 @@ index f04b60f58..3e7865503 100644 // If we're here, we have to use the Vpp unit and allocate buffers for // |decoder_|; usually we'd have to allocate the |decoder_|s --- -2.21.0 - diff --git a/chromium-81.0.4044.92-missing-memory-header.patch b/chromium-81.0.4044.92-missing-memory-header.patch new file mode 100644 index 00000000..778c026c --- /dev/null +++ b/chromium-81.0.4044.92-missing-memory-header.patch @@ -0,0 +1,11 @@ +diff -up chromium-81.0.4044.92/base/test/icu_test_util.h.missing-memory chromium-81.0.4044.92/base/test/icu_test_util.h +--- chromium-81.0.4044.92/base/test/icu_test_util.h.missing-memory 2020-04-15 07:52:11.239815139 -0400 ++++ chromium-81.0.4044.92/base/test/icu_test_util.h 2020-04-15 07:52:19.982632306 -0400 +@@ -5,6 +5,7 @@ + #ifndef BASE_TEST_ICU_TEST_UTIL_H_ + #define BASE_TEST_ICU_TEST_UTIL_H_ + ++#include + #include + + #include "base/macros.h" diff --git a/chromium.spec b/chromium.spec index 79470028..57c50803 100644 --- a/chromium.spec +++ b/chromium.spec @@ -20,9 +20,8 @@ # We'd like to always have this on. %global use_vaapi 1 -# If we build with shared on, then chrome-remote-desktop depends on chromium libs. -# If we build with shared off, then users cannot swap out libffmpeg (and i686 gets a lot harder to build) -%global shared 1 +# Since no one liked replacing just the media components, we do not build shared anymore. +%global shared 0 # NEVER EVER EVER turn this on in official builds %global freeworld 0 @@ -67,6 +66,10 @@ # for RHEL7, append libfontconfig to the end # make sure there is not a trailing | at the end of the list +# We don't really need to do this unless we're building shared. + +%if 0%{?shared} + %global __provides_exclude_from %{chromium_path}/.*\\.so|%{chromium_path}/lib/.*\\.so|%{chromium_path}/lib/.*\\.so.* %if 0%{?rhel} == 7 %global privlibs libaccessibility|libandroid_mojo_bindings_shared|libanimation|libapdu|libaura|libaura_extra|libauthenticator_test_mojo_bindings_shared|libbase|libbase_i18n|libbindings|libbindings_base|libblink_common|libblink_controller|libblink_core|libblink_embedded_frame_sink_mojo_bindings_shared|libblink_features|libblink_modules|libblink_mojom_broadcastchannel_bindings_shared|libblink_platform|libbluetooth|libboringssl|libbrowser_ui_views|libcaptive_portal|libcapture_base|libcapture_lib|libcbor|libcc|libcc_animation|libcc_base|libcc_debug|libcc_ipc|libcc_mojo_embedder|libcc_paint|libcertificate_matching|libcert_verifier|libchrome_features|libchromium_sqlite3|libclearkeycdm|libclient|libcloud_policy_proto_generated_compile|libcodec|libcolor_space|libcolor_utils|libcommon|libcompositor|libcontent|libcontent_common_mojo_bindings_shared|libcontent_public_common_mojo_bindings_shared|libcontent_service_cpp|libcontent_service_mojom|libcontent_service_mojom_shared|libcontent_settings_features|libcrash_key_lib|libcrcrypto|libcrdtp|libdbus|libdevice_base|libdevice_event_log|libdevice_features|libdevice_gamepad|libdevices|libdevice_vr|libdevice_vr_mojo_bindings|libdevice_vr_mojo_bindings_blink|libdevice_vr_mojo_bindings_shared|libdevice_vr_test_mojo_bindings|libdevice_vr_test_mojo_bindings_blink|libdevice_vr_test_mojo_bindings_shared|libdiscardable_memory_client|libdiscardable_memory_common|libdiscardable_memory_service|libdisplay|libdisplay_types|libdisplay_util|libdomain_reliability|libdom_storage_mojom|libdom_storage_mojom_shared|libEGL|libEGL|libembedder|libembedder_switches|libevents|libevents_base|libevents_devices_x11|libevents_ozone_layout|libevents_x|libextras|libffmpeg|libfido|libfingerprint|libfreetype_harfbuzz|libgamepad_mojom|libgamepad_mojom_blink|libgamepad_mojom_shared|libgamepad_shared_typemap_traits|libgcm|libgeometry|libgeometry_skia|libgesture_detection|libgfx|libgfx_ipc|libgfx_ipc_buffer_types|libgfx_ipc_color|libgfx_ipc_geometry|libgfx_ipc_skia|libgfx_switches|libgfx_x11|libgin|libgles2|libgles2_implementation|libgles2_utils|libGLESv2|libGLESv2|libgl_init|libgl_in_process_context|libgl_wrapper|libgpu|libgpu_ipc_service|libgtkui|libheadless_non_renderer|libhost|libicui18n|libicuuc|libinterfaces_shared|libipc|libipc_mojom|libipc_mojom_shared|libkeycodes_x11|libkeyed_service_content|libkeyed_service_core|liblearning_common|liblearning_impl|libleveldatabase|libleveldb_proto|libmanager|libmedia|libmedia_blink|libmedia_gpu|libmedia_learning_mojo_impl|libmedia_message_center|libmedia_mojo_services|libmedia_session_base_cpp|libmedia_session_cpp|libmedia_webrtc|libmemory_instrumentation|libmenu|libmessage_center|libmessage_support|libmetrics_cpp|libmidi|libmirroring_service|libmojo_base_lib|libmojo_base_mojom|libmojo_base_mojom_blink|libmojo_base_mojom_shared|libmojo_base_shared_typemap_traits|libmojo_core_embedder|libmojo_core_embedder_internal|libmojo_core_ports|libmojo_cpp_platform|libmojom_core_shared|libmojom_mhtml_load_result_shared|libmojom_modules_shared|libmojo_mojom_bindings|libmojo_mojom_bindings_shared|libmojom_platform_shared|libmojo_public_system|libmojo_public_system_cpp|libnative_theme|libnet|libnetwork_cpp|libnetwork_cpp_base|libnetwork_service|libnetwork_session_configurator|libonc|libos_crypt|libparsers|libpdfium|libperfetto|libperformace_manager_public_mojom|libperformace_manager_public_mojom_blink|libperformace_manager_public_mojom_shared|libplatform|libplatform_window|libplatform_window_common|libplatform_window_handler_libs|libpolicy_component|libpolicy_proto|libppapi_host|libppapi_proxy|libppapi_shared|libprefs|libprinting|libproperties|libprotobuf_lite|libproxy_config|libpublic|librange|libraster|libresource_coordinator_public_mojom|libresource_coordinator_public_mojom_blink|libresource_coordinator_public_mojom_shared|libsandbox|libsandbox_services|libscheduling_metrics|libseccomp_bpf|libsecurity_state_features|libservice|libservice_manager_cpp|libservice_manager_cpp_types|libservice_manager_mojom|libservice_manager_mojom_blink|libservice_manager_mojom_constants|libservice_manager_mojom_constants_blink|libservice_manager_mojom_constants_shared|libservice_manager_mojom_shared|libservice_manager_mojom_traits|libservice_provider|libsessions|libshared_memory_support|libshared_with_blink|libshell_dialogs|libskia|libskia_shared_typemap_traits|libsnapshot|libsql|libstartup_tracing|libstorage_browser|libstorage_common|libstorage_service_public|libstub_window|libsuid_sandbox_client|libsurface|libsystem_media_controls|libtab_count_metrics|libthread_linux|libtracing|libtracing_cpp|libtracing_mojom|libtracing_mojom_shared|libui_accessibility_ax_mojom|libui_accessibility_ax_mojom_blink|libui_accessibility_ax_mojom_shared|libui_base|libui_base_clipboard|libui_base_clipboard_types|libui_base_features|libui_base_idle|libui_base_ime|libui_base_ime_init|libui_base_ime_linux|libui_base_ime_types|libui_base_x|libui_data_pack|libui_devtools|libui_message_center_cpp|libui_touch_selection|liburl|liburl_ipc|liburl_matcher|libusb_shared|libuser_manager|libuser_prefs|libv8|libv8_libbase|libv8_libplatform|libviews|libviz_common|libviz_resource_format_utils|libviz_vulkan_context_provider|libVkICD_mock_icd|libvk_swiftshader|libvr_base|libvr_common|libvulkan_info|libvulkan_init|libvulkan_wrapper|libvulkan_x11|libvulkan_ycbcr_info|libweb_bluetooth_mojo_bindings_shared|libwebdata_common|libweb_dialogs|libweb_feature_mojo_bindings_mojom|libweb_feature_mojo_bindings_mojom_blink|libweb_feature_mojo_bindings_mojom_shared|libwebgpu|libweb_modal|libwebrtc_component|libwebview|libwm|libwm_public|libwtf|libwtf_support|libx11_events_platform|libx11_window|libzygote|libfontconfig @@ -75,6 +78,8 @@ %endif %global __requires_exclude ^(%{privlibs})\\.so* +%endif + # AddressSanitizer mode # https://www.chromium.org/developers/testing/addresssanitizer %global asan 0 @@ -236,7 +241,15 @@ Patch72: chromium-80.0.3987.87-missing-cstdint-header.patch Patch73: chromium-80.0.3987.106-missing-cstddef-header.patch # Missing (thanks c++17) Patch75: chromium-80.0.3987.106-missing-cstring-header.patch - +# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-81-gcc-constexpr.patch +Patch76: chromium-81-gcc-constexpr.patch +# prepare for using system ffmpeg (clean) +# http://svnweb.mageia.org/packages/cauldron/chromium-browser-stable/current/SOURCES/chromium-53-ffmpeg-no-deprecation-errors.patch?view=markup +Patch77: chromium-53-ffmpeg-no-deprecation-errors.patch +# https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/files/chromium-81-gcc-noexcept.patch +Patch78: chromium-81-gcc-noexcept.patch +# ../../base/test/icu_test_util.h:12:1: note: 'std::unique_ptr' is defined in header ''; did you forget to '#include '? +Patch79: chromium-81.0.4044.92-missing-memory-header.patch # Use lstdc++ on EPEL7 only Patch101: chromium-75.0.3770.100-epel7-stdc++.patch @@ -247,8 +260,10 @@ Patch102: chromium-80.0.3987.132-el7-noexcept.patch # NOTE: This patch will never land upstream Patch202: enable-vaapi.patch Patch203: chromium-80.0.3987.122-vaapi-i686-fpermissive.patch -# Fix compatibility with VA-API library (libva) version 1 -Patch205: fixvaapionintel.patch +Patch205: chromium-81.0.4044.92-fix-vaapi-on-intel.patch +# upstream backports to fix vaapi, thanks rpmfusion +Patch206: chromium-81-vaapi-r737459.patch +Patch207: chromium-81-vaapi-r738595.patch # Apply these patches to work around EPEL8 issues Patch300: chromium-76.0.3809.132-rhel8-force-disable-use_gnome_keyring.patch @@ -301,7 +316,6 @@ BuildRequires: desktop-file-utils BuildRequires: expat-devel BuildRequires: flex BuildRequires: fontconfig-devel -BuildRequires: GConf2-devel BuildRequires: glib2-devel BuildRequires: glibc-devel BuildRequires: gperf @@ -324,6 +338,7 @@ BuildRequires: libusb-devel BuildRequires: libXdamage-devel BuildRequires: libXScrnSaver-devel BuildRequires: libXtst-devel +BuildRequires: mesa-libgbm-devel # Old Fedora (before 30) uses the 1.2 minizip by default. # Newer Fedora needs to use the compat package %if 0%{?fedora} >= 30 @@ -797,7 +812,10 @@ udev. %patch72 -p1 -b .missing-cstdint %patch73 -p1 -b .missing-cstddef %patch75 -p1 -b .missing-cstring - +%patch76 -p1 -b .gcc-constexpr +%patch77 -p1 -b .ffmpeg-deprecations +%patch78 -p1 -b .gcc-noexcept +%patch79 -p1 -b .missing-memory # Fedora branded user agent %if 0%{?fedora} @@ -817,6 +835,8 @@ udev. %patch203 -p1 -b .i686permissive %endif %patch205 -p1 -b .vaapi-intel-fix +%patch206 -p1 -b .r737459 +%patch207 -p1 -b .r738595 %endif %if 0%{?rhel} == 8 @@ -993,6 +1013,7 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/angle/src/third_party/compiler' \ 'third_party/angle/src/third_party/libXNVCtrl' \ 'third_party/angle/src/third_party/trace_event' \ + 'third_party/angle/src/third_party/volk' \ 'third_party/angle/third_party/glslang' \ 'third_party/angle/third_party/spirv-headers' \ 'third_party/angle/third_party/spirv-tools' \ @@ -1038,6 +1059,9 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/devscripts' \ 'third_party/devtools-frontend' \ 'third_party/devtools-frontend/src/third_party/axe-core' \ + 'third_party/devtools-frontend/src/third_party/typescript' \ + 'third_party/devtools-frontend/src/front_end/third_party/fabricjs' \ + 'third_party/devtools-frontend/src/front_end/third_party/wasmparser' \ 'third_party/dom_distiller_js' \ 'third_party/emoji-segmenter' \ 'third_party/expat' \ @@ -1132,7 +1156,6 @@ build/linux/unbundle/remove_bundled_libraries.py \ %endif 'third_party/rnnoise' \ 'third_party/s2cellid' \ - 'third_party/sfntly' \ 'third_party/simplejson' \ 'third_party/sinonjs' \ 'third_party/skia' \ @@ -1169,11 +1192,12 @@ build/linux/unbundle/remove_bundled_libraries.py \ 'third_party/webrtc/rtc_base/third_party/sigslot' \ 'third_party/widevine' \ 'third_party/woff2' \ + 'third_party/wuffs' \ 'third_party/xdg-utils' \ 'third_party/yasm' \ 'third_party/zlib' \ 'third_party/zlib/google' \ - 'tools/gn/base/third_party/icu' \ + 'tools/gn/src/base/third_party/icu' \ 'tools/grit/third_party/six' \ 'url/third_party/mozilla' \ 'v8/src/third_party/siphash' \ @@ -1732,6 +1756,7 @@ getent group chrome-remote-desktop >/dev/null || groupadd -r chrome-remote-deskt - squelch the selinux output in the post scriptlet - add Provides/Obsoletes in case we're build with shared set to 0 - add ulimit -n 4096 (needed for static builds, probably not harmful for shared builds either) +- do static build * Sat Apr 4 2020 Tom Callaway - 80.0.3987.163-1 - update to 80.0.3987.163