Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions scripts.d/50-vulkan/60-libplacebo.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
#!/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
[[ $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() {
Expand Down
10 changes: 5 additions & 5 deletions scripts.d/50-vvenc.sh
Original file line number Diff line number Diff line change
@@ -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() {
Expand All @@ -22,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

Expand Down
Loading