From 4b395e935801871a8c1b4c6834655c18d9792449 Mon Sep 17 00:00:00 2001 From: Jiri Slachta Date: Thu, 7 Apr 2016 16:20:12 +0200 Subject: [PATCH] asterisk-{11.x,13.x}: remove module fax and fax-spandsp Signed-off-by: Jiri Slachta --- net/asterisk-11.x/Makefile | 13 ++----------- net/asterisk-13.x/Makefile | 5 ++--- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index 6dbfe77..d7ef9f3 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 PKG_VERSION:=11.22.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -210,14 +210,6 @@ else --without-postgres endif -ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-fax-spandsp),) - CONFIGURE_ARGS+= \ - --with-spandsp="$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= \ - --without-spandsp -endif - ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk11-res-srtp),) CONFIGURE_ARGS+= \ --with-srtp="$(STAGING_DIR)/usr" @@ -263,6 +255,7 @@ CONFIGURE_ARGS+= \ --without-pwlib \ --without-radius \ --without-sdl \ + --without-spandsp \ --without-sqlite \ --with-sqlite3="$(STAGING_DIR)/usr" \ --without-suppserv \ @@ -444,8 +437,6 @@ $(eval $(call BuildAsterisk11Module,res-ael-share,Shareable AEL code,support for $(eval $(call BuildAsterisk11Module,res-agi,Asterisk Gateway Interface,Support for the Asterisk Gateway Interface extension,,,,res_agi,)) $(eval $(call BuildAsterisk11Module,res-calendar,Calendaring API,Calendaring support (ICal and Google Calendar),,/etc/asterisk/calendar.conf,calendar.conf,res_calendar,,)) $(eval $(call BuildAsterisk11Module,res-clioriginate,Calls via CLI,Originate calls via the CLI,,,,res_clioriginate,)) -$(eval $(call BuildAsterisk11Module,res-fax-spandsp,Spandsp T.38 and G.711,Spandsp T.38 and G.711 FAX Resource,+asterisk11-res-fax +libspandsp +libtiff,,,res_fax_spandsp,)) -$(eval $(call BuildAsterisk11Module,res-fax,FAX modules,Generic FAX resource for FAX technology resource modules,+asterisk11-res-timing-pthread,/etc/asterisk/res_fax.conf /etc/asterisk/udptl.conf,udptl.conf res_fax.conf,res_fax,)) $(eval $(call BuildAsterisk11Module,res-monitor,Provide Monitor,Cryptographic Signature capability,,,,res_monitor,)) $(eval $(call BuildAsterisk11Module,res-musiconhold,MOH,Music On Hold support,,/etc/asterisk/musiconhold.conf,musiconhold.conf,res_musiconhold,)) $(eval $(call BuildAsterisk11Module,res-phoneprov,Phone Provisioning,Phone provisioning application for the asterisk internal http server,,/etc/asterisk/phoneprov.conf,phoneprov.conf,res_phoneprov,)) diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile index fc6c12f..b67c6ba 100644 --- a/net/asterisk-13.x/Makefile +++ b/net/asterisk-13.x/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk13 PKG_VERSION:=13.8.0 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ @@ -207,7 +207,7 @@ CONFIGURE_ARGS+= \ --with-popt="$(STAGING_DIR)/usr" \ --without-pwlib \ --without-radius \ - $(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-fax-spandsp),--with-spandsp="$(STAGING_DIR)/usr",--without-spandsp) \ + --without-spandsp \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-res-xmpp),--with-iksemel="$(STAGING_DIR)/usr",--without-iksemel) \ --without-sdl \ --without-sqlite \ @@ -388,7 +388,6 @@ $(eval $(call BuildAsterisk13Module,res-ael-share,Shareable AEL code,support for $(eval $(call BuildAsterisk13Module,res-agi,Asterisk Gateway Interface,Support for the Asterisk Gateway Interface extension,,,res_agi,,)) $(eval $(call BuildAsterisk13Module,res-calendar,Calendaring API,Calendaring support (ICal and Google Calendar),,calendar.conf,res_calendar,,)) $(eval $(call BuildAsterisk13Module,res-clioriginate,Calls via CLI,Originate calls via the CLI,,,res_clioriginate,,)) -$(eval $(call BuildAsterisk13Module,res-fax,FAX modules,Generic FAX resource for FAX technology resource modules,+asterisk13-res-timing-pthread,udptl.conf res_fax.conf,res_fax,,)) $(eval $(call BuildAsterisk13Module,res-hep,HEPv3 API,,,,res_hep,,)) $(eval $(call BuildAsterisk13Module,res-hep-pjsip,PJSIP HEPv3 Logger,,+asterisk13-res-hep +asterisk13-pjsip,,res_hep,,)) $(eval $(call BuildAsterisk13Module,res-hep-rtcp,RTCP HEPv3 Logger,,+asterisk13-res-hep,,res_hep,,)) -- 2.30.2