From 280220a157fbcc488da4dd1413f2997735f81028 Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Sun, 12 Apr 2026 23:06:28 +0200 Subject: [PATCH] patch shaderc --- shaderc/all/conandata.yml | 2 +- .../adapt-update_build_version.py.patch | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 shaderc/all/patches/2026.1/adapt-update_build_version.py.patch diff --git a/shaderc/all/conandata.yml b/shaderc/all/conandata.yml index d7b06c9..b942ded 100644 --- a/shaderc/all/conandata.yml +++ b/shaderc/all/conandata.yml @@ -19,7 +19,7 @@ patches: - patch_file: "patches/2025.3/use-conan-dependencies.patch" patch_description: "Replace third_party with Conan dependencies" patch_type: "conan" - - patch_file: "patches/2021.1/adapt-update_build_version.py.patch" + - patch_file: "patches/2026.1/adapt-update_build_version.py.patch" patch_description: "Adapt update_build_version.py for Conan" patch_type: "conan" - patch_file: "patches/2021.1/install-shaderc_util.patch" diff --git a/shaderc/all/patches/2026.1/adapt-update_build_version.py.patch b/shaderc/all/patches/2026.1/adapt-update_build_version.py.patch new file mode 100644 index 0000000..0c13021 --- /dev/null +++ b/shaderc/all/patches/2026.1/adapt-update_build_version.py.patch @@ -0,0 +1,25 @@ +diff --git a/utils/update_build_version.py b/utils/update_build_version.py +--- a/utils/update_build_version.py ++++ b/utils/update_build_version.py +@@ -130,18 +130,18 @@ + + + def main(): +- if len(sys.argv) != 5: ++ if len(sys.argv) < 5: + print(('usage: {} '.format( + sys.argv[0]))) + sys.exit(1) + +- projects = ['shaderc', 'spirv-tools', 'glslang'] ++ projects = ['shaderc'] + new_content = ''.join([ + '"{}\\n"\n'.format(get_version_string(p, d)) + for (p, d) in zip(projects, sys.argv[1:]) + ]) + +- output_file = sys.argv[4] ++ output_file = sys.argv[-1] + mkdir_p(os.path.dirname(output_file)) + + if os.path.isfile(output_file):