From 8b174ea37062b5a5531f81357c2a2a7f7217f4b8 Mon Sep 17 00:00:00 2001 From: Jonatan Nevo Date: Tue, 2 Dec 2025 01:13:54 +0200 Subject: [PATCH] [shader-slang] Update to version 2025.22.1 (#48434) --- ports/shader-slang/portfile.cmake | 26 +++++++++++++++++--------- ports/shader-slang/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/s-/shader-slang.json | 5 +++++ 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/ports/shader-slang/portfile.cmake b/ports/shader-slang/portfile.cmake index 3cc03b7e0d..12ef2cc1f3 100644 --- a/ports/shader-slang/portfile.cmake +++ b/ports/shader-slang/portfile.cmake @@ -17,7 +17,7 @@ if(key STREQUAL "windows-x64" OR VCPKG_SHADER_SLANG_UPDATE) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-windows-x86_64.zip" FILENAME "slang-${VERSION}-windows-x86_64.zip" - SHA512 82533b688e100a1aba34be4ae5ef30cda158d7bb7f06f7f6d02a9d3b08b69277f4edc6650ed60967162b812835c9c8b5a85defb21aef0012a00dad5344340111 + SHA512 de073b816df5c1d5fe1c0580dd11770eb9e03188922e58997a22f6fe910434e2efdbbfa3908c030011b6e704a89db58454f7100c4f26c9f3175b329f3b79ead8 ) endif() if(key STREQUAL "windows-arm64" OR VCPKG_SHADER_SLANG_UPDATE) @@ -25,7 +25,7 @@ if(key STREQUAL "windows-arm64" OR VCPKG_SHADER_SLANG_UPDATE) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-windows-aarch64.zip" FILENAME "slang-${VERSION}-windows-aarch64.zip" - SHA512 4962ec98bf61bb15296697681d8070a59c916eb583831bfc611684cbbf459b17e197c068862357bb7cf7160d14548a01c206723338c8e576db4103fe7dce6778 + SHA512 7aa4c9b8652818c79fd63c8e23e3f2cfbbaa2fe4ec00cb435364fcb8c8a557beb080f435da8f10710bc1a6ccdd5a2177db124daec051bc34350b56a0aad81d85 ) endif() if(key STREQUAL "macosx-x64" OR VCPKG_SHADER_SLANG_UPDATE) @@ -33,7 +33,7 @@ if(key STREQUAL "macosx-x64" OR VCPKG_SHADER_SLANG_UPDATE) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-x86_64.zip" FILENAME "slang-${VERSION}-macos-x86_64.zip" - SHA512 04f23543163bba57e68f130ee67e0de2a405b7d69f2a04c1a115432bd4b18e8ce93d6ae146616e06843bac9bbf6eaec315e05c021faa0dc383a870df1e5649ef + SHA512 f74a4c94e6b84f1359d680c1a44cf441f4043158efec0a835379227ade2f72557efabdce6518054bfd1036a85c8a7355918b1a70179ccd06bf3fbb8c49c6fcc5 ) endif() if(key STREQUAL "macosx-arm64" OR VCPKG_SHADER_SLANG_UPDATE) @@ -41,7 +41,7 @@ if(key STREQUAL "macosx-arm64" OR VCPKG_SHADER_SLANG_UPDATE) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-macos-aarch64.zip" FILENAME "slang-${VERSION}-macos-aarch64.zip" - SHA512 1f62de8a8f8b364c2b45dd1cd4781ebd3823fde4ca81b560a068638ac6662e6ef1143cd9f161bd401185a2b2a3df4b553b14c10e8fd042babbe057456cf17226 + SHA512 5e8bba5784ad5d30e9b92a5754ad7687ada8899aa55516c0cad7a5d8c09fb2cba83a09c9bd06911c8fe7d464ebece8d72376f810881d5c73c4b4a3246b020a7b ) endif() if(key STREQUAL "linux-x64" OR VCPKG_SHADER_SLANG_UPDATE) @@ -49,7 +49,7 @@ if(key STREQUAL "linux-x64" OR VCPKG_SHADER_SLANG_UPDATE) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-linux-x86_64.zip" FILENAME "slang-${VERSION}-linux-x86_64.zip" - SHA512 9f13335f5d5599fab5c4ba17ee6003542f41e925e9f4b0c9695910d6012072cd0350a5b5e1e745c97375ece98cd9b3e4ca694c4160a74b0cf33309864186d4f7 + SHA512 d9f398cfe902b948290bad9e158e82baea0c6bd942e9cf9ae272546167c63a289fe1ef9a6048b658f1c9ecd51cbbcd187675da87f39ca05ad289eaa93a7fd30b ) endif() if(key STREQUAL "linux-arm64" OR VCPKG_SHADER_SLANG_UPDATE) @@ -57,7 +57,7 @@ if(key STREQUAL "linux-arm64" OR VCPKG_SHADER_SLANG_UPDATE) ARCHIVE URLS "https://github.com/shader-slang/slang/releases/download/v${VERSION}/slang-${VERSION}-linux-aarch64.zip" FILENAME "slang-${VERSION}-linux-aarch64.zip" - SHA512 2b8b42c2ada7dc76e246a5668d01a416a99ebe2bcececabdbc43733ffe30ce743c4607ba84ce5e2682702ffd26f84ef2928c5f5a3a2cef860eaa15c384b7ee47 + SHA512 56d0f975c629e53c45e9d075fe71630ba488f6ad2da0cfcea27e28c726607152d451b7b3dacf10248e0c80535499c4c5c9ede6909c10c29c75a40bf553a9af64 ) endif() if(NOT ARCHIVE) @@ -79,6 +79,7 @@ file(GLOB libs "${BINDIST_PATH}/lib/*.lib" "${BINDIST_PATH}/lib/*.dylib" "${BINDIST_PATH}/lib/*.so" + "${BINDIST_PATH}/lib/*.so.0.${VERSION}" # On linux, some of the .so files are postfixed by the version. ) file(INSTALL ${libs} DESTINATION "${CURRENT_PACKAGES_DIR}/lib") @@ -117,10 +118,17 @@ file(INSTALL ${headers} DESTINATION "${CURRENT_PACKAGES_DIR}/include") block(SCOPE_FOR VARIABLES) set(VCPKG_BUILD_TYPE Release) # no debug binaries anyways - file(COPY "${BINDIST_PATH}/cmake" DESTINATION "${CURRENT_PACKAGES_DIR}") - vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME slang) + + if (VCPKG_TARGET_IS_WINDOWS) + file(COPY "${BINDIST_PATH}/cmake" DESTINATION "${CURRENT_PACKAGES_DIR}") + vcpkg_cmake_config_fixup(CONFIG_PATH cmake PACKAGE_NAME slang) + else() + file(COPY "${BINDIST_PATH}/lib/cmake/slang" DESTINATION "${CURRENT_PACKAGES_DIR}") + vcpkg_cmake_config_fixup(CONFIG_PATH slang PACKAGE_NAME slang) + endif() + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/slang/slangConfig.cmake" - [[HINTS ENV PATH "${PACKAGE_PREFIX_DIR}/bin"]] + [[HINTS "${PACKAGE_PREFIX_DIR}/bin" ENV PATH]] [[PATHS "${PACKAGE_PREFIX_DIR}/tools/shader-slang" NO_DEFAULT_PATH REQUIRED]] ) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/slang/slangConfigVersion.cmake" diff --git a/ports/shader-slang/vcpkg.json b/ports/shader-slang/vcpkg.json index 02e6029cb2..e487d749c3 100644 --- a/ports/shader-slang/vcpkg.json +++ b/ports/shader-slang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shader-slang", - "version": "2025.14.3", + "version": "2025.22.1", "description": "Slang is a shading language that makes it easier to build and maintain large shader codebases in a modular and extensible fashion, while also maintaining the highest possible performance on modern GPUs and graphics APIs. Slang is based on years of collaboration between researchers at NVIDIA, Carnegie Mellon University, and Stanford.", "homepage": "https://github.com/shader-slang/slang", "license": null, diff --git a/versions/baseline.json b/versions/baseline.json index 0d82107097..66bcfa3316 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -8985,7 +8985,7 @@ "port-version": 0 }, "shader-slang": { - "baseline": "2025.14.3", + "baseline": "2025.22.1", "port-version": 0 }, "shaderc": { diff --git a/versions/s-/shader-slang.json b/versions/s-/shader-slang.json index e033b4c3b1..c7f0407005 100644 --- a/versions/s-/shader-slang.json +++ b/versions/s-/shader-slang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b6c99976992df2e8056caf5944a8e34ce1ab4544", + "version": "2025.22.1", + "port-version": 0 + }, { "git-tree": "f12f02f75577d741813dddbccda3db91f7071191", "version": "2025.14.3",