From 80bdb44ead002e37eec935fb905c604e7d7a1d43 Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 3 Oct 2019 22:53:03 -0400
Subject: [PATCH 1/2] 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.
---
 .ci/scripts/linux/docker.sh | 3 ++-
 .gitmodules                 | 8 ++++----
 externals/CMakeLists.txt    | 6 +++---
 externals/zlib              | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/.ci/scripts/linux/docker.sh b/.ci/scripts/linux/docker.sh
index f538a40817..296b14e560 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 f3051cca0c..35e0d12404 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 d797d9fc95..d6815fbc53 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
index 094ed57db3..cacf7f1d4e 160000
--- a/externals/zlib
+++ b/externals/zlib
@@ -1 +1 @@
-Subproject commit 094ed57db392170130bc710293568de7b576306d
+Subproject commit cacf7f1d4e3d44d871b605da3b647f07d718623f

From e29492d114a9caecaac8698457157ba93c8ee01e Mon Sep 17 00:00:00 2001
From: Lioncash <mathew1800@gmail.com>
Date: Thu, 3 Oct 2019 23:11:19 -0400
Subject: [PATCH 2/2] CMakeLists: Make libzip excluded from the ALL target

Likewise, we also only want to link in the libraries that we actually
make use of (so we don't need to worry about linking in test targets).
---
 externals/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt
index d6815fbc53..3539828b8d 100644
--- a/externals/CMakeLists.txt
+++ b/externals/CMakeLists.txt
@@ -81,7 +81,7 @@ endif()
 add_subdirectory(zlib EXCLUDE_FROM_ALL)
 
 # libzip
-add_subdirectory(libzip)
+add_subdirectory(libzip EXCLUDE_FROM_ALL)
 
 if (ENABLE_WEB_SERVICE)
     # LibreSSL