March 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r4739 - freeswitch/trunk/src/mod/asr_tts/mod_lumenvox
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Thu Mar 22 17:47:05 2007 New Revision: 4739 Modified: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile Log: use handy exported vars to find the installed lumenvox libs and includes Modified: freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile ============================================================================== --- freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile (original) +++ freeswitch/trunk/src/mod/asr_tts/mod_lumenvox/Makefile Thu Mar 22 17:47:05 2007 @@ -3,9 +3,9 @@ # and define these variables to impact your build -LOCAL_CFLAGS= -fpermissive -Wno-deprecated -Wno-conversion -fpermissive -Wno-unused -Wno-comment -Wno-sign-compare \ - -Wno-conversion -Wno-reorder -I/opt/lumenvox/eng\ine_7.0/include -LOCAL_LDFLAGS= -L/opt/lumenvox/engine_7.0/lib -llv_lvspeechport -LOCAL_OBJS= +LVENGINE_DIR=/opt/lumenvox/engine_7.0 +LOCAL_CFLAGS= -fpermissive -Wno-deprecated -Wno-conversion -fpermissive -Wno-unused +LOCAL_CFLAGS+= -Wno-comment -Wno-sign-compare -Wno-conversion -Wno-reorder -I$(LVINCLUDE) +LOCAL_LDFLAGS= -L$(LVLIB) -llv_lvspeechport include ../../../../build/modmake.rules

1 0

[commit] r4738 - freeswitch/trunk/build
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Thu Mar 22 17:40:11 2007 New Revision: 4738 Modified: freeswitch/trunk/build/modmake.rules.in Log: fix Modified: freeswitch/trunk/build/modmake.rules.in ============================================================================== --- freeswitch/trunk/build/modmake.rules.in (original) +++ freeswitch/trunk/build/modmake.rules.in Thu Mar 22 17:40:11 2007 @@ -117,7 +117,7 @@ fi; mod_clean: - @rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *.lo *~ .libs + @rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *.lo *~ .libs $(LOCAL_OBJS) mod_install: $(DESTDIR)$(PREFIX)/mod/$(MODNAME).$(DYNAMIC_LIB_EXTEN)

1 0

[commit] r4737 - freeswitch/trunk/src/mod/formats/mod_shout
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 17:13:10 2007 New Revision: 4737 Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile Log: shout does not need speex Modified: freeswitch/trunk/src/mod/formats/mod_shout/Makefile ============================================================================== --- freeswitch/trunk/src/mod/formats/mod_shout/Makefile (original) +++ freeswitch/trunk/src/mod/formats/mod_shout/Makefile Thu Mar 22 17:13:10 2007 @@ -12,7 +12,6 @@ LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) -LOCAL_LDFLAGS += -lspeex MP3SOURCES=common.c dct64_i386.c decode_ntom.c layer3.c tabinit.c interface.c MP3OBJS=common.o dct64_i386.o decode_ntom.o layer3.o tabinit.o interface.o LOCAL_OBJS=$(MP3OBJS)

1 0

[commit] r4736 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 17:04:43 2007 New Revision: 4736 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: fix linking to link to all the needed la's Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile ============================================================================== --- freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile (original) +++ freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Thu Mar 22 17:04:43 2007 @@ -3,18 +3,16 @@ #XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la #dont ask... -XMLRPCLAS = $(XMLRPC_DIR)/src/*.o +XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server.la XMLRPCLAS += $(XMLRPC_DIR)/src/libxmlrpc_server_abyss.la $(XMLRPC_DIR)/lib/abyss/src/libxmlrpc_abyss.la -XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la +XMLRPCLAS += $(XMLRPC_DIR)/lib/expat/xmlparse/libxmlrpc_xmlparse.la $(XMLRPC_DIR)/lib/expat/xmltok/libxmlrpc_xmltok.la -LOCAL_OBJS =$(XMLRPCLAS) +LOCAL_LIBADD =$(XMLRPCLAS) LOCAL_CFLAGS=-I$(XMLRPC_DIR)/include include $(BASE)/build/modmake.rules -local_depend: $(XMLRPCLAS) - $(XMLRPCLAS): $(XMLRPC_DIR) $(XMLRPC_DIR)/.update cd $(XMLRPC_DIR) && $(MAKE) $(TOUCH_TARGET)

1 0

[commit] r4735 - freeswitch/trunk/src
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Thu Mar 22 16:55:46 2007 New Revision: 4735 Modified: freeswitch/trunk/src/switch_rtp.c Log: dunno maybe this will work Modified: freeswitch/trunk/src/switch_rtp.c ============================================================================== --- freeswitch/trunk/src/switch_rtp.c (original) +++ freeswitch/trunk/src/switch_rtp.c Thu Mar 22 16:55:46 2007 @@ -105,6 +105,7 @@ unsigned char out_digit_packet[4]; unsigned int out_digit_sofar; unsigned int out_digit_dur; + uint16_t in_digit_seq; uint16_t out_digit_seq; uint32_t out_digit_ssrc; int32_t timestamp_dtmf; @@ -910,31 +911,36 @@ int end = packet[1]&0x80; int duration = (packet[2]<<8) + packet[3]; char key = switch_rfc2833_to_char(packet[0]); + uint16_t in_digit_seq = ntohs((uint16_t)rtp_session->recv_msg.header.seq); /* SHEESH.... Curse you RFC2833 inventors!!!!*/ if ((time(NULL) - rtp_session->dtmf_data.last_digit_time) > 2) { rtp_session->dtmf_data.last_digit = 0; rtp_session->dtmf_data.dc = 0; } + if (in_digit_seq > rtp_session->dtmf_data.in_digit_seq) { + rtp_session->dtmf_data.in_digit_seq = in_digit_seq; + + if (duration && end) { + if (key != rtp_session->dtmf_data.last_digit) { + char digit_str[] = {key, 0}; + time(&rtp_session->dtmf_data.last_digit_time); + switch_rtp_queue_dtmf(rtp_session, digit_str); + } + if (++rtp_session->dtmf_data.dc >= 3) { + rtp_session->dtmf_data.last_digit = 0; + rtp_session->dtmf_data.dc = 0; + } - if (duration && end) { - if (key != rtp_session->dtmf_data.last_digit) { - char digit_str[] = {key, 0}; - time(&rtp_session->dtmf_data.last_digit_time); - switch_rtp_queue_dtmf(rtp_session, digit_str); - } - if (++rtp_session->dtmf_data.dc >= 3) { + rtp_session->dtmf_data.last_digit = key; + } else { rtp_session->dtmf_data.last_digit = 0; rtp_session->dtmf_data.dc = 0; } - - rtp_session->dtmf_data.last_digit = key; - } else { - rtp_session->dtmf_data.last_digit = 0; - rtp_session->dtmf_data.dc = 0; } continue; + } break;

1 0

[commit] r4734 - freeswitch/trunk/libs/apr-util/xml/expat/lib
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 14:09:53 2007 New Revision: 4734 Modified: freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c Log: missing #endif from yesterdays change Modified: freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c ============================================================================== --- freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c (original) +++ freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c Thu Mar 22 14:09:53 2007 @@ -20,6 +20,7 @@ #else #define memmove(d,s,l) ;punting on memmove; #endif +#endif #ifdef HAVE_STRING_H # include <string.h>

1 0

[commit] r4733 - in freeswitch/trunk: libs/apr-util libs/apr-util/build libs/apr-util/include/private libs/apr-util/xml/expat libs/iksemel/include libs/js libs/libdingaling/src libs/libetpan libs/libresample/src libs/libsndfile/src libs/pcre libs/sofia-sip libs/srtp libs/srtp/doc src/include
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 12:27:37 2007 New Revision: 4733 Modified: freeswitch/trunk/libs/apr-util/ (props changed) freeswitch/trunk/libs/apr-util/build/ (props changed) freeswitch/trunk/libs/apr-util/include/private/ (props changed) freeswitch/trunk/libs/apr-util/xml/expat/ (props changed) freeswitch/trunk/libs/iksemel/include/ (props changed) freeswitch/trunk/libs/js/ (props changed) freeswitch/trunk/libs/libdingaling/src/ (props changed) freeswitch/trunk/libs/libetpan/ (props changed) freeswitch/trunk/libs/libresample/src/ (props changed) freeswitch/trunk/libs/libsndfile/src/ (props changed) freeswitch/trunk/libs/pcre/ (props changed) freeswitch/trunk/libs/sofia-sip/ (props changed) freeswitch/trunk/libs/srtp/ (props changed) freeswitch/trunk/libs/srtp/doc/ (props changed) freeswitch/trunk/src/include/ (props changed) Log: svn:ignore props

1 0

[commit] r4732 - freeswitch/trunk/src/mod/endpoints/mod_wanpipe
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: anthm Date: Thu Mar 22 12:09:28 2007 New Revision: 4732 Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Log: tweak make file Modified: freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile (original) +++ freeswitch/trunk/src/mod/endpoints/mod_wanpipe/Makefile Thu Mar 22 12:09:28 2007 @@ -9,34 +9,36 @@ WANPIPE_DIR=$(BASE)/libs/$(WANPIPE) WANPIPE_INCLUDE=$(WANPIPE_DIR)/patches/kdrivers/include WANPIPE_KO=$(WANPIPE_DIR)/patches/kdrivers/src/net/wanpipe.ko +WANPIPE_INSTALLED_KO=$(shell echo "/lib/modules/`uname -r`/kernel/drivers/net/wan/wanpipe.ko") LIBSANGOMA_DIR=$(WANPIPE_DIR)/api/libsangoma -LIBSANGOMA_LA=$(LIBSANGOMA_DIR)/.libs/libsangoma.la -LIBSANGOMA_MAKEFILE=$(LIBSANGOMA_DIR)/Makefile -LOCAL_CFLAGS =-I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include -LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -LOCAL_CFLAGS +=-w -LOCAL_OBJS=ss7boost_client.o $(BASE)/libs/libteletone/libteletone.la $(LIBSANGOMA_LA) -OPTS=--prefix=$(PREFIX) --with-libpri=../../../$(LIBPRI) --disable-shared -LOCAL_OBJS +=$(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o -include $(BASE)/build/modmake.rules +TELETONE_DIR=$(BASE)/libs/libteletone +TELETONE_LA=$(TELETONE_DIR)/libteletone.la +LOCAL_CFLAGS =-w -I$(WANPIPE_INCLUDE) -I$(LIBSANGOMA_DIR) -I/usr/local/include -I$(LIBPRI_DIR) -I/usr/src/linux/include -I. -I/usr/include +LOCAL_CFLAGS +=-D__LINUX__ -D_REENTRANT -D_GNU_SOURCE -DAFT_A104 -DWANPIPE_TDM_API -I$(switch_srcdir)/libs/libteletone/src -D_GNUC_ -DWANPIPE_TDM_API +LOCAL_LIBADD = $(TELETONE_LA) +LOCAL_OBJS = ss7boost_client.o $(LIBPRI_DIR)/copy_string.o $(LIBPRI_DIR)/pri.o $(LIBPRI_DIR)/q921.o $(LIBPRI_DIR)/prisched.o $(LIBPRI_DIR)/q931.o $(LIBPRI_DIR)/pri_facility.o $(LIBSANGOMA_DIR)/libsangoma.o $(LIBSANGOMA_DIR)/sangoma_pri.o -$(LIBPRI_DIR): - $(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE) - cd $(LIBPRI_DIR) -$(LIBSANGOMA_MAKEFILE): $(LIBPRI_DIR) - cd $(LIBSANGOMA_DIR) && CFLAGS="-I$(WANPIPE_INCLUDE)" ./configure $(OPTS) +include $(BASE)/build/modmake.rules -$(LIBSANGOMA_LA): $(LIBSANGOMA_MAKEFILE) - cd $(LIBSANGOMA_DIR) && $(MAKE) +$(LIBPRI_DIR): + $(GETLIB) $(LIBPRI_HOST) $(LIBPRI_FILE) $(WANPIPE_DIR): $(GETLIB) $(WANPIPE_HOST) $(WANPIPE_FILE) $(WANPIPE_KO): $(WANPIPE_DIR) - cd $(WANPIPE_DIR) && $(MAKE) && $(MAKE) install - rm -f $(LIBSANGOMA_MAKEFILE) + cd $(WANPIPE_DIR) && $(MAKE) + @$(TOUCH_TARGET) + +$(TELETONE_LA): + cd $(TELETONE_DIR) && $(MAKE) + @$(TOUCH_TARGET) + +$(WANPIPE_INSTALLED_KO): $(WANPIPE_KO) + cd $(WANPIPE_DIR) && $(MAKE) install -local_depend: $(WANPIPE_KO) +local_depend: $(LIBPRI_DIR) $(WANPIPE_KO) +local_install: $(WANPIPE_INSTALLED_KO)

1 0

[commit] r4731 - in freeswitch/trunk/libs: codec/gsm libteletone
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 11:57:12 2007 New Revision: 4731 Modified: freeswitch/trunk/libs/codec/gsm/configure.in freeswitch/trunk/libs/libteletone/configure.in Log: some little cleanup Modified: freeswitch/trunk/libs/codec/gsm/configure.in ============================================================================== --- freeswitch/trunk/libs/codec/gsm/configure.in (original) +++ freeswitch/trunk/libs/codec/gsm/configure.in Thu Mar 22 11:57:12 2007 @@ -5,7 +5,6 @@ AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) AM_INIT_AUTOMAKE(libgsm,0.1) AC_CONFIG_SRCDIR([src]) -#AC_CONFIG_HEADER([]) # Checks for programs. AC_PROG_CC Modified: freeswitch/trunk/libs/libteletone/configure.in ============================================================================== --- freeswitch/trunk/libs/libteletone/configure.in (original) +++ freeswitch/trunk/libs/libteletone/configure.in Thu Mar 22 11:57:12 2007 @@ -6,7 +6,6 @@ AC_CONFIG_AUX_DIR(build) AM_INIT_AUTOMAKE(libteletone,0.1) AC_CONFIG_SRCDIR([src]) -#AC_CONFIG_HEADER([]) # Checks for programs. AC_PROG_CC

1 0

[commit] r4730 - freeswitch/trunk
by Freeswitch SVN 22 Mar '07

22 Mar '07

Author: mikej Date: Thu Mar 22 11:21:31 2007 New Revision: 4730 Modified: freeswitch/trunk/bootstrap.sh Log: only require 1.5.14. More changes on this coming very soon Modified: freeswitch/trunk/bootstrap.sh ============================================================================== --- freeswitch/trunk/bootstrap.sh (original) +++ freeswitch/trunk/bootstrap.sh Thu Mar 22 11:21:31 2007 @@ -60,7 +60,7 @@ lt_pversion=`$libtool --version 2>/dev/null|sed -e 's/([^)]*)//g;s/^[^0-9]*//;s/[- ].*//g;q'` if test -z "$lt_pversion"; then echo "bootstrap: libtool not found." -echo " You need libtool version 1.5.7 or newer installed" +echo " You need libtool version 1.5.14 or newer installed" echo " to build FreeSWITCH from SVN." exit 1 fi @@ -68,16 +68,18 @@ IFS=.; set $lt_version; IFS=' ' lt_status="good" -if test "$1" = "1"; then - if test "$2" -lt "5" -o "$2" = "5" -a "$3" -lt "22" || test ; then +if test "$1" -lt "2"; then + if test "$2" -lt "5" -o "$2" = "5" -a "$3" -lt "14" ; then lt_status="bad" fi +else + lt_status="bad" fi if test $lt_status = "good"; then echo "bootstrap: libtool version $lt_pversion (ok)" else echo "bootstrap: libtool version $lt_pversion found." -echo " You need libtool version 1.5.7 or newer installed" +echo " You need libtool version 1.5.14 or newer installed" echo " to build FreeSWITCH from SVN." exit 1

1 0