X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=adeee91bcf9b764f62de9e6d86d1458403cc521c;hp=1216bbc401445f2fbe1e5bb3897923b3d401caa9;hb=7cf8cc4a916b0a13d4b478d27f343b38bf382664;hpb=5e5ff66a4a0cec822781fcc1fb0bf518d7b21e44

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index 1216bbc..adeee91 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -62,26 +62,26 @@ 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
 VER_BOOST=1.58.0
 VER_QT=5.5.1
-VER_SIGROK_FIRMWARE_FX2LAFW=0.1.2
+VER_SIGROK_FIRMWARE_FX2LAFW=0.1.3
 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
@@ -496,6 +496,7 @@ find $PREFIX -iname "*.so" -exec ${TOOLCHAIN_TRIPLET}-strip -S {} \;
 # PulseView
 $GIT_CLONE git://sigrok.org/pulseview
 cd pulseview
+patch -p1 < ../../pv_cmake_pkgconfig_fix.patch
 cmake $CM -DENABLE_TESTS=y .
 make $PARALLEL $V
 ${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so