jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-08-03 16:07:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

kodi: update to 6384782

Browse Source
This commit is contained in:
CvH 2020-10-19 20:54:07 +02:00
parent ec1292ba3f
commit a83571f1c6
8 changed files with 34 additions and 30 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="ce1232862b929a5e1ab26e57e0502d0ee7be25c8" PKG_VERSION="6384782d19e14fbeb85e9d3f2e22e0242200dbeb"
PKG_SHA256="699edc31c664a7912618ac1ebbf736137f5b972c3d720ed6143527e4d9c2c6f5" PKG_SHA256="28a9e52ef2147730aec79e1c1204957d0a5d5608e279a81440a7ba08cdca37ae"
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"

11
packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch
View File

@ -2,10 +2,10 @@ Subject: disable online check
--- ---
diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp
index 213bb83d7e..892104e417 100644 index 10181e10a6..4cb9feac9b 100644
--- a/xbmc/GUIInfoManager.cpp --- a/xbmc/GUIInfoManager.cpp
+++ b/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp
@@ -1766,7 +1766,6 @@ const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE}, @@ -1774,7 +1774,6 @@ const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE},
{"currentcontrol", SYSTEM_CURRENT_CONTROL}, {"currentcontrol", SYSTEM_CURRENT_CONTROL},
{"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID}, {"currentcontrolid", SYSTEM_CURRENT_CONTROL_ID},
{"dvdlabel", SYSTEM_DVD_LABEL}, {"dvdlabel", SYSTEM_DVD_LABEL},
@ -14,7 +14,7 @@ index 213bb83d7e..892104e417 100644
{"kernelversion", SYSTEM_OS_VERSION_INFO}, // old, not correct name {"kernelversion", SYSTEM_OS_VERSION_INFO}, // old, not correct name
{"uptime", SYSTEM_UPTIME}, {"uptime", SYSTEM_UPTIME},
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index 5b1d89ed2011..4a39f1122bca 100644 index 92d2c19c93..8cbf3da636 100644
--- a/xbmc/utils/SystemInfo.cpp --- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp +++ b/xbmc/utils/SystemInfo.cpp
@@ -271,7 +271,6 @@ bool CSysInfoJob::DoWork() @@ -271,7 +271,6 @@ bool CSysInfoJob::DoWork()
@ -37,7 +37,7 @@ index 5b1d89ed2011..4a39f1122bca 100644
std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText) std::string CSysInfo::GetHddSpaceInfo(int drive, bool shortText)
diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp diff --git a/xbmc/windows/GUIWindowSystemInfo.cpp b/xbmc/windows/GUIWindowSystemInfo.cpp
index e73004d0bbe8..d4af7836d643 100644 index 2b0c23f12c..7f9d45f64f 100644
--- a/xbmc/windows/GUIWindowSystemInfo.cpp --- a/xbmc/windows/GUIWindowSystemInfo.cpp
+++ b/xbmc/windows/GUIWindowSystemInfo.cpp +++ b/xbmc/windows/GUIWindowSystemInfo.cpp
@@ -124,7 +124,6 @@ void CGUIWindowSystemInfo::FrameMove() @@ -124,7 +124,6 @@ void CGUIWindowSystemInfo::FrameMove()
@ -48,3 +48,6 @@ index e73004d0bbe8..d4af7836d643 100644
} }
else if (m_section == CONTROL_BT_VIDEO) else if (m_section == CONTROL_BT_VIDEO)
--
2.25.1

6
packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch
View File

@ -13,10 +13,10 @@ this should probably be removed after OE 6
1 file changed, 2 deletions(-) 1 file changed, 2 deletions(-)
diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
index 34d3138977..0cdc91a8ba 100644 index 9e6bdc445f..9af86dd393 100644
--- a/xbmc/windowing/X11/WinSystemX11.cpp --- a/xbmc/windowing/X11/WinSystemX11.cpp
+++ b/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp
@@ -743,8 +743,6 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std: @@ -750,8 +750,6 @@ bool CWinSystemX11::SetWindow(int width, int height, bool fullscreen, const std:
if (fullscreen && hasWM) if (fullscreen && hasWM)
{ {
@ -26,5 +26,5 @@ index 34d3138977..0cdc91a8ba 100644
int one = 1; int one = 1;
Atom composite = XInternAtom(m_dpy, "_KDE_NET_WM_BLOCK_COMPOSITING", True); Atom composite = XInternAtom(m_dpy, "_KDE_NET_WM_BLOCK_COMPOSITING", True);
-- --
2.5.0 2.25.1

4
packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH 07/13] disable minimize
1 file changed, 1 deletion(-) 1 file changed, 1 deletion(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index a6f6119b81..adf77074e0 100644 index 4bc60d41f6..62267b2cab 100644
--- a/xbmc/Application.cpp --- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp +++ b/xbmc/Application.cpp
@@ -4692,7 +4692,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */) @@ -4696,7 +4696,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */)
void CApplication::Minimize() void CApplication::Minimize()
{ {

16
packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch
View File

@ -1,8 +1,8 @@
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index 11d304662d..a685ac568a 100644 index 294c99a76f..52ac89a688 100644
--- a/xbmc/addons/Addon.cpp --- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp
@@ -375,6 +375,37 @@ AddonVersion CAddon::GetDependencyVersion(const std::string &dependencyID) const @@ -371,6 +371,37 @@ AddonVersion CAddon::GetDependencyVersion(const std::string &dependencyID) const
return m_addonInfo->DependencyVersion(dependencyID); return m_addonInfo->DependencyVersion(dependencyID);
} }
@ -50,7 +50,7 @@ index 11d304662d..a685ac568a 100644
// OE // OE
addon->OnPostInstall(update, modal); addon->OnPostInstall(update, modal);
@@ -411,6 +445,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) @@ -385,6 +416,8 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
void OnPreUnInstall(const AddonPtr& addon) void OnPreUnInstall(const AddonPtr& addon)
{ {
@ -60,7 +60,7 @@ index 11d304662d..a685ac568a 100644
} }
diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h diff --git a/xbmc/addons/Addon.h b/xbmc/addons/Addon.h
index e8fed4e5bc..e8be365b44 100644 index 6b72ca62c2..88a5096a7e 100644
--- a/xbmc/addons/Addon.h --- a/xbmc/addons/Addon.h
+++ b/xbmc/addons/Addon.h +++ b/xbmc/addons/Addon.h
@@ -27,6 +27,15 @@ namespace ADDON @@ -27,6 +27,15 @@ namespace ADDON
@ -80,10 +80,10 @@ index e8fed4e5bc..e8be365b44 100644
{ {
public: public:
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
index e3e5923272..8d11c1976d 100644 index d454177cfa..afea05c99d 100644
--- a/xbmc/addons/AddonManager.cpp --- a/xbmc/addons/AddonManager.cpp
+++ b/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp
@@ -775,6 +775,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled @@ -780,6 +780,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled
AddonPtr addon; AddonPtr addon;
if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL) if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL)
{ {
@ -91,7 +91,7 @@ index e3e5923272..8d11c1976d 100644
CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141))); CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141)));
} }
@@ -803,6 +804,7 @@ bool CAddonMgr::EnableSingle(const std::string& id) @@ -808,6 +809,7 @@ bool CAddonMgr::EnableSingle(const std::string& id)
if (!m_database.EnableAddon(id)) if (!m_database.EnableAddon(id))
return false; return false;
m_disabled.erase(id); m_disabled.erase(id);
@ -99,3 +99,5 @@ index e3e5923272..8d11c1976d 100644
// If enabling a repo add-on without an origin, set its origin to its own id // If enabling a repo add-on without an origin, set its origin to its own id
if (addon->HasType(ADDON_REPOSITORY) && addon->Origin().empty()) if (addon->HasType(ADDON_REPOSITORY) && addon->Origin().empty())
--
2.25.1

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

@ -23,7 +23,7 @@ so, when shutdown/reboot is requested:
5 files changed, 20 insertions(+), 8 deletions(-) 5 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index 3754243394..1976ce1947 100644 index 62267b2cab..1a05196d11 100644
--- a/xbmc/Application.cpp --- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp +++ b/xbmc/Application.cpp
@@ -2075,12 +2075,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) @@ -2075,12 +2075,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg)
@ -80,7 +80,7 @@ index 3754243394..1976ce1947 100644
CVariant vExitCode(CVariant::VariantTypeObject); CVariant vExitCode(CVariant::VariantTypeObject);
- vExitCode["exitcode"] = exitCode; - vExitCode["exitcode"] = exitCode;
+ vExitCode["exitcode"] = m_ExitCode; + vExitCode["exitcode"] = m_ExitCode;
CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "xbmc", "OnQuit", vExitCode); CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode);
// Abort any active screensaver // Abort any active screensaver
@@ -2643,7 +2655,6 @@ void CApplication::Stop(int exitCode) @@ -2643,7 +2655,6 @@ void CApplication::Stop(int exitCode)
@ -91,7 +91,7 @@ index 3754243394..1976ce1947 100644
CLog::Log(LOGINFO, "Stopping all"); CLog::Log(LOGINFO, "Stopping all");
// cancel any jobs from the jobmanager // cancel any jobs from the jobmanager
@@ -4215,7 +4226,7 @@ void CApplication::ProcessSlow() @@ -4225,7 +4236,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");
@ -101,7 +101,7 @@ index 3754243394..1976ce1947 100644
#endif #endif
diff --git a/xbmc/Application.h b/xbmc/Application.h diff --git a/xbmc/Application.h b/xbmc/Application.h
index 5f94dd3e07..3d11c4fa37 100644 index 5babd5a8fd..421d1f4ea3 100644
--- a/xbmc/Application.h --- a/xbmc/Application.h
+++ b/xbmc/Application.h +++ b/xbmc/Application.h
@@ -156,6 +156,7 @@ public: @@ -156,6 +156,7 @@ public:

4
packages/mediacenter/kodi/patches/kodi-100.12-prevent-kodi-switching-to-windowed-mode.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] prevent kodi switching to windowed mode
1 file changed, 1 insertion(+) 1 file changed, 1 insertion(+)
diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h diff --git a/xbmc/windowing/X11/WinSystemX11.h b/xbmc/windowing/X11/WinSystemX11.h
index 3f207d3ffa..3b3ff9b62c 100644 index 632f35b6f9..1dac05fa98 100644
--- a/xbmc/windowing/X11/WinSystemX11.h --- a/xbmc/windowing/X11/WinSystemX11.h
+++ b/xbmc/windowing/X11/WinSystemX11.h +++ b/xbmc/windowing/X11/WinSystemX11.h
@@ -38,6 +38,7 @@ public: @@ -46,6 +46,7 @@ public:
void FinishWindowResize(int newWidth, int newHeight) override; void FinishWindowResize(int newWidth, int newHeight) override;
bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override; bool SetFullScreen(bool fullScreen, RESOLUTION_INFO& res, bool blankOtherDisplays) override;
void UpdateResolutions() override; void UpdateResolutions() override;

9
packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch
View File

@ -8,10 +8,10 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall
1 file changed, 6 insertions(+) 1 file changed, 6 insertions(+)
diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp
index a685ac568a..f41258a2c2 100644 index e57f6894cc..3926dc2d1e 100644
--- a/xbmc/addons/Addon.cpp --- a/xbmc/addons/Addon.cpp
+++ b/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp
@@ -441,6 +441,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal) @@ -438,6 +438,9 @@ void OnPostInstall(const AddonPtr& addon, bool update, bool modal)
// OE // OE
addon->OnPostInstall(update, modal); addon->OnPostInstall(update, modal);
@ -21,7 +21,7 @@ index a685ac568a..f41258a2c2 100644
} }
void OnPreUnInstall(const AddonPtr& addon) void OnPreUnInstall(const AddonPtr& addon)
@@ -453,6 +456,9 @@ void OnPreUnInstall(const AddonPtr& addon) @@ -450,6 +453,9 @@ void OnPreUnInstall(const AddonPtr& addon)
void OnPostUnInstall(const AddonPtr& addon) void OnPostUnInstall(const AddonPtr& addon)
{ {
addon->OnPostUnInstall(); addon->OnPostUnInstall();
@ -32,5 +32,4 @@ index a685ac568a..f41258a2c2 100644
} /* namespace ADDON */ } /* namespace ADDON */
-- --
2.20.1 2.25.1