Skip to contentSkip to conversation

package/kodi-pvr-zattoo: fix json dependency

PATCH New Bernd Kuhls 3 participants 3 messages Jan 15, 2021 – Jan 18, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/kodi-pvr-zattoo: fix json dependency

Package depends on rapidjson, not rapidxml:
https://github.com/rbuehlma/pvr.zattoo/blob/Leia/CMakeLists.txt#L10

The bug was previously not noticed because kodi depends on rapidjson
https://github.com/xbmc/xbmc/blob/Leia/CMakeLists.txt#L133
and kodi-platform depends on kodi
https://github.com/xbmc/kodi-platform/blob/master/CMakeLists.txt#L8

---
 package/kodi-pvr-zattoo/Config.in          | 2 +-
 package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/kodi-pvr-zattoo/Config.in +1 -1
index ab7ff70034..5dfadcadd1 100644
@@ -2,7 +2,7 @@ config BR2_PACKAGE_KODI_PVR_ZATTOO
 	bool "kodi-pvr-zattoo"
 	select BR2_PACKAGE_KODI_PLATFORM
 	select BR2_PACKAGE_LIBPLATFORM
-	select BR2_PACKAGE_RAPIDXML
+	select BR2_PACKAGE_RAPIDJSON
 	select BR2_PACKAGE_TINYXML2
 	help
 	  Kodi PVR-Addon for Zattoo
package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk +1 -1
index 7afe92e87c..78fc01f195 100644
@@ -8,6 +8,6 @@ KODI_PVR_ZATTOO_VERSION = 18.1.21-Leia
 KODI_PVR_ZATTOO_SITE = $(call github,rbuehlma,pvr.zattoo,$(KODI_PVR_ZATTOO_VERSION))
 KODI_PVR_ZATTOO_LICENSE = GPL-2.0+
 KODI_PVR_ZATTOO_LICENSE_FILES = debian/copyright
-KODI_PVR_ZATTOO_DEPENDENCIES = kodi-platform libplatform rapidxml tinyxml2
+KODI_PVR_ZATTOO_DEPENDENCIES = kodi-platform libplatform rapidjson tinyxml2
 
 $(eval $(cmake-package))
Signature · 1 line
2.29.2
#1 lore raw

PATCH 1/1 package/kodi-pvr-zattoo: fix json dependency

Quoted 8 lines · On Fri, 15 Jan 2021 19:15:29 +0100 Bernd Kuhls <[email protected]> wrote:

Package depends on rapidjson, not rapidxml:
https://github.com/rbuehlma/pvr.zattoo/blob/Leia/CMakeLists.txt#L10

The bug was previously not noticed because kodi depends on rapidjson
https://github.com/xbmc/xbmc/blob/Leia/CMakeLists.txt#L133
and kodi-platform depends on kodi
https://github.com/xbmc/kodi-platform/blob/master/CMakeLists.txt#L8

Quoted 5 lines
---
 package/kodi-pvr-zattoo/Config.in          | 2 +-
 package/kodi-pvr-zattoo/kodi-pvr-zattoo.mk | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 package/kodi-pvr-zattoo: fix json dependency

In reply to Bernd Kuhls
Quoted 11 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Package depends on rapidjson, not rapidxml:
https://github.com/rbuehlma/pvr.zattoo/blob/Leia/CMakeLists.txt#L10

The bug was previously not noticed because kodi depends on rapidjson
https://github.com/xbmc/xbmc/blob/Leia/CMakeLists.txt#L133
and kodi-platform depends on kodi
https://github.com/xbmc/kodi-platform/blob/master/CMakeLists.txt#L8

Committed to 2020.11.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard