diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 0e1fa55fd6..26b662e482 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="339dd24a8c0e02fd91e59fa9f625eb1a76dbb212" -PKG_SHA256="ffb6984864a0755ea1a3f4d61451911209a7691a8aaffcda455ee38cadceb07a" +PKG_VERSION="1cd618c9cfc9a6c57474959a77ae6a8db3013259" +PKG_SHA256="043f8b74d2a39f536855d9c2a1439e3eeecd25ca0038acbf03065d911d254599" 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-001-pr18378-support-libplist-2.2.0.patch b/packages/mediacenter/kodi/patches/kodi-001-pr18378-support-libplist-2.2.0.patch deleted file mode 100644 index 91af47e41b..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-001-pr18378-support-libplist-2.2.0.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 22ab58e8f958980c070a46cabe197b3557dda0a3 Mon Sep 17 00:00:00 2001 -From: Matthias Reichl -Date: Sun, 6 Sep 2020 23:50:53 +0200 -Subject: [PATCH] [cmake] support libplist version 2.2.0 - -libplist 2.2.0 changed the pkgconfig and library names from -libplist(++) to libplist(++)-2.0. Add these names to cmake pkgconfig -and library lists so cmake can pick up external 2.2 versions as well. - -Signed-off-by: Matthias Reichl ---- - cmake/modules/FindPlist.cmake | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cmake/modules/FindPlist.cmake b/cmake/modules/FindPlist.cmake -index 2c86b7493a..8f9b2d6cd7 100644 ---- a/cmake/modules/FindPlist.cmake -+++ b/cmake/modules/FindPlist.cmake -@@ -15,7 +15,7 @@ - # Plist::Plist - The Plist library - - if(PKG_CONFIG_FOUND) -- pkg_check_modules(PC_PLIST libplist QUIET) -+ pkg_search_module(PC_PLIST libplist-2.0 libplist QUIET) - endif() - - find_path(PLIST_INCLUDE_DIR plist/plist.h -@@ -23,7 +23,7 @@ find_path(PLIST_INCLUDE_DIR plist/plist.h - - set(PLIST_VERSION ${PC_PLIST_VERSION}) - --find_library(PLIST_LIBRARY NAMES plist libplist -+find_library(PLIST_LIBRARY NAMES plist-2.0 plist libplist-2.0 libplist - PATHS ${PC_PLIST_LIBDIR}) - - include(FindPackageHandleStandardArgs) --- -2.20.1 - 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 eeadb4ddff..c84f1010eb 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 @@ -5,7 +5,7 @@ diff --git a/xbmc/GUIInfoManager.cpp b/xbmc/GUIInfoManager.cpp index 1d112c4dd218..eaff4ee12d3f 100644 --- a/xbmc/GUIInfoManager.cpp +++ b/xbmc/GUIInfoManager.cpp -@@ -1710,7 +1710,6 @@ const infomap system_labels[] = {{"hasnetwork", SYSTEM_ETHERNET_LINK_ACTIVE}, +@@ -1702,7 +1702,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.07-disable-minimize.patch b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch index 3596a59ad7..0d151c1362 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.07-disable-minimize.patch @@ -11,7 +11,7 @@ diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp index a6f6119b81..adf77074e0 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -4695,7 +4695,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */) +@@ -4692,7 +4692,6 @@ bool CApplication::SwitchToFullScreen(bool force /* = false */) void CApplication::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 42e516cfa9..5b38da93de 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 f9a133474c..f4f7906765 100644 +index 8150789b8f..49a84033e8 100644 --- a/xbmc/addons/AddonManager.cpp +++ b/xbmc/addons/AddonManager.cpp -@@ -735,6 +735,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled +@@ -733,6 +733,7 @@ bool CAddonMgr::DisableAddon(const std::string& id, AddonDisabledReason disabled AddonPtr addon; if (GetAddon(id, addon, ADDON_UNKNOWN, false) && addon != NULL) { @@ -91,7 +91,7 @@ index f9a133474c..f4f7906765 100644 CServiceBroker::GetEventLog().Add(EventPtr(new CAddonManagementEvent(addon, 24141))); } -@@ -763,6 +764,7 @@ bool CAddonMgr::EnableSingle(const std::string& id) +@@ -761,6 +762,7 @@ bool CAddonMgr::EnableSingle(const std::string& id) 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 20ad62ccb4..6c4144ff77 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 a6f6119b81..6b24f6bfe9 100644 +index cb164168bd..d57f4791ef 100644 --- a/xbmc/Application.cpp +++ b/xbmc/Application.cpp -@@ -2073,12 +2073,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -2069,12 +2069,12 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) switch (msg) { case TMSG_POWERDOWN: @@ -41,7 +41,7 @@ index a6f6119b81..6b24f6bfe9 100644 break; case TMSG_SHUTDOWN: -@@ -2099,12 +2099,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) +@@ -2095,12 +2095,13 @@ void CApplication::OnApplicationMessage(ThreadMessage* pMsg) case TMSG_RESTART: case TMSG_RESET: @@ -56,7 +56,7 @@ index a6f6119b81..6b24f6bfe9 100644 Stop(EXITCODE_RESTARTAPP); #endif break; -@@ -2582,6 +2583,17 @@ bool CApplication::Cleanup() +@@ -2579,6 +2580,17 @@ bool CApplication::Cleanup() } } @@ -74,7 +74,7 @@ index a6f6119b81..6b24f6bfe9 100644 void CApplication::Stop(int exitCode) { CLog::Log(LOGINFO, "Stopping player"); -@@ -2608,7 +2620,7 @@ void CApplication::Stop(int exitCode) +@@ -2605,7 +2617,7 @@ void CApplication::Stop(int exitCode) m_frameMoveGuard.unlock(); CVariant vExitCode(CVariant::VariantTypeObject); @@ -83,7 +83,7 @@ index a6f6119b81..6b24f6bfe9 100644 CServiceBroker::GetAnnouncementManager()->Announce(ANNOUNCEMENT::System, "xbmc", "OnQuit", vExitCode); // Abort any active screensaver -@@ -2640,7 +2652,6 @@ void CApplication::Stop(int exitCode) +@@ -2637,7 +2649,6 @@ void CApplication::Stop(int exitCode) // Needs cleaning up CApplicationMessenger::GetInstance().Stop(); m_AppFocused = false; @@ -91,7 +91,7 @@ index a6f6119b81..6b24f6bfe9 100644 CLog::Log(LOGINFO, "Stopping all"); // cancel any jobs from the jobmanager -@@ -4225,7 +4236,7 @@ void CApplication::ProcessSlow() +@@ -4222,7 +4233,7 @@ void CApplication::ProcessSlow() if (CPlatformPosix::TestQuitFlag()) { CLog::Log(LOGINFO, "Quitting due to POSIX signal");