More packages

spirv-tools/all/conandata.yml

@@ -0,0 +1,46 @@
+# Add only the SDK release versions from https://github.com/KhronosGroup/SPIRV-Tools/tags for consistency
+sources:
+  "1.4.341.0":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.4.341.0.tar.gz"
+    sha256: "15bfb678138cdf9cd1480dfb952547bbb66b763a735b6d5582578572f5c2e6f9"
+  "1.4.313.0":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.4.313.0.tar.gz"
+    sha256: "6b60f723345ceed5291cceebbcfacf7fea9361a69332261fa08ae57e2a562005"
+  "1.4.309.0":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.4.309.0.tar.gz"
+    sha256: "6b8577054c575573ead3ad71cb6a2c0b3397b64c746cc3c99e48cc5e324c1b55"
+  "1.3.268.0":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/vulkan-sdk-1.3.268.0.tar.gz"
+    sha256: "4c19fdcffb5fe8ef8dc93d7a65ae78b64edc7a5688893ee381c57f70be77deaf"
+  "1.3.261.1":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/sdk-1.3.261.1.tar.gz"
+    sha256: "ead95c626ad482882a141d1aa0ce47b9453871f72c42c0b28d39c82f60a52008"
+  "1.3.243.0":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/sdk-1.3.243.0.tar.gz"
+    sha256: "684a29e37bfdc6e151fe1d3ec4b87c5396c17a439de545d81ea05d4ee6fbc86e"
+  "1.3.239.0":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/sdk-1.3.239.0.tar.gz"
+    sha256: "327b2dba4515646eee28c1a5fe1332891e81c8b6ff289363f52877f3e67c2d81"
+  "1.3.236.0":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/sdk-1.3.236.0.tar.gz"
+    sha256: "6789c782a8ba8fa127c3d579f9362f0cdde7a9ccc2e8513cdf217bba579dfda9"
+  "1.2.198.0":
+    url: "https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/sdk-1.2.198.0.tar.gz"
+    sha256: "e8a9fec946f8473129374ad6b98ee690ac9a4574ace7cb3b46bbeb4eddfdc33b"
+patches:
+  "1.4.313.0":
+    - patch_file: "patches/0001-fix-clang-20-build-issue.patch"
+      patch_description: "fix clang-20 build issue"
+      patch_type: "backport"
+  "1.4.309.0":
+    - patch_file: "patches/0001-fix-clang-20-build-issue.patch"
+      patch_description: "fix clang-20 build issue"
+      patch_type: "backport"
+  "1.3.268.0":
+    - patch_file: "patches/0001-fix-clang-20-build-issue.patch"
+      patch_description: "fix clang-20 build issue"
+      patch_type: "backport"
+  "1.3.261.1":
+    - patch_file: "patches/0001-fix-clang-20-build-issue.patch"
+      patch_description: "fix clang-20 build issue"
+      patch_type: "backport"

spirv-tools/all/conanfile.py

@@ -0,0 +1,199 @@
+from conan import ConanFile
+from conan.tools.build import check_min_cppstd, stdcpp_library
+from conan.tools.cmake import CMake, CMakeToolchain, cmake_layout
+from conan.tools.env import VirtualBuildEnv
+from conan.tools.files import copy, get, replace_in_file, rm, rmdir, save, apply_conandata_patches, export_conandata_patches
+from conan.tools.scm import Version
+import os
+
+required_conan_version = ">=2.1"
+
+
+class SpirvtoolsConan(ConanFile):
+    name = "spirv-tools"
+    homepage = "https://github.com/KhronosGroup/SPIRV-Tools/"
+    description = "Create and optimize SPIRV shaders"
+    topics = ("spirv", "spirv-v", "vulkan", "opengl", "opencl", "hlsl", "khronos")
+    url = "https://github.com/conan-io/conan-center-index"
+    license = "Apache-2.0"
+
+    package_type = "library"
+    settings = "os", "arch", "compiler", "build_type"
+    options = {
+        "shared": [True, False],
+        "fPIC": [True, False],
+        "build_executables": [True, False],
+    }
+    default_options = {
+        "shared": False,
+        "fPIC": True,
+        "build_executables": True,
+    }
+
+    short_paths = True
+
+    def export_sources(self):
+        export_conandata_patches(self)
+
+    def config_options(self):
+        if self.settings.os == "Windows":
+            del self.options.fPIC
+
+    def configure(self):
+        if self.options.shared:
+            self.options.rm_safe("fPIC")
+
+    def layout(self):
+        cmake_layout(self, src_folder="src")
+
+    def requirements(self):
+        self.requires(f"spirv-headers/{self.version}")
+
+    def validate_build(self):
+        # newer versions of the library require C++17 for internals
+        check_min_cppstd(self, 11 if Version(self.version) < "1.3.243" else 17)
+
+    def validate(self):
+        # The interface requires C++11
+        check_min_cppstd(self, 11)
+
+    def build_requirements(self):
+        if Version(self.version) >= "1.3.239":
+            self.tool_requires("cmake/[>=3.17.2 <4]")
+
+    def source(self):
+        get(self, **self.conan_data["sources"][self.version], strip_root=True)
+
+    def generate(self):
+        env = VirtualBuildEnv(self)
+        env.generate()
+
+        tc = CMakeToolchain(self)
+
+        #====================
+        # Shared libs mess in Spirv-Tools (see https://github.com/KhronosGroup/SPIRV-Tools/issues/3909)
+        #====================
+        # We have 2 solutions if shared True:
+        #  - Only package SPIRV-Tools-shared lib (private symbols properly hidden), and wait resolution
+        #    of above issue before allowing to build shared for all Spirv-Tools libs.
+        #  - Build and package shared libs with all symbols exported
+        #    (it would require CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS for msvc)
+        # Currently this recipe implements the first solution
+
+        # Static and shared libs are controlled by a weird combination
+        # of SPIRV_TOOLS_BUILD_STATIC and BUILD_SHARED_LIBS.
+        tc.variables["SPIRV_TOOLS_BUILD_STATIC"] = True
+        #============
+
+        # Required by the project's CMakeLists.txt
+        tc.variables["SPIRV-Headers_SOURCE_DIR"] = self.dependencies["spirv-headers"].package_folder.replace("\\", "/")
+
+        # There are some switch( ) statements that are causing errors
+        # need to turn this off
+        tc.variables["SPIRV_WERROR"] = False
+
+        tc.variables["SKIP_SPIRV_TOOLS_INSTALL"] = False
+        tc.variables["SPIRV_LOG_DEBUG"] = False
+        tc.variables["SPIRV_SKIP_TESTS"] = True
+        tc.variables["SPIRV_CHECK_CONTEXT"] = False
+        tc.variables["SPIRV_BUILD_FUZZER"] = False
+        tc.variables["SPIRV_SKIP_EXECUTABLES"] = not self.options.build_executables
+        # To install relocatable shared libs on Macos
+        if Version(self.version) < "1.3.239":
+            tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0042"] = "NEW"
+            tc.cache_variables["CMAKE_POLICY_VERSION_MINIMUM"] = "3.5" # CMake 4 support
+        # For iOS/tvOS/watchOS
+        tc.variables["CMAKE_MACOSX_BUNDLE"] = False
+
+        tc.generate()
+
+    def _patch_sources(self):
+        apply_conandata_patches(self)
+        # CMAKE_POSITION_INDEPENDENT_CODE was set ON for the entire
+        # project in the lists file.
+        replace_in_file(self, os.path.join(self.source_folder, "CMakeLists.txt"),
+                              "set(CMAKE_POSITION_INDEPENDENT_CODE ON)", "")
+
+    def build(self):
+        self._patch_sources()
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def package(self):
+        copy(self, "LICENSE*", src=self.source_folder, dst=os.path.join(self.package_folder, "licenses"))
+        cmake = CMake(self)
+        cmake.install()
+
+        rmdir(self, os.path.join(self.package_folder, "lib", "pkgconfig"))
+        rmdir(self, os.path.join(self.package_folder, "lib", "cmake"))
+        rmdir(self, os.path.join(self.package_folder, "SPIRV-Tools"))
+        rmdir(self, os.path.join(self.package_folder, "SPIRV-Tools-link"))
+        rmdir(self, os.path.join(self.package_folder, "SPIRV-Tools-opt"))
+        rmdir(self, os.path.join(self.package_folder, "SPIRV-Tools-reduce"))
+        rmdir(self, os.path.join(self.package_folder, "SPIRV-Tools-lint"))
+        rmdir(self, os.path.join(self.package_folder, "SPIRV-Tools-diff"))
+        rmdir(self, os.path.join(self.package_folder, "SPIRV-Tools-tools"))
+        if self.options.shared:
+            for file_name in [
+                "*SPIRV-Tools", "*SPIRV-Tools-opt", "*SPIRV-Tools-link",
+                "*SPIRV-Tools-reduce", "*SPIRV-Tools-lint",
+            ]:
+                for ext in [".a", ".lib"]:
+                    rm(self, f"{file_name}{ext}", os.path.join(self.package_folder, "lib"))
+        else:
+            rm(self, "*SPIRV-Tools-shared.dll", os.path.join(self.package_folder, "bin"))
+            rm(self, "*SPIRV-Tools-shared*", os.path.join(self.package_folder, "lib"))
+
+    def package_info(self):
+        self.cpp_info.set_property("cmake_file_name", "SPIRV-Tools")
+        self.cpp_info.set_property("pkg_config_name", "SPIRV-Tools-shared" if self.options.shared else "SPIRV-Tools")
+
+        # SPIRV-Tools
+        self.cpp_info.components["spirv-tools-core"].set_property(
+            "cmake_target_name",
+            "SPIRV-Tools-shared" if self.options.shared else "SPIRV-Tools-static",
+        )
+        self.cpp_info.components["spirv-tools-core"].set_property("cmake_target_aliases", ["SPIRV-Tools"]) # before 2020.5, kept for conveniency
+        self.cpp_info.components["spirv-tools-core"].libs = ["SPIRV-Tools-shared" if self.options.shared else "SPIRV-Tools"]
+        self.cpp_info.components["spirv-tools-core"].requires = ["spirv-headers::spirv-headers"]
+        if self.options.shared:
+            self.cpp_info.components["spirv-tools-core"].defines = ["SPIRV_TOOLS_SHAREDLIB"]
+        if self.settings.os in ["Linux", "FreeBSD"]:
+            self.cpp_info.components["spirv-tools-core"].system_libs.extend(["m", "rt"])
+        if not self.options.shared:
+            libcxx = stdcpp_library(self)
+            if libcxx:
+                self.cpp_info.components["spirv-tools-core"].system_libs.append(libcxx)
+
+        # FIXME: others components should have their own CMake config file
+        if not self.options.shared:
+            # SPIRV-Tools-opt
+            self.cpp_info.components["spirv-tools-opt"].set_property("cmake_target_name", "SPIRV-Tools-opt")
+            self.cpp_info.components["spirv-tools-opt"].libs = ["SPIRV-Tools-opt"]
+            self.cpp_info.components["spirv-tools-opt"].requires = ["spirv-tools-core", "spirv-headers::spirv-headers"]
+            if self.settings.os in ["Linux", "FreeBSD"]:
+                self.cpp_info.components["spirv-tools-opt"].system_libs.append("m")
+
+            # SPIRV-Tools-link
+            self.cpp_info.components["spirv-tools-link"].set_property("cmake_target_name", "SPIRV-Tools-link")
+            self.cpp_info.components["spirv-tools-link"].libs = ["SPIRV-Tools-link"]
+            self.cpp_info.components["spirv-tools-link"].requires = ["spirv-tools-core", "spirv-tools-opt"]
+
+            # SPIRV-Tools-reduce
+            self.cpp_info.components["spirv-tools-reduce"].set_property("cmake_target_name", "SPIRV-Tools-reduce")
+            self.cpp_info.components["spirv-tools-reduce"].libs = ["SPIRV-Tools-reduce"]
+            self.cpp_info.components["spirv-tools-reduce"].requires = ["spirv-tools-core", "spirv-tools-opt"]
+
+            # SPIRV-Tools-lint
+            self.cpp_info.components["spirv-tools-lint"].set_property("cmake_target_name", "SPIRV-Tools-lint")
+            self.cpp_info.components["spirv-tools-lint"].libs = ["SPIRV-Tools-lint"]
+            self.cpp_info.components["spirv-tools-lint"].requires = ["spirv-tools-core", "spirv-tools-opt"]
+
+            # SPIRV-Tools-diff
+            self.cpp_info.components["spirv-tools-diff"].set_property("cmake_target_name", "SPIRV-Tools-diff")
+            self.cpp_info.components["spirv-tools-diff"].libs = ["SPIRV-Tools-diff"]
+            self.cpp_info.components["spirv-tools-diff"].requires = ["spirv-tools-core", "spirv-tools-opt"]
+
+        if Version(self.version) < "1.3" and not self.options.shared:
+            del self.cpp_info.components["spirv-tools-diff"]

spirv-tools/all/patches/0001-fix-clang-20-build-issue.patch

@@ -0,0 +1,26 @@
+From 4b46b76c7c68f838f18906c6d3ca275eef207ca7 Mon Sep 17 00:00:00 2001
+From: Elvis Dukaj <elvis.dukaj@dynatrace.com>
+Date: Thu, 24 Apr 2025 14:36:21 +0200
+Subject: [PATCH] fix clang-20 build issue
+
+---
+ tools/diff/diff.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/tools/diff/diff.cpp b/tools/diff/diff.cpp
+index d60edb2e..349ec092 100644
+--- a/tools/diff/diff.cpp
++++ b/tools/diff/diff.cpp
+@@ -87,7 +87,8 @@ std::unique_ptr<spvtools::opt::IRContext> load_module(const char* path) {
+     return spvtools::BuildModule(
+         kDefaultEnvironment, spvtools::utils::CLIMessageConsumer,
+         std::string(contents.begin(), contents.end()),
+-        spvtools::SpirvTools::kDefaultAssembleOption |
++        static_cast<spv_text_to_binary_options_t>(
++            spvtools::SpirvTools::kDefaultAssembleOption) |
+             SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
+   }
+ 
+-- 
+2.43.0
+

spirv-tools/all/test_package/CMakeLists.txt

@@ -0,0 +1,24 @@
+cmake_minimum_required(VERSION 3.15)
+project(test_package)
+
+find_package(SPIRV-Tools REQUIRED CONFIG)
+
+add_executable(${PROJECT_NAME}_c test_package.c)
+if(TARGET SPIRV-Tools-shared)
+    target_link_libraries(${PROJECT_NAME}_c PRIVATE SPIRV-Tools-shared)
+elseif(TARGET SPIRV-Tools-static)
+    target_link_libraries(${PROJECT_NAME}_c PRIVATE SPIRV-Tools-static)
+else()
+    target_link_libraries(${PROJECT_NAME}_c PRIVATE SPIRV-Tools)
+endif()
+
+# TODO: we should call find_package(SPIRV-Tools-opt REQUIRED CONFIG), but not modeled right now
+if(TARGET SPIRV-Tools-opt)
+    add_executable(${PROJECT_NAME}_cpp test_package.cpp)
+    target_link_libraries(${PROJECT_NAME}_cpp PRIVATE SPIRV-Tools-opt)
+    if(SPIRV-Tools_VERSION VERSION_LESS "1.3.243.0")
+        target_compile_features(${PROJECT_NAME}_cpp PRIVATE cxx_std_11)
+    else()
+        target_compile_features(${PROJECT_NAME}_cpp PRIVATE cxx_std_17)
+    endif()
+endif()

spirv-tools/all/test_package/conanfile.py

@@ -0,0 +1,29 @@
+from conan import ConanFile
+from conan.tools.build import can_run
+from conan.tools.cmake import CMake, cmake_layout
+import os
+
+
+class TestPackageConan(ConanFile):
+    settings = "os", "arch", "compiler", "build_type"
+    generators = "CMakeToolchain", "CMakeDeps", "VirtualRunEnv"
+    test_type = "explicit"
+
+    def layout(self):
+        cmake_layout(self)
+
+    def requirements(self):
+        self.requires(self.tested_reference_str)
+
+    def build(self):
+        cmake = CMake(self)
+        cmake.configure()
+        cmake.build()
+
+    def test(self):
+        if can_run(self):
+            bin_path_c = os.path.join(self.cpp.build.bindirs[0], "test_package_c")
+            self.run(bin_path_c, env="conanrun")
+            bin_path_cpp = os.path.join(self.cpp.build.bindirs[0], "test_package_cpp")
+            if os.path.exists(bin_path_cpp):
+                self.run(bin_path_cpp, env="conanrun")

spirv-tools/all/test_package/test_package.c

@@ -0,0 +1,31 @@
+#include "spirv-tools/libspirv.h"
+
+int main(int argc, char ** argv)
+{
+const char input_text[] =
+    "OpCapability Shader\n"
+    "OpCapability Linkage\n"
+    "OpMemoryModel Logical GLSL450";
+  spv_text text;
+  spv_binary binary;
+  spv_context context;
+
+  context  = spvContextCreate(SPV_ENV_UNIVERSAL_1_1);
+
+  binary = 0;
+  if( SPV_SUCCESS != spvTextToBinary(context, input_text, sizeof(input_text), &binary, 0) )
+  {
+      return 1;
+  }
+
+  text = 0;
+  if( SPV_SUCCESS != spvBinaryToText(context, binary->code, binary->wordCount, 0, &text, 0) )
+  {
+      return 1;
+  }
+
+  spvTextDestroy(text);
+  spvBinaryDestroy(binary);
+  spvContextDestroy(context);
+  return 0;
+}

spirv-tools/all/test_package/test_package.cpp

@@ -0,0 +1,65 @@
+// Copyright (c) 2016 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// This program demonstrates basic SPIR-V module processing using
+// SPIRV-Tools C++ API:
+// * Assembling
+// * Validating
+// * Optimizing
+// * Disassembling
+
+#include <iostream>
+#include <string>
+#include <vector>
+
+#include "spirv-tools/libspirv.hpp"
+#include "spirv-tools/optimizer.hpp"
+
+int main() {
+  const std::string source =
+      "         OpCapability Linkage "
+      "         OpCapability Shader "
+      "         OpMemoryModel Logical GLSL450 "
+      "         OpSource GLSL 450 "
+      "         OpDecorate %spec SpecId 1 "
+      "  %int = OpTypeInt 32 1 "
+      " %spec = OpSpecConstant %int 0 "
+      "%const = OpConstant %int 42";
+
+  spvtools::SpirvTools core(SPV_ENV_UNIVERSAL_1_3);
+  spvtools::Optimizer opt(SPV_ENV_UNIVERSAL_1_3);
+
+  auto print_msg_to_stderr = [](spv_message_level_t, const char*,
+                                const spv_position_t&, const char* m) {
+    std::cerr << "error: " << m << std::endl;
+  };
+  core.SetMessageConsumer(print_msg_to_stderr);
+  opt.SetMessageConsumer(print_msg_to_stderr);
+
+  std::vector<uint32_t> spirv;
+  if (!core.Assemble(source, &spirv)) return 1;
+  if (!core.Validate(spirv)) return 1;
+
+  opt.RegisterPass(spvtools::CreateSetSpecConstantDefaultValuePass({{1, "42"}}))
+      .RegisterPass(spvtools::CreateFreezeSpecConstantValuePass())
+      .RegisterPass(spvtools::CreateUnifyConstantPass())
+      .RegisterPass(spvtools::CreateStripDebugInfoPass());
+  if (!opt.Run(spirv.data(), spirv.size(), &spirv)) return 1;
+
+  std::string disassembly;
+  if (!core.Disassemble(spirv, &disassembly)) return 1;
+  std::cout << disassembly << "\n";
+
+  return 0;
+}