Merge pull request #3195 from MilhouseVH/le90_kodi-next002

kodi (RPi/Generic/Rockchip): update to kodi-18.0rc4-Leia
This commit is contained in:
CvH 2018-12-29 09:12:30 +01:00 committed by GitHub
commit 7c871329b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 16 additions and 48 deletions

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="libcec" PKG_NAME="libcec"
PKG_VERSION="f7593243377687c84c27b4e0342b00bb2ef2efbc" PKG_VERSION="libcec-4.0.4"
PKG_SHA256="43c21276ce39f8bed9deda319d682699af9aa9d3f869d8a5167dc825f3a99dbb" PKG_SHA256="4382a964bf8c511c22c03cdab5ba2d81c241536e6479072a61516966804f400a"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"
PKG_SITE="http://libcec.pulse-eight.com/" PKG_SITE="http://libcec.pulse-eight.com/"
PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz" PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_VERSION.tar.gz"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.nextpvr" PKG_NAME="pvr.nextpvr"
PKG_VERSION="450caebdfb508aaed8ff342413acf9466b0380b8" PKG_VERSION="42a9a4b8ee9c0cfb94ad0d68dc23f816c4b8ec18"
PKG_SHA256="44a274749affc902c58ad24a2c04e9e6daf750e81741fb60ededbd9cf409df37" PKG_SHA256="caa7203a1e6d986d1526692594c582346852f615d70e12badd64946dbacc933b"
PKG_REV="2" PKG_REV="2"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.teleboy" PKG_NAME="pvr.teleboy"
PKG_VERSION="50689bdb04ea081ee38383de35edc62489694910" PKG_VERSION="1956113e4ec824ab930bd237ca8a6e662b18c19a"
PKG_SHA256="5dedc34c1521e641b356d6cee5e471059e757f952ab0c1b400cf2e58910a4697" PKG_SHA256="49ed188aabaff018e0624af4c242691f81591006624dde3a3ae8457bdbaaddf4"
PKG_REV="1" PKG_REV="1"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -3,8 +3,8 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.vuplus" PKG_NAME="pvr.vuplus"
PKG_VERSION="5741f242d6519a21e3b352d78937dd9b535b4833" PKG_VERSION="ec29899c002373c1220c90728b0f1bd40280f48f"
PKG_SHA256="5cad2a8017d6cf2deca147a187f23e160887b4733e7c038fd6c3e4b4611be75f" PKG_SHA256="9b956742f24605ca535cca4341734b5a9a39abd58b119f6e1ed454ce5a49de47"
PKG_REV="2" PKG_REV="2"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -2,8 +2,8 @@
# Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv) # Copyright (C) 2017-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="pvr.zattoo" PKG_NAME="pvr.zattoo"
PKG_VERSION="4688f458525d752074cf1441facf4da8bdd8d0ee" PKG_VERSION="d44651f4c8d7b356c7cbec5738f8eed09522d2e2"
PKG_SHA256="642238a47f58006b835cb6c8a8b3d926ea20694ec78d3931f70c9e76b23b5617" PKG_SHA256="7db4a946230c652833468ec2c6fe3fdc9f53035959e224e316fe76b2a3e6d10d"
PKG_REV="2" PKG_REV="2"
PKG_ARCH="any" PKG_ARCH="any"
PKG_LICENSE="GPL" PKG_LICENSE="GPL"

View File

@ -12,20 +12,20 @@ PKG_PATCH_DIRS="$KODI_VENDOR"
case $KODI_VENDOR in case $KODI_VENDOR in
raspberrypi) raspberrypi)
PKG_VERSION="newclock5_18.0rc3-Leia" PKG_VERSION="newclock5_18.0rc4-Leia"
PKG_SHA256="5f98caff0908ae44ccf2262f87ead695cd2c8915f0ed5cd44fdbdc0598f70d6a" PKG_SHA256="d4151ff73ab7790764100bf1b47908419bed9b04e1eb00f2e0480f95827b50b2"
PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz" PKG_URL="https://github.com/popcornmix/xbmc/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz" PKG_SOURCE_NAME="kodi-$KODI_VENDOR-$PKG_VERSION.tar.gz"
;; ;;
rockchip) rockchip)
PKG_VERSION="rockchip_18.0rc3-Leia" PKG_VERSION="rockchip_18.0rc4-Leia"
PKG_SHA256="1bf6d98f3f299d214901424182a40b2914cd8eb6e76f6aa9c53c14311f89f6e8" PKG_SHA256="1c5ee8235319e957f5c7e2c5d601ee6816e7a710318fbd047201f02e9f0acbc6"
PKG_URL="https://github.com/kwiboo/xbmc/archive/$PKG_VERSION.tar.gz" PKG_URL="https://github.com/kwiboo/xbmc/archive/$PKG_VERSION.tar.gz"
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"
;; ;;

View File

@ -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;});