jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6503 from HiassofT/le11-kodi-20a1

Browse Source 
kodi: update to 20.0a1-Nexus
This commit is contained in:
CvH 2022-05-21 08:52:27 +02:00 committed by GitHub
commit 80770cd193
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/mediacenter/kodi/package.mk
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="ee3663fd468ec417ea0bba20b0d18f3448c8980c" PKG_VERSION="20.0a1-Nexus"
PKG_SHA256="609e49b0eaa3deb5f85828f8220e5734cdb316889926dcd4d7d312c4772c7898" PKG_SHA256="8c99bc18e982a55f55b10f643ceb873b79eeea47d5090a75ad594335d10a3b50"
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"

41
packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch
View File

@ -1,4 +1,4 @@
From 244cbd6ac18eb6e2ce2c7a89c95cd33380439caa Mon Sep 17 00:00:00 2001 From c76c93444a0f7a87530c51ff9ec6ca6a35554a41 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com> From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Sun, 3 Apr 2022 11:31:07 +0200 Date: Sun, 3 Apr 2022 11:31:07 +0200
Subject: [PATCH] handle SIGTERM Subject: [PATCH] handle SIGTERM
@ -20,9 +20,11 @@ so, when shutdown/reboot is requested:
.../powermanagement/LogindUPowerSyscall.cpp | 2 -- .../powermanagement/LogindUPowerSyscall.cpp | 2 --
3 files changed, 20 insertions(+), 8 deletions(-) 3 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index f20d05f50b..fd0781ed38 100644
--- a/xbmc/Application.cpp --- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp +++ b/xbmc/Application.cpp
@@ -2047,12 +2047,12 @@ void CApplication::OnApplicationMessage( @@ -1700,12 +1700,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
switch (msg) switch (msg)
{ {
case TMSG_POWERDOWN: case TMSG_POWERDOWN:
@ -37,7 +39,7 @@ so, when shutdown/reboot is requested:
break; break;
case TMSG_SHUTDOWN: case TMSG_SHUTDOWN:
@@ -2073,12 +2073,13 @@ void CApplication::OnApplicationMessage( @@ -1726,12 +1726,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
case TMSG_RESTART: case TMSG_RESTART:
case TMSG_RESET: case TMSG_RESET:
@ -52,7 +54,7 @@ so, when shutdown/reboot is requested:
Stop(EXITCODE_RESTARTAPP); Stop(EXITCODE_RESTARTAPP);
#endif #endif
break; break;
@@ -2666,7 +2667,7 @@ bool CApplication::Stop(int exitCode) @@ -2292,7 +2293,7 @@ bool CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock(); m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject); CVariant vExitCode(CVariant::VariantTypeObject);
@ -61,7 +63,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
@@ -2698,7 +2699,6 @@ bool CApplication::Stop(int exitCode) @@ -2324,7 +2325,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,8 +71,8 @@ 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
@@ -3285,6 +3285,18 @@ void CApplication::OnQueueNextItem() @@ -2817,6 +2817,18 @@ void CApplication::StopPlaying()
CServiceBroker::GetGUI()->GetWindowManager().SendThreadMessage(msg); }
} }
+bool CApplication::SetExitCode(int exitCode) +bool CApplication::SetExitCode(int exitCode)
@ -85,10 +87,10 @@ so, when shutdown/reboot is requested:
+ return true; + return true;
+} +}
+ +
void CApplication::OnPlayBackStopped() bool CApplication::OnMessage(CGUIMessage& message)
{ {
CLog::LogF(LOGDEBUG, "CApplication::OnPlayBackStopped"); switch ( message.GetMessage() )
@@ -4352,7 +4364,7 @@ void CApplication::ProcessSlow() @@ -3293,7 +3305,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");
@ -97,27 +99,31 @@ so, when shutdown/reboot is requested:
} }
#endif #endif
diff --git a/xbmc/Application.h b/xbmc/Application.h
index fb3e65cc69..33a37519d4 100644
--- a/xbmc/Application.h --- a/xbmc/Application.h
+++ b/xbmc/Application.h +++ b/xbmc/Application.h
@@ -153,6 +153,7 @@ public: @@ -152,6 +152,7 @@ public:
bool InitWindow(RESOLUTION res = RES_INVALID); bool InitWindow(RESOLUTION res = RES_INVALID);
bool IsCurrentThread() const; bool IsCurrentThread() const;
+ bool SetExitCode(int exitCode); + bool SetExitCode(int exitCode);
bool Stop(int exitCode); bool Stop(int exitCode);
void UnloadSkin(); void ReloadSkin(bool confirm = false);
bool LoadCustomWindows(); const std::string& CurrentFile();
@@ -447,6 +448,7 @@ private: @@ -339,6 +340,7 @@ private:
CEvent m_playerEvent; CApplicationPlayer m_appPlayer;
CApplicationStackHelper m_stackHelper; CApplicationStackHelper m_stackHelper;
int m_ExitCode{EXITCODE_QUIT}; int m_ExitCode{EXITCODE_QUIT};
+ bool m_ExitCodeSet = false; + bool m_ExitCodeSet = false;
}; };
XBMC_GLOBAL_REF(CApplication,g_application); XBMC_GLOBAL_REF(CApplication,g_application);
diff --git a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
index 34eed6e41b..c374dbdbd3 100644
--- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp --- a/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
+++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp +++ b/xbmc/platform/linux/powermanagement/LogindUPowerSyscall.cpp
@@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSysc @@ -78,8 +78,6 @@ CLogindUPowerSyscall::~CLogindUPowerSyscall()
bool CLogindUPowerSyscall::Powerdown() bool CLogindUPowerSyscall::Powerdown()
{ {
@ -126,3 +132,6 @@ so, when shutdown/reboot is requested:
return LogindSetPowerState("PowerOff"); return LogindSetPowerState("PowerOff");
} }
--
2.30.2