[arch-commits] Commit in electron/trunk (PKGBUILD chromium-fix-libva-redef.patch)
Nicola Squartini
tensor5 at archlinux.org
Thu Apr 1 11:39:23 UTC 2021
Date: Thursday, April 1, 2021 @ 11:39:23
Author: tensor5
Revision: 910797
upgpkg: electron 12.0.2-1
Added:
electron/trunk/chromium-fix-libva-redef.patch
Modified:
electron/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 14 ++++--
chromium-fix-libva-redef.patch | 86 +++++++++++++++++++++++++++++++++++++++
2 files changed, 96 insertions(+), 4 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-01 11:32:44 UTC (rev 910796)
+++ PKGBUILD 2021-04-01 11:39:23 UTC (rev 910797)
@@ -1,9 +1,9 @@
# Maintainer: Nicola Squartini <tensor5 at gmail.com>
pkgname=electron
-pkgver=12.0.1
-_commit=05972074e3f1022866ccb31ce259cc82a31dac36
-_chromiumver=89.0.4389.82
+pkgver=12.0.2
+_commit=17c970b6a2fd07ac3c63809c25831e7aba8775f0
+_chromiumver=89.0.4389.90
_gcc_patchset=7
pkgrel=1
pkgdesc='Build cross platform desktop apps with web technologies'
@@ -14,9 +14,10 @@
'nss' 're2' 'snappy')
makedepends=('clang' 'git' 'gn-m87' 'gperf' 'harfbuzz-icu' 'http-parser'
'java-runtime-headless' 'jsoncpp' 'libnotify' 'lld' 'llvm' 'ninja'
- 'npm' 'pciutils' 'yarn' 'python2' 'wget')
+ 'npm' 'pciutils' 'pipewire' 'python2' 'wget' 'yarn')
optdepends=('kde-cli-tools: file deletion support (kioclient5)'
'libappindicator-gtk3: StatusNotifierItem support'
+ 'pipewire: WebRTC desktop sharing under Wayland'
'trash-cli: file deletion support (trash-put)'
"xdg-utils: open URLs with desktop's default (xdg-email, xdg-open)")
source=('git+https://github.com/electron/electron.git'
@@ -27,6 +28,7 @@
'default_app-icon.patch'
'use-system-libraries-in-node.patch'
'add-dependency-on-opus-in-webcodecs.patch'
+ 'chromium-fix-libva-redef.patch'
'chromium-glibc-2.33.patch'
'x11-ozone-fix-two-edge-cases.patch'
)
@@ -38,6 +40,7 @@
'dd2d248831dd4944d385ebf008426e66efe61d6fdf66f8932c963a12167947b4'
'f16103daf05713dea632b5f01e45db20ff12d1770a6539b4e8d3957a0242dd54'
'b86b11de8db438c47f0a84c7956740f648d21035f4ee46bfbd50c3348d369121'
+ 'de9eb3612d44616a500c2eccdffac814eb90ad9a868cc1030d17fc6783d544e2'
'2fccecdcd4509d4c36af873988ca9dbcba7fdb95122894a9fdf502c33a1d7a4b'
'9e4743bdeaf5b668659ad53400e3977006916aac3a7ba045bbc750b7b4cbf274'
)
@@ -129,6 +132,7 @@
patch -Np1 -i ../patches/chromium-89-AXTreeSerializer-include.patch
patch -Np1 -i ../add-dependency-on-opus-in-webcodecs.patch
+ patch -Np1 -i ../chromium-fix-libva-redef.patch
patch -Np1 -i ../chromium-glibc-2.33.patch
patch -Np1 -i ../x11-ozone-fix-two-edge-cases.patch
patch -Np1 -i ../use-system-libraries-in-node.patch
@@ -175,6 +179,8 @@
icu_use_data_file = false
is_component_ffmpeg = false
link_pulseaudio = true
+ rtc_pipewire_version = "0.3"
+ rtc_use_pipewire = true
treat_warnings_as_errors = false
use_custom_libcxx = false
use_gnome_keyring = false
Added: chromium-fix-libva-redef.patch
===================================================================
--- chromium-fix-libva-redef.patch (rev 0)
+++ chromium-fix-libva-redef.patch 2021-04-01 11:39:23 UTC (rev 910797)
@@ -0,0 +1,86 @@
+--- 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