Merge pull request #5723 from CvH/11.0/kodi_up_0710

Kodi update to latest
This commit is contained in:
heitbaum 2021-10-07 22:44:17 +11:00 committed by GitHub
commit 98b3f8e247
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 14 additions and 14 deletions

View File

@ -5,4 +5,4 @@
OS_VERSION="11.0" OS_VERSION="11.0"
# ADDON_VERSION: Addon version # ADDON_VERSION: Addon version
ADDON_VERSION="10.80.1" ADDON_VERSION="10.80.2"

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="3d01768da145e67708ed378dfc36bb4b61a81624" PKG_VERSION="8ea70bc886aff2d6e4ddcd6ae1b651a57debb8f8"
PKG_SHA256="fcc2ac30f62b55bf36fb5edf9026cdd4b1af2aaecd17accc0500705850de0cc3" PKG_SHA256="56d2611afef27272b4db1af042c0fdc995ed0ddd2dc90c6936a1bc7606cbb893"
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

@ -14,7 +14,7 @@ this should probably be removed after OE 6
--- a/xbmc/windowing/X11/WinSystemX11.cpp --- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -756,8 +756,6 @@ bool CWinSystemX11::SetWindow(int width, @@ -759,8 +759,6 @@ bool CWinSystemX11::SetWindow(int width,
if (fullscreen && hasWM) if (fullscreen && hasWM)
{ {

View File

@ -9,7 +9,7 @@ Subject: [PATCH 07/13] disable minimize
--- a/xbmc/Application.cpp --- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp +++ b/xbmc/Application.cpp
@@ -2055,7 +2055,6 @@ void CApplication::OnApplicationMessage( @@ -2053,7 +2053,6 @@ void CApplication::OnApplicationMessage(
break; break;
case TMSG_MINIMIZE: case TMSG_MINIMIZE:

View File

@ -76,7 +76,7 @@
public: public:
--- a/xbmc/addons/AddonManager.cpp --- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp
@@ -795,6 +795,7 @@ bool CAddonMgr::DisableAddon(const std:: @@ -829,6 +829,7 @@ bool CAddonMgr::DisableAddon(const std::
AddonPtr addon; AddonPtr addon;
if (GetAddon(id, addon, ADDON_UNKNOWN, OnlyEnabled::NO) && addon != NULL) if (GetAddon(id, addon, ADDON_UNKNOWN, OnlyEnabled::NO) && addon != NULL)
{ {
@ -84,7 +84,7 @@
CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141))); CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
} }
@@ -840,6 +841,7 @@ bool CAddonMgr::EnableSingle(const std:: @@ -874,6 +875,7 @@ bool CAddonMgr::EnableSingle(const std::
if (!m_database.EnableAddon(id)) if (!m_database.EnableAddon(id))
return false; return false;
m_disabled.erase(id); m_disabled.erase(id);

View File

@ -24,7 +24,7 @@ so, when shutdown/reboot is requested:
--- a/xbmc/Application.cpp --- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp +++ b/xbmc/Application.cpp
@@ -1935,12 +1935,12 @@ void CApplication::OnApplicationMessage( @@ -1933,12 +1933,12 @@ void CApplication::OnApplicationMessage(
switch (msg) switch (msg)
{ {
case TMSG_POWERDOWN: case TMSG_POWERDOWN:
@ -39,7 +39,7 @@ so, when shutdown/reboot is requested:
break; break;
case TMSG_SHUTDOWN: case TMSG_SHUTDOWN:
@@ -1961,12 +1961,13 @@ void CApplication::OnApplicationMessage( @@ -1959,12 +1959,13 @@ void CApplication::OnApplicationMessage(
case TMSG_RESTART: case TMSG_RESTART:
case TMSG_RESET: case TMSG_RESET:
@ -54,7 +54,7 @@ so, when shutdown/reboot is requested:
Stop(EXITCODE_RESTARTAPP); Stop(EXITCODE_RESTARTAPP);
#endif #endif
break; break;
@@ -2456,6 +2457,17 @@ bool CApplication::Cleanup() @@ -2454,6 +2455,17 @@ bool CApplication::Cleanup()
} }
} }
@ -72,7 +72,7 @@ so, when shutdown/reboot is requested:
void CApplication::Stop(int exitCode) void CApplication::Stop(int exitCode)
{ {
CLog::Log(LOGINFO, "Stopping player"); CLog::Log(LOGINFO, "Stopping player");
@@ -2482,7 +2494,7 @@ void CApplication::Stop(int exitCode) @@ -2480,7 +2492,7 @@ void CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock(); m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject); CVariant vExitCode(CVariant::VariantTypeObject);
@ -81,7 +81,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
@@ -2514,7 +2526,6 @@ void CApplication::Stop(int exitCode) @@ -2512,7 +2524,6 @@ void CApplication::Stop(int exitCode)
// Needs cleaning up // Needs cleaning up
CApplicationMessenger::GetInstance().Stop(); CApplicationMessenger::GetInstance().Stop();
m_AppFocused = false; m_AppFocused = false;
@ -89,7 +89,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
@@ -4157,7 +4168,7 @@ void CApplication::ProcessSlow() @@ -4155,7 +4166,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

@ -16,7 +16,7 @@ https://github.com/xbmc/xbmc/pull/19091
~CPlatformLinux() override = default; ~CPlatformLinux() override = default;
bool InitStageOne() override; bool InitStageOne() override;
- bool IsConfigureAddonsAtStartupEnabled() override { return true; }; - bool IsConfigureAddonsAtStartupEnabled() override { return true; }
private: private:
std::unique_ptr<OPTIONALS::CLircContainer, OPTIONALS::delete_CLircContainer> m_lirc; std::unique_ptr<OPTIONALS::CLircContainer, OPTIONALS::delete_CLircContainer> m_lirc;