diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2025-09-08 13:54:36 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2025-09-08 13:54:36 -0400 |
| commit | ce955da36daa278d5b331b3c97e228e733a5125e (patch) | |
| tree | e221231e7c0da5324355af44a2e53f41166e3a05 /subprojects/packagefiles/libplacebo | |
| parent | cbbb0c16dc3d9c375ac2a18ca3d59cc308d41beb (diff) | |
| download | camu-ce955da36daa278d5b331b3c97e228e733a5125e.tar.gz camu-ce955da36daa278d5b331b3c97e228e733a5125e.tar.bz2 camu-ce955da36daa278d5b331b3c97e228e733a5125e.zip | |
Major FFmpeg build improvements
- Make build more compatible with a traditional linux environment.
Signed-off-by: Andrew Opalach <andrew@akon.city>
Diffstat (limited to 'subprojects/packagefiles/libplacebo')
| -rw-r--r-- | subprojects/packagefiles/libplacebo/dependency_version_override.diff | 37 |
1 files changed, 36 insertions, 1 deletions
diff --git a/subprojects/packagefiles/libplacebo/dependency_version_override.diff b/subprojects/packagefiles/libplacebo/dependency_version_override.diff index f9a0688..1ee6169 100644 --- a/subprojects/packagefiles/libplacebo/dependency_version_override.diff +++ b/subprojects/packagefiles/libplacebo/dependency_version_override.diff @@ -12,7 +12,7 @@ index d4c4b44..ef96256 100644 ] diff --git a/src/glsl/meson.build b/src/glsl/meson.build -index 8fb5e69..4adfa18 100644 +index b1f4c8d..9b3a5bb 100644 --- a/src/glsl/meson.build +++ b/src/glsl/meson.build @@ -1,5 +1,5 @@ @@ -22,3 +22,38 @@ index 8fb5e69..4adfa18 100644 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 += [ |