Merge pull request #417 from micmac1/ast16-add2

Asterisk 16 additions II

4 files changed, 139 insertions, 5 deletions

diff --git a/net/asterisk-16.x-chan-lantiq/Makefile b/net/asterisk-16.x-chan-lantiq/Makefile
new file mode 100644
index 0000000..2aa4fca
--- /dev/null
+++ b/net/asterisk-16.x-chan-lantiq/Makefile
@@ -0,0 +1,77 @@
+#
+# Copyright (C) 2018 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=asterisk16-chan-lantiq
+PKG_VERSION:=20180215
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
+PKG_SOURCE_URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=c9d68dd06fcd46ac7985df45f8c2b8833e658f8e
+PKG_MIRROR_HASH:=8666c18b24adf9da3ddf12306fcf0a8b4f56860c256b172bd0ba5c2a7a3ab25e
+PKG_SOURCE_PROTO:=git
+
+PKG_LICENSE:=GPL-2.0
+
+PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
+
+PKG_FLAGS:=nonshared
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  SUBMENU:=Telephony Lantiq
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=Lantiq channel driver
+  URL:=https://github.com/kochstefan/asterisk_channel_lantiq
+  DEPENDS:=+asterisk16 +kmod-ltq-vmmc
+endef
+
+define Package/$(PKG_NAME)/description
+An implementation of a Lantiq TAPI channel driver for Asterisk 16.
+endef
+
+define Package/$(PKG_NAME)/conffiles
+/etc/asterisk/lantiq.conf
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(INSTALL_DATA) ./files/default.exports \
+		$(PKG_BUILD_DIR)/src/channels/chan_lantiq.exports
+endef
+
+define Build/Compile
+	cd $(PKG_BUILD_DIR)/src/channels && \
+	$(TARGET_CC) -o chan_lantiq.o -c chan_lantiq.c -MD -MT chan_lantiq.o \
+		-MF .chan_lantiq.o.d -MP -pthread \
+		$(TARGET_CFLAGS) -DAST_MODULE_SELF_SYM=__internal_chan_lantiq_self \
+		-I$(STAGING_DIR)/usr/include/asterisk-16/include \
+		$(TARGET_CPPFLAGS) \
+		-Wall -Wstrict-prototypes -Wmissing-prototypes \
+		-Wmissing-declarations $(FPIC) -DAST_MODULE=\"chan_lantiq\" && \
+	$(TARGET_CC) -o chan_lantiq.so -pthread $(TARGET_LDFLAGS) -shared \
+		-Wl,--version-script,chan_lantiq.exports,--warn-common \
+		chan_lantiq.o
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/etc/asterisk
+	$(INSTALL_CONF) \
+		$(PKG_BUILD_DIR)/src/configs/samples/lantiq.conf.sample \
+		$(1)/etc/asterisk/lantiq.conf
+	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/src/channels/chan_lantiq.so \
+		$(1)/usr/lib/asterisk/modules
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
diff --git a/net/asterisk-16.x-chan-lantiq/files/default.exports b/net/asterisk-16.x-chan-lantiq/files/default.exports
new file mode 100644
index 0000000..6d9344d
--- /dev/null
+++ b/net/asterisk-16.x-chan-lantiq/files/default.exports
@@ -0,0 +1,8 @@
+{
+	global:
+		/* See main/asterisk.exports.in for an explanation why this is
+		 * needed. */
+		_IO_stdin_used;
+	local:
+		*;
+};
diff --git a/net/asterisk-chan-dongle/Makefile b/net/asterisk-chan-dongle/Makefile
index 8f02816..528a2b0 100644
--- a/net/asterisk-chan-dongle/Makefile
+++ b/net/asterisk-chan-dongle/Makefile
@@ -53,12 +53,19 @@ $(call Package/asterisk-chan-dongle/Default)
   VARIANT:=asterisk15
 endef
 
+define Package/asterisk16-chan-dongle
+$(call Package/asterisk-chan-dongle/Default)
+  DEPENDS+=asterisk16
+  VARIANT:=asterisk16
+endef
+
 define Package/description/Default
  Asterisk channel driver for Huawei UMTS 3G dongle.
 endef
 
 Package/asterisk13-chan-dongle/description = $(Package/description/Default)
 Package/asterisk15-chan-dongle/description = $(Package/description/Default)
+Package/asterisk16-chan-dongle/description = $(Package/description/Default)
 
 ifeq ($(BUILD_VARIANT),asterisk13)
   CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-13/include
@@ -72,6 +79,12 @@ ifeq ($(BUILD_VARIANT),asterisk15)
 	  --with-astversion=15
 endif
 
+ifeq ($(BUILD_VARIANT),asterisk16)
+  CHAN_DONGLE_AST_HEADERS:=$(STAGING_DIR)/usr/include/asterisk-16/include
+  CONFIGURE_ARGS+= \
+	  --with-astversion=16
+endif
+
 CONFIGURE_ARGS+= \
 	--with-asterisk=$(CHAN_DONGLE_AST_HEADERS)
 
@@ -91,6 +104,7 @@ endef
 
 Package/asterisk13-chan-dongle/conffiles = $(Package/conffiles/Default)
 Package/asterisk15-chan-dongle/conffiles = $(Package/conffiles/Default)
+Package/asterisk16-chan-dongle/conffiles = $(Package/conffiles/Default)
 
 define Package/Install/Default
 	$(INSTALL_DIR) $(1)/etc/asterisk
@@ -101,6 +115,8 @@ endef
 
 Package/asterisk13-chan-dongle/install = $(Package/Install/Default)
 Package/asterisk15-chan-dongle/install = $(Package/Install/Default)
+Package/asterisk16-chan-dongle/install = $(Package/Install/Default)
 
 $(eval $(call BuildPackage,asterisk13-chan-dongle))
 $(eval $(call BuildPackage,asterisk15-chan-dongle))
+$(eval $(call BuildPackage,asterisk16-chan-dongle))
diff --git a/net/asterisk-chan-sccp/Makefile b/net/asterisk-chan-sccp/Makefile
index 18357ad..77909d7 100644
--- a/net/asterisk-chan-sccp/Makefile
+++ b/net/asterisk-chan-sccp/Makefile
@@ -9,14 +9,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chan-sccp
-PKG_VERSION:=v4.3.1-20181225
+PKG_VERSION:=v4.3.2-20190411
 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:=614fc3e7514c56b233431f92b87e6cf211f5d925
-PKG_MIRROR_HASH:=9c56a5b9d0768bd79e5c2cc1c4704ffbbbe9c6d2a2f8d994ff145143d4814fda
+PKG_SOURCE_VERSION:=da59f2f073502645b34b458392a1fb11465f48cc
+PKG_MIRROR_HASH:=a449c3384b92ff79b2db4d6b4e8dc7a3fb668f4c0f1a65baa198578b0b953ab8
 PKG_SOURCE_PROTO:=git
 
 PKG_FIXUP:=autoreconf
@@ -44,18 +44,43 @@ endef
 
 define Package/asterisk13-chan-sccp
 $(call Package/chan-sccp/Default)
-  DEPENDS+=asterisk13
+  DEPENDS += asterisk13 \
+	  +asterisk13-bridge-holding \
+	  +asterisk13-bridge-native-rtp \
+	  +asterisk13-bridge-simple \
+	  +asterisk13-bridge-softmix \
+	  +asterisk13-res-stasis-device-state \
+	  +asterisk13-voicemail
   VARIANT:=asterisk13
   CONFLICTS:=asterisk13-chan-skinny
 endef
 
 define Package/asterisk15-chan-sccp
 $(call Package/chan-sccp/Default)
-  DEPENDS+=asterisk15
+  DEPENDS += asterisk15 \
+	  +asterisk15-bridge-holding \
+	  +asterisk15-bridge-native-rtp \
+	  +asterisk15-bridge-simple \
+	  +asterisk15-bridge-softmix \
+	  +asterisk15-res-stasis-device-state \
+	  +asterisk15-voicemail
   VARIANT:=asterisk15
   CONFLICTS:=asterisk15-chan-skinny
 endef
 
+define Package/asterisk16-chan-sccp
+$(call Package/chan-sccp/Default)
+  DEPENDS += asterisk16 \
+	  +asterisk16-bridge-holding \
+	  +asterisk16-bridge-native-rtp \
+	  +asterisk16-bridge-simple \
+	  +asterisk16-bridge-softmix \
+	  +asterisk16-res-stasis-device-state \
+	  +asterisk16-voicemail
+  VARIANT:=asterisk16
+  CONFLICTS:=asterisk16-chan-skinny
+endef
+
 define Package/description/Default
 Replacement for the SCCP channel driver (chan_skinny) in Asterisk.
 Extended features include shared lines, presence / BLF, customizable
@@ -64,6 +89,7 @@ endef
 
 Package/asterisk13-chan-sccp/description = $(Package/description/Default)
 Package/asterisk15-chan-sccp/description = $(Package/description/Default)
+Package/asterisk16-chan-sccp/description = $(Package/description/Default)
 
 CONFIGURE_ARGS += \
 	--disable-debug \
@@ -79,12 +105,17 @@ ifeq ($(BUILD_VARIANT),asterisk15)
   CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-15
 endif
 
+ifeq ($(BUILD_VARIANT),asterisk16)
+  CONFIGURE_ARGS += --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-16
+endif
+
 define Package/conffiles/Default
 /etc/asterisk/sccp.conf
 endef
 
 Package/asterisk13-chan-sccp/conffiles = $(Package/conffiles/Default)
 Package/asterisk15-chan-sccp/conffiles = $(Package/conffiles/Default)
+Package/asterisk16-chan-sccp/conffiles = $(Package/conffiles/Default)
 
 define Package/Install/Default
 	$(INSTALL_DIR) $(1)/etc/asterisk
@@ -95,6 +126,8 @@ endef
 
 Package/asterisk13-chan-sccp/install = $(Package/Install/Default)
 Package/asterisk15-chan-sccp/install = $(Package/Install/Default)
+Package/asterisk16-chan-sccp/install = $(Package/Install/Default)
 
 $(eval $(call BuildPackage,asterisk13-chan-sccp))
 $(eval $(call BuildPackage,asterisk15-chan-sccp))
+$(eval $(call BuildPackage,asterisk16-chan-sccp))