From f96ab3afdaa8d744f917a347b627bc2cfedd3d5a Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Sun, 16 Feb 2025 16:05:30 +1000
Subject: [PATCH] Deps: Switch zlib to zlib-ng

Mac is ommitted because the updater is currently still dynamically
linked, and libz is not part of the bundle (yet).
---
 .../deps/build-dependencies-linux-cross.sh    | 55 ++++++++++++------
 scripts/deps/build-dependencies-linux.sh      | 57 +++++++++++++------
 .../deps/build-dependencies-windows-arm64.bat | 16 +++---
 .../deps/build-dependencies-windows-x64.bat   | 16 +++---
 4 files changed, 95 insertions(+), 49 deletions(-)

diff --git a/scripts/deps/build-dependencies-linux-cross.sh b/scripts/deps/build-dependencies-linux-cross.sh
index 274fbd883..f265fb817 100755
--- a/scripts/deps/build-dependencies-linux-cross.sh
+++ b/scripts/deps/build-dependencies-linux-cross.sh
@@ -6,7 +6,7 @@
 set -e
 
 if [ "$#" -lt 4 ]; then
-    echo "Syntax: $0 [-system-freetype] [-system-harfbuzz] [-system-libjpeg] [-system-libpng] [-system-libwebp] [-system-libzip] [-system-zstd] [-system-qt] [-skip-download] [-skip-cleanup] [-only-download] <host directory> <cross architecture> <cross chroot> <output directory>"
+    echo "Syntax: $0 [-system-freetype] [-system-harfbuzz] [-system-libjpeg] [-system-libpng] [-system-libwebp] [-system-libzip] [-system-zlib] [-system-zstd] [-system-qt] [-skip-download] [-skip-cleanup] [-only-download] <host directory> <cross architecture> <cross chroot> <output directory>"
     exit 1
 fi
 
@@ -35,6 +35,10 @@ for arg in "$@"; do
 		echo "Skipping building libzip."
 		SKIP_LIBZIP=true
 		shift
+	elif [ "$arg" == "-system-zlib" ]; then
+		echo "Skipping building zlib-ng."
+		SKIP_ZLIBNG=true
+		shift
 	elif [ "$arg" == "-system-zstd" ]; then
 		echo "Skipping building zstd."
 		SKIP_ZSTD=true
@@ -92,6 +96,7 @@ LIBWEBP=1.5.0
 LIBZIP=1.11.3
 SDL3=3.2.4
 QT=6.8.2
+ZLIBNG=2.2.4
 ZSTD=1.5.6
 
 CPUINFO=3ebbfd45645650c4940bf0f3b4d25ab913466bb0
@@ -105,9 +110,9 @@ mkdir -p "${INSTALLDIR}"
 mkdir -p deps-build
 cd deps-build
 
-if [ "$SKIP_DOWNLOAD" != true ]; then
+if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE.tar.gz" ]]; then
 	curl -C - -L \
-		-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.tar.gz" \
+		-o "libbacktrace-$LIBBACKTRACE.tar.gz" "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.tar.gz" \
 		-O "https://github.com/libsdl-org/SDL/releases/download/release-$SDL3/SDL3-$SDL3.tar.gz" \
 		-o "cpuinfo-$CPUINFO.tar.gz" "https://github.com/stenzek/cpuinfo/archive/$CPUINFO.tar.gz" \
 		-o "discord-rpc-$DISCORD_RPC.tar.gz" "https://github.com/stenzek/discord-rpc/archive/$DISCORD_RPC.tar.gz" \
@@ -117,7 +122,7 @@ if [ "$SKIP_DOWNLOAD" != true ]; then
 fi
 
 cat > SHASUMS <<EOF
-baf8aebd22002b762d803ba0e1e389b6b4415159334e9d34bba1a938f6de8ce6  $LIBBACKTRACE.tar.gz
+baf8aebd22002b762d803ba0e1e389b6b4415159334e9d34bba1a938f6de8ce6  libbacktrace-$LIBBACKTRACE.tar.gz
 2938328317301dfbe30176d79c251733aa5e7ec5c436c800b99ed4da7adcb0f0  SDL3-$SDL3.tar.gz
 b60832071919220d2fe692151fb420fa9ea489aa4c7a2eb0e01c830cbe469858  cpuinfo-$CPUINFO.tar.gz
 3eea5ccce6670c126282f1ba4d32c19d486db49a1a5cbfb8d6f48774784d310c  discord-rpc-$DISCORD_RPC.tar.gz
@@ -127,7 +132,7 @@ fe45c2af99f6102d2704277d392c1c83b55180a70bfd17fb888cc84a54b70573  soundtouch-$SO
 EOF
 
 if [ "$SKIP_FREETYPE" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "freetype-$FREETYPE.tar.xz" ]]; then
 		curl -C - -L -o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download"
 	fi
 	cat >> SHASUMS <<EOF
@@ -135,7 +140,7 @@ if [ "$SKIP_FREETYPE" != true ]; then
 EOF
 fi
 if [ "$SKIP_HARFBUZZ" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "harfbuzz-$HARFBUZZ.tar.gz" ]]; then
 		curl -C - -L -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -143,7 +148,7 @@ if [ "$SKIP_HARFBUZZ" != true ]; then
 EOF
 fi
 if [ "$SKIP_LIBJPEG" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "libjpeg-turbo-$LIBJPEGTURBO.tar.gz" ]]; then
 		curl -C - -L -O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -151,7 +156,7 @@ if [ "$SKIP_LIBJPEG" != true ]; then
 EOF
 fi
 if [ "$SKIP_LIBPNG" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "libpng-$LIBPNG.tar.xz" ]]; then
 		curl -C - -L -O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -159,7 +164,7 @@ if [ "$SKIP_LIBPNG" != true ]; then
 EOF
 fi
 if [ "$SKIP_LIBWEBP" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "libwebp-$LIBWEBP.tar.gz" ]]; then
 		curl -C - -L -O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -167,15 +172,23 @@ if [ "$SKIP_LIBWEBP" != true ]; then
 EOF
 fi
 if [ "$SKIP_LIBZIP" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "libzip-$LIBZIP.tar.xz" ]]; then
 		curl -C - -L -O "https://github.com/nih-at/libzip/releases/download/v$LIBZIP/libzip-$LIBZIP.tar.xz"
 	fi
 	cat >> SHASUMS <<EOF
 9509d878ba788271c8b5abca9cfde1720f075335686237b7e9a9e7210fe67c1b  libzip-$LIBZIP.tar.xz
 EOF
 fi
+if [ "$SKIP_ZLIBNG" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "zlib-ng-$ZLIBNG.tar.gz" ]]; then
+		curl -C - -L -o "zlib-ng-$ZLIBNG.tar.gz" "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$ZLIBNG.tar.gz"
+	fi
+	cat >> SHASUMS <<EOF
+a73343c3093e5cdc50d9377997c3815b878fd110bf6511c2c7759f2afb90f5a3  zlib-ng-$ZLIBNG.tar.gz
+EOF
+fi
 if [ "$SKIP_ZSTD" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "zstd-$ZSTD.tar.gz" ]]; then
 		curl -C - -L -O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -183,7 +196,7 @@ if [ "$SKIP_ZSTD" != true ]; then
 EOF
 fi
 if [ "$SKIP_QT" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "qtbase-everywhere-src-$QT.tar.xz" ]]; then
 		curl -C - -L \
 			-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
 			-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
@@ -205,10 +218,8 @@ fi
 shasum -a 256 --check SHASUMS
 
 # Have to clone with git, because it does version detection.
-if [ "$SKIP_DOWNLOAD" != true ]; then
-	if [ ! -d "SPIRV-Cross" ]; then
-		git clone https://github.com/KhronosGroup/SPIRV-Cross/ -b $SPIRV_CROSS --depth 1
-	fi
+if [[ "$SKIP_DOWNLOAD" != true && ! -d "SPIRV-Cross" ]]; then
+	git clone https://github.com/KhronosGroup/SPIRV-Cross/ -b $SPIRV_CROSS --depth 1
 fi
 
 # Only downloading sources?
@@ -248,6 +259,18 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
 EOF
 
+# Build zlib first because of the things that depend on it.
+if [ "$SKIP_ZLIBNG" != true ]; then
+	echo "Building zlib-ng..."
+	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 --build build --parallel
+	ninja -C build install
+	cd ..
+fi
+
 # NOTE: Must be a shared library because otherwise aarch64 libgcc symbols are missing when building with clang.
 echo "Building libbacktrace..."
 rm -fr "libbacktrace-$LIBBACKTRACE"
diff --git a/scripts/deps/build-dependencies-linux.sh b/scripts/deps/build-dependencies-linux.sh
index 53e04064b..f6a4fd056 100755
--- a/scripts/deps/build-dependencies-linux.sh
+++ b/scripts/deps/build-dependencies-linux.sh
@@ -6,7 +6,7 @@
 set -e
 
 if [ "$#" -lt 1 ]; then
-    echo "Syntax: $0 [-system-freetype] [-system-harfbuzz] [-system-libjpeg] [-system-libpng] [-system-libwebp] [-system-libzip] [-system-zstd] [-system-qt] [-skip-download] [-skip-cleanup] [-only-download] <output directory>"
+    echo "Syntax: $0 [-system-freetype] [-system-harfbuzz] [-system-libjpeg] [-system-libpng] [-system-libwebp] [-system-libzip] [-system-zlib] [-system-zstd] [-system-qt] [-skip-download] [-skip-cleanup] [-only-download] <output directory>"
     exit 1
 fi
 
@@ -35,6 +35,10 @@ for arg in "$@"; do
 		echo "Skipping building libzip."
 		SKIP_LIBZIP=true
 		shift
+	elif [ "$arg" == "-system-zlib" ]; then
+		echo "Skipping building zlib-ng."
+		SKIP_ZLIBNG=true
+		shift
 	elif [ "$arg" == "-system-zstd" ]; then
 		echo "Skipping building zstd."
 		SKIP_ZSTD=true
@@ -74,6 +78,7 @@ LIBWEBP=1.5.0
 LIBZIP=1.11.3
 SDL3=3.2.4
 QT=6.8.2
+ZLIBNG=2.2.4
 ZSTD=1.5.6
 
 CPUINFO=3ebbfd45645650c4940bf0f3b4d25ab913466bb0
@@ -86,9 +91,9 @@ SPIRV_CROSS=vulkan-sdk-1.4.304.0
 mkdir -p deps-build
 cd deps-build
 
-if [ "$SKIP_DOWNLOAD" != true ]; then
+if [[ "$SKIP_DOWNLOAD" != true && ! -f "libbacktrace-$LIBBACKTRACE.tar.gz" ]]; then
 	curl -C - -L \
-		-O "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.tar.gz" \
+		-o "libbacktrace-$LIBBACKTRACE.tar.gz" "https://github.com/ianlancetaylor/libbacktrace/archive/$LIBBACKTRACE.tar.gz" \
 		-O "https://github.com/libsdl-org/SDL/releases/download/release-$SDL3/SDL3-$SDL3.tar.gz" \
 		-o "cpuinfo-$CPUINFO.tar.gz" "https://github.com/stenzek/cpuinfo/archive/$CPUINFO.tar.gz" \
 		-o "discord-rpc-$DISCORD_RPC.tar.gz" "https://github.com/stenzek/discord-rpc/archive/$DISCORD_RPC.tar.gz" \
@@ -98,7 +103,7 @@ if [ "$SKIP_DOWNLOAD" != true ]; then
 fi
 
 cat > SHASUMS <<EOF
-baf8aebd22002b762d803ba0e1e389b6b4415159334e9d34bba1a938f6de8ce6  $LIBBACKTRACE.tar.gz
+baf8aebd22002b762d803ba0e1e389b6b4415159334e9d34bba1a938f6de8ce6  libbacktrace-$LIBBACKTRACE.tar.gz
 2938328317301dfbe30176d79c251733aa5e7ec5c436c800b99ed4da7adcb0f0  SDL3-$SDL3.tar.gz
 b60832071919220d2fe692151fb420fa9ea489aa4c7a2eb0e01c830cbe469858  cpuinfo-$CPUINFO.tar.gz
 3eea5ccce6670c126282f1ba4d32c19d486db49a1a5cbfb8d6f48774784d310c  discord-rpc-$DISCORD_RPC.tar.gz
@@ -108,7 +113,7 @@ fe45c2af99f6102d2704277d392c1c83b55180a70bfd17fb888cc84a54b70573  soundtouch-$SO
 EOF
 
 if [ "$SKIP_FREETYPE" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "freetype-$FREETYPE.tar.xz" ]]; then
 		curl -C - -L -o "freetype-$FREETYPE.tar.xz" "https://sourceforge.net/projects/freetype/files/freetype2/$FREETYPE/freetype-$FREETYPE.tar.xz/download"
 	fi
 	cat >> SHASUMS <<EOF
@@ -116,7 +121,7 @@ if [ "$SKIP_FREETYPE" != true ]; then
 EOF
 fi
 if [ "$SKIP_HARFBUZZ" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "harfbuzz-$HARFBUZZ.tar.gz" ]]; then
 		curl -C - -L -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -124,7 +129,7 @@ if [ "$SKIP_HARFBUZZ" != true ]; then
 EOF
 fi
 if [ "$SKIP_LIBJPEG" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "libjpeg-turbo-$LIBJPEGTURBO.tar.gz" ]]; then
 		curl -C - -L -O "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/$LIBJPEGTURBO/libjpeg-turbo-$LIBJPEGTURBO.tar.gz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -132,7 +137,7 @@ if [ "$SKIP_LIBJPEG" != true ]; then
 EOF
 fi
 if [ "$SKIP_LIBPNG" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "libpng-$LIBPNG.tar.xz" ]]; then
 		curl -C - -L -O "https://downloads.sourceforge.net/project/libpng/libpng16/$LIBPNG/libpng-$LIBPNG.tar.xz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -140,7 +145,7 @@ if [ "$SKIP_LIBPNG" != true ]; then
 EOF
 fi
 if [ "$SKIP_LIBWEBP" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "libwebp-$LIBWEBP.tar.gz" ]]; then
 		curl -C - -L -O "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-$LIBWEBP.tar.gz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -148,15 +153,23 @@ if [ "$SKIP_LIBWEBP" != true ]; then
 EOF
 fi
 if [ "$SKIP_LIBZIP" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "libzip-$LIBZIP.tar.xz" ]]; then
 		curl -C - -L -O "https://github.com/nih-at/libzip/releases/download/v$LIBZIP/libzip-$LIBZIP.tar.xz"
 	fi
 	cat >> SHASUMS <<EOF
 9509d878ba788271c8b5abca9cfde1720f075335686237b7e9a9e7210fe67c1b  libzip-$LIBZIP.tar.xz
 EOF
 fi
+if [ "$SKIP_ZLIBNG" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "zlib-ng-$ZLIBNG.tar.gz" ]]; then
+		curl -C - -L -o "zlib-ng-$ZLIBNG.tar.gz" "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/$ZLIBNG.tar.gz"
+	fi
+	cat >> SHASUMS <<EOF
+a73343c3093e5cdc50d9377997c3815b878fd110bf6511c2c7759f2afb90f5a3  zlib-ng-$ZLIBNG.tar.gz
+EOF
+fi
 if [ "$SKIP_ZSTD" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "zstd-$ZSTD.tar.gz" ]]; then
 		curl -C - -L -O "https://github.com/facebook/zstd/releases/download/v$ZSTD/zstd-$ZSTD.tar.gz"
 	fi
 	cat >> SHASUMS <<EOF
@@ -164,7 +177,7 @@ if [ "$SKIP_ZSTD" != true ]; then
 EOF
 fi
 if [ "$SKIP_QT" != true ]; then
-	if [ "$SKIP_DOWNLOAD" != true ]; then
+	if [[ "$SKIP_DOWNLOAD" != true && ! -f "qtbase-everywhere-src-$QT.tar.xz" ]]; then
 		curl -C - -L \
 			-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtbase-everywhere-src-$QT.tar.xz" \
 			-O "https://download.qt.io/official_releases/qt/${QT%.*}/$QT/submodules/qtimageformats-everywhere-src-$QT.tar.xz" \
@@ -186,10 +199,8 @@ fi
 shasum -a 256 --check SHASUMS
 
 # Have to clone with git, because it does version detection.
-if [ "$SKIP_DOWNLOAD" != true ]; then
-	if [ ! -d "SPIRV-Cross" ]; then
-		git clone https://github.com/KhronosGroup/SPIRV-Cross/ -b $SPIRV_CROSS --depth 1
-	fi
+if [[ "$SKIP_DOWNLOAD" != true && ! -d "SPIRV-Cross" ]]; then
+	git clone https://github.com/KhronosGroup/SPIRV-Cross/ -b $SPIRV_CROSS --depth 1
 fi
 
 # Only downloading sources?
@@ -197,9 +208,21 @@ if [ "$ONLY_DOWNLOAD" == true ]; then
 	exit 0
 fi
 
+# Build zlib first because of the things that depend on it.
+if [ "$SKIP_ZLIBNG" != true ]; then
+	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 --build build --parallel
+	ninja -C build install
+	cd ..
+fi
+
 echo "Building libbacktrace..."
 rm -fr "libbacktrace-$LIBBACKTRACE"
-tar xf "$LIBBACKTRACE.tar.gz"
+tar xf "libbacktrace-$LIBBACKTRACE.tar.gz"
 cd "libbacktrace-$LIBBACKTRACE"
 ./configure --prefix="$INSTALLDIR" --with-pic
 make
diff --git a/scripts/deps/build-dependencies-windows-arm64.bat b/scripts/deps/build-dependencies-windows-arm64.bat
index 6b0ab3205..c3e455991 100644
--- a/scripts/deps/build-dependencies-windows-arm64.bat
+++ b/scripts/deps/build-dependencies-windows-arm64.bat
@@ -54,8 +54,7 @@ set QTMINOR=6.8
 set SDL3=3.2.4
 set WEBP=1.5.0
 set LIBZIP=1.11.3
-set ZLIB=1.3.1
-set ZLIBSHORT=131
+set ZLIBNG=2.2.4
 set ZSTD=1.5.6
 
 set CPUINFO=3ebbfd45645650c4940bf0f3b4d25ab913466bb0
@@ -79,7 +78,7 @@ call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/off
 call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 33ccac9f99a357ffd83cb2d7179a0c0ffcba85a14d23d86619d5dc9721ded42f || goto error
 call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c || goto error
 call :downloadfile "libzip-%LIBZIP%.tar.gz" "https://github.com/nih-at/libzip/releases/download/v%LIBZIP%/libzip-%LIBZIP%.tar.gz" 76653f135dde3036036c500e11861648ffbf9e1fc5b233ff473c60897d9db0ea || goto error
-call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zlib-ng-%ZLIBNG%.zip" "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/%ZLIBNG%.zip" 5e78f0ebbe507fe294bf756c741a8af4766d3838c54460a087e906b3f20346e4 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 3b1c3b46e416d36931efd34663122d7f51b550c87f74de2d38249516fe7d8be5 || goto error
 call :downloadfile "zstd-fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch" https://github.com/facebook/zstd/commit/fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch 8df152f4969b308546306c074628de761f0b80265de7de534e3822fab22d7535 || goto error
 
@@ -104,11 +103,12 @@ if %DEBUG%==1 (
 set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"
 set ARM64TOOLCHAIN=-DCMAKE_TOOLCHAIN_FILE="%SCRIPTDIR%\cmake-toolchain-windows-arm64.cmake"
 
-echo Building Zlib...
-rmdir /S /Q "zlib-%ZLIB%"
-%SEVENZIP% x "zlib%ZLIBSHORT%.zip" || goto error
-cd "zlib-%ZLIB%" || goto error
-cmake %ARM64TOOLCHAIN% -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF -B build -G Ninja || goto error
+echo Building zlib-ng...
+rmdir /S /Q "zlib-ng-%ZLIBNG%"
+%SEVENZIP% x "zlib-ng-%ZLIBNG%.zip" || 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 --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 82970f829..8726465c2 100644
--- a/scripts/deps/build-dependencies-windows-x64.bat
+++ b/scripts/deps/build-dependencies-windows-x64.bat
@@ -52,8 +52,7 @@ set QTMINOR=6.8
 set SDL3=3.2.4
 set WEBP=1.5.0
 set LIBZIP=1.11.3
-set ZLIB=1.3.1
-set ZLIBSHORT=131
+set ZLIBNG=2.2.4
 set ZSTD=1.5.6
 
 set CPUINFO=3ebbfd45645650c4940bf0f3b4d25ab913466bb0
@@ -77,7 +76,7 @@ call :downloadfile "qttools-everywhere-src-%QT%.zip" "https://download.qt.io/off
 call :downloadfile "qttranslations-everywhere-src-%QT%.zip" "https://download.qt.io/official_releases/qt/%QTMINOR%/%QT%/submodules/qttranslations-everywhere-src-%QT%.zip" 33ccac9f99a357ffd83cb2d7179a0c0ffcba85a14d23d86619d5dc9721ded42f || goto error
 call :downloadfile "libwebp-%WEBP%.tar.gz" "https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-%WEBP%.tar.gz" 7d6fab70cf844bf6769077bd5d7a74893f8ffd4dfb42861745750c63c2a5c92c || goto error
 call :downloadfile "libzip-%LIBZIP%.tar.gz" "https://github.com/nih-at/libzip/releases/download/v%LIBZIP%/libzip-%LIBZIP%.tar.gz" 76653f135dde3036036c500e11861648ffbf9e1fc5b233ff473c60897d9db0ea || goto error
-call :downloadfile "zlib%ZLIBSHORT%.zip" "https://zlib.net/zlib%ZLIBSHORT%.zip" 72af66d44fcc14c22013b46b814d5d2514673dda3d115e64b690c1ad636e7b17 || goto error
+call :downloadfile "zlib-ng-%ZLIBNG%.zip" "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/%ZLIBNG%.zip" 5e78f0ebbe507fe294bf756c741a8af4766d3838c54460a087e906b3f20346e4 || goto error
 call :downloadfile "zstd-%ZSTD%.zip" "https://github.com/facebook/zstd/archive/refs/tags/v%ZSTD%.zip" 3b1c3b46e416d36931efd34663122d7f51b550c87f74de2d38249516fe7d8be5 || goto error
 call :downloadfile "zstd-fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch" https://github.com/facebook/zstd/commit/fd5f8106a58601a963ee816e6a57aa7c61fafc53.patch 8df152f4969b308546306c074628de761f0b80265de7de534e3822fab22d7535 || goto error
 
@@ -101,11 +100,12 @@ if %DEBUG%==1 (
 
 set FORCEPDB=-DCMAKE_SHARED_LINKER_FLAGS_RELEASE="/DEBUG"
 
-echo Building Zlib...
-rmdir /S /Q "zlib-%ZLIB%"
-%SEVENZIP% x "zlib%ZLIBSHORT%.zip" || goto error
-cd "zlib-%ZLIB%" || goto error
-cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="%INSTALLDIR%" -DCMAKE_INSTALL_PREFIX="%INSTALLDIR%" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF -B build -G Ninja || goto error
+echo Building zlib-ng...
+rmdir /S /Q "zlib-ng-%ZLIBNG%"
+%SEVENZIP% x "zlib-ng-%ZLIBNG%.zip" || 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 --build build --parallel || goto error
 ninja -C build install || goto error
 cd .. || goto error