From 83167e3809ac886c3630cc834bce0c53d80174e8 Mon Sep 17 00:00:00 2001 From: Dirk Wagner Date: Tue, 29 Apr 2014 08:32:21 +0200 Subject: [PATCH] asterisk addon: Update to 11.9.0. Removed ffmpeg and spandsp dependencies due to licence issues. --- config/rootfiles/packages/asterisk | 24 ++++++++++++------------ lfs/asterisk | 17 ++++++++++++----- src/patches/asterisk-no-ffmpeg.patch | 11 +++++++++++ 3 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 src/patches/asterisk-no-ffmpeg.patch diff --git a/config/rootfiles/packages/asterisk b/config/rootfiles/packages/asterisk index 5140c90e4c..0fab2ea61d 100755 --- a/config/rootfiles/packages/asterisk +++ b/config/rootfiles/packages/asterisk @@ -298,7 +298,7 @@ usr/lib/asterisk/modules/format_h263.so usr/lib/asterisk/modules/format_h264.so usr/lib/asterisk/modules/format_ilbc.so usr/lib/asterisk/modules/format_jpeg.so -usr/lib/asterisk/modules/format_ogg_vorbis.so +#usr/lib/asterisk/modules/format_ogg_vorbis.so usr/lib/asterisk/modules/format_pcm.so usr/lib/asterisk/modules/format_siren14.so usr/lib/asterisk/modules/format_siren7.so @@ -370,7 +370,7 @@ usr/lib/asterisk/modules/res_convert.so usr/lib/asterisk/modules/res_crypto.so usr/lib/asterisk/modules/res_curl.so usr/lib/asterisk/modules/res_fax.so -usr/lib/asterisk/modules/res_fax_spandsp.so +#usr/lib/asterisk/modules/res_fax_spandsp.so usr/lib/asterisk/modules/res_format_attr_celt.so usr/lib/asterisk/modules/res_format_attr_h263.so usr/lib/asterisk/modules/res_format_attr_h264.so @@ -520,7 +520,7 @@ var/ipfire/asterisk/wakeup/wakeup.sh var/ipfire/asterisk/xmpp.conf var/ipfire/backup/addons/includes/asterisk #var/lib/asterisk -#var/lib/asterisk/agi-bin +var/lib/asterisk/agi-bin #var/lib/asterisk/documentation #var/lib/asterisk/documentation/appdocsxml.dtd #var/lib/asterisk/documentation/core-en_US.xml @@ -528,9 +528,9 @@ var/ipfire/backup/addons/includes/asterisk #var/lib/asterisk/firmware var/lib/asterisk/firmware/iax #var/lib/asterisk/images -var/lib/asterisk/images/asterisk-intro.jpg -var/lib/asterisk/images/kpad2.jpg -#var/lib/asterisk/keys +#var/lib/asterisk/images/asterisk-intro.jpg +#var/lib/asterisk/images/kpad2.jpg +var/lib/asterisk/keys #var/lib/asterisk/moh var/lib/asterisk/moh/.asterisk-moh-opsound-gsm-2.03 var/lib/asterisk/moh/.asterisk-moh-opsound-wav-2.03 @@ -2872,12 +2872,12 @@ var/lib/asterisk/sounds/phonetic/de/x_p.gsm var/lib/asterisk/sounds/phonetic/de/y_p.gsm var/lib/asterisk/sounds/phonetic/de/z_p.gsm #var/lib/asterisk/static-http -var/lib/asterisk/static-http/ajamdemo.html -var/lib/asterisk/static-http/astman.css -var/lib/asterisk/static-http/astman.js -var/lib/asterisk/static-http/core-en_US.xml -var/lib/asterisk/static-http/mantest.html -var/lib/asterisk/static-http/prototype.js +#var/lib/asterisk/static-http/ajamdemo.html +#var/lib/asterisk/static-http/astman.css +#var/lib/asterisk/static-http/astman.js +#var/lib/asterisk/static-http/core-en_US.xml +#var/lib/asterisk/static-http/mantest.html +#var/lib/asterisk/static-http/prototype.js #var/log/asterisk var/log/asterisk/cdr-csv var/log/asterisk/cdr-custom diff --git a/lfs/asterisk b/lfs/asterisk index 1706ba0cc0..a87cad928c 100755 --- a/lfs/asterisk +++ b/lfs/asterisk @@ -20,7 +20,7 @@ include Config -VER = 11.8.1 +VER = 11.9.0 THISAPP = asterisk-$(VER) DL_FILE = $(THISAPP).tar.gz @@ -28,9 +28,9 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = asterisk -PAK_VER = 9 +PAK_VER = 10 -DEPS = "sqlite ffmpeg spandsp" +DEPS = "sqlite" ############################################################################### # Top-level Rules @@ -48,7 +48,7 @@ asterisk-extra-sounds-en-gsm-1.4.14.tar.gz = $(URL_IPFIRE)/asterisk-extra-sounds 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 -$(DL_FILE)_MD5 = 7bace8e6845188ca68b8d682d71cb1cc +$(DL_FILE)_MD5 = 743e7dc0112e24f794453443b17ce42b srtp-1.4.2.tar.gz_MD5 = 7b0ffbfad9bbaf33d397027e031cb35a asterisk-extra-sounds-en-gsm-1.4.14.tar.gz_MD5 = ffc2e0ffd783c03fef5b75277dba0896 asterisk-moh-opsound-gsm-2.03.tar.gz_MD5 = 09066f55f1358f298bc1a6e4678a3ddf @@ -90,14 +90,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_SRC)/srtp && ./configure --prefix=/usr && make uninstall && make && make install # remove old directories and extract asterisk - @rm -rf $(DIR_APP) $(DIR_SRC)/asterisk-* $(DIR_SRC)/agx-ast-addons && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + # patch asterisk + cd $(DIR_APP) && patch -p4 < $(DIR_SRC)/src/patches/asterisk-no-ffmpeg.patch + # configure asterisk cd $(DIR_APP) && ./configure --prefix=/usr --sysconfdir=/var/ipfire \ --without-oss \ --without-sdl \ --without-SDL_image \ --without-netsnmp \ + --without-avcodec \ + --without-vorbis \ + --without-ogg \ + --without-spandsp \ --disable-xmldoc # enable additional features (include following sound-tars) diff --git a/src/patches/asterisk-no-ffmpeg.patch b/src/patches/asterisk-no-ffmpeg.patch new file mode 100644 index 0000000000..7bc2e841ff --- /dev/null +++ b/src/patches/asterisk-no-ffmpeg.patch @@ -0,0 +1,11 @@ +--- build/usr/src/asterisk-11.9.0/res/Makefile.orig 2014-04-28 20:30:50.500877461 +0200 ++++ build/usr/src/asterisk-11.9.0/res/Makefile 2014-04-28 20:31:39.357034757 +0200 +@@ -75,7 +75,7 @@ + rm -f pjproject/build.mak + + pjproject/build.mak: pjproject/aconfigure +- (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec) ++ (cd pjproject && CFLAGS="-fPIC" ./configure --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) --disable-floating-point --disable-sound --disable-oss --disable-speex-aec --disable-l16-codec --disable-gsm-codec --disable-g722-codec --disable-g7221-codec --disable-speex-codec --disable-ilbc-codec --disable-g711-codec --disable-opencore-amrnb --disable-video --disable-sdl --disable-ffmpeg --disable-v4l2) + + ifneq ($(findstring $(MAKECMDGOALS),all),) + -include pjproject/build.mak -- 2.39.2