From 98d2d866d6045c6f50aec55bcdd1ca4266e9c10e Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Tue, 26 Mar 2024 00:45:04 +1000
Subject: [PATCH] CI: Use OS zlib for MacOS

Because the updater doesn't get fixup'd, so the dylib doesn't get added
to its bundle.
---
 CMakeModules/DuckStationDependencies.cmake |  2 +-
 scripts/build-dependencies-mac.sh          | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CMakeModules/DuckStationDependencies.cmake b/CMakeModules/DuckStationDependencies.cmake
index 7b2f02d7d..f102f7ab4 100644
--- a/CMakeModules/DuckStationDependencies.cmake
+++ b/CMakeModules/DuckStationDependencies.cmake
@@ -11,7 +11,7 @@ if(NOT WIN32 AND NOT ANDROID)
 
   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(ZLIB 1.3 REQUIRED)
+  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.
   find_package(CURL REQUIRED)
diff --git a/scripts/build-dependencies-mac.sh b/scripts/build-dependencies-mac.sh
index bd180151f..6b62e27b9 100755
--- a/scripts/build-dependencies-mac.sh
+++ b/scripts/build-dependencies-mac.sh
@@ -99,14 +99,15 @@ make -C build "-j$NPROCS"
 make -C build install
 cd ..
 
-echo "Installing Zlib..."
-rm -fr "zlib-$ZLIB"
-tar xf "zlib-$ZLIB.tar.gz"
-cd "zlib-$ZLIB"
-cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF
-make -C build "-j$NPROCS"
-make -C build install
-cd ..
+# Temporarily disabled, because the updater doesn't get fixup'd, so the dylib doesn't get added to its bundle.
+#echo "Installing Zlib..."
+#rm -fr "zlib-$ZLIB"
+#tar xf "zlib-$ZLIB.tar.gz"
+#cd "zlib-$ZLIB"
+#cmake -B build "${CMAKE_COMMON[@]}" "$CMAKE_ARCH_UNIVERSAL" -DBUILD_SHARED_LIBS=ON -DZLIB_BUILD_EXAMPLES=OFF
+#make -C build "-j$NPROCS"
+#make -C build install
+#cd ..
 
 echo "Installing Zstd..."
 rm -fr "zstd-$ZSTD"