commit 6f4d1d03d516955afc260a141dd4dcbaabd0b876 Author: qvint <dotqvint(a)gmail.com&gt; Date: Fri Nov 27 14:11:00 2020 +0300 Update to 87.0.4280.66 chromium-86-cookiemonster-r803260.patch | 72 ----------------- chromium-86-vaapi-r807550.patch | 133 -------------------------------- chromium-86-vaapi-r811480.patch | 37 --------- chromium-86-xproto-r819538.patch | 31 -------- chromium-86-xproto-r819650.patch | 35 --------- chromium-87-includes.patch | 10 +++ chromium-fix-vaapi-on-intel.patch | 4 +- chromium-freeworld.spec | 50 +++++------- chromium-hw-accel-mjpeg.patch | 6 +- chromium-md5-based-build-id.patch | 2 +- sources | 4 +- 11 files changed, 36 insertions(+), 348 deletions(-) --- diff --git a/chromium-87-includes.patch b/chromium-87-includes.patch new file mode 100644 index 0000000..1ddec7b --- /dev/null +++ b/chromium-87-includes.patch @@ -0,0 +1,10 @@ +--- a/components/autofill/core/browser/pattern_provider/pattern_provider.h ++++ b/components/autofill/core/browser/pattern_provider/pattern_provider.h +@@ -6,6 +6,7 @@ + #define COMPONENTS_AUTOFILL_CORE_BROWSER_PATTERN_PROVIDER_PATTERN_PROVIDER_H_ + + #include <string> ++#include <vector> + + #include "base/macros.h" + #include "base/no_destructor.h" diff --git a/chromium-fix-vaapi-on-intel.patch b/chromium-fix-vaapi-on-intel.patch index c559f56..d68bd60 100644 --- a/chromium-fix-vaapi-on-intel.patch +++ b/chromium-fix-vaapi-on-intel.patch @@ -21,7 +21,7 @@ Subject: [PATCH] Move offending function to chromeos only } // namespace -@@ -1214,6 +1216,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1223,6 +1225,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) return BufferAllocationMode::kNormal; @@ -30,7 +30,7 @@ Subject: [PATCH] Move offending function to chromeos only // 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 -@@ -1229,6 +1233,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1238,6 +1242,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe num_extra_pics_ = 3; return BufferAllocationMode::kNone; } diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index 1bd9580..5d88017 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -27,13 +27,10 @@ %if 0%{?fedora} >= 33 %global system_libicu 1 %endif -#------------------------------------------------------ -# Enable building with ozone support -%global ozone 0 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 86.0.4240.111 -Release: 2%{?dist} +Version: 87.0.4280.66 +Release: 1%{?dist} Summary: Chromium built with all freeworld codecs and VA-API support License: BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: https://www.chromium.org/Home @@ -57,7 +54,7 @@ Source0: chromium-%{version}-clean.tar.xz %endif # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-86-patchset-7 +%global patchset_revision chromium-87-patchset-9 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -93,12 +90,10 @@ BuildRequires: pkgconfig(libffi) #for vaapi BuildRequires: pkgconfig(libva) BuildRequires: pkgconfig(gbm) -%if %{ozone} BuildRequires: pkgconfig(wayland-client) BuildRequires: pkgconfig(wayland-cursor) BuildRequires: pkgconfig(wayland-scanner) BuildRequires: pkgconfig(wayland-server) -%endif BuildRequires: /usr/bin/python2 BuildRequires: python2-setuptools %if %{system_re2} @@ -153,13 +148,6 @@ Recommends: libva-utils # This build should be only available to amd64 ExclusiveArch: x86_64 -# Google patches (short-term fixes and backports): -Patch150: chromium-86-cookiemonster-r803260.patch -Patch151: chromium-86-vaapi-r807550.patch -Patch152: chromium-86-vaapi-r811480.patch -Patch153: chromium-86-xproto-r819538.patch -Patch154: chromium-86-xproto-r819650.patch - # Fedora patches: Patch300: chromium-py2-bootstrap.patch @@ -173,6 +161,9 @@ Patch404: chromium-md5-based-build-id.patch Patch420: chromium-rpm-fusion-brand.patch %endif +# RPM Fusion patches [free/chromium-freeworld] -- short-term: +Patch450: chromium-87-includes.patch + %description %{name} is an open-source web browser, powered by WebKit (Blink) ############################################PREP########################################################### @@ -188,11 +179,12 @@ Patch420: chromium-rpm-fusion-brand.patch %patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch %patchset_apply chromium-79-gcc-protobuf-alignas.patch %patchset_apply chromium-84-blink-disable-clang-format.patch -%patchset_apply chromium-86-ConsumeDurationNumber-constexpr.patch -%patchset_apply chromium-86-ImageMemoryBarrierData-init.patch -%patchset_apply chromium-86-ServiceWorkerRunningInfo-noexcept.patch %patchset_apply chromium-86-nearby-explicit.patch %patchset_apply chromium-86-nearby-include.patch +%patchset_apply chromium-87-ServiceWorkerContainerHost-crash.patch +%patchset_apply chromium-87-openscreen-include.patch +%patchset_apply chromium-88-ityp-include.patch +%patchset_apply chromium-88-vaapi-attribute.patch # Apply patches from this spec. %autopatch -p1 @@ -275,6 +267,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/devscripts \ third_party/devtools-frontend \ third_party/devtools-frontend/src/front_end/third_party/acorn \ + third_party/devtools-frontend/src/front_end/third_party/axe-core \ third_party/devtools-frontend/src/front_end/third_party/chromium \ third_party/devtools-frontend/src/front_end/third_party/codemirror \ third_party/devtools-frontend/src/front_end/third_party/fabricjs \ @@ -284,6 +277,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/devtools-frontend/src/front_end/third_party/lit-html \ third_party/devtools-frontend/src/front_end/third_party/lodash-isequal \ third_party/devtools-frontend/src/front_end/third_party/marked \ + third_party/devtools-frontend/src/front_end/third_party/puppeteer \ third_party/devtools-frontend/src/front_end/third_party/wasmparser \ third_party/devtools-frontend/src/third_party \ third_party/dom_distiller_js \ @@ -342,9 +336,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/markupsafe \ third_party/mesa \ third_party/metrics_proto \ -%if %{ozone} third_party/minigbm \ -%endif %if !%{system_minizip} third_party/minizip/ \ %endif @@ -375,6 +367,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/ply \ third_party/polymer \ third_party/private-join-and-compute \ + third_party/private_membership \ third_party/protobuf \ third_party/protobuf/third_party/six \ third_party/pyjson5 \ @@ -386,6 +379,8 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/s2cellid \ third_party/schema_org \ third_party/securemessage \ + third_party/shaka-player \ + third_party/shell-encryption \ third_party/skia \ third_party/skia/include/third_party/skcms \ third_party/skia/include/third_party/vulkan \ @@ -409,9 +404,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/usb_ids \ third_party/usrsctp \ third_party/vulkan \ -%if %{ozone} third_party/wayland \ -%endif third_party/web-animations-js \ third_party/webdriver \ third_party/webrtc \ @@ -549,16 +542,6 @@ gn_args+=( rtc_link_pipewire=true ) -# Ozone stuff : Whole work is done completely upstream. -gn_args+=( -%if %{ozone} - use_ozone=true - use_system_minigbm=true - use_xkbcommon=true -%endif -) - - #symbol gn_args+=( symbol_level=0 @@ -675,6 +658,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog +* Fri Nov 27 2020 qvint <dotqvint(a)gmail.com&gt; - 87.0.4280.66-1 +- Update to 87.0.4280.66 + * Tue Oct 27 2020 qvint <dotqvint(a)gmail.com&gt; - 86.0.4240.111-2 - Fix invalid "end" iterator usage in CookieMonster - Only fall back to the i965 driver if we're on iHD diff --git a/chromium-hw-accel-mjpeg.patch b/chromium-hw-accel-mjpeg.patch index ac3d37b..042ad21 100644 --- a/chromium-hw-accel-mjpeg.patch +++ b/chromium-hw-accel-mjpeg.patch @@ -1,6 +1,6 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3112,12 +3112,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3336,12 +3336,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, #endif // ENABLE_VR @@ -18,7 +18,7 @@ FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3519,16 +3519,19 @@ const char kVideoToolboxVp9DecodingDescr +@@ -3590,16 +3590,19 @@ const char kVideoToolboxVp9DecodingDescr #endif @@ -43,7 +43,7 @@ "Use the aggregated ML model to rank the suggested apps."; --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2026,13 +2026,19 @@ extern const char kVideoToolboxVp9Decodi +@@ -2062,13 +2062,19 @@ extern const char kVideoToolboxVp9Decodi #endif // defined(OS_MAC) diff --git a/chromium-md5-based-build-id.patch b/chromium-md5-based-build-id.patch index 1c6734e..c76e078 100644 --- a/chromium-md5-based-build-id.patch +++ b/chromium-md5-based-build-id.patch @@ -3,7 +3,7 @@ https://bugzilla.rpmfusion.org/show_bug.cgi?id=5743 --- a/build/config/compiler/BUILD.gn +++ b/build/config/compiler/BUILD.gn -@@ -342,7 +342,7 @@ config("compiler") { +@@ -338,7 +338,7 @@ config("compiler") { # links. ldflags += [ "-Wl,--build-id=sha1" ] } else if (current_os != "aix") { diff --git a/sources b/sources index 26553c5..1c7e2b9 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-86.0.4240.111.tar.xz) = 809bcab82c44976f109f0db0ce0470f88893a0999596b057e82675093f8fa0fc0badae4431a9160b4e94ae09219fa01914cad4b3143cebc530c71d420e7add54 -SHA512 (chromium-patches-chromium-86-patchset-7.tar.gz) = 4b569655409b2ba1564a7de8f3f97ffadea65f5d982024d665b873117688a9874f869114e753fb77492b7a2c38e66f0f9a7294785077776230ee057d4e70bf7d +SHA512 (chromium-87.0.4280.66.tar.xz) = 8bf31b012166fb1fd35107020608cf77e6a31038a583423541c64aaf1c91bca0767ca111dcb4dd0f57c9c19c347375bde6b6488c56e309bd2871998c26b8b32a +SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) = 7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691