updated to FS git HEAD 5e3a6fc5e6f40be5d68c8b3cfbbfa3227fe06c2f

git-svn-id: svn://svn.openwrt.org/openwrt/packages@35036 3c298f89-4303-0410-b956-a3cf2f4a3e73

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

net/freeswitch/patches/002-Makefile.am.patch

@@ -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

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],,,[

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:

net/freeswitch/patches/007-src-mod-endpoints-mod_gsmopen-Makefile.patch

@@ -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

net/freeswitch/patches/010-ppc_asm.patch

@@ -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];

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];

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 <math.h>
+ #endif
+ #include "floating_fudge.h"
+-#include <tiffio.h>
++#include <tiffiop.h>
+ 
+ #include "spandsp/telephony.h"
+ #include "spandsp/logging.h"

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 <math.h>
+ #endif
+ #include "floating_fudge.h"
+-#include <tiffio.h>
++#include <tiffiop.h>
+ 
+ #include "spandsp/telephony.h"
+ #include "spandsp/logging.h"

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:
+ 

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)

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

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	

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

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

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

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\