From 77b54c35bf9587450cd636e0d7df37e190e28bfb Mon Sep 17 00:00:00 2001 From: Andrew Opalach Date: Mon, 13 Apr 2026 17:01:47 -0400 Subject: Smaller stuff that went uncommitted Signed-off-by: Andrew Opalach --- .../libplacebo/dependency_version_override.diff | 59 ---------------------- 1 file changed, 59 deletions(-) delete mode 100644 subprojects/packagefiles/libplacebo/dependency_version_override.diff (limited to 'subprojects/packagefiles/libplacebo/dependency_version_override.diff') diff --git a/subprojects/packagefiles/libplacebo/dependency_version_override.diff b/subprojects/packagefiles/libplacebo/dependency_version_override.diff deleted file mode 100644 index 1ee6169..0000000 --- a/subprojects/packagefiles/libplacebo/dependency_version_override.diff +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/src/d3d11/meson.build b/src/d3d11/meson.build -index d4c4b44..ef96256 100644 ---- a/src/d3d11/meson.build -+++ b/src/d3d11/meson.build -@@ -5,7 +5,7 @@ d3d11_headers_extra = [ # needed internally - cc.check_header('dxgi1_6.h', required: d3d11), - ] - d3d11_deps = [ -- dependency('spirv-cross-c-shared', version: '>=0.29.0', required: d3d11), -+ dependency('spirv-cross-c-shared', required: d3d11), - cc.find_library('version', required: d3d11), - ] - -diff --git a/src/glsl/meson.build b/src/glsl/meson.build -index b1f4c8d..9b3a5bb 100644 ---- a/src/glsl/meson.build -+++ b/src/glsl/meson.build -@@ -1,5 +1,5 @@ - # shaderc --shaderc = dependency('shaderc', version: '>=2019.1', required: get_option('shaderc')) -+shaderc = dependency('shaderc', required: get_option('shaderc')) - components.set('shaderc', shaderc.found()) - if shaderc.found() - build_deps += shaderc -@@ -29,8 +29,9 @@ if glslang_req.auto() and shaderc.found() - - elif not glslang_req.disabled() - -+ prefer_static = get_option('prefer_static') - glslang_deps = [ -- cxx.find_library('glslang-default-resource-limits', required: false) -+ dependency('glslang-default-resource-limits', static: prefer_static) - ] - - # meson doesn't respect generator expressions in INTERFACE_LINK_LIBRARIES -@@ -38,13 +39,12 @@ elif not glslang_req.disabled() - # TODO: Use the following once it's fixed - # glslang = dependency('glslang', method: 'cmake', modules: ['glslang::SPIRV']) - -- prefer_static = get_option('prefer_static') - found_lib = false - foreach arg : [[prefer_static, false], [not prefer_static, glslang_req]] - static = arg[0] - required = arg[1] - -- spirv = cxx.find_library('SPIRV', required: required, static: static) -+ spirv = dependency('SPIRV', static: static) - - if not spirv.found() - continue -@@ -54,7 +54,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', static: static) - - if static - glslang_deps += [ -- cgit v1.2.3-101-g0448