mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-01 15:07:49 +00:00
Merge pull request #4574 from CvH/10.0/kodi_up_0310
kodi update to latest
This commit is contained in:
commit
46b99e72c7
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="audiodecoder.sacd"
|
||||
PKG_VERSION="0.1.1-Matrix"
|
||||
PKG_SHA256="8ef2faddcfa404625b474f4e5efbf260bb90e3aeed0158f6103b0e5b6c6579c6"
|
||||
PKG_VERSION="0.1.2-Matrix"
|
||||
PKG_SHA256="6bcd40d82982d85ed3e46e9b1363322eadfb61f1603054e39f0be60e677ec11a"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -2,8 +2,8 @@
|
||||
# Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="inputstream.ffmpegdirect"
|
||||
PKG_VERSION="1.15.3-Matrix"
|
||||
PKG_SHA256="16da84ea54a7ed631fbbdc25b89c5b322148113b2d4664f29c279e6ae54d0a34"
|
||||
PKG_VERSION="1.15.4-Matrix"
|
||||
PKG_SHA256="9abdd71e307476b1f7b18e3083dae247f1c0df384b420d9a953f01999f705934"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL2+"
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="pvr.iptvsimple"
|
||||
PKG_VERSION="6.3.1-Matrix"
|
||||
PKG_SHA256="d4618f0c110924f81cb7b7f29b5b89c5f975dd13eb8285a51d2ab607ab07fd00"
|
||||
PKG_VERSION="6.3.2-Matrix"
|
||||
PKG_SHA256="900fea47684ec7b7c1b11e641bfca798e24d15dc52903a08965ef5a836b6b919"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="pvr.vbox"
|
||||
PKG_VERSION="7.0.0-Matrix"
|
||||
PKG_SHA256="e0f81b7af96f66e74c7bac0d39d3c237101c8f36559acf6c9ebf67e1bcb17554"
|
||||
PKG_VERSION="7.0.1-Matrix"
|
||||
PKG_SHA256="f30336be5e705a78c488cbc881e2ed1741e7b1ec2d93053aa1482ffe73b7e6f1"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="pvr.vuplus"
|
||||
PKG_VERSION="6.1.2-Matrix"
|
||||
PKG_SHA256="fbcdae87bf554d667600474d2c72ff9716407f81089ac21c826dbbfbe53efe9b"
|
||||
PKG_VERSION="6.1.3-Matrix"
|
||||
PKG_SHA256="0e94e562943d896825ddf29b25af62eb9600311b7ba2aa97f1d43b8482b1c3e8"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -3,8 +3,8 @@
|
||||
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
|
||||
|
||||
PKG_NAME="kodi"
|
||||
PKG_VERSION="fbef8cf4aca97418eb04f231a973ed4e4945c164"
|
||||
PKG_SHA256="ce2459ae7180e044139ec8f6a274fa463a0afbf9275fa0e28ce0fb404302fb3b"
|
||||
PKG_VERSION="ce1232862b929a5e1ab26e57e0502d0ee7be25c8"
|
||||
PKG_SHA256="699edc31c664a7912618ac1ebbf736137f5b972c3d720ed6143527e4d9c2c6f5"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kodi.tv"
|
||||
PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
|
||||
|
@ -2,10 +2,10 @@ Subject: disable online check
|
||||
|
||||
---
|
||||
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
|
||||
index 1d112c4dd218..eaff4ee12d3f 100644
|
||||
index 213bb83d7e..892104e417 100644
|
||||
--- a/xbmc/GUIInfoManager.cpp
|
||||
+++ b/xbmc/GUIInfoManager.cpp
|
||||
@@ -1702,7 +1702,6 @@ const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
|
||||
@@ -1766,7 +1766,6 @@ const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
|
||||
{"currentcontrol", SYSTEM_CURRENT_CONTROL},
|
||||
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
|
||||
{"dvdlabel", SYSTEM_DVD_LABEL},
|
||||
|
@ -80,10 +80,10 @@ index e8fed4e5bc..e8be365b44 100644
|
||||
{
|
||||
public:
|
||||
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
|
||||
index 8150789b8f..49a84033e8 100644
|
||||
index e3e5923272..8d11c1976d 100644
|
||||
--- a/xbmc/addons/AddonManager.cpp
|
||||
+++ b/xbmc/addons/AddonManager.cpp
|
||||
@@ -733,6 +733,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled
|
||||
@@ -775,6 +775,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled
|
||||
AddonPtr addon;
|
||||
if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL)
|
||||
{
|
||||
@ -91,11 +91,11 @@ index 8150789b8f..49a84033e8 100644
|
||||
CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
|
||||
}
|
||||
|
||||
@@ -761,6 +762,7 @@ bool CAddonMgr::EnableSingle(const std::string& id)
|
||||
@@ -803,6 +804,7 @@ bool CAddonMgr::EnableSingle(const std::string& id)
|
||||
if (!m_database.EnableAddon(id))
|
||||
return false;
|
||||
m_disabled.erase(id);
|
||||
+ ADDON::LEAddonHook(addon, ADDON::LE_ADDON_ENABLED);
|
||||
|
||||
CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24064)));
|
||||
|
||||
// If enabling a repo add-on without an origin, set its origin to its own id
|
||||
if (addon->HasType(ADDON_REPOSITORY) && addon->Origin().empty())
|
||||
|
@ -23,10 +23,10 @@ so, when shutdown/reboot is requested:
|
||||
5 files changed, 20 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
|
||||
index cb164168bd..d57f4791ef 100644
|
||||
index 3754243394..1976ce1947 100644
|
||||
--- a/xbmc/Application.cpp
|
||||
+++ b/xbmc/Application.cpp
|
||||
@@ -2069,12 +2069,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
|
||||
@@ -2075,12 +2075,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
|
||||
switch (msg)
|
||||
{
|
||||
case TMSG_POWERDOWN:
|
||||
@ -41,7 +41,7 @@ index cb164168bd..d57f4791ef 100644
|
||||
break;
|
||||
|
||||
case TMSG_SHUTDOWN:
|
||||
@@ -2095,12 +2095,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
|
||||
@@ -2101,12 +2101,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
|
||||
|
||||
case TMSG_RESTART:
|
||||
case TMSG_RESET:
|
||||
@ -56,7 +56,7 @@ index cb164168bd..d57f4791ef 100644
|
||||
Stop(EXITCODE_RESTARTAPP);
|
||||
#endif
|
||||
break;
|
||||
@@ -2579,6 +2580,17 @@ bool CApplication::Cleanup()
|
||||
@@ -2585,6 +2586,17 @@ bool CApplication::Cleanup()
|
||||
}
|
||||
}
|
||||
|
||||
@ -74,7 +74,7 @@ index cb164168bd..d57f4791ef 100644
|
||||
void CApplication::Stop(int exitCode)
|
||||
{
|
||||
CLog::Log(LOGINFO, "Stopping player");
|
||||
@@ -2605,7 +2617,7 @@ void CApplication::Stop(int exitCode)
|
||||
@@ -2611,7 +2623,7 @@ void CApplication::Stop(int exitCode)
|
||||
m_frameMoveGuard.unlock();
|
||||
|
||||
CVariant vExitCode(CVariant::VariantTypeObject);
|
||||
@ -83,7 +83,7 @@ index cb164168bd..d57f4791ef 100644
|
||||
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "xbmc", "OnQuit", vExitCode);
|
||||
|
||||
// Abort any active screensaver
|
||||
@@ -2637,7 +2649,6 @@ void CApplication::Stop(int exitCode)
|
||||
@@ -2643,7 +2655,6 @@ void CApplication::Stop(int exitCode)
|
||||
// Needs cleaning up
|
||||
CApplicationMessenger::GetInstance().Stop();
|
||||
m_AppFocused = false;
|
||||
@ -91,7 +91,7 @@ index cb164168bd..d57f4791ef 100644
|
||||
CLog::Log(LOGINFO, "Stopping all");
|
||||
|
||||
// cancel any jobs from the jobmanager
|
||||
@@ -4222,7 +4233,7 @@ void CApplication::ProcessSlow()
|
||||
@@ -4215,7 +4226,7 @@ void CApplication::ProcessSlow()
|
||||
if (CPlatformPosix::TestQuitFlag())
|
||||
{
|
||||
CLog::Log(LOGINFO, "Quitting due to POSIX signal");
|
||||
|
Loading…
x
Reference in New Issue
Block a user