diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake index f1b69f1ec..e1e411525 100644 --- a/CMakeModules/DuckStationDependencies.cmake +++ b/CMakeModules/DuckStationDependencies.cmake @@ -39,10 +39,10 @@ endif() # Bundled dependencies. find_package(zstd 1.5.7 REQUIRED) find_package(WebP REQUIRED) # v1.4.0, spews an error on Linux because no pkg-config. -find_package(PNG 1.6.50 REQUIRED) +find_package(PNG 1.6.53 REQUIRED) find_package(JPEG REQUIRED) -find_package(SDL3 3.2.26 REQUIRED) -find_package(Freetype 2.13.3 REQUIRED) +find_package(SDL3 3.2.28 REQUIRED) +find_package(Freetype 2.14.1 REQUIRED) find_package(harfbuzz REQUIRED) find_package(plutosvg 0.0.6 REQUIRED) find_package(cpuinfo REQUIRED) diff --git a/scripts/deps/build-dependencies-linux-cross.sh b/scripts/deps/build-dependencies-linux-cross.sh index 5b1aef118..eb1969679 100755 --- a/scripts/deps/build-dependencies-linux-cross.sh +++ b/scripts/deps/build-dependencies-linux-cross.sh @@ -73,7 +73,7 @@ mkdir -p "${INSTALLDIR}" mkdir -p deps-build cd deps-build -if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE.tar.gz" ]]; then +if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE_COMMIT.tar.gz" ]]; then curl -C - -L \ -o "freetype-$FREETYPE.tar.gz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.gz/download" \ -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \ @@ -176,7 +176,7 @@ EOF #rm -fr "zlib-ng-$ZLIBNG" #tar xf "zlib-ng-$ZLIBNG.tar.gz" #cd "zlib-ng-$ZLIBNG" -#cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DZLIB_COMPAT=ON -DZLIBNG_ENABLE_TESTS=OFF -DZLIB_ENABLE_TESTS=OFF -DWITH_GTEST=OFF -B build -G Ninja +#cmake "${CMAKE_COMMON[@]}" -DBUILD_SHARED_LIBS=ON -DZLIB_COMPAT=ON -DBUILD_TESTING=OFF -DWITH_BENCHMARK_APPS=OFF -DWITH_GTEST=OFF -B build -G Ninja #cmake --build build --parallel #ninja -C build install #cd .. @@ -207,7 +207,7 @@ echo "Building libjpeg..." rm -fr "libjpeg-turbo-$LIBJPEGTURBO" tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz" cd "libjpeg-turbo-$LIBJPEGTURBO" -cmake "${CMAKE_COMMON[@]}" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ninja +cmake "${CMAKE_COMMON[@]}" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -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 b41e8c7c8..857a3fdff 100755 --- a/scripts/deps/build-dependencies-linux.sh +++ b/scripts/deps/build-dependencies-linux.sh @@ -42,7 +42,7 @@ source "$SCRIPTDIR/versions" mkdir -p deps-build cd deps-build -if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE.tar.gz" ]]; then +if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE_COMMIT.tar.gz" ]]; then curl -C - -L \ -o "freetype-$FREETYPE.tar.gz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.gz/download" \ -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz" \ @@ -78,7 +78,6 @@ $ZLIBNG_GZ_HASH zlib-ng-$ZLIBNG.tar.gz $ZSTD_GZ_HASH zstd-$ZSTD.tar.gz $QTBASE_XZ_HASH qtbase-everywhere-src-$QT.tar.xz $QTIMAGEFORMATS_XZ_HASH qtimageformats-everywhere-src-$QT.tar.xz -$QTSHADERTOOLS_XZ_HASH qtshadertools-everywhere-src-$QT.tar.xz $QTSVG_XZ_HASH qtsvg-everywhere-src-$QT.tar.xz $QTTOOLS_XZ_HASH qttools-everywhere-src-$QT.tar.xz $QTTRANSLATIONS_XZ_HASH qttranslations-everywhere-src-$QT.tar.xz @@ -120,7 +119,7 @@ echo "Building zlib-ng..." rm -fr "zlib-ng-$ZLIBNG" tar xf "zlib-ng-$ZLIBNG.tar.gz" cd "zlib-ng-$ZLIBNG" -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DZLIB_COMPAT=ON -DZLIBNG_ENABLE_TESTS=OFF -DZLIB_ENABLE_TESTS=OFF -DWITH_GTEST=OFF -B build -G Ninja +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DBUILD_SHARED_LIBS=ON -DZLIB_COMPAT=ON -DBUILD_TESTING=OFF -DWITH_BENCHMARK_APPS=OFF -DWITH_GTEST=OFF -B build -G Ninja cmake --build build --parallel ninja -C build install cd .. @@ -151,7 +150,7 @@ echo "Building libjpeg..." rm -fr "libjpeg-turbo-$LIBJPEGTURBO" tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz" cd "libjpeg-turbo-$LIBJPEGTURBO" -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ninja +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="$INSTALLDIR" -DCMAKE_INSTALL_PREFIX="$INSTALLDIR" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -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 3a1470436..2beef48ae 100755 --- a/scripts/deps/build-dependencies-mac.sh +++ b/scripts/deps/build-dependencies-mac.sh @@ -137,9 +137,9 @@ echo "Building libjpeg..." rm -fr "libjpeg-turbo-$LIBJPEGTURBO" tar xf "libjpeg-turbo-$LIBJPEGTURBO.tar.gz" cd "libjpeg-turbo-$LIBJPEGTURBO" -cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build +cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_X64" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -B build make -C build "-j$NPROCS" -cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build-arm64 +cmake "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_ARM64" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -B build-arm64 make -C build-arm64 "-j$NPROCS" merge_binaries $(realpath build) $(realpath build-arm64) make -C build install diff --git a/scripts/deps/build-dependencies-windows-arm64.bat b/scripts/deps/build-dependencies-windows-arm64.bat index 2e710820b..b54240f16 100644 --- a/scripts/deps/build-dependencies-windows-arm64.bat +++ b/scripts/deps/build-dependencies-windows-arm64.bat @@ -96,7 +96,7 @@ rmdir /S /Q "zlib-ng-%ZLIBNG%" tar -xf "zlib-ng-%ZLIBNG%.tar.gz" || goto error cd "zlib-ng-%ZLIBNG%" || goto error rem BUILD_SHARED_LIBS deliberately ommitted so that both shared and static libraries are built, we need static for the updater. -cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DZLIB_COMPAT=ON -DZLIBNG_ENABLE_TESTS=OFF -DZLIB_ENABLE_TESTS=OFF -DWITH_GTEST=OFF -B build -G Ninja || goto error +cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DZLIB_COMPAT=ON -DBUILD_TESTING=OFF -DWITH_BENCHMARK_APPS=OFF -DWITH_GTEST=OFF -B build -G Ninja || goto error cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error @@ -117,7 +117,7 @@ echo Building libjpeg... rmdir /S /Q "libjpeg-turbo-%LIBJPEGTURBO%" tar -xf "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" || goto error cd "libjpeg-turbo-%LIBJPEGTURBO%" || goto error -cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ninja || goto error +cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -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 4d85a680d..49f6648a0 100644 --- a/scripts/deps/build-dependencies-windows-x64.bat +++ b/scripts/deps/build-dependencies-windows-x64.bat @@ -93,7 +93,7 @@ rmdir /S /Q "zlib-ng-%ZLIBNG%" tar -xf "zlib-ng-%ZLIBNG%.tar.gz" || goto error cd "zlib-ng-%ZLIBNG%" || goto error rem BUILD_SHARED_LIBS deliberately ommitted so that both shared and static libraries are built, we need static for the updater. -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DZLIB_COMPAT=ON -DZLIBNG_ENABLE_TESTS=OFF -DZLIB_ENABLE_TESTS=OFF -DWITH_GTEST=OFF -B build -G Ninja || goto error +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DZLIB_COMPAT=ON -DBUILD_TESTING=OFF -DWITH_BENCHMARK_APPS=OFF -DWITH_GTEST=OFF -B build -G Ninja || goto error cmake --build build --parallel || goto error ninja -C build install || goto error cd .. || goto error @@ -114,7 +114,7 @@ echo Building libjpeg... rmdir /S /Q "libjpeg-turbo-%LIBJPEGTURBO%" tar -xf "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" || goto error cd "libjpeg-turbo-%LIBJPEGTURBO%" || goto error -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -B build -G Ninja || goto error +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DENABLE_STATIC=OFF -DENABLE_SHARED=ON -DWITH_TESTS=OFF -DWITH_TOOLS=OFF -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/versions b/scripts/deps/versions index c2372e3de..9b5906e50 100644 --- a/scripts/deps/versions +++ b/scripts/deps/versions @@ -14,11 +14,11 @@ HARFBUZZ_GZ_HASH=f63fc519f150465bd0bdafcdf3d0e9c23474f4c474171cd515ea1b3a72c081f LIBBACKTRACE_COMMIT=793921876c981ce49759114d7bb89bb89b2d3a2d LIBBACKTRACE_GZ_HASH=858b1225351052234f7e71f0f36622fc9ad33aac947db7816d0b443ae0dd33ce -LIBJPEGTURBO=3.1.2 -LIBJPEGTURBO_GZ_HASH=8f0012234b464ce50890c490f18194f913a7b1f4e6a03d6644179fa0f867d0cf +LIBJPEGTURBO=3.1.3 +LIBJPEGTURBO_GZ_HASH=075920b826834ac4ddf97661cc73491047855859affd671d52079c6867c1c6c0 -LIBPNG=1.6.50 -LIBPNG_GZ_HASH=708f4398f996325819936d447f982e0db90b6b8212b7507e7672ea232210949a +LIBPNG=1.6.53 +LIBPNG_GZ_HASH=da0b045cbb1d06a8fc9696f9441359f70645f280ff24ae453ccb7c722353654f LIBWEBP=1.6.0 LIBWEBP_GZ_HASH=e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 @@ -26,8 +26,8 @@ LIBWEBP_GZ_HASH=e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 LIBZIP=1.11.4 LIBZIP_GZ_HASH=82e9f2f2421f9d7c2466bbc3173cd09595a88ea37db0d559a9d0a2dc60dc722e -ZLIBNG=2.2.5 -ZLIBNG_GZ_HASH=5b3b022489f3ced82384f06db1e13ba148cbce38c7941e424d6cb414416acd18 +ZLIBNG=2.3.2 +ZLIBNG_GZ_HASH=6a0561b50b8f5f6434a6a9e667a67026f2b2064a1ffa959c6b2dae320161c2a8 ZSTD=1.5.7 ZSTD_GZ_HASH=eb33e51f49a15e023950cd7825ca74a4a2b43db8354825ac24fc1b7ee09e6fa3 @@ -71,5 +71,5 @@ SPIRV_CROSS_SHA=7affe74d77f93a622bb5002789d5332d32e512ee DXCOMPILER_VERSION=1.8.2505.32 DXCOMPILER_ZIP_HASH=c6e82b70c14552f1dd58e4a79c93eeab1567eeb0a9ee63a51564c410429bce3e -FFMPEG_VERSION=8.0 -FFMPEG_XZ_HASH=b2751fccb6cc4c77708113cd78b561059b6fa904b24162fa0be2d60273d27b8e +FFMPEG_VERSION=8.0.1 +FFMPEG_XZ_HASH=05ee0b03119b45c0bdb4df654b96802e909e0a752f72e4fe3794f487229e5a41