diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 20:38:24 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 20:38:24 +0000 |
| commit | 9199faea097ed81e2f836d5f60179bf6e51d5a40 (patch) | |
| tree | 8fd938e444f5c1e9b4a9050a383f0493b2042ddb /debian/patches | |
| parent | Adding upstream version 6.338.2. (diff) | |
| download | libplacebo-debian/6.338.2-2.tar.xz libplacebo-debian/6.338.2-2.zip | |
Adding debian version 6.338.2-2.debian/6.338.2-2debian
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/0001-meson-don-t-hard-require-glslang-internal-dependenci.patch | 31 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/debian/patches/0001-meson-don-t-hard-require-glslang-internal-dependenci.patch b/debian/patches/0001-meson-don-t-hard-require-glslang-internal-dependenci.patch new file mode 100644 index 0000000..5aae631 --- /dev/null +++ b/debian/patches/0001-meson-don-t-hard-require-glslang-internal-dependenci.patch @@ -0,0 +1,31 @@ +From: Niklas Haas <git@haasn.dev> +Date: Thu, 8 Feb 2024 19:25:55 +0100 +Subject: meson: don't hard-require glslang internal dependencies + +They apparently like to randomly remove them. Just mark them as not +required. + +Fixes: https://code.videolan.org/videolan/libplacebo/-/issues/321 +--- + src/glsl/meson.build | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/glsl/meson.build b/src/glsl/meson.build +index 5cebfb8..5a88196 100644 +--- a/src/glsl/meson.build ++++ b/src/glsl/meson.build +@@ -42,10 +42,10 @@ elif not glslang_req.disabled() + if static + glslang_deps += [ + # Always required for static linking +- cxx.find_library('MachineIndependent', required: true, static: true), +- cxx.find_library('OSDependent', required: true, static: true), +- cxx.find_library('OGLCompiler', required: true, static: true), +- cxx.find_library('GenericCodeGen', required: true, static: true), ++ cxx.find_library('MachineIndependent', required: false, static: true), ++ cxx.find_library('OSDependent', required: false, static: true), ++ cxx.find_library('OGLCompiler', required: false, static: true), ++ cxx.find_library('GenericCodeGen', required: false, static: true), + # SPIRV-Tools are required only if optimizer is enabled in glslang build + cxx.find_library('SPIRV-Tools', required: false, static: true), + cxx.find_library('SPIRV-Tools-opt', required: false, static: true), diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..cdcae7d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +0001-meson-don-t-hard-require-glslang-internal-dependenci.patch |