RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

meson: remove unneccesary shaderc_static check 

shaderc is a special case dependency in meson. According to the
documentation*, it first checks for shaderc_shared and will fallback to
shaderc_combined (the order is reversed if the static keyword is true).
However, shaderc also has a third .pc file (shaderc_static) which should
be checked. The meson documentation doesn't indicate this, but it also
actually checks shaderc_static*. shaderc_combined is first checked if
meson looks for static libs and if that is not found it tries
shaderc_static. So this extra fallback check is not needed.

*: https://mesonbuild.com/Dependencies.html#shaderc
*: a2934ca9d1/mesonbuild/dependencies/misc.py (L539)
This commit is contained in:
Dudemanguy 2021-12-19 11:41:34 -06:00
parent 2858073fd0
commit 2db7a148d3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -997,7 +997,7 @@ if sdl2_video.allowed()
sources += files('video/out/vo_sdl.c')
endif
shaderc = dependency('shaderc', 'shaderc_static', required: get_option('shaderc'))
shaderc = dependency('shaderc', required: get_option('shaderc'))
if shaderc.found()
dependencies += shaderc
features += shaderc.name()