From 124c07b906ba927ae961dce652a2fe09ee38c071 Mon Sep 17 00:00:00 2001 From: Uwe Hermann Date: Thu, 4 Feb 2016 08:30:58 +0100 Subject: [PATCH] sigrok-cross-android: Bump a few packages to newer versions. --- cross-compile/android/README | 2 +- cross-compile/android/sigrok-cross-android | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cross-compile/android/README b/cross-compile/android/README index 023b1c4..ba6b120 100644 --- a/cross-compile/android/README +++ b/cross-compile/android/README @@ -25,7 +25,7 @@ Requirements - ant - Android NDK (tested: r10e) - Android cross-compile toolchain (tested: arm-linux-androideabi-4.9) - - Android SDK (tested: r24.3.3) + - Android SDK (tested: r24.4.1) - On 64bit hosts, you also need some i386 packages. E.g. on Debian/Ubuntu: $ dpkg --add-architecture i386 $ apt-get update diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android index 349ab1a..5645b6c 100755 --- a/cross-compile/android/sigrok-cross-android +++ b/cross-compile/android/sigrok-cross-android @@ -62,17 +62,17 @@ PARALLEL="-j 2" # ----------------------------------------------------------------------------- VER_LIBICONV=1.14 -VER_GETTEXT=0.19.5.1 +VER_GETTEXT=0.19.7 VER_ZLIB=1.2.8 -VER_PCRE=8.37 +VER_PCRE=8.38 VER_LIBFFI=3.2.1 -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_GLIB=2.47.5 +VER_GLIB_SHORT=2.47 +VER_GLIBMM=2.47.4 +VER_GLIBMM_SHORT=2.47 +VER_LIBSIGCXX=2.6.2 +VER_LIBSIGCXX_SHORT=2.6 +VER_LIBZIP=1.1 VER_LIBFTDI1=1.2 VER_LIBUSB=1.0.19 VER_PYTHON=3.3.3 @@ -80,8 +80,8 @@ VER_BOOST=1.58.0 VER_QT=5.5.1 VER_SIGROK_FIRMWARE_FX2LAFW=0.1.2 VER_NDK=10e -VER_SDK=24.3.3 -VER_AND_BT=22.0.1 # Android build tools version +VER_SDK=24.4.1 +VER_AND_BT=23.0.2 # Android build tools version VER_AND_API=16 # Target Android API version SF_MIRROR=download.sourceforge.net -- 2.30.2