diff --git a/system-images/android/sdk/build-cmake-native b/system-images/android/sdk/build-cmake-native index 04fa932..053b8a4 100755 --- a/system-images/android/sdk/build-cmake-native +++ b/system-images/android/sdk/build-cmake-native @@ -1,34 +1,34 @@ #!/bin/bash set -e name=$1 shift repo=$1 shift srcdir="`pwd`/src" cloned=0 if ! [ -d "$srcdir"/$name ] ; then mkdir -p "$srcdir" pushd "$srcdir" - git clone $repo --single-branch $GIT_EXTRA + git clone --depth 1 $repo --single-branch $GIT_EXTRA cloned=1 popd fi mkdir build/$name -p pushd build/$name cmake "$srcdir"/$name/$EXTRA_CMAKE_SUBDIR $@ cmake --build . -- install -j`nproc` popd if [ "$PERSIST" ]; then echo "leaving the build directory intact" else rm -rf build/$name if [ "$cloned" ]; then rm -rf src/$name fi fi diff --git a/system-images/android/sdk/build-generic b/system-images/android/sdk/build-generic index d74c051..fb5982d 100755 --- a/system-images/android/sdk/build-generic +++ b/system-images/android/sdk/build-generic @@ -1,54 +1,54 @@ #!/bin/bash set -e # trap 'err_report echo "error: ${BASH_SOURCE}":"${LINENO}"' exit 1 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH=$DIR:$PATH export PERSIST=1 package=$1 shift build-kde-dependencies $package # we now do the actual application separately # first we download the project and look for the manifest file pushd src -git clone kde:$package $APP_GIT_EXTRA || true +git clone --depth 1 kde:$package $APP_GIT_EXTRA || true popd manifestFile=`find $(pwd)/src/$package -name AndroidManifest.xml` targetname=$(python3 ci-tooling/helpers/getsetting.py --project $package --product Applications --platform AndroidQt5.12 --key target-name || true) if [[ -z "$targetname" && -n "$manifestFile" ]] then targetname=`python3 $DIR/target-from-manifest.py $manifestFile | tr '\n' ';' | head -c -1` EXTRA+=" "-DANDROID_APK_DIR=$(dirname $manifestFile | tr '\n' ';' | head -c -1 ) fi if [[ -z "$targetname" || "$targetname" =~ ".*%%.*" ]] then appdataFile=$(find $(pwd)/src/$package -name "*.appdata.xml") if [[ -z "$appdataFile" ]]; then echo "error: No AndroidManifest.xml or *.appdata.xml file :(" exit 1 fi targetname=`python3 $DIR/target-from-appdata.py $appdataFile | tr '\n' ';' | head -c -1` fi build-kde-project $package Applications -DQTANDROID_EXPORTED_TARGET=$targetname $EXTRA $@ pushd build/$package if [ -f /keys/${package}keystore-config ]; then ARGS="`cat /keys/${package}keystore-config` $ARGS" make create-apk elif [ -f /keys/androidkeystore-config ]; then ARGS="`cat /keys/androidkeystore-config` $ARGS" make create-apk else make create-apk fi if [ -d /output ] then find *_build_apk/build/outputs/apk/ -name \*.apk -print0 | xargs -I{} -0 cp -v {} /output fi diff --git a/system-images/android/sdk/build-gstreamer-binaries b/system-images/android/sdk/build-gstreamer-binaries index 07d1f50..7cc1e2f 100644 --- a/system-images/android/sdk/build-gstreamer-binaries +++ b/system-images/android/sdk/build-gstreamer-binaries @@ -1,21 +1,21 @@ #!/bin/bash set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" wget -c https://gstreamer.freedesktop.org/data/pkg/android/1.15.2/gstreamer-1.0-android-universal-1.15.2.tar.bz2 tar xvf gstreamer-1.0-android-universal-1.15.2.tar.bz2 sed -i.bak -e 's|^prefix=.*|prefix=/opt/kdeandroid-deps|g' armv7/lib/pkgconfig/*.pc #fix prefix sed -i.bak -e 's|/home/nirbheek/projects/repos/gst/cerbero.git/build/dist/android_universal/armv7|/opt/kdeandroid-deps|g' armv7/lib/pkgconfig/*.pc sed -i.bak -e 's|/home/nirbheek/projects/repos/gst/cerbero.git/build/android-ndk-18|/opt/android-ndk|g' armv7/lib/pkgconfig/*.pc cp -r armv7/* /opt/kdeandroid-deps/ -git clone git://anongit.freedesktop.org/gstreamer/gst-plugins-good +git clone --depth 1 git://anongit.freedesktop.org/gstreamer/gst-plugins-good cd gst-plugins-good/ext/qt export PKG_CONFIG_SYSROOT_DIR=/ export PKG_CONFIG_LIBDIR=/opt/kdeandroid-deps/lib/pkgconfig/ qmake make install libgstqmlgl.a /opt/kdeandroid-deps/lib/gstreamer-1.0 diff --git a/system-images/android/sdk/build-kde-dependencies b/system-images/android/sdk/build-kde-dependencies index cc0fae6..8eed86f 100755 --- a/system-images/android/sdk/build-kde-dependencies +++ b/system-images/android/sdk/build-kde-dependencies @@ -1,35 +1,35 @@ #!/bin/bash set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH=$DIR:$PATH # we get the repositories for the dependencies -git clone kde:sysadmin/ci-tooling || true +git clone --depth 1 kde:sysadmin/ci-tooling || true pushd ci-tooling -git clone kde:sysadmin/repo-metadata || true -git clone kde:kde-build-metadata || true +git clone --depth 1 kde:sysadmin/repo-metadata || true +git clone --depth 1 kde:kde-build-metadata || true popd # we figure out the dependencies all_packages=$(python3 ci-tooling/helpers/list-dependencies.py $@ $EXTRA_PKGS --platform AndroidQt5.12) echo "Dependencies to build: $all_packages" blacklist="`cat $DIR/skip` $SKIP" for a in $extrapackages $all_packages $EXTRA_PKGS do skip=0 for x in $blacklist do if [[ $a =~ ^$x$ ]]; then skip=1 break fi done if [ $skip == 1 ]; then echo "Skipping $a $skip" continue fi build-kde-project $a Frameworks -DBUILD_TESTING=OFF done diff --git a/system-images/android/sdk/build-openssl-uptodate b/system-images/android/sdk/build-openssl-uptodate index c9c6607..d8043a6 100644 --- a/system-images/android/sdk/build-openssl-uptodate +++ b/system-images/android/sdk/build-openssl-uptodate @@ -1,16 +1,16 @@ #!/bin/bash set -e -git clone git://git.openssl.org/openssl.git --branch OpenSSL_1_1_1a +git clone --depth 1 git://git.openssl.org/openssl.git --branch OpenSSL_1_1_1a pushd openssl export PATH=/opt/android-ndk/toolchains/llvm/prebuilt/linux-x86_64/bin/:$PATH export ANDROID_NDK=$ANDROID_NDK_ROOT ./Configure android-arm -D__ANDROID_API__=21 --prefix=/opt/kdeandroid-deps make build_libs -j`nproc` SHLIB_VERSION_NUMBER= SHLIB_EXT=.so make install_sw SHLIB_VERSION_NUMBER= SHLIB_EXT=.so popd rm -rf openssl diff --git a/system-images/android/sdk/build-poppler b/system-images/android/sdk/build-poppler index 2a88f0c..b43ab6f 100755 --- a/system-images/android/sdk/build-poppler +++ b/system-images/android/sdk/build-poppler @@ -1,22 +1,22 @@ #!/bin/bash set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH=$DIR:$PATH mkdir -p $HOME/src/ cd $HOME/src/ if [ ! -d freetype2 ] ; then - git clone https://git.savannah.gnu.org/git/freetype/freetype2.git --single-branch -b VER-2-8-1 + git clone --depth 1 https://git.savannah.gnu.org/git/freetype/freetype2.git --single-branch -b VER-2-8-1 fi cd freetype2 CFLAGS=-std=gnu99 build-standalone "./autogen.sh && ./configure --prefix=/opt/kdeandroid-deps --host=${ANDROID_NDK_TOOLCHAIN_PREFIX} && make -j`nproc` && make install" cd #we could build for older than 24 if we pass HAVE_FSEEKO=0 if [ "$QMAKESPEC" -ne android-clang ] ; then export GIT_EXTRA="--branch poppler-0.68.0" fi build-cmake poppler git://anongit.freedesktop.org/poppler/poppler -DENABLE_DCTDECODER=unmaintained -DENABLE_LIBOPENJPEG=unmaintained -DENABLE_CPP=OFF -DCMAKE_ANDROID_API=24 -DBUILD_QT5_TESTS=OFF -DENABLE_UTILS=OFF $@ diff --git a/system-images/android/sdk/build-qt b/system-images/android/sdk/build-qt index 2aa242b..c1270e7 100755 --- a/system-images/android/sdk/build-qt +++ b/system-images/android/sdk/build-qt @@ -1,22 +1,22 @@ #!/bin/bash set -e name=$1 shift repo=$1 shift srcdir=`pwd`/src mkdir -p $srcdir pushd $srcdir -if [ -d $name ] ; then pushd $name; git pull; popd; else git clone $repo $GIT_EXTRA; fi +if [ -d $name ] ; then pushd $name; git pull; popd; else git clone --depth 1 $repo $GIT_EXTRA; fi popd mkdir -p build/$name pushd build/$name qmake PREFIX=/opt/kdeandroid-deps $srcdir/$name $@ make -j`nproc` sudo make install rm -rf * popd diff --git a/system-images/android/sdk/build-vlcqt b/system-images/android/sdk/build-vlcqt index af62847..0e16556 100644 --- a/system-images/android/sdk/build-vlcqt +++ b/system-images/android/sdk/build-vlcqt @@ -1,28 +1,28 @@ #!/bin/bash set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" export PATH=$DIR:$PATH export ANDROID_SDK=$ANDROID_SDK_ROOT sudo apt install -y autopoint mkdir -p $HOME/src/ cd $HOME/src/ if [ ! -d vlc-android ] ; then - git clone https://github.com/videolan/vlc-android.git + git clone --depth 1 https://github.com/videolan/vlc-android.git fi cd vlc-android ./compile-libvlc.sh -a armeabi-v7a cp /home/user/src/vlc-android/libvlc/jni/obj/local/armeabi-v7a/libvlc.so /opt/kdeandroid-deps/lib/ VLC_INSTALL_PREFIX=/home/user/src/vlc-android/vlc/build-android-arm-linux-androideabi/install DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" EXTRA_PREFIXES=$VLC_INSTALL_PREFIX $DIR/build-cmake vlc-qt https://github.com/vlc-qt/vlc-qt.git -DWITH_GLES=ON \ -DECM_ADDITIONAL_FIND_ROOT_PATH=$VLC_INSTALL_PREFIX/ \ -DLIBVLC_INCLUDE_DIR=$VLC_INSTALL_PREFIX/include/ \ -DLIBVLC_LIBRARY=/home/user/src/vlc-android/libvlc/jni/obj/local/armeabi-v7a/libvlc.so \ -DLIBVLCCORE_LIBRARY=$VLC_INSTALL_PREFIX/lib/libvlccore.a