commit 9dec70d6bc5a6c8125465a5a4890a4cdd387f67c Author: qvint <dotqvint(a)gmail.com&gt; Date: Wed Aug 26 03:46:55 2020 +0300 Update to 85.0.4183.83 - Use xcb-proto bundled in Chromium tarball .gitignore | 1 - chromium-84-nss-r771840.patch | 38 -------------------------- chromium-85-ffmpeg-4.3-r796966.patch | 41 ++++++++++++++++++++++++++++ chromium-enable-vaapi.patch | 8 +++--- chromium-freeworld.spec | 52 ++++++++++++++++++++---------------- sources | 5 ++-- 6 files changed, 76 insertions(+), 69 deletions(-) --- diff --git a/.gitignore b/.gitignore index 9d45c0d..ae2e382 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,2 @@ chromium-*.tar.xz chromium-patches-*.tar.gz -xcb-proto-*.tar.bz2 diff --git a/chromium-85-ffmpeg-4.3-r796966.patch b/chromium-85-ffmpeg-4.3-r796966.patch new file mode 100644 index 0000000..5fb9254 --- /dev/null +++ b/chromium-85-ffmpeg-4.3-r796966.patch @@ -0,0 +1,41 @@ +From 7f4c7ff6b0f0e74338c885b0d5e5ef80fed597c3 Mon Sep 17 00:00:00 2001 +From: Dan Sanders <sandersd(a)chromium.org&gt; +Date: Tue, 11 Aug 2020 20:38:03 +0000 +Subject: [PATCH] [media] Set allocation limit compatible with FFmpeg 4.3 + +Previously we set the limit to zero, meaning no limit, but FFmpeg 4.3 +will not allocate at all with that setting. + +Changed to std::numeric_limits<size_t>::max(). + +Bug: 1095962 +Change-Id: I96820c21f794f2814e955ee75ff22dfd31804c29 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2349405 +Reviewed-by: Dale Curtis <dalecurtis(a)chromium.org&gt; +Commit-Queue: Dan Sanders <sandersd(a)chromium.org&gt; +Cr-Commit-Position: refs/heads/master@{#796966} +--- + media/base/media.cc | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +--- a/media/base/media.cc ++++ b/media/base/media.cc +@@ -4,6 +4,9 @@ + + #include "media/base/media.h" + ++#include <stdint.h> ++#include <limits> ++ + #include "base/allocator/buildflags.h" + #include "base/command_line.h" + #include "base/macros.h" +@@ -41,7 +44,7 @@ class MediaInitializer { + + #if BUILDFLAG(USE_ALLOCATOR_SHIM) + // Remove allocation limit from ffmpeg, so calls go down to shim layer. +- av_max_alloc(0); ++ av_max_alloc(std::numeric_limits<size_t>::max()); + #endif // BUILDFLAG(USE_ALLOCATOR_SHIM) + + #endif // BUILDFLAG(ENABLE_FFMPEG) diff --git a/chromium-enable-vaapi.patch b/chromium-enable-vaapi.patch index 5785193..99446a4 100644 --- a/chromium-enable-vaapi.patch +++ b/chromium-enable-vaapi.patch @@ -5,7 +5,7 @@ Subject: [PATCH] Enable VAAPI on Linux --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -2367,7 +2367,7 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2372,7 +2372,7 @@ const FeatureEntry kFeatureEntries[] = { "disable-accelerated-video-decode", flag_descriptions::kAcceleratedVideoDecodeName, flag_descriptions::kAcceleratedVideoDecodeDescription, @@ -14,7 +14,7 @@ Subject: [PATCH] Enable VAAPI on Linux SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedVideoDecode), }, { -@@ -2798,12 +2798,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -2823,12 +2823,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, #endif // ENABLE_VR @@ -32,7 +32,7 @@ Subject: [PATCH] Enable VAAPI on Linux FEATURE_VALUE_TYPE(features::kSystemKeyboardLock)}, --- a/chrome/browser/flag_descriptions.cc +++ b/chrome/browser/flag_descriptions.cc -@@ -3142,16 +3142,19 @@ const char kMetalDescription[] = +@@ -3257,16 +3257,19 @@ const char kMetalDescription[] = #endif @@ -57,7 +57,7 @@ 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 -@@ -1823,13 +1823,19 @@ extern const char kMetalDescription[]; +@@ -1881,13 +1881,19 @@ extern const char kMetalDescription[]; #endif // defined(OS_MACOSX) diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index dc129ad..f0c0316 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -66,7 +66,7 @@ %global ozone 0 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 84.0.4147.125 +Version: 85.0.4183.83 Release: 1%{?dist} Summary: Chromium web browser 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) @@ -91,13 +91,9 @@ Source0: chromium-%{version}-clean.tar.xz %endif # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-84-patchset-3 +%global patchset_revision chromium-85-patchset-2 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... -# Bundled xcb-proto. Chromium needs python2 version of this package. -%global xcb_proto_version 1.13 -Source2: https://xcb.freedesktop.org/dist/xcb-proto-%{xcb_proto_version}.tar.bz2 - # The following two source files are copied and modified from the chromium source Source10: %{name}.sh #Add our own appdata file. @@ -217,7 +213,9 @@ Recommends: libva-utils ExclusiveArch: x86_64 # Google patches (short-term fixes and backports): -Patch150: chromium-84-nss-r771840.patch +%if 0%{?fedora} >= 33 +Patch150: chromium-85-ffmpeg-4.3-r796966.patch +%endif # Gentoo patches (short-term fixes): @@ -237,19 +235,27 @@ Patch403: chromium-rpm-fusion-brand.patch ############################################PREP########################################################### %prep %setup -q -T -n chromium-patches-%{patchset_revision} -b 1 -%setup -q -T -n xcb-proto-%{xcb_proto_version} -b 2 +%setup -q -n chromium-%{version} %global patchset_root %{_builddir}/chromium-patches-%{patchset_revision} -%global xcb_proto_root %{_builddir}/xcb-proto-%{xcb_proto_version} - -%setup -q -n chromium-%{version} # Apply patchset composed by Stephan Hartmann. -rm %{patchset_root}/chromium-84-compiler.patch -for patch in %{patchset_root}/*.patch; do - echo "Applying ${patch}" - %{__patch} -p1 <"${patch}" -done +%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 # Apply patches from this spec. %autopatch -p1 @@ -409,6 +415,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/node \ third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2 \ third_party/one_euro_filter \ + third_party/opencv \ third_party/openh264 \ third_party/openscreen \ third_party/openscreen/src/third_party/mozilla \ @@ -453,7 +460,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/sqlite \ third_party/swiftshader \ third_party/swiftshader/third_party/astc-encoder \ - third_party/swiftshader/third_party/llvm-7.0 \ + third_party/swiftshader/third_party/llvm-10.0 \ third_party/swiftshader/third_party/llvm-subzero \ third_party/swiftshader/third_party/marl \ third_party/swiftshader/third_party/subzero \ @@ -478,6 +485,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/xcbproto \ third_party/xdg-utils \ third_party/zlib/google \ tools/grit/third_party/six \ @@ -660,12 +668,6 @@ gn_args+=( %endif ) -# Bundled xcb-proto. -gn_args+=( - 'xcbproto_path="%{xcb_proto_root}/src"' -) -export PYTHONPATH="${PYTHONPATH}${PYTHONPATH+:}%{xcb_proto_root}" - tools/gn/bootstrap/bootstrap.py --gn-gen-args "${gn_args[*]}" %{target}/gn --script-executable=%{__python2} gen --args="${gn_args[*]}" %{target} %if %{debug_logs} @@ -762,6 +764,10 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog +* Wed Aug 26 2020 qvint <dotqvint(a)gmail.com&gt; - 85.0.4183.83-1 +- Update to 85.0.4183.83 +- Use xcb-proto bundled in Chromium tarball + * Tue Aug 11 2020 qvint <dotqvint(a)gmail.com&gt; - 84.0.4147.125-1 - Update to 84.0.4147.125 - Stop using gold diff --git a/sources b/sources index 5a53a32..b360cf6 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ -SHA512 (chromium-84.0.4147.125.tar.xz) = a86439efbadce4cc157fe16e0e16732feda2025e14179a54df6a33446f744dc1db59f1ebcf7d5d29d7bfc42102af1283ddf108982152ec1f869d7623af7bed26 -SHA512 (chromium-patches-chromium-84-patchset-3.tar.gz) = ea7f5c9436bbbe3de2fa69f006e0e12be24e73a652d3ac780c30045dfd821b41d9b83779fd306eafc2455cbc8fced3477f5adff626318a4ab5e13b06d9a7234a -SHA512 (xcb-proto-1.13.tar.bz2) = 002aa2aa0ad503977e03419c6f136f1e3aa8c787916830ce6d6be8f81ca99edc1d8fc5f71ce8c592b490cc767bf6567695f0bafe55fe3f743076bcddbaac07f7 +SHA512 (chromium-85.0.4183.83.tar.xz) = 9b491133ad5a04a9a65d8be2a8102102e6698dc30e9dd310825f9a6648655595656bef1ba2d9d5a6d64c1e0adb755010672986a0de46ce00cd0a5769bff30436 +SHA512 (chromium-patches-chromium-85-patchset-2.tar.gz) = b8252b778ff16f1fbb0be22ebd1b9f711fafe6d6837e0806e4281aa659756a091c79609e2e4dd865b5f2d377f159c12d47feab201d4d72a93de5fc5ff596ff2e