From 7d80f36576a764197c3438c29c4d7cc54c588408 Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 28 Mar 2025 22:47:21 +0100 Subject: [PATCH 1/4] Latest libvvenc should be fixed --- scripts.d/50-vvenc.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts.d/50-vvenc.sh b/scripts.d/50-vvenc.sh index fd32d8091a..77ab0b7074 100755 --- a/scripts.d/50-vvenc.sh +++ b/scripts.d/50-vvenc.sh @@ -1,15 +1,12 @@ #!/bin/bash SCRIPT_REPO="https://github.com/fraunhoferhhi/vvenc.git" -SCRIPT_COMMIT="bde56fd61d5d6fcd8fac4bab0faa4da813928bb3" +SCRIPT_COMMIT="22de8fc9e1f5ab7c4ca1cef6cecf0d9d9e42ca9d" ffbuild_enabled() { [[ $TARGET != *32 ]] || return -1 (( $(ffbuild_ffver) > 700 )) || return -1 - # vvenc force-enabled avx2 and equivalent compiler options, and uses a static initializer that promptly - # runs such instructions. Making resulting binaries malfunction on any but the very latest CPUs. - # Until upstream fixes this behaviour, force-disable vvenc. - return -1 + return 0 } ffbuild_dockerbuild() { From 6182351e61e28c11d07770b6e50ea03fe756d39f Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 28 Mar 2025 23:12:40 +0100 Subject: [PATCH 2/4] Fix libvvenc clang build --- scripts.d/50-vvenc.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts.d/50-vvenc.sh b/scripts.d/50-vvenc.sh index 77ab0b7074..4197393d57 100755 --- a/scripts.d/50-vvenc.sh +++ b/scripts.d/50-vvenc.sh @@ -19,6 +19,9 @@ ffbuild_dockerbuild() { if [[ "$CC" != *clang* ]]; then export CFLAGS="$CFLAGS -fpermissive -Wno-error=uninitialized -Wno-error=maybe-uninitialized" export CXXFLAGS="$CXXFLAGS -fpermissive -Wno-error=uninitialized -Wno-error=maybe-uninitialized" + else + export CFLAGS="$CFLAGS -Wno-error=deprecated-literal-operator" + export CXXFLAGS="$CXXFLAGS -Wno-error=deprecated-literal-operator" fi fi From a5b1f0068cdf3b7ae2238c3b76331b9ecc947e75 Mon Sep 17 00:00:00 2001 From: BtbN Date: Sat, 29 Mar 2025 19:22:00 +0100 Subject: [PATCH 3/4] Update to fixed libplacebo --- scripts.d/50-vulkan/60-libplacebo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 787ced48ef..9fc09190b0 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -1,7 +1,7 @@ #!/bin/bash SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" -SCRIPT_COMMIT="02f4f9862395d0379a0ec654345f52daf81e1aee" +SCRIPT_COMMIT="563ea4a1a23237c0acd9f0ba29f5166ebcd5cf60" ffbuild_enabled() { [[ $ADDINS_STR == *4.4* ]] && return -1 From 3c50fd2ef6701ff8d85b81043efb21c15ee48ecf Mon Sep 17 00:00:00 2001 From: BtbN Date: Mon, 31 Mar 2025 20:56:01 +0200 Subject: [PATCH 4/4] Shrink libplacebo submodule download --- scripts.d/50-vulkan/60-libplacebo.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts.d/50-vulkan/60-libplacebo.sh b/scripts.d/50-vulkan/60-libplacebo.sh index 9fc09190b0..8a286ef2d3 100755 --- a/scripts.d/50-vulkan/60-libplacebo.sh +++ b/scripts.d/50-vulkan/60-libplacebo.sh @@ -4,16 +4,13 @@ SCRIPT_REPO="https://code.videolan.org/videolan/libplacebo.git" SCRIPT_COMMIT="563ea4a1a23237c0acd9f0ba29f5166ebcd5cf60" ffbuild_enabled() { - [[ $ADDINS_STR == *4.4* ]] && return -1 - [[ $ADDINS_STR == *5.0* ]] && return -1 - [[ $ADDINS_STR == *5.1* ]] && return -1 - [[ $ADDINS_STR == *6.0* ]] && return -1 + (( $(ffbuild_ffver) > 600 )) || return -1 return 0 } ffbuild_dockerdl() { default_dl . - echo "git submodule update --init --recursive" + echo "git submodule update --init --recursive --depth=1 --filter=blob:none" } ffbuild_dockerbuild() {