PR #22699 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22699 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/22699.patch
Vulkan was soft enabled, so this check has no reason to call die() >From b47a4598677f009cafc860803aef1bfa1ffd1a71 Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Fri, 3 Apr 2026 16:53:58 -0300 Subject: [PATCH] configure: don't abort if spirv-headers are not present Vulkan was soft enabled, so this check has no reason to call die() Signed-off-by: James Almer <[email protected]> --- configure | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 603e8c3860..32db36cee4 100755 --- a/configure +++ b/configure @@ -7796,6 +7796,9 @@ enabled vdpau && check_lib vdpau_x11 "vdpau/vdpau.h vdpau/vdpau_x11.h" vdp_device_create_x11 -lvdpau -lX11 # Check for the Vulkan headers +if enabled vulkan; then + check_cpp_condition vulkan "spirv/unified1/spirv.h" "defined(SPV_VERSION)" +fi if enabled_all vulkan vulkan_static; then check_pkg_config vulkan "vulkan >= 1.3.277" "vulkan/vulkan.h" "defined VK_VERSION_1_3" || check_lib vulkan "vulkan/vulkan.h" vkGetInstanceProcAddr -lvulkan @@ -7804,10 +7807,6 @@ elif enabled vulkan; then check_cpp_condition vulkan "vulkan/vulkan.h" "defined(VK_VERSION_1_4) || (defined(VK_VERSION_1_3) && VK_HEADER_VERSION >= 277)" $vulkan_incflags fi -if enabled vulkan; then - check_cpp_condition vulkan "spirv/unified1/spirv.h" "defined(SPV_VERSION)" || die "spirv-headers is required to build with Vulkan support enabled." -fi - probe_glslc(){ glslc_probe=$1 if test_cmd $glslc_probe -v; then -- 2.52.0 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
