From 624e7400e6ad6fef5d7869816a11aed019aba594 Mon Sep 17 00:00:00 2001 From: CvH Date: Sat, 3 Oct 2020 10:26:28 +0200 Subject: [PATCH] kodi: update to ce12328 --- packages/mediacenter/kodi/package.mk | 4 ++-- .../patches/kodi-100.03-disable-online-check.patch | 4 ++-- ....09-use-a-wrapper-to-setup-service-addons.patch | 10 +++++----- .../kodi/patches/kodi-100.10-handle-SIGTERM.patch | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 7a3e37682f..083989659b 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="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" 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 c84f1010eb..35bbf729d5 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 @@ -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}, 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 5b38da93de..76f61360c2 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 @@ -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()) 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 6c4144ff77..518803bd0f 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.10-handle-SIGTERM.patch @@ -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");