aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLynne <dev@lynne.ee>2024-10-07 11:31:27 +0200
committerLynne <dev@lynne.ee>2024-10-09 00:59:33 +0200
commit204558cee880e02483ba6154bcc4fc94e88d7ef5 (patch)
tree97707382fab5b280e75000d029c2f9c341c26437
parent57b7e96b04b19cf7ce26d07d8fd5f76d19f380c5 (diff)
downloadffmpeg-204558cee880e02483ba6154bcc4fc94e88d7ef5.tar.gz
configure: explicitly disable spirv_compiler
spirv_compiler is an undeclared variable that was spontaneously enabled if libshaderc or libglslang were detected, and served as a way to enable filters. However, it being undeclared had the effect that it was neither considered explicitly disabled nor enabled if libshaderc or libglslang were detected. The only category we have which explicitly disables variables is EXTERNAL_LIBRARY_LIST, however, spirv_compiler is not a real external library, and making it present there would report its detection on ./configure.
-rwxr-xr-xconfigure9
1 files changed, 9 insertions, 0 deletions
diff --git a/configure b/configure
index 461586cdb8..aad87da507 100755
--- a/configure
+++ b/configure
@@ -6553,6 +6553,15 @@ if test -n "$custom_allocator"; then
add_extralibs "$custom_allocator_extralibs"
fi
+# Unlike other feature flags or libraries, spirv_compiler is not defined
+# within any of our predefined categories of components.
+# It gets defined if either libshaderc or libglslang check succeeds.
+# As such, its in a state of neither being explicitly enabled, nor
+# explicitly disabled, but even in this state, being mentioned in
+# _deps results in it always passing.
+# Disable it explicitly to fix this.
+disable spirv_compiler
+
check_func_headers malloc.h _aligned_malloc && enable aligned_malloc
check_func ${malloc_prefix}memalign && enable memalign
check_func ${malloc_prefix}posix_memalign && enable posix_memalign