X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fasterisk;h=d2b1976cdeecef89a86b074ceffc1ebda276c5a0;hp=6a7b93fc0a5d8360ece564be7d000253dab8fae3;hb=5561ea4a71350e0c851534bed430bc5ef60547ad;hpb=b6541fec20b01af251f8f0a865bbc69c5d80959f

diff --git a/lfs/asterisk b/lfs/asterisk
index 6a7b93fc0..d2b1976cd 100644
--- a/lfs/asterisk
+++ b/lfs/asterisk
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2012  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -24,7 +24,7 @@
 
 include Config
 
-VER        = 1.4.26.3
+VER        = 1.8.19.0
 
 THISAPP    = asterisk-$(VER)
 DL_FILE    = $(THISAPP).tar.gz
@@ -32,45 +32,33 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 PROG       = asterisk
-PAK_VER    = 5
+PAK_VER    = 8
 
-CHAN_CAPI  = chan_capi-1.1.4
+CHAN_CAPI  = chan_capi-20120614
 
-DEPS       = "libpri spandsp sox dahdi"
-#
-# TODO: checked all needed dependencies for asterisk 1.4.26
-#       started from clean system, checked all libs with ldd and
-#       found this ones:
-#       "libpri dahdi-tools dahdi-linux alsa cyrus-sasl libogg libtiff libvorbis netsnmpd spandsp"
-#
+DEPS       = "libpri libtiff libvorbis libogg spandsp netsnmpd"
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
 objects = $(DL_FILE) \
-	   asterisk-1.4-de-prompts.tar.gz \
-	   asterisk-core-sounds-en-alaw-1.4.15.tar.gz \
-	   asterisk-extra-sounds-en-alaw-1.4.9.tar.gz \
-	   asterisk-addons-1.4.9.tar.gz \
-	   agx-ast-addons-svn65.tgz \
-	   $(CHAN_CAPI).tar.gz
+	asterisk-1.4-de-prompts.tar.gz \
+	asterisk-extra-sounds-en-gsm-1.4.11.tar.gz \
+	asterisk-moh-opsound-gsm-2.03.tar.gz \
+	$(CHAN_CAPI).tgz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-asterisk-core-sounds-en-alaw-1.4.15.tar.gz = $(URL_IPFIRE)/asterisk-core-sounds-en-alaw-1.4.15.tar.gz
-asterisk-extra-sounds-en-alaw-1.4.9.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-alaw-1.4.9.tar.gz
+asterisk-extra-sounds-en-gsm-1.4.11.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz
+asterisk-moh-opsound-gsm-2.03.tar.gz = $(URL_IPFIRE)/asterisk-moh-opsound-gsm-2.03.tar.gz
 asterisk-1.4-de-prompts.tar.gz = $(URL_IPFIRE)/asterisk-1.4-de-prompts.tar.gz
-asterisk-addons-1.4.9.tar.gz = $(URL_IPFIRE)/asterisk-addons-1.4.9.tar.gz
-agx-ast-addons-svn65.tgz = $(URL_IPFIRE)/agx-ast-addons-svn65.tgz
-$(CHAN_CAPI).tar.gz = $(URL_IPFIRE)/$(CHAN_CAPI).tar.gz
+$(CHAN_CAPI).tgz = $(URL_IPFIRE)/$(CHAN_CAPI).tgz
 
-$(DL_FILE)_MD5 = 04017dfdc8caeb8f4663b5dc4a9e1019
-asterisk-core-sounds-en-alaw-1.4.15.tar.gz_MD5 = e9531e871d5b24e7b83d3ef946390d40
-asterisk-extra-sounds-en-alaw-1.4.9.tar.gz_MD5 = 4fa1b8d096a66b3a39b6d0e52fe3f1ad
+$(DL_FILE)_MD5 = dc98436846cc2de57100d78747b1bdd1
+asterisk-extra-sounds-en-gsm-1.4.11.tar.gz_MD5 = 5479cb4cb81d678304d96f35e4933a11
+asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf
 asterisk-1.4-de-prompts.tar.gz_MD5 = 626a2b95071a5505851e43874dfbfd5c
-asterisk-addons-1.4.9.tar.gz_MD5 = 0c0ddf2386a9541e416e122ca082e611
-agx-ast-addons-svn65.tgz_MD5 = 9372d818cc68337658110f793d0fd8e0
-$(CHAN_CAPI).tar.gz_MD5 = 18fa835e724b7814deafbfa5b8cb01eb
+$(CHAN_CAPI).tgz_MD5 = c190f44eb362bf258b27f92c3458e4bf
 
 install : $(TARGET)
 
@@ -113,24 +101,20 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cd $(DIR_APP) && cp -fv $(DIR_SRC)/config/asterisk/asterisk.makeopts menuselect.makeopts
 
 	# add additional sounds
-	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-core-sounds-en-alaw-1.4.15.tar.gz $(DIR_APP)/sounds/asterisk-core-sounds-en-alaw-1.4.15.tar.gz
-	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-alaw-1.4.9.tar.gz $(DIR_APP)/sounds/asterisk-extra-sounds-en-alaw-1.4.9.tar.gz
+	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz $(DIR_APP)/sounds/
+	cd $(DIR_APP) && cp -fv $(DIR_DL)/asterisk-moh-opsound-gsm-2.03.tar.gz $(DIR_APP)/sounds/
+
+	# Fix wrong cpu optimization (march=armv5tel)
+	cd $(DIR_APP) && sed -i -e "s|^PROC=armv5te.*|PROC=armv5te|g" makeopts
+
+	# Add armv5te to gsm codecs
+	cd $(DIR_APP) && sed -i -e "s|armv5b |*armv5te |g" codecs/gsm/Makefile
 
 	# compile and install
 	cd $(DIR_APP) && make $(MAKETUNING) all
 	cd $(DIR_APP) && make install
 	cd $(DIR_APP) && make samples
 
-	# extract and configure asterisk-addons
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/asterisk-addons-1.4.9.tar.gz
-	cd $(DIR_SRC)/asterisk-addons-* && ./configure --prefix=/usr --sysconfdir=/var/ipfire
-	# enable additional features (--> NOT NEEDED, DEFAULT CONFIG INCLUDES ALL)
-	#cd $(DIR_SRC)/asterisk-addons-* && cp -f $(DIR_SRC)/config/asterisk/addons.makeopts menuselect.makeopts
-	# make and install asterisk-addons
-	cd $(DIR_SRC)/asterisk-addons-* && make $(MAKETUNING) all
-	cd $(DIR_SRC)/asterisk-addons-* && make install
-	cd $(DIR_SRC)/asterisk-addons-* && make samples
-
 	# add german sounds and remove README.txt
 	tar xfz $(DIR_DL)/asterisk-1.4-de-prompts.tar.gz -C /var/lib/asterisk/sounds/
 	-rm -f /var/lib/asterisk/sounds/README.txt
@@ -146,20 +130,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -f -s /var/ipfire/asterisk/wakeup/wakeup.sh /etc/fcron.minutely/wakeup.sh
 
 	# build and install chan capi (needed for isdn)
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tar.gz
-	cd $(DIR_SRC)/$(CHAN_CAPI) && make $(MAKETUNING)
-	cd $(DIR_SRC)/$(CHAN_CAPI) && make install
-	@rm -rf $(DIR_SRC)/$(CHAN_CAPI)
-
-	# build FAX stuff (TODO: get newer version... where to download source?)
-	cd $(DIR_SRC) && tar zxf $(DIR_DL)/agx-ast-addons-svn65.tgz
-	# bugfix: disable app_confcall (not supported with dahdi, but we can take meetme)
-	cd $(DIR_SRC)/agx-ast-addons && echo "project (agx-ast-addons-zaptel)" > ./app-dahdi/CMakeLists.txt
-	cd $(DIR_SRC)/agx-ast-addons && echo >> ./app-dahdi/CMakeLists.txt
-	# end bugfix
-	cd $(DIR_SRC)/agx-ast-addons && ./configure.sh
-	cd $(DIR_SRC)/agx-ast-addons && ./build.sh
-	@rm -rf $(DIR_SRC)/agx-ast-addons
+	cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(CHAN_CAPI).tgz
+	cd $(DIR_SRC)/chan-capi-HEAD && sed -i -e 's/^CFLAGS+=-Wno-unused-but-set-variable$$//' Makefile
+	cd $(DIR_SRC)/chan-capi-HEAD && make $(MAKETUNING)
+	cd $(DIR_SRC)/chan-capi-HEAD && make install
+	@rm -rf $(DIR_SRC)/chan-capi-HEAD
 
 	# be sure all source is removed
 	@rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-*