From ca90753f82e2e5d95f8ed39c5c10806e93af97c9 Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Tue, 14 Mar 2017 12:00:03 -0700 Subject: [PATCH] kodi: update to 93e9d69 --- packages/mediacenter/kodi/package.mk | 3 +-- ...-a-wrapper-to-setup-systemd-services.patch | 26 ++++++++++++------- .../kodi/patches/kodi-999.99-PR11662.patch | 22 ---------------- 3 files changed, 17 insertions(+), 34 deletions(-) delete mode 100644 packages/mediacenter/kodi/patches/kodi-999.99-PR11662.patch diff --git a/packages/mediacenter/kodi/package.mk b/packages/mediacenter/kodi/package.mk index 9a148f5532..d609e8eef8 100644 --- a/packages/mediacenter/kodi/package.mk +++ b/packages/mediacenter/kodi/package.mk @@ -17,7 +17,7 @@ ################################################################################ PKG_NAME="kodi" -PKG_VERSION="4c792db" +PKG_VERSION="93e9d69" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" @@ -246,7 +246,6 @@ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \ pre_configure_target() { # kodi should never be built with lto strip_lto - strip_gold export LIBS="$LIBS -lz -lterminfo" } diff --git a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch index db7e1c1695..e3685cdd73 100644 --- a/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch +++ b/packages/mediacenter/kodi/patches/kodi-100.09-use-a-wrapper-to-setup-systemd-services.patch @@ -1,8 +1,14 @@ +commit 07c96988b65becae0141d71d40481bcf916bee68 +Author: Stefan Saraev +Date: Sun Dec 18 11:30:39 2016 -0800 + + use a wrapper to setup systemd services + diff --git a/xbmc/addons/Addon.cpp b/xbmc/addons/Addon.cpp -index 476ab29..ec5faa5 100644 +index 8f62079..a54682a 100644 --- a/xbmc/addons/Addon.cpp +++ b/xbmc/addons/Addon.cpp -@@ -340,6 +340,13 @@ AddonVersion CAddon::GetDependencyVersion(const std::string &dependencyID) const +@@ -348,6 +348,13 @@ AddonVersion CAddon::GetDependencyVersion(const std::string &dependencyID) const return AddonVersion("0.0.0"); } @@ -16,7 +22,7 @@ index 476ab29..ec5faa5 100644 void OnEnabled(const std::string& id) { // If the addon is a special, call enabled handler -@@ -348,6 +355,11 @@ void OnEnabled(const std::string& id) +@@ -356,6 +363,11 @@ void OnEnabled(const std::string& id) CAddonMgr::GetInstance().GetAddon(id, addon, ADDON_ADSPDLL)) return addon->OnEnabled(); @@ -28,19 +34,19 @@ index 476ab29..ec5faa5 100644 if (CAddonMgr::GetInstance().ServicesHasStarted()) { if (CAddonMgr::GetInstance().GetAddon(id, addon, ADDON_SERVICE)) -@@ -372,6 +384,11 @@ void OnDisabled(const std::string& id) +@@ -379,6 +391,11 @@ void OnDisabled(const std::string& id) + if (CAddonMgr::GetInstance().GetAddon(id, addon, ADDON_SERVICE, false)) std::static_pointer_cast(addon)->Stop(); } - ++ + // OE: systemctl stop & disable on addon disable + if (CAddonMgr::GetInstance().GetAddon(id, addon, ADDON_SERVICE, false)) + CallOEWrapper(addon->ID(), true); + // OE -+ - if (CAddonMgr::GetInstance().GetAddon(id, addon, ADDON_CONTEXT_ITEM, false)) - CContextMenuManager::GetInstance().Unload(*std::static_pointer_cast(addon)); } -@@ -399,6 +416,15 @@ void OnPreInstall(const AddonPtr& addon) + + void OnPreInstall(const AddonPtr& addon) +@@ -401,6 +418,15 @@ void OnPreInstall(const AddonPtr& addon) void OnPostInstall(const AddonPtr& addon, bool update, bool modal) { AddonPtr localAddon; @@ -56,7 +62,7 @@ index 476ab29..ec5faa5 100644 if (CAddonMgr::GetInstance().ServicesHasStarted()) { if (CAddonMgr::GetInstance().GetAddon(addon->ID(), localAddon, ADDON_SERVICE)) -@@ -415,6 +441,11 @@ void OnPreUnInstall(const AddonPtr& addon) +@@ -439,6 +465,11 @@ void OnPreUnInstall(const AddonPtr& addon) { AddonPtr localAddon; diff --git a/packages/mediacenter/kodi/patches/kodi-999.99-PR11662.patch b/packages/mediacenter/kodi/patches/kodi-999.99-PR11662.patch deleted file mode 100644 index e9fdb7190b..0000000000 --- a/packages/mediacenter/kodi/patches/kodi-999.99-PR11662.patch +++ /dev/null @@ -1,22 +0,0 @@ -From f907adcd658a00031f88f1c0de817672cb51b57c Mon Sep 17 00:00:00 2001 -From: Jonas Karlman -Date: Sun, 12 Feb 2017 16:31:29 +0100 -Subject: [PATCH] [settings] change allowed remotedelay range to inlcude zero - ---- - xbmc/settings/AdvancedSettings.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/xbmc/settings/AdvancedSettings.cpp b/xbmc/settings/AdvancedSettings.cpp -index 1c87d8c..b817f94 100644 ---- a/xbmc/settings/AdvancedSettings.cpp -+++ b/xbmc/settings/AdvancedSettings.cpp -@@ -1011,7 +1011,7 @@ void CAdvancedSettings::ParseSettingsFile(const std::string &file) - } - } - -- XMLUtils::GetInt(pRootElement, "remotedelay", m_remoteDelay, 1, 20); -+ XMLUtils::GetInt(pRootElement, "remotedelay", m_remoteDelay, 0, 20); - XMLUtils::GetFloat(pRootElement, "controllerdeadzone", m_controllerDeadzone, 0.0f, 1.0f); - XMLUtils::GetUInt(pRootElement, "fanartres", m_fanartRes, 0, 1080); - XMLUtils::GetUInt(pRootElement, "imageres", m_imageRes, 0, 1080);