PR #21440 opened by James Almer (jamrial) URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21440 Patch URL: https://code.ffmpeg.org/FFmpeg/FFmpeg/pulls/21440.patch
>From 5ceba4ba596a36944010dec77ad9c340da662577 Mon Sep 17 00:00:00 2001 From: James Almer <[email protected]> Date: Mon, 12 Jan 2026 16:42:34 -0300 Subject: [PATCH] configure: fix glslc checks and add missing dependencies to relevant modules Signed-off-by: James Almer <[email protected]> --- configure | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/configure b/configure index d0f6dd3a9b..41c80cf100 100755 --- a/configure +++ b/configure @@ -2103,6 +2103,7 @@ HWACCEL_AUTODETECT_LIBRARY_LIST=" vdpau videotoolbox vulkan + vulkan_glslc v4l2_m2m " @@ -3316,7 +3317,7 @@ av1_videotoolbox_hwaccel_deps="videotoolbox" av1_videotoolbox_hwaccel_select="av1_decoder" av1_vulkan_hwaccel_deps="vulkan" av1_vulkan_hwaccel_select="av1_decoder" -dpx_vulkan_hwaccel_deps="vulkan" +dpx_vulkan_hwaccel_deps="vulkan vulkan_glslc" dpx_vulkan_hwaccel_select="dpx_decoder" ffv1_vulkan_hwaccel_deps="vulkan spirv_library" ffv1_vulkan_hwaccel_select="ffv1_decoder" @@ -3396,9 +3397,9 @@ mpeg4_videotoolbox_hwaccel_deps="videotoolbox" mpeg4_videotoolbox_hwaccel_select="mpeg4_decoder" prores_videotoolbox_hwaccel_deps="videotoolbox" prores_videotoolbox_hwaccel_select="prores_decoder" -prores_raw_vulkan_hwaccel_deps="vulkan" +prores_raw_vulkan_hwaccel_deps="vulkan vulkan_glslc" prores_raw_vulkan_hwaccel_select="prores_raw_decoder" -prores_vulkan_hwaccel_deps="vulkan" +prores_vulkan_hwaccel_deps="vulkan vulkan_glslc" prores_vulkan_hwaccel_select="prores_decoder" vc1_d3d11va_hwaccel_deps="d3d11va" vc1_d3d11va_hwaccel_select="vc1_decoder" @@ -4035,7 +4036,7 @@ aresample_filter_deps="swresample" asr_filter_deps="pocketsphinx" ass_filter_deps="libass" avgblur_opencl_filter_deps="opencl" -avgblur_vulkan_filter_deps="vulkan" +avgblur_vulkan_filter_deps="vulkan vulkan_glslc" azmq_filter_deps="libzmq" blackdetect_vulkan_filter_deps="vulkan spirv_library" blackframe_filter_deps="gpl" @@ -4045,7 +4046,7 @@ boxblur_opencl_filter_deps="opencl gpl" bs2b_filter_deps="libbs2b" bwdif_cuda_filter_deps="ffnvcodec" bwdif_cuda_filter_deps_any="cuda_nvcc cuda_llvm" -bwdif_vulkan_filter_deps="vulkan" +bwdif_vulkan_filter_deps="vulkan vulkan_glslc" chromaber_vulkan_filter_deps="vulkan spirv_library" color_vulkan_filter_deps="vulkan spirv_library" colorkey_opencl_filter_deps="opencl" @@ -4186,7 +4187,7 @@ zoompan_filter_deps="swscale" zscale_filter_deps="libzimg const_nan" scale_vaapi_filter_deps="vaapi" scale_vt_filter_deps="videotoolbox VTPixelTransferSessionCreate" -scale_vulkan_filter_deps="vulkan spirv_library" +scale_vulkan_filter_deps="vulkan vulkan_glslc" vpp_qsv_filter_deps="libmfx" vpp_qsv_filter_select="qsvvpp" xfade_opencl_filter_deps="opencl" @@ -7701,16 +7702,11 @@ probe_glslc(){ glslc_debug="-g" GLSLC_DEPFLAGS='-MD -MF $(@:.spv=.d) -MT $@' else + disable vulkan_glslc return 1 fi - check_glslc vulkan -} + check_glslc vulkan_glslc || return 0 -if enabled vulkan; then - for program in $glslc glslc glslang glslangValidator; do - probe_glslc $program && break - done - disabled vulkan && warn "glslc/glslang not found or too old, disabling Vulkan." append GLSLCFLAGS $glslcflags if enabled small; then append GLSLCFLAGS $glslc_opt_size @@ -7720,10 +7716,14 @@ if enabled vulkan; then append GLSLCFLAGS $glslc_opt_none fi enabled debug && append GLSLCFLAGS $glslc_debug -fi +} -if disabled vulkan; then - disable libglslang libshaderc spirv_library +if enabled vulkan; then + for program in $glslc glslc glslang glslangValidator; do + probe_glslc $program && break + done +else + disable libglslang libshaderc spirv_library vulkan_glslc fi if enabled x86; then -- 2.49.1 _______________________________________________ ffmpeg-devel mailing list -- [email protected] To unsubscribe send an email to [email protected]
