sigrok-cross-android: Bump various lib versions.

[sigrok-util.git] / cross-compile / android / sigrok-cross-android

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index b8a17fae929adbe1b9807bb275b57851c75a27bf..b5b4e4234a771fff97daed543f58e84331096421 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -26,7 +26,7 @@ set -e
 ANDROID_PATH=$HOME/android
 
 # The path where the Android NDK is located.
-ANDROID_NDK=$ANDROID_PATH/android-ndk-r10d
+ANDROID_NDK=$ANDROID_PATH/android-ndk-r10e
 
 # The path where the Android SDK is located.
 ANDROID_SDK=$ANDROID_PATH/android-sdk-linux
@@ -62,22 +62,24 @@ PARALLEL="-j 2"
 # -----------------------------------------------------------------------------
 
 VER_LIBICONV=1.14
-VER_GETTEXT=0.19.4
+VER_GETTEXT=0.19.5.1
 VER_ZLIB=1.2.8
-VER_PCRE=8.36
+VER_PCRE=8.37
 VER_LIBFFI=3.2.1
-VER_GLIB=2.43.3
-VER_GLIB_SHORT=2.43
-VER_LIBSIGCXX=2.4.0
-VER_LIBSIGCXX_SHORT=2.4
+VER_GLIB=2.45.4
+VER_GLIB_SHORT=2.45
+VER_GLIBMM=2.45.41
+VER_GLIBMM_SHORT=2.45
+VER_LIBSIGCXX=2.5.1
+VER_LIBSIGCXX_SHORT=2.5
 VER_LIBZIP=0.11.2
 VER_LIBFTDI1=1.2
 VER_LIBUSB=1.0.19
 VER_PYTHON=3.3.3
-VER_BOOST=1.57.0
+VER_BOOST=1.58.0
 VER_QT=5.4.1
-VER_NDK=10d
-VER_SDK=23.0.2
+VER_NDK=10e
+VER_SDK=24.3.3
 VER_AND_BT=22.0.1 # Android build tools version
 VER_AND_API=16    # Target Android API version
 
@@ -120,7 +122,7 @@ if [ "x$1" = "xprepare" ]; then
   $WGET http://dl.google.com/android/android-sdk_r$VER_SDK-linux.tgz
   tar xfz android-sdk_r$VER_SDK-linux.tgz
   cd android-sdk-linux
-  echo y | ./tools/android update sdk --no-ui --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
+  echo y | ./tools/android update sdk --no-ui --all --filter platform-tools,build-tools-$VER_AND_BT,android-$VER_AND_API
   cd ..
 
   exit
@@ -318,7 +320,7 @@ cd ..
 $WGET http://www.intra2net.com/en/developer/libftdi/download/libftdi1-$VER_LIBFTDI1.tar.bz2
 tar xfj libftdi1-$VER_LIBFTDI1.tar.bz2
 cd libftdi1-$VER_LIBFTDI1
-cmake $CM -DFTDIPP=no -DDOCUMENTATION=no -DEXAMPLES=no -DFTDI_EEPROM=no -DPYTHON_BINDINGS=no .
+cmake $CM -DFTDIPP=no -DDOCUMENTATION=no -DEXAMPLES=no -DFTDI_EEPROM=no -DPYTHON_BINDINGS=no -DBUILD_TESTS=n .
 make $PARALLEL $V
 make install $V
 cd ..
@@ -350,9 +352,9 @@ if [ x"$CPPFLAGS_STL" != x ]; then
   cd ..
 
   # glibmm (needed for libsigrok bindings)
-  $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIB_SHORT/glibmm-$VER_GLIB.tar.xz
-  tar xfJ glibmm-$VER_GLIB.tar.xz
-  cd glibmm-$VER_GLIB
+  $WGET http://ftp.gnome.org/pub/gnome/sources/glibmm/$VER_GLIBMM_SHORT/glibmm-$VER_GLIBMM.tar.xz
+  tar xfJ glibmm-$VER_GLIBMM.tar.xz
+  cd glibmm-$VER_GLIBMM
   CPPFLAGS="$CPPFLAGS_STL" LDFLAGS="$LDFLAGS_STL -lgnustl_shared" ./configure --disable-documentation $C
   make $PARALLEL $V
   make install $V