From e8541648ceed3ac49e489e715a111c43a54fc6fe Mon Sep 17 00:00:00 2001 From: Stenzek Date: Sun, 23 Jun 2024 11:36:24 +1000 Subject: [PATCH] Deps: Bump versions --- CMakeModules/DuckStationDependencies.cmake | 4 +- scripts/build-dependencies-linux.sh | 47 +++++++------------ scripts/build-dependencies-mac.sh | 49 +++++++------------- scripts/build-dependencies-windows-arm64.bat | 28 +++++------ scripts/build-dependencies-windows-x64.bat | 28 +++++------ scripts/flatpak/modules/23-spirv-cross.json | 4 +- src/duckstation-qt/CMakeLists.txt | 2 +- 7 files changed, 67 insertions(+), 95 deletions(-) diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake index ca5a0eb69..800ae82ef 100644 --- a/CMakeModules/DuckStationDependencies.cmake +++ b/CMakeModules/DuckStationDependencies.cmake @@ -10,8 +10,8 @@ set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) find_package(SDL2 2.30.4 REQUIRED) -find_package(Zstd 1.5.5 REQUIRED) -find_package(WebP REQUIRED) # v1.3.2, spews an error on Linux because no pkg-config. +find_package(Zstd 1.5.6 REQUIRED) +find_package(WebP REQUIRED) # v1.4.0, spews an error on Linux because no pkg-config. find_package(ZLIB REQUIRED) # 1.3, but Mac currently doesn't use it. find_package(PNG 1.6.40 REQUIRED) find_package(JPEG REQUIRED) # No version because flatpak uses libjpeg-turbo. diff --git a/scripts/build-dependencies-linux.sh b/scripts/build-dependencies-linux.sh index a48db418f..c4b70cec1 100755 --- a/scripts/build-dependencies-linux.sh +++ b/scripts/build-dependencies-linux.sh @@ -17,16 +17,16 @@ fi LIBBACKTRACE=ad106d5fdd5d960bd33fae1c48a351af567fd075 LIBJPEG=9f LIBPNG=1.6.43 -LIBWEBP=1.3.2 +LIBWEBP=1.4.0 SDL=SDL2-2.30.4 -QT=6.7.0 -ZSTD=1.5.5 +QT=6.7.2 +ZSTD=1.5.6 SHADERC=2024.1 SHADERC_GLSLANG=142052fa30f9eca191aa9dcf65359fcaed09eeec SHADERC_SPIRVHEADERS=5e3ad389ee56fca27c9705d093ae5387ce404df4 SHADERC_SPIRVTOOLS=dd4b663e13c07fea4fbb3f70c1c91c86731099f7 -SPIRV_CROSS=vulkan-sdk-1.3.280.0 +SPIRV_CROSS=vulkan-sdk-1.3.283.0 mkdir -p deps-build cd deps-build @@ -35,20 +35,20 @@ cat > SHASUMS < SHASUMS <