externals: Use upstream zlib

We don't need to depend on a custom fork for this. We can add the
library as is, and then make it excluded from the ALL target, so we only
link in the libraries that we actually make use of.

4 files changed, 9 insertions, 8 deletions

diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh
index f538a4081..296b14e56 100644
--- a/.ci/scripts/linux/docker.sh
+++ b/.ci/scripts/linux/docker.sh
@@ -11,4 +11,5 @@ ninja
 
 ccache -s
 
-ctest -VV -C Release
+# Ignore zlib's tests, since they aren't gated behind a CMake option.
+ctest -VV -E "(example|example64)" -C Release
diff --git a/.gitmodules b/.gitmodules
index f3051cca0..35e0d1240 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -47,8 +47,8 @@
     path = externals/sirit
     url = https://github.com/ReinUsesLisp/sirit
 [submodule "libzip"]
-	path = externals/libzip
-	url = https://github.com/DarkLordZach/libzip
+    path = externals/libzip
+    url = https://github.com/DarkLordZach/libzip
 [submodule "zlib"]
-	path = externals/zlib
-	url = https://github.com/DarkLordZach/zlib
+    path = externals/zlib
+    url = https://github.com/madler/zlib
diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d797d9fc9..d6815fbc5 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -77,12 +77,12 @@ if (ENABLE_VULKAN)
     add_subdirectory(sirit)
 endif()
 
+# zlib
+add_subdirectory(zlib EXCLUDE_FROM_ALL)
+
 # libzip
 add_subdirectory(libzip)
 
-# zlib
-add_subdirectory(zlib)
-
 if (ENABLE_WEB_SERVICE)
     # LibreSSL
     set(LIBRESSL_SKIP_INSTALL ON CACHE BOOL "")
diff --git a/externals/zlib b/externals/zlib
-Subproject 094ed57db392170130bc710293568de7b576306
+Subproject cacf7f1d4e3d44d871b605da3b647f07d718623