mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
Android: WIP attempt to build with Qt6
Completely non-functional. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel
parent
02d06072a1
commit
29d9405a72
4 changed files with 72 additions and 70 deletions
|
|
@ -2,7 +2,7 @@
|
|||
#
|
||||
# build a multi architecture package for Android
|
||||
#
|
||||
# this requires Qt5.14 or newer with matching NDK
|
||||
# this requires Qt6.7 or newer with matching NDK
|
||||
#
|
||||
# the scripts/docker/android-build-container/android-build-setup.sh sets up an environment that works for this
|
||||
|
||||
|
|
@ -111,16 +111,16 @@ if [ "$versionOnly" = "1" ] ; then
|
|||
fi
|
||||
|
||||
# pick the Qt setup and show the configuration info
|
||||
if [ -n "${QT5_ANDROID+X}" ] ; then
|
||||
echo "Using Qt5 in $QT5_ANDROID"
|
||||
if [ -n "${QT6_ANDROID+X}" ] ; then
|
||||
echo "Using Qt6 in $QT6_ANDROID"
|
||||
elif [ -d "$SUBSURFACE_SOURCE/../${LATEST_QT}" ] ; then
|
||||
export QT5_ANDROID=$SUBSURFACE_SOURCE/../${LATEST_QT}
|
||||
export QT6_ANDROID=$SUBSURFACE_SOURCE/../${LATEST_QT}
|
||||
else
|
||||
echo "Cannot find Qt 5.12 or newer under $SUBSURFACE_SOURCE/.."
|
||||
echo "Cannot find Qt 6.7 or newer under $SUBSURFACE_SOURCE/.."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
QMAKE=$QT5_ANDROID/android/bin/qmake
|
||||
QMAKE=$QT6_ANDROID/android_arm64_v8a/bin/qmake
|
||||
echo $QMAKE
|
||||
$QMAKE -query
|
||||
|
||||
|
|
@ -148,7 +148,7 @@ popd
|
|||
|
||||
# build default architectures, or the given one?
|
||||
if [ "$ARCHITECTURES" = "" ] ; then
|
||||
ARCHITECTURES="armv7a aarch64"
|
||||
ARCHITECTURES="aarch64"
|
||||
fi
|
||||
|
||||
# it would of course be too easy to use these terms consistently, so let's not
|
||||
|
|
@ -161,6 +161,7 @@ for ARCH in $ARCHITECTURES ; do
|
|||
fi
|
||||
BUILD_ABIS="$BUILD_ABIS $ANDROID_ABI"
|
||||
done
|
||||
BUILD_ABIS="arm64-v8a"
|
||||
|
||||
# if this isn't just a quick rebuild, pull kirigami, icons, etc, and finally build the Googlemaps plugin
|
||||
if [ "$QUICK" = "" ] ; then
|
||||
|
|
@ -170,22 +171,22 @@ if [ "$QUICK" = "" ] ; then
|
|||
|
||||
# build google maps plugin
|
||||
# this is the easy one as it uses qmake which ensures things get built for all platforms, etc
|
||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . googlemaps
|
||||
#"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . googlemaps
|
||||
# but unfortunately, on Android (and apparently only on Android) the naming pattern for geoservice
|
||||
# plugins has changed
|
||||
pushd googlemaps
|
||||
sed -i 's/TARGET = qtgeoservices_googlemaps/TARGET = plugins_geoservices_qtgeoservices_googlemaps/' googlemaps.pro
|
||||
popd
|
||||
QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS)
|
||||
GOOGLEMAPS_BIN=libplugins_geoservices_qtgeoservices_googlemaps_arm64-v8a.so
|
||||
if [ ! -e "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] || [ googlemaps/.git/HEAD -nt "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] ; then
|
||||
mkdir -p googlemaps-build
|
||||
pushd googlemaps-build
|
||||
$QMAKE ANDROID_ABIS="$BUILD_ABIS" ../googlemaps/googlemaps.pro
|
||||
make -j4
|
||||
make install
|
||||
popd
|
||||
fi
|
||||
#pushd googlemaps
|
||||
#sed -i 's/TARGET = qtgeoservices_googlemaps/TARGET = plugins_geoservices_qtgeoservices_googlemaps/' googlemaps.pro
|
||||
#popd
|
||||
#QT_PLUGINS_PATH=$($QMAKE -query QT_INSTALL_PLUGINS)
|
||||
#GOOGLEMAPS_BIN=libplugins_geoservices_qtgeoservices_googlemaps_arm64-v8a.so
|
||||
#if [ ! -e "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] || [ googlemaps/.git/HEAD -nt "$QT_PLUGINS_PATH"/geoservices/$GOOGLEMAPS_BIN ] ; then
|
||||
# mkdir -p googlemaps-build
|
||||
# pushd googlemaps-build
|
||||
# $QMAKE ANDROID_ABIS="$BUILD_ABIS" ../googlemaps/googlemaps.pro
|
||||
# make -j4
|
||||
# make install
|
||||
# popd
|
||||
#fi
|
||||
fi
|
||||
|
||||
# autoconf based libraries are harder
|
||||
|
|
@ -222,37 +223,37 @@ for ARCH in $ARCHITECTURES ; do
|
|||
mkdir -p "$PREFIX"/lib/pkgconfig
|
||||
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
|
||||
|
||||
if [ "$QUICK" = "" ] ; then
|
||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . openssl
|
||||
if [ ! -e "$PKG_CONFIG_PATH/libssl.pc" ] ; then
|
||||
#if [ "$QUICK" = "" ] ; then
|
||||
#"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . openssl
|
||||
#if [ ! -e "$PKG_CONFIG_PATH/libssl.pc" ] ; then
|
||||
# openssl build fails with these set
|
||||
export SYSROOT=""
|
||||
export CFLAGS=""
|
||||
export CPPFLAGS=""
|
||||
export CXXFLAGS=""
|
||||
# export SYSROOT=""
|
||||
# export CFLAGS=""
|
||||
# export CPPFLAGS=""
|
||||
# export CXXFLAGS=""
|
||||
|
||||
mkdir -p openssl-build-"$ARCH"
|
||||
cp -r openssl/* openssl-build-"$ARCH"
|
||||
pushd openssl-build-"$ARCH"
|
||||
perl -pi -e 's/-mandroid//g' Configure
|
||||
./Configure shared android-"$OPENSSL_ARCH" no-ssl2 no-ssl3 no-comp no-hw no-engine no-asm \
|
||||
--prefix="$PREFIX" -DOPENSSL_NO_UI_CONSOLE -DOPENSSL_NO_STDIO \
|
||||
-D__ANDROID_API__=$ANDROID_PLATFORM_LEVEL
|
||||
make depend
|
||||
# follow the suggestions here: https://doc.qt.io/qt-5/android-openssl-support.html
|
||||
make SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs
|
||||
# mkdir -p openssl-build-"$ARCH"
|
||||
# cp -r openssl/* openssl-build-"$ARCH"
|
||||
# pushd openssl-build-"$ARCH"
|
||||
# perl -pi -e 's/-mandroid//g' Configure
|
||||
# ./Configure shared android-"$OPENSSL_ARCH" no-ssl2 no-ssl3 no-comp no-hw no-engine no-asm \
|
||||
# --prefix="$PREFIX" -DOPENSSL_NO_UI_CONSOLE -DOPENSSL_NO_STDIO \
|
||||
# -D__ANDROID_API__=$ANDROID_PLATFORM_LEVEL
|
||||
# make depend
|
||||
# # follow the suggestions here: https://doc.qt.io/qt-5/android-openssl-support.html
|
||||
# make SHLIB_VERSION_NUMBER= SHLIB_EXT=_1_1.so build_libs
|
||||
|
||||
cp -RL include/openssl $PREFIX/include/openssl
|
||||
cp libcrypto.a $PREFIX/lib
|
||||
cp libcrypto_1_1.so* $PREFIX/lib
|
||||
cp libssl.a $PREFIX/lib
|
||||
cp libssl_1_1.so* $PREFIX/lib
|
||||
cp *.pc $PKG_CONFIG_PATH
|
||||
# cp -RL include/openssl $PREFIX/include/openssl
|
||||
# cp libcrypto.a $PREFIX/lib
|
||||
# cp libcrypto_1_1.so* $PREFIX/lib
|
||||
# cp libssl.a $PREFIX/lib
|
||||
# cp libssl_1_1.so* $PREFIX/lib
|
||||
# cp *.pc $PKG_CONFIG_PATH
|
||||
|
||||
popd
|
||||
fi
|
||||
# popd
|
||||
#fi
|
||||
|
||||
fi
|
||||
#fi
|
||||
|
||||
# autoconf seems to get lost without this -- but openssl fails if these are set
|
||||
SYSROOT="$ANDROID_NDK_ROOT"/toolchains/llvm/prebuilt/linux-x86_64/sysroot
|
||||
|
|
@ -261,15 +262,15 @@ for ARCH in $ARCHITECTURES ; do
|
|||
CXXFLAGS="--sysroot=${SYSROOT} -fPIC"
|
||||
|
||||
if [ "$QUICK" = "" ] ; then
|
||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . sqlite
|
||||
if [ ! -e "$PKG_CONFIG_PATH/sqlite3.pc" ] ; then
|
||||
mkdir -p sqlite-build-"$ARCH"
|
||||
pushd sqlite-build-"$ARCH"
|
||||
../sqlite/configure --host="$TARGET" --prefix="$PREFIX" --enable-static --disable-shared
|
||||
make
|
||||
make install
|
||||
popd
|
||||
fi
|
||||
#"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . sqlite
|
||||
#if [ ! -e "$PKG_CONFIG_PATH/sqlite3.pc" ] ; then
|
||||
# mkdir -p sqlite-build-"$ARCH"
|
||||
# pushd sqlite-build-"$ARCH"
|
||||
# ../sqlite/configure --host="$TARGET" --prefix="$PREFIX" --enable-static --disable-shared
|
||||
# make
|
||||
# make install
|
||||
# popd
|
||||
#fi
|
||||
|
||||
"${SUBSURFACE_SOURCE}"/scripts/get-dep-lib.sh singleAndroid . libxml2
|
||||
if [ ! -e libxml2/configure ] ; then
|
||||
|
|
@ -342,8 +343,8 @@ for ARCH in $ARCHITECTURES ; do
|
|||
-DCMAKE_INSTALL_PREFIX="$PREFIX" \
|
||||
-DCURL=OFF \
|
||||
-DUSE_SSH=OFF \
|
||||
-DOPENSSL_SSL_LIBRARY="$PREFIX"/lib/libssl_1_1.so \
|
||||
-DOPENSSL_CRYPTO_LIBRARY="$PREFIX"/lib/libcrypto_1_1.so \
|
||||
-DOPENSSL_SSL_LIBRARY="$PREFIX"/lib/libssl_3.so \
|
||||
-DOPENSSL_CRYPTO_LIBRARY="$PREFIX"/lib/libcrypto_3.so \
|
||||
-DOPENSSL_INCLUDE_DIR="$PREFIX"/include \
|
||||
-D_OPENSSL_VERSION="${OPENSSL_VERSION}" \
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_HTTP_Parser=TRUE \
|
||||
|
|
@ -414,7 +415,7 @@ if [ "$QUICK" = "" ] ; then
|
|||
pushd "$SUBSURFACE_SOURCE"/packaging/android
|
||||
mkdir -p translation-assets
|
||||
for src in $SRCS; do
|
||||
"$QT5_ANDROID"/android/bin/lrelease "$SUBSURFACE_SOURCE"/translations/"$src" -qm translation-assets/"${src/.ts/.qm}"
|
||||
"$QT6_ANDROID"/android/bin/lrelease "$SUBSURFACE_SOURCE"/translations/"$src" -qm translation-assets/"${src/.ts/.qm}"
|
||||
done
|
||||
popd
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
#!/bin/bash
|
||||
# When changing Qt version remember to update the
|
||||
# qt-installer-noninteractive file as well.
|
||||
QT_VERSION=5.15
|
||||
LATEST_QT=5.15.1
|
||||
NDK_VERSION=21.3.6528147
|
||||
QT_VERSION=6.7
|
||||
LATEST_QT=6.7.2
|
||||
NDK_VERSION=26.1.10909125
|
||||
ANDROID_BUILDTOOLS_REVISION=29.0.3
|
||||
ANDROID_PLATFORM_LEVEL=21
|
||||
ANDROID_PLATFORM=android-21
|
||||
ANDROID_PLATFORMS=android-29
|
||||
ANDROID_PLATFORM_LEVEL=23
|
||||
ANDROID_PLATFORM=android-31
|
||||
ANDROID_PLATFORMS=android-34
|
||||
ANDROID_NDK=ndk/${NDK_VERSION}
|
||||
# OpenSSL also has an entry in get-dep-lib.sh line 103
|
||||
# that needs to be updated as well.
|
||||
OPENSSL_VERSION=1.1.1m
|
||||
OPENSSL_VERSION=3.0
|
||||
|
|
|
|||
|
|
@ -9,11 +9,11 @@ CURRENT_LIBCURL="curl-7_88_1"
|
|||
CURRENT_LIBUSB="v1.0.25"
|
||||
CURRENT_OPENSSL="OpenSSL_1_1_1m"
|
||||
CURRENT_LIBSSH2="libssh2-1.8.0"
|
||||
CURRENT_XSLT="v1.1.34"
|
||||
CURRENT_XSLT="v1.1.42"
|
||||
CURRENT_SQLITE="3190200"
|
||||
CURRENT_LIBXML2="v2.9.4"
|
||||
CURRENT_LIBXML2="v2.9.14"
|
||||
CURRENT_LIBFTDI="abd19b721f7e9b4d514ed319ece173ebc7b1ea72"
|
||||
CURRENT_KIRIGAMI="v5.76.0"
|
||||
CURRENT_KIRIGAMI="v6.5.0"
|
||||
CURRENT_BREEZE_ICONS="4daac191fb33c8c03bba8356db9767816cb8ee02"
|
||||
CURRENT_MDBTOOLS="v1.0.0"
|
||||
CURRENT_QT_ANDROID_CMAKE="master"
|
||||
|
|
@ -169,7 +169,7 @@ for package in "${PACKAGES[@]}" ; do
|
|||
git_checkout_library breeze-icons $CURRENT_BREEZE_ICONS https://github.com/kde/breeze-icons.git
|
||||
;;
|
||||
googlemaps)
|
||||
git_checkout_library googlemaps master https://github.com/Subsurface/googlemaps.git
|
||||
git_checkout_library googlemaps qt6 https://github.com/Subsurface/googlemaps.git
|
||||
;;
|
||||
hidapi)
|
||||
git_checkout_library hidapi master https://github.com/libusb/hidapi.git
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ cd "$SRC"/subsurface/mobile-widgets/3rdparty/ECM
|
|||
cmake -DSHARE_INSTALL_DIR=.. ../extra-cmake-modules
|
||||
make install
|
||||
|
||||
exit
|
||||
# finally, add our patches to Kirigami
|
||||
cd "$SRC"/subsurface/mobile-widgets/3rdparty
|
||||
PATCHES=$(echo 00*.patch)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue