[arch-commits] Commit in chromium/trunk (4 files)
Evangelos Foutras
foutrelis at archlinux.org
Thu Apr 15 01:53:19 UTC 2021
Date: Thursday, April 15, 2021 @ 01:53:19
Author: foutrelis
Revision: 412473
upgpkg: chromium 90.0.4430.72-1: new upstream release
Added:
chromium/trunk/add-clang-nomerge-attribute-to-CheckError.patch
Modified:
chromium/trunk/PKGBUILD
Deleted:
chromium/trunk/add-dependency-on-opus-in-webcodecs.patch
chromium/trunk/chromium-fix-libva-redef.patch
-------------------------------------------------+
PKGBUILD | 25 ++----
add-clang-nomerge-attribute-to-CheckError.patch | 62 +++++++++++++++
add-dependency-on-opus-in-webcodecs.patch | 43 -----------
chromium-fix-libva-redef.patch | 86 ----------------------
4 files changed, 72 insertions(+), 144 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-14 20:59:59 UTC (rev 412472)
+++ PKGBUILD 2021-04-15 01:53:19 UTC (rev 412473)
@@ -4,10 +4,10 @@
# Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
pkgname=chromium
-pkgver=89.0.4389.128
+pkgver=90.0.4430.72
pkgrel=1
_launcher_ver=7
-_gcc_patchset=7
+_gcc_patchset=6
pkgdesc="A web browser built for speed, simplicity, and security"
arch=('x86_64')
url="https://www.chromium.org/Home"
@@ -24,16 +24,14 @@
source=(https://commondatastorage.googleapis.com/chromium-browser-official/$pkgname-$pkgver.tar.xz
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-glibc-2.33.patch
- chromium-fix-libva-redef.patch
use-oauth2-client-switches-as-default.patch)
-sha256sums=('1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b'
+sha256sums=('a5cc88ca8fffac21ec4d1646980f698dfb6f388a225dd7a2c5a3d252a4098943'
'86859c11cfc8ba106a3826479c0bc759324a62150b271dd35d1a0f96e890f52f'
- 'f8b1558f6c87b33423da854d42f0f69d47885a96d6bf6ce7f26373e93d47442f'
- 'b86b11de8db438c47f0a84c7956740f648d21035f4ee46bfbd50c3348d369121'
+ '3eb9580ea35a96789e02815270498226fa33726f4210a5ee36f3868af2ffae1f'
+ '5e22afcb91b5402bc09e80630c5323d61013c3fccb0bbd9b23d1e79a400b00d0'
'2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b'
- 'de9eb3612d44616a500c2eccdffac814eb90ad9a868cc1030d17fc6783d544e2'
'e393174d7695d0bafed69e868c5fbfecf07aa6969f3b64596d0bae8b067e1711')
# Possible replacements are listed in build/linux/unbundle/replace_gn_files.py
@@ -91,15 +89,12 @@
# 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
+ # Revert addition of [[clang::nomerge]] attribute; not supported by clang 11
+ patch -Rp1 -d base <../add-clang-nomerge-attribute-to-CheckError.patch
- # Upstream fixes
- patch -Np1 -i ../add-dependency-on-opus-in-webcodecs.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
# Force script incompatible with Python 3 to use /usr/bin/python2
sed -i '1s|python$|&2|' third_party/dom_distiller_js/protoc_plugins/*.py
Added: add-clang-nomerge-attribute-to-CheckError.patch
===================================================================
--- add-clang-nomerge-attribute-to-CheckError.patch (rev 0)
+++ add-clang-nomerge-attribute-to-CheckError.patch 2021-04-15 01:53:19 UTC (rev 412473)
@@ -0,0 +1,62 @@
+From 209bf5cdfc095516ba9e391dd52ce16a74114ae6 Mon Sep 17 00:00:00 2001
+From: Zequan Wu <zequanwu at 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 at chromium.org>
+> Auto-Submit: Zequan Wu <zequanwu at google.com>
+> Reviewed-by: Nico Weber <thakis at 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 at chromium.org>
+Commit-Queue: Nico Weber <thakis at chromium.org>
+Commit-Queue: Zequan Wu <zequanwu at 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_
Deleted: add-dependency-on-opus-in-webcodecs.patch
===================================================================
--- add-dependency-on-opus-in-webcodecs.patch 2021-04-14 20:59:59 UTC (rev 412472)
+++ add-dependency-on-opus-in-webcodecs.patch 2021-04-15 01:53:19 UTC (rev 412473)
@@ -1,43 +0,0 @@
-From b5b80df7dafba8cafa4c6c0ba2153dfda467dfc9 Mon Sep 17 00:00:00 2001
-From: Stephan Hartmann <stha09 at 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 at chromium.org>
-Commit-Queue: Dale Curtis <dalecurtis at 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",
Deleted: chromium-fix-libva-redef.patch
===================================================================
--- chromium-fix-libva-redef.patch 2021-04-14 20:59:59 UTC (rev 412472)
+++ chromium-fix-libva-redef.patch 2021-04-15 01:53:19 UTC (rev 412473)
@@ -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.
More information about the arch-commits
mailing list