Vulkan packages (#8)
All checks were successful
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 19s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 17s
Conan Packaging / Package assimp/6.0.4 (push) Successful in 2m40s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 26s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 16s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 20s
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Successful in 29s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Successful in 2m21s
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Successful in 7m57s
Conan Packaging / Package cli11/2.6.1 (push) Successful in 21s
Conan Packaging / Package eabase/01082025 (push) Successful in 15s
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m12s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 20s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 15s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Successful in 15s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 36s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 16s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Successful in 16s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 18s
Conan Packaging / Package glslang/1.4.341.0 (push) Successful in 3m43s
Conan Packaging / Package shaderc/2026.1 (push) Successful in 3m41s
All checks were successful
Conan Packaging / Package lodepng/cci.20260210 (push) Successful in 19s
Conan Packaging / Package meshoptimizer/1.0 (push) Successful in 17s
Conan Packaging / Package assimp/6.0.4 (push) Successful in 2m40s
Conan Packaging / Package mimalloc/3.2.8 (push) Successful in 26s
Conan Packaging / Package stduuid/1.2.3 (push) Successful in 16s
Conan Packaging / Package vulkan-memory-allocator/3.3.0 (push) Successful in 20s
Conan Packaging / Package vulkan-utility-libraries/1.4.341.0 (push) Successful in 29s
Conan Packaging / Package spirv-tools/1.4.341.0 (push) Successful in 2m21s
Conan Packaging / Package vulkan-validationlayers/1.4.341.0 (push) Successful in 7m57s
Conan Packaging / Package cli11/2.6.1 (push) Successful in 21s
Conan Packaging / Package eabase/01082025 (push) Successful in 15s
Conan Packaging / Package flatbuffers/25.12.19 (push) Successful in 1m12s
Conan Packaging / Package pixelmatch-cpp17/1.0.3 (push) Successful in 20s
Conan Packaging / Package rapidhash/3.0 (push) Successful in 15s
Conan Packaging / Package spirv-headers/1.4.341.0 (push) Successful in 15s
Conan Packaging / Package sqlite3/3.51.2 (push) Successful in 36s
Conan Packaging / Package unordered_dense/4.8.1 (push) Successful in 16s
Conan Packaging / Package vulkan-headers/1.4.341.0 (push) Successful in 16s
Conan Packaging / Package eastl/3.27.01 (push) Successful in 18s
Conan Packaging / Package glslang/1.4.341.0 (push) Successful in 3m43s
Conan Packaging / Package shaderc/2026.1 (push) Successful in 3m41s
Reviewed-on: #8
This commit was merged in pull request #8.
This commit is contained in:
@@ -1,4 +1,7 @@
|
||||
sources:
|
||||
"2026.1":
|
||||
url: "https://github.com/google/shaderc/archive/refs/tags/v2026.1.tar.gz"
|
||||
sha256: "245002feccbe7f8361b223545a5654cea69780745886872d7efff50a38d96c66"
|
||||
"2025.3":
|
||||
url: "https://github.com/google/shaderc/archive/refs/tags/v2025.3.tar.gz"
|
||||
sha256: "a8e4a25e5c2686fd36981e527ed05e451fcfc226bddf350f4e76181371190937"
|
||||
@@ -12,6 +15,16 @@ sources:
|
||||
url: "https://github.com/google/shaderc/archive/v2021.1.tar.gz"
|
||||
sha256: "047113bc4628da164a3cb845efc20d442728873f6054a68ab56d04a053f2c32b"
|
||||
patches:
|
||||
"2026.1":
|
||||
- patch_file: "patches/2025.3/use-conan-dependencies.patch"
|
||||
patch_description: "Replace third_party with Conan dependencies"
|
||||
patch_type: "conan"
|
||||
- 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"
|
||||
patch_description: "install() shaderc_util"
|
||||
patch_type: "conan"
|
||||
"2025.3":
|
||||
- patch_file: "patches/2025.3/use-conan-dependencies.patch"
|
||||
patch_description: "Replace third_party with Conan dependencies"
|
||||
@@ -54,6 +67,7 @@ patches:
|
||||
patch_type: "conan"
|
||||
siprv_mapping:
|
||||
# TODO: bump me once newer versions are available on CCI
|
||||
"2026.1": "1.4.341.0"
|
||||
"2025.3": "1.4.313.0"
|
||||
"2024.1": "1.3.261.1"
|
||||
# "2023.6": "1.3.261.1"
|
||||
|
||||
@@ -51,9 +51,14 @@ class ShadercConan(ConanFile):
|
||||
|
||||
def requirements(self):
|
||||
# transitive_headers=True is not required for any of the dependencies
|
||||
self.requires(f"glslang/{self._spirv_version}")
|
||||
self.requires(f"spirv-tools/{self._spirv_version}")
|
||||
self.requires(f"spirv-headers/{self._spirv_version}")
|
||||
if Version(self.version) >= "1.4.341.0":
|
||||
self.requires(f"glslang/{self._spirv_version}@{self.user}/{self.channel}")
|
||||
self.requires(f"spirv-tools/{self._spirv_version}@{self.user}/{self.channel}")
|
||||
self.requires(f"spirv-headers/{self._spirv_version}@{self.user}/{self.channel}")
|
||||
else:
|
||||
self.requires(f"glslang/{self._spirv_version}")
|
||||
self.requires(f"spirv-tools/{self._spirv_version}")
|
||||
self.requires(f"spirv-headers/{self._spirv_version}")
|
||||
|
||||
def validate(self):
|
||||
if self.settings.compiler.get_safe("cppstd"):
|
||||
|
||||
@@ -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):
|
||||
@@ -1,4 +1,6 @@
|
||||
versions:
|
||||
"2026.1":
|
||||
folder: all
|
||||
"2025.3":
|
||||
folder: all
|
||||
"2024.1":
|
||||
|
||||
Reference in New Issue
Block a user