UPDATE

AlwinEsch · Jan 29, 2022 · 01146f5 · 01146f5
1 parent 5240512
commit 01146f5
Show file tree

Hide file tree

Showing 602 changed files with 91,852 additions and 23,384 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -99,6 +99,7 @@ set(INCLUDES ${CMAKE_SOURCE_DIR}
              ${CMAKE_SOURCE_DIR}/lib
              ${CMAKE_SOURCE_DIR}/xbmc
              ${CMAKE_SOURCE_DIR}/xbmc/${PLATFORM_DIR}
+             ${CMAKE_SOURCE_DIR}/xbmc/addons/kodi-dev-kit
              ${CMAKE_SOURCE_DIR}/xbmc/cores/VideoPlayer
              ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}
              ${CMAKE_BINARY_DIR}/${CORE_BUILD_DIR}/include)
@@ -219,6 +220,9 @@ if(ENABLE_AIRTUNES)
   endif()
 endif()
 
+list(APPEND DEP_DEFINES -DDEVKIT_LIBRARY="${DEVKIT_LIBRARY}")
+list(APPEND DEP_DEFINES -DDEVKIT_LAUNCH_EXE="${DEVKIT_LAUNCH_EXE}")
+
 # find all folders containing addon.xml.in
 # used to define ADDON_XML_OUTPUTS, ADDON_XML_DEPENDS and ADDON_INSTALL_DATA
 # Function defined in ./cmake/scripts/common/Macros.cmake
@@ -317,9 +321,9 @@ if(CMAKE_GENERATOR STREQUAL Xcode)
   )
   add_library(lib${APP_NAME_LC} STATIC)
   add_dependencies(lib${APP_NAME_LC} compileinfo)
-  target_link_libraries(lib${APP_NAME_LC} PUBLIC compileinfo_obj)
+  target_link_libraries(lib${APP_NAME_LC} PUBLIC compileinfo_obj $<TARGET_OBJECTS:devkit_shared>)
 else()
-  add_library(lib${APP_NAME_LC} STATIC $<TARGET_OBJECTS:compileinfo>)
+  add_library(lib${APP_NAME_LC} STATIC $<TARGET_OBJECTS:compileinfo> $<TARGET_OBJECTS:devkit_shared>)
 endif()
 add_dependencies(lib${APP_NAME_LC} ${GLOBAL_TARGET_DEPS})
 set_target_properties(lib${APP_NAME_LC} PROPERTIES PREFIX "")

diff --git a/addons/kodi.binary.devkit/addon.xml.in b/addons/kodi.binary.devkit/addon.xml.in
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<addon id="kodi.binary.devkit" version="@__KDK_MAJOR__@.@__KDK_MINOR__@" provider-name="Team Kodi">
+  <backwards-compatibility abi="@[email protected]"/>
+  <canary>@__KDK_CANARY_XML__@</canary>
+  <requires>
+    <import addon="xbmc.core" version="0.1.0"/>
+  </requires>
+</addon>
diff --git a/addons/kodi.binary.global.audioengine/addon.xml.in b/addons/kodi.binary.global.audioengine/addon.xml.in
diff --git a/addons/kodi.binary.global.filesystem/addon.xml.in b/addons/kodi.binary.global.filesystem/addon.xml.in
diff --git a/addons/kodi.binary.global.general/addon.xml.in b/addons/kodi.binary.global.general/addon.xml.in
diff --git a/addons/kodi.binary.global.gui/addon.xml.in b/addons/kodi.binary.global.gui/addon.xml.in
diff --git a/addons/kodi.binary.global.main/addon.xml.in b/addons/kodi.binary.global.main/addon.xml.in
diff --git a/addons/kodi.binary.global.network/addon.xml.in b/addons/kodi.binary.global.network/addon.xml.in
diff --git a/addons/kodi.binary.global.tools/addon.xml.in b/addons/kodi.binary.global.tools/addon.xml.in
diff --git a/addons/kodi.binary.instance.audiodecoder/addon.xml.in b/addons/kodi.binary.instance.audiodecoder/addon.xml.in
diff --git a/addons/kodi.binary.instance.audioencoder/addon.xml.in b/addons/kodi.binary.instance.audioencoder/addon.xml.in
diff --git a/addons/kodi.binary.instance.game/addon.xml.in b/addons/kodi.binary.instance.game/addon.xml.in
diff --git a/addons/kodi.binary.instance.game/controller.xsd b/addons/kodi.binary.instance.game/controller.xsd
diff --git a/addons/kodi.binary.instance.imagedecoder/addon.xml.in b/addons/kodi.binary.instance.imagedecoder/addon.xml.in
diff --git a/addons/kodi.binary.instance.inputstream/addon.xml.in b/addons/kodi.binary.instance.inputstream/addon.xml.in
diff --git a/addons/kodi.binary.instance.peripheral/addon.xml.in b/addons/kodi.binary.instance.peripheral/addon.xml.in
diff --git a/addons/kodi.binary.instance.pvr/addon.xml.in b/addons/kodi.binary.instance.pvr/addon.xml.in
diff --git a/addons/kodi.binary.instance.pvr/icon.png b/addons/kodi.binary.instance.pvr/icon.png
diff --git a/addons/kodi.binary.instance.screensaver/addon.xml.in b/addons/kodi.binary.instance.screensaver/addon.xml.in
diff --git a/addons/kodi.binary.instance.vfs/addon.xml.in b/addons/kodi.binary.instance.vfs/addon.xml.in
diff --git a/addons/kodi.binary.instance.videocodec/addon.xml.in b/addons/kodi.binary.instance.videocodec/addon.xml.in
diff --git a/addons/kodi.binary.instance.visualization/addon.xml.in b/addons/kodi.binary.instance.visualization/addon.xml.in
diff --git a/addons/resource.language.en_gb/resources/strings.po b/addons/resource.language.en_gb/resources/strings.po
@@ -6536,7 +6536,37 @@ msgctxt "#13253"
 msgid "Cancel move"
 msgstr ""
 
-#empty strings from id 13254 to 13269
+#: addons/skin.estuary/xml/SettingsSystemInfo.xml
+msgctxt "#13254"
+msgid "CPU usage:"
+msgstr ""
+
+#: addons/skin.estuary/xml/SettingsSystemInfo.xml
+msgctxt "#13255"
+msgid "Physical memory usage:"
+msgstr ""
+
+#: addons/skin.estuary/xml/SettingsSystemInfo.xml
+msgctxt "#13256"
+msgid "Virtual memory usage:"
+msgstr ""
+
+#: addons/skin.estuary/xml/SettingsSystemInfo.xml
+msgctxt "#13257"
+msgid "Shared memory usage:"
+msgstr ""
+
+#: addons/skin.estuary/xml/SettingsSystemInfo.xml
+msgctxt "#13258"
+msgid "Threads:"
+msgstr ""
+
+#: addons/skin.estuary/xml/SettingsSystemInfo.xml
+msgctxt "#13259"
+msgid "Process ID:"
+msgstr ""
+
+#empty strings from id 13260 to 13269
 
 msgctxt "#13270"
 msgid "Hardware:"
@@ -6585,7 +6615,10 @@ msgctxt "#13281"
 msgid "Hardware"
 msgstr ""
 
-#empty string with id 13282
+#: addons/skin.estuary/xml/SettingsSystemInfo.xml
+msgctxt "#13282"
+msgid "Addons"
+msgstr ""
 
 #: xbmc/windows/GUIWindowSystemInfo.cpp
 msgctxt "#13283"

diff --git a/addons/skin.estuary/xml/DialogAddonCrashReporter.xml b/addons/skin.estuary/xml/DialogAddonCrashReporter.xml