From fdd6fe927b8f2d99dbd0a5f5c58b92430d20e1be Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Wed, 27 Jul 2022 17:10:37 +0200 Subject: [PATCH] package/domoticz: selects minizip-zlib Selects minizip-zlib and so drop git submodules Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- package/domoticz/Config.in | 1 + package/domoticz/domoticz.hash | 2 +- package/domoticz/domoticz.mk | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in index 4324d13cee..85361eecf0 100644 --- a/package/domoticz/Config.in +++ b/package/domoticz/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_DOMOTICZ select BR2_PACKAGE_FMT select BR2_PACKAGE_JSONCPP select BR2_PACKAGE_LIBCURL + select BR2_PACKAGE_MINIZIP_ZLIB select BR2_PACKAGE_MOSQUITTO select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_SQLITE diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash index 18bf57b7e0..9de241015c 100644 --- a/package/domoticz/domoticz.hash +++ b/package/domoticz/domoticz.hash @@ -1,3 +1,3 @@ # Locally computed: -sha256 b7faf959c4f1dbfec3b0c17ab495f29b3d1437bc2251579c5252be82247e7ff9 domoticz-2022.1-br1.tar.gz +sha256 8282cb71c924b6ef92503976d50f966f2c785eab8f8cffa1136ac133f0241157 domoticz-2022.1.tar.gz sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 License.txt diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk index 5edc10e8d8..f21c52d432 100644 --- a/package/domoticz/domoticz.mk +++ b/package/domoticz/domoticz.mk @@ -5,9 +5,7 @@ ################################################################################ DOMOTICZ_VERSION = 2022.1 -DOMOTICZ_SITE = https://github.com/domoticz/domoticz -DOMOTICZ_SITE_METHOD = git -DOMOTICZ_GIT_SUBMODULES = YES +DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION)) DOMOTICZ_LICENSE = GPL-3.0 DOMOTICZ_LICENSE_FILES = License.txt DOMOTICZ_CPE_ID_VENDOR = domoticz @@ -19,6 +17,7 @@ DOMOTICZ_DEPENDENCIES = \ jsoncpp \ libcurl \ lua \ + minizip \ mosquitto \ openssl \ sqlite \ @@ -34,10 +33,11 @@ DOMOTICZ_CONF_OPTS += \ -DUSE_OPENSSL_STATIC=OFF # Do not use any built-in libraries which are enabled by default for -# jsoncpp, fmt, sqlite and mqtt +# jsoncpp, fmt, minizip, sqlite and mqtt DOMOTICZ_CONF_OPTS += \ -DUSE_BUILTIN_JSONCPP=OFF \ -DUSE_BUILTIN_LIBFMT=OFF \ + -DUSE_BUILTIN_MINIZIP=OFF \ -DUSE_BUILTIN_SQLITE=OFF \ -DUSE_BUILTIN_MQTT=OFF