diff options
| -rw-r--r-- | chromium/chromium/chromium-angle-constexpr.patch | 28 | ||||
| -rwxr-xr-x | chromium/chromium/chromium-ffmpeg-clean.sh | 2 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc10-r858574.patch | 36 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc10-r858904.patch | 30 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc10-r858938.patch | 30 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc11-r871265.patch | 52 | ||||
| -rw-r--r-- | chromium/chromium/chromium-gcc11-r872164.patch | 48 | ||||
| -rw-r--r-- | chromium/chromium/chromium.spec | 24 |
8 files changed, 115 insertions, 135 deletions
diff --git a/chromium/chromium/chromium-angle-constexpr.patch b/chromium/chromium/chromium-angle-constexpr.patch deleted file mode 100644 index 5c319df..0000000 --- a/chromium/chromium/chromium-angle-constexpr.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b1669139f475ebe39ded6f7905f4c901f17eef83 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Wed, 24 Feb 2021 07:38:37 +0000 -Subject: [PATCH] add missing static constexpr member definition - -C++14 requires to definition of static constexpr members to -emit a linker symbol. ---- - .../angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp b/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp -index 56b46e6..8f8158c 100644 ---- a/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp -+++ b/third_party/angle/src/libANGLE/renderer/glslang_wrapper_utils.cpp -@@ -2069,6 +2069,9 @@ class SpirvTransformFeedbackCodeGenerator final : angle::NonCopyable - spirv::IdRef mTransformFeedbackExtensionPositionId; - }; - -+constexpr size_t SpirvTransformFeedbackCodeGenerator::kXfbDecorationCount; -+constexpr spv::Decoration SpirvTransformFeedbackCodeGenerator::kXfbDecorations[kXfbDecorationCount]; -+ - void SpirvTransformFeedbackCodeGenerator::visitVariable(const ShaderInterfaceVariableInfo &info, - gl::ShaderType shaderType, - const spirv::LiteralString &name, --- -2.26.2 - diff --git a/chromium/chromium/chromium-ffmpeg-clean.sh b/chromium/chromium/chromium-ffmpeg-clean.sh index 86f0b44..f52193b 100755 --- a/chromium/chromium/chromium-ffmpeg-clean.sh +++ b/chromium/chromium/chromium-ffmpeg-clean.sh @@ -141,6 +141,7 @@ header_files=" libavcodec/x86/inline_asm.h \ libavcodec/pixblockdsp.h \ libavcodec/pixels.h \ libavcodec/png.h \ + libavcodec/pngdsp.h \ libavcodec/put_bits.h \ libavcodec/qpeldsp.h \ libavcodec/ratecontrol.h \ @@ -309,7 +310,6 @@ mp3_files=" libavcodec/aarch64/aacpsdsp_init_aarch64.c \ libavcodec/sbrdsp.c \ libavcodec/sbrdsp_template.c \ libavcodec/sinewin.c \ - libavcodec/sinewin_fixed.c \ libavcodec/x86/dct_init.c \ libavcodec/x86/dct32.asm \ libavcodec/x86/imdct36.asm \ diff --git a/chromium/chromium/chromium-gcc10-r858574.patch b/chromium/chromium/chromium-gcc10-r858574.patch deleted file mode 100644 index 64b2f26..0000000 --- a/chromium/chromium/chromium-gcc10-r858574.patch +++ /dev/null @@ -1,36 +0,0 @@ -From ea572f5fb9944cf48bb39292e9c123b170ec25f0 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Mon, 1 Mar 2021 16:36:07 +0000 -Subject: [PATCH] GCC: remove extra qualification from CrossThreadCopier - -Extra qualification used here is invalid C++ and also -not required, because it is already inside namespace WTF. - -Bug: 819294 -Change-Id: I88cae0647357f9777f8908f700669301da9633e9 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2720283 -Reviewed-by: Chris Harrelson <chrishtr@chromium.org> -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -Cr-Commit-Position: refs/heads/master@{#858574} ---- - .../blink/renderer/platform/graphics/resource_id_traits.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/third_party/blink/renderer/platform/graphics/resource_id_traits.h b/third_party/blink/renderer/platform/graphics/resource_id_traits.h -index b370d7c1801f..565dfee48a20 100644 ---- a/third_party/blink/renderer/platform/graphics/resource_id_traits.h -+++ b/third_party/blink/renderer/platform/graphics/resource_id_traits.h -@@ -15,8 +15,8 @@ - namespace WTF { - - template <> --struct WTF::CrossThreadCopier<viz::ResourceId> -- : public WTF::CrossThreadCopierPassThrough<viz::ResourceId> {}; -+struct CrossThreadCopier<viz::ResourceId> -+ : public CrossThreadCopierPassThrough<viz::ResourceId> {}; - - template <> - struct HashTraits<viz::ResourceId> : GenericHashTraits<viz::ResourceId> { --- -2.30.2 - diff --git a/chromium/chromium/chromium-gcc10-r858904.patch b/chromium/chromium/chromium-gcc10-r858904.patch deleted file mode 100644 index 64bea9b..0000000 --- a/chromium/chromium/chromium-gcc10-r858904.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a5f9b4782da8690fee1814e7f5c70f843b6213c4 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Tue, 2 Mar 2021 07:00:35 +0000 -Subject: [PATCH] IWYU: add missing cstdint for uint32_t - -Bug: None -Change-Id: I815e5a9657b76832c15eb18c22d07fb53e095ef5 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2725106 -Reviewed-by: Takashi Toyoshima <toyoshim@chromium.org> -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -Cr-Commit-Position: refs/heads/master@{#858904} ---- - .../translate/core/language_detection/quantization_utils.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/components/translate/core/language_detection/quantization_utils.h b/components/translate/core/language_detection/quantization_utils.h -index eb8f6d1e927d..699a48897564 100644 ---- a/components/translate/core/language_detection/quantization_utils.h -+++ b/components/translate/core/language_detection/quantization_utils.h -@@ -7,6 +7,7 @@ - - #include <algorithm> - #include <cmath> -+#include <cstdint> - - namespace translate { - --- -2.30.2 - diff --git a/chromium/chromium/chromium-gcc10-r858938.patch b/chromium/chromium/chromium-gcc10-r858938.patch deleted file mode 100644 index bc66c19..0000000 --- a/chromium/chromium/chromium-gcc10-r858938.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 866dcc6aef6fb44729d73b62a48902b2cca79cb3 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Tue, 2 Mar 2021 09:24:40 +0000 -Subject: [PATCH] IWYU: include missing cstring for strlen - -Bug: None -Change-Id: Ib38cbcb18f57a3eb8a29cb205fda920412addd63 -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2727717 -Reviewed-by: David Roger <droger@chromium.org> -Commit-Queue: Stephan Hartmann <stha09@googlemail.com> -Cr-Commit-Position: refs/heads/master@{#858938} ---- - .../translate/core/language_detection/ngram_hash_ops_utils.cc | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/components/translate/core/language_detection/ngram_hash_ops_utils.cc b/components/translate/core/language_detection/ngram_hash_ops_utils.cc -index cf9103358f30..dd03a3db4e35 100644 ---- a/components/translate/core/language_detection/ngram_hash_ops_utils.cc -+++ b/components/translate/core/language_detection/ngram_hash_ops_utils.cc -@@ -4,6 +4,7 @@ - - #include "components/translate/core/language_detection/ngram_hash_ops_utils.h" - -+#include <cstring> - #include <vector> - - #include "third_party/utf/src/include/utf.h" --- -2.30.2 - diff --git a/chromium/chromium/chromium-gcc11-r871265.patch b/chromium/chromium/chromium-gcc11-r871265.patch new file mode 100644 index 0000000..346fbd8 --- /dev/null +++ b/chromium/chromium/chromium-gcc11-r871265.patch @@ -0,0 +1,52 @@ +From 429e6f78a88473208e96689afa2f6e91f07a4f8c Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Sat, 10 Apr 2021 17:02:49 +0000 +Subject: [PATCH] GCC: fix vector types in pcscan + + * _mm_cmpeq_epi64 result is __m128i + * maybe_ptrs is __m128i already and doesn't require cast + +Bug: 819294 +Change-Id: I3f8c6cc327191827838e80aea1431ac09315fe88 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2817544 +Reviewed-by: Anton Bikineev <bikineev@chromium.org> +Commit-Queue: Stephan Hartmann <stha09@googlemail.com> +Cr-Commit-Position: refs/heads/master@{#871265} +--- + base/allocator/partition_allocator/starscan/pcscan.cc | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/base/allocator/partition_allocator/starscan/pcscan.cc b/base/allocator/partition_allocator/starscan/pcscan.cc +index c7854ff3a855..d5c0aea206e3 100644 +--- a/base/allocator/partition_allocator/starscan/pcscan.cc ++++ b/base/allocator/partition_allocator/starscan/pcscan.cc +@@ -1143,7 +1143,7 @@ class PCScanTask::ScanLoop final { + const __m128i maybe_ptrs = + _mm_loadu_si128(reinterpret_cast<__m128i*>(payload)); + const __m128i vand = _mm_and_si128(maybe_ptrs, cage_mask); +- const __m128d vcmp = _mm_cmpeq_epi64(vand, vbase); ++ const __m128i vcmp = _mm_cmpeq_epi64(vand, vbase); + const int mask = _mm_movemask_pd(_mm_castsi128_pd(vcmp)); + if (LIKELY(!mask)) + continue; +@@ -1153,15 +1153,14 @@ class PCScanTask::ScanLoop final { + if (mask & 0b01) { + quarantine_size += + pcscan_task_.TryMarkObjectInNormalBuckets<GigaCageLookupPolicy>( +- _mm_cvtsi128_si64(_mm_castpd_si128(maybe_ptrs))); ++ _mm_cvtsi128_si64(maybe_ptrs)); + } + if (mask & 0b10) { + // Extraction intrinsics for qwords are only supported in SSE4.1, so + // instead we reshuffle dwords with pshufd. The mask is used to move the + // 4th and 3rd dwords into the second and first position. + static constexpr int kSecondWordMask = (3 << 2) | (2 << 0); +- const __m128i shuffled = +- _mm_shuffle_epi32(_mm_castpd_si128(maybe_ptrs), kSecondWordMask); ++ const __m128i shuffled = _mm_shuffle_epi32(maybe_ptrs, kSecondWordMask); + quarantine_size += + pcscan_task_.TryMarkObjectInNormalBuckets<GigaCageLookupPolicy>( + _mm_cvtsi128_si64(shuffled)); +-- +2.31.1 + diff --git a/chromium/chromium/chromium-gcc11-r872164.patch b/chromium/chromium/chromium-gcc11-r872164.patch new file mode 100644 index 0000000..32865be --- /dev/null +++ b/chromium/chromium/chromium-gcc11-r872164.patch @@ -0,0 +1,48 @@ +From c2d0133f47afb59b4ce64e42215d1d053f15250a Mon Sep 17 00:00:00 2001 +From: Stephan Hartmann <stha09@googlemail.com> +Date: Tue, 13 Apr 2021 23:21:42 +0000 +Subject: [PATCH] fix crash in ThemeService + +ThemeSyncableService and ThemeService are owned by each other. On +destruction of ThemeService, ThemeSyncableService gets destructed as +well, but calls RemoveObserver of partly destructed ThemeService object. +To avoid already destructed |observers_| list, move it before +|theme_syncable_service_| definition. + +Bug: 1190561 +Change-Id: I4dc2c990d589071d97b7fa737afef54463c84751 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2821311 +Commit-Queue: Peter Kasting <pkasting@chromium.org> +Reviewed-by: Peter Kasting <pkasting@chromium.org> +Cr-Commit-Position: refs/heads/master@{#872164} +--- + chrome/browser/themes/theme_service.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/chrome/browser/themes/theme_service.h b/chrome/browser/themes/theme_service.h +index 592d40ae9de0..337dfac9a040 100644 +--- a/chrome/browser/themes/theme_service.h ++++ b/chrome/browser/themes/theme_service.h +@@ -299,6 +299,10 @@ class ThemeService : public KeyedService, + // The number of infobars currently displayed. + int number_of_reinstallers_ = 0; + ++ // Declared before |theme_syncable_service_|, because ThemeSyncableService ++ // removes itself from the |observers_| list on destruction. ++ base::ObserverList<ThemeServiceObserver> observers_; ++ + std::unique_ptr<ThemeSyncableService> theme_syncable_service_; + + #if BUILDFLAG(ENABLE_EXTENSIONS) +@@ -320,8 +324,6 @@ class ThemeService : public KeyedService, + ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> + native_theme_observer_{this}; + +- base::ObserverList<ThemeServiceObserver> observers_; +- + base::WeakPtrFactory<ThemeService> weak_ptr_factory_{this}; + + DISALLOW_COPY_AND_ASSIGN(ThemeService); +-- +2.31.1 + diff --git a/chromium/chromium/chromium.spec b/chromium/chromium/chromium.spec index 872af38..0d5e658 100644 --- a/chromium/chromium/chromium.spec +++ b/chromium/chromium/chromium.spec @@ -57,7 +57,7 @@ %bcond_with fedora_compilation_flags Name: chromium -Version: 90.0.4430.212 +Version: 91.0.4472.77 Release: 100%{?dist} Summary: A WebKit (Blink) powered web browser @@ -111,14 +111,9 @@ Patch20: chromium-python2.patch # Fix build issues for GCC 11 Patch21: chromium-ruy-limits.patch -# Pull patches from stha09 -# https://github.com/stha09/chromium-patches/commit/1c969e50cc334fbd -Patch30: chromium-angle-constexpr.patch - # Pull upstream patches -Patch40: chromium-gcc10-r858574.patch -Patch41: chromium-gcc10-r858904.patch -Patch42: chromium-gcc10-r858938.patch +Patch30: chromium-gcc11-r871265.patch +Patch31: chromium-gcc11-r872164.patch # I don't have time to test whether it work on other architectures ExclusiveArch: x86_64 @@ -131,7 +126,8 @@ BuildRequires: gcc, gcc-c++ %endif BuildRequires: ninja-build, nodejs, java-headless, bison, gperf, hwdata BuildRequires: libgcc(x86-32), glibc(x86-32), libatomic -BuildRequires: libcap-devel, cups-devel, alsa-lib-devel, expat-devel +BuildRequires: alsa-lib-devel, cups-devel, expat-devel +BuildRequires: libcap-devel, libcurl-devel %if 0%{?fedora} >= 30 BuildRequires: minizip-compat-devel %else @@ -324,6 +320,7 @@ find -type f -exec \ third_party/flatbuffers \ third_party/freetype \ third_party/fusejs \ + third_party/highway \ third_party/libgifcodec \ third_party/liburlpattern \ third_party/libzip \ @@ -355,6 +352,7 @@ find -type f -exec \ third_party/libavif \ third_party/libgav1 \ third_party/libjingle \ + third_party/libjxl \ third_party/libphonenumber \ third_party/libsecret \ third_party/libsrtp \ @@ -426,7 +424,6 @@ find -type f -exec \ %endif third_party/rnnoise \ third_party/s2cellid \ - third_party/schema_org \ third_party/securemessage \ third_party/shell-encryption \ third_party/simplejson \ @@ -445,6 +442,7 @@ find -type f -exec \ third_party/swiftshader/third_party/marl \ third_party/swiftshader/third_party/subzero \ third_party/swiftshader/third_party/SPIRV-Headers/include/spirv/unified1 \ + third_party/tcmalloc \ third_party/tensorflow-text \ third_party/tflite \ third_party/tflite/src/third_party/eigen3 \ @@ -462,6 +460,7 @@ find -type f -exec \ third_party/wayland \ third_party/web-animations-js \ third_party/webdriver \ + third_party/webgpu-cts \ third_party/webrtc \ third_party/webrtc/common_audio/third_party/ooura \ third_party/webrtc/common_audio/third_party/spl_sqrt_floor \ @@ -531,6 +530,8 @@ ln -s %{python2_sitelib}/ply third_party/ply mkdir -p third_party/node/linux/node-linux-x64/bin ln -s %{_bindir}/node third_party/node/linux/node-linux-x64/bin/node +ln -s %{_bindir}/java third_party/jdk/current/bin/java + %build export AR=ar NM=nm @@ -735,6 +736,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog +* Mon May 31 2021 - Ting-Wei Lan <lantw44@gmail.com> - 91.0.4472.77-100 +- Update to 91.0.4472.77 + * Tue May 11 2021 - Ting-Wei Lan <lantw44@gmail.com> - 90.0.4430.212-100 - Update to 90.0.4430.212 |