From be55d05d5ed3ff6ce6b03625cdd26aac5acff319 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 26 Sep 2021 15:21:19 +0200 Subject: [PATCH] package/kodi-pvr-octonet: fix json dependency While creating the initial package file a wrong dependency was chosen. This package really depends on jsoncpp, not json-for-modern-cpp: https://github.com/DigitalDevices/pvr.octonet/commit/f724c5934c63c64a0085c3dbe4cd3c3fc58f1318 This bug was found while testing per-package directories. Signed-off-by: Bernd Kuhls (cherry picked from commit 2d8e45289531fda33d1a157dffc60b758d6a8377) Signed-off-by: Peter Korsgaard --- package/kodi-pvr-octonet/Config.in | 8 ++++---- package/kodi-pvr-octonet/kodi-pvr-octonet.mk | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package/kodi-pvr-octonet/Config.in b/package/kodi-pvr-octonet/Config.in index e831194ba5..7b46cccb2a 100644 --- a/package/kodi-pvr-octonet/Config.in +++ b/package/kodi-pvr-octonet/Config.in @@ -1,11 +1,11 @@ config BR2_PACKAGE_KODI_PVR_OCTONET bool "kodi-pvr-octonet" - depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 # json-for-modern-cpp - select BR2_PACKAGE_JSON_FOR_MODERN_CPP + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # jsoncpp + select BR2_PACKAGE_JSONCPP help DigitalDevices Octonet PVR client addon for Kodi https://github.com/DigitalDevices/pvr.octonet -comment "kodi-pvr-octonet needs a toolchain w/ gcc >= 4.9" - depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_9 +comment "kodi-pvr-octonet needs a toolchain w/ gcc >= 4.7" + depends on !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 diff --git a/package/kodi-pvr-octonet/kodi-pvr-octonet.mk b/package/kodi-pvr-octonet/kodi-pvr-octonet.mk index becd43a4e4..76366eb540 100644 --- a/package/kodi-pvr-octonet/kodi-pvr-octonet.mk +++ b/package/kodi-pvr-octonet/kodi-pvr-octonet.mk @@ -8,6 +8,6 @@ KODI_PVR_OCTONET_VERSION = 4.1.0-2-Matrix KODI_PVR_OCTONET_SITE = $(call github,DigitalDevices,pvr.octonet,$(KODI_PVR_OCTONET_VERSION)) KODI_PVR_OCTONET_LICENSE = GPL-2.0+ KODI_PVR_OCTONET_LICENSE_FILES = LICENSE.md -KODI_PVR_OCTONET_DEPENDENCIES = json-for-modern-cpp kodi +KODI_PVR_OCTONET_DEPENDENCIES = jsoncpp kodi $(eval $(cmake-package))