From 3f221f72919efa3853e0f3678b4b57c61e9aca89 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 23 May 2021 11:10:32 +0200 Subject: [PATCH] electron12: update to 12.0.9. --- .../patches/chromium-fix-libva-redef.patch | 86 +++++++++++++++++++ srcpkgs/electron12/template | 8 +- 2 files changed, 90 insertions(+), 4 deletions(-) create mode 100644 srcpkgs/electron12/files/patches/chromium-fix-libva-redef.patch diff --git a/srcpkgs/electron12/files/patches/chromium-fix-libva-redef.patch b/srcpkgs/electron12/files/patches/chromium-fix-libva-redef.patch new file mode 100644 index 00000000000..b9f27881d94 --- /dev/null +++ b/srcpkgs/electron12/files/patches/chromium-fix-libva-redef.patch @@ -0,0 +1,86 @@ +--- third_party/libva_protected_content/va_protected_content.h ++++ 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. diff --git a/srcpkgs/electron12/template b/srcpkgs/electron12/template index a45f3caf882..51c50b0f74a 100644 --- a/srcpkgs/electron12/template +++ b/srcpkgs/electron12/template @@ -1,8 +1,8 @@ # Template file for 'electron12' pkgname=electron12 -version=12.0.4 +version=12.0.9 _nodever=14.16.0 -_chromiumver=89.0.4389.114 +_chromiumver=89.0.4389.128 revision=1 archs="x86_64* i686* aarch64* ppc64le*" build_wrksrc="src" @@ -31,8 +31,8 @@ homepage="https://electronjs.org" distfiles="https://github.com/electron/electron/archive/v$version.tar.gz>electron-${version}.tar.gz https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$_chromiumver.tar.xz https://github.com/nodejs/node/archive/v$_nodever.tar.gz>node-$_nodever.tar.gz" -checksum="0be3860a58c1bfbf058dfdb3e6ab2bcefad5b060bac3b5c4718183446f998f33 - f2f0abe9697a220a8545df74d832c6c8d85a4fb11845e7e398752d746e72ed00 +checksum="1b4073baa3e93bb410591688b7ca6e59201ae9c8cf18f05e5a05ecfd7ffebfc8 + 1a75ea6aeb98f2d3b6feae1fbf5692679e93d5b7631bc7c762dd873499deda5b bcdf869b0743405515ee897b1047b5e851a717e426b4974d26537c9b10dfd53a" case "$XBPS_TARGET_MACHINE" in