From 082ba21640ed683a953dc2681149c29619ce670d Mon Sep 17 00:00:00 2001 From: Stenzek Date: Fri, 7 Nov 2025 15:39:49 +1000 Subject: [PATCH] Deps: Update versions Update to SDL3 3.2.26 Update to Shaderc 2025.4 Update to DXCompiler 1.8.2505.32 Update to SPIV-Cross 1.4.328.1 Update to MoltenVK 1.4.0 --- .../deps/build-dependencies-linux-cross.sh | 2 +- scripts/deps/build-dependencies-linux.sh | 2 +- scripts/deps/build-dependencies-mac.sh | 6 +-- .../deps/build-dependencies-windows-arm64.bat | 3 +- .../deps/build-dependencies-windows-x64.bat | 3 +- scripts/deps/sdl3-wgi-roinitialize.patch | 44 ------------------- scripts/deps/versions | 18 ++++---- 7 files changed, 16 insertions(+), 62 deletions(-) delete mode 100644 scripts/deps/sdl3-wgi-roinitialize.patch diff --git a/scripts/deps/build-dependencies-linux-cross.sh b/scripts/deps/build-dependencies-linux-cross.sh index 5d0b52e04..951fe37d8 100755 --- a/scripts/deps/build-dependencies-linux-cross.sh +++ b/scripts/deps/build-dependencies-linux-cross.sh @@ -364,7 +364,7 @@ echo "Building shaderc..." rm -fr "shaderc-$SHADERC_COMMIT" tar xf "shaderc-$SHADERC_COMMIT.tar.gz" cd "shaderc-$SHADERC_COMMIT" -cmake "${CMAKE_COMMON[@]}" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja +cmake "${CMAKE_COMMON[@]}" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_EXECUTABLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja cmake --build build --parallel ninja -C build install cd .. diff --git a/scripts/deps/build-dependencies-linux.sh b/scripts/deps/build-dependencies-linux.sh index b0eb97631..19fa4b9c1 100755 --- a/scripts/deps/build-dependencies-linux.sh +++ b/scripts/deps/build-dependencies-linux.sh @@ -301,7 +301,7 @@ echo "Building shaderc..." rm -fr "shaderc-$SHADERC_COMMIT" tar xf "shaderc-$SHADERC_COMMIT.tar.gz" cd "shaderc-$SHADERC_COMMIT" -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_EXECUTABLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build -G Ninja cmake --build build --parallel ninja -C build install cd .. diff --git a/scripts/deps/build-dependencies-mac.sh b/scripts/deps/build-dependencies-mac.sh index 3e4b20d0d..f3f5eb0ed 100755 --- a/scripts/deps/build-dependencies-mac.sh +++ b/scripts/deps/build-dependencies-mac.sh @@ -37,7 +37,7 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then fi source "$SCRIPTDIR/versions" -MOLTENVK=1.2.9 +MOLTENVK=1.4.0 mkdir -p deps-build cd deps-build @@ -73,7 +73,7 @@ $LIBZIP_GZ_HASH libzip-$LIBZIP.tar.gz $SDL3_GZ_HASH SDL3-$SDL3.tar.gz $ZSTD_GZ_HASH zstd-$ZSTD.tar.gz $FFMPEG_XZ_HASH ffmpeg-$FFMPEG_VERSION.tar.xz -f415a09385030c6510a936155ce211f617c31506db5fbc563e804345f1ecf56e v$MOLTENVK.tar.gz +fc74aef926ee3cd473fe260a93819c09fdc939bff669271a587e9ebaa43d4306 v$MOLTENVK.tar.gz $QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz $QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz $QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz @@ -360,7 +360,7 @@ echo "Building shaderc..." rm -fr "shaderc-$SHADERC_COMMIT" tar xf "shaderc-$SHADERC_COMMIT.tar.gz" cd "shaderc-$SHADERC_COMMIT" -cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -B build +cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_SKIP_EXECUTABLES=ON -B build make -C build "-j$NPROCS" make -C build install cd .. diff --git a/scripts/deps/build-dependencies-windows-arm64.bat b/scripts/deps/build-dependencies-windows-arm64.bat index 1b26e5af2..2e710820b 100644 --- a/scripts/deps/build-dependencies-windows-arm64.bat +++ b/scripts/deps/build-dependencies-windows-arm64.bat @@ -178,7 +178,6 @@ echo Building SDL... rmdir /S /Q "SDL3-%SDL3%" %SEVENZIP% x "SDL3-%SDL3%.zip" || goto error cd "SDL3-%SDL3%" || goto error -%PATCH% -p1 < "%SCRIPTDIR%\sdl3-wgi-roinitialize.patch" || goto error cmake -B build %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_TESTS=OFF -G Ninja || goto error cmake --build build --parallel || goto error ninja -C build install || goto error @@ -259,7 +258,7 @@ echo Building shaderc... rmdir /S /Q "shaderc-%SHADERC_COMMIT%" tar -xf "shaderc-%SHADERC_COMMIT%.tar.gz" || goto error cd "shaderc-%SHADERC_COMMIT%" || goto error -cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_ENABLE_SHARED_CRT=ON -B build -G Ninja || goto error +cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_EXECUTABLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_ENABLE_SHARED_CRT=ON -B build -G Ninja || goto error cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error diff --git a/scripts/deps/build-dependencies-windows-x64.bat b/scripts/deps/build-dependencies-windows-x64.bat index 72ba2ce59..4d85a680d 100644 --- a/scripts/deps/build-dependencies-windows-x64.bat +++ b/scripts/deps/build-dependencies-windows-x64.bat @@ -175,7 +175,6 @@ echo Building SDL... rmdir /S /Q "SDL3-%SDL3%" %SEVENZIP% x "SDL3-%SDL3%.zip" || goto error cd "SDL3-%SDL3%" || goto error -%PATCH% -p1 < "%SCRIPTDIR%\sdl3-wgi-roinitialize.patch" || goto error cmake -B build -DCMAKE_BUILD_TYPE=Release %FORCEPDB% -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DSDL_SHARED=ON -DSDL_STATIC=OFF -DSDL_TESTS=OFF -G Ninja || goto error cmake --build build --parallel || goto error ninja -C build install || goto error @@ -259,7 +258,7 @@ echo Building shaderc... rmdir /S /Q "shaderc-%SHADERC_COMMIT%" tar -xf "shaderc-%SHADERC_COMMIT%.tar.gz" || goto error cd "shaderc-%SHADERC_COMMIT%" || goto error -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_ENABLE_SHARED_CRT=ON -B build -G Ninja || goto error +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DSHADERC_SKIP_TESTS=ON -DSHADERC_SKIP_EXAMPLES=ON -DSHADERC_SKIP_EXECUTABLES=ON -DSHADERC_SKIP_COPYRIGHT_CHECK=ON -DSHADERC_ENABLE_SHARED_CRT=ON -B build -G Ninja || goto error cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error diff --git a/scripts/deps/sdl3-wgi-roinitialize.patch b/scripts/deps/sdl3-wgi-roinitialize.patch deleted file mode 100644 index b40221eef..000000000 --- a/scripts/deps/sdl3-wgi-roinitialize.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 54c2f2c3f781db2e5593d44aa108f7043fc19baa Mon Sep 17 00:00:00 2001 -From: Sam Lantinga -Date: Wed, 8 Oct 2025 13:15:48 -0700 -Subject: [PATCH] Only call WIN_RoUninitialize() if WIN_RoInitialize() - succeeded - -Fixes https://github.com/libsdl-org/SDL/issues/14178 - -(cherry picked from commit 7914bdb7ea14ee5109d50df857c8dfc69a28a62d) ---- - src/joystick/windows/SDL_windows_gaming_input.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/joystick/windows/SDL_windows_gaming_input.c b/src/joystick/windows/SDL_windows_gaming_input.c -index 11ee2243b7683..5f9435e34a570 100644 ---- a/src/joystick/windows/SDL_windows_gaming_input.c -+++ b/src/joystick/windows/SDL_windows_gaming_input.c -@@ -69,6 +69,7 @@ typedef PCWSTR(WINAPI *WindowsGetStringRawBuffer_t)(HSTRING string, UINT32 *leng - - static struct - { -+ bool ro_initialized; - CoIncrementMTAUsage_t CoIncrementMTAUsage; - RoGetActivationFactory_t RoGetActivationFactory; - WindowsCreateStringReference_t WindowsCreateStringReference; -@@ -592,6 +593,7 @@ static bool WGI_JoystickInit(void) - if (FAILED(WIN_RoInitialize())) { - return SDL_SetError("RoInitialize() failed"); - } -+ wgi.ro_initialized = true; - - #define RESOLVE(x) wgi.x = (x##_t)WIN_LoadComBaseFunction(#x); if (!wgi.x) return WIN_SetError("GetProcAddress failed for " #x); - RESOLVE(CoIncrementMTAUsage); -@@ -1002,7 +1004,9 @@ static void WGI_JoystickQuit(void) - __x_ABI_CWindows_CGaming_CInput_CIRawGameControllerStatics_Release(wgi.controller_statics); - } - -- WIN_RoUninitialize(); -+ if (wgi.ro_initialized) { -+ WIN_RoUninitialize(); -+ } - - SDL_zero(wgi); - } diff --git a/scripts/deps/versions b/scripts/deps/versions index f12aaef89..4869b63b8 100644 --- a/scripts/deps/versions +++ b/scripts/deps/versions @@ -32,9 +32,9 @@ ZLIBNG_GZ_HASH=5b3b022489f3ced82384f06db1e13ba148cbce38c7941e424d6cb414416acd18 ZSTD=1.5.7 ZSTD_GZ_HASH=eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 -SDL3=3.2.24 -SDL3_GZ_HASH=81cc0fc17e5bf2c1754eeca9af9c47a76789ac5efdd165b3b91cbbe4b90bfb76 -SDL3_ZIP_HASH=ca7fe2ca54a97e047f5eff236e62ae87546e862f509f0a62fc6e564ded3c6a95 +SDL3=3.2.26 +SDL3_GZ_HASH=dad488474a51a0b01d547cd2834893d6299328d2e30f479a3564088b5476bae2 +SDL3_ZIP_HASH=739356eef1192fff9d641c320a8f5ef4a10506b8927def4b9ceb764c7e947369 QT=6.10.0 QTMINOR=6.10 @@ -59,17 +59,17 @@ DISCORD_RPC_GZ_HASH=297cd48a287a9113eec44902574084c6ab3b6a8b28d02606765a7fded431 PLUTOSVG_COMMIT=bc845bb6b6511e392f9e1097b26f70cf0b3c33be PLUTOSVG_GZ_HASH=cc8eed38daf68aaaaa96e904f68f5524c02f10b5d42062b91cdc93f93445f68a -SHADERC_COMMIT=4daf9d466ad00897f755163dd26f528d14e1db44 -SHADERC_GZ_HASH=167109d52b65f6eedd66103971b869a71632fe27a63efc2ba5b0e5a1912a094c +SHADERC_COMMIT=85cd26cc38e3e8b5e3c649f4551900ee330d6552 +SHADERC_GZ_HASH=06c7bf901ee887e1ce17bbca7c17dd7190f9987ff394138e2c8702c651803584 SOUNDTOUCH_COMMIT=463ade388f3a51da078dc9ed062bf28e4ba29da7 SOUNDTOUCH_GZ_HASH=fe45c2af99f6102d2704277d392c1c83b55180a70bfd17fb888cc84a54b70573 -SPIRV_CROSS_TAG=vulkan-sdk-1.4.321.0 -SPIRV_CROSS_SHA=d8e3e2b141b8c8a167b2e3984736a6baacff316c +SPIRV_CROSS_TAG=vulkan-sdk-1.4.328.1 +SPIRV_CROSS_SHA=7affe74d77f93a622bb5002789d5332d32e512ee -DXCOMPILER_VERSION=1.8.2407.12 -DXCOMPILER_ZIP_HASH=eb4f6a3bb6b08aaa62f435b3dbf26b180702ca52398d3650d0dd538f56742cdc +DXCOMPILER_VERSION=1.8.2505.32 +DXCOMPILER_ZIP_HASH=c6e82b70c14552f1dd58e4a79c93eeab1567eeb0a9ee63a51564c410429bce3e FFMPEG_VERSION=8.0 FFMPEG_XZ_HASH=b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e