domoticz: Fix libmosquitto dependency, use dynamic libjsoncpp.
authorDavid Woodhouse <dwmw2@infradead.org>
Wed, 3 Jun 2020 13:41:46 +0000 (14:41 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 6 Jun 2020 18:39:17 +0000 (19:39 +0100)
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 <dwmw2@infradead.org>
utils/domoticz/Makefile

index 5bb61088f6b86c5da5ac8065c9b5d09ab75f2ff9..ac3955413fd168cb52d596b3c268492b48a5fc56 100644 (file)
@@ -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 \