From 3f0a66bddf5b47bf49cfe01888205433740a6267 Mon Sep 17 00:00:00 2001 From: Cheney Wang <38240633+Cheney-W@users.noreply.github.com> Date: Thu, 31 Oct 2024 17:33:23 +0800 Subject: [PATCH] [shader-slang] update to v2024.14.3 and fix package debug path (#41854) --- ports/shader-slang/portfile.cmake | 16 ++++++++-------- ports/shader-slang/vcpkg.json | 2 +- versions/baseline.json | 4 ++-- versions/s-/shader-slang.json | 5 +++++ 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/ports/shader-slang/portfile.cmake b/ports/shader-slang/portfile.cmake index c77c2b1b93..c3d79adf0a 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 b1af26beb786b2f47bb4dc4e94613c9dda61f6c26539917376d13252ddcbed925f5b1f82948012d2cd288a20ea9d27f3703db96bc8b6689f69ac9f3e3a673584 + SHA512 4cfbca81df3342bc1e329929102f020cd3771e3877e4cde89e499da41b0903602f92de7d69c3adee4e56240d9fe887e0748b2a57d94dd468fcee5bf059090ff0 ) 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 8c9f8082dd949d10d4228ce5d58cf862c9419039f7e5fdde3719f9ea446e55a87eb3e6f8367d26e0015830951c98175d1e59e95873cac9e937f98a6c8d211c16 + SHA512 f56246c054ae3a87726b71a19307f09efa1cd6355a0d44802eead247bb9b837e4073476b3cebb31ff2dda244623344c0741e262cf258f6ca89179e340859196c ) 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 88a920f44650bc99ed97b04d3d674fd256b1414c60697dee7bc234472abe9216d7a3d3e5b75537fe01f7da56fe1fe5348d2cd38dad43f4f143105e4cb2e1ec53 + SHA512 2e491a075cf6a20cd5589470955448cd9efa17566a493ceb96e6fd4192d1261f312535f07e0cb1bf195b4b9f12e46ac635839f509c140d780d6a49138d255075 ) 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 f3de6277d06a9aaadffe4e3d7d74a2352edc12001055142682eb65834cedfdea8f37daa65b7719178a4419f7e87842de6814c03a68b843c5c0085239bb895058 + SHA512 1fdd1a580b6b96af381445a5aab2666f05cd57e9435c7df7e6ba520e9d5ef3a9ca77c2df0acebd0035532e9a2a729c3364fb886fcb8dc4f0577bf71de4616f12 ) 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 7db8c2635bd5868a6741c1e094b7b2f6a095b66f1314c811e6fd41fc198ef68c7700214d9e81db80615daadd2bb89e2a6169d8cb6da5f2185bafdcff43d581b8 + SHA512 5d1c658a4bd3315def327561802e65ad89e52bb5c95cd21c0e7941737e59f0f11ad86b30b81bdafd756e8a04d4af2f830a0f7559277bc779f2ddaada1d7d1c16 ) 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 5c7bc8a9fe3d7c3829434469833f4c1aa70160914d80ac5292ef115cb0a9c8a0907f9f49488b5d14bd2668bf5d3420ccad289aa4f02c6d673e492b548fd9f4e9 + SHA512 997a51dfe3f45e2f6e0630f64dcdedb26e2a3d92756ddb2156612ae59ec3ad3998edc9638062a097a1eed044bd1f2a3d48767558f5dcf331fb4034f7b1837160 ) endif() if(NOT ARCHIVE) @@ -94,9 +94,9 @@ if(VCPKG_TARGET_IS_WINDOWS) endif() if(NOT VCPKG_BUILD_TYPE) - file(INSTALL "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib") + file(INSTALL "${CURRENT_PACKAGES_DIR}/lib" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") if(VCPKG_TARGET_IS_WINDOWS) - file(INSTALL "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug/bin") + file(INSTALL "${CURRENT_PACKAGES_DIR}/bin" DESTINATION "${CURRENT_PACKAGES_DIR}/debug") endif() endif() diff --git a/ports/shader-slang/vcpkg.json b/ports/shader-slang/vcpkg.json index 18cf94ee3d..112f328ef0 100644 --- a/ports/shader-slang/vcpkg.json +++ b/ports/shader-slang/vcpkg.json @@ -1,6 +1,6 @@ { "name": "shader-slang", - "version": "2024.11", + "version": "2024.14.3", "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": "MIT", diff --git a/versions/baseline.json b/versions/baseline.json index 5b030847e0..5ba1a02f95 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4186,7 +4186,7 @@ }, "launch-darkly-server": { "baseline": "2.9.3", - "port-version": 0 + "port-version": 0 }, "lazy-importer": { "baseline": "2023-08-03", @@ -8269,7 +8269,7 @@ "port-version": 0 }, "shader-slang": { - "baseline": "2024.11", + "baseline": "2024.14.3", "port-version": 0 }, "shaderc": { diff --git a/versions/s-/shader-slang.json b/versions/s-/shader-slang.json index 6c1677ffa4..ac19553949 100644 --- a/versions/s-/shader-slang.json +++ b/versions/s-/shader-slang.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "a3913bcb927a0d2340fc053584dcabd1172df6c3", + "version": "2024.14.3", + "port-version": 0 + }, { "git-tree": "2feb4b46c67fe8e4cc244a11a5b7af687c6d2f7f", "version": "2024.11",