commit 0d6e5c65602291d29c0420c394edeb69ac0fdafa Author: qvint <dotqvint(a)gmail.com&gt; Date: Wed Oct 21 16:07:29 2020 +0300 Update to 86.0.4240.111 chromium-85-ffmpeg-4.3-r796966.patch | 41 --------------------- chromium-fix-vaapi-on-intel.patch | 10 +++--- chromium-freeworld.spec | 42 +++++++++++----------- ...le-vaapi.patch => chromium-hw-accel-mjpeg.patch | 42 ++++------------------ chromium-md5-based-build-id.patch | 2 +- sources | 4 +-- 6 files changed, 35 insertions(+), 106 deletions(-) --- diff --git a/chromium-fix-vaapi-on-intel.patch b/chromium-fix-vaapi-on-intel.patch index f54cb69..c559f56 100644 --- a/chromium-fix-vaapi-on-intel.patch +++ b/chromium-fix-vaapi-on-intel.patch @@ -5,15 +5,15 @@ Subject: [PATCH] Move offending function to chromeos only --- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc +++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -@@ -66,6 +66,7 @@ void ReportToUMA(VAVDADecoderFailure fai - VAVDA_DECODER_FAILURES_MAX + 1); +@@ -58,6 +58,7 @@ unsigned int GetVaFormatForVideoCodecPro + return VA_RT_FORMAT_YUV420; } +#if defined(OS_ANDROID) || defined(OS_CHROMEOS) // Returns true if the CPU is an Intel Gemini Lake or later (including Kaby // Lake) Cpu platform id's are referenced from the following file in kernel // source arch/x86/include/asm/intel-family.h -@@ -78,6 +79,7 @@ bool IsGeminiLakeOrLater() { +@@ -70,6 +71,7 @@ bool IsGeminiLakeOrLater() { cpuid.model() >= kGeminiLakeModelId; return is_geminilake_or_later; } @@ -21,7 +21,7 @@ Subject: [PATCH] Move offending function to chromeos only } // namespace -@@ -1169,6 +1171,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1214,6 +1216,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 -@@ -1184,6 +1188,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1229,6 +1233,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe num_extra_pics_ = 3; return BufferAllocationMode::kNone; } diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index ca65ff9..a3830ac 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -32,7 +32,7 @@ %global ozone 0 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 85.0.4183.121 +Version: 86.0.4240.111 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) @@ -57,7 +57,7 @@ Source0: chromium-%{version}-clean.tar.xz %endif # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-85-patchset-2 +%global patchset_revision chromium-86-patchset-6 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -153,18 +153,11 @@ Recommends: libva-utils # This build should be only available to amd64 ExclusiveArch: x86_64 -# Google patches (short-term fixes and backports): -%if 0%{?fedora} >= 33 -Patch150: chromium-85-ffmpeg-4.3-r796966.patch -%endif - -# Gentoo patches (short-term fixes): - # Fedora patches: Patch300: chromium-py2-bootstrap.patch # RPM Fusion patches [free/chromium-freeworld]: -Patch400: chromium-enable-vaapi.patch +Patch400: chromium-hw-accel-mjpeg.patch Patch401: chromium-fix-vaapi-on-intel.patch Patch402: chromium-enable-widevine.patch Patch403: chromium-manpage.patch @@ -184,21 +177,16 @@ Patch420: chromium-rpm-fusion-brand.patch # Apply patchset composed by Stephan Hartmann. %global patchset_apply() %{__scm_apply_patch -p1} <%{patchset_root}/%{1} -%patchset_apply chromium-blink-gcc-diagnostic-pragma.patch %patchset_apply chromium-fix-char_traits.patch -%patchset_apply chromium-quiche-invalid-offsetof.patch %patchset_apply chromium-78-protobuf-RepeatedPtrField-export.patch %patchset_apply chromium-79-gcc-protobuf-alignas.patch %patchset_apply chromium-80-QuicStreamSendBuffer-deleted-move-constructor.patch %patchset_apply chromium-84-blink-disable-clang-format.patch -%patchset_apply chromium-85-DelayNode-cast.patch -%patchset_apply chromium-85-FrameWidget-namespace.patch -%patchset_apply chromium-85-NearbyConnection-abstract.patch -%patchset_apply chromium-85-NearbyShareEncryptedMetadataKey-include.patch -%patchset_apply chromium-85-oscillator_node-cast.patch -%patchset_apply chromium-85-ostream-operator.patch -%patchset_apply chromium-85-ozone-include.patch -%patchset_apply chromium-85-sim_hash-include.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 # Apply patches from this spec. %autopatch -p1 @@ -253,7 +241,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/breakpad \ third_party/breakpad/breakpad/src/third_party/curl \ third_party/brotli \ - third_party/cacheinvalidation \ third_party/catapult \ third_party/catapult/common/py_vulcanize/third_party/rcssmin \ third_party/catapult/common/py_vulcanize/third_party/rjsmin \ @@ -282,9 +269,15 @@ 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/chromium \ third_party/devtools-frontend/src/front_end/third_party/codemirror \ third_party/devtools-frontend/src/front_end/third_party/fabricjs \ + third_party/devtools-frontend/src/front_end/third_party/i18n \ + third_party/devtools-frontend/src/front_end/third_party/intl-messageformat \ third_party/devtools-frontend/src/front_end/third_party/lighthouse \ + 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/wasmparser \ third_party/devtools-frontend/src/third_party \ third_party/dom_distiller_js \ @@ -351,6 +344,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt %endif third_party/modp_b64 \ third_party/nasm \ + third_party/nearby \ third_party/node \ third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 \ third_party/one_euro_filter \ @@ -385,6 +379,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/rnnoise \ third_party/s2cellid \ third_party/schema_org \ + third_party/securemessage \ third_party/skia \ third_party/skia/include/third_party/skcms \ third_party/skia/include/third_party/vulkan \ @@ -403,6 +398,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/ukey2 \ third_party/unrar \ third_party/usb_ids \ third_party/usrsctp \ @@ -425,6 +421,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/xcbproto \ third_party/xdg-utils \ third_party/zlib/google \ + third_party/zxcvbn-cpp \ tools/grit/third_party/six \ %if !%{system_minizip} third_party/zlib \ @@ -672,6 +669,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog +* Wed Oct 21 2020 qvint <dotqvint(a)gmail.com&gt; - 86.0.4240.111-1 +- Update to 86.0.4240.111 + * Wed Sep 23 2020 qvint <dotqvint(a)gmail.com&gt; - 85.0.4183.121-1 - Update to 85.0.4183.121 - Enable Hangout services extension (rfbz#5758) diff --git a/chromium-enable-vaapi.patch b/chromium-hw-accel-mjpeg.patch similarity index 63% rename from chromium-enable-vaapi.patch rename to chromium-hw-accel-mjpeg.patch index 99446a4..ac3d37b 100644 --- a/chromium-enable-vaapi.patch +++ b/chromium-hw-accel-mjpeg.patch @@ -1,20 +1,6 @@ -From e04b52fc9b12f0725e76b889161ea45c776e6da5 Mon Sep 17 00:00:00 2001 -From: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org&gt; -Date: Fri, 20 Sep 2019 19:55:45 +0530 -Subject: [PATCH] Enable VAAPI on Linux - --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2372,7 +2372,7 @@ const FeatureEntry kFeatureEntries[] = { - "disable-accelerated-video-decode", - flag_descriptions::kAcceleratedVideoDecodeName, - flag_descriptions::kAcceleratedVideoDecodeDescription, -- kOsMac | kOsWin | kOsCrOS | kOsAndroid, -+ kOsMac | kOsWin | kOsCrOS | kOsAndroid | kOsLinux, - SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), - }, - { -@@ -2823,12 +2823,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3112,12 +3112,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, #endif // ENABLE_VR @@ -26,13 +12,13 @@ Subject: [PATCH] Enable VAAPI on Linux + flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, -#endif // OS_CHROMEOS -+#endif // OS_CHROMEOS | OS_LINUX ++#endif // OS_CHROMEOS || OS_LINUX {"system-keyboard-lock", flag_descriptions::kSystemKeyboardLockName, flag_descriptions::kSystemKeyboardLockDescription, kOsDesktop, FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3257,16 +3257,19 @@ const char kMetalDescription[] = +@@ -3519,16 +3519,19 @@ const char kVideoToolboxVp9DecodingDescr #endif @@ -57,9 +43,9 @@ Subject: [PATCH] Enable VAAPI on Linux "Use the aggregated ML model to rank the suggested apps."; --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -1881,13 +1881,19 @@ extern const char kMetalDescription[]; +@@ -2026,13 +2026,19 @@ extern const char kVideoToolboxVp9Decodi - #endif // defined(OS_MACOSX) + #endif // defined(OS_MAC) -// Chrome OS ------------------------------------------------------------------ +// Chrome OS and Linux --------------------------------------------------------- @@ -70,7 +56,7 @@ Subject: [PATCH] Enable VAAPI on Linux extern const char kAcceleratedMjpegDecodeName[]; extern const char kAcceleratedMjpegDecodeDescription[]; -+#endif ++#endif + +// Chrome OS ------------------------------------------------------------------- + @@ -79,19 +65,3 @@ Subject: [PATCH] Enable VAAPI on Linux extern const char kAggregatedMlAppRankingName[]; extern const char kAggregatedMlAppRankingDescription[]; ---- a/gpu/config/software_rendering_list.json -+++ b/gpu/config/software_rendering_list.json -@@ -337,11 +337,12 @@ - }, - { - "id": 48, -- "description": "Accelerated video decode is unavailable on Linux", -+ "description": "Accelerated VA-API video decode is not supported on NVIDIA platforms", - "cr_bugs": [137247, 1032907], - "os": { - "type": "linux" - }, -+ "vendor_id": "0x10de", - "exceptions": [ - { - "machine_model_name": ["Chromecast"] diff --git a/chromium-md5-based-build-id.patch b/chromium-md5-based-build-id.patch index c76e078..1c6734e 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") { +@@ -342,7 +342,7 @@ config("compiler") { # links. ldflags += [ "-Wl,--build-id=sha1" ] } else if (current_os != "aix") { diff --git a/sources b/sources index d94d7d0..59b84b8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-85.0.4183.121.tar.xz) = 9d61a0782c012fe36467a10f008962d45f4eaa065f6812276d847f7563056124c9fd21d8376dda8ab64e4c3b793da0593bac9d39988bbd60221828084b534945 -SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e +SHA512 (chromium-86.0.4240.111.tar.xz) = 809bcab82c44976f109f0db0ce0470f88893a0999596b057e82675093f8fa0fc0badae4431a9160b4e94ae09219fa01914cad4b3143cebc530c71d420e7add54 +SHA512 (chromium-patches-chromium-86-patchset-6.tar.gz) = a2b6ada235dd39c23629c613ec0f98d7df6d4b0e95396415ab68396f730efa1dd13f0118e71992b9c279fbe1b4c39a225416915cd6af058d650252bd16e8641d