History

configure: fix vulkan dep for libglslang based filters

Temporary fix until the filters are updated.

James Almer committed 5 years ago

Commit 036bb531 parent 49e3a841 file · +11 −8Browse files

Unified · Split

configure+11−8
@@ -3551,7 +3551,7 @@ ass_filter_deps="libass" · 3550 unmodified lines
35513551 atempo_filter_deps="avcodec"
35523552 atempo_filter_select="rdft"
35533553 avgblur_opencl_filter_deps="opencl"
3554−avgblur_vulkan_filter_deps="vulkan libglslang"
3554+avgblur_vulkan_filter_deps="vulkan_lib libglslang"
35553555 azmq_filter_deps="libzmq"
35563556 blackframe_filter_deps="gpl"
35573557 bm3d_filter_deps="avcodec"
@@ -3559,7 +3559,7 @@ bm3d_filter_select="dct" · 1 unmodified line
35593559 boxblur_filter_deps="gpl"
35603560 boxblur_opencl_filter_deps="opencl gpl"
35613561 bs2b_filter_deps="libbs2b"
3562−chromaber_vulkan_filter_deps="vulkan libglslang"
3562+chromaber_vulkan_filter_deps="vulkan_lib libglslang"
35633563 colorkey_opencl_filter_deps="opencl"
35643564 colormatrix_filter_deps="gpl"
35653565 convolution_opencl_filter_deps="opencl"
@@ -3624,7 +3624,7 @@ openclsrc_filter_deps="opencl" · 58 unmodified lines
36243624 overlay_opencl_filter_deps="opencl"
36253625 overlay_qsv_filter_deps="libmfx"
36263626 overlay_qsv_filter_select="qsvvpp"
3627−overlay_vulkan_filter_deps="vulkan libglslang"
3627+overlay_vulkan_filter_deps="vulkan_lib libglslang"
36283628 owdenoise_filter_deps="gpl"
36293629 pad_opencl_filter_deps="opencl"
36303630 pan_filter_deps="swresample"
@@ -3693,7 +3693,7 @@ zmq_filter_deps="libzmq" · 62 unmodified lines
36933693 zoompan_filter_deps="swscale"
36943694 zscale_filter_deps="libzimg const_nan"
36953695 scale_vaapi_filter_deps="vaapi"
3696−scale_vulkan_filter_deps="vulkan libglslang"
3696+scale_vulkan_filter_deps="vulkan_lib libglslang"
36973697 vpp_qsv_filter_deps="libmfx"
36983698 vpp_qsv_filter_select="qsvvpp"
36993699 xfade_opencl_filter_deps="opencl"
@@ -6390,7 +6390,7 @@ enabled fontconfig && enable libfontconfig · 2690 unmodified lines
63906390 enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
63916391 enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
63926392 enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
6393−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++
6393+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++
63946394 enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
63956395 require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
63966396 enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
@@ -6769,9 +6769,12 @@ enabled vdpau && · 372 unmodified lines
67696769
67706770 enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
67716771
6772−enabled vulkan &&
6773− { require_pkg_config_cpp vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" "defined VK_VERSION_1_1" ||
6774− require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_1"; }
6772+if enabled vulkan; then
6773+ require_pkg_config_cpp vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" "defined VK_VERSION_1_1" ||
6774+ require_cpp_condition vulkan "vulkan/vulkan.h" "defined VK_VERSION_1_1"
6775+ # vulkan_lib should be removed once glslang filters are updated
6776+ check_pkg_config vulkan_lib "vulkan >= 1.1.97" "vulkan/vulkan.h" vkCreateInstance
6777+fi
67756778
67766779 if enabled x86; then
67776780 case $target_os in

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t