Merge pull request #8363 from CvH/11.0/kodi-20.3ish

kodi: update to 0f4ed67
This commit is contained in:
Christian Hewitt 2023-11-25 10:29:08 +04:00 committed by GitHub
commit f8cedf0dfc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 12 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="kodi" PKG_NAME="kodi"
PKG_VERSION="618d1e35d89f1c49c2a37f5d233319f3f3bbe01b" PKG_VERSION="0f4ed67345a277d46a00e8090f5d4f026759ba31"
PKG_SHA256="2831ca6c004dde11105c14337b58e89b24cd735596510f1ab85d15f6234a835c" PKG_SHA256="325a554fec47d29cc35978b230d2c96185fff56128b4766f6916cbdbfc45bc89"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv" PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"

View File

@ -3,7 +3,7 @@ Subject: disable online check
--- ---
--- a/xbmc/GUIInfoManager.cpp --- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp
@@ -1919,7 +1919,6 @@ const infomap system_labels[] = { @@ -1921,7 +1921,6 @@ const infomap system_labels[] = {
{"currentcontrol", SYSTEM_CURRENT_CONTROL}, {"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID}, {"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL}, {"dvdlabel", SYSTEM_DVD_LABEL},

View File

@ -52,7 +52,7 @@ so, when shutdown/reboot is requested:
Stop(EXITCODE_RESTARTAPP); Stop(EXITCODE_RESTARTAPP);
#endif #endif
break; break;
@@ -2083,7 +2084,7 @@ bool CApplication::Stop(int exitCode) @@ -2094,7 +2095,7 @@ bool CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock(); m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject); CVariant vExitCode(CVariant::VariantTypeObject);
@ -61,7 +61,7 @@ so, when shutdown/reboot is requested:
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
// Abort any active screensaver // Abort any active screensaver
@@ -2115,7 +2116,6 @@ bool CApplication::Stop(int exitCode) @@ -2126,7 +2127,6 @@ bool CApplication::Stop(int exitCode)
// Needs cleaning up // Needs cleaning up
CServiceBroker::GetAppMessenger()->Stop(); CServiceBroker::GetAppMessenger()->Stop();
m_AppFocused = false; m_AppFocused = false;
@ -69,7 +69,7 @@ so, when shutdown/reboot is requested:
CLog::Log(LOGINFO, "Stopping all"); CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager // cancel any jobs from the jobmanager
@@ -2658,6 +2658,18 @@ void CApplication::StopPlaying() @@ -2669,6 +2669,18 @@ void CApplication::StopPlaying()
} }
} }
@ -88,7 +88,7 @@ so, when shutdown/reboot is requested:
bool CApplication::OnMessage(CGUIMessage& message) bool CApplication::OnMessage(CGUIMessage& message)
{ {
switch (message.GetMessage()) switch (message.GetMessage())
@@ -3178,7 +3190,7 @@ void CApplication::ProcessSlow() @@ -3189,7 +3201,7 @@ void CApplication::ProcessSlow()
if (CPlatformPosix::TestQuitFlag()) if (CPlatformPosix::TestQuitFlag())
{ {
CLog::Log(LOGINFO, "Quitting due to POSIX signal"); CLog::Log(LOGINFO, "Quitting due to POSIX signal");

View File

@ -8,8 +8,6 @@ Signed-off-by: Matthias Reichl <hias@horus.com>
system/keymaps/remote.xml | 2 +- system/keymaps/remote.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/system/keymaps/remote.xml b/system/keymaps/remote.xml
index c122b99188..baebf679c0 100644
--- a/system/keymaps/remote.xml --- a/system/keymaps/remote.xml
+++ b/system/keymaps/remote.xml +++ b/system/keymaps/remote.xml
@@ -50,7 +50,7 @@ @@ -50,7 +50,7 @@
@ -21,6 +19,3 @@ index c122b99188..baebf679c0 100644
<myvideo>ActivateWindow(Videos)</myvideo> <myvideo>ActivateWindow(Videos)</myvideo>
<mymusic>ActivateWindow(Music)</mymusic> <mymusic>ActivateWindow(Music)</mymusic>
<mypictures>ActivateWindow(Pictures)</mypictures> <mypictures>ActivateWindow(Pictures)</mypictures>
--
2.39.2