mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-31 06:36:41 +00:00
kodi (Generic): update to kodi-18.0rc4-Leia
This commit is contained in:
parent
52f582cdf0
commit
0d10ab4541
@ -24,8 +24,8 @@ case $KODI_VENDOR in
|
|||||||
PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
|
PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
PKG_VERSION="18.0rc3-Leia"
|
PKG_VERSION="18.0rc4-Leia"
|
||||||
PKG_SHA256="72918ccc63a6bc387b4ebd8796be55f0962bce093e845cdee3aacc8e8649587b"
|
PKG_SHA256="90f7a8c32e571654d2503a4e97e438b597ff19ae7876e926aaa06b8de516b72b"
|
||||||
PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
|
PKG_URL="https://github.com/xbmc/xbmc/archive/$PKG_VERSION.tar.gz"
|
||||||
PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz"
|
PKG_SOURCE_NAME="kodi-$PKG_VERSION.tar.gz"
|
||||||
;;
|
;;
|
||||||
|
@ -1,32 +0,0 @@
|
|||||||
diff --git a/xbmc/addons/AddonManager.cpp b/xbmc/addons/AddonManager.cpp
|
|
||||||
index ef662d3..fe97b1f 100644
|
|
||||||
--- a/xbmc/addons/AddonManager.cpp
|
|
||||||
+++ b/xbmc/addons/AddonManager.cpp
|
|
||||||
@@ -14,6 +14,7 @@
|
|
||||||
#include "events/EventLog.h"
|
|
||||||
#include "events/NotificationEvent.h"
|
|
||||||
#include "filesystem/File.h"
|
|
||||||
+#include "filesystem/Directory.h"
|
|
||||||
#include "filesystem/SpecialProtocol.h"
|
|
||||||
#include "utils/log.h"
|
|
||||||
#include "utils/StringUtils.h"
|
|
||||||
@@ -1259,7 +1260,8 @@ bool CAddonMgr::IsCompatible(const IAddon& addon)
|
|
||||||
// Intentionally only check the xbmc.* and kodi.* magic dependencies. Everything else will
|
|
||||||
// not be missing anyway, unless addon was installed in an unsupported way.
|
|
||||||
if (StringUtils::StartsWith(dependency.id, "xbmc.") ||
|
|
||||||
- StringUtils::StartsWith(dependency.id, "kodi."))
|
|
||||||
+ StringUtils::StartsWith(dependency.id, "kodi.") ||
|
|
||||||
+ CDirectory::Exists("/usr/share/kodi/addons/" + dependency.id))
|
|
||||||
{
|
|
||||||
AddonPtr addon;
|
|
||||||
bool haveAddon = GetAddon(dependency.id, addon);
|
|
||||||
@@ -1287,7 +1289,8 @@ std::vector<DependencyInfo> CAddonMgr::GetDepsRecursive(const std::string& id)
|
|
||||||
auto current_dep = *toProcess.begin();
|
|
||||||
toProcess.erase(toProcess.begin());
|
|
||||||
if (StringUtils::StartsWith(current_dep.id, "xbmc.") ||
|
|
||||||
- StringUtils::StartsWith(current_dep.id, "kodi."))
|
|
||||||
+ StringUtils::StartsWith(current_dep.id, "kodi.") ||
|
|
||||||
+ CDirectory::Exists("/usr/share/kodi/addons/" + current_dep.id))
|
|
||||||
continue;
|
|
||||||
|
|
||||||
auto added_it = std::find_if(added.begin(), added.end(), [&](const DependencyInfo& d){ return d.id == current_dep.id;});
|
|
Loading…
x
Reference in New Issue
Block a user