Просмотр исходного кода

knxd: update to 0.14.75, fix broken package

Waldemar Brodkorb 2 недель назад
Родитель
Сommit
ba7d4f22b3

+ 5 - 6
package/knxd/Makefile

@@ -4,18 +4,17 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		knxd
-PKG_VERSION:=		0.14.61
+PKG_VERSION:=		0.14.75
 PKG_RELEASE:=		1
-PKG_HASH:=		b5284c89a55a2c53e0ff769ec4f736fc1ad4b55afdd2a18b9258fa95f708d798
+PKG_HASH:=		9d326bb0b8c16d49805c74ed3b25dd8ba0dfcc50e38797ac6037cd42191cecad
 PKG_DESCR:=		knx daemon
 PKG_SECTION:=		sys/hw
-PKG_DEPENDS:=		libev
-PKG_BUILDDEP:=		libev cmake-host
+PKG_DEPENDS:=		libev libfmt
+PKG_BUILDDEP:=		libev fmt cmake-host
+PKG_NEEDS:=		c++
 PKG_URL:=		https://github.com/knxd/knxd
 PKG_SITES:=		https://github.com/knxd/knxd/archive/refs/tags/
 
-PKG_CFLINE_KNXD:=	depends on ADK_BROKEN
-
 DISTFILES:=		$(PKG_VERSION).tar.gz
 
 include $(ADK_TOPDIR)/mk/package.mk

+ 11 - 0
package/knxd/patches/patch-configure_ac

@@ -0,0 +1,11 @@
+--- knxd-0.14.75.orig/configure.ac	2026-01-08 17:37:44.000000000 +0100
++++ knxd-0.14.75/configure.ac	2026-05-25 03:11:10.593766258 +0200
+@@ -26,7 +26,7 @@ dnl ##    SUCH DAMAGE.
+ AC_PREREQ([2.69])
+ LT_PREREQ([2.2.0])
+ 
+-AC_INIT([knxd],m4_esyscmd_s([./tools/version.sh]))
++AC_INIT([knxd],[0.14.75])
+ AC_CONFIG_SRCDIR([src/server/knxd.cpp])
+ AM_INIT_AUTOMAKE
+ LT_INIT

+ 9 - 0
package/knxd/patches/patch-src_client_go_Makefile_am

@@ -0,0 +1,9 @@
+--- knxd-0.14.75.orig/src/client/go/Makefile.am	2026-01-08 17:37:44.000000000 +0100
++++ knxd-0.14.75/src/client/go/Makefile.am	2026-05-25 04:07:37.520967150 +0200
+@@ -1,4 +1,6 @@
+ CC = $(CC_FOR_BUILD)
++CFLAGS = $(CFLAGS_FOR_BUILD)
++LDFLAGS = $(LDFLAGS_FOR_BUILD)
+ LIBS = $(LIBS_FOR_BUILD)
+ EXEEXT = $(EXEEXT_FOR_BUILD)
+ 

+ 9 - 0
package/knxd/patches/patch-src_client_lua_Makefile_am

@@ -0,0 +1,9 @@
+--- knxd-0.14.75.orig/src/client/lua/Makefile.am	2026-01-08 17:37:44.000000000 +0100
++++ knxd-0.14.75/src/client/lua/Makefile.am	2026-05-25 04:06:42.884220630 +0200
+@@ -1,4 +1,6 @@
+ CC = $(CC_FOR_BUILD)
++CFLAGS = $(CFLAGS_FOR_BUILD)
++LDFLAGS = $(LDFLAGS_FOR_BUILD)
+ LIBS = $(LIBS_FOR_BUILD)
+ EXEEXT = $(EXEEXT_FOR_BUILD)
+ 

+ 8 - 0
package/knxd/patches/patch-src_client_pascal_Makefile_am

@@ -0,0 +1,8 @@
+--- knxd-0.14.75.orig/src/client/pascal/Makefile.am	2026-01-08 17:37:44.000000000 +0100
++++ knxd-0.14.75/src/client/pascal/Makefile.am	2026-05-25 04:03:47.149408957 +0200
+@@ -1,4 +1,5 @@
+ CC = $(CC_FOR_BUILD)
++CFLAGS = $(CFLAGS_FOR_BUILD)
+ LIBS = $(LIBS_FOR_BUILD)
+ EXEEXT = $(EXEEXT_FOR_BUILD)
+ 

+ 8 - 0
package/knxd/patches/patch-src_client_python_Makefile_am

@@ -0,0 +1,8 @@
+--- knxd-0.14.75.orig/src/client/python/Makefile.am	2026-01-08 17:37:44.000000000 +0100
++++ knxd-0.14.75/src/client/python/Makefile.am	2026-05-25 04:02:35.456042780 +0200
+@@ -1,4 +1,5 @@
+ CC = $(CC_FOR_BUILD)
++CFLAGS = $(CFLAGS_FOR_BUILD)
+ LIBS = $(LIBS_FOR_BUILD)
+ EXEEXT = $(EXEEXT_FOR_BUILD)
+ 

+ 8 - 0
package/knxd/patches/patch-src_client_ruby_Makefile_am

@@ -0,0 +1,8 @@
+--- knxd-0.14.75.orig/src/client/ruby/Makefile.am	2026-01-08 17:37:44.000000000 +0100
++++ knxd-0.14.75/src/client/ruby/Makefile.am	2026-05-25 04:04:33.614220897 +0200
+@@ -1,4 +1,5 @@
+ CC = $(CC_FOR_BUILD)
++CFLAGS = $(CFLAGS_FOR_BUILD)
+ LIBS = $(LIBS_FOR_BUILD)
+ EXEEXT = $(EXEEXT_FOR_BUILD)
+