Fix version

glslang/all/conanfile.py

@@ -60,7 +60,10 @@ class GlslangConan(ConanFile):
 
     def requirements(self):
         if self.options.enable_optimizer:
-            self.requires(f"spirv-tools/{self.version}")
+            if Version(self.version) >= "1.4.341.0":
+                self.requires(f"spirv-tools/{self.version}@{self.user}/{self.channel}")
+            else:
+                self.requires(f"spirv-tools/{self.version}")
 
     def validate(self):
         if self.settings.compiler.get_safe("cppstd"):

shaderc/all/conanfile.py

@@ -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"):

spirv-tools/all/conanfile.py

@@ -47,7 +47,10 @@ class SpirvtoolsConan(ConanFile):
         cmake_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires(f"spirv-headers/{self.version}")
+        if Version(self.version) >= "1.4.341.0":
+            self.requires(f"spirv-headers/{self.version}@{self.user}/{self.channel}")
+        else:
+            self.requires(f"spirv-headers/{self.version}")
 
     def validate_build(self):
         # newer versions of the library require C++17 for internals

vulkan-memory-allocator/all/conanfile.py

@@ -29,7 +29,7 @@ class VulkanMemoryAllocatorConan(ConanFile):
         basic_layout(self, src_folder="src")
 
     def requirements(self):
-        self.requires("vulkan-headers/1.4.341.0")
+        self.requires(f"vulkan-headers/1.4.341.0@{self.user}/{self.channel}")
 
     def package_id(self):
         self.info.clear()

vulkan-validationlayers/all/conanfile.py

@@ -101,15 +101,24 @@ class VulkanValidationLayersConan(ConanFile):
 
     def requirements(self):
         self.requires("robin-hood-hashing/3.11.5")
-        self.requires(self._require("spirv-headers"))
+        if Version(conan_version).minor >= "1.4.341":
+            self.requires(f"{self._require("spirv-headers")}@{self.user}/{self.channel}")
+        else:
+            self.requires(self._require("spirv-headers"))
         if Version(conan_version).minor >= "1.4.313":
             self.requires(f"{self._require("vulkan-utility-libraries")}@{self.user}/{self.channel}", transitive_headers=True)
         if Version(conan_version).major < "2":
             # TODO: set private=True, once the issue is resolved https://github.com/conan-io/conan/issues/9390
             self.requires(self._require("spirv-tools"), private=not hasattr(self, "settings_build"))
         else:
-            self.requires(self._require("spirv-tools"))
-        self.requires(self._require("vulkan-headers"), transitive_headers=True)
+            if Version(conan_version).minor >= "1.4.341":
+                self.requires(f"{self._require("spirv-tools")}@{self.user}/{self.channel}")
+            else:
+                self.requires(self._require("spirv-tools"))
+        if Version(conan_version).minor >= "1.4.341":
+            self.requires(f"{self._require("vulkan-headers")}@{self.user}/{self.channel}", transitive_headers=True)
+        else:
+            self.requires(self._require("vulkan-headers"), transitive_headers=True)
         if self.options.get_safe("with_wsi_xcb") or self.options.get_safe("with_wsi_xlib"):
             self.requires("xorg/system")
         if self._needs_wayland_for_build: