sigrok-cross-android: Bump to Qt 5.6-beta.

[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 f919cd09ce87f6abceb312a6d1fbaa4d8d13a29d..a1334aa9e5558a82e10a66eb361772b288e402d4 100755 (executable)
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -62,26 +62,27 @@ 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_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.4.1
-VER_SIGROK_FIRMWARE_FX2LAFW=0.1.2
+VER_QT=5.6.0
+VER_QT_SHORT=5.6
+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
@@ -445,9 +446,9 @@ echo "using gcc : $NDK_TOOLCHAIN_VERSION : \"${TOOLCHAIN_TRIPLET}-g++\" : <cxxfl
 cd ..
 
 # Qt (needed for PulseView)
-$WGET http://download.qt-project.org/official_releases/qt/${VER_QT%.*}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.gz
-tar xfz qt-everywhere-opensource-src-${VER_QT}.tar.gz
-cd qt-everywhere-opensource-src-${VER_QT}
+$WGET http://download.qt.io/snapshots/qt/${VER_QT_SHORT}/${VER_QT}-beta/latest_src/qt-everywhere-opensource-src-${VER_QT}-beta.tar.gz
+tar xfz qt-everywhere-opensource-src-${VER_QT}-beta.tar.gz
+cd qt-everywhere-opensource-src-${VER_QT}-beta
 patch -p1 < ../../android-qt.patch
 CC= CXX= ./configure \
        --prefix="$PREFIX" \
@@ -470,8 +471,6 @@ CC= CXX= ./configure \
        -skip qttools \
        -skip qttranslations \
        -skip qtwebchannel \
-       -skip qtwebkit \
-       -skip qtwebkit-examples \
        -skip qtwebsockets \
        -skip qtxmlpatterns \
        -opensource -confirm-license -silent
@@ -496,9 +495,9 @@ 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
-make install $V
 ${TOOLCHAIN_TRIPLET}-strip -S libs/$TARGET_ARCH/libpulseview.so
 cd android
 "${ANDROID_SDK}/tools/android" update project -p . -t android-$VER_AND_API -n PulseView