Merge pull request #1443 from lrusak/kodi-18

kodi: update to 93e9d69
This commit is contained in:
MilhouseVH 2017-03-14 19:03:08 +00:00 committed by GitHub
commit 8f5dd9c58d
3 changed files with 17 additions and 33 deletions

View File

@ -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"

View File

@ -1,8 +1,14 @@
commit 07c96988b65becae0141d71d40481bcf916bee68
Author: Stefan Saraev <stefan@saraev.ca>
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<CService>(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<CContextMenuAddon>(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;

View File

@ -1,22 +0,0 @@
From f907adcd658a00031f88f1c0de817672cb51b57c Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
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);