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 <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2018-08-04 12:20:47 -07:00
parent a65a8267a5
commit 8df6789a9d
3 changed files with 6 additions and 3 deletions

View file

@ -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]

View file

@ -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

View file

@ -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