From 02b6a58011651eb7bfa968a4ad418421ab93f539 Mon Sep 17 00:00:00 2001 From: relan Date: Sun, 28 Apr 2019 09:47:19 +0300 Subject: [PATCH] Update Kodi to 18.2 (1802000) Closes fdroid/fdroiddata#1599. --- metadata/org.xbmc.kodi.yml | 40 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 38 insertions(+), 2 deletions(-) diff --git a/metadata/org.xbmc.kodi.yml b/metadata/org.xbmc.kodi.yml index dfc05538b1..51f718b7cc 100644 --- a/metadata/org.xbmc.kodi.yml +++ b/metadata/org.xbmc.kodi.yml @@ -53,6 +53,42 @@ Builds: - make apk-unsigned ndk: r17b + - versionName: '18.2' + versionCode: 1802000 + commit: 18.2-Leia + timeout: 10800 + sudo: + - apt-get update || apt-get update + - apt-get install -y build-essential default-jdk gawk lib32stdc++6 lib32z1 lib32z1-dev + libcurl4-openssl-dev zlib1g-dev groovy libcommons-lang-java python-dev + patch: + - groovy.patch + output: build/tools/android/packaging/images/*.apk + rm: + - tools/codegenerator/groovy/ + prebuild: + - sed -i -e '/gradlew/d' -e '/gradle-wrapper.jar/d' cmake/scripts/android/Install.cmake + - sed -i -e 's#./gradlew#gradle#' tools/android/packaging/Makefile.in + scandelete: + - lib/ + - project/ + - tools/ + build: + - DIR=$PWD + - $$NDK$$/build/tools/make_standalone_toolchain.py --install-dir=toolchain/ + --api 21 --arch arm + - pushd tools/depends/ + - ./bootstrap + - ./configure --host=arm-linux-androideabi --with-sdk-path=$$SDK$$ --with-ndk-path=$$NDK$$ + --prefix=$DIR/prefix/ --with-toolchain=$DIR/toolchain/ --disable-debug + - make -j$(getconf _NPROCESSORS_ONLN) + - popd + - make -C tools/depends/target/cmakebuildsys + - pushd build/ + - make -j$(getconf _NPROCESSORS_ONLN) + - make apk-unsigned + ndk: r17c + MaintainerNotes: |- groovy.patch was [https://github.com/xbmc/xbmc/issues/6860#issuecomment-461122155 provided by upstream]; it makes the build use the Debian groovy package instead of a prebuilt JAR. @@ -60,5 +96,5 @@ MaintainerNotes: |- AutoUpdateMode: None UpdateCheckMode: None -CurrentVersion: '18.0' -CurrentVersionCode: 1800000 +CurrentVersion: '18.2' +CurrentVersionCode: 1802000