Update deps, small changes and cleanup

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 40 insertions, 0 deletions

diff --git a/subprojects/packagefiles/libplacebo/glslang_meson_wrap.diff b/subprojects/packagefiles/libplacebo/glslang_meson_wrap.diff
new file mode 100644
index 0000000..d722bef
--- /dev/null
+++ b/subprojects/packagefiles/libplacebo/glslang_meson_wrap.diff
@@ -0,0 +1,40 @@
+diff --git a/src/glsl/meson.build b/src/glsl/meson.build
+index c9a8542..499042a 100644
+--- a/src/glsl/meson.build
++++ b/src/glsl/meson.build
+@@ -30,7 +30,7 @@ if glslang_req.auto() and shaderc.found()
+ elif not glslang_req.disabled()
+ 
+   glslang_deps = [
+-    cxx.find_library('glslang-default-resource-limits', required: false)
++    dependency('glslang-default-resource-limits', required: false)
+   ]
+ 
+   # meson doesn't respect generator expressions in INTERFACE_LINK_LIBRARIES
+@@ -49,7 +49,7 @@ elif not glslang_req.disabled()
+     static   = arg[0]
+     required = arg[1]
+ 
+-    spirv = cxx.find_library('SPIRV', required: required, static: static, dirs: vulkan_lib_dirs)
++    spirv = dependency('SPIRV', required: required, static: static)
+ 
+     if not spirv.found()
+       continue
+@@ -59,7 +59,7 @@ elif not glslang_req.disabled()
+ 
+     # Glslang 15.0.0 moved some code around, add also linking to glslang, while
+     # this is not needed for older versions, it will still work.
+-    glslang_deps += cxx.find_library('glslang', required: required, static: static)
++    glslang_deps += dependency('glslang', required: required, static: static)
+ 
+     if static
+       glslang_deps += [
+@@ -78,7 +78,7 @@ elif not glslang_req.disabled()
+     break
+   endforeach
+ 
+-  if found_lib and cc.has_header('glslang/build_info.h')
++  if found_lib
+     glslang = declare_dependency(dependencies: glslang_deps)
+   endif
+