mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-27 04:36:40 +00:00
Merge pull request #8786 from CvH/12.0/kodiup_0304
kodi: update to afe5c94
This commit is contained in:
commit
64b33a849b
@ -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="21.0rc2-Omega"
|
PKG_VERSION="afe5c94c51bd6a30aa55dbcf2008ba9f0b4eee06"
|
||||||
PKG_SHA256="52580a3b293443da3b560fce822c7c08871bc0089156a6b4f83ea26d54662af4"
|
PKG_SHA256="151d50d4d62f8c0dcb2b45feeae32518f28b8e25b3a76bfa7d2f4c9abeecb324"
|
||||||
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"
|
||||||
|
@ -5,6 +5,6 @@
|
|||||||
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
|
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
|
||||||
<set id="1">
|
<set id="1">
|
||||||
+ <feed updateinterval="30">https://libreelec.tv/feed</feed>
|
+ <feed updateinterval="30">https://libreelec.tv/feed</feed>
|
||||||
<feed updateinterval="30">http://feeds.kodi.tv/xbmc</feed>
|
<feed updateinterval="1440">https://kodi.tv/feed</feed>
|
||||||
<feed updateinterval="30">http://feeds.kodi.tv/latest_xbmc_addons</feed>
|
</set>
|
||||||
<feed updateinterval="30">http://feeds.kodi.tv/updated_xbmc_addons</feed>
|
</rssfeeds>
|
||||||
|
@ -9,7 +9,7 @@ Subject: [PATCH] disable minimize
|
|||||||
|
|
||||||
--- a/xbmc/application/Application.cpp
|
--- a/xbmc/application/Application.cpp
|
||||||
+++ b/xbmc/application/Application.cpp
|
+++ b/xbmc/application/Application.cpp
|
||||||
@@ -1605,7 +1605,6 @@ void CApplication::OnApplicationMessage(
|
@@ -1535,7 +1535,6 @@ void CApplication::OnApplicationMessage(
|
||||||
break;
|
break;
|
||||||
|
|
||||||
case TMSG_MINIMIZE:
|
case TMSG_MINIMIZE:
|
||||||
|
@ -95,7 +95,7 @@ Subject: [PATCH] Use a wrapper to setup service addons
|
|||||||
#include "addons/AddonBuilder.h"
|
#include "addons/AddonBuilder.h"
|
||||||
#include "addons/AddonDatabase.h"
|
#include "addons/AddonDatabase.h"
|
||||||
#include "addons/AddonEvents.h"
|
#include "addons/AddonEvents.h"
|
||||||
@@ -863,6 +864,7 @@ bool CAddonMgr::DisableAddon(const std::
|
@@ -862,6 +863,7 @@ bool CAddonMgr::DisableAddon(const std::
|
||||||
AddonPtr addon;
|
AddonPtr addon;
|
||||||
if (GetAddon(id, addon, AddonType::UNKNOWN, OnlyEnabled::CHOICE_NO) && addon != nullptr)
|
if (GetAddon(id, addon, AddonType::UNKNOWN, OnlyEnabled::CHOICE_NO) && addon != nullptr)
|
||||||
{
|
{
|
||||||
@ -103,7 +103,7 @@ Subject: [PATCH] Use a wrapper to setup service addons
|
|||||||
auto eventLog = CServiceBroker::GetEventLog();
|
auto eventLog = CServiceBroker::GetEventLog();
|
||||||
if (eventLog)
|
if (eventLog)
|
||||||
eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
|
eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
|
||||||
@@ -914,6 +916,7 @@ bool CAddonMgr::EnableSingle(const std::
|
@@ -913,6 +915,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);
|
||||||
|
@ -22,7 +22,7 @@ so, when shutdown/reboot is requested:
|
|||||||
|
|
||||||
--- a/xbmc/application/Application.cpp
|
--- a/xbmc/application/Application.cpp
|
||||||
+++ b/xbmc/application/Application.cpp
|
+++ b/xbmc/application/Application.cpp
|
||||||
@@ -1473,12 +1473,12 @@ void CApplication::OnApplicationMessage(
|
@@ -1403,12 +1403,12 @@ void CApplication::OnApplicationMessage(
|
||||||
switch (msg)
|
switch (msg)
|
||||||
{
|
{
|
||||||
case TMSG_POWERDOWN:
|
case TMSG_POWERDOWN:
|
||||||
@ -37,7 +37,7 @@ so, when shutdown/reboot is requested:
|
|||||||
break;
|
break;
|
||||||
|
|
||||||
case TMSG_SHUTDOWN:
|
case TMSG_SHUTDOWN:
|
||||||
@@ -1499,12 +1499,13 @@ void CApplication::OnApplicationMessage(
|
@@ -1429,12 +1429,13 @@ void CApplication::OnApplicationMessage(
|
||||||
|
|
||||||
case TMSG_RESTART:
|
case TMSG_RESTART:
|
||||||
case TMSG_RESET:
|
case TMSG_RESET:
|
||||||
@ -52,7 +52,7 @@ so, when shutdown/reboot is requested:
|
|||||||
Stop(EXITCODE_RESTARTAPP);
|
Stop(EXITCODE_RESTARTAPP);
|
||||||
#endif
|
#endif
|
||||||
break;
|
break;
|
||||||
@@ -2100,7 +2101,7 @@ bool CApplication::Stop(int exitCode)
|
@@ -2030,7 +2031,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
|
||||||
@@ -2132,7 +2133,6 @@ bool CApplication::Stop(int exitCode)
|
@@ -2062,7 +2063,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
|
||||||
@@ -2689,6 +2689,18 @@ void CApplication::StopPlaying()
|
@@ -2625,6 +2625,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())
|
||||||
@@ -3269,7 +3281,7 @@ void CApplication::ProcessSlow()
|
@@ -3205,7 +3217,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");
|
||||||
@ -99,7 +99,7 @@ so, when shutdown/reboot is requested:
|
|||||||
|
|
||||||
--- a/xbmc/application/Application.h
|
--- a/xbmc/application/Application.h
|
||||||
+++ b/xbmc/application/Application.h
|
+++ b/xbmc/application/Application.h
|
||||||
@@ -113,6 +113,7 @@ public:
|
@@ -109,6 +109,7 @@ public:
|
||||||
bool CreateGUI();
|
bool CreateGUI();
|
||||||
bool InitWindow(RESOLUTION res = RES_INVALID);
|
bool InitWindow(RESOLUTION res = RES_INVALID);
|
||||||
|
|
||||||
@ -107,7 +107,7 @@ so, when shutdown/reboot is requested:
|
|||||||
bool Stop(int exitCode);
|
bool Stop(int exitCode);
|
||||||
const std::string& CurrentFile();
|
const std::string& CurrentFile();
|
||||||
CFileItem& CurrentFileItem();
|
CFileItem& CurrentFileItem();
|
||||||
@@ -251,6 +252,7 @@ private:
|
@@ -240,6 +241,7 @@ private:
|
||||||
unsigned int m_ProcessedExternalCalls = 0; /*!< counts calls which are processed during one "door open" cycle in FrameMove */
|
unsigned int m_ProcessedExternalCalls = 0; /*!< counts calls which are processed during one "door open" cycle in FrameMove */
|
||||||
unsigned int m_ProcessedExternalDecay = 0; /*!< counts to close door after a few frames of no python activity */
|
unsigned int m_ProcessedExternalDecay = 0; /*!< counts to close door after a few frames of no python activity */
|
||||||
int m_ExitCode{EXITCODE_QUIT};
|
int m_ExitCode{EXITCODE_QUIT};
|
||||||
|
Loading…
x
Reference in New Issue
Block a user