Add pbx_dundi patch (thanks Greg Boehnlein).

Move "not recommended" codecs into subpackages.


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1138 3c298f89-4303-0410-b956-a3cf2f4a3e73

openwrt/package/asterisk/Config.in

@@ -1,5 +1,8 @@
+menu "asterisk - Complete open source PBX"
+
 config BR2_PACKAGE_ASTERISK
-	tristate "asterisk - Complete open source PBX"
+	prompt "asterisk - Complete open source PBX"
+	tristate
 	default m if CONFIG_DEVEL
 	help
  	  Asterisk is a complete PBX in software. It provides all of the features
@@ -10,41 +13,71 @@ config BR2_PACKAGE_ASTERISK
 	  http://www.asterisk.org/
 	  
 
-config BR2_PACKAGE_ASTERISK_SPEEX
+config BR2_PACKAGE_ASTERISK_CODEC_ILBC
-	tristate "Speex codec"
+	prompt "...-codec-ilbc - Internet Low Bitrate Codec (ILBC) Translator"
+	tristate
+	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_ASTERISK
+	help
+	  The Internet Low Bitrate Codec (ILBC) Translator for Asterisk
+
+config BR2_PACKAGE_ASTERISK_CODEC_LPC10
+	prompt "...-codec-lpc10 - LPC10 (Linear Predictor Code) 2.4kbps Voice Coder"
+	tristate
+	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_ASTERISK
+	help
+	  The LPC10 (Linear Predictor Code) 2.4kbps Voice Coder for Asterisk
+
+config BR2_PACKAGE_ASTERISK_CODEC_SPEEX
+	prompt "...-codec-speex - Speex/PCM16 Codec Translator"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	select BR2_PACKAGE_LIBSPEEX
 	help
 	  The Speex speech compression codec for Asterisk
 
+config BR2_PACKAGE_ASTERISK_PBX_DUNDI
+	prompt "...-pbx-dundi - Distributed Universal Number Discovery (DUNDi) support"
+	tristate
+	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_ASTERISK
+	help
+	  Distributed Universal Number Discovery (DUNDi) support for Asterisk
+
 config BR2_PACKAGE_ASTERISK_MYSQL
-	tristate "MySQL plugins"
+	prompt "...-mysql - MySQL modules"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	select BR2_PACKAGE_LIBMYSQLCLIENT
 	help
-	  MySQL plugins for Asterisk
+	  MySQL modules for Asterisk
 
 config BR2_PACKAGE_ASTERISK_PGSQL
-	tristate "PostgreSQL plugins"
+	prompt "...-pgsql - PostgreSQL modules"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	select BR2_PACKAGE_LIBPQ
 	help
-	  PostgreSQL plugins for Asterisk
+	  PostgreSQL modules for Asterisk
-	  
-config BR2_PACKAGE_ASTERISK_VOICEMAIL
-	tristate "Voicemail support"
-	default m if CONFIG_DEVEL
-	depends BR2_PACKAGE_ASTERISK
-	help
-	  Voicemail related plugins for Asterisk
 	  
 config BR2_PACKAGE_ASTERISK_SOUNDS
-	tristate "Sound files"
+	prompt "...-sounds - Sound files"
+	tristate
 	default m if CONFIG_DEVEL
 	depends BR2_PACKAGE_ASTERISK
 	help
 	  Sound files for Asterisk
 
+config BR2_PACKAGE_ASTERISK_VOICEMAIL
+	prompt "...-voicemail - Voicemail support"
+	tristate
+	default m if CONFIG_DEVEL
+	depends BR2_PACKAGE_ASTERISK
+	help
+	  Voicemail related modules for Asterisk
+	  
+endmenu

openwrt/package/asterisk/Makefile

@@ -18,7 +18,10 @@ $(eval $(call PKG_template,ASTERISK_MYSQL,asterisk-mysql,$(PKG_VERSION)-$(PKG_RE
 $(eval $(call PKG_template,ASTERISK_PGSQL,asterisk-pgsql,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,ASTERISK_VOICEMAIL,asterisk-voicemail,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 $(eval $(call PKG_template,ASTERISK_SOUNDS,asterisk-sounds,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
-$(eval $(call PKG_template,ASTERISK_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ASTERISK_CODEC_ILBC,asterisk-codec-ilbc,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ASTERISK_CODEC_LPC10,asterisk-codec-lpc10,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ASTERISK_CODEC_SPEEX,asterisk-codec-speex,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,ASTERISK_PBX_DUNDI,asterisk-pbx-dundi,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
 
 APPS:=
 MODS:=
@@ -30,11 +33,14 @@ ifneq ($(BR2_PACKAGE_ASTERISK_PGSQL),)
 APPS += app_sql_postgres.so
 MODS += cdr_pgsql.so
 endif
-ifneq ($(BR2_PACKAGE_ASTERISK_SPEEX),)
+ifneq ($(BR2_PACKAGE_ASTERISK_CODEC_SPEEX),)
 SPEEX:=codec_speex.so
 endif
 
-asterisk-compile: $(PKG_BUILD_DIR)/.prepared
+$(PKG_BUILD_DIR)/.configured:
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
 	$(MAKE) -C "$(PKG_BUILD_DIR)/channels" \
 		CC="$(HOSTCC)" \
 		gentone 
@@ -49,14 +55,9 @@ asterisk-compile: $(PKG_BUILD_DIR)/.prepared
 		EXTRA_APPS="$(APPS)" \
 		EXTRA_MODS="$(MODS)" \
 		MODSPEEX="$(SPEEX)"
-
-$(PKG_BUILD_DIR)/.configured:
 	touch $@
 
-$(PKG_BUILD_DIR)/.built: asterisk-compile
+$(IPKG_ASTERISK):
-	touch $@
-
-$(IPKG_ASTERISK): asterisk-compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		DESTDIR="$(IDIR_ASTERISK)" \
 		install samples
@@ -76,54 +77,81 @@ $(IPKG_ASTERISK): asterisk-compile
 		rm -rf	*adsi* *festival* *modem* *meetme* *oss* *phone* *intercom* \
 			*mp3* *nbscat* *mysql* *postgres* *pgsql* *voicemail* *speex* \
 			*musiconhold* *zapateller* *jpeg*; \
+		rm -f {codec,format}_ilbc.so ; \
+		rm -f codec_lpc10.so ; \
+		rm -f pbx_dundi.so ; \
 	)
 	(cd $(IDIR_ASTERISK)/etc/asterisk; \
 		rm -f 	*odbc* *mysql* *postgres* *pgsql* *voicemail* *adsi* *oss* *alsa* \
 			*festival* *modem* *meetme* *phone* *tds* *vofr* *rpt* *vpb* \
 			*zapata* *musiconhold*; \
+		rm -f dundi.conf ; \
 	)
-	-$(STRIP) $(IDIR_ASTERISK)/usr/sbin/asterisk
+	install -d -m0755 $(IDIR_ASTERISK)/etc/default
-	-$(STRIP) $(IDIR_ASTERISK)/usr/lib/asterisk/modules/* 
+	install -m0644  ./files/asterisk.default $(IDIR_ASTERISK)/etc/default/asterisk
-	cp -a ./files/* $(IDIR_ASTERISK)/
+	install -d -m0755 $(IDIR_ASTERISK)/etc/init.d
-	find $(IDIR_ASTERISK) -name CVS | xargs rm -rf
+	install -m0755  ./files/asterisk.init $(IDIR_ASTERISK)/etc/init.d/asterisk
-	chmod +x $(IDIR_ASTERISK)/etc/init.d/*
+	ln -sf asterisk $(IDIR_ASTERISK)/etc/init.d/S60asterisk
+	$(RSTRIP) $(IDIR_ASTERISK)
 	$(IPKG_BUILD) $(IDIR_ASTERISK) $(PACKAGE_DIR)
 
-$(IPKG_ASTERISK_MYSQL): asterisk-compile
+$(IPKG_ASTERISK_MYSQL):
-	mkdir -p $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules
+	install -d -m0755 $(IDIR_ASTERISK_MYSQL)/etc/asterisk
-	mkdir -p $(IDIR_ASTERISK_MYSQL)/etc/asterisk
+	install -m0600 $(PKG_BUILD_DIR)/configs/cdr_mysql.conf.sample $(IDIR_ASTERISK_MYSQL)/etc/asterisk/cdr_mysql.conf
-	cp $(PKG_BUILD_DIR)/apps/app_sql_mysql.so $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules/
+	install -d -m0755 $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules
-	cp $(PKG_BUILD_DIR)/cdr/cdr_mysql.so $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules/
+	install -m0755 $(PKG_BUILD_DIR)/apps/app_sql_mysql.so $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules/
-	$(STRIP) $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules/*
+	install -m0755 $(PKG_BUILD_DIR)/cdr/cdr_mysql.so $(IDIR_ASTERISK_MYSQL)/usr/lib/asterisk/modules/
-	cp $(PKG_BUILD_DIR)/configs/cdr_mysql.conf.sample $(IDIR_ASTERISK_MYSQL)/etc/asterisk/cdr_mysql.conf
+	$(RSTRIP) $(IDIR_ASTERISK_MYSQL)
 	$(IPKG_BUILD) $(IDIR_ASTERISK_MYSQL) $(PACKAGE_DIR)
 
-$(IPKG_ASTERISK_PGSQL): asterisk-compile
+$(IPKG_ASTERISK_PGSQL):
-	mkdir -p $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules
+	install -d -m0755 $(IDIR_ASTERISK_PGSQL)/etc/asterisk
-	mkdir -p $(IDIR_ASTERISK_PGSQL)/etc/asterisk
+	install -m0600 $(PKG_BUILD_DIR)/configs/cdr_pgsql.conf.sample $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
-	cp $(PKG_BUILD_DIR)/apps/app_sql_postgres.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
+	install -d -m0755 $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules
-	cp $(PKG_BUILD_DIR)/cdr/cdr_pgsql.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
+	install -m0755 $(PKG_BUILD_DIR)/apps/app_sql_postgres.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
-	$(STRIP) $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/*
+	install -m0755 $(PKG_BUILD_DIR)/cdr/cdr_pgsql.so $(IDIR_ASTERISK_PGSQL)/usr/lib/asterisk/modules/
-	cp $(PKG_BUILD_DIR)/configs/cdr_pgsql.conf.sample $(IDIR_ASTERISK_PGSQL)/etc/asterisk/cdr_pgsql.conf
+	$(RSTRIP) $(IDIR_ASTERISK_PGSQL)
 	$(IPKG_BUILD) $(IDIR_ASTERISK_PGSQL) $(PACKAGE_DIR)
 
-$(IPKG_ASTERISK_SOUNDS): asterisk-compile
+$(IPKG_ASTERISK_SOUNDS):
-	mkdir -p $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds
+	install -d -m0755 $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds
-	cp -a $(PKG_BUILD_DIR)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
+	cp -fpR $(PKG_BUILD_DIR)/sounds/* $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/
 	rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/*.mp3
 	rm -f $(IDIR_ASTERISK_SOUNDS)/usr/lib/asterisk/sounds/vm-*
 	$(IPKG_BUILD) $(IDIR_ASTERISK_SOUNDS) $(PACKAGE_DIR)
 
-$(IPKG_ASTERISK_SPEEX): asterisk-compile
+$(IPKG_ASTERISK_VOICEMAIL):
-	mkdir -p $(IDIR_ASTERISK_SPEEX)/usr/lib/asterisk/modules
+	install -d -m0755 $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk
-	cp $(PKG_BUILD_DIR)/codecs/*speex.so $(IDIR_ASTERISK_SPEEX)/usr/lib/asterisk/modules
+	install -m0644 $(PKG_BUILD_DIR)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
-	$(STRIP) $(IDIR_ASTERISK_SPEEX)/usr/lib/asterisk/modules/*
+	install -d -m0755 $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
-	$(IPKG_BUILD) $(IDIR_ASTERISK_SPEEX) $(PACKAGE_DIR)
+	install -m0755 $(PKG_BUILD_DIR)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/
-
+	$(RSTRIP) $(IDIR_ASTERISK_VOICEMAIL)
-$(IPKG_ASTERISK_VOICEMAIL): asterisk-compile
-	mkdir -p $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk
-	cp $(PKG_BUILD_DIR)/configs/voicemail.conf.sample $(IDIR_ASTERISK_VOICEMAIL)/etc/asterisk/voicemail.conf
-	mkdir -p $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
-	cp $(PKG_BUILD_DIR)/apps/*voicemail.so $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules
-	$(STRIP) $(IDIR_ASTERISK_VOICEMAIL)/usr/lib/asterisk/modules/*
 	$(IPKG_BUILD) $(IDIR_ASTERISK_VOICEMAIL) $(PACKAGE_DIR)
+
+$(IPKG_ASTERISK_CODEC_ILBC):
+	install -d -m0755 $(IDIR_ASTERISK_CODEC_ILBC)/usr/lib/asterisk/modules
+	install -m0755 $(PKG_BUILD_DIR)/codecs/codec_ilbc.so $(IDIR_ASTERISK_CODEC_ILBC)/usr/lib/asterisk/modules/
+	install -m0755 $(PKG_BUILD_DIR)/formats/format_ilbc.so $(IDIR_ASTERISK_CODEC_ILBC)/usr/lib/asterisk/modules/
+	$(RSTRIP) $(IDIR_ASTERISK_CODEC_ILBC)
+	$(IPKG_BUILD) $(IDIR_ASTERISK_CODEC_ILBC) $(PACKAGE_DIR)
+
+$(IPKG_ASTERISK_CODEC_LPC10):
+	install -d -m0755 $(IDIR_ASTERISK_CODEC_LPC10)/usr/lib/asterisk/modules
+	install -m0755 $(PKG_BUILD_DIR)/codecs/codec_lpc10.so $(IDIR_ASTERISK_CODEC_LPC10)/usr/lib/asterisk/modules/
+	$(RSTRIP) $(IDIR_ASTERISK_CODEC_LPC10)
+	$(IPKG_BUILD) $(IDIR_ASTERISK_CODEC_LPC10) $(PACKAGE_DIR)
+
+$(IPKG_ASTERISK_CODEC_SPEEX):
+	install -d -m0755 $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules
+	install -m0755 $(PKG_BUILD_DIR)/codecs/codec_speex.so $(IDIR_ASTERISK_CODEC_SPEEX)/usr/lib/asterisk/modules/
+	$(RSTRIP) $(IDIR_ASTERISK_CODEC_SPEEX)
+	$(IPKG_BUILD) $(IDIR_ASTERISK_CODEC_SPEEX) $(PACKAGE_DIR)
+
+$(IPKG_ASTERISK_PBX_DUNDI):
+	install -d -m0755 $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk
+	install -m0644 $(PKG_BUILD_DIR)/configs/dundi.conf.sample $(IDIR_ASTERISK_PBX_DUNDI)/etc/asterisk/dundi.conf
+	install -d -m0755 $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules
+	install -m0755 $(PKG_BUILD_DIR)/pbx/pbx_dundi.so $(IDIR_ASTERISK_PBX_DUNDI)/usr/lib/asterisk/modules/
+	$(RSTRIP) $(IDIR_ASTERISK_PBX_DUNDI)
+	$(IPKG_BUILD) $(IDIR_ASTERISK_PBX_DUNDI) $(PACKAGE_DIR)
+

openwrt/package/asterisk/ipkg/asterisk-codec-ilbc.control

@@ -0,0 +1,7 @@
+Package: asterisk-codec-ilbc
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: an Internet Low Bitrate Codec (ILBC) Translator for Asterisk
+Depends: asterisk

openwrt/package/asterisk/ipkg/asterisk-codec-lpc10.control

@@ -0,0 +1,7 @@
+Package: asterisk-codec-lpc10
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: an LPC10 (Linear Predictor Code) 2.4kbps Voice Coder for Asterisk
+Depends: asterisk

openwrt/package/asterisk/ipkg/asterisk-pbx-dundi.conffiles

@@ -0,0 +1 @@
+/etc/asterisk/dundi.conf

openwrt/package/asterisk/ipkg/asterisk-pbx-dundi.control

@@ -0,0 +1,7 @@
+Package: asterisk-pbx-dundi
+Priority: optional
+Section: net
+Maintainer: Felix Fietkau <nbd@vd-s.ath.cx>
+Source: buildroot internal
+Description: Distributed Universal Number Discovery (DUNDi) support for Asterisk
+Depends: asterisk