[cmake] Update deps to fix cmake version errors (#309)

* [cmake] Update zlib

* [cmake] Update mariadb connector c

* Patch mariadb for mac arm64 inline assembly error

See: https://jira.mariadb.org/browse/CONC-764

Author: tobil4sk

cmake/patch_mariadb.cmake

@@ -11,3 +11,18 @@ string(REPLACE
 )
 
 file(WRITE ${cmakelists} "${content}")
+
+# https://jira.mariadb.org/browse/CONC-764
+if(${processor} STREQUAL "arm64")
+	set(ma_context ${mariadb_source}/libmariadb/ma_context.c)
+
+	file(READ ${ma_context} content)
+
+	string(REPLACE
+		"\"x18\", "
+		""
+		content "${content}"
+	)
+
+	file(WRITE ${ma_context} "${content}")
+endif()

libs/CMakeLists.txt

@@ -35,9 +35,9 @@ if (STATIC_ZLIB)
 	ExternalProject_Add(Zlib
 		${EP_CONFIGS}
 		URL
-			https://zlib.net/fossils/zlib-1.2.13.tar.gz
-			https://github.com/madler/zlib/releases/download/v1.2.13/zlib-1.2.13.tar.gz
-		URL_HASH SHA256=b3a24de97a8fdbc835b9833169501030b8977031bcb54b3b3ac13740f846ab30
+			https://zlib.net/zlib-1.3.1.tar.gz
+			https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.gz
+		URL_HASH SHA256=9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
 		CMAKE_ARGS ${ZLIB_CMAKE_ARGS}
 		INSTALL_COMMAND cd ${CMAKE_BINARY_DIR}/libs/src/Zlib-build &&
 			${CMAKE_COMMAND} --build . --target install --config ${config}

libs/mysql/CMakeLists.txt

@@ -98,16 +98,19 @@ if (STATIC_MARIADBCONNECTOR)
 	ExternalProject_Add(MariaDBConnector
 		${EP_CONFIGS}
 		DEPENDS ${OPENSSL_DEP} ${ZLIB_DEP}
-		URL https://downloads.mariadb.com/Connectors/c/connector-c-3.3.4/mariadb-connector-c-3.3.4-src.tar.gz
-		URL_HASH SHA256=486e5fdf976a8e7fadf583ae912128655e013ac575fa79b2d1af0fb8827a78ed
+		URL https://downloads.mariadb.com/Connectors/c/connector-c-3.4.4/mariadb-connector-c-3.4.4-src.tar.gz
+		URL_HASH SHA256=58876fad1c2d33979d78bbfa61d7a3476e8faa2cd0af0f7f8bfeb06deaa1034e
 		CMAKE_ARGS
 			-Wno-dev
 			-DCMAKE_OSX_ARCHITECTURES=${CMAKE_OSX_ARCHITECTURES}
 			-DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}
 			-DWITH_SSL=OPENSSL
 			${OPENSSL_CONF}
 			${ZLIB_CONF}
-		PATCH_COMMAND ${CMAKE_COMMAND} -Dmariadb_source=${CMAKE_BINARY_DIR}/libs/src/MariaDBConnector -P ${CMAKE_SOURCE_DIR}/cmake/patch_mariadb.cmake
+		PATCH_COMMAND ${CMAKE_COMMAND}
+			-Dmariadb_source=${CMAKE_BINARY_DIR}/libs/src/MariaDBConnector
+			-Dprocessor=${CMAKE_SYSTEM_PROCESSOR}
+			-P ${CMAKE_SOURCE_DIR}/cmake/patch_mariadb.cmake
 		BUILD_COMMAND cd ${CMAKE_BINARY_DIR}/libs/src/MariaDBConnector-build &&
 			${CMAKE_COMMAND} --build . --target mariadbclient --config ${CMAKE_CFG_INTDIR}
 		INSTALL_COMMAND echo skip install