From 64a412c9b688941292da550bd5c10303ce748c63 Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Wed, 23 Feb 2022 19:42:10 +0100 Subject: extra/linux-zen: 5.16.8-zen1 -> 5.16.10-zen1 --- extra/ffmpeg/PKGBUILD | 9 ++++++++- extra/linux-zen/PKGBUILD | 4 ++-- extra/linux-zen/config | 10 +++++----- 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD index 8d7c47cb..9bb8b8fb 100644 --- a/extra/ffmpeg/PKGBUILD +++ b/extra/ffmpeg/PKGBUILD @@ -1,5 +1,4 @@ # disable LTO (breaks with too few registers in error: 'asm' operand has impossible constraints -# also disable mfx - libmfx does not compile eval "$( declare -f build | \ sed ' @@ -7,7 +6,15 @@ declare -f build | \ s/--enable-libmfx/--disable-libmfx/ ' )" + +# also disable mfx - libmfx does not compile depends=(${depends[@]//libmfx/}) +eval "$( + declare -f build | \ + sed ' + s/--enable-libmfx/--disable-libmfx/ + ' +)" # no vamf for non-pentium4 if [ "$CARCH" == 'i686' ] || [ "$CARCH" == 'i486' ]; then diff --git a/extra/linux-zen/PKGBUILD b/extra/linux-zen/PKGBUILD index 69f6c7b3..91e5110d 100644 --- a/extra/linux-zen/PKGBUILD +++ b/extra/linux-zen/PKGBUILD @@ -2,8 +2,8 @@ # fail if upstream's .config changes for ((i=0; i<${#sha256sums[@]}; i++)); do - if [ "${sha256sums[${i}]}" = 'c2a9b42dbc3fa917726ac2a636c0af5f01829b3231fa8779ac04fb678cc4e3c3' ]; then - sha256sums[${i}]='91ed1a5bc875026c66ca7c7a3694f0c762784c7fdc74a1db01827d80144d773f' + if [ "${sha256sums[${i}]}" = '4fb8b32bd7f9b11fa9e546d705982500f8e6ae63e0a49b9d2f2931f86905648e' ]; then + sha256sums[${i}]='fce3bf96602478db279fa80a7e03eb2d4199e463e9f2b46ad3af5f088bf81172' fi done diff --git a/extra/linux-zen/config b/extra/linux-zen/config index 68d87bd3..9c3ee386 100644 --- a/extra/linux-zen/config +++ b/extra/linux-zen/config @@ -1,15 +1,15 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 5.16.8-zen1 Kernel Configuration +# Linux/x86 5.16.10-zen1 Kernel Configuration # -CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.1.0" +CONFIG_CC_VERSION_TEXT="gcc (GCC) 11.2.0" CONFIG_CC_IS_GCC=y -CONFIG_GCC_VERSION=110100 +CONFIG_GCC_VERSION=110200 CONFIG_CLANG_VERSION=0 CONFIG_AS_IS_GNU=y -CONFIG_AS_VERSION=23601 +CONFIG_AS_VERSION=23800 CONFIG_LD_IS_BFD=y -CONFIG_LD_VERSION=23601 +CONFIG_LD_VERSION=23800 CONFIG_LLD_VERSION=0 CONFIG_CC_HAS_ASM_GOTO=y CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y -- cgit v1.2.3-54-g00ecf