sudoxreboot/fdroiddata
1
0
Fork 0
mirror of https://github.com/sudoxnym/fdroiddata.git synced 2026-05-23 22:27:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Kodi to 19.0 (1900000)

Browse source
This commit is contained in:
relan 2021-02-20 22:32:45 +03:00
parent 15fb95e4de
commit bc9ed676b7
2 changed files with 61 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
metadata/org.xbmc.kodi.yml
View file

@ -206,6 +206,42 @@ Builds:
- make -C build apk-unsigned - make -C build apk-unsigned
ndk: r18b ndk: r18b
- versionName: '19.0'
versionCode: 1900000
commit: 19.0-Matrix
timeout: 7200
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:
- 19.0-groovy.patch
output: build/tools/android/packaging/xbmc/build/outputs/apk/releaseUnsigned/xbmc-releaseUnsigned-unsigned.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
scanignore:
- addons/webinterface.default/lib/soundmanager/swf/soundmanager2_flash_xdomain.zip
scandelete:
- lib/
- project/
- tools/
- xbmc/filesystem/test
build:
- pushd tools/depends/
- ./bootstrap
- ./configure --host=arm-linux-androideabi --with-sdk-path=$$SDK$$ --with-ndk-path=$$NDK$$
--prefix=$PWD/output --disable-debug
- make -j`nproc`
- popd
- make -C tools/depends/target/binary-addons -j`nproc`
- make -C tools/depends/target/cmakebuildsys
- make -C build -j`nproc`
- make -C build apk-unsigned
ndk: r20b
MaintainerNotes: |- MaintainerNotes: |-
18.0-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. 18.0-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.
@ -213,5 +249,5 @@ MaintainerNotes: |-
AutoUpdateMode: None AutoUpdateMode: None
UpdateCheckMode: None UpdateCheckMode: None
CurrentVersion: '18.9' CurrentVersion: '19.0'
CurrentVersionCode: 1809000 CurrentVersionCode: 1900000

23
metadata/org.xbmc.kodi/19.0-groovy.patch Normal file
View file

@ -0,0 +1,23 @@
diff --git a/xbmc/interfaces/swig/CMakeLists.txt b/xbmc/interfaces/swig/CMakeLists.txt
index 3abe31a3f5..2992f21ff0 100644
--- a/xbmc/interfaces/swig/CMakeLists.txt
+++ b/xbmc/interfaces/swig/CMakeLists.txt
@@ -1,6 +1,5 @@
function(generate_file file)
- set(classpath ${GROOVY_DIR}/groovy-all-${GROOVY_VER}.jar
- ${GROOVY_DIR}/commons-lang-${COMMONS_VER}.jar
+ set(classpath /usr/share/java/commons-lang.jar
${CMAKE_SOURCE_DIR}/tools/codegenerator
${CMAKE_CURRENT_SOURCE_DIR}/../python)
if(NOT CORE_SYSTEM_NAME STREQUAL windows AND NOT CORE_SYSTEM_NAME STREQUAL windowsstore)
@@ -17,8 +16,8 @@ function(generate_file file)
add_custom_command(OUTPUT ${CPP_FILE}
COMMAND ${SWIG_EXECUTABLE}
ARGS -w401 -c++ -o ${file}.xml -xml -I${CMAKE_SOURCE_DIR}/xbmc -xmllang python ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
- COMMAND ${Java_JAVA_EXECUTABLE}
- ARGS -cp "${classpath}" groovy.ui.GroovyMain ${CMAKE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
+ COMMAND groovy
+ ARGS -cp "${classpath}" ${CMAKE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
${CLANG_FORMAT_COMMAND}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file} ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template)
set(SOURCES ${SOURCES} "${CPP_FILE}" PARENT_SCOPE)