From f821c4bd433faf8dfbe70b51ff1b822270023041 Mon Sep 17 00:00:00 2001 From: CvH Date: Thu, 7 Oct 2021 13:02:23 +0200 Subject: [PATCH 1/2] distro: bump ADDON_VERSION to 10.80.2 --- distributions/LibreELEC/version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distributions/LibreELEC/version b/distributions/LibreELEC/version index 652bf41447..df30ce8029 100644 --- a/distributions/LibreELEC/version +++ b/distributions/LibreELEC/version @@ -5,4 +5,4 @@ OS_VERSION="11.0" # ADDON_VERSION: Addon version - ADDON_VERSION="10.80.1" + ADDON_VERSION="10.80.2" From f82846ecd0b1df4703bf6ff1e1c56f3e0e146012 Mon Sep 17 00:00:00 2001 From: CvH Date: Thu, 7 Oct 2021 13:08:42 +0200 Subject: [PATCH 2/2] kodi: update to 8ea70bc --- packages/mediacenter/kodi/package.mk | 4 ++-- ...di-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch | 2 +- .../kodi/patches/kodi-100.07-disable-minimize.patch | 2 +- ...00.09-use-a-wrapper-to-setup-service-addons.patch | 4 ++-- .../kodi/patches/kodi-100.10-handle-SIGTERM.patch | 12 ++++++------ .../kodi-100.31.le-addons-no-startupenable.patch | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 8de7076e55..2cb9c75ac3 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="3d01768da145e67708ed378dfc36bb4b61a81624" -PKG_SHA256="fcc2ac30f62b55bf36fb5edf9026cdd4b1af2aaecd17accc0500705850de0cc3" +PKG_VERSION="8ea70bc886aff2d6e4ddcd6ae1b651a57debb8f8" +PKG_SHA256="56d2611afef27272b4db1af042c0fdc995ed0ddd2dc90c6936a1bc7606cbb893" 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.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch b/packages/mediacenter/kodi/patches/kodi-100.06-dont-set-_NET_WM_STATE_FULLSCREEN.patch index 5e172f6e97..3adf2b49c1 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 -@@ -756,8 +756,6 @@ bool CWinSystemX11::SetWindow(int width, +@@ -759,8 +759,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 8ae0d5c8e0..9dcb9ca9af 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 -@@ -2055,7 +2055,6 @@ void CApplication::OnApplicationMessage( +@@ -2053,7 +2053,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 2ac3fcdb5b..ce7d8ec9fd 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 @@ -76,7 +76,7 @@ public: --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp -@@ -795,6 +795,7 @@ bool CAddonMgr::DisableAddon(const std:: +@@ -829,6 +829,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))); } -@@ -840,6 +841,7 @@ bool CAddonMgr::EnableSingle(const std:: +@@ -874,6 +875,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 add99dd3c8..3574b3219f 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 -@@ -1935,12 +1935,12 @@ void CApplication::OnApplicationMessage( +@@ -1933,12 +1933,12 @@ void CApplication::OnApplicationMessage( switch (msg) { case TMSG_POWERDOWN: @@ -39,7 +39,7 @@ so, when shutdown/reboot is requested: break; case TMSG_SHUTDOWN: -@@ -1961,12 +1961,13 @@ void CApplication::OnApplicationMessage( +@@ -1959,12 +1959,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; -@@ -2456,6 +2457,17 @@ bool CApplication::Cleanup() +@@ -2454,6 +2455,17 @@ bool CApplication::Cleanup() } } @@ -72,7 +72,7 @@ so, when shutdown/reboot is requested: void CApplication::Stop(int exitCode) { CLog::Log(LOGINFO, "Stopping player"); -@@ -2482,7 +2494,7 @@ void CApplication::Stop(int exitCode) +@@ -2480,7 +2492,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 -@@ -2514,7 +2526,6 @@ void CApplication::Stop(int exitCode) +@@ -2512,7 +2524,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 -@@ -4157,7 +4168,7 @@ void CApplication::ProcessSlow() +@@ -4155,7 +4166,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal"); 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 8e0837f4d0..8995fd0c2c 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 @@ -16,7 +16,7 @@ https://github.com/xbmc/xbmc/pull/19091 ~CPlatformLinux() override = default; bool InitStageOne() override; -- bool IsConfigureAddonsAtStartupEnabled() override { return true; }; +- bool IsConfigureAddonsAtStartupEnabled() override { return true; } private: std::unique_ptr m_lirc;