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
3551atempo_filter_deps="avcodec"3551atempo_filter_deps="avcodec"
3552atempo_filter_select="rdft"3552atempo_filter_select="rdft"
3553avgblur_opencl_filter_deps="opencl"3553avgblur_opencl_filter_deps="opencl"
3554avgblur_vulkan_filter_deps="vulkan libglslang"3554avgblur_vulkan_filter_deps="vulkan_lib libglslang"
3555azmq_filter_deps="libzmq"3555azmq_filter_deps="libzmq"
3556blackframe_filter_deps="gpl"3556blackframe_filter_deps="gpl"
3557bm3d_filter_deps="avcodec"3557bm3d_filter_deps="avcodec"
@@ -3559,7 +3559,7 @@ bm3d_filter_select="dct" · 1 unmodified line
3559boxblur_filter_deps="gpl"3559boxblur_filter_deps="gpl"
3560boxblur_opencl_filter_deps="opencl gpl"3560boxblur_opencl_filter_deps="opencl gpl"
3561bs2b_filter_deps="libbs2b"3561bs2b_filter_deps="libbs2b"
3562chromaber_vulkan_filter_deps="vulkan libglslang"3562chromaber_vulkan_filter_deps="vulkan_lib libglslang"
3563colorkey_opencl_filter_deps="opencl"3563colorkey_opencl_filter_deps="opencl"
3564colormatrix_filter_deps="gpl"3564colormatrix_filter_deps="gpl"
3565convolution_opencl_filter_deps="opencl"3565convolution_opencl_filter_deps="opencl"
@@ -3624,7 +3624,7 @@ openclsrc_filter_deps="opencl" · 58 unmodified lines
3624overlay_opencl_filter_deps="opencl"3624overlay_opencl_filter_deps="opencl"
3625overlay_qsv_filter_deps="libmfx"3625overlay_qsv_filter_deps="libmfx"
3626overlay_qsv_filter_select="qsvvpp"3626overlay_qsv_filter_select="qsvvpp"
3627overlay_vulkan_filter_deps="vulkan libglslang"3627overlay_vulkan_filter_deps="vulkan_lib libglslang"
3628owdenoise_filter_deps="gpl"3628owdenoise_filter_deps="gpl"
3629pad_opencl_filter_deps="opencl"3629pad_opencl_filter_deps="opencl"
3630pan_filter_deps="swresample"3630pan_filter_deps="swresample"
@@ -3693,7 +3693,7 @@ zmq_filter_deps="libzmq" · 62 unmodified lines
3693zoompan_filter_deps="swscale"3693zoompan_filter_deps="swscale"
3694zscale_filter_deps="libzimg const_nan"3694zscale_filter_deps="libzimg const_nan"
3695scale_vaapi_filter_deps="vaapi"3695scale_vaapi_filter_deps="vaapi"
3696scale_vulkan_filter_deps="vulkan libglslang"3696scale_vulkan_filter_deps="vulkan_lib libglslang"
3697vpp_qsv_filter_deps="libmfx"3697vpp_qsv_filter_deps="libmfx"
3698vpp_qsv_filter_select="qsvvpp"3698vpp_qsv_filter_select="qsvvpp"
3699xfade_opencl_filter_deps="opencl"3699xfade_opencl_filter_deps="opencl"
@@ -6390,7 +6390,7 @@ enabled fontconfig && enable libfontconfig · 2690 unmodified lines
6390enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit6390enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
6391enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType6391enabled libfreetype && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
6392enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info6392enabled libfribidi && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
6393enabled 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++6393enabled 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++
6394enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||6394enabled libgme && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
6395 require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }6395 require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
6396enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do6396enabled libgsm && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do
@@ -6769,9 +6769,12 @@ enabled vdpau && · 372 unmodified lines
6769 6769
6770enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd6770enabled crystalhd && check_lib crystalhd "stdint.h libcrystalhd/libcrystalhd_if.h" DtsCrystalHDVersion -lcrystalhd
6771 6771
6772enabled vulkan &&6772if enabled vulkan; then
6773 { require_pkg_config_cpp vulkan "vulkan >= 1.1.97" "vulkan/vulkan.h" "defined VK_VERSION_1_1" ||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"; }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
6777fi
6775 6778
6776if enabled x86; then6779if enabled x86; then
6777 case $target_os in6780 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