Merge pull request #8787 from HiassofT/le12-kodi-omega-240404

kodi: switch back to Omega branch
This commit is contained in:
CvH 2024-04-04 12:29:05 +02:00 committed by GitHub
commit b5ce01cce1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 16 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="kodi"
PKG_VERSION="afe5c94c51bd6a30aa55dbcf2008ba9f0b4eee06"
PKG_SHA256="151d50d4d62f8c0dcb2b45feeae32518f28b8e25b3a76bfa7d2f4c9abeecb324"
PKG_VERSION="ed0c71562b966d6bae5946a0f7495cb7980b2f82"
PKG_SHA256="e63e5b9655a1cf3637b70b44b946291a2483f368ad5594105ac880c9933e62a5"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz"

View File

@ -5,6 +5,6 @@
<!-- To use different sets in your skin, each must be called from skin with a unique id. !-->
<set id="1">
+ <feed updateinterval="30">https://libreelec.tv/feed</feed>
<feed updateinterval="1440">https://kodi.tv/feed</feed>
</set>
</rssfeeds>
<feed updateinterval="30">http://feeds.kodi.tv/xbmc</feed>
<feed updateinterval="30">http://feeds.kodi.tv/latest_xbmc_addons</feed>
<feed updateinterval="30">http://feeds.kodi.tv/updated_xbmc_addons</feed>

View File

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

View File

@ -95,7 +95,7 @@ Subject: [PATCH] Use a wrapper to setup service addons
#include "addons/AddonBuilder.h"
#include "addons/AddonDatabase.h"
#include "addons/AddonEvents.h"
@@ -862,6 +863,7 @@ bool CAddonMgr::DisableAddon(const std::
@@ -863,6 +864,7 @@ bool CAddonMgr::DisableAddon(const std::
AddonPtr addon;
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();
if (eventLog)
eventLog->Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
@@ -913,6 +915,7 @@ bool CAddonMgr::EnableSingle(const std::
@@ -914,6 +916,7 @@ bool CAddonMgr::EnableSingle(const std::
if (!m_database->EnableAddon(id))
return false;
m_disabled.erase(id);

View File

@ -22,7 +22,7 @@ so, when shutdown/reboot is requested:
--- a/xbmc/application/Application.cpp
+++ b/xbmc/application/Application.cpp
@@ -1403,12 +1403,12 @@ void CApplication::OnApplicationMessage(
@@ -1473,12 +1473,12 @@ void CApplication::OnApplicationMessage(
switch (msg)
{
case TMSG_POWERDOWN:
@ -37,7 +37,7 @@ so, when shutdown/reboot is requested:
break;
case TMSG_SHUTDOWN:
@@ -1429,12 +1429,13 @@ void CApplication::OnApplicationMessage(
@@ -1499,12 +1499,13 @@ void CApplication::OnApplicationMessage(
case TMSG_RESTART:
case TMSG_RESET:
@ -52,7 +52,7 @@ so, when shutdown/reboot is requested:
Stop(EXITCODE_RESTARTAPP);
#endif
break;
@@ -2030,7 +2031,7 @@ bool CApplication::Stop(int exitCode)
@@ -2100,7 +2101,7 @@ bool CApplication::Stop(int exitCode)
m_frameMoveGuard.unlock();
CVariant vExitCode(CVariant::VariantTypeObject);
@ -61,7 +61,7 @@ so, when shutdown/reboot is requested:
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
// Abort any active screensaver
@@ -2062,7 +2063,6 @@ bool CApplication::Stop(int exitCode)
@@ -2132,7 +2133,6 @@ bool CApplication::Stop(int exitCode)
// Needs cleaning up
CServiceBroker::GetAppMessenger()->Stop();
m_AppFocused = false;
@ -69,7 +69,7 @@ so, when shutdown/reboot is requested:
CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager
@@ -2625,6 +2625,18 @@ void CApplication::StopPlaying()
@@ -2689,6 +2689,18 @@ void CApplication::StopPlaying()
}
}
@ -88,7 +88,7 @@ so, when shutdown/reboot is requested:
bool CApplication::OnMessage(CGUIMessage& message)
{
switch (message.GetMessage())
@@ -3205,7 +3217,7 @@ void CApplication::ProcessSlow()
@@ -3269,7 +3281,7 @@ void CApplication::ProcessSlow()
if (CPlatformPosix::TestQuitFlag())
{
CLog::Log(LOGINFO, "Quitting due to POSIX signal");
@ -99,7 +99,7 @@ so, when shutdown/reboot is requested:
--- a/xbmc/application/Application.h
+++ b/xbmc/application/Application.h
@@ -109,6 +109,7 @@ public:
@@ -113,6 +113,7 @@ public:
bool CreateGUI();
bool InitWindow(RESOLUTION res = RES_INVALID);
@ -107,7 +107,7 @@ so, when shutdown/reboot is requested:
bool Stop(int exitCode);
const std::string& CurrentFile();
CFileItem& CurrentFileItem();
@@ -240,6 +241,7 @@ private:
@@ -251,6 +252,7 @@ private:
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 */
int m_ExitCode{EXITCODE_QUIT};