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

Revert "Update Kodi to 20.0"

Browse source 
This reverts commit c40df955b2
This commit is contained in:
Licaon_Kter 2023-01-19 21:03:37 +00:00
parent c40df955b2
commit fff4d20060
2 changed files with 2 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -521,44 +521,6 @@ Builds:
- make -C build apk
ndk: r21e
- versionName: '20.0'
versionCode: 2000000
commit: 389e701cb96e5543c303c4004811b51684d67dd4
timeout: 28000
sudo:
- rm -fr /opt/android-sdk/build-tools/*
- apt-get update
- apt-get install -y automake build-essential cmake file gawk gperf groovy lib32stdc++6
lib32z1-dev libcommons-lang-java libcurl4-openssl-dev python-dev
patch:
- 20.0-groovy.patch
output: build/tools/android/packaging/xbmc/build/outputs/apk/release/xbmc-release-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#' -e '\!@cp xbmc/build!d' tools/android/packaging/Makefile.in
- sed -i -e '/signingConfigs {/,+11d' -e '/signingConfig/d' tools/android/packaging/xbmc/build.gradle.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=aarch64-linux-android --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
ndk: r21e
MaintainerNotes: |-
18.0-groovy.patch was <a href="https://github.com/xbmc/xbmc/issues/6860#issuecomment-461122155">provided by upstream</a>; it makes the build use the Debian groovy package instead of a prebuilt JAR.
@ -568,5 +530,5 @@ MaintainerNotes: |-
AutoUpdateMode: None
UpdateCheckMode: None
CurrentVersion: '20.0'
CurrentVersionCode: 2000000
CurrentVersion: '19.4'
CurrentVersionCode: 1904001

24
metadata/org.xbmc.kodi/20.0-groovy.patch
View file

@ -1,24 +0,0 @@
diff --git a/xbmc/interfaces/swig/CMakeLists.txt b/xbmc/interfaces/swig/CMakeLists.txt
--- a/xbmc/interfaces/swig/CMakeLists.txt
+++ b/xbmc/interfaces/swig/CMakeLists.txt
@@ -1,8 +1,5 @@
function(generate_file file)
- set(classpath ${GROOVY_DIR}/groovy-${GROOVY_VER}.jar
- ${GROOVY_DIR}/groovy-xml-${GROOVY_VER}.jar
- ${GROOVY_DIR}/groovy-templates-${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)
@@ -27,8 +24,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 ${JAVA_OPEN_OPTS} -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)