- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r4719 - in freeswitch/trunk/libs: apr-util/build apr-util/xml/expat apr-util/xml/expat/lib apr/build
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: mikej Date: Wed Mar 21 17:14:31 2007 New Revision: 4719 Removed: freeswitch/trunk/libs/apr-util/build/apr_common.m4 freeswitch/trunk/libs/apr-util/build/find_apr.m4 freeswitch/trunk/libs/apr-util/build/get-version.sh freeswitch/trunk/libs/apr-util/build/install.sh freeswitch/trunk/libs/apr-util/xml/expat/acconfig.h freeswitch/trunk/libs/apr-util/xml/expat/config.h.in Modified: freeswitch/trunk/libs/apr-util/xml/expat/configure.in freeswitch/trunk/libs/apr-util/xml/expat/lib/xmlparse.c freeswitch/trunk/libs/apr/build/apr_common.m4 Log: clean up the bootstrap warnings. you will need to re-run bootstrap and re-configure (or at least run the libs/apr-util/buildconf) and configure Modified: freeswitch/trunk/libs/apr-util/xml/expat/configure.in ============================================================================== --- freeswitch/trunk/libs/apr-util/xml/expat/configure.in (original) +++ freeswitch/trunk/libs/apr-util/xml/expat/configure.in Wed Mar 21 17:14:31 2007 @@ -86,9 +86,19 @@ if test "$cross_compiling" = "no"; then AC_C_BIGENDIAN else - AC_DEFINE(AP_UNKNOWN_BYTE_ORDER,1, - [byte order is unknown due to cross-compilation]) + AC_DEFINE(AP_UNKNOWN_BYTE_ORDER,1,[byte order is unknown due to cross-compilation]) fi + +if test "$ac_cv_c_bigendian" = "yes"; then + AC_DEFINE(XML_BYTE_ORDER,21,[21 for big endian or 12 for little]) +else + AC_DEFINE(XML_BYTE_ORDER,12,[z]) +fi + +AC_DEFINE(XML_NS,,[Define me]) +AC_DEFINE(XML_DTD,,[Define me]) +AC_DEFINE(XML_CONTEXT_BYTES,1024,[1024]) + AC_C_CONST AC_TYPE_OFF_T AC_TYPE_SIZE_T 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 Wed Mar 21 17:14:31 2007 @@ -14,6 +14,13 @@ #else #include <config.h> +#ifndef HAVE_MEMMOVE +#ifdef HAVE_BCOPY +#define memmove(d,s,l) bcopy((s),(d),(l)) +#else +#define memmove(d,s,l) ;punting on memmove; +#endif + #ifdef HAVE_STRING_H # include <string.h> #endif Modified: freeswitch/trunk/libs/apr/build/apr_common.m4 ============================================================================== --- freeswitch/trunk/libs/apr/build/apr_common.m4 (original) +++ freeswitch/trunk/libs/apr/build/apr_common.m4 Wed Mar 21 17:14:31 2007 @@ -23,7 +23,7 @@ dnl dnl Saves a snapshot of the configure command-line for later reuse dnl -AC_DEFUN(APR_CONFIG_NICE,[ +AC_DEFUN([APR_CONFIG_NICE],[ rm -f $1 cat >$1<<EOF #! /bin/sh @@ -80,7 +80,7 @@ dnl APR_MKDIR_P_CHECK(fallback-mkdir-p) dnl checks whether mkdir -p works -AC_DEFUN(APR_MKDIR_P_CHECK,[ +AC_DEFUN([APR_MKDIR_P_CHECK],[ AC_CACHE_CHECK(for working mkdir -p, ac_cv_mkdir_p,[ test -d conftestdir && rm -rf conftestdir mkdir -p conftestdir/somedir >/dev/null 2>&1 @@ -118,7 +118,7 @@ dnl Trying to optimize this is left as an exercise to the reader who wants dnl to put up with more autoconf craziness. I give up. dnl -AC_DEFUN(APR_SUBDIR_CONFIG, [ +AC_DEFUN([APR_SUBDIR_CONFIG], [ # save our work to this point; this allows the sub-package to use it AC_CACHE_SAVE @@ -186,7 +186,7 @@ dnl dnl Stores the variable (usually a Makefile macro) for later restoration dnl -AC_DEFUN(APR_SAVE_THE_ENVIRONMENT,[ +AC_DEFUN([APR_SAVE_THE_ENVIRONMENT],[ apr_ste_save_$1="$$1" ])dnl @@ -198,7 +198,7 @@ dnl and restoring the original variable contents. This makes it possible dnl for a user to override configure when it does something stupid. dnl -AC_DEFUN(APR_RESTORE_THE_ENVIRONMENT,[ +AC_DEFUN([APR_RESTORE_THE_ENVIRONMENT],[ if test "x$apr_ste_save_$1" = "x"; then $2$1="$$1" $1= @@ -222,7 +222,7 @@ dnl dnl Set variable iff it's currently null dnl -AC_DEFUN(APR_SETIFNULL,[ +AC_DEFUN([APR_SETIFNULL],[ if test -z "$$1"; then test "x$silent" != "xyes" && echo " setting $1 to \"$2\"" $1="$2" @@ -234,7 +234,7 @@ dnl dnl Set variable no matter what dnl -AC_DEFUN(APR_SETVAR,[ +AC_DEFUN([APR_SETVAR],[ test "x$silent" != "xyes" && echo " forcing $1 to \"$2\"" $1="$2" ])dnl @@ -244,7 +244,7 @@ dnl dnl Add value to variable dnl -AC_DEFUN(APR_ADDTO,[ +AC_DEFUN([APR_ADDTO],[ if test "x$$1" = "x"; then test "x$silent" != "xyes" && echo " setting $1 to \"$2\"" $1="$2" @@ -271,7 +271,7 @@ dnl dnl Remove a value from a variable dnl -AC_DEFUN(APR_REMOVEFROM,[ +AC_DEFUN([APR_REMOVEFROM],[ if test "x$$1" = "x$2"; then test "x$silent" != "xyes" && echo " nulling $1" $1="" @@ -295,7 +295,7 @@ dnl dnl APR_CHECK_DEFINE_FILES( symbol, header_file [header_file ...] ) dnl -AC_DEFUN(APR_CHECK_DEFINE_FILES,[ +AC_DEFUN([APR_CHECK_DEFINE_FILES],[ AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ ac_cv_define_$1=no for curhdr in $2 @@ -317,7 +317,7 @@ dnl dnl APR_CHECK_DEFINE(symbol, header_file) dnl -AC_DEFUN(APR_CHECK_DEFINE,[ +AC_DEFUN([APR_CHECK_DEFINE],[ AC_CACHE_CHECK([for $1 in $2],ac_cv_define_$1,[ AC_EGREP_CPP(YES_IS_DEFINED, [ #include <$2> @@ -334,7 +334,7 @@ dnl dnl APR_CHECK_APR_DEFINE( symbol ) dnl -AC_DEFUN(APR_CHECK_APR_DEFINE,[ +AC_DEFUN([APR_CHECK_APR_DEFINE],[ apr_old_cppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $INCLUDES" AC_EGREP_CPP(YES_IS_DEFINED, [ @@ -450,7 +450,7 @@ dnl A variant of AC_CHECK_SIZEOF which allows the checking of dnl sizes of non-builtin types dnl -AC_DEFUN(APR_CHECK_SIZEOF_EXTENDED, +AC_DEFUN([APR_CHECK_SIZEOF_EXTENDED], [changequote(<<,>>)dnl dnl The name to #define define(<<AC_TYPE_NAME>>, translit(sizeof_$2, [a-z *], [A-Z_P]))dnl @@ -511,7 +511,7 @@ dnl string. dnl dnl -AC_DEFUN(APR_CHECK_STRERROR_R_RC,[ +AC_DEFUN([APR_CHECK_STRERROR_R_RC],[ AC_MSG_CHECKING(for type of return code from strerror_r) AC_TRY_RUN([ #include <errno.h> @@ -546,7 +546,7 @@ dnl structure on this platform. Single UNIX Spec says d_ino, dnl BSD uses d_fileno. Undef to find the real beast. dnl -AC_DEFUN(APR_CHECK_DIRENT_INODE, [ +AC_DEFUN([APR_CHECK_DIRENT_INODE], [ AC_CACHE_CHECK([for inode member of struct dirent], apr_cv_dirent_inode, [ apr_cv_dirent_inode=no AC_TRY_COMPILE([ @@ -584,7 +584,7 @@ dnl Note that this is worthless without DT_xxx macros, so dnl look for one while we are at it. dnl -AC_DEFUN(APR_CHECK_DIRENT_TYPE,[ +AC_DEFUN([APR_CHECK_DIRENT_TYPE],[ AC_CACHE_CHECK([for file type member of struct dirent], apr_cv_dirent_type,[ apr_cv_dirent_type=no AC_TRY_COMPILE([ @@ -633,7 +633,7 @@ dnl all "." and "-" chars. If the 3rd parameter is "yes" then instead of dnl setting to 1 or 0, we set FLAG-TO-SET to yes or no. dnl -AC_DEFUN(APR_FLAG_HEADERS,[ +AC_DEFUN([APR_FLAG_HEADERS],[ AC_CHECK_HEADERS($1) for aprt_i in $1 do @@ -654,7 +654,7 @@ dnl is "yes" then instead of setting to 1 or 0, we set FLAG-TO-SET dnl to yes or no. dnl -AC_DEFUN(APR_FLAG_FUNCS,[ +AC_DEFUN([APR_FLAG_FUNCS],[ AC_CHECK_FUNCS($1) for aprt_j in $1 do @@ -679,7 +679,7 @@ dnl APR_EXPAND_VAR(fraz, $baz) dnl $fraz is now "1/2/3" dnl -AC_DEFUN(APR_EXPAND_VAR,[ +AC_DEFUN([APR_EXPAND_VAR],[ ap_last= ap_cur="$2" while test "x${ap_cur}" != "x${ap_last}"; @@ -698,7 +698,7 @@ dnl orig_path="${prefix}/bar" dnl APR_PATH_RELATIVE(final_path, $orig_path, $prefix) dnl $final_path now contains "bar" -AC_DEFUN(APR_PATH_RELATIVE,[ +AC_DEFUN([APR_PATH_RELATIVE],[ ap_stripped=`echo $2 | sed -e "s#^$3##"` # check if the stripping was successful if test "x$2" != "x${ap_stripped}"; then @@ -716,12 +716,12 @@ dnl Note: this define must be on one line so that it can be properly returned dnl as the help string. When using this macro with a multi-line RHS, ensure dnl that you surround the macro invocation with []s -AC_DEFUN(APR_HELP_STRING,[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) +AC_DEFUN([APR_HELP_STRING],[ifelse(regexp(AC_ACVERSION, 2\.1), -1, AC_HELP_STRING([$1],[$2]),[ ][$1] substr([ ],len($1))[$2])]) dnl dnl APR_LAYOUT(configlayout, layoutname [, extravars]) dnl -AC_DEFUN(APR_LAYOUT,[ +AC_DEFUN([APR_LAYOUT],[ if test ! -f $srcdir/config.layout; then echo "** Error: Layout file $srcdir/config.layout not found" echo "** Error: Cannot use undefined layout '$LAYOUT'" @@ -784,7 +784,7 @@ dnl dnl APR_ENABLE_LAYOUT(default layout name [, extra vars]) dnl -AC_DEFUN(APR_ENABLE_LAYOUT,[ +AC_DEFUN([APR_ENABLE_LAYOUT],[ AC_ARG_ENABLE(layout, [ --enable-layout=LAYOUT],[ LAYOUT=$enableval @@ -805,7 +805,7 @@ dnl a reimplementation of autoconf's argument parser, dnl used here to allow us to co-exist layouts and argument based dnl set ups. -AC_DEFUN(APR_PARSE_ARGUMENTS,[ +AC_DEFUN([APR_PARSE_ARGUMENTS],[ ac_prev= # Retrieve the command-line arguments. The eval is needed because # the arguments are quoted to preserve accuracy. @@ -931,7 +931,7 @@ dnl dnl Determine what program we can use to generate .deps-style dependencies dnl -AC_DEFUN(APR_CHECK_DEPEND,[ +AC_DEFUN([APR_CHECK_DEPEND],[ dnl Try to determine what depend program we can use dnl All GCC-variants should have -MM. dnl If not, then we can check on those, too.

1 0

[commit] r4718 - freeswitch/trunk/src/mod/languages/mod_perl
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 16:16:33 2007 New Revision: 4718 Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile Log: fix mod_perl compile Modified: freeswitch/trunk/src/mod/languages/mod_perl/Makefile ============================================================================== --- freeswitch/trunk/src/mod/languages/mod_perl/Makefile (original) +++ freeswitch/trunk/src/mod/languages/mod_perl/Makefile Wed Mar 21 16:16:33 2007 @@ -3,18 +3,21 @@ # and define these variables to impact your build -LOCAL_CFLAGS=-DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL +PERL = `which perl` +PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE +PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}') + +LOCAL_CFLAGS=-w -DMULTIPLICITY $(shell $(PERL) -MExtUtils::Embed -e ccopts) -DEMBED_PERL LOCAL_LDFLAGS=$(shell $(PERL) -MExtUtils::Embed -e ldopts) $(shell $(PERL) -MConfig -e 'print $$Config{libs}') LOCAL_OBJS=perlxsi.o include ../../../../build/modmake.rules -PERL = $(shell which perl) -PERL_LIBDIR =-L$(shell perl -MConfig -e 'print $$Config{archlib}')/CORE -PERL_LIBS =$(shell perl -MConfig -e 'print $$Config{libs}') SWIGCFILE=../../../switch_swig.c SWIGIFILE=../../../switch_swig.i + + local_all: fs_perl.$(DYNAMIC_LIB_EXTEN) .perlok:

1 0

[commit] r4717 - freeswitch/trunk/src/mod
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 15:39:31 2007 New Revision: 4717 Modified: freeswitch/trunk/src/mod/Makefile.am Log: fix exporting MODULES variable with more than 1 module in the list Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Wed Mar 21 15:39:31 2007 @@ -1,9 +1,9 @@ CONF_MODULES=if test ! -f $(switch_builddir)/modules.conf ; then cp $(switch_builddir)/build/modules.conf.in $(switch_builddir)/modules.conf ; fi ; conf_modules=`grep -v "\#" $(switch_builddir)/modules.conf` ; FOUND_MODULES=found_modules=`find . -type d -name mod_\* | sed -e 's|^\./||'` ; -OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules=$(MODULES) ; fi ; +OUR_MODULES=if test -z "$(MODULES)" ; then our_modules=$$conf_modules ; else our_modules="$(MODULES)" ; fi ; OUR_CLEAN_MODULES=if test -z "$(MODULES)" ; then tmp_clean_modules=`echo $$conf_modules $$found_modules`; \ our_clean_modules=`for i in $$tmp_clean_modules ; do echo $$i ; done | sort | uniq` ; \ - else our_clean_modules=$(MODULES) ; fi ; + else our_clean_modules="$(MODULES)" ; fi ; MOD_NAME=`echo $$i | sed -e 's|^.*/||'` MOD_DIR=`if test -d $(switch_srcdir)/src/mod/$$i ; then echo $(switch_srcdir)/src/mod/$$i ; else echo $$i ; fi;` AM_MAKEFLAGS = `test -n "$(VERBOSE)" || echo -s`

1 0

[commit] r4716 - in freeswitch/trunk/src: . include mod/applications/mod_conference
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 14:50:51 2007 New Revision: 4716 Modified: freeswitch/trunk/src/include/switch_resample.h freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c freeswitch/trunk/src/switch_resample.c Log: shhhh Modified: freeswitch/trunk/src/include/switch_resample.h ============================================================================== --- freeswitch/trunk/src/include/switch_resample.h (original) +++ freeswitch/trunk/src/include/switch_resample.h Wed Mar 21 14:50:51 2007 @@ -155,6 +155,14 @@ SWITCH_DECLARE(void) switch_swap_linear(int16_t *buf, int len); /*! + \brief Generate static noise + \param data the audio data buffer + \param samples the number of 2 byte samples + \param divisor the volume factor + */ +SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor); + +/*! \brief Change the volume of a signed linear audio frame \param data the audio data \param samples the number of 2 byte samples Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Mar 21 14:50:51 2007 @@ -1696,7 +1696,7 @@ } else { if (switch_test_flag(member, MFLAG_WASTE_BANDWIDTH)) { - memset(write_frame.data, 255, bytes); + switch_generate_sln_silence(write_frame.data, samples, 1400); write_frame.datalen = bytes; write_frame.samples = samples; write_frame.timestamp = timer.samplecount; Modified: freeswitch/trunk/src/switch_resample.c ============================================================================== --- freeswitch/trunk/src/switch_resample.c (original) +++ freeswitch/trunk/src/switch_resample.c Wed Mar 21 14:50:51 2007 @@ -183,6 +183,27 @@ } } +SWITCH_DECLARE(void) switch_generate_sln_silence(int16_t *data, uint32_t samples, uint32_t divisor) +{ + int16_t rnd, x,i; + uint32_t sum_rnd = 0; + + assert(divisor); + + for(i = 0; i < samples; i++, sum_rnd = 0) { + for(x = 0; x < 7; x++) { + rnd = (int16_t) (rand() * sizeof(int16_t)); + sum_rnd += rnd; + } + switch_normalize_to_16bit(sum_rnd); + *data = (int16_t) sum_rnd; + *data /= (int)divisor; + + data++; + } +} + + SWITCH_DECLARE(void) switch_change_sln_volume(int16_t *data, uint32_t samples, int32_t vol) { double newrate = 0;

1 0

[commit] r4715 - freeswitch/trunk/src/mod/applications/mod_conference
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 13:09:39 2007 New Revision: 4715 Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Log: fix typos Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (original) +++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c Wed Mar 21 13:09:39 2007 @@ -1466,7 +1466,7 @@ samples, NULL) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "setup timer %s success interval: %u samples: %u\n", - member->conference->timer_name, member->conference->interval, samples); + member->conference->timer_name, interval, samples); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Timer Setup Failed. Conference Cannot Start\n"); return; @@ -4046,10 +4046,12 @@ NULL, member.pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000); flags = 0; goto done; } @@ -4075,17 +4077,19 @@ if (switch_core_codec_init(&member.write_codec, "L16", NULL, - conference->rate, - conference->interval, + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, member.pool) == SWITCH_STATUS_SUCCESS) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Success L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000); } else { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n", - conference->rate, conference->interval); + read_codec->implementation->samples_per_second, + read_codec->implementation->microseconds_per_frame / 1000); flags = 0; goto codec_done2; }

1 0

[commit] r4714 - in freeswitch/trunk/src/mod: codecs/mod_g723_1 codecs/mod_g729 formats/mod_shout
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 13:04:22 2007 New Revision: 4714 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/trunk/src/mod/codecs/mod_g729/Makefile freeswitch/trunk/src/mod/formats/mod_shout/Makefile Log: fix makefiles Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Wed Mar 21 13:04:22 2007 @@ -1,6 +1,8 @@ BASE=../../../.. +DIR=$(BASE)/libs/libg723_1 +A=$(DIR)/.libs/libg723.a -LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg723_1; then echo "-I$(PREFIX)/include" ; else echo "-DG723_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg723_1 || echo "-L/usr/local/freeswitch/lib -lg723" +LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG723_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) include $(BASE)/build/modmake.rules Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Wed Mar 21 13:04:22 2007 @@ -1,4 +1,7 @@ BASE=../../../.. -LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/g729; then echo "-I$(PREFIX)/include/g729" ; else echo "-DG729_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/g729 || echo "-L/usr/local/freeswitchlib -lg729" +DIR=$(BASE)/libs/libg729 +A=$(DIR)/.libs/libg729.a + +LOCAL_INSERT_CFLAGS=if test -f $(A); then echo "-I$(DIR)/src/include" ; else echo "-DG729_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -f $(A) || echo $(A) include $(BASE)/build/modmake.rules 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 Wed Mar 21 13:04:22 2007 @@ -11,8 +11,8 @@ SHOUTLA=$(SHOUT_DIR)/src/libshout.la LOCAL_CFLAGS=-I$(SHOUT_DIR)/include -I$(LAME_DIR)/include -LOCAL_LIBADD=$(LAMELA) $(SHOUTLA) - +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] r4713 - freeswitch/trunk/src/mod/xml_int/mod_xml_rpc
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: anthm Date: Wed Mar 21 11:13:39 2007 New Revision: 4713 Modified: freeswitch/trunk/src/mod/xml_int/mod_xml_rpc/Makefile Log: doh 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 Wed Mar 21 11:13:39 2007 @@ -1,11 +1,14 @@ BASE=../../../.. XMLRPC_DIR=$(BASE)/libs/xmlrpc-c -XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la $(XMLRPC_DIR)/src/libxmlrpc_server.la +#XMLRPCLAS = $(XMLRPC_DIR)/src/libxmlrpc.la +#dont ask... +XMLRPCLAS = $(XMLRPC_DIR)/src/*.o +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 -LOCAL_LDFLAGS = $(XMLRPCLAS) +LOCAL_OBJS =$(XMLRPCLAS) LOCAL_CFLAGS=-I$(XMLRPC_DIR)/include include $(BASE)/build/modmake.rules

1 0

[commit] r4712 - freeswitch/trunk/src/mod/codecs/mod_g729
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: brian Date: Wed Mar 21 00:11:30 2007 New Revision: 4712 Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Log: tweak Modified: freeswitch/trunk/src/mod/codecs/mod_g729/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g729/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Wed Mar 21 00:11:30 2007 @@ -1,4 +1,4 @@ BASE=../../../.. -LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg729; then echo "-I$(PREFIX)/include/libg729" ; else echo "-DG729_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg729 || echo "-lg729" +LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/g729; then echo "-I$(PREFIX)/include/g729" ; else echo "-DG729_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/g729 || echo "-L/usr/local/freeswitchlib -lg729" include $(BASE)/build/modmake.rules

1 0

[commit] r4711 - freeswitch/trunk/src/mod/codecs/mod_g723_1
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: brian Date: Wed Mar 21 00:09:49 2007 New Revision: 4711 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Log: small tweak Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile ============================================================================== --- freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile (original) +++ freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile Wed Mar 21 00:09:49 2007 @@ -1,6 +1,6 @@ BASE=../../../.. -LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg723_1; then echo "-I$(PREFIX)/include/g723" ; else echo "-DG723_PASSTHROUGH" ; fi ; -LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg723_1 || echo "-lg723" +LOCAL_INSERT_CFLAGS=if test -d $(BASE)/libs/libg723_1; then echo "-I$(PREFIX)/include" ; else echo "-DG723_PASSTHROUGH" ; fi ; +LOCAL_INSERT_LDFLAGS=test ! -d $(BASE)/libs/libg723_1 || echo "-L/usr/local/freeswitch/lib -lg723" include $(BASE)/build/modmake.rules

1 0

[commit] r4706 - freeswitch/trunk/src/mod/endpoints/mod_sofia
by Freeswitch SVN 21 Mar '07

21 Mar '07

Author: mikej Date: Tue Mar 20 22:48:47 2007 New Revision: 4706 Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Log: msvc build tweaks Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Tue Mar 20 22:48:47 2007 @@ -4805,7 +4805,7 @@ case 200: if (sip && sip->sip_contact && sip->sip_contact->m_expires) { char *new_expires = (char *) sip->sip_contact->m_expires; - int expi = atoi(new_expires); + uint32_t expi = (uint32_t)atoi(new_expires); if (expi != sofia_private->gateway->freq) { sofia_private->gateway->freq = expi; @@ -5569,10 +5569,6 @@ } if ((gateway = switch_core_alloc(profile->pool, sizeof(*gateway)))) { - gateway->pool = profile->pool; - gateway->profile = profile; - gateway->name = switch_core_strdup(gateway->pool, name); - gateway->freq = 0; char *scheme = "Digest", *realm = NULL, *username = NULL, @@ -5581,6 +5577,11 @@ *proxy = NULL, *context = "default", *expire_seconds = "3600"; + + gateway->pool = profile->pool; + gateway->profile = profile; + gateway->name = switch_core_strdup(gateway->pool, name); + gateway->freq = 0; for (param = switch_xml_child(gateway_tag, "param"); param; param = param->next) {

1 0