From: Mazi Lo <openwrt.mazilo@recursor.net>
Date: Wed, 15 Apr 2015 02:04:50 +0000 (-0400)
Subject: FreeSWITCH:
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=882da949e78a0995423b8e1144109980b72c6029;p=feed%2Ftelephony.git

FreeSWITCH:
  1. Update to FS Git HEAD 464d8ab91086715a2ec7eb1fb9a2d2cb53377eb7
  2. Revert Config.in file to before GitHUB.
  3. Revert dependency to libsrtp before GitHUB.
  4. Add patch from Bluemax <bluemax@users.noreply.github.com> to libs/apr/configure.ac to disable TCP_NODELAY_WITH_CORK when cross compile.

Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>
---

diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in
index 1ec5ed6..d6a67ab 100644
--- a/net/freeswitch/Config.in
+++ b/net/freeswitch/Config.in
@@ -1,24 +1,6 @@
 menu "Configuration"
   depends on PACKAGE_freeswitch
 
-  choice
-    prompt "Version to use"
-    default FS_WITH_VERSION_RELEASE
-    help
-	Specify version to use: [devel|release]
-
-    config FS_WITH_VERSION_DEVEL
-      bool "devel"
-      help
-	Selected version: devel
-
-    config FS_WITH_VERSION_RELEASE
-      bool "release"
-      help
-	Selected version: release
-
-  endchoice
-
   choice
     depends on DEVEL
     prompt "Git HEAD version to use"
diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 9eb21fa..e280d55 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -18,7 +18,7 @@ PKG_VERSION:=1.5.14
 # The latest FS git hash in PKG_SOURCE_VERSION can be obtained from
 # http://fisheye.freeswitch.org
 #
-FS_WITH_DEFAULT_HEAD:=6eb59c711989774fb797d1c447e3d63aac84826b
+FS_WITH_DEFAULT_HEAD:=464d8ab91086715a2ec7eb1fb9a2d2cb53377eb7
 PKG_SOURCE_URL:=https://stash.$(PKG_NAME).org/scm/fs/$(PKG_NAME).git
 PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_WITH_LATEST_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD|cut -f1),$(FS_WITH_DEFAULT_HEAD))
 FS_WITH_DEFAULT_HEAD_SHORT:=$(shell echo $(FS_WITH_DEFAULT_HEAD)|cut -b -7)
@@ -258,7 +258,7 @@ define Package/$(PKG_NAME)
 $(call Package/$(PKG_NAME)/Default)
   MENU:=1
   TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT))
-  DEPENDS:=+FS_WITH_CORE_LIBEDIT_SUPPORT:libedit +FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp_git +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl
+  DEPENDS:=+FS_WITH_CORE_LIBEDIT_SUPPORT:libedit +FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libgdbm $(ICONV_DEPENDS) $(INTL_DEPENDS) +libjpeg +libncurses +libopenldap +libpcre +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl
 endef
 
 
diff --git a/net/freeswitch/patches/libs-apr-configure_ac.patch b/net/freeswitch/patches/libs-apr-configure_ac.patch
new file mode 100644
index 0000000..c4667dd
--- /dev/null
+++ b/net/freeswitch/patches/libs-apr-configure_ac.patch
@@ -0,0 +1,15 @@
+--- a/libs/apr/configure.ac
++++ b/libs/apr/configure.ac
+@@ -1956,7 +1956,11 @@ fi
+ 
+ APR_CHECK_TCP_NODELAY_INHERITED
+ APR_CHECK_O_NONBLOCK_INHERITED
+-APR_CHECK_TCP_NODELAY_WITH_CORK
++
++dnl Check TCP_NODELAY_WITH_CORK ONLY when NOT cross compiling
++if test "$cross_compiling" != yes; then
++	APR_CHECK_TCP_NODELAY_WITH_CORK
++fi
+ 
+ # Look for a way of corking TCP...
+ APR_CHECK_DEFINE(TCP_CORK, netinet/tcp.h)