- Freeswitch-trunk - FreeSWITCH Mailing Lists

[commit] r2948 - freeswitch/trunk/src
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Mon Oct 2 12:23:39 2006 New Revision: 2948 Modified: freeswitch/trunk/src/switch_core.c Log: solaris warning tweak Modified: freeswitch/trunk/src/switch_core.c ============================================================================== --- freeswitch/trunk/src/switch_core.c (original) +++ freeswitch/trunk/src/switch_core.c Mon Oct 2 12:23:39 2006 @@ -1574,7 +1574,7 @@ assert(session != NULL); *frame = NULL; - while (switch_channel_test_flag(session->channel, CF_HOLD)) { + if (switch_channel_test_flag(session->channel, CF_HOLD)) { status = SWITCH_STATUS_BREAK; goto done; } @@ -2668,7 +2668,6 @@ } } goto done; - break; case CS_INIT: /* Basic setup tasks */ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State INIT\n", switch_channel_get_name(session->channel)); if (!driver_state_handler->on_init ||

1 0

[commit] r2943 - freeswitch/trunk/libs
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Mon Oct 2 02:27:29 2006 New Revision: 2943 Modified: freeswitch/trunk/libs/mozilla.build.sh Log: make spidermonkey build on OpenBSD Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Mon Oct 2 02:27:29 2006 @@ -1,5 +1,6 @@ hosttype=`uname -s` ldflags="" +cflags="" if [ $hosttype = "FreeBSD" ] ; then patch <<__EOF__ @@ -26,6 +27,8 @@ if [ $hosttype = "OpenBSD" ] ; then cp js/src/config/Linux_All.mk js/src/config/`uname -s``uname -r`.mk +cflags="-DHAVE_VA_COPY -DVA_COPY=va_copy -D_PR_HAVE_GETPROTO_R -D_PR_HAVE_GETPROTO_R_INT" +ldflags="-lpthread" fi if [ $hosttype = "NetBSD" ] ; then @@ -37,9 +40,14 @@ opts="" if [ $arch = "x86_64" ] ; then opts="--enable-64bit" +cflags="$cflags -fPIC" fi +if [ $arch = "amd64" ] ; then +opts="--enable-64bit" +cflags="$cflags -fPIC" +fi -cd nsprpub && LDFLAGS=$ldflags ./configure $opts && $MAKE +cd nsprpub && CFLAGS=$cflags LDFLAGS=$ldflags ./configure $opts && $MAKE -cd ../js/src && LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` +cd ../js/src && CFLAGS=$cflags LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a`

1 0

[commit] r2941 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Mon Oct 2 00:25:41 2006 New Revision: 2941 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Log: typo Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Mon Oct 2 00:25:41 2006 @@ -1,10 +1,9 @@ -CFLAGS += $(shell mysql_config --includes) -LDFLAGS += $(shell mysql_config --libs ) +CFLAGS += $(shell mysql_config --include) +LDFLAGS += $(shell mysql_config --libs) CPPCC = g++ OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o - all: depends $(OBJS) $(MODNAME).$(DYNAMIC_LIB_EXTEN)

1 0

[commit] r2940 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Mon Oct 2 00:19:04 2006 New Revision: 2940 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Log: make this build in a few more places for now. This still needs proper autoconf detection for mysql. Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Mon Oct 2 00:19:04 2006 @@ -1,5 +1,7 @@ -LDFLAGS += -L/usr/lib64/mysql -L/usr/lib/mysql -L/usr/local/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lssl -lcrypto -CFLAGS += -I/usr/include/mysql -I/usr/local/include/mysql + +CFLAGS += $(shell mysql_config --includes) +LDFLAGS += $(shell mysql_config --libs ) + CPPCC = g++ OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o

1 0

[commit] r2939 - freeswitch/trunk/src/mod/event_handlers/mod_cdr
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Mon Oct 2 00:11:22 2006 New Revision: 2939 Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Log: make this build in a few more places for now. This still needs proper autoconf detection for mysql. Modified: freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_cdr/Makefile Mon Oct 2 00:11:22 2006 @@ -1,5 +1,5 @@ -LDFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lssl -lcrypto -CFLAGS += -I/usr/include/mysql -L/usr/lib64/mysql +LDFLAGS += -L/usr/lib64/mysql -L/usr/lib/mysql -L/usr/local/lib/mysql -lmysqlclient -lz -lcrypt -lnsl -lm -lssl -lcrypto +CFLAGS += -I/usr/include/mysql -I/usr/local/include/mysql CPPCC = g++ OBJS=cdrcontainer.o basecdr.o baseregistry.o mysqlcdr.o pddcdr.o csvcdr.o

1 0

[commit] r2938 - freeswitch/trunk/libs
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Mon Oct 2 00:06:27 2006 New Revision: 2938 Modified: freeswitch/trunk/libs/mozilla.build.sh Log: spidermonkey builds successfully on freebsd now. Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Mon Oct 2 00:06:27 2006 @@ -1,5 +1,5 @@ hosttype=`uname -s` -ldflags= +ldflags="" if [ $hosttype = "FreeBSD" ] ; then patch <<__EOF__ @@ -21,7 +21,7 @@ cp js/src/config/Linux_All.mk js/src/config/`uname -s``uname -r`.mk -ldflags=-lpthread +ldflags="-lpthread" fi if [ $hosttype = "OpenBSD" ] ; then @@ -41,5 +41,5 @@ cd nsprpub && LDFLAGS=$ldflags ./configure $opts && $MAKE -cd ../js/src && JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a` +cd ../js/src && LDFLAGS=$ldflags JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a`

1 0

[commit] r2937 - freeswitch/trunk/libs
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Sun Oct 1 23:36:26 2006 New Revision: 2937 Modified: freeswitch/trunk/libs/mozilla.build.sh Log: force -lpthread on freebsd Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Sun Oct 1 23:36:26 2006 @@ -1,7 +1,5 @@ hosttype=`uname -s` - -pthreadopts="" - +ldflags= if [ $hosttype = "FreeBSD" ] ; then patch <<__EOF__ @@ -23,7 +21,7 @@ cp js/src/config/Linux_All.mk js/src/config/`uname -s``uname -r`.mk -pthreadopts=" --with-pthreads=yes" +ldflags=-lpthread fi if [ $hosttype = "OpenBSD" ] ; then @@ -41,7 +39,7 @@ opts="--enable-64bit" fi -cd nsprpub && ./configure $opts $pthreadopts && $MAKE +cd nsprpub && LDFLAGS=$ldflags ./configure $opts && $MAKE cd ../js/src && JS_THREADSAFE=1 JS_HAS_FILE_OBJECT=1 OTHER_LIBS="-L../../../mozilla/nsprpub/dist/lib" INCLUDES="-I../../../mozilla/nsprpub/dist/include/nspr" $MAKE -f Makefile.ref `find . -name libjs.a`

1 0

[commit] r2935 - freeswitch/trunk
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Sun Oct 1 23:07:28 2006 New Revision: 2935 Modified: freeswitch/trunk/modules.conf.in Log: typo Modified: freeswitch/trunk/modules.conf.in ============================================================================== --- freeswitch/trunk/modules.conf.in (original) +++ freeswitch/trunk/modules.conf.in Sun Oct 1 23:07:28 2006 @@ -14,7 +14,7 @@ #codecs/mod_amr codecs/mod_g711 #codecs/mod_g722 -#codecs/mod_g23_1 +#codecs/mod_g723_1 #codecs/mod_g726 #codecs/mod_g729 codecs/mod_gsm

1 0

[commit] r2934 - in freeswitch/trunk/src/mod/codecs: mod_g723_1 mod_g729
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Sun Oct 1 23:00:37 2006 New Revision: 2934 Modified: freeswitch/trunk/src/mod/codecs/mod_g723_1/Makefile freeswitch/trunk/src/mod/codecs/mod_g729/Makefile Log: enable passthrough build of g732_1 and g729 codecs 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 Sun Oct 1 23:00:37 2006 @@ -1,5 +1,12 @@ +ifeq ($(shell ls $(BASE)/libs/libg723_1),$(BASE)/libs/libg723_1) + CFLAGS += -I$(PREFIX)/include/g723 LDFLAGS +=-lg723 + +else + +CFLAGS += -DG723_PASSTHROUGH +endif all: $(MODNAME).$(DYNAMIC_LIB_EXTEN) 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 Sun Oct 1 23:00:37 2006 @@ -1,5 +1,13 @@ +ifeq ($(shell ls $(BASE)/libs/libg729),$(BASE)/libs/libg729) + CFLAGS += -I$(PREFIX)/include/g729 LDFLAGS +=-lg729 + +else + +CFLAGS += -DG729_PASSTHROUGH + +endif all: $(MODNAME).$(DYNAMIC_LIB_EXTEN)

1 0

[commit] r2933 - freeswitch/trunk/libs
by Freeswitch SVN 02 Oct '06

02 Oct '06

Author: mikej Date: Sun Oct 1 22:47:39 2006 New Revision: 2933 Modified: freeswitch/trunk/libs/mozilla.build.sh Log: create makefile for netbsd. Modified: freeswitch/trunk/libs/mozilla.build.sh ============================================================================== --- freeswitch/trunk/libs/mozilla.build.sh (original) +++ freeswitch/trunk/libs/mozilla.build.sh Sun Oct 1 22:47:39 2006 @@ -30,6 +30,10 @@ cp js/src/config/Linux_All.mk js/src/config/`uname -s``uname -r`.mk fi +if [ $hosttype = "NetBSD" ] ; then +cp js/src/config/Linux_All.mk js/src/config/`uname -s``uname -r`.mk +fi + arch=`uname -m` opts=""

1 0