commit 0d5bd48ca378c8d9922698b01051ff3cdedbed86 Author: qvint <dotqvint(a)gmail.com&gt; Date: Sun Apr 4 20:04:54 2021 +0300 Update to 89.0.4389.114 chromium-89-webcodecs-deps.patch | 21 ++++++++++ chromium-fix-vaapi-on-intel.patch | 8 ++-- chromium-freeworld.spec | 49 ++++++++++------------ chromium-fstatfix.patch | 27 +++++------- chromium-gcc11.patch | 88 +++++++++++++++------------------------ chromium-hw-accel-mjpeg.patch | 50 ++++++++++------------ chromium-md5-based-build-id.patch | 2 +- chromium-names.patch | 10 ++--- sources | 4 +- 9 files changed, 121 insertions(+), 138 deletions(-) --- diff --git a/chromium-89-webcodecs-deps.patch b/chromium-89-webcodecs-deps.patch new file mode 100644 index 0000000..9f516f4 --- /dev/null +++ b/chromium-89-webcodecs-deps.patch @@ -0,0 +1,21 @@ +From b6f16f656bb8683f70ce8ce19791d594fce4163b Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09(a)googlemail.com&gt; +Date: Fri, 15 Jan 2021 19:54:08 +0000 +Subject: [PATCH] add dependency on opus in webcodecs + +webcodecs uses opus, but dependency is missing. With unbundled +opus library build fails, because include path is incomplete. +--- + third_party/blink/renderer/modules/webcodecs/BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +--- a/third_party/blink/renderer/modules/webcodecs/BUILD.gn ++++ b/third_party/blink/renderer/modules/webcodecs/BUILD.gn +@@ -63,6 +63,7 @@ blink_modules_sources("webcodecs") { + "//media/mojo/clients", + "//media/mojo/mojom", + "//third_party/libyuv:libyuv", ++ "//third_party/opus", + ] + if (media_use_openh264) { + deps += [ "//third_party/openh264:encoder" ] diff --git a/chromium-fix-vaapi-on-intel.patch b/chromium-fix-vaapi-on-intel.patch index 5ecd8bf..0c794f0 100644 --- a/chromium-fix-vaapi-on-intel.patch +++ b/chromium-fix-vaapi-on-intel.patch @@ -5,7 +5,7 @@ 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 -@@ -58,6 +58,7 @@ unsigned int GetVaFormatForVideoCodecPro +@@ -59,6 +59,7 @@ unsigned int GetVaFormatForVideoCodecPro return VA_RT_FORMAT_YUV420; } @@ -13,7 +13,7 @@ Subject: [PATCH] Move offending function to chromeos only // 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 -@@ -70,6 +71,7 @@ bool IsGeminiLakeOrLater() { +@@ -71,6 +72,7 @@ bool IsGeminiLakeOrLater() { cpuid.model() >= kGeminiLakeModelId; return is_geminilake_or_later; } @@ -21,7 +21,7 @@ Subject: [PATCH] Move offending function to chromeos only } // namespace -@@ -1224,6 +1226,8 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1231,6 +1233,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 -@@ -1239,6 +1243,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe +@@ -1246,6 +1250,7 @@ VaapiVideoDecodeAccelerator::DecideBuffe num_extra_pics_ = 3; return BufferAllocationMode::kNone; } diff --git a/chromium-freeworld.spec b/chromium-freeworld.spec index 21bea00..ee8143a 100644 --- a/chromium-freeworld.spec +++ b/chromium-freeworld.spec @@ -24,7 +24,7 @@ %global system_re2 1 ##############################Package Definitions###################################### Name: chromium-freeworld -Version: 88.0.4324.150 +Version: 89.0.4389.114 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) @@ -49,7 +49,7 @@ Source0: chromium-%{version}-clean.tar.xz %endif # Patchset composed by Stephan Hartmann. -%global patchset_revision chromium-88-patchset-3 +%global patchset_revision chromium-89-patchset-7 Source1: https://github.com/stha09/chromium-patches/archive/%{patchset_revision}/c... # The following two source files are copied and modified from the chromium source @@ -124,6 +124,7 @@ BuildRequires: expat-devel BuildRequires: pciutils-devel BuildRequires: speech-dispatcher-devel BuildRequires: pulseaudio-libs-devel +BuildRequires: libxshmfence-devel # install desktop files BuildRequires: desktop-file-utils # install AppData files @@ -143,6 +144,9 @@ Recommends: libva-utils # This build should be only available to amd64 ExclusiveArch: x86_64 +# Gentoo patches: +Patch200: chromium-89-webcodecs-deps.patch + # Fedora patches: Patch300: chromium-py2-bootstrap.patch Patch301: chromium-fstatfix.patch @@ -170,21 +174,16 @@ Patch700: chromium-rpm-fusion-brand.patch %global patchset_root %{_builddir}/chromium-patches-%{patchset_revision} # Apply patchset composed by Stephan Hartmann. -%global patchset_apply() %{__scm_apply_patch -p1} <%{patchset_root}/%{1} -%patchset_apply chromium-fix-char_traits.patch +%global patchset_apply() \ + printf "Applying %%s\\n" %{1} \ + %{__scm_apply_patch -p1} <%{patchset_root}/%{1} + %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-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 +%patchset_apply chromium-89-AXTreeSerializer-include.patch +%patchset_apply chromium-89-dawn-include.patch +%patchset_apply chromium-89-quiche-dcheck.patch +%patchset_apply chromium-89-quiche-private.patch +%patchset_apply chromium-89-skia-CropRect.patch # Apply patches up to #600 from this spec. %autopatch -M600 -p1 @@ -223,7 +222,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt net/third_party/quic \ net/third_party/uri_template \ third_party/abseil-cpp \ - third_party/adobe \ third_party/angle \ third_party/angle/src/common/third_party/base \ third_party/angle/src/common/third_party/smhasher \ @@ -233,13 +231,6 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/angle/src/third_party/trace_event \ third_party/angle/src/third_party/volk \ third_party/libgifcodec \ - third_party/glslang \ - third_party/angle/third_party/spirv-headers \ - third_party/angle/third_party/spirv-tools \ - third_party/angle/third_party/vulkan-headers \ - third_party/angle/third_party/vulkan-loader \ - third_party/angle/third_party/vulkan-tools \ - third_party/angle/third_party/vulkan-validation-layers \ third_party/apple_apsl \ third_party/axe-core \ third_party/boringssl \ @@ -298,6 +289,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/flatbuffers \ third_party/freetype \ third_party/fusejs \ + third_party/liburlpattern \ 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 \ @@ -328,6 +320,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/libsrtp \ third_party/libsync \ third_party/libudev \ + third_party/libva_protected_content \ %if !%{system_libvpx} third_party/libvpx \ third_party/libvpx/source/libvpx/third_party/x86inc \ @@ -376,6 +369,7 @@ find -depth -type f -writable -name "*.py" -exec sed -iE '1s=^#! */usr/bin/\(pyt third_party/pdfium/third_party/libtiff \ third_party/pdfium/third_party/skia_shared \ third_party/perfetto \ + third_party/perfetto/protos/third_party/chromium \ third_party/pffft \ third_party/ply \ third_party/polymer \ @@ -392,7 +386,6 @@ 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 \ @@ -401,9 +394,6 @@ 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 \ third_party/swiftshader \ third_party/swiftshader/third_party/astc-encoder \ @@ -674,6 +664,9 @@ appstream-util validate-relax --nonet "%{buildroot}%{_metainfodir}/%{name}.appda %{chromiumdir}/swiftshader/libGLESv2.so #########################################changelogs################################################# %changelog +* Sun Apr 04 2021 qvint <dotqvint(a)gmail.com&gt; - 89.0.4389.114-1 +- Update to 89.0.4389.114 + * Thu Feb 04 2021 qvint <dotqvint(a)gmail.com&gt; - 88.0.4324.150-1 - Update to 88.0.4324.150 diff --git a/chromium-fstatfix.patch b/chromium-fstatfix.patch index 26e8003..269a180 100644 --- a/chromium-fstatfix.patch +++ b/chromium-fstatfix.patch @@ -1,7 +1,6 @@ -diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ---- chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc.fstatfix 2021-01-25 10:11:45.427436398 -0500 -+++ chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc 2021-01-25 10:12:51.337699003 -0500 -@@ -257,6 +257,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de +--- a/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc +@@ -261,6 +261,18 @@ ResultExpr EvaluateSyscallImpl(int fs_de return RestrictKillTarget(current_pid, sysno); } @@ -20,9 +19,8 @@ diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/baseline_policy if (SyscallSets::IsFileSystem(sysno) || SyscallSets::IsCurrentDirectory(sysno)) { return Error(fs_denied_errno); -diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ---- chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc.fstatfix 2021-01-25 10:13:10.179774081 -0500 -+++ chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc 2021-01-25 10:16:18.790525746 -0500 +--- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc ++++ b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc @@ -6,6 +6,8 @@ #include "sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h" @@ -79,9 +77,8 @@ diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers void AllocateCrashKeys() { #if !defined(OS_NACL_NONSFI) if (seccomp_crash_key) -diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h ---- chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h.fstatfix 2021-01-25 10:16:36.982598236 -0500 -+++ chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h 2021-01-25 10:18:45.705111027 -0500 +--- a/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h ++++ b/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.h @@ -62,6 +62,10 @@ SANDBOX_EXPORT intptr_t SIGSYSPtraceFail // sched_setparam(), sched_setscheduler() SANDBOX_EXPORT intptr_t SIGSYSSchedHandler(const arch_seccomp_data& args, @@ -101,9 +98,8 @@ diff -up chromium-88.0.4324.96/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers // Allocates a crash key so that Seccomp information can be recorded. void AllocateCrashKeys(); -diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc ---- chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatfix 2021-01-25 10:18:53.307141311 -0500 -+++ chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc 2021-01-25 10:19:46.982355293 -0500 +--- a/sandbox/linux/services/syscall_wrappers.cc ++++ b/sandbox/linux/services/syscall_wrappers.cc @@ -261,4 +261,13 @@ int sys_sigaction(int signum, #endif // defined(MEMORY_SANITIZER) @@ -118,9 +114,8 @@ diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.cc.fstatf +} + } // namespace sandbox -diff -up chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h.fstatfix chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h ---- chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h.fstatfix 2021-01-25 10:19:53.115379741 -0500 -+++ chromium-88.0.4324.96/sandbox/linux/services/syscall_wrappers.h 2021-01-25 10:20:45.485588421 -0500 +--- a/sandbox/linux/services/syscall_wrappers.h ++++ b/sandbox/linux/services/syscall_wrappers.h @@ -17,6 +17,7 @@ struct sock_fprog; struct rlimit64; struct cap_hdr; diff --git a/chromium-gcc11.patch b/chromium-gcc11.patch index 75f2299..e7d0825 100644 --- a/chromium-gcc11.patch +++ b/chromium-gcc11.patch @@ -1,5 +1,34 @@ -diff --git a/third_party/angle/src/libANGLE/HandleAllocator.cpp b/third_party/angle/src/libANGLE/HandleAllocator.cpp -index 013f1dfb2..3ce63c192 100644 +--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc ++++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc +@@ -2,6 +2,7 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <cstddef> + #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" + + #include "base/observer_list.h" +--- a/components/bookmarks/browser/base_bookmark_model_observer.cc ++++ b/components/bookmarks/browser/base_bookmark_model_observer.cc +@@ -2,6 +2,8 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <cstddef> ++ + #include "components/bookmarks/browser/base_bookmark_model_observer.h" + + namespace bookmarks { +--- a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc ++++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc +@@ -2,6 +2,7 @@ + // Use of this source code is governed by a BSD-style license that can be + // found in the LICENSE file. + ++#include <cstddef> + #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" + + #include <stdint.h> --- a/third_party/angle/src/libANGLE/HandleAllocator.cpp +++ b/third_party/angle/src/libANGLE/HandleAllocator.cpp @@ -9,6 +9,7 @@ @@ -10,8 +39,6 @@ index 013f1dfb2..3ce63c192 100644 #include <algorithm> #include <functional> -diff --git a/third_party/perfetto/src/trace_processor/containers/string_pool.cc b/third_party/perfetto/src/trace_processor/containers/string_pool.cc -index fd651958f..1e8d0606c 100644 --- a/third_party/perfetto/src/trace_processor/containers/string_pool.cc +++ b/third_party/perfetto/src/trace_processor/containers/string_pool.cc @@ -14,9 +14,9 @@ @@ -25,8 +52,6 @@ index fd651958f..1e8d0606c 100644 #include "perfetto/base/logging.h" #include "perfetto/ext/base/utils.h" -diff --git a/third_party/perfetto/src/trace_processor/db/column.cc b/third_party/perfetto/src/trace_processor/db/column.cc -index 00496b335..0dccfeb8a 100644 --- a/third_party/perfetto/src/trace_processor/db/column.cc +++ b/third_party/perfetto/src/trace_processor/db/column.cc @@ -14,6 +14,7 @@ @@ -37,8 +62,6 @@ index 00496b335..0dccfeb8a 100644 #include "src/trace_processor/db/column.h" #include "src/trace_processor/db/compare.h" -diff --git a/third_party/perfetto/src/trace_processor/types/variadic.cc b/third_party/perfetto/src/trace_processor/types/variadic.cc -index 837bfeba9..cdd56817d 100644 --- a/third_party/perfetto/src/trace_processor/types/variadic.cc +++ b/third_party/perfetto/src/trace_processor/types/variadic.cc @@ -14,6 +14,7 @@ @@ -49,11 +72,9 @@ index 837bfeba9..cdd56817d 100644 #include "src/trace_processor/types/variadic.h" namespace perfetto { -diff --git a/ui/accessibility/platform/ax_platform_atk_hyperlink.cc b/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -index be91def6b..73f202356 100644 --- a/ui/accessibility/platform/ax_platform_atk_hyperlink.cc +++ b/ui/accessibility/platform/ax_platform_atk_hyperlink.cc -@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(AXPlatformAtkHyperlink* self, gpointer) { +@@ -245,7 +245,7 @@ static void AXPlatformAtkHyperlinkInit(A } GType ax_platform_atk_hyperlink_get_type() { @@ -62,11 +83,9 @@ index be91def6b..73f202356 100644 AXPlatformNodeAuraLinux::EnsureGTypeInit(); -diff --git a/ui/accessibility/platform/ax_platform_node_auralinux.cc b/ui/accessibility/platform/ax_platform_node_auralinux.cc -index 04125c6fd..6c64e5d8e 100644 --- a/ui/accessibility/platform/ax_platform_node_auralinux.cc +++ b/ui/accessibility/platform/ax_platform_node_auralinux.cc -@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, gpointer /* class_data */) { +@@ -2274,7 +2274,7 @@ void ClassInit(gpointer class_pointer, g GType GetType() { AXPlatformNodeAuraLinux::EnsureGTypeInit(); @@ -75,11 +94,9 @@ index 04125c6fd..6c64e5d8e 100644 if (g_once_init_enter(&type_volatile)) { static const GTypeInfo type_info = { sizeof(AXPlatformNodeAuraLinuxClass), // class_size -diff --git a/ui/gtk/gtk_key_bindings_handler.cc b/ui/gtk/gtk_key_bindings_handler.cc -index c663a2074..38a342484 100644 --- a/ui/gtk/gtk_key_bindings_handler.cc +++ b/ui/gtk/gtk_key_bindings_handler.cc -@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClassInit(HandlerClass* klass) { +@@ -141,7 +141,7 @@ void GtkKeyBindingsHandler::HandlerClass } GType GtkKeyBindingsHandler::HandlerGetType() { @@ -88,40 +105,3 @@ index c663a2074..38a342484 100644 if (g_once_init_enter(&type_id_volatile)) { GType type_id = g_type_register_static_simple( GTK_TYPE_TEXT_VIEW, g_intern_static_string("GtkKeyBindingsHandler"), -diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc -index c0b5a805b..e6f921926 100644 ---- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc -+++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.cc -@@ -2,6 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include <cstddef> - #include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h" - - #include "base/observer_list.h" -diff --git a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -index 4ad2afa1f..5c4596e12 100644 ---- a/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -+++ b/components/bookmarks/browser/bookmark_expanded_state_tracker.cc -@@ -2,6 +2,7 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include <cstddef> - #include "components/bookmarks/browser/bookmark_expanded_state_tracker.h" - - #include <stdint.h> -diff --git a/components/bookmarks/browser/base_bookmark_model_observer.cc b/components/bookmarks/browser/base_bookmark_model_observer.cc -index 657a3c96b..ad641a082 100644 ---- a/components/bookmarks/browser/base_bookmark_model_observer.cc -+++ b/components/bookmarks/browser/base_bookmark_model_observer.cc -@@ -2,6 +2,8 @@ - // Use of this source code is governed by a BSD-style license that can be - // found in the LICENSE file. - -+#include <cstddef> -+ - #include "components/bookmarks/browser/base_bookmark_model_observer.h" - - namespace bookmarks { diff --git a/chromium-hw-accel-mjpeg.patch b/chromium-hw-accel-mjpeg.patch index 7cb5e3a..93d4e36 100644 --- a/chromium-hw-accel-mjpeg.patch +++ b/chromium-hw-accel-mjpeg.patch @@ -1,40 +1,38 @@ --- a/chrome/browser/about_flags.cc +++ b/chrome/browser/about_flags.cc -@@ -3362,12 +3362,12 @@ const FeatureEntry kFeatureEntries[] = { +@@ -3526,12 +3526,12 @@ const FeatureEntry kFeatureEntries[] = { flag_descriptions::kWebXrForceRuntimeDescription, kOsDesktop, MULTI_VALUE_TYPE(kWebXrForceRuntimeChoices)}, #endif // ENABLE_VR --#if defined(OS_CHROMEOS) -+#if defined(OS_CHROMEOS) || defined(OS_LINUX) +-#if BUILDFLAG(IS_CHROMEOS_ASH) ++#if BUILDFLAG(IS_CHROMEOS_ASH) || defined(OS_LINUX) {"disable-accelerated-mjpeg-decode", flag_descriptions::kAcceleratedMjpegDecodeName, - flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS, + flag_descriptions::kAcceleratedMjpegDecodeDescription, kOsCrOS | kOsLinux, SINGLE_DISABLE_VALUE_TYPE(switches::kDisableAcceleratedMjpegDecode)}, --#endif // OS_CHROMEOS -+#endif // OS_CHROMEOS || OS_LINUX +-#endif // BUILDFLAG(IS_CHROMEOS_ASH) ++#endif // BUILDFLAG(IS_CHROMEOS_ASH) || 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 -@@ -3587,9 +3587,9 @@ const char kVideoToolboxVp9DecodingDescr - - #endif - --// Chrome OS ------------------------------------------------------------------- -+// Chrome OS and Linux --------------------------------------------------------- - --#if defined(OS_CHROMEOS) -+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) +@@ -3704,12 +3704,22 @@ const char kAccountManagementFlowsV2Desc + "Settings. " + "See go/betterAM"; ++#endif ++ ++#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID)) ++ const char kAcceleratedMjpegDecodeName[] = "Hardware-accelerated mjpeg decode for captured frame"; -@@ -3597,6 +3597,12 @@ const char kAcceleratedMjpegDecodeDescri + const char kAcceleratedMjpegDecodeDescription[] = "Enable hardware-accelerated mjpeg decode for captured frame where " "available."; -+#endif ++#endif + +// Chrome OS ------------------------------------------------------------------- + @@ -45,24 +43,20 @@ const char kAllowDisableMouseAccelerationDescription[] = --- a/chrome/browser/flag_descriptions.h +++ b/chrome/browser/flag_descriptions.h -@@ -2077,13 +2077,19 @@ extern const char kVideoToolboxVp9Decodi - - #endif // defined(OS_MAC) - --// Chrome OS ------------------------------------------------------------------ -+// Chrome OS and Linux -------------------------------------------------------- - --#if defined(OS_CHROMEOS) -+#if defined(OS_CHROMEOS) || (defined(OS_LINUX) && !defined(OS_ANDROID)) +@@ -2138,9 +2138,17 @@ extern const char kVideoToolboxVp9Decodi + extern const char kAccountManagementFlowsV2Name[]; + extern const char kAccountManagementFlowsV2Description[]; ++#endif ++ ++#if BUILDFLAG(IS_CHROMEOS_ASH) || (defined(OS_LINUX) && !defined(OS_ANDROID)) ++ extern const char kAcceleratedMjpegDecodeName[]; extern const char kAcceleratedMjpegDecodeDescription[]; +#endif + -+// Chrome OS ------------------------------------------------------------------ -+ -+#if defined(OS_CHROMEOS) ++#if BUILDFLAG(IS_CHROMEOS_ASH) + 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 46741ad..d6411fd 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 -@@ -336,7 +336,7 @@ config("compiler") { +@@ -360,7 +360,7 @@ config("compiler") { # links. ldflags += [ "-Wl,--build-id=sha1" ] } else if (current_os != "aix") { diff --git a/chromium-names.patch b/chromium-names.patch index 0880ecb..c94dae9 100644 --- a/chromium-names.patch +++ b/chromium-names.patch @@ -11,7 +11,7 @@ Replace hard-coded "chromium-browser" with package name. --- a/chrome/browser/BUILD.gn +++ b/chrome/browser/BUILD.gn -@@ -4964,6 +4964,7 @@ static_library("browser") { +@@ -5082,6 +5082,7 @@ static_library("browser") { "upgrade_detector/directory_monitor.h", "upgrade_detector/get_installed_version_linux.cc", ] @@ -21,7 +21,7 @@ Replace hard-coded "chromium-browser" with package name. if (use_dbus) { --- a/chrome/browser/shell_integration_linux.cc +++ b/chrome/browser/shell_integration_linux.cc -@@ -414,7 +414,7 @@ std::string GetIconName() { +@@ -415,7 +415,7 @@ std::string GetIconName() { #if BUILDFLAG(GOOGLE_CHROME_BRANDING) return "google-chrome"; #else // BUILDFLAG(CHROMIUM_BRANDING) @@ -32,7 +32,7 @@ Replace hard-coded "chromium-browser" with package name. --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn -@@ -79,6 +79,7 @@ source_set("channel_info") { +@@ -83,6 +83,7 @@ source_set("channel_info") { deps += [ "//chromeos/crosapi/cpp" ] } else if (is_posix) { sources += [ "channel_info_posix.cc" ] @@ -42,7 +42,7 @@ Replace hard-coded "chromium-browser" with package name. --- a/chrome/common/channel_info_posix.cc +++ b/chrome/common/channel_info_posix.cc -@@ -93,7 +93,7 @@ std::string GetDesktopName(base::Environ +@@ -96,7 +96,7 @@ std::string GetDesktopName(base::Environ std::string name; if (env->GetVar("CHROME_DESKTOP", &name) && !name.empty()) return name; @@ -50,7 +50,7 @@ Replace hard-coded "chromium-browser" with package name. + return RPM_FUSION_PACKAGE_NAME ".desktop"; #endif } - #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) + #endif // defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS) --- a/media/audio/BUILD.gn +++ b/media/audio/BUILD.gn @@ -296,6 +296,8 @@ source_set("audio") { diff --git a/sources b/sources index 33e20ba..375adb4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (chromium-88.0.4324.150.tar.xz) = 5e0419ce26e58b6ba30586c806fa3001f6c3c094e09c82fb08ed828a199c582308ce9bc0ea445aa0214d29710a586bf5a972553fbef5eab574fb0dc3ebe6280b -SHA512 (chromium-patches-chromium-88-patchset-3.tar.gz) = ba3965e8b3c611490d47d909dd0478b381bec6ce1defe3dce9b09b33856afe321e951df42ab42533a3d6bf11c2213b4741834d617fe3c4827315859c25c0fad3 +SHA512 (chromium-89.0.4389.114.tar.xz) = 5b8d92ecde3ab35847dc4981caa12434334f81fc576e8809c5832a18989b6d1465ae8c43f0ad0ea8a3da7a5876c52679c57ec8323109de2b81ac467419fa1a4c +SHA512 (chromium-patches-chromium-89-patchset-7.tar.gz) = 259358087f50960443e4a4bced2580a2b2e1cfc519ea6211d9e6be84a3282913cd1b546465aef5f2b4d2446ed27425be464407dfef52dbf87935aef4c50e1996