bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updating/cleaning freeswitch with some new/old modules

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@27619 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mazilo
2011-07-15 19:03:13 +00:00
parent 5086212304
commit 83eb1c0b24
12 changed files with 247 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
net/freeswitch/patches/001-Makefile.am.patch
View File

@ -1,20 +0,0 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -295,7 +295,7 @@ endif
##
fs_encode_SOURCES = src/fs_encode.c
fs_encode_CFLAGS = $(AM_CFLAGS)
-fs_encode_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
+fs_encode_LDFLAGS = $(AM_LDFLAGS) -lpthread $(CORE_LIBS)
fs_encode_LDADD = libfreeswitch.la
##
@@ -303,7 +303,7 @@ fs_encode_LDADD = libfreeswitch.la
##
tone2wav_SOURCES = src/tone2wav.c
tone2wav_CFLAGS = $(AM_CFLAGS)
-tone2wav_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
+tone2wav_LDFLAGS = $(AM_LDFLAGS) -lpthread $(CORE_LIBS)
tone2wav_LDADD = libfreeswitch.la
##

32
net/freeswitch/patches/001-build-modules_conf_in.patch Normal file
View File

@ -0,0 +1,32 @@
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -38,10 +38,13 @@ applications/mod_valet_parking
#applications/mod_fsk
#applications/mod_ladspa
#applications/mod_mongo
+#applications/mod_mp4
+#applications/mod_protovm
codecs/mod_g723_1
codecs/mod_amr
#codecs/mod_amrwb
#codecs/mod_silk
+#codecs/mod_theora
#codecs/mod_codec2
codecs/mod_g729
#codecs/mod_com_g729
@@ -59,6 +62,7 @@ dialplans/mod_dialplan_xml
dialplans/mod_dialplan_asterisk
#directories/mod_ldap
#endpoints/mod_dingaling
+#endpoints/mod_gsmopen
#endpoints/mod_portaudio
endpoints/mod_sofia
endpoints/mod_loopback
@@ -79,6 +83,7 @@ endpoints/mod_loopback
#event_handlers/mod_event_multicast
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_pg_csv

50
net/freeswitch/patches/002-Makefile.am.patch Normal file
View File

@ -0,0 +1,50 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -299,7 +299,7 @@ endif
##
fs_encode_SOURCES = src/fs_encode.c
fs_encode_CFLAGS = $(AM_CFLAGS)
-fs_encode_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
+fs_encode_LDFLAGS = $(AM_LDFLAGS) -lpthread $(CORE_LIBS)
fs_encode_LDADD = libfreeswitch.la
##
@@ -307,7 +307,7 @@ fs_encode_LDADD = libfreeswitch.la
##
tone2wav_SOURCES = src/tone2wav.c
tone2wav_CFLAGS = $(AM_CFLAGS)
-tone2wav_LDFLAGS = $(AM_LDFLAGS) $(CORE_LIBS)
+tone2wav_LDFLAGS = $(AM_LDFLAGS) -lpthread $(CORE_LIBS)
tone2wav_LDADD = libfreeswitch.la
##
@@ -585,10 +585,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=$(HOST) --prefix=$(prefix)
cd libs/spandsp && autoreconf -fi
- cd libs/spandsp && sh ./configure.gnu
- make mod_voipcodecs-clean
+ cd libs/spandsp && sh ./configure.gnu --host=$(HOST) --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
@@ -611,12 +614,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

0
net/freeswitch/patches/002-libs-esl-Makefile.patch → net/freeswitch/patches/003-libs-esl-Makefile.patch
View File

10
net/freeswitch/patches/003-src-mod-event_handlers-mod_event_zmq-Makefile.patch
View File

@ -1,10 +0,0 @@
--- a/src/mod/event_handlers/mod_event_zmq/Makefile
+++ b/src/mod/event_handlers/mod_event_zmq/Makefile
@@ -1,6 +1,6 @@
BASE=../../../..
-ZMQ=zeromq-2.1.4
+ZMQ=zeromq-2.1.7
ZMQ_BASEURL=http://download.zeromq.org

10
net/freeswitch/patches/004-build-modules_conf_in.patch
View File

@ -1,10 +0,0 @@
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@ -38,6 +38,7 @@ applications/mod_valet_parking
#applications/mod_fsk
#applications/mod_ladspa
#applications/mod_mongo
+#applications/mod_mp4
codecs/mod_g723_1
codecs/mod_amr
#codecs/mod_amrwb

0
net/freeswitch/patches/005-src-mod-applications-mod_mp4-mp4_helper_hpp.patch → net/freeswitch/patches/004-src-mod-applications-mod_mp4-mp4_helper_hpp.patch
View File

11
net/freeswitch/patches/005-src-mod-codecs-mod_opus-Makefile.patch Normal file
View File

@ -0,0 +1,11 @@
--- a/src/mod/codecs/mod_opus/Makefile
+++ b/src/mod/codecs/mod_opus/Makefile
@@ -19,7 +19,7 @@ $(OPUS_DIR):
$(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR)
mkdir -p $(OPUS_BUILDDIR)
- cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR)
+ cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(HOST) --disable-shared --with-pic --srcdir=$(OPUS_DIR)
$(TOUCH_TARGET)
$(IETF_LA): $(OPUS_BUILDDIR)/Makefile

27
net/freeswitch/patches/006-src-include-timerfd_wrap_h.patch Normal file
View File

@ -0,0 +1,27 @@
--- a/src/include/timerfd_wrap.h
+++ b/src/include/timerfd_wrap.h
@@ -55,20 +55,12 @@ SWITCH_BEGIN_EXTERN_C
#ifndef __NR_timerfd
-#if defined(__x86_64__)
-#define __NR_timerfd_create 283
-#define __NR_timerfd_settime 286
-#define __NR_timerfd_gettime 287
-#elif defined(__i386__)
-#define __NR_timerfd_create 322
-#define __NR_timerfd_settime 325
-#define __NR_timerfd_gettime 326
-#else
-#error invalid system
-#endif
+#include <linux/unistd.h>
#endif
-#define TFD_TIMER_ABSTIME (1 << 0)
+#ifndef TFD_TIMER_ABSTIME
+#include <sys/timerfd.h>
+#endif
int timerfd_create(int clockid, int flags)
{

26
net/freeswitch/patches/007-src-mod-endpoints-mod_gsmopen-Makefile.patch Normal file
View File

@ -0,0 +1,26 @@
--- 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
+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