All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/2] package/domoticz: remove configure option needed for CMake < 3.16
@ 2026-10-24 18:21 Bernd Kuhls
  2026-10-24 18:21 ` [Buildroot] [PATCH 2/2] package/domoticz: bump version to 2026.4 Bernd Kuhls
  2026-10-24 21:19 ` [Buildroot] [PATCH 1/2] package/domoticz: remove configure option needed for CMake < 3.16 Thomas Petazzoni via buildroot
  0 siblings, 2 replies; 3+ messages in thread
From: Bernd Kuhls @ 2026-10-24 18:21 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

In 2020 the fix we remove now was committed with buildroot commit
6e6bd863093605419044d6e376185ff3caed9fbe as build fix for cmake < 3.16.

Buildroot commit 53beb8fc1a4f3ba20ea6c856b4ec8506570f17c1 raised the
minimum CMake version to 3.18 in 2023 so this fix is not needed anymore.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
Building unpatched domoticz fails for target
bootlin-aarch64-glibc-old/build/domoticz-2024.4/.stamp_built:
https://gitlab.com/bkuhls/buildroot/-/commits/193b593de0c65a10581abe808368cd736c8f47b1

This patch passes Gitlab pipelines with the same build error
https://gitlab.com/bkuhls/buildroot/-/commits/f2f37f272b02ca379a429832d14abf42a9a39242
so this patch does not introduce new build errors.

 package/domoticz/domoticz.mk | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk
index 95d3335adb..498ca232f4 100644
--- a/package/domoticz/domoticz.mk
+++ b/package/domoticz/domoticz.mk
@@ -22,9 +22,6 @@ DOMOTICZ_DEPENDENCIES = \
 	sqlite \
 	zlib
 
-# Disable precompiled header as it needs cmake >= 3.16
-DOMOTICZ_CONF_OPTS = -DUSE_PRECOMPILED_HEADER=OFF
-
 # Due to the dependency on mosquitto, domoticz depends on
 # !BR2_STATIC_LIBS so set USE_STATIC_BOOST and USE_OPENSSL_STATIC to OFF
 DOMOTICZ_CONF_OPTS += \
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH 2/2] package/domoticz: bump version to 2026.4
  2026-10-24 18:21 [Buildroot] [PATCH 1/2] package/domoticz: remove configure option needed for CMake < 3.16 Bernd Kuhls
@ 2026-10-24 18:21 ` Bernd Kuhls
  2026-10-24 21:19 ` [Buildroot] [PATCH 1/2] package/domoticz: remove configure option needed for CMake < 3.16 Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Bernd Kuhls @ 2026-10-24 18:21 UTC (permalink / raw)
  To: buildroot; +Cc: Fabrice Fontaine

https://github.com/domoticz/domoticz/blob/2026.4/History.txt

Switched to tarball provided by upstream which also includes git
submodule libwebem, it was split from the domoticz tree:
https://github.com/domoticz/domoticz/commit/7de4834e9959e8a9a21a2b82bb7700ea5af6e618

Added new dependency jwt-cpp needed since 2025.1:
https://github.com/domoticz/domoticz/commit/b30d9e9436ad428a2cbfd1fbb273461bdbf50a82

Raised minimum gcc version because libwebem depends on c++17:
https://github.com/domoticz/libwebem/blob/master/README.md

Removed configure option USE_BUILTIN_MQTT due to its upstream removal:
https://github.com/domoticz/domoticz/commit/be95eec094bf524c1ab011eebcd797d3b19b17fc

Link to libatomic to fix a build error

output/per-package/domoticz/host/opt/ext-toolchain/bin/../lib/gcc/arc-buildroot-linux-uclibc/15.3.0/../../../../arc-buildroot-linux-uclibc/bin/ld:
 CMakeFiles/domoticz.dir/hardware/Matter.cpp.o:
 undefined reference to symbol '__atomic_load_8@@LIBATOMIC_1.0'

detected by the Gitlab pipelines which is introduced by upstream
commit
https://github.com/domoticz/domoticz/commit/ec5488a7df963af4b260a92bfecea53edc20b136
that added hardware/Matter.cpp in version 2026.2.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
Series passes Gitlab pipelines:
https://gitlab.com/bkuhls/buildroot/-/commits/dcbbc7e8c57e5b14e279e86daca45624836d0a6f

 package/domoticz/Config.in     |  7 ++++---
 package/domoticz/domoticz.hash |  3 ++-
 package/domoticz/domoticz.mk   | 18 +++++++++++++-----
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/package/domoticz/Config.in b/package/domoticz/Config.in
index a0e69a7601..2af63baecf 100644
--- a/package/domoticz/Config.in
+++ b/package/domoticz/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_DOMOTICZ
 	bool "domoticz"
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS
-	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_6 # C++14
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_7 # C++17
 	# pthread_condattr_setclock
 	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # mosquitto
 	depends on BR2_INSTALL_LIBSTDCPP
@@ -17,6 +17,7 @@ config BR2_PACKAGE_DOMOTICZ
 	select BR2_PACKAGE_BOOST_THREAD
 	select BR2_PACKAGE_CEREAL
 	select BR2_PACKAGE_JSONCPP
+	select BR2_PACKAGE_JWT_CPP
 	select BR2_PACKAGE_LIBCURL
 	select BR2_PACKAGE_MINIZIP_ZLIB
 	select BR2_PACKAGE_MOSQUITTO
@@ -32,11 +33,11 @@ config BR2_PACKAGE_DOMOTICZ
 
 	  http://domoticz.com
 
-comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 6, NPTL, wchar, dynamic library"
+comment "domoticz needs lua 5.3 and a toolchain w/ C++, gcc >= 7, NPTL, wchar, dynamic library"
 	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_SUPPORTS_ALWAYS_LOCKFREE_ATOMIC_INTS
 	depends on !BR2_INSTALL_LIBSTDCPP || \
-		!BR2_TOOLCHAIN_GCC_AT_LEAST_6 || \
+		!BR2_TOOLCHAIN_GCC_AT_LEAST_7 || \
 		!BR2_TOOLCHAIN_HAS_THREADS_NPTL || \
 		!BR2_USE_WCHAR || BR2_STATIC_LIBS || \
 		!BR2_PACKAGE_LUA_5_3
diff --git a/package/domoticz/domoticz.hash b/package/domoticz/domoticz.hash
index ae86a67b79..8f800e00de 100644
--- a/package/domoticz/domoticz.hash
+++ b/package/domoticz/domoticz.hash
@@ -1,3 +1,4 @@
+# From https://github.com/domoticz/domoticz/releases/download/2026.4/domoticz_src_2026.18387.tar.gz.sha256sum
+sha256  88964b791050abf6b6df3ec9e1d262d18e198a6fa108638974eca8600d1a4568  domoticz_src_2026.18387.tar.gz
 # Locally computed:
-sha256  d87113d7cacd0b52b9126fcc1ef24e140a4f7042d5bc6262e86e4b4752f5cf38  domoticz-2024.4.tar.gz
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  License.txt
diff --git a/package/domoticz/domoticz.mk b/package/domoticz/domoticz.mk
index 498ca232f4..db89dd9e94 100644
--- a/package/domoticz/domoticz.mk
+++ b/package/domoticz/domoticz.mk
@@ -4,16 +4,19 @@
 #
 ################################################################################
 
-DOMOTICZ_VERSION = 2024.4
-DOMOTICZ_SITE = $(call github,domoticz,domoticz,$(DOMOTICZ_VERSION))
+DOMOTICZ_VERSION = 2026.4
+DOMOTICZ_SITE = https://github.com/domoticz/domoticz/releases/download/$(DOMOTICZ_VERSION)
+DOMOTICZ_SOURCE = domoticz_src_2026.18387.tar.gz
 DOMOTICZ_LICENSE = GPL-3.0
 DOMOTICZ_LICENSE_FILES = License.txt
 DOMOTICZ_CPE_ID_VENDOR = domoticz
+
 DOMOTICZ_DEPENDENCIES = \
 	boost \
 	cereal \
 	host-pkgconf \
 	jsoncpp \
+	jwt-cpp \
 	libcurl \
 	lua \
 	minizip-zlib \
@@ -22,6 +25,11 @@ DOMOTICZ_DEPENDENCIES = \
 	sqlite \
 	zlib
 
+# Uses __atomic_load_8
+ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
+DOMOTICZ_CONF_OPTS += -DCMAKE_EXE_LINKER_FLAGS=-latomic
+endif
+
 # Due to the dependency on mosquitto, domoticz depends on
 # !BR2_STATIC_LIBS so set USE_STATIC_BOOST and USE_OPENSSL_STATIC to OFF
 DOMOTICZ_CONF_OPTS += \
@@ -29,12 +37,12 @@ DOMOTICZ_CONF_OPTS += \
 	-DUSE_OPENSSL_STATIC=OFF
 
 # Do not use any built-in libraries which are enabled by default for
-# jsoncpp, fmt, minizip, sqlite and mqtt
+# jsoncpp, jwt-cpp, minizip and sqlite
 DOMOTICZ_CONF_OPTS += \
 	-DUSE_BUILTIN_JSONCPP=OFF \
+	-DUSE_BUILTIN_JWTCPP=OFF \
 	-DUSE_BUILTIN_MINIZIP=OFF \
-	-DUSE_BUILTIN_SQLITE=OFF \
-	-DUSE_BUILTIN_MQTT=OFF
+	-DUSE_BUILTIN_SQLITE=OFF
 
 ifeq ($(BR2_PACKAGE_LIBEXECINFO),y)
 DOMOTICZ_DEPENDENCIES += libexecinfo
-- 
2.47.3

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Buildroot] [PATCH 1/2] package/domoticz: remove configure option needed for CMake < 3.16
  2026-10-24 18:21 [Buildroot] [PATCH 1/2] package/domoticz: remove configure option needed for CMake < 3.16 Bernd Kuhls
  2026-10-24 18:21 ` [Buildroot] [PATCH 2/2] package/domoticz: bump version to 2026.4 Bernd Kuhls
@ 2026-10-24 21:19 ` Thomas Petazzoni via buildroot
  1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2026-10-24 21:19 UTC (permalink / raw)
  To: Bernd Kuhls; +Cc: buildroot, Fabrice Fontaine

On Sat, Oct 24, 2026 at 08:21:38PM +0200, Bernd Kuhls wrote:
> In 2020 the fix we remove now was committed with buildroot commit
> 6e6bd863093605419044d6e376185ff3caed9fbe as build fix for cmake < 3.16.
> 
> Buildroot commit 53beb8fc1a4f3ba20ea6c856b4ec8506570f17c1 raised the
> minimum CMake version to 3.18 in 2023 so this fix is not needed anymore.
> 
> Signed-off-by: Bernd Kuhls <bernd@kuhls.net>

Both applied to master, thanks!

Best regards,

Thomas Petazzoni
-- 
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2026-10-24 21:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-10-24 18:21 [Buildroot] [PATCH 1/2] package/domoticz: remove configure option needed for CMake < 3.16 Bernd Kuhls
2026-10-24 18:21 ` [Buildroot] [PATCH 2/2] package/domoticz: bump version to 2026.4 Bernd Kuhls
2026-10-24 21:19 ` [Buildroot] [PATCH 1/2] package/domoticz: remove configure option needed for CMake < 3.16 Thomas Petazzoni via buildroot

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.