From aea17da3bf7b2db0cc7246a92f4176c530bbebe5 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 25 Sep 2021 15:40:17 +0200 Subject: [PATCH] kodi: update to 3d01768 --- packages/mediacenter/kodi/package.mk | 4 ++-- .../kodi-100.03-disable-online-check.patch | 14 +++++++------- ...-100.05-make-binary-addons-executable.patch | 2 +- ....06-dont-set-_NET_WM_STATE_FULLSCREEN.patch | 2 +- .../patches/kodi-100.07-disable-minimize.patch | 2 +- ...use-a-wrapper-to-setup-service-addons.patch | 10 +++++----- .../patches/kodi-100.10-handle-SIGTERM.patch | 18 +++++++++--------- .../kodi-100.16-remove-sysinfo-battery.patch | 8 ++++---- ...100.30-addons-refresh-etc-environment.patch | 4 ++-- ...odi-100.31.le-addons-no-startupenable.patch | 7 +------ 10 files changed, 33 insertions(+), 38 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index bf16236492..8de7076e55 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -3,8 +3,8 @@ # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) PKG_NAME="kodi" -PKG_VERSION="6402a50950ff6463042f8891ec4029c782730391" -PKG_SHA256="56e1a64f2cd1b38e6997dac3057cdeb81e33109bfa449521493208b514466bd0" +PKG_VERSION="3d01768da145e67708ed378dfc36bb4b61a81624" +PKG_SHA256="fcc2ac30f62b55bf36fb5edf9026cdd4b1af2aaecd17accc0500705850de0cc3" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/xbmc/archive/${PKG_VERSION}.tar.gz" diff --git a/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch index 6ffd100b9a..aa0889db1e 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.03-disable-online-check.patch @@ -13,15 +13,15 @@ Subject: disable online check {"uptime", SYSTEM_UPTIME}, --- a/xbmc/utils/SystemInfo.cpp +++ b/xbmc/utils/SystemInfo.cpp -@@ -271,7 +271,6 @@ bool CSysInfoJob::DoWork() +@@ -274,7 +274,6 @@ bool CSysInfoJob::DoWork() { m_info.systemUptime = GetSystemUpTime(false); m_info.systemTotalUptime = GetSystemUpTime(true); - m_info.internetState = GetInternetState(); m_info.videoEncoder = GetVideoEncoder(); m_info.cpuFrequency = - StringUtils::Format("%4.0f MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency()); -@@ -1000,9 +999,7 @@ int CSysInfo::GetXbmcBitness(void) + StringUtils::Format("{:4.0f} MHz", CServiceBroker::GetCPUInfo()->GetCPUFrequency()); +@@ -1010,9 +1009,7 @@ int CSysInfo::GetXbmcBitness(void) bool CSysInfo::HasInternet() { @@ -35,10 +35,10 @@ Subject: disable online check --- a/xbmc/windows/GUIWindowSystemInfo.cpp +++ b/xbmc/windows/GUIWindowSystemInfo.cpp @@ -124,7 +124,6 @@ void CGUIWindowSystemInfo::FrameMove() - SetControlLabel(i++, "%s: %s", 13160, NETWORK_GATEWAY_ADDRESS); - SetControlLabel(i++, "%s: %s", 13161, NETWORK_DNS1_ADDRESS); - SetControlLabel(i++, "%s: %s", 20307, NETWORK_DNS2_ADDRESS); -- SetControlLabel(i++, "%s %s", 13295, SYSTEM_INTERNET_STATE); + SetControlLabel(i++, "{}: {}", 13160, NETWORK_GATEWAY_ADDRESS); + SetControlLabel(i++, "{}: {}", 13161, NETWORK_DNS1_ADDRESS); + SetControlLabel(i++, "{}: {}", 20307, NETWORK_DNS2_ADDRESS); +- SetControlLabel(i++, "{} {}", 13295, SYSTEM_INTERNET_STATE); } else if (m_section == CONTROL_BT_VIDEO) diff --git a/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch b/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch index a23dc418e0..0cb385d3f7 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.05-make-binary-addons-executable.patch @@ -23,7 +23,7 @@ credits to vpeter4 for the patch #include "AddonManager.h" #include "addons/settings/AddonSettings.h" #include "filesystem/Directory.h" -@@ -385,6 +389,28 @@ void OnPreInstall(const AddonPtr& addon) +@@ -390,6 +394,28 @@ void OnPreInstall(const AddonPtr& addon) void OnPostInstall(const AddonPtr& addon, bool update, bool modal) { diff --git a/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch b/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch index c564f084d3..5e172f6e97 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch @@ -14,7 +14,7 @@ this should probably be removed after OE 6 --- a/xbmc/windowing/X11/WinSystemX11.cpp +++ b/xbmc/windowing/X11/WinSystemX11.cpp -@@ -753,8 +753,6 @@ bool CWinSystemX11::SetWindow(int width, +@@ -756,8 +756,6 @@ bool CWinSystemX11::SetWindow(int width, if (fullscreen && hasWM) { diff --git a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch index 7030e2e3c1..8ae0d5c8e0 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch @@ -9,7 +9,7 @@ Subject: [PATCH 07/13] disable minimize --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2056,7 +2056,6 @@ void CApplication::OnApplicationMessage( +@@ -2055,7 +2055,6 @@ void CApplication::OnApplicationMessage( break; case TMSG_MINIMIZE: diff --git a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch index 11adba478e..2ac3fcdb5b 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-service-addons.patch @@ -1,6 +1,6 @@ --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp -@@ -380,6 +380,37 @@ AddonVersion CAddon::GetDependencyVersio +@@ -385,6 +385,37 @@ AddonVersion CAddon::GetDependencyVersio return m_addonInfo->DependencyVersion(dependencyID); } @@ -38,7 +38,7 @@ void OnPreInstall(const AddonPtr& addon) { //Fallback to the pre-install callback in the addon. -@@ -409,6 +440,8 @@ void OnPostInstall(const AddonPtr& addon +@@ -414,6 +445,8 @@ void OnPostInstall(const AddonPtr& addon } closedir(addonsDir); } @@ -47,7 +47,7 @@ // OE addon->OnPostInstall(update, modal); -@@ -416,6 +449,8 @@ void OnPostInstall(const AddonPtr& addon +@@ -421,6 +454,8 @@ void OnPostInstall(const AddonPtr& addon void OnPreUnInstall(const AddonPtr& addon) { @@ -76,7 +76,7 @@ public: --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp -@@ -789,6 +789,7 @@ bool CAddonMgr::DisableAddon(const std:: +@@ -795,6 +795,7 @@ bool CAddonMgr::DisableAddon(const std:: AddonPtr addon; if (GetAddon(id, addon, ADDON_UNKNOWN, OnlyEnabled::NO) && addon != NULL) { @@ -84,7 +84,7 @@ CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141))); } -@@ -834,6 +835,7 @@ bool CAddonMgr::EnableSingle(const std:: +@@ -840,6 +841,7 @@ bool CAddonMgr::EnableSingle(const std:: if (!m_database.EnableAddon(id)) return false; m_disabled.erase(id); diff --git a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch index 388263de8c..add99dd3c8 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -24,7 +24,7 @@ so, when shutdown/reboot is requested: --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2118,12 +2118,12 @@ void CApplication::OnApplicationMessage( +@@ -1935,12 +1935,12 @@ void CApplication::OnApplicationMessage( switch (msg) { case TMSG_POWERDOWN: @@ -39,7 +39,7 @@ so, when shutdown/reboot is requested: break; case TMSG_SHUTDOWN: -@@ -2144,12 +2144,13 @@ void CApplication::OnApplicationMessage( +@@ -1961,12 +1961,13 @@ void CApplication::OnApplicationMessage( case TMSG_RESTART: case TMSG_RESET: @@ -54,7 +54,7 @@ so, when shutdown/reboot is requested: Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2635,6 +2636,17 @@ bool CApplication::Cleanup() +@@ -2456,6 +2457,17 @@ bool CApplication::Cleanup() } } @@ -72,7 +72,7 @@ so, when shutdown/reboot is requested: void CApplication::Stop(int exitCode) { CLog::Log(LOGINFO, "Stopping player"); -@@ -2661,7 +2673,7 @@ void CApplication::Stop(int exitCode) +@@ -2482,7 +2494,7 @@ void CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -81,7 +81,7 @@ so, when shutdown/reboot is requested: CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "OnQuit", vExitCode); // Abort any active screensaver -@@ -2693,7 +2705,6 @@ void CApplication::Stop(int exitCode) +@@ -2514,7 +2526,6 @@ void CApplication::Stop(int exitCode) // Needs cleaning up CApplicationMessenger::GetInstance().Stop(); m_AppFocused = false; @@ -89,7 +89,7 @@ so, when shutdown/reboot is requested: CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -4347,7 +4358,7 @@ void CApplication::ProcessSlow() +@@ -4157,7 +4168,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); @@ -100,8 +100,8 @@ so, when shutdown/reboot is requested: --- a/xbmc/Application.h +++ b/xbmc/Application.h -@@ -156,6 +156,7 @@ public: - bool StartServer(enum ESERVERS eServer, bool bStart, bool bWait = false); +@@ -138,6 +138,7 @@ public: + bool InitWindow(RESOLUTION res = RES_INVALID); bool IsCurrentThread() const; + void SetExitCode(int exitCode); @@ -110,7 +110,7 @@ so, when shutdown/reboot is requested: bool LoadCustomWindows(); --- a/xbmc/XBApplicationEx.cpp +++ b/xbmc/XBApplicationEx.cpp -@@ -23,6 +23,7 @@ CXBApplicationEx::CXBApplicationEx() +@@ -22,6 +22,7 @@ CXBApplicationEx::CXBApplicationEx() m_bStop = false; m_AppFocused = true; m_ExitCode = EXITCODE_QUIT; diff --git a/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch b/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch index 835772ea95..d918dc0744 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.16-remove-sysinfo-battery.patch @@ -1,10 +1,10 @@ --- a/xbmc/windows/GUIWindowSystemInfo.cpp +++ b/xbmc/windows/GUIWindowSystemInfo.cpp @@ -99,7 +99,6 @@ void CGUIWindowSystemInfo::FrameMove() - SetControlLabel(i++, "%s %s", 13283, SYSTEM_OS_VERSION_INFO); - SetControlLabel(i++, "%s: %s", 12390, SYSTEM_UPTIME); - SetControlLabel(i++, "%s: %s", 12394, SYSTEM_TOTALUPTIME); -- SetControlLabel(i++, "%s: %s", 12395, SYSTEM_BATTERY_LEVEL); + SetControlLabel(i++, "{} {}", 13283, SYSTEM_OS_VERSION_INFO); + SetControlLabel(i++, "{}: {}", 12390, SYSTEM_UPTIME); + SetControlLabel(i++, "{}: {}", 12394, SYSTEM_TOTALUPTIME); +- SetControlLabel(i++, "{}: {}", 12395, SYSTEM_BATTERY_LEVEL); } else if (m_section == CONTROL_BT_STORAGE) diff --git a/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch b/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch index c7ec60588a..c78fad3f0e 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.30-addons-refresh-etc-environment.patch @@ -9,7 +9,7 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp -@@ -445,6 +445,9 @@ void OnPostInstall(const AddonPtr& addon +@@ -450,6 +450,9 @@ void OnPostInstall(const AddonPtr& addon // OE addon->OnPostInstall(update, modal); @@ -19,7 +19,7 @@ Subject: [PATCH] refresh /etc/environment on install and uninstall } void OnPreUnInstall(const AddonPtr& addon) -@@ -457,6 +460,9 @@ void OnPreUnInstall(const AddonPtr& addo +@@ -462,6 +465,9 @@ void OnPreUnInstall(const AddonPtr& addo void OnPostUnInstall(const AddonPtr& addon) { addon->OnPostUnInstall(); diff --git a/packages/mediacenter/kodi/patches/kodi-100.31.le-addons-no-startupenable.patch b/packages/mediacenter/kodi/patches/kodi-100.31.le-addons-no-startupenable.patch index af2190300c..8e0837f4d0 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.31.le-addons-no-startupenable.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.31.le-addons-no-startupenable.patch @@ -10,18 +10,13 @@ https://github.com/xbmc/xbmc/pull/19091 xbmc/platform/linux/PlatformLinux.h | 1 - 1 file changed, 1 deletion(-) -diff --git a/xbmc/platform/linux/PlatformLinux.h b/xbmc/platform/linux/PlatformLinux.h -index c45d41143a..9a872a5f55 100644 --- a/xbmc/platform/linux/PlatformLinux.h +++ b/xbmc/platform/linux/PlatformLinux.h @@ -21,7 +21,6 @@ public: ~CPlatformLinux() override = default; - bool Init() override; + bool InitStageOne() override; - bool IsConfigureAddonsAtStartupEnabled() override { return true; }; private: std::unique_ptr m_lirc; --- -2.31.1 -