virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

configure: fix vulkan dep for libglslang based filters

Browse Source 
Temporary fix until the filters are updated.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2021-04-29 21:22:11 -03:00
parent 49e3a844ba
commit 036bb53ccc
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
configure vendored
View File

@@ -3551,7 +3551,7 @@ ass_filter_deps="libass"
atempo_filter_deps="avcodec" atempo_filter_deps="avcodec"
atempo_filter_select="rdft" atempo_filter_select="rdft"
avgblur_opencl_filter_deps="opencl" avgblur_opencl_filter_deps="opencl"
avgblur_vulkan_filter_deps="vulkan libglslang" avgblur_vulkan_filter_deps="vulkan_lib libglslang"
azmq_filter_deps="libzmq" azmq_filter_deps="libzmq"
blackframe_filter_deps="gpl" blackframe_filter_deps="gpl"
bm3d_filter_deps="avcodec" bm3d_filter_deps="avcodec"
@@ -3559,7 +3559,7 @@ bm3d_filter_select="dct"
boxblur_filter_deps="gpl" boxblur_filter_deps="gpl"
boxblur_opencl_filter_deps="opencl gpl" boxblur_opencl_filter_deps="opencl gpl"
bs2b_filter_deps="libbs2b" bs2b_filter_deps="libbs2b"
chromaber_vulkan_filter_deps="vulkan libglslang" chromaber_vulkan_filter_deps="vulkan_lib libglslang"
colorkey_opencl_filter_deps="opencl" colorkey_opencl_filter_deps="opencl"
colormatrix_filter_deps="gpl" colormatrix_filter_deps="gpl"
convolution_opencl_filter_deps="opencl" convolution_opencl_filter_deps="opencl"
@@ -3624,7 +3624,7 @@ openclsrc_filter_deps="opencl"
overlay_opencl_filter_deps="opencl" overlay_opencl_filter_deps="opencl"
overlay_qsv_filter_deps="libmfx" overlay_qsv_filter_deps="libmfx"
overlay_qsv_filter_select="qsvvpp" overlay_qsv_filter_select="qsvvpp"
overlay_vulkan_filter_deps="vulkan libglslang" overlay_vulkan_filter_deps="vulkan_lib libglslang"
owdenoise_filter_deps="gpl" owdenoise_filter_deps="gpl"
pad_opencl_filter_deps="opencl" pad_opencl_filter_deps="opencl"
pan_filter_deps="swresample" pan_filter_deps="swresample"
@@ -3693,7 +3693,7 @@ zmq_filter_deps="libzmq"
zoompan_filter_deps="swscale" zoompan_filter_deps="swscale"
zscale_filter_deps="libzimg const_nan" zscale_filter_deps="libzimg const_nan"
scale_vaapi_filter_deps="vaapi" scale_vaapi_filter_deps="vaapi"
scale_vulkan_filter_deps="vulkan libglslang" scale_vulkan_filter_deps="vulkan_lib libglslang"
vpp_qsv_filter_deps="libmfx" vpp_qsv_filter_deps="libmfx"
vpp_qsv_filter_select="qsvvpp" vpp_qsv_filter_select="qsvvpp"
xfade_opencl_filter_deps="opencl" xfade_opencl_filter_deps="opencl"
@@ -6390,7 +6390,7 @@ enabled fontconfig && enable libfontconfig
enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lvulkan -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ enabled libglslang && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu || enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
require libgme gme/gme.h gme_new_emu -lgme -lstdc++; } require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
@@ -6769,9 +6769,12 @@ enabled vdpau &&
enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
enabled vulkan && if enabled vulkan; then
{ require_pkg_config_cpp vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" "defined VK_VERSION_1_1" || require_pkg_config_cpp vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" "defined VK_VERSION_1_1" ||
require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_1"; } require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_1"
# vulkan_lib should be removed once glslang filters are updated
check_pkg_config vulkan_lib "vulkan >= 1.1.97" "vulkan/vulkan.h" vkCreateInstance
fi
if enabled x86; then if enabled x86; then
case $target_os in case $target_os in