Merge pull request #210 from micmac1/chan-sccp

Chan sccp

net/asterisk-chan-sccp/Makefile

@@ -8,14 +8,14 @@
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=chan-sccp-b
-PKG_VERSION:=v4.3.0-20170814
+PKG_NAME:=chan-sccp
+PKG_VERSION:=v4.3.0-20171123
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=https://github.com/chan-sccp/chan-sccp.git
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=016fee3a96b09d5404757f7b178af2e349e55bcc
+PKG_SOURCE_VERSION:=ed272e974897f075573a358d169e5c77889f5905
 PKG_SOURCE_PROTO:=git
 
 PKG_FIXUP:=autoreconf
@@ -38,29 +38,38 @@ TARGET_LDFLAGS+= \
 	-L$(STAGING_DIR)/usr/lib/libiconv-full/lib -liconv
 endif
 
-define Package/chan-sccp-b/Default
+define Package/chan-sccp/Default
   SUBMENU:=Telephony
   SECTION:=net
   CATEGORY:=Network
-  TITLE:=SCCP channel provider support
-  URL:=http://chan-sccp-b.sourceforge.net/
+  TITLE:=SCCP channel support
+  URL:=https://github.com/chan-sccp/chan-sccp
   DEPENDS:=+USE_UCLIBC:libiconv-full +libltdl
   PKG_BUILD_DEPENDS:=libiconv
 endef
 
-define Package/asterisk13-chan-sccp-b
-$(call Package/chan-sccp-b/Default)
+define Package/asterisk13-chan-sccp
+$(call Package/chan-sccp/Default)
   DEPENDS+= asterisk13
   VARIANT:=asterisk13
   CONFLICTS:=asterisk13-chan-skinny
 endef
 
-define Package/description/Default
- SCCP channel provider for asterisk. It delivers extended functionality for SCCP phones over chan_skinny delivered
- by asterisk by default.
+define Package/asterisk15-chan-sccp
+$(call Package/chan-sccp/Default)
+  DEPENDS+= asterisk15
+  VARIANT:=asterisk15
+  CONFLICTS:=asterisk15-chan-skinny
 endef
 
-Package/asterisk13-chan-sccp-b/description = $(Package/description/Default)
+define Package/description/Default
+Replacement for the SCCP channel driver (chan_skinny) in Asterisk.
+Extended features include shared lines, presence / BLF, customizable
+feature buttons and custom device state.
+endef
+
+Package/asterisk13-chan-sccp/description = $(Package/description/Default)
+Package/asterisk15-chan-sccp/description = $(Package/description/Default)
 
 CONFIGURE_ARGS += \
 	--disable-debug \
@@ -72,6 +81,10 @@ ifeq ($(BUILD_VARIANT),asterisk13)
   CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-13
 endif
 
+ifeq ($(BUILD_VARIANT),asterisk15)
+  CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-15
+endif
+
 define Package/conffiles/Default
 /etc/asterisk/sccp.conf
 /etc/asterisk/extconfig.conf.sccp_sample
@@ -80,7 +93,16 @@ define Package/conffiles/Default
 /etc/asterisk/sccp.conf.realtime_sample
 endef
 
-Package/asterisk13-chan-sccp-b/conffiles = $(Package/conffiles/Default)
+Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
+Package/asterisk15-chan-sccp/conffiles = $(Package/conffiles/Default)
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+ifeq ($(BUILD_VARIANT),asterisk13)
+	$(SED) 's|asterisk/iostream.h|asterisk/iostream.404|' \
+		$(PKG_BUILD_DIR)/autoconf/asterisk.m4
+endif
+endef
 
 define Package/Install/Default
 	$(INSTALL_DIR) $(1)/etc/asterisk
@@ -93,6 +115,8 @@ define Package/Install/Default
 	$(INSTALL_DATA) ./files/sccp.conf.realtime_sample $(1)/etc/asterisk/sccp.conf.realtime_sample
 endef
 
-Package/asterisk13-chan-sccp-b/install = $(Package/Install/Default)
+Package/asterisk13-chan-sccp/install = $(Package/Install/Default)
+Package/asterisk15-chan-sccp/install = $(Package/Install/Default)
 
-$(eval $(call BuildPackage,asterisk13-chan-sccp-b))
+$(eval $(call BuildPackage,asterisk13-chan-sccp))
+$(eval $(call BuildPackage,asterisk15-chan-sccp))

net/asterisk-chan-sccp/patches/01-prevent-extra-optimization.patch

@@ -1,9 +1,9 @@
 --- a/autoconf/extra.m4
 +++ b/autoconf/extra.m4
-@@ -472,17 +472,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+@@ -491,17 +491,6 @@ AC_DEFUN([CS_ENABLE_OPTIMIZATION], [
+ 			], SUPPORTED_CFLAGS)
  		])
- 	 	CPPFLAGS_saved="${CPPFLAGS_saved} -D_FORTIFY_SOURCE=2"
- 		GDB_FLAGS=""
+ 		AC_SUBST([strip_binaries])
 -	], [
 -	 	CFLAGS_saved="`echo ${CFLAGS_saved} |sed -e 's/\-O[0-9]\ \?//g' -e 's/[^|\ ]\-g[$|\ ]//g'`"
 -		optimize_flag="-O0"