commit 569eb5751c5c84681189d16f3021716626174459 Author: qvint <dotqvint(a)gmail.com&gt; Date: Wed Jan 20 12:15:02 2021 +0300 Update to 88.0.4324.96 chromium-87-includes.patch | 10 ---------- chromium-enable-widevine.patch | 2 +- chromium-fix-vaapi-on-intel.patch | 4 ++-- chromium-freeworld.spec | 27 +++++++++++++++++++-------- chromium-hw-accel-mjpeg.patch | 34 ++++++++++++++++++---------------- chromium-md5-based-build-id.patch | 2 +- sources | 4 ++-- 7 files changed, 43 insertions(+), 40 deletions(-) --- diff --git a/chromium-enable-widevine.patch b/chromium-enable-widevine.patch index e2afcea..7fecad8 100644 --- a/chromium-enable-widevine.patch +++ b/chromium-enable-widevine.patch @@ -1,6 +1,6 @@ --- a/third_party/widevine/cdm/BUILD.gn +++ b/third_party/widevine/cdm/BUILD.gn -@@ -14,7 +14,7 @@ buildflag_header("buildflags") { +@@ -15,7 +15,7 @@ buildflag_header("buildflags") { flags = [ "ENABLE_WIDEVINE=$enable_widevine", diff --git a/chromium-fix-vaapi-on-intel.patch b/chromium-fix-vaapi-on-intel.patch index d68bd60..5ecd8bf 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 -@@ -1223,6 +1225,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1224,6 +1226,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 -@@ -1238,6 +1242,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1239,6 +1243,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe num_extra_pics_ = 3; return BufferAllocationMode::kNone; } diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index 76c42b3..ae05369 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -26,7 +26,7 @@ %global system_re2 1 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 87.0.4280.88 +Version: 88.0.4324.96 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) @@ -51,7 +51,7 @@ Source0: chromium-%{version}-clean.tar.xz %endif # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-87-patchset-9 +%global patchset_revision chromium-88-patchset-3 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -158,9 +158,6 @@ 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########################################################### @@ -176,10 +173,14 @@ Patch450: chromium-87-includes.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-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-AXTreeFormatter-include.patch +%patchset_apply chromium-88-BookmarkModelObserver-include.patch +%patchset_apply chromium-88-CompositorFrameReporter-dcheck.patch +%patchset_apply chromium-88-StringPool-include.patch +%patchset_apply chromium-88-dawn-static.patch +%patchset_apply chromium-88-federated_learning-include.patch +%patchset_apply chromium-88-ideographicSpaceCharacter.patch %patchset_apply chromium-88-ityp-include.patch %patchset_apply chromium-88-vaapi-attribute.patch @@ -259,6 +260,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/crc32c \ third_party/cros_system_api \ third_party/dawn \ + third_party/dawn/third_party/khronos \ third_party/depot_tools \ third_party/dav1d \ third_party/devscripts \ @@ -284,6 +286,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt %endif third_party/flatbuffers \ third_party/freetype \ + third_party/fusejs \ third_party/google_input_tools \ third_party/google_input_tools/third_party/closure_library \ third_party/google_input_tools/third_party/closure_library/third_party/closure \ @@ -319,6 +322,8 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/libvpx/source/libvpx/third_party/x86inc \ %endif third_party/libwebm \ + third_party/libx11 \ + third_party/libxcb-keysyms \ %if %{system_libxml2} third_party/libxml/chromium \ %else @@ -385,6 +390,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/skia/third_party/skcms \ third_party/smhasher \ third_party/speech-dispatcher \ + third_party/spirv-cross/spirv-cross \ third_party/spirv-headers \ third_party/SPIRV-Tools \ third_party/sqlite \ @@ -396,6 +402,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/swiftshader/third_party/subzero \ third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 \ third_party/tcmalloc \ + third_party/tint \ third_party/ukey2 \ third_party/unrar \ third_party/usb_ids \ @@ -414,6 +421,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/webrtc/rtc_base/third_party/sigslot \ third_party/widevine \ third_party/woff2 \ + third_party/x11proto \ third_party/xcbproto \ third_party/xdg-utils \ third_party/zlib/google \ @@ -655,6 +663,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog +* Wed Jan 20 2021 qvint <dotqvint(a)gmail.com&gt; - 88.0.4324.96-1 +- Update to 88.0.4324.96 + * Tue Dec 08 2020 qvint <dotqvint(a)gmail.com&gt; - 87.0.4280.88-1 - Update to 87.0.4280.88 diff --git a/chromium-hw-accel-mjpeg.patch b/chromium-hw-accel-mjpeg.patch index 2cbcd2e..7cb5e3a 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 -@@ -3342,12 +3342,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3362,12 +3362,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, #endif // ENABLE_VR @@ -18,37 +18,39 @@ FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3590,16 +3590,19 @@ const char kVideoToolboxVp9DecodingDescr +@@ -3587,9 +3587,9 @@ const char kVideoToolboxVp9DecodingDescr #endif -// Chrome OS ------------------------------------------------------------------- -- --#if defined(OS_CHROMEOS) -+// Chrome OS and Linux ------------------------------------------------------------------- ++// Chrome OS and Linux --------------------------------------------------------- +-#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) + const char kAcceleratedMjpegDecodeName[] = "Hardware-accelerated mjpeg decode for captured frame"; - const char kAcceleratedMjpegDecodeDescription[] = +@@ -3597,6 +3597,12 @@ const char kAcceleratedMjpegDecodeDescri "Enable hardware-accelerated mjpeg decode for captured frame where " "available."; -+#endif -+// Chrome OS ----------------------------------------------------------------------------- ++#endif ++ ++// Chrome OS ------------------------------------------------------------------- + +#if defined(OS_CHROMEOS) - const char kAggregatedMlAppRankingName[] = "Rank suggested apps with ML."; - const char kAggregatedMlAppRankingDescription[] = - "Use the aggregated ML model to rank the suggested apps."; ++ + const char kAllowDisableMouseAccelerationName[] = + "Allow disabling mouse acceleration"; + const char kAllowDisableMouseAccelerationDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2062,13 +2062,19 @@ extern const char kVideoToolboxVp9Decodi +@@ -2077,13 +2077,19 @@ extern const char kVideoToolboxVp9Decodi #endif // defined(OS_MAC) -// Chrome OS ------------------------------------------------------------------ -+// Chrome OS and Linux --------------------------------------------------------- ++// Chrome OS and Linux -------------------------------------------------------- -#if defined(OS_CHROMEOS) +#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) @@ -58,10 +60,10 @@ +#endif + -+// Chrome OS ------------------------------------------------------------------- ++// Chrome OS ------------------------------------------------------------------ + +#if defined(OS_CHROMEOS) + - extern const char kAggregatedMlAppRankingName[]; - extern const char kAggregatedMlAppRankingDescription[]; + extern const char kAllowDisableMouseAccelerationName[]; + extern const char kAllowDisableMouseAccelerationDescription[]; diff --git a/chromium-md5-based-build-id.patch b/chromium-md5-based-build-id.patch index c76e078..46741ad 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 -@@ -338,7 +338,7 @@ config("compiler") { +@@ -336,7 +336,7 @@ config("compiler") { # links. ldflags += [ "-Wl,--build-id=sha1" ] } else if (current_os != "aix") { diff --git a/sources b/sources index 40f2301..f66572c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-87.0.4280.88.tar.xz) = ac3903b598bd69f4ee3065845eac3c85cb5524715b9ce629c9c2bd017f2ebd168b7ee8111bccc2e6b6cfd12ad07add834cb2cd3bf0e27a8a5076bb7842fca897 -SHA512 (chromium-patches-chromium-87-patchset-9.tar.gz) = 7612d02b1e078bfd2bfefdd773b5931eff72e661111170d3c5497e5bef73aedd6e037cfadbb4ce62d7d68c5f7de0c2b560ffb7cbe90c73e88eb9c2b98298c691 +SHA512 (chromium-88.0.4324.96.tar.xz) = f51e6dbbd4ea2b6528a601c1bd7e76820a4b614f05366d2999b4a30d8e13581279f69a1a76d3f417ae1cea38f9f834d011f754d078784a70388e2cde0ccba6b6 +SHA512 (chromium-patches-chromium-88-patchset-3.tar.gz) = ba3965e8b3c611490d47d909dd0478b381bec6ce1defe3dce9b09b33856afe321e951df42ab42533a3d6bf11c2213b4741834d617fe3c4827315859c25c0fad3