patch shaderc
Some checks failed
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m24s
Conan Packaging / Package cli11/2.6.1 (push) Successful in 22s
Conan Packaging / Package eabase/01082025 (push) Successful in 14s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 20s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 19s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Successful in 16s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 38s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 18s
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Successful in 26s
Conan Packaging / Package glslang/1.4.341.0 (push) Has been cancelled
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 23s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 26s
Conan Packaging / Package assimp/6.0.4 (push) Successful in 3m11s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 15s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 16s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 15s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Successful in 15s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 19s
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Has been cancelled
Conan Packaging / Package shaderc/2026.1 (push) Has been cancelled
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Has been cancelled
Some checks failed
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m24s
Conan Packaging / Package cli11/2.6.1 (push) Successful in 22s
Conan Packaging / Package eabase/01082025 (push) Successful in 14s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 20s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 19s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Successful in 16s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 38s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 18s
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Successful in 26s
Conan Packaging / Package glslang/1.4.341.0 (push) Has been cancelled
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 23s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 26s
Conan Packaging / Package assimp/6.0.4 (push) Successful in 3m11s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 15s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 16s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 15s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Successful in 15s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 19s
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Has been cancelled
Conan Packaging / Package shaderc/2026.1 (push) Has been cancelled
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Has been cancelled
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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: {} <shaderc-dir> <spirv-tools-dir> <glslang-dir> <output-file>'.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):
|
||||
Reference in New Issue
Block a user