Merge pull request #4949 from commodo/python-lxml-update

[feed/packages.git] / net / knxd / Makefile

diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 5b5fba2204cefa3e05e91d56d05846c2024da25d..b77860dc2f2af79c441e1e481b6847681fc082d0 100644 (file)
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2008-2016 OpenWrt.org
+# Copyright (C) 2008-2017 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -11,14 +11,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knxd
-PKG_VERSION=2016-03-12
-PKG_RELEASE:=1
+PKG_VERSION:=0.14.18
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/knxd/knxd.git
-PKG_SOURCE_VERSION:=c8a4bb3b042de1fd692a93cdb7a307546f2be359
+PKG_SOURCE_VERSION:=5e707fdb7430009a299d3ad849aecf9ccbc8fdf6
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=96d5dd7b1513ccf871aed2bdd2601ca2a2f2d1005462fb1c631e5683e2e86e4e
 
 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch>
 
@@ -38,7 +39,7 @@ define Package/knxd
   SECTION:=net
   CATEGORY:=Network
   TITLE:=EIB KNX daemon
-  DEPENDS:=+pthsem +libusb-1.0
+  DEPENDS:=+libusb-1.0 +libstdcpp +libev
 endef
 
 define Package/knxd/description
@@ -46,58 +47,34 @@ EIB KNX Daemon
 endef
 
 define Package/knxd/conffiles
+/etc/knxd.ini
 /etc/config/knxd
 endef
 
-define Package/knxd-tools
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=EIB KNX Utils
-endef
-
-define Package/knxd-tools/description
-EIB KNX Tools
-endef
-
-TARGET_CXXFLAGS+= -fno-rtti
+TARGET_CXXFLAGS+= -std=c++0x
 TARGET_CXX=$(TARGET_CC)
 
 CONFIGURE_ARGS+= \
-       --disable-ft12 \
-       --enable-eibnetip \
-       --enable-eibnetiptunnel \
-       --enable-eibnetipserver \
-       --enable-usb \
-       --enable-tpuarts \
-       --disable-pei16s \
-       --enable-groupcache \
-       --without-pth-test \
-       --disable-systemd \
-       --without-libstdc
+       --disable-systemd
 
 EXTRA_LDFLAGS+= \
-       -fno-builtin -largp
+       -largp -lstdc++
 
 define Package/knxd/install
+       $(INSTALL_DIR) $(1)/usr/lib
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libeibclient.so* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/knxd_args $(1)/usr/lib/
        $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-       $(RM) $(1)/usr/bin/knxtool
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/knxd/eibwrite-cgi $(1)/usr/bin/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/knxd/eibread-cgi $(1)/usr/bin/
 
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd
 
        $(INSTALL_DIR) $(1)/etc/config
+       $(INSTALL_DATA) ./files/knxd.ini $(1)/etc/knxd.ini
        $(INSTALL_DATA) ./files/knxd.config $(1)/etc/config/knxd
 endef
 
-define Package/knxd-tools/install
-       $(INSTALL_DIR) $(1)/usr/lib
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/libeibclient.so* $(1)/usr/lib/
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/knxtool $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/knxd/eibwrite-cgi $(1)/usr/bin/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/knxd/eibread-cgi $(1)/usr/bin/
-endef
-
 $(eval $(call BuildPackage,knxd))
-$(eval $(call BuildPackage,knxd-tools))