diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 5c5466b5b..0e15637bb 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2009-2013 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,19 +10,19 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch PKG_DISTNAME:=$(PKG_NAME)_git -PKG_VERSION:=1.0.7 -PKG_RELEASE:=2 +PKG_VERSION:=1.3.13b +PKG_RELEASE:=1 # # The latest FS git hash in PKG_REV can be obtained from http://fisheye.freeswitch.org # -PKG_REV:=54b4b088d911d4c80f224ed561d8e278229a75ff +PKG_REV:=5e3a6fc5e6f40be5d68c8b3cfbbfa3227fe06c2f PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(shell echo $(PKG_REV)|cut -b -9).tar.bz2 +PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(shell echo $(PKG_REV)|cut -b -7).tar.xz PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) @@ -31,6 +31,7 @@ PKG_BUILD_PARALLEL:=1 FS_MOD_AVAILABLE:= \ + abstraction \ alsa \ amr \ amrwb \ @@ -78,8 +79,11 @@ FS_MOD_AVAILABLE:= \ h26x \ h323 \ hash \ + html5 \ + httapi \ http-cache \ ilbc \ + isac \ java \ json-cdr \ lcr \ @@ -89,18 +93,24 @@ FS_MOD_AVAILABLE:= \ lua \ managed \ mp4 \ + mp4v \ native-file \ nibblebill \ openzap \ opus \ + oreka \ portaudio \ portaudio-stream \ + posix-timer \ radius-cdr \ + redis \ rss \ rtmp \ + sangoma-codec \ say-de \ say-en \ say-es \ + say-fa \ say-fr \ say-hu \ say-it \ @@ -112,6 +122,7 @@ FS_MOD_AVAILABLE:= \ shell-stream \ silk \ siren \ + skel \ skinny \ skypopen \ sms \ @@ -121,6 +132,7 @@ FS_MOD_AVAILABLE:= \ snmp \ snom \ sofia \ + sonar \ spandsp \ speex \ spidermonkey \ @@ -138,9 +150,11 @@ FS_MOD_AVAILABLE:= \ valet-parking \ vmd \ voicemail \ + voicemail-ivr \ xml-cdr \ xml-curl \ xml-rpc \ + xml-scgi \ yaml \ @@ -173,7 +187,7 @@ endef define Package/$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) TITLE:=FreeSWITCH open source telephony platform - DEPENDS:= +libreadline +libncurses +libpthread +libstdcpp +libopenssl +libpq +librt +zlib + DEPENDS:=+libcurl +libjpeg +libncurses +libpq +libpthread +librt +libstdcpp MENU:=1 endef @@ -394,17 +408,17 @@ endif ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),) - $(eval $(call Download/files,flite,flite-1.5.1-current.tar.bz2,36e5d1c1307161211c8ffe9a75a623ae,,downloads/libs/,libs/)) + $(eval $(call Download/files,flite,flite-1.5.4-current.tar.bz2,f3a2d88b1059f6f4ff3c20a8169bc0f4,,downloads/libs/,libs/)) endif ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-opus),) - $(eval $(call Download/files,opus,opus-0.9.0.tar.gz,8a729db587430392e64280a499e9d061,,downloads/libs/,libs/)) + $(eval $(call Download/files,opus,opus-1.0.2.tar.gz,ic503ad05a59ddb44deab96204401be03,,downloads/libs/,libs/)) endif ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en),) - $(eval $(call Download/files,sounds-en,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.16.tar.gz,bde0883eb75fe06f39bde11f50a1f858,,,)) + $(eval $(call Download/files,sounds-en,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.22.tar.gz,cff509d878708ce5e6e7fedac7f683ef,,,)) MAKE_INSTALL_TARGETS+= sounds-install endif @@ -460,21 +474,23 @@ CONFIGURE_ARGS+= \ CONFIGURE_VARS+= \ - config_TARGET_CC="${TARGET_CC}" \ + config_TARGET_CC="$(TOOLCHAIN_DIR)/bin/${TARGET_CC}" \ config_TARGET_CFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CFLAGS}" \ - config_TARGET_CXX="${TARGET_CXX}" \ + config_TARGET_CXX="$(TOOLCHAIN_DIR)/bin/${TARGET_CXX}" \ config_TARGET_CXXFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CXXFLAGS}" \ config_TARGET_CPPFLAGS="${FS_TARGET_CPPFLAGS}" \ config_TARGET_READLINE_INC="${FS_TARGET_CPPFLAGS}" \ config_TARGET_READLINE_LIBS="${TARGET_LDFLAGS} -lreadline -lncurses" \ - config_TARGET_LIBS="${TARGET_LDFLAGS} -lpthread" \ + config_TARGET_LIBS="${TARGET_LDFLAGS} -lpthread -ldl" \ config_BUILD_CC="${HOSTCC}" \ config_BUILD_CFLAGS="${HOST_CFLAGS}" \ CC_FOR_BUILD="${HOSTCC}" \ + BUILDTOOL_CC="${HOSTCC}" \ + BUILDTOOL_CCLD="${HOSTCC}" \ LDFLAGS="$$$$LDFLAGS" \ LDFLAGS_FOR_BUILD="${HOST_LDFLAGS}" \ - CC="${TARGET_CC}" \ - CXX="${TARGET_CXX}" \ + CC="$(TOOLCHAIN_DIR)/bin/${TARGET_CC}" \ + CXX="$(TOOLCHAIN_DIR)/bin/${TARGET_CXX}" \ CFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CFLAGS}" \ CXXFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CXXFLAGS}" \ CPPFLAGS="${FS_TARGET_CPPFLAGS}" \ @@ -515,6 +531,9 @@ endef define Build/Configure + if [ -d $(PKG_BUILD_DIR)/libs/libcodec2/src ]; then \ + (cd $(PKG_BUILD_DIR)/libs/libcodec2/src; $(HOSTCC) -c generate_codebook.c; $(HOSTCC) -o generate_codebook generate_codebook.o -lm) \ + fi (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh) $(call Build/Configure/Default,) $(foreach m,$(FS_MOD_AVAILABLE), @@ -529,10 +548,10 @@ endef define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - AR="$(TARGET_CROSS)ar" \ - RANLIB="$(TARGET_CROSS)ranlib" \ - CC="$(TARGET_CC)" \ - CXX="$(TARGET_CXX)" \ + AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \ + RANLIB="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ranlib" \ + CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \ + CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ all $(MAKE_INSTALL_TARGETS) @@ -684,6 +703,7 @@ $(eval $(call BuildPackage,libopenzap)) # # $(eval $(call BuildPlugin,Name,Title,Files,Inter Depends,Extra Depends)) # +$(eval $(call BuildPlugin,abstraction,Abstraction epplication,mod_abstraction,,)) $(eval $(call BuildPlugin,alsa,Alsa endpoint,mod_alsa,,+alsa-lib)) $(eval $(call BuildPlugin,amr,GSM-AMR codec,mod_amr,,)) $(eval $(call BuildPlugin,amrwb,GSM-AMRWB,mod_amrwb,,)) @@ -731,8 +751,11 @@ $(eval $(call BuildPlugin,gsmopen,Short Message Service (SMS),mod_gsmopen,spands $(eval $(call BuildPlugin,h26x,H26X linear codec,mod_h26x,,)) $(eval $(call BuildPlugin,h323,h323 endpoint,mod_h323,,@BROKEN)) # missing header files (other packages needed) $(eval $(call BuildPlugin,hash,API for manipulating a hash table,mod_hash,,)) +$(eval $(call BuildPlugin,html5,HTML5 Endpoint Module,mod_html5,,)) +$(eval $(call BuildPlugin,httapi,HT Telephony API and HTTP caching,mod_httapi,,)) $(eval $(call BuildPlugin,http-cache,HTTP GET with caching,mod_http_cache,,+libcurl)) $(eval $(call BuildPlugin,ilbc,ILBC codec,mod_ilbc,,)) +$(eval $(call BuildPlugin,isac,isac Codec,mod_isac,,)) $(eval $(call BuildPlugin,java,Java language interface,mod_java,,@BROKEN)) # needs java $(eval $(call BuildPlugin,json-cdr,JSon-CDR interface,mod_json_cdr,,+libcurl)) $(eval $(call BuildPlugin,lcr,Least Cost Routing,mod_lcr,,)) @@ -742,18 +765,23 @@ $(eval $(call BuildPlugin,loopback,Loopback endpoint,mod_loopback,,)) $(eval $(call BuildPlugin,lua,Lua language interface,mod_lua,,+libstdcpp)) $(eval $(call BuildPlugin,managed,language mod_managed,mod_managed,,+glib2 @BROKEN)) # needs Mono $(eval $(call BuildPlugin,mp4,MP4 File Format support for video apps.,mod_mp4,,@BROKEN)) # needs libmp4v2 +$(eval $(call BuildPlugin,mp4v,MP4 CoDec support for video apps.,mod_mp4v,,)) $(eval $(call BuildPlugin,native-file,Native files,mod_native_file,,)) $(eval $(call BuildPlugin,nibblebill,Billing,mod_nibblebill,,)) +$(eval $(call BuildPlugin,oreka,Media Recording with Oreka,mod_oreka,,)) $(eval $(call BuildPlugin,openzap,Zaptel hardware interface,mod_openzap ozmod_analog ozmod_analog_em ozmod_isdn ozmod_skel ozmod_zt,,+libpcap +libopenzap)) $(eval $(call BuildPlugin,opus,Opus CoDec,mod_opus,,)) $(eval $(call BuildPlugin,portaudio,Local audio endpoint,mod_portaudio,,+alsa-lib)) $(eval $(call BuildPlugin,portaudio-stream,portaudio stream format,mod_portaudio_stream,,+alsa-lib)) +$(eval $(call BuildPlugin,posix-timer,POSIX compliance soft timer,mod_posix_timer,,)) $(eval $(call BuildPlugin,radius-cdr,Radius-CDR interface,mod_radius_cdr,,+freeradius2 @BROKEN)) # fails in freeradius-client +$(eval $(call BuildPlugin,redis,redis,mod_redis,,)) $(eval $(call BuildPlugin,rss,RRS feeds via TTS,mod_rss,,)) $(eval $(call BuildPlugin,rtmp,RTMP Protocol Handler,mod_rtmp,,)) $(eval $(call BuildPlugin,say-de,German say,mod_say_de,,)) $(eval $(call BuildPlugin,say-en,English say,mod_say_en,,)) $(eval $(call BuildPlugin,say-es,Spanish say,mod_say_es,,)) +$(eval $(call BuildPlugin,say-fa,Persian say,mod_say_fa,,)) $(eval $(call BuildPlugin,say-fr,French say,mod_say_fr,,)) $(eval $(call BuildPlugin,say-hu,Hungarian say,mod_say_hu,,)) $(eval $(call BuildPlugin,say-it,Italian say,mod_say_it,,)) @@ -765,6 +793,7 @@ $(eval $(call BuildPlugin,say-zh,Chineese say,mod_say_zh,,)) $(eval $(call BuildPlugin,shell-stream,Shell stream,mod_shell_stream,,)) $(eval $(call BuildPlugin,silk,codec mod_silk,mod_silk,,)) $(eval $(call BuildPlugin,siren,G.722.1 codec,mod_siren,,)) +$(eval $(call BuildPlugin,skel,Application Framework Demo Module,mod_skel,,)) $(eval $(call BuildPlugin,skinny,endpoint mod_skinny,mod_skinny,,)) $(eval $(call BuildPlugin,skypopen,Skype compatible endpoint,mod_skypopen,,@FEATURE_drawing-backend_libX11)) $(eval $(call BuildPlugin,sms,SMS application,mod_sms,,)) @@ -791,8 +820,10 @@ $(eval $(call BuildPlugin,unimrcp,MRCP interface,mod_unimrcp,,@BROKEN)) $(eval $(call BuildPlugin,valet-parking,application mod_valet_parking,mod_valet_parking,,)) $(eval $(call BuildPlugin,vmd,VoiceMail beep detection,mod_vmd,,)) $(eval $(call BuildPlugin,voicemail,VoiceMail,mod_voicemail,,)) +$(eval $(call BuildPlugin,voicemail-ivr,VoiceMail IVR,mod_voicemail_ivr,,)) $(eval $(call BuildPlugin,xml-cdr,XML-CDR handler,mod_xml_cdr,,+libcurl)) $(eval $(call BuildPlugin,xml-curl,XML-Curl gateway,mod_xml_curl,,+libcurl)) $(eval $(call BuildPlugin,xml-rpc,XML-RPC interface,mod_xml_rpc,,)) +$(eval $(call BuildPlugin,xml-scgi,SCGI XML Gateway,mod_xml_scgi,,)) $(eval $(call BuildPlugin,yaml,YAML dialplans,mod_yaml,,)) diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/ivr.conf.xml b/net/freeswitch/files/etc.minimal/autoload_configs/ivr.conf.xml new file mode 100644 index 000000000..bd4e73ded --- /dev/null +++ b/net/freeswitch/files/etc.minimal/autoload_configs/ivr.conf.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/net/freeswitch/files/etc.minimal/dialplan/default.xml b/net/freeswitch/files/etc.minimal/dialplan/default.xml index a368ee5d5..c62fee236 100644 --- a/net/freeswitch/files/etc.minimal/dialplan/default.xml +++ b/net/freeswitch/files/etc.minimal/dialplan/default.xml @@ -144,6 +144,15 @@ + + + + + + + + + diff --git a/net/freeswitch/files/etc.minimal/vars.xml b/net/freeswitch/files/etc.minimal/vars.xml index de1186a06..e7c4483e4 100644 --- a/net/freeswitch/files/etc.minimal/vars.xml +++ b/net/freeswitch/files/etc.minimal/vars.xml @@ -116,7 +116,7 @@ 127 - BV32 --> - + diff --git a/net/freeswitch/files/etc.packages/alsa/autoload_configs/alsa.conf.xml b/net/freeswitch/files/etc.packages/alsa/autoload_configs/alsa.conf.xml new file mode 100644 index 000000000..e589acaac --- /dev/null +++ b/net/freeswitch/files/etc.packages/alsa/autoload_configs/alsa.conf.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/callcenter.conf.xml b/net/freeswitch/files/etc.packages/callcenter/autoload_configs/callcenter.conf.xml similarity index 100% rename from net/freeswitch/files/etc.minimal/autoload_configs/callcenter.conf.xml rename to net/freeswitch/files/etc.packages/callcenter/autoload_configs/callcenter.conf.xml diff --git a/net/freeswitch/files/etc.packages/cdr_csv/autoload_configs/cdr_csv.conf.xml b/net/freeswitch/files/etc.packages/cdr-csv/autoload_configs/cdr_csv.conf.xml similarity index 88% rename from net/freeswitch/files/etc.packages/cdr_csv/autoload_configs/cdr_csv.conf.xml rename to net/freeswitch/files/etc.packages/cdr-csv/autoload_configs/cdr_csv.conf.xml index bcefd460b..8d796c68f 100644 --- a/net/freeswitch/files/etc.packages/cdr_csv/autoload_configs/cdr_csv.conf.xml +++ b/net/freeswitch/files/etc.packages/cdr-csv/autoload_configs/cdr_csv.conf.xml @@ -17,6 +17,7 @@ + diff --git a/net/freeswitch/files/etc.packages/cdr-mongodb/autoload_configs/cdr_mongodb.conf.xml b/net/freeswitch/files/etc.packages/cdr-mongodb/autoload_configs/cdr_mongodb.conf.xml new file mode 100644 index 000000000..ce366d1bd --- /dev/null +++ b/net/freeswitch/files/etc.packages/cdr-mongodb/autoload_configs/cdr_mongodb.conf.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/cdr_pg_csv/autoload_configs/cdr_pg_csv.conf.xml b/net/freeswitch/files/etc.packages/cdr-pg-csv/autoload_configs/cdr_pg_csv.conf.xml similarity index 100% rename from net/freeswitch/files/etc.packages/cdr_pg_csv/autoload_configs/cdr_pg_csv.conf.xml rename to net/freeswitch/files/etc.packages/cdr-pg-csv/autoload_configs/cdr_pg_csv.conf.xml diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/console.conf.xml b/net/freeswitch/files/etc.packages/console/autoload_configs/console.conf.xml similarity index 100% rename from net/freeswitch/files/etc.minimal/autoload_configs/console.conf.xml rename to net/freeswitch/files/etc.packages/console/autoload_configs/console.conf.xml diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/dingaling.conf.xml b/net/freeswitch/files/etc.packages/dingaling/autoload_configs/dingaling.conf.xml similarity index 74% rename from net/freeswitch/files/etc.minimal/autoload_configs/dingaling.conf.xml rename to net/freeswitch/files/etc.packages/dingaling/autoload_configs/dingaling.conf.xml index e68c8b4b4..ce1319112 100644 --- a/net/freeswitch/files/etc.minimal/autoload_configs/dingaling.conf.xml +++ b/net/freeswitch/files/etc.packages/dingaling/autoload_configs/dingaling.conf.xml @@ -1,6 +1,7 @@ + diff --git a/net/freeswitch/files/etc.packages/event_multicast/autoload_configs/event_multicast.conf.xml b/net/freeswitch/files/etc.packages/event-multicast/autoload_configs/event_multicast.conf.xml similarity index 100% rename from net/freeswitch/files/etc.packages/event_multicast/autoload_configs/event_multicast.conf.xml rename to net/freeswitch/files/etc.packages/event-multicast/autoload_configs/event_multicast.conf.xml diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/event_socket.conf.xml b/net/freeswitch/files/etc.packages/event-socket/autoload_configs/event_socket.conf.xml similarity index 100% rename from net/freeswitch/files/etc.minimal/autoload_configs/event_socket.conf.xml rename to net/freeswitch/files/etc.packages/event-socket/autoload_configs/event_socket.conf.xml diff --git a/net/freeswitch/files/etc.packages/httapi/autoload_configs/httapi.conf.xml b/net/freeswitch/files/etc.packages/httapi/autoload_configs/httapi.conf.xml new file mode 100644 index 000000000..68ab54818 --- /dev/null +++ b/net/freeswitch/files/etc.packages/httapi/autoload_configs/httapi.conf.xml @@ -0,0 +1,127 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/http_cache/autoload_configs/http_cache.conf.xml b/net/freeswitch/files/etc.packages/http-cache/autoload_configs/http_cache.conf.xml similarity index 71% rename from net/freeswitch/files/etc.packages/http_cache/autoload_configs/http_cache.conf.xml rename to net/freeswitch/files/etc.packages/http-cache/autoload_configs/http_cache.conf.xml index 4150d6472..4f0526965 100644 --- a/net/freeswitch/files/etc.packages/http_cache/autoload_configs/http_cache.conf.xml +++ b/net/freeswitch/files/etc.packages/http-cache/autoload_configs/http_cache.conf.xml @@ -3,6 +3,8 @@ + + diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/local_stream.conf.xml b/net/freeswitch/files/etc.packages/local-stream/autoload_configs/local_stream.conf.xml similarity index 100% rename from net/freeswitch/files/etc.minimal/autoload_configs/local_stream.conf.xml rename to net/freeswitch/files/etc.packages/local-stream/autoload_configs/local_stream.conf.xml diff --git a/net/freeswitch/files/etc.packages/logfile/autoload_configs/logfile.conf.xml b/net/freeswitch/files/etc.packages/logfile/autoload_configs/logfile.conf.xml index 57f276c4e..65bea552b 100644 --- a/net/freeswitch/files/etc.packages/logfile/autoload_configs/logfile.conf.xml +++ b/net/freeswitch/files/etc.packages/logfile/autoload_configs/logfile.conf.xml @@ -10,6 +10,9 @@ + + + diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/lua.conf.xml b/net/freeswitch/files/etc.packages/lua/autoload_configs/lua.conf.xml similarity index 100% rename from net/freeswitch/files/etc.minimal/autoload_configs/lua.conf.xml rename to net/freeswitch/files/etc.packages/lua/autoload_configs/lua.conf.xml diff --git a/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml b/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml index 1b44c9a1d..a7dbab0c0 100644 --- a/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml +++ b/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml @@ -9,3 +9,14 @@ + diff --git a/net/freeswitch/files/etc.packages/say-de/lang/de/demo/demo.xml b/net/freeswitch/files/etc.packages/say-de/lang/de/demo/demo.xml index 61582b205..fa77948b6 100644 --- a/net/freeswitch/files/etc.packages/say-de/lang/de/demo/demo.xml +++ b/net/freeswitch/files/etc.packages/say-de/lang/de/demo/demo.xml @@ -1,71 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-de/lang/de/vm/sounds.xml b/net/freeswitch/files/etc.packages/say-de/lang/de/vm/sounds.xml new file mode 100644 index 000000000..657e611c2 --- /dev/null +++ b/net/freeswitch/files/etc.packages/say-de/lang/de/vm/sounds.xml @@ -0,0 +1,413 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-de/lang/de/vm/tts.xml b/net/freeswitch/files/etc.packages/say-de/lang/de/vm/tts.xml index 7a8f18cf5..f91cae1b9 100644 --- a/net/freeswitch/files/etc.packages/say-de/lang/de/vm/tts.xml +++ b/net/freeswitch/files/etc.packages/say-de/lang/de/vm/tts.xml @@ -1,8 +1,9 @@ - + + - + @@ -10,7 +11,7 @@ - + @@ -18,7 +19,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -34,7 +35,7 @@ - + @@ -42,7 +43,7 @@ - + @@ -50,12 +51,12 @@ - + - + @@ -63,27 +64,25 @@ - + - - + - - + @@ -91,8 +90,8 @@ - + @@ -100,8 +99,8 @@ - + @@ -109,8 +108,8 @@ - + @@ -118,7 +117,7 @@ - + @@ -126,7 +125,7 @@ - + @@ -134,7 +133,7 @@ - + @@ -142,7 +141,7 @@ - + @@ -150,7 +149,7 @@ - + @@ -158,7 +157,7 @@ - + @@ -166,7 +165,7 @@ - + @@ -174,7 +173,7 @@ - + @@ -182,7 +181,7 @@ - + @@ -190,7 +189,7 @@ - + @@ -198,7 +197,7 @@ - + @@ -206,9 +205,20 @@ - + - + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/demo/demo-ivr.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/demo/demo-ivr.xml index ec7d7bccd..98f155a26 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/demo/demo-ivr.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/demo/demo-ivr.xml @@ -1,6 +1,4 @@ - - - + @@ -69,7 +67,7 @@ - + @@ -132,7 +130,7 @@ - + @@ -140,9 +138,19 @@ - - + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/demo/demo.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/demo/demo.xml index e3e6f0214..bcfe6a822 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/demo/demo.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/demo/demo.xml @@ -1,71 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/demo/funnies.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/demo/funnies.xml new file mode 100644 index 000000000..e901c5ad9 --- /dev/null +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/demo/funnies.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml index fc288ff62..b715a7f82 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml @@ -117,3 +117,14 @@ + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml index 84007b7d5..d5f112dcd 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml @@ -93,3 +93,14 @@ + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml index 2ccd51382..3d27bce17 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml @@ -3,11 +3,23 @@ - - - - + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/ivr/sounds.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/ivr/sounds.xml index e436e294a..5e8b2a1a0 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/ivr/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/ivr/sounds.xml @@ -1,65 +1,145 @@ - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml index 5a090411d..fdef472a5 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml @@ -1,9 +1,10 @@ - + + - - + + @@ -11,8 +12,8 @@ - - + + @@ -20,7 +21,23 @@ - + + + + + + + + + + + + + + + + + @@ -28,7 +45,7 @@ - + @@ -36,7 +53,7 @@ - + @@ -44,7 +61,7 @@ - + @@ -52,18 +69,18 @@ - - - - + + + + - - - - + + + + @@ -71,28 +88,28 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + @@ -100,34 +117,34 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + @@ -135,7 +152,7 @@ - + @@ -143,15 +160,15 @@ - - - - - - - - - + + + + + + + + + @@ -159,12 +176,12 @@ - - - - - - + + + + + + @@ -172,12 +189,12 @@ - - - - - - + + + + + + @@ -185,9 +202,9 @@ - - - + + + @@ -195,7 +212,7 @@ - + @@ -203,43 +220,43 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -247,7 +264,7 @@ - + @@ -255,7 +272,7 @@ - + @@ -263,7 +280,7 @@ - + @@ -271,7 +288,7 @@ - + @@ -279,9 +296,9 @@ - - - + + + @@ -289,9 +306,9 @@ - - - + + + @@ -299,7 +316,7 @@ - + @@ -307,17 +324,25 @@ - - - + + + + + + + + - + + + + @@ -325,39 +350,39 @@ - + - + - + - - + + - - + + - - + + - - + + @@ -365,16 +390,16 @@ - + - - - + + + @@ -401,4 +426,16 @@ - + + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/vm/tts.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/vm/tts.xml index 1fc877d50..2de4b3781 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/vm/tts.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/vm/tts.xml @@ -1,8 +1,9 @@ - + + - + @@ -10,7 +11,7 @@ - + @@ -18,7 +19,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -34,7 +35,7 @@ - + @@ -42,7 +43,7 @@ - + @@ -50,12 +51,12 @@ - + - + @@ -63,27 +64,25 @@ - + - - + - - + @@ -92,8 +91,8 @@ - + @@ -101,8 +100,8 @@ - + @@ -110,7 +109,7 @@ - + @@ -118,7 +117,7 @@ - + @@ -126,7 +125,7 @@ - + @@ -134,8 +133,8 @@ - + @@ -143,7 +142,7 @@ - + @@ -151,7 +150,7 @@ - + @@ -159,7 +158,7 @@ - + @@ -167,7 +166,7 @@ - + @@ -175,7 +174,7 @@ - + @@ -183,7 +182,7 @@ - + @@ -191,7 +190,7 @@ - + @@ -199,7 +198,7 @@ - + @@ -207,7 +206,7 @@ - + @@ -215,7 +214,7 @@ - + @@ -223,7 +222,7 @@ - + @@ -231,9 +230,20 @@ - + - + + diff --git a/net/freeswitch/files/etc.packages/say-fr/lang/fr/demo/demo.xml b/net/freeswitch/files/etc.packages/say-fr/lang/fr/demo/demo.xml index 80660203a..0d0de592a 100644 --- a/net/freeswitch/files/etc.packages/say-fr/lang/fr/demo/demo.xml +++ b/net/freeswitch/files/etc.packages/say-fr/lang/fr/demo/demo.xml @@ -1,18 +1,29 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-fr/lang/fr/dir/sounds.xml b/net/freeswitch/files/etc.packages/say-fr/lang/fr/dir/sounds.xml index 02d6b3671..a0dcb2c0e 100644 --- a/net/freeswitch/files/etc.packages/say-fr/lang/fr/dir/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-fr/lang/fr/dir/sounds.xml @@ -1,121 +1,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + - + + + + + + + - - - - - - + + + + + + + - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + diff --git a/net/freeswitch/files/etc.packages/say-fr/lang/fr/dir/tts.xml b/net/freeswitch/files/etc.packages/say-fr/lang/fr/dir/tts.xml index 1f5b0caa6..7d3e5e309 100644 --- a/net/freeswitch/files/etc.packages/say-fr/lang/fr/dir/tts.xml +++ b/net/freeswitch/files/etc.packages/say-fr/lang/fr/dir/tts.xml @@ -1,101 +1,110 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + + - + + + + + + + - - - - - - + + + + + + + - + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/net/freeswitch/files/etc.packages/say-fr/lang/fr/vm/sounds.xml b/net/freeswitch/files/etc.packages/say-fr/lang/fr/vm/sounds.xml index 55190a6ba..9cd209eab 100644 --- a/net/freeswitch/files/etc.packages/say-fr/lang/fr/vm/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-fr/lang/fr/vm/sounds.xml @@ -1,9 +1,9 @@ - - + + - + @@ -11,7 +11,7 @@ - + @@ -19,7 +19,7 @@ - + @@ -27,7 +27,7 @@ - + @@ -35,7 +35,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -51,17 +51,17 @@ - + - + - + @@ -69,27 +69,25 @@ - + - - + - - + @@ -98,8 +96,8 @@ - + @@ -107,8 +105,8 @@ - + @@ -116,8 +114,8 @@ - + @@ -125,7 +123,7 @@ - + @@ -133,7 +131,7 @@ - + @@ -141,7 +139,7 @@ - + @@ -149,7 +147,7 @@ - + @@ -157,7 +155,7 @@ - + @@ -165,7 +163,7 @@ - + @@ -173,7 +171,7 @@ - + @@ -181,12 +179,12 @@ - + - + @@ -194,7 +192,7 @@ - + @@ -202,7 +200,7 @@ - + @@ -210,27 +208,27 @@ - + - + - + - + - + @@ -238,9 +236,20 @@ - + - \ No newline at end of file + + diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo-ivr.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo-ivr.xml index ec7d7bccd..df8d24b75 100644 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo-ivr.xml +++ b/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo-ivr.xml @@ -1,6 +1,4 @@ - - - + @@ -69,7 +67,7 @@ - + @@ -132,7 +130,7 @@ - + @@ -145,4 +143,15 @@ - + + diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo.xml index e3e6f0214..bcfe6a822 100644 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo.xml +++ b/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo.xml @@ -1,71 +1,82 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/dir/sounds.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/dir/sounds.xml index 15ecec304..5fd13fffc 100644 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/dir/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-he/lang/he/dir/sounds.xml @@ -1,121 +1,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + - + + + + + + + - - - - - - + + + + + + + - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/he.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/he.xml index fe7c5d8a0..7cca73c1e 100644 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/he.xml +++ b/net/freeswitch/files/etc.packages/say-he/lang/he/he.xml @@ -9,3 +9,14 @@ + diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/vm/sounds.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/vm/sounds.xml index 5a090411d..917c84b03 100644 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/vm/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-he/lang/he/vm/sounds.xml @@ -1,9 +1,10 @@ - + + - - + + @@ -11,8 +12,8 @@ - - + + @@ -20,7 +21,7 @@ - + @@ -28,7 +29,7 @@ - + @@ -36,7 +37,7 @@ - + @@ -44,7 +45,7 @@ - + @@ -52,18 +53,18 @@ - - - - + + + + - - - - + + + + @@ -71,28 +72,28 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + @@ -100,34 +101,34 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - - + + + + @@ -135,7 +136,7 @@ - + @@ -143,15 +144,15 @@ - - - - - - - - - + + + + + + + + + @@ -159,12 +160,12 @@ - - - - - - + + + + + + @@ -172,12 +173,12 @@ - - - - - - + + + + + + @@ -185,9 +186,9 @@ - - - + + + @@ -195,7 +196,7 @@ - + @@ -203,43 +204,43 @@ - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -247,7 +248,7 @@ - + @@ -255,7 +256,7 @@ - + @@ -263,7 +264,7 @@ - + @@ -271,7 +272,7 @@ - + @@ -279,9 +280,9 @@ - - - + + + @@ -289,9 +290,9 @@ - - - + + + @@ -299,7 +300,7 @@ - + @@ -307,9 +308,9 @@ - - - + + + @@ -317,7 +318,7 @@ - + @@ -325,39 +326,39 @@ - + - + - + - - + + - - + + - - + + - - + + @@ -365,16 +366,16 @@ - + - - - + + + @@ -401,4 +402,16 @@ - + + + diff --git a/net/freeswitch/files/etc.packages/say-ru/lang/ru/demo/demo-ivr.xml b/net/freeswitch/files/etc.packages/say-ru/lang/ru/demo/demo-ivr.xml index 8c6f3f862..7de0d7fd0 100644 --- a/net/freeswitch/files/etc.packages/say-ru/lang/ru/demo/demo-ivr.xml +++ b/net/freeswitch/files/etc.packages/say-ru/lang/ru/demo/demo-ivr.xml @@ -1,6 +1,4 @@ - - - + @@ -66,7 +64,7 @@ - + @@ -129,7 +127,7 @@ - + @@ -142,4 +140,15 @@ - + + diff --git a/net/freeswitch/files/etc.packages/say-ru/lang/ru/demo/demo.xml b/net/freeswitch/files/etc.packages/say-ru/lang/ru/demo/demo.xml index 7e450fbc8..10c9dbc55 100644 --- a/net/freeswitch/files/etc.packages/say-ru/lang/ru/demo/demo.xml +++ b/net/freeswitch/files/etc.packages/say-ru/lang/ru/demo/demo.xml @@ -1,100 +1,109 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-ru/lang/ru/dir/sounds.xml b/net/freeswitch/files/etc.packages/say-ru/lang/ru/dir/sounds.xml index 02d6b3671..a0dcb2c0e 100644 --- a/net/freeswitch/files/etc.packages/say-ru/lang/ru/dir/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-ru/lang/ru/dir/sounds.xml @@ -1,121 +1,130 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + - - - - - - + + + + + + + + + + + + + - + + + + + + + - - - - - - + + + + + + + - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - - + + diff --git a/net/freeswitch/files/etc.packages/say-ru/lang/ru/dir/tts.xml b/net/freeswitch/files/etc.packages/say-ru/lang/ru/dir/tts.xml index 67ae5ab26..f0aafa267 100644 --- a/net/freeswitch/files/etc.packages/say-ru/lang/ru/dir/tts.xml +++ b/net/freeswitch/files/etc.packages/say-ru/lang/ru/dir/tts.xml @@ -1,96 +1,105 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - + + + + + + + - + + + + + + + - - - - - - + + + + + + + - + + + + + + + - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml b/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml index 686e84086..5f52e768a 100644 --- a/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml +++ b/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml @@ -1,4 +1,3 @@ - @@ -11,3 +10,14 @@ + diff --git a/net/freeswitch/files/etc.packages/say-ru/lang/ru/vm/sounds.xml b/net/freeswitch/files/etc.packages/say-ru/lang/ru/vm/sounds.xml index ffd9ec5d8..2ee9e6ec5 100644 --- a/net/freeswitch/files/etc.packages/say-ru/lang/ru/vm/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-ru/lang/ru/vm/sounds.xml @@ -1,10 +1,10 @@ - - + + - - + + @@ -12,8 +12,8 @@ - - + + @@ -21,7 +21,7 @@ - + @@ -29,7 +29,7 @@ - + @@ -37,7 +37,7 @@ - + @@ -45,7 +45,7 @@ - + @@ -53,30 +53,30 @@ - - - - - + + + + + - + - - - - - + + + + + - + - - - - - + + + + + @@ -84,50 +84,48 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - + @@ -135,15 +133,15 @@ - - - - - - - - - + + + + + + + + + @@ -151,12 +149,12 @@ - - - - - - + + + + + + @@ -164,12 +162,12 @@ - - - - - - + + + + + + @@ -177,9 +175,9 @@ - - - + + + @@ -187,7 +185,7 @@ - + @@ -239,7 +237,7 @@ - + @@ -247,7 +245,7 @@ - + @@ -255,7 +253,7 @@ - + @@ -263,7 +261,7 @@ - + @@ -271,9 +269,9 @@ - - - + + + @@ -281,9 +279,9 @@ - - - + + + @@ -291,7 +289,7 @@ - + @@ -299,9 +297,9 @@ - - - + + + @@ -309,7 +307,7 @@ - + @@ -317,39 +315,39 @@ - + - + - + - - + + - - + + - - + + - - + + @@ -357,9 +355,20 @@ - + - + + diff --git a/net/freeswitch/files/etc.packages/say-ru/lang/ru/vm/tts.xml b/net/freeswitch/files/etc.packages/say-ru/lang/ru/vm/tts.xml index 1fc877d50..2de4b3781 100644 --- a/net/freeswitch/files/etc.packages/say-ru/lang/ru/vm/tts.xml +++ b/net/freeswitch/files/etc.packages/say-ru/lang/ru/vm/tts.xml @@ -1,8 +1,9 @@ - + + - + @@ -10,7 +11,7 @@ - + @@ -18,7 +19,7 @@ - + @@ -26,7 +27,7 @@ - + @@ -34,7 +35,7 @@ - + @@ -42,7 +43,7 @@ - + @@ -50,12 +51,12 @@ - + - + @@ -63,27 +64,25 @@ - + - - + - - + @@ -92,8 +91,8 @@ - + @@ -101,8 +100,8 @@ - + @@ -110,7 +109,7 @@ - + @@ -118,7 +117,7 @@ - + @@ -126,7 +125,7 @@ - + @@ -134,8 +133,8 @@ - + @@ -143,7 +142,7 @@ - + @@ -151,7 +150,7 @@ - + @@ -159,7 +158,7 @@ - + @@ -167,7 +166,7 @@ - + @@ -175,7 +174,7 @@ - + @@ -183,7 +182,7 @@ - + @@ -191,7 +190,7 @@ - + @@ -199,7 +198,7 @@ - + @@ -207,7 +206,7 @@ - + @@ -215,7 +214,7 @@ - + @@ -223,7 +222,7 @@ - + @@ -231,9 +230,20 @@ - + - + + diff --git a/net/freeswitch/files/etc.minimal/autoload_configs/sofia.conf.xml b/net/freeswitch/files/etc.packages/sofia/autoload_configs/sofia.conf.xml similarity index 86% rename from net/freeswitch/files/etc.minimal/autoload_configs/sofia.conf.xml rename to net/freeswitch/files/etc.packages/sofia/autoload_configs/sofia.conf.xml index 24252d08c..a5e861432 100644 --- a/net/freeswitch/files/etc.minimal/autoload_configs/sofia.conf.xml +++ b/net/freeswitch/files/etc.packages/sofia/autoload_configs/sofia.conf.xml @@ -4,6 +4,7 @@ + + + + + + + + + + + + + + + + + + + + + + + @@ -7,20 +42,25 @@ - + + + + - - + + + - - + + + diff --git a/net/freeswitch/files/etc.packages/tts_commandline/autoload_configs/tts_commandline.conf.xml b/net/freeswitch/files/etc.packages/tts-commandline/autoload_configs/tts_commandline.conf.xml similarity index 100% rename from net/freeswitch/files/etc.packages/tts_commandline/autoload_configs/tts_commandline.conf.xml rename to net/freeswitch/files/etc.packages/tts-commandline/autoload_configs/tts_commandline.conf.xml diff --git a/net/freeswitch/files/etc.packages/voicemail-ivr/autoload_configs/voicemail_ivr.conf.xml b/net/freeswitch/files/etc.packages/voicemail-ivr/autoload_configs/voicemail_ivr.conf.xml new file mode 100644 index 000000000..529509a49 --- /dev/null +++ b/net/freeswitch/files/etc.packages/voicemail-ivr/autoload_configs/voicemail_ivr.conf.xml @@ -0,0 +1,208 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/xml-cdr/autoload_configs/xml_cdr.conf.xml b/net/freeswitch/files/etc.packages/xml-cdr/autoload_configs/xml_cdr.conf.xml index 6f8ef0deb..ac9b1f94d 100644 --- a/net/freeswitch/files/etc.packages/xml-cdr/autoload_configs/xml_cdr.conf.xml +++ b/net/freeswitch/files/etc.packages/xml-cdr/autoload_configs/xml_cdr.conf.xml @@ -27,7 +27,7 @@ - + diff --git a/net/freeswitch/patches/001-build-modules_conf_in.patch b/net/freeswitch/patches/001-build-modules_conf_in.patch index 838d5a4f8..ecfc0a94f 100644 --- a/net/freeswitch/patches/001-build-modules_conf_in.patch +++ b/net/freeswitch/patches/001-build-modules_conf_in.patch @@ -1,33 +1,57 @@ --- a/build/modules.conf.in +++ b/build/modules.conf.in -@@ -41,10 +41,14 @@ applications/mod_valet_parking - #applications/mod_ladspa - #applications/mod_mongo - applications/mod_sms -+#applications/mod_http_cache +@@ -3,6 +3,9 @@ + #applications/mod_blacklist + #applications/mod_callcenter + #applications/mod_cidlookup ++#applications/mod_skel +#applications/mod_mp4 +#applications/mod_protovm - codecs/mod_g723_1 - codecs/mod_amr - #codecs/mod_amrwb + applications/mod_cluechoo + applications/mod_commands + applications/mod_conference +@@ -27,6 +30,7 @@ applications/mod_httapi + #applications/mod_memcache + #applications/mod_mongo + #applications/mod_nibblebill ++#applications/mod_oreka + #applications/mod_osp + #applications/mod_redis + #applications/mod_rss +@@ -34,6 +38,7 @@ applications/mod_sms + #applications/mod_snapshot + #applications/mod_snipe_hunt + #applications/mod_snom ++#applications/mod_sonar + #applications/mod_soundtouch + applications/mod_spandsp + #applications/mod_spy +@@ -61,17 +66,20 @@ codecs/mod_h26x + codecs/mod_vp8 + #codecs/mod_ilbc + #codecs/mod_isac ++#codecs/mod_mp4v + #codecs/mod_opus + #codecs/mod_sangoma_codec #codecs/mod_silk + #codecs/mod_siren + codecs/mod_speex +#codecs/mod_theora - #codecs/mod_codec2 - codecs/mod_g729 - #codecs/mod_com_g729 -@@ -62,6 +66,7 @@ dialplans/mod_dialplan_xml dialplans/mod_dialplan_asterisk + #dialplans/mod_dialplan_directory + dialplans/mod_dialplan_xml #directories/mod_ldap + #endpoints/mod_alsa #endpoints/mod_dingaling +#endpoints/mod_gsmopen - #endpoints/mod_portaudio - endpoints/mod_sofia - endpoints/mod_loopback -@@ -82,6 +87,7 @@ endpoints/mod_loopback + #endpoints/mod_h323 + #endpoints/mod_html5 + #endpoints/mod_khomp +@@ -88,6 +96,7 @@ event_handlers/mod_cdr_csv + event_handlers/mod_cdr_sqlite + #event_handlers/mod_erlang_event #event_handlers/mod_event_multicast ++#event_handlers/mod_json_cdr event_handlers/mod_event_socket #event_handlers/mod_event_zmq -+#event_handlers/mod_json_cdr - event_handlers/mod_cdr_csv - event_handlers/mod_cdr_sqlite - #event_handlers/mod_cdr_mongodb + #event_handlers/mod_radius_cdr diff --git a/net/freeswitch/patches/002-Makefile.am.patch b/net/freeswitch/patches/002-Makefile.am.patch deleted file mode 100644 index 0e84f1b6f..000000000 --- a/net/freeswitch/patches/002-Makefile.am.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,3 +1,7 @@ -+BASE=. -+ -+include $(BASE)/build/openwrt_rules.mk -+ - EXTRA_DIST = - SUBDIRS = . src - AUTOMAKE_OPTIONS = foreign -@@ -61,7 +65,7 @@ cd-moh-install: uhd-moh-install sounds-m - # (1) if the variable is set in `config.status', edit `config.status' - # (which will cause the Makefiles to be regenerated when you run `make'); - # (2) otherwise, pass the desired values on the `make' command line. --all-recursive: libfreeswitch.la -+all-recursive: spandsp-reconf libfreeswitch.la - clean-recusive: clean_core - install-recursive: install-libLTLIBRARIES install-binPROGRAMS - $(RECURSIVE_TARGETS): -@@ -586,10 +590,13 @@ speex-reconf: - - tiff-reconf: - cd libs/tiff-3.8.2 && autoreconf -fi -- cd libs/tiff-3.8.2 && sh ./configure.gnu -+ cd libs/tiff-3.8.2 && sh ./configure.gnu --host=$(GNU_TARGET_NAME) - cd libs/spandsp && autoreconf -fi -- cd libs/spandsp && sh ./configure.gnu -- make mod_voipcodecs-clean -+ cd libs/spandsp && sh ./configure.gnu --host=$(GNU_TARGET_NAME) --prefix=$(prefix) -+ cd libs/tiff-3.8.2 && $(MAKE) -+ -+spandsp-reconf: tiff-reconf -+ cd libs/spandsp && $(MAKE) - - python-reconf: - rm -f src/mod/languages/mod_python/Makefile -@@ -612,12 +619,6 @@ iks-reconf: - cd libs/iksemel && sh ./configure.gnu --prefix=$(prefix) - $(MAKE) mod_dingaling-clean - --spandsp-reconf: -- cd libs/spandsp && $(MAKE) clean || echo -- cd libs/spandsp && autoreconf -fi -- cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix) -- cd libs/spandsp && $(MAKE) -- - sofia-reconf: - cd libs/sofia-sip && sh ./autogen.sh - cd libs/sofia-sip && $(MAKE) clean diff --git a/net/freeswitch/patches/002-configure_in.patch b/net/freeswitch/patches/002-configure_in.patch new file mode 100644 index 000000000..b33098124 --- /dev/null +++ b/net/freeswitch/patches/002-configure_in.patch @@ -0,0 +1,11 @@ +--- a/configure.in ++++ b/configure.in +@@ -581,7 +581,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa + + AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) + +-AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])]) ++# AC_CHECK_FILE(/dev/ptmx, [AC_DEFINE(HAVE_DEV_PTMX, 1, [Define if you have /dev/ptmx])]) + AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])]) + + AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[ diff --git a/net/freeswitch/patches/003-Makefile.am.patch b/net/freeswitch/patches/003-Makefile.am.patch new file mode 100644 index 000000000..409bdcaae --- /dev/null +++ b/net/freeswitch/patches/003-Makefile.am.patch @@ -0,0 +1,40 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,7 @@ ++BASE=. ++ ++include $(BASE)/build/openwrt_rules.mk ++ + EXTRA_DIST = + SUBDIRS = . src + AUTOMAKE_OPTIONS = foreign +@@ -69,7 +73,7 @@ cd-moh-install: uhd-moh-install sounds-m + # (1) if the variable is set in `config.status', edit `config.status' + # (which will cause the Makefiles to be regenerated when you run `make'); + # (2) otherwise, pass the desired values on the `make' command line. +-all-recursive: libfreeswitch.la ++all-recursive: spandsp-reconf libfreeswitch.la + clean-recusive: clean_core + install-recursive: install-libLTLIBRARIES install-binPROGRAMS + +@@ -612,7 +616,9 @@ sndfile-reconf: + + tiff-reconf: + cd libs/tiff-4.0.2 && autoreconf -fi +- cd libs/tiff-4.0.2 && sh ./configure.gnu ++ cd libs/tiff-4.0.2 && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr" ++ cd libs/spandsp && autoreconf -fi ++ cd libs/spandsp && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr" + cd libs/tiff-4.0.2 && make + + python-reconf: +@@ -637,9 +643,6 @@ iks-reconf: + $(MAKE) mod_dingaling-clean + + spandsp-reconf: tiff-reconf +- cd libs/spandsp && $(MAKE) clean || echo +- cd libs/spandsp && autoreconf -fi +- cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix) + cd libs/spandsp && $(MAKE) + + sofia-reconf: diff --git a/net/freeswitch/patches/007-src-mod-endpoints-mod_gsmopen-Makefile.patch b/net/freeswitch/patches/007-src-mod-endpoints-mod_gsmopen-Makefile.patch deleted file mode 100644 index 18a130d3e..000000000 --- a/net/freeswitch/patches/007-src-mod-endpoints-mod_gsmopen-Makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/src/mod/endpoints/mod_gsmopen/Makefile -+++ b/src/mod/endpoints/mod_gsmopen/Makefile -@@ -1,9 +1,16 @@ -+BASE=../../../.. - MODNAME=mod_gsmopen - SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"' --#LOCAL_CFLAGS += $(SVNDEF) -I/usr/src/gsmlib-1.10 --LOCAL_CFLAGS += $(SVNDEF) -I../../../../libs/spandsp/src -I../../../..//libs/tiff-3.8.2/libtiff --#LOCAL_LDFLAGS=-lasound -L/usr/src/gsmlib-1.10/gsmlib/.libs -lgsmme --LOCAL_LDFLAGS=-L../../../../libs/spandsp/src -lasound -lgsmme -lspandsp --LOCAL_OBJS=gsmopen_protocol.o --#OUR_OBJS += /usr/src/gsmlib-1.10/gsmlib/libgsmme.la --include ../../../../build/modmake.rules -+LOCAL_CFLAGS += $(SVNDEF) -I$(BASE)/libs/spandsp/src -I$(BASE)/libs/tiff-3.8.2/libtiff -fpermissive -+LOCAL_LDFLAGS=-L$(BASE)/libs/spandsp/src -lasound -lgsmme -lspandsp -+LOCAL_OBJS=gsmopen_protocol.o -+ -+include $(BASE)/build/modmake.rules -+ -+TIFF_DIR=$(switch_srcdir)/libs/tiff-3.8.2 -+TIFF_BUILDDIR=$(switch_builddir)/libs/tiff-3.8.2 -+TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la -+ -+SPANDSP_DIR=$(switch_srcdir)/libs/spandsp -+SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp -+SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la diff --git a/net/freeswitch/patches/010-ppc_asm.patch b/net/freeswitch/patches/010-ppc_asm.patch deleted file mode 100644 index 05db2d1a4..000000000 --- a/net/freeswitch/patches/010-ppc_asm.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: freeswitch-1.0.7/libs/spandsp/src/spandsp/fast_convert.h -=================================================================== ---- freeswitch-1.0.7.orig/libs/spandsp/src/spandsp/fast_convert.h 2012-08-14 19:52:20.000000000 +0200 -+++ freeswitch-1.0.7/libs/spandsp/src/spandsp/fast_convert.h 2012-08-14 19:53:01.000000000 +0200 -@@ -195,7 +195,7 @@ - { - return (long int) (x); - } --#elif defined(__ppc__) || defined(__powerpc__) -+#elif 0 /* defined(__ppc__) || defined(__powerpc__) */ - static __inline__ long int lfastrint(register double x) - { - int res[2]; diff --git a/net/freeswitch/patches/003-libs-esl-Makefile.patch b/net/freeswitch/patches/100-libs-esl-Makefile.patch similarity index 100% rename from net/freeswitch/patches/003-libs-esl-Makefile.patch rename to net/freeswitch/patches/100-libs-esl-Makefile.patch diff --git a/net/freeswitch/patches/101-libs-spandsp-src-spandsp-fast_convert_h.patch b/net/freeswitch/patches/101-libs-spandsp-src-spandsp-fast_convert_h.patch new file mode 100644 index 000000000..e2fb3daf2 --- /dev/null +++ b/net/freeswitch/patches/101-libs-spandsp-src-spandsp-fast_convert_h.patch @@ -0,0 +1,11 @@ +--- a/libs/spandsp/src/spandsp/fast_convert.h ++++ b/libs/spandsp/src/spandsp/fast_convert.h +@@ -195,7 +195,7 @@ extern "C" + { + return (long int) (x); + } +-#elif defined(__ppc__) || defined(__powerpc__) ++#elif 0 /* defined(__ppc__) || defined(__powerpc__) */ + static __inline__ long int lfastrint(register double x) + { + int res[2]; diff --git a/net/freeswitch/patches/103-libs-spandsp-src-t4_rx_c.patch b/net/freeswitch/patches/103-libs-spandsp-src-t4_rx_c.patch new file mode 100644 index 000000000..b7057ca71 --- /dev/null +++ b/net/freeswitch/patches/103-libs-spandsp-src-t4_rx_c.patch @@ -0,0 +1,11 @@ +--- a/libs/spandsp/src/t4_rx.c ++++ b/libs/spandsp/src/t4_rx.c +@@ -45,7 +45,7 @@ + #include + #endif + #include "floating_fudge.h" +-#include ++#include + + #include "spandsp/telephony.h" + #include "spandsp/logging.h" diff --git a/net/freeswitch/patches/104-libs-spandsp-src-t4_tx_c.patch b/net/freeswitch/patches/104-libs-spandsp-src-t4_tx_c.patch new file mode 100644 index 000000000..31264ae1c --- /dev/null +++ b/net/freeswitch/patches/104-libs-spandsp-src-t4_tx_c.patch @@ -0,0 +1,11 @@ +--- a/libs/spandsp/src/t4_tx.c ++++ b/libs/spandsp/src/t4_tx.c +@@ -45,7 +45,7 @@ + #include + #endif + #include "floating_fudge.h" +-#include ++#include + + #include "spandsp/telephony.h" + #include "spandsp/logging.h" diff --git a/net/freeswitch/patches/105-libs-xmlrpc-c-config_mk_in.patch b/net/freeswitch/patches/105-libs-xmlrpc-c-config_mk_in.patch new file mode 100644 index 000000000..79cb33e50 --- /dev/null +++ b/net/freeswitch/patches/105-libs-xmlrpc-c-config_mk_in.patch @@ -0,0 +1,13 @@ +--- a/libs/xmlrpc-c/config.mk.in ++++ b/libs/xmlrpc-c/config.mk.in +@@ -335,8 +335,8 @@ endif + # The cross compiling user can update config.mk or override + # BUILDTOOL_CC on a make command. + +-BUILDTOOL_CC = $(CC) +-BUILDTOOL_CCLD = $(CCLD) ++BUILDTOOL_CC = $(HOSTCC) ++BUILDTOOL_CCLD = $(HOSTCC) + + # Here are the commands 'make install' uses to install various kinds of files: + diff --git a/net/freeswitch/patches/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch b/net/freeswitch/patches/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch new file mode 100644 index 000000000..d50d200ad --- /dev/null +++ b/net/freeswitch/patches/106-libs-xmlrpc-c-lib-expat-gennmtab-Makefile.patch @@ -0,0 +1,16 @@ +--- a/libs/xmlrpc-c/lib/expat/gennmtab/Makefile ++++ b/libs/xmlrpc-c/lib/expat/gennmtab/Makefile +@@ -1,3 +1,5 @@ ++TOPDIR=$(shell (cd $(SRCDIR)/../../../../..; pwd)) ++ + ifeq ($(SRCDIR),) + updir = $(shell echo $(dir $(1)) | sed 's/.$$//') + EXPATDIR := $(call updir,$(CURDIR)) +@@ -7,6 +9,7 @@ ifeq ($(SRCDIR),) + endif + SUBDIR := lib/expat/gennmtab + ++include $(TOPDIR)/rules.mk + include $(BLDDIR)/config.mk + + LDFLAGS = $(LADD) diff --git a/net/freeswitch/patches/006-src-include-timerfd_wrap_h.patch b/net/freeswitch/patches/200-src-include-timerfd_wrap_h.patch similarity index 100% rename from net/freeswitch/patches/006-src-include-timerfd_wrap_h.patch rename to net/freeswitch/patches/200-src-include-timerfd_wrap_h.patch diff --git a/net/freeswitch/patches/004-src-mod-applications-mod_mp4-mp4_helper_hpp.patch b/net/freeswitch/patches/201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch similarity index 100% rename from net/freeswitch/patches/004-src-mod-applications-mod_mp4-mp4_helper_hpp.patch rename to net/freeswitch/patches/201-src-mod-applications-mod_mp4-mp4_helper_hpp.patch diff --git a/net/freeswitch/patches/005-src-mod-codecs-mod_opus-Makefile.patch b/net/freeswitch/patches/202-src-mod-codecs-mod_opus-Makefile.patch similarity index 67% rename from net/freeswitch/patches/005-src-mod-codecs-mod_opus-Makefile.patch rename to net/freeswitch/patches/202-src-mod-codecs-mod_opus-Makefile.patch index 94ba6f03c..cdf710ab3 100644 --- a/net/freeswitch/patches/005-src-mod-codecs-mod_opus-Makefile.patch +++ b/net/freeswitch/patches/202-src-mod-codecs-mod_opus-Makefile.patch @@ -1,7 +1,7 @@ --- a/src/mod/codecs/mod_opus/Makefile +++ b/src/mod/codecs/mod_opus/Makefile -@@ -13,13 +13,14 @@ SILK_LA=$(OPUS_BUILDDIR)/silk/libSKP_SIL - LOCAL_LIBADD=$(IETF_LA) $(CELT_LA) $(SILK_LA) -lm -lz +@@ -12,12 +12,13 @@ OPUS_LA=$(OPUS_BUILDDIR)/.libs/libopus.l + LOCAL_LIBADD=$(OPUS_LA) include $(BASE)/build/modmake.rules +include $(BASE)/build/openwrt_rules.mk @@ -9,10 +9,9 @@ $(OPUS_DIR): $(GETLIB) $(OPUS).tar.gz - $(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR) - mkdir -p $(OPUS_BUILDDIR) + $(OPUS_DIR)/Makefile: $(OPUS_DIR) - cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR) + cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(GNU_TARGET_NAME) --disable-shared --with-pic --srcdir=$(OPUS_DIR) $(TOUCH_TARGET) - $(IETF_LA): $(OPUS_BUILDDIR)/Makefile + $(OPUS_LA): $(OPUS_DIR)/Makefile diff --git a/net/freeswitch/patches/009-src-mod-codecs-mod_silk-Makefile.patch b/net/freeswitch/patches/203-src-mod-codecs-mod_silk-Makefile.patch similarity index 91% rename from net/freeswitch/patches/009-src-mod-codecs-mod_silk-Makefile.patch rename to net/freeswitch/patches/203-src-mod-codecs-mod_silk-Makefile.patch index 53c9705a5..1d4341e14 100644 --- a/net/freeswitch/patches/009-src-mod-codecs-mod_silk-Makefile.patch +++ b/net/freeswitch/patches/203-src-mod-codecs-mod_silk-Makefile.patch @@ -6,7 +6,7 @@ SILK_DIR=$(switch_srcdir)/libs/silk SILK_BUILDDIR=$(switch_builddir)/libs/silk LOCAL_CFLAGS=-I$(SILK_DIR)/src -I$(SILK_DIR)/interface -@@ -7,5 +8,5 @@ LOCAL_LIBADD=$(SILK_LA) +@@ -8,5 +9,5 @@ LOCAL_OBJS=$(BASE)/libs/stfu/stfu.o include $(BASE)/build/modmake.rules $(SILK_LA): $(SILK_DIR)/.update diff --git a/net/freeswitch/patches/204-src-mod-directories-mod_ldap-Makefile.patch b/net/freeswitch/patches/204-src-mod-directories-mod_ldap-Makefile.patch new file mode 100644 index 000000000..92741d1c2 --- /dev/null +++ b/net/freeswitch/patches/204-src-mod-directories-mod_ldap-Makefile.patch @@ -0,0 +1,11 @@ +--- a/src/mod/directories/mod_ldap/Makefile ++++ b/src/mod/directories/mod_ldap/Makefile +@@ -21,7 +21,7 @@ $(LDAP_DIR): + + $(LDAP_BUILDDIR)/Makefile: $(LDAP_DIR) + mkdir -p $(LDAP_BUILDDIR) +- cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) ++ cd $(LDAP_BUILDDIR) && $(DEFAULT_VARS) $(LDAP_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(LDAP_DIR) --with-yielding_select=yes + $(TOUCH_TARGET) + + $(LDAPLA) $(LIBLBERLA): $(LDAP_BUILDDIR)/Makefile diff --git a/net/freeswitch/patches/205-src-mod-endpoints-mod_gsmopen-Makefile.patch b/net/freeswitch/patches/205-src-mod-endpoints-mod_gsmopen-Makefile.patch new file mode 100644 index 000000000..3b2466969 --- /dev/null +++ b/net/freeswitch/patches/205-src-mod-endpoints-mod_gsmopen-Makefile.patch @@ -0,0 +1,20 @@ +--- a/src/mod/endpoints/mod_gsmopen/Makefile ++++ b/src/mod/endpoints/mod_gsmopen/Makefile +@@ -1,5 +1,15 @@ ++BASE=../../../.. + MODNAME=mod_gsmopen +-LOCAL_CFLAGS += -I../../../../libs/spandsp/src -I../../../..//libs/tiff-4.0.2/libtiff -DGSMOPEN_C_VER=\"`git log -1 --format="%h" gsmopen_protocol.cpp`\" -DMODGSMOPEN_C_VER=\"`git log -1 --format="%h" mod_gsmopen.cpp`\" +-LOCAL_LDFLAGS=-L../../../../libs/spandsp/src -lspandsp -lctb-0.16 -lgsmme ++SVNDEF := -D'GSMOPEN_SVN_VERSION="$(shell svnversion -n .)"' ++ ++TIFF_DIR="$(shell ls -d $(switch_srcdir)/libs/tiff*)" ++TIFF_BUILDDIR=$(TIFF_DIR) ++TIFF_LA=$(TIFF_BUILDDIR)/libtiff/libtiff.la ++ ++SPANDSP_DIR=$(switch_srcdir)/libs/spandsp ++SPANDSP_BUILDDIR=$(switch_builddir)/libs/spandsp ++SPANDSP_LA=$(SPANDSP_BUILDDIR)/src/libspandsp.la ++LOCAL_CFLAGS += $(SVNDEF) -I$(BASE)/libs/spandsp/src -I$(TIFF_DIR)/libtiff -I$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/include -fpermissive ++LOCAL_LDFLAGS=-L$(BASE)/libs/spandsp/src -lspandsp -L$(BASE)/src/mod/endpoints/mod_gsmopen/libctb-0.16/lib -lctb-0.16 + LOCAL_OBJS=gsmopen_protocol.o + include ../../../../build/modmake.rules diff --git a/net/freeswitch/patches/008-src-mod-event_handlers-mod_snmp-Makefile.patch b/net/freeswitch/patches/206-src-mod-event_handlers-mod_snmp-Makefile.patch similarity index 100% rename from net/freeswitch/patches/008-src-mod-event_handlers-mod_snmp-Makefile.patch rename to net/freeswitch/patches/206-src-mod-event_handlers-mod_snmp-Makefile.patch diff --git a/net/freeswitch/patches/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch b/net/freeswitch/patches/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch new file mode 100644 index 000000000..0734887b8 --- /dev/null +++ b/net/freeswitch/patches/207-src-mod-xml_int-mod_xml_ldap-Makefile.patch @@ -0,0 +1,11 @@ +--- a/src/mod/xml_int/mod_xml_ldap/Makefile ++++ b/src/mod/xml_int/mod_xml_ldap/Makefile +@@ -14,7 +14,7 @@ LOCAL_LIBADD=$(LDAPLA) $(LIBLBERLA) $(LI + + include $(BASE)/build/modmake.rules + +-DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb ++DEFAULT_ARGS+= --disable-slapd --disable-slurpd --disable-relay --disable-bdb --disable-hdb --with-yielding_select=yes + + $(LDAP_DIR): + $(GETLIB) $(LDAP).tar.gz diff --git a/net/freeswitch/patches/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch b/net/freeswitch/patches/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch new file mode 100644 index 000000000..7691d3e71 --- /dev/null +++ b/net/freeswitch/patches/208-src-mod-xml_int-mod_xml_rpc-Makefile.patch @@ -0,0 +1,10 @@ +--- a/src/mod/xml_int/mod_xml_rpc/Makefile ++++ b/src/mod/xml_int/mod_xml_rpc/Makefile +@@ -14,7 +14,6 @@ $(XMLRPC_DIR)/lib/abyss/src/date.o\ + $(XMLRPC_DIR)/src/double.o\ + $(XMLRPC_DIR)/lib/libutil/error.o\ + $(XMLRPC_DIR)/lib/abyss/src/file.o\ +-$(XMLRPC_DIR)/lib/expat/gennmtab/gennmtab.o\ + $(XMLRPC_DIR)/lib/util/getoptx.o\ + $(XMLRPC_DIR)/lib/abyss/src/handler.o\ + $(XMLRPC_DIR)/lib/abyss/src/http.o\