diff --git a/scripts/get-dep-lib.sh b/scripts/get-dep-lib.sh index bca4ba369..927c212a5 100755 --- a/scripts/get-dep-lib.sh +++ b/scripts/get-dep-lib.sh @@ -15,7 +15,7 @@ CURRENT_LIBXML2="v2.9.4" CURRENT_LIBFTDI="abd19b721f7e9b4d514ed319ece173ebc7b1ea72" CURRENT_KIRIGAMI="v5.76.0" CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02" -CURRENT_MDBTOOLS="master" +CURRENT_MDBTOOLS="v1.0.0" CURRENT_QT_ANDROID_CMAKE="master" CURRENT_LIBMTP="master" @@ -196,7 +196,7 @@ for package in "${PACKAGES[@]}" ; do curl_download_library sqlite https://www.sqlite.org/2017/ sqlite-autoconf-${CURRENT_SQLITE}.tar.gz ;; mdbtools) - git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/brianb/mdbtools.git + git_checkout_library mdbtools $CURRENT_MDBTOOLS https://github.com/mdbtools/mdbtools.git ;; qt-android-cmake) git_checkout_library qt-android-cmake $CURRENT_QT_ANDROID_CMAKE https://github.com/LaurentGomila/qt-android-cmake.git diff --git a/scripts/smtk2ssrf-build.sh b/scripts/smtk2ssrf-build.sh index 7ab5799ba..b78bf5321 100755 --- a/scripts/smtk2ssrf-build.sh +++ b/scripts/smtk2ssrf-build.sh @@ -108,15 +108,16 @@ else cd "$BASEDIR"/mdbtools || aborting "Couldn't cd into $BASEDIR/mdbtools" git pull --rebase || aborting "Problem downloading/updating mdbtools" else - git clone https://github.com/brianb/mdbtools.git "$BASEDIR"/mdbtools || \ + git clone https://github.com/mdbtools/mdbtools.git "$BASEDIR"/mdbtools || \ aborting "Problem downloading/updating mdbtools" fi echo "----> Building mdbtools ..." echo "----> This will display a lot of errors and warnings" cd "$BASEDIR"/mdbtools || aborting "Couldn't cd into $BASEDIR/mdbtools" + git checkout "v1.0.0" autoreconf -i -f - ./configure --prefix "$INSTALL_ROOT" --disable-man --disable-gmdb2 >/dev/null + ./configure --prefix "$INSTALL_ROOT" --disable-man --without-bash-completion-dir >/dev/null make "$JOBS">/dev/null || aborting "Building mdbtools failed" make install fi diff --git a/scripts/windows/before_install.sh b/scripts/windows/before_install.sh index 9f6140659..1cddcb9bd 100644 --- a/scripts/windows/before_install.sh +++ b/scripts/windows/before_install.sh @@ -61,7 +61,7 @@ git clone https://github.com/Subsurface/googlemaps.git echo "Get mdbtools" cd ${TRAVIS_BUILD_DIR}/.. -git clone https://github.com/brianb/mdbtools.git +git clone https://github.com/mdbtools/mdbtools.git # get prebuilt mxe libraries for mdbtools and glib. # do not overwrite upstream prebuilt mxe binaries if there is any coincidence.