diff options
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | PKGBUILD | 29 | ||||
-rw-r--r-- | add-clang-nomerge-attribute-to-CheckError.patch | 62 | ||||
-rw-r--r-- | add-dependency-on-opus-in-webcodecs.patch | 43 | ||||
-rw-r--r-- | chromium-fix-libva-redef.patch | 86 |
5 files changed, 83 insertions, 157 deletions
@@ -1,6 +1,6 @@ pkgbase = ungoogled-chromium pkgdesc = A lightweight approach to removing Google web service dependency - pkgver = 89.0.4389.128 + pkgver = 90.0.4430.85 pkgrel = 1 url = https://github.com/Eloston/ungoogled-chromium arch = x86_64 @@ -52,24 +52,22 @@ pkgbase = ungoogled-chromium optdepends = kwallet: for storing passwords in KWallet on KDE desktops provides = chromium conflicts = chromium - source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-89.0.4389.128.tar.xz - source = ungoogled-chromium-89.0.4389.114-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/89.0.4389.114-1.tar.gz + source = https://commondatastorage.googleapis.com/chromium-browser-official/chromium-90.0.4430.85.tar.xz + source = ungoogled-chromium-90.0.4430.85-1.tar.gz::https://github.com/Eloston/ungoogled-chromium/archive/90.0.4430.85-1.tar.gz source = https://github.com/foutrelis/chromium-launcher/archive/v7/chromium-launcher-7.tar.gz - source = https://github.com/stha09/chromium-patches/releases/download/chromium-89-patchset-7/chromium-89-patchset-7.tar.xz - source = add-dependency-on-opus-in-webcodecs.patch + source = https://github.com/stha09/chromium-patches/releases/download/chromium-90-patchset-6/chromium-90-patchset-6.tar.xz + source = add-clang-nomerge-attribute-to-CheckError.patch source = chromium-drirc-disable-10bpc-color-configs.conf source = chromium-glibc-2.33.patch - source = chromium-fix-libva-redef.patch source = wayland-egl.patch source = use-oauth2-client-switches-as-default.patch - sha256sums = 1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b - sha256sums = 38bc4f73356caaa23d7f6b9d2961f9241f8e0fb212f3ab11bf88dca1db5ca3ee + sha256sums = 01c5594d4b7eaa67e00b4fa16ae0c9d35ec5917467abd387ba1b5cc332d44922 + sha256sums = 72c4b5225b88b73bbb5d31e6402313950c1a2b5e046a65a2c523874625dc6376 sha256sums = 86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f - sha256sums = f8b1558f6c87b33423da854d42f0f69d47885a96d6bf6ce7f26373e93d47442f - sha256sums = b86b11de8db438c47f0a84c7956740f648d21035f4ee46bfbd50c3348d369121 + sha256sums = 3eb9580ea35a96789e02815270498226fa33726f4210a5ee36f3868af2ffae1f + sha256sums = 5e22afcb91b5402bc09e80630c5323d61013c3fccb0bbd9b23d1e79a400b00d0 sha256sums = babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb sha256sums = 2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b - sha256sums = de9eb3612d44616a500c2eccdffac814eb90ad9a868cc1030d17fc6783d544e2 sha256sums = 34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574 sha256sums = e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711 @@ -9,14 +9,14 @@ # Contributor: Daniel J Griffiths <ghost1227@archlinux.us> pkgname=ungoogled-chromium -pkgver=89.0.4389.128 +pkgver=90.0.4430.85 pkgrel=1 _launcher_ver=7 -_gcc_patchset=7 +_gcc_patchset=6 _pkgname=$(echo $pkgname | cut -d\- -f1-2) _pkgver=$(echo $pkgver | cut -d\. -f1-4) # ungoogled chromium variables -_uc_ver=89.0.4389.114-1 +_uc_ver=$pkgver-1 _uc_usr=Eloston pkgdesc="A lightweight approach to removing Google web service dependency" arch=('x86_64') @@ -37,20 +37,18 @@ source=(https://commondatastorage.googleapis.com/chromium-browser-official/chrom $_pkgname-$_uc_ver.tar.gz::https://github.com/$_uc_usr/ungoogled-chromium/archive/$_uc_ver.tar.gz https://github.com/foutrelis/chromium-launcher/archive/v$_launcher_ver/chromium-launcher-$_launcher_ver.tar.gz https://github.com/stha09/chromium-patches/releases/download/chromium-${pkgver%%.*}-patchset-$_gcc_patchset/chromium-${pkgver%%.*}-patchset-$_gcc_patchset.tar.xz - add-dependency-on-opus-in-webcodecs.patch + add-clang-nomerge-attribute-to-CheckError.patch chromium-drirc-disable-10bpc-color-configs.conf chromium-glibc-2.33.patch - chromium-fix-libva-redef.patch wayland-egl.patch use-oauth2-client-switches-as-default.patch) -sha256sums=('1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b' - '38bc4f73356caaa23d7f6b9d2961f9241f8e0fb212f3ab11bf88dca1db5ca3ee' +sha256sums=('01c5594d4b7eaa67e00b4fa16ae0c9d35ec5917467abd387ba1b5cc332d44922' + '72c4b5225b88b73bbb5d31e6402313950c1a2b5e046a65a2c523874625dc6376' '86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f' - 'f8b1558f6c87b33423da854d42f0f69d47885a96d6bf6ce7f26373e93d47442f' - 'b86b11de8db438c47f0a84c7956740f648d21035f4ee46bfbd50c3348d369121' + '3eb9580ea35a96789e02815270498226fa33726f4210a5ee36f3868af2ffae1f' + '5e22afcb91b5402bc09e80630c5323d61013c3fccb0bbd9b23d1e79a400b00d0' 'babda4f5c1179825797496898d77334ac067149cac03d797ab27ac69671a7feb' '2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b' - 'de9eb3612d44616a500c2eccdffac814eb90ad9a868cc1030d17fc6783d544e2' '34d08ea93cb4762cb33c7cffe931358008af32265fc720f2762f0179c3973574' 'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711') @@ -101,15 +99,12 @@ prepare() { # https://crbug.com/1164975 patch -Np1 -i ../chromium-glibc-2.33.patch - # https://github.com/kiss-community/repo-community/issues/246 - patch -Np1 -i ../chromium-fix-libva-redef.patch - - # Upstream fixes - patch -Np1 -i ../add-dependency-on-opus-in-webcodecs.patch + # Revert addition of [[clang::nomerge]] attribute; not supported by clang 11 + patch -Rp1 -d base <../add-clang-nomerge-attribute-to-CheckError.patch # Fixes for building with libstdc++ instead of libc++ - patch -Np1 -i ../patches/chromium-89-quiche-dcheck.patch - patch -Np1 -i ../patches/chromium-89-AXTreeSerializer-include.patch + patch -Np1 -i ../patches/chromium-90-quantization_utils-include.patch + patch -Np1 -i ../patches/chromium-90-TokenizedOutput-include.patch # Wayland/EGL regression (crbug #1071528 #1071550) patch -Np1 -i ../wayland-egl.patch diff --git a/add-clang-nomerge-attribute-to-CheckError.patch b/add-clang-nomerge-attribute-to-CheckError.patch new file mode 100644 index 000000000000..5dc0834dea92 --- /dev/null +++ b/add-clang-nomerge-attribute-to-CheckError.patch @@ -0,0 +1,62 @@ +From 209bf5cdfc095516ba9e391dd52ce16a74114ae6 Mon Sep 17 00:00:00 2001 +From: Zequan Wu <zequanwu@google.com> +Date: Wed, 10 Feb 2021 03:26:00 +0000 +Subject: [PATCH] Reland "Add [[clang::nomerge]] attribute to ~CheckError()." + +This is a reland of 8860253376c38c090d585bda4b20b801e3aa3ce3 + +Original change's description: +> Add [[clang::nomerge]] attribute to ~CheckError(). +> +> To disable merging multiple ~CheckError() destructor for accurate crash logs. +> +> Bug: 1153188 +> Change-Id: If6d153661667a63f13b645f6d284eb3d5ea3a300 +> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2611331 +> Commit-Queue: Nico Weber <thakis@chromium.org> +> Auto-Submit: Zequan Wu <zequanwu@google.com> +> Reviewed-by: Nico Weber <thakis@chromium.org> +> Cr-Commit-Position: refs/heads/master@{#844989} + +Bug: 1153188 +Change-Id: I303c5ff9fb88f7a30663400622b327a910d0b108 +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2686331 +Reviewed-by: Nico Weber <thakis@chromium.org> +Commit-Queue: Nico Weber <thakis@chromium.org> +Commit-Queue: Zequan Wu <zequanwu@google.com> +Cr-Commit-Position: refs/heads/master@{#852453} +GitOrigin-RevId: 9909f146b28d56c9c0411329a056ed959b33f76a +--- + check.h | 2 +- + compiler_specific.h | 7 +++++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/check.h b/check.h +index c94ab68db..17048e455 100644 +--- a/check.h ++++ b/check.h +@@ -85,7 +85,7 @@ class BASE_EXPORT CheckError { + // Stream for adding optional details to the error message. + std::ostream& stream(); + +- ~CheckError(); ++ NOMERGE ~CheckError(); + + CheckError(const CheckError& other) = delete; + CheckError& operator=(const CheckError& other) = delete; +diff --git a/compiler_specific.h b/compiler_specific.h +index fa961b0ce..14a5d6870 100644 +--- a/compiler_specific.h ++++ b/compiler_specific.h +@@ -332,4 +332,11 @@ inline constexpr bool AnalyzerAssumeTrue(bool arg) { + + #endif // defined(__clang_analyzer__) + ++// Use nomerge attribute to disable optimization of merging multiple same calls. ++#if defined(__clang__) && __has_attribute(nomerge) && !defined(OS_CHROMEOS) ++#define NOMERGE [[clang::nomerge]] ++#else ++#define NOMERGE ++#endif ++ + #endif // BASE_COMPILER_SPECIFIC_H_ diff --git a/add-dependency-on-opus-in-webcodecs.patch b/add-dependency-on-opus-in-webcodecs.patch deleted file mode 100644 index 12e1116fafc9..000000000000 --- a/add-dependency-on-opus-in-webcodecs.patch +++ /dev/null @@ -1,43 +0,0 @@ -From b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9 Mon Sep 17 00:00:00 2001 -From: Stephan Hartmann <stha09@googlemail.com> -Date: Wed, 27 Jan 2021 20:31:51 +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. - -Bug: 1169758 -Change-Id: I01369364327461196a81002479636cf45017669a -Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2644623 -Reviewed-by: Dale Curtis <dalecurtis@chromium.org> -Commit-Queue: Dale Curtis <dalecurtis@chromium.org> -Cr-Commit-Position: refs/heads/master@{#847754} ---- - third_party/blink/renderer/modules/webcodecs/BUILD.gn | 1 + - third_party/blink/renderer/modules/webcodecs/DEPS | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/third_party/blink/renderer/modules/webcodecs/BUILD.gn b/third_party/blink/renderer/modules/webcodecs/BUILD.gn -index fdf4ca0fafc72..01a7bf809ffca 100644 ---- a/third_party/blink/renderer/modules/webcodecs/BUILD.gn -+++ b/third_party/blink/renderer/modules/webcodecs/BUILD.gn -@@ -65,6 +65,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/third_party/blink/renderer/modules/webcodecs/DEPS b/third_party/blink/renderer/modules/webcodecs/DEPS -index b8dd596da8caf..ea1919d12205a 100644 ---- a/third_party/blink/renderer/modules/webcodecs/DEPS -+++ b/third_party/blink/renderer/modules/webcodecs/DEPS -@@ -19,6 +19,7 @@ include_rules = [ - - "+third_party/libyuv", - "+third_party/openh264", -+ "+third_party/opus", - - "+ui/gfx/color_space.h", - "+ui/gfx/geometry/rect.h", diff --git a/chromium-fix-libva-redef.patch b/chromium-fix-libva-redef.patch deleted file mode 100644 index 693b493bb6d8..000000000000 --- a/chromium-fix-libva-redef.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- a/third_party/libva_protected_content/va_protected_content.h -+++ b/third_party/libva_protected_content/va_protected_content.h -@@ -132,19 +132,6 @@ - #define VA_PC_SAMPLE_TYPE_FULLSAMPLE 0x00000001 - #define VA_PC_SAMPLE_TYPE_SUBSAMPLE 0x00000002 - --/** \brief TeeExec Function Codes. */ --typedef enum _VA_TEE_EXEC_FUNCTION_ID { -- VA_TEE_EXEC_TEE_FUNCID_PASS_THROUGH_NONE = 0x0, -- -- // 0x40000000~0x400000FFF reserved for TEE Exec GPU function -- VA_TEE_EXEC_GPU_FUNCID_ENCRYPTION_BLT = 0x40000000, -- VA_TEE_EXEC_GPU_FUNCID_DECRYPTION_BLT = 0x40000001, -- -- // 0x40001000~0x400001FFF reserved for TEE Exec TEE function -- VA_TEE_EXEC_TEE_FUNCID_PASS_THROUGH = 0x40001000, -- --} VA_TEE_EXEC_FUNCTION_ID; -- - /** \brief values for the encryption return status. */ - typedef enum { - /** \brief Indicate encryption operation is successful.*/ -@@ -159,63 +146,6 @@ - VA_ENCRYPTION_STATUS_UNSUPPORT - } VAEncryptionStatus; - --/** \brief structure for encrypted segment info. */ --typedef struct _VAEncryptionSegmentInfo { -- /** \brief The offset relative to the start of the bitstream input in -- * bytes of the start of the segment*/ -- uint32_t segment_start_offset; -- /** \brief The length of the segments in bytes*/ -- uint32_t segment_length; -- /** \brief The length in bytes of the remainder of an incomplete block -- * from a previous segment*/ -- uint32_t partial_aes_block_size; -- /** \brief The length in bytes of the initial clear data */ -- uint32_t init_byte_length; -- /** \brief This will be AES 128 counter for secure decode and secure -- * encode when numSegments equals 1 */ -- uint8_t aes_cbc_iv_or_ctr[16]; -- /** \brief Reserved bytes for future use, must be zero */ -- uint32_t va_reserved[VA_PADDING_MEDIUM]; --} VAEncryptionSegmentInfo; -- --/** \brief encryption parameters, corresponding to -- * #VAEncryptionParameterBufferType*/ --typedef struct _VAEncryptionParameters { -- /** \brief Encryption type, attribute values. */ -- uint32_t encryption_type; -- /** \brief The number of sengments */ -- uint32_t num_segments; -- /** \brief Pointer of segments */ -- VAEncryptionSegmentInfo* segment_info; -- /** \brief The status report index for CENC workload. -- * The value is to indicate CENC workload and needs to be -- * different for each CENC workload */ -- uint32_t status_report_index; -- /** \brief CENC counter length */ -- uint32_t size_of_length; -- /** \brief Wrapped decrypt blob (Snd)kb */ -- uint8_t wrapped_decrypt_blob[16]; -- /** \brief Wrapped Key blob info (Sne)kb */ -- uint8_t wrapped_encrypt_blob[16]; -- /** \brief Indicates the number of 16-byte BLOCKS that are encrypted in any -- * given encrypted region of segments. -- * If this value is zero: -- * 1. All bytes in encrypted region of segments are encrypted, i.e. the -- * CENC or CBC1 scheme is being used -- * 2. blocks_stripe_clear must also be zero. -- * If this value is non-zero, blocks_stripe_clear must also be non-zero. */ -- uint32_t blocks_stripe_encrypted; -- /** \brief Indicates the number of 16-byte BLOCKS that are clear in any given -- * encrypted region of segments, as defined by the CENS and CBCS schemes in -- * the common encryption spec. -- * If this value is zero, all bytes in encrypted region of segments are -- * encrypted, i.e. the CENC or CBC1 scheme is being used. -- */ -- uint32_t blocks_stripe_clear; -- /** \brief Reserved bytes for future use, must be zero */ -- uint32_t va_reserved[VA_PADDING_MEDIUM]; --} VAEncryptionParameters; -- - /** \brief structure for VA_TEE_EXEC_GPU_FUNCID_ENCRYPTION_BLT */ - typedef struct _VA_PROTECTED_BLT_PARAMS { - uint8_t* src_resource; // The source resource which contains the clear data. |