From 8df6789a9d4284c360146c53d24e56d442006237 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 4 Aug 2018 12:20:47 -0700 Subject: build-system: update libzip to 1.5.1 This also switches us to libzip's new official home on GitHub, and takes into account that libzip no longer supports autotools and instead now is cmake based. Building against that, on my Mac build system, Subsurface once again correctly opens DLD files downloaded from divelogs.de. Fixes #1534 Signed-off-by: Dirk Hohndel --- scripts/build.sh | 4 +++- scripts/get-dep-lib.sh | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/build.sh b/scripts/build.sh index 406bcbb08..8e2381e6e 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -274,7 +274,9 @@ if [[ $PLATFORM = Darwin && "$BUILD_DEPS" == "1" ]] ; then pushd libzip mkdir -p build cd build - ../configure CFLAGS="$OLDER_MAC" --prefix=$INSTALL_ROOT + cmake $OLDER_MAC_CMAKE -DCMAKE_BUILD_TYPE=$DEBUGRELEASE \ + -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT \ + .. make -j4 make install popd diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index a0db86896..5bd3f2494 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -2,7 +2,7 @@ # # set version of 3rd party libraries -CURRENT_LIBZIP="1.2.0" +CURRENT_LIBZIP="rel-1-5-1" CURRENT_LIBGIT2="v0.26.0" CURRENT_HIDAPI="hidapi-0.7.0" CURRENT_LIBCURL="curl-7_54_1" @@ -176,7 +176,7 @@ for package in "${PACKAGES[@]}" ; do git_checkout_library openssl $CURRENT_OPENSSL https://github.com/openssl/openssl.git ;; libzip) - curl_download_library libzip https://subsurface-divelog.org/downloads/ libzip-${CURRENT_LIBZIP}.tar.xz + git_checkout_library libzip $CURRENT_LIBZIP https://github.com/nih-at/libzip.git ;; libftdi1) curl_download_library libftdi1 https://www.intra2net.com/en/developer/libftdi/download/ libftdi1-${CURRENT_LIBFTDI}.tar.bz2 -- cgit v1.2.3-70-g09d2