diff options
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rwxr-xr-x | scripts/build.sh | 4 | ||||
| -rwxr-xr-x | scripts/get-dep-lib.sh | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 707106a7c..0fe7d0a15 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,4 @@ +- Mac: fix problem downloading from divelogs.de - Dive media: paint duration of videos on thumbnails in the dive-photo tab - Dive media: extract video thumbnails using ffmpeg - Dive media: implement "open folder of selected media files" [#1514] 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 |