chan-lantiq: pull the source from github

Instead of using local copies pull the source from github. The source
version is selected via CHAN_LANTIQ_VERSION, so there can be a different
version for each VARIANT.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

net/asterisk-chan-lantiq/Makefile

@@ -8,9 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=chan-lantiq
-PKG_VERSION:=20170304
+PKG_VERSION:=20171111
 PKG_RELEASE:=1
 
+LANTIQ_AST13_VERSION:=5adf3d7774a75c88835f2f3daf824e2cda2c6e67
+
 PKG_LICENSE:=GPL-2.0
 PKG_MAINTAINER:=Jiri Slachta <jiri@slachta.eu>
 
@@ -18,6 +20,17 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
 
 include $(INCLUDE_DIR)/package.mk
 
+define Download/github
+define Download/$(PKG_NAME)
+  VERSION:=$(1)
+  SUBDIR:=$(PKG_NAME)
+  FILE:=$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION)-$(1).tar.xz
+  URL:=https://github.com/kochstefan/asterisk_channel_lantiq.git
+  PROTO:=git
+endef
+$$(eval $$(call Download,chan-lantiq))
+endef
+
 define Package/$(PKG_NAME)/Default
   SUBMENU:=Telephony
   SECTION:=net
@@ -47,10 +60,12 @@ Package/asterisk13-$(PKG_NAME)/conffiles = $(Package/conffiles/Default)
 
 define Package/Install/Default
 	$(INSTALL_DIR) $(1)/etc/asterisk
-	$(INSTALL_CONF) ./files/lantiq-$(BUILD_VARIANT).conf.sample \
+	$(INSTALL_CONF) \
+		$(PKG_BUILD_DIR)/$(PKG_NAME)/src/configs/samples/lantiq.conf.sample \
 		$(1)/etc/asterisk/lantiq.conf
 	$(INSTALL_DIR) $(1)/usr/lib/asterisk/modules
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/chan_lantiq.so \
+	$(INSTALL_BIN) \
+		$(PKG_BUILD_DIR)/$(PKG_NAME)/src/channels/chan_lantiq.so \
 		$(1)/usr/lib/asterisk/modules
 endef
 
@@ -58,18 +73,23 @@ Package/asterisk13-$(PKG_NAME)/install = $(Package/Install/Default)
 
 ifeq ($(BUILD_VARIANT),asterisk13)
 CHAN_LANTIQ_AST_INCLUDES:=-I$(STAGING_DIR)/usr/include/asterisk-13/include
+CHAN_LANTIQ_VERSION:=$(LANTIQ_AST13_VERSION)
 endif
 
 define Build/Prepare
-	$(CP) ./files/chan_lantiq-$(BUILD_VARIANT).c $(PKG_BUILD_DIR)/chan_lantiq.c
-	$(CP) ./files/default.exports $(PKG_BUILD_DIR)/chan_lantiq.exports
+	$(eval $(call Download/github,$(CHAN_LANTIQ_VERSION)))
+	$(TAR) --extract --no-same-owner --no-same-permissions --xz \
+		--file=$(DL_DIR)/$(BUILD_VARIANT)-$(PKG_NAME)-$(PKG_VERSION)-$(CHAN_LANTIQ_VERSION).tar.xz \
+		--directory=$(PKG_BUILD_DIR)
+	$(CP) ./files/default.exports \
+		$(PKG_BUILD_DIR)/$(PKG_NAME)/src/channels/chan_lantiq.exports
 endef
 
 define Build/Configure
 endef
 
 define Build/Compile
-	cd $(PKG_BUILD_DIR) && \
+	cd $(PKG_BUILD_DIR)/$(PKG_NAME)/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) \

net/asterisk-chan-lantiq/files/lantiq-asterisk13.conf.sample

@@ -1,153 +0,0 @@
-;
-; TAPI Telephony Interface
-;
-; Configuration file
-
-[interfaces]
-;
-; Number of FXS ports (default: 2)
-channels = 2
-;
-; Create contexts per channel (default: off)
-;per_channel_context = off
-;
-; Set tapi firmware file path
-;firmwarefilename = /lib/firmware/danube_firmware.bin
-;
-; Set tapi bbd file path
-;bbdfilename = /lib/firmware/danube_bbd_fxs.bin
-;
-; Set vmmc device path
-;basepath = /dev/vmmc
-;
-[general]
-;
-; Gain setting for the receive and transmit path.
-; The value is given in dB within the range (-24dB to +12dB), in 1 dB steps.
-;
-;rxgain = 1
-;txgain = 1
-;
-;
-;
-; Line echo cancller valid types:
-;
-; off		LEC and echo suppressor turned off.
-; nlec		LEC using fixed window; no echo suppressor.
-; wlec		LEC using fixed and moving window; no echo suppressor.
-; nees		LEC using fixed window and echo suppressor.
-; nfees		LEC using fixed and moving window and echo suppressor.
-; es		Echo suppressor
-;
-;echocancel = off
-;
-; If nlec or wlec is selected than size of the fixed window in narrowband (8 kHz) sampling mode
-; can be defined with:
-; A value of 0 defaults to: 16 ms if type is nlec or 8 ms if type is wlec:
-;
-;echocancelfixedwindowsize = 0
-;
-; If wlec is selected than size of the moving window in narrowband (8 kHz) sampling mode
-; can be defined with:
-; A value of 0 defaults to 8 ms.
-;
-;echocancelnfemovingwindowsize = 0
-;
-; If wlec is selected than size of the moving window in wideband (16 kHz) sampling mode
-; can be defined with:
-; A value of 0 defaults to 8 ms.
-;
-;echocancelwidefixedwindowsize = 0
-;
-; Activate or deactivate line echo cancller NLP (Non Linear Processor) if the LEC is active,
-; valid is on or off:
-;
-;echocancelnlp = off
-;
-;
-;
-; Jitter buffer valid types:
-;
-; fixed		Fixed jitter buffer.
-; adaptive	Adaptive jitter buffer.
-;
-;jitterbuffertype = fixed
-;
-; Jitter buffer packet adaptation valid types:
-;
-; voice		Jitter buffer optimized for voice.
-; data		Jitter buffer optimized for data.
-; datanorep	Jitter buffer optimized for data but without doing packet repetition.
-;
-;jitterbufferpackettype = voice
-;
-;	Following jitter buffer values can only be used with jitter buffer adaptive type:
-; Turns on or off jitter buffer adaptation:
-;
-;jitterbufferadaptation = off
-;
-; Scaling factor multiplied by 16; in adaptive jitter buffer mode, the target average playout delay is
-; equal to the estimated jitter multiplied by the scaling factor. The default value for the scaling factor
-; is about 1.4 (scaling=22), meaning that the target average playout delay is equal to the estimated
-; jitter. If less packets should be dropped because of jitter, the scaling factor has to be increased. An
-; increase in the scaling factor will eventually lead to an increased playout delay.
-; The supported range is 1 to 16 (16 up to 256).
-;
-;jitterbufferscalling = 1
-;
-; Initial size of the jitter buffer in time stamps of 125 us:
-;
-;jitterbufferinitialsize = 125
-;
-; Minimum size of the jitter buffer in time stamps of 125 us
-;
-;jitterbufferminsize = 125
-;
-; Maximum size of the jitter buffer in time stamps of 125 us
-;
-;jitterbuffermaxsize = 125
-;
-;
-;
-; Caller id valid standards:
-;
-; telecordia	 Bellcore/Telcordia GR-30-CORE; use Bell202 FSK coding of CID information. (default)
-; etsifsk	 ETSI 300-659-1/2/3 V1.3.1; use V.23 FSK coding to transmit CID information.
-; etsidtmf	 ETSI 300-659-1/2/3 V1.3.1; use DTMF transmission of CID information.
-; sin		 SIN 227 Issue 3.4; use V.23 FSK coding of CID information.
-; ntt		 NTT standard: TELEPHONE SERVICE INTERFACES, edition 5; use a modified V.23 FSK coding of
-; 		 CID information.
-; kpndtmf	 KPN; use DTMF transmission of CID information.
-; kpndtmffsk	 KPN; use DTMF and FSK transmission of CID information.
-;
-;calleridtype = telecordia
-;
-;
-;
-; Voice activity detection:
-;
-; on		Voice activity detection on; in this case also comfort noise and spectral
-; 		information (nicer noise) is switched on.
-; g711		Voice activity detection on with comfort noise generation,
-;		but without spectral information.
-; cng		Voice activity detection on with comfort noise generation, but without silence compression
-; sc		Voice activity detection on with silence compression,
-;		but without comfort noise generation.
-;
-;voiceactivitydetection = on
-;
-;
-;
-; Timeout between dialed digits, in milliseconds, before placing the call.
-;
-;interdigit = 4000
-;
-;
-;
-; Tone generator type (default: integrated)
-; integrated	Use tapi tone generator
-; asterisk	Use asterisk tone generator where possible
-; media		Use media tone where possible
-;
-;tone_generator = integrated
-;