chan-sccp-b: fix variant build, misc fixes

[feed/telephony.git] / net / chan-sccp-b / Makefile

diff --git a/net/chan-sccp-b/Makefile b/net/chan-sccp-b/Makefile
index b9c2f1a34703b4992e443efe3894bd3eeb9c5a6b..31a4a147f9cce12dca1713a82c77df7400ed794a 100644 (file)
--- a/net/chan-sccp-b/Makefile
+++ b/net/chan-sccp-b/Makefile
@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2015 OpenWrt.org
-# Copyright (C) 2015 Cesnet, z.s.p.o.
+# Copyright (C) 2016 - 2017 OpenWrt.org
+# Copyright (C) 2016 Cesnet, z.s.p.o.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,21 +9,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chan-sccp-b
-PKG_REV:=6139
-PKG_VERSION:=v4.2-r$(PKG_REV)
-PKG_RELEASE:=3
+PKG_REV:=6728
+PKG_VERSION:=v4.2.3-r$(PKG_REV)
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/branches/V4.2
+PKG_SOURCE_URL:=http://svn.code.sf.net/p/chan-sccp-b/code/branches/v4.2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=svn
 
-PKG_FIXUP:=autoreconf -fi
+PKG_FIXUP:=autoreconf
 
 PKG_LICENSE:=GPL-1.0
 PKG_LICENSE_FILES:=COPYING LICENSE
-PKG_MAINTAINER:=Jiri Slachta <slachta@cesnet.cz>
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
+
+PKG_INSTALL:=1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -33,14 +37,8 @@ define Package/chan-sccp-b/Default
   CATEGORY:=Network
   TITLE:=SCCP channel provider support
   URL:=http://chan-sccp-b.sourceforge.net/
-  DEPENDS:= +libltdl
-endef
-
-define Package/asterisk18-chan-sccp-b
-$(call Package/chan-sccp-b/Default)
-  DEPENDS+= asterisk18
-  VARIANT:=asterisk18
-  CONFLICTS:=asterisk18-chan-skinny
+  DEPENDS:=+libltdl
+  PKG_BUILD_DEPENDS:=libiconv
 endef
 
 define Package/asterisk13-chan-sccp-b
@@ -52,7 +50,7 @@ endef
 
 define Package/asterisk11-chan-sccp-b
 $(call Package/chan-sccp-b/Default)
-  DEPENDS+= asterisk11 
+  DEPENDS+= asterisk11
   VARIANT:=asterisk11
   CONFLICTS:=asterisk11-chan-skinny
 endef
@@ -62,10 +60,16 @@ define Package/description/Default
  by asterisk by default.
 endef
 
-Package/asterisk18-chan-sccp-b/description = $(Package/description/Default)
 Package/asterisk11-chan-sccp-b/description = $(Package/description/Default)
 Package/asterisk13-chan-sccp-b/description = $(Package/description/Default)
 
+CONFIGURE_ARGS += \
+       --enable-static \
+       --enable-section-relocation \
+       --enable-conference \
+       --enable-advanced-functions \
+       --enable-video
+
 ifeq ($(BUILD_VARIANT),asterisk13)
   CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-13
 endif
@@ -74,10 +78,6 @@ ifeq ($(BUILD_VARIANT),asterisk11)
   CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-11
 endif
 
-ifeq ($(BUILD_VARIANT),asterisk18)
-  CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8
-endif
-
 define Package/conffiles/Default
 /etc/asterisk/sccp.conf
 /etc/asterisk/extconfig.conf.sccp_sample
@@ -86,17 +86,9 @@ define Package/conffiles/Default
 /etc/asterisk/sccp.conf.realtime_sample
 endef
 
-Package/asterisk18-chan-sccp-b/conffiles = $(Package/conffiles/Default)
 Package/asterisk11-chan-sccp-b/conffiles = $(Package/conffiles/Default)
 Package/asterisk13-chan-sccp-b/conffiles = $(Package/conffiles/Default)
 
-define Build/Compile
-       $(MAKE) -C "$(PKG_BUILD_DIR)" \
-               CFLAGS="$(CFLAGS) -I$(PKG_BUILD_DIR)/src -DLOW_MEMORY" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               all install
-endef
-
 define Package/Install/Default
        $(INSTALL_DIR) $(1)/etc/asterisk
        $(CP) ./files/sccp.conf $(1)/etc/asterisk/sccp.conf
@@ -108,10 +100,8 @@ define Package/Install/Default
        $(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample
 endef
 
-Package/asterisk18-chan-sccp-b/install = $(Package/Install/Default)
 Package/asterisk11-chan-sccp-b/install = $(Package/Install/Default)
 Package/asterisk13-chan-sccp-b/install = $(Package/Install/Default)
 
-$(eval $(call BuildPackage,asterisk18-chan-sccp-b))
 $(eval $(call BuildPackage,asterisk11-chan-sccp-b))
 $(eval $(call BuildPackage,asterisk13-chan-sccp-b))