From 4a5ddf720218db0cab4b9c68464b14654943d086 Mon Sep 17 00:00:00 2001 From: David Woodhouse Date: Wed, 3 Jun 2020 14:41:46 +0100 Subject: [PATCH] domoticz: Fix libmosquitto dependency, use dynamic libjsoncpp. Domoticz doesn't use libmosquittopp any more as it was deprecated. It has its own copy. It can also use the system libjsoncpp, so do that too. Signed-off-by: David Woodhouse --- utils/domoticz/Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/utils/domoticz/Makefile b/utils/domoticz/Makefile index 5bb61088f6..ac3955413f 100644 --- a/utils/domoticz/Makefile +++ b/utils/domoticz/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=domoticz PKG_VERSION:=2020.1 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/domoticz/domoticz/archive/$(PKG_VERSION)/$(PKG_SOURCE) @@ -39,8 +39,9 @@ define Package/domoticz +boost-date_time \ +boost-system \ +boost-thread \ + +jsoncpp \ +libcurl \ - +libmosquittopp \ + +libmosquitto \ +libopenssl \ +libopenzwave \ +libsqlite3 \ @@ -59,6 +60,7 @@ CMAKE_OPTIONS += \ -DCMAKE_BUILD_TYPE=Release \ -DUSE_BUILTIN_MQTT=no \ -DUSE_BUILTIN_SQLITE=no \ + -DUSE_BUILTIN_JSONCPP=no \ -DUSE_STATIC_BOOST=no \ -DUSE_STATIC_LIBSTDCXX=no \ -DUSE_STATIC_OPENZWAVE=no \ -- 2.30.2