X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fandroid%2Fsigrok-cross-android;h=e6f8ed9fc20d215240574ee5dfc3f74543a66d4e;hp=b5b4e4234a771fff97daed543f58e84331096421;hb=a4aed0610040e7412f464be712ce2dd48c45f431;hpb=e3f032ac6751556525b4130fb4fb84d8d99445a5

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index b5b4e42..e6f8ed9 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -62,25 +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_GLIB=2.48.1
+VER_GLIB_SHORT=2.48
+VER_GLIBMM=2.48.1
+VER_GLIBMM_SHORT=2.48
+VER_LIBSIGCXX=2.9.2
+VER_LIBSIGCXX_SHORT=2.9
+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_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
@@ -206,10 +208,10 @@ fi
 # -----------------------------------------------------------------------------
 
 # Get the latest versions of config.guess/config.sub that know about Android.
-$GIT_CLONE git://git.savannah.gnu.org/config.git
+$GIT_CLONE http://git.savannah.gnu.org/r/config.git
 
 # Get a toolchain for cmake that knows about Android.
-$WGET https://android-cmake.googlecode.com/hg/toolchain/android.toolchain.cmake
+$WGET https://raw.githubusercontent.com/arithran/android-cmake/master/toolchain/android.toolchain.cmake
 patch < ../android.toolchain.cmake.patch android.toolchain.cmake
 
 # -----------------------------------------------------------------------------
@@ -222,6 +224,8 @@ autoreconf
 patch -p1 < ../../Python-$VER_PYTHON.patch
 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6
 sed -i "s/^#zlib/zlib/g" Modules/Setup
+sed -i "s/^#math/math/g" Modules/Setup
+sed -i "s/^#time/time/g" Modules/Setup
 make PYTHON_FOR_BUILD='_PYTHON_HOST_PLATFORM=$(_PYTHON_HOST_PLATFORM) ./hostpython' install $V
 cd ..
 
@@ -384,6 +388,24 @@ make $PARALLEL $V
 make install $V
 cd ../..
 
+# sigrok-firmware
+$GIT_CLONE git://sigrok.org/sigrok-firmware
+cd sigrok-firmware
+./autogen.sh
+mkdir build
+cd build
+../configure $C
+make $PARALLEL $V
+make install $V
+cd ../..
+
+# sigrok-firmware-fx2lafw
+$WGET http://sigrok.org/download/binary/sigrok-firmware-fx2lafw/sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW.tar.gz
+tar xfz sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW.tar.gz
+cd sigrok-firmware-fx2lafw-bin-$VER_SIGROK_FIRMWARE_FX2LAFW
+cp *.fw $PREFIX/share/sigrok-firmware/
+cd ..
+
 # sigrok-cli
 $GIT_CLONE git://sigrok.org/sigrok-cli
 cd sigrok-cli
@@ -424,8 +446,8 @@ 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
+$WGET http://download.qt.io/official_releases/qt/${VER_QT_SHORT}/${VER_QT}/single/qt-everywhere-opensource-src-${VER_QT}.tar.xz
+tar xfi qt-everywhere-opensource-src-${VER_QT}.tar.xz
 cd qt-everywhere-opensource-src-${VER_QT}
 patch -p1 < ../../android-qt.patch
 CC= CXX= ./configure \
@@ -439,12 +461,18 @@ CC= CXX= ./configure \
 	-android-ndk-host "$NDK_HOST" \
 	-android-arch "$TARGET_ARCH" \
 	-android-toolchain-version "$NDK_TOOLCHAIN_VERSION" \
-	-skip qttranslations \
-	-skip qtwebkit \
-	-skip qtserialport \
-	-skip qtwebkit-examples \
-	-skip qtlocation \
 	-skip qtconnectivity \
+	-skip qtdeclarative \
+	-skip qtlocation \
+	-skip qtmultimedia \
+	-skip qtscript \
+	-skip qtsensors \
+	-skip qtserialport \
+	-skip qttools \
+	-skip qttranslations \
+	-skip qtwebchannel \
+	-skip qtwebsockets \
+	-skip qtxmlpatterns \
 	-opensource -confirm-license -silent
 export ANDROID_API_VERSION=android-$VER_AND_API
 export ANDROID_BUILD_TOOLS_REVISION=$VER_AND_BT
@@ -467,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