From: Debian <debian@Debian.HomeLinux.net>
Date: Sat, 27 Jul 2013 01:32:16 +0000 (-0400)
Subject: FreeSWITCH:
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=04d8a881db551119ebf620a29bbf60d2f31f821e;p=feed%2Ftelephony.git

FreeSWITCH:
	1. Updated to git HEAD 03dcbde8b4a5e2861b848fe6fc0ef04dd915939f
	2. Fixed error messages for missing dependency of liblzma.so.5.
		FS libs/tiff package auto detects liblzma. As such, when
		liblzma is enabled/compiled, libs/tiff will be compiled
		and linked to liblzma. As such, package like spandsp which
		depends on libs/tiff will be flagged by OpenWRT during
		packaging stage for a missing dependency of liblzma.so.5.
---

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 7881979..42e52a8 100644
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -18,7 +18,7 @@ PKG_VERSION:=1.5.5b
 # The latest FS git hash in PKG_SOURCE_VERSION can be obtained from http://fisheye.freeswitch.org
 #
 PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
-FS_DEFAULT_HEAD:=1dbcfbfa028b4818f83eb7c5fb624b525a2011b2
+FS_DEFAULT_HEAD:=03dcbde8b4a5e2861b848fe6fc0ef04dd915939f
 FS_LATEST_HEAD:=$(if $(DUMP),$(FS_DEFAULT_HEAD),$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1))
 PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_WITH_PULL_CURRENT),$(FS_LATEST_HEAD),$(FS_DEFAULT_HEAD))
 PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7)
@@ -593,6 +593,7 @@ CONFIGURE_ARGS+= \
 	$(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),--with,--without)-erlang \
 	$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \
+	$(call autoconf_bool,CONFIG_PACKAGE_liblzma,lzma) \
 	$(call autoconf_bool,CONFIG_FS_WITH_POSTGRESQL,core-pgsql-support) \
 	$(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp && CONFIG_FS_WITH_FIXED_POINT,fixed-point) \
 	$(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \
@@ -1066,7 +1067,7 @@ $(eval $(call BuildPlugin,snmp,SNMP AgentX Subagent,vanilla,,,,+libnetsnmp))
 $(eval $(call BuildPlugin,snom,SNOM specific features,vanilla,,,,))
 $(eval $(call BuildPlugin,sofia,SOFIA SIP,mod,,,,)) # ~/conf
 $(eval $(call BuildPlugin,sonar,Sonar Ping Timer,vanilla,,,,))
-$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg)) # ~/conf
+$(eval $(call BuildPlugin,spandsp,Span DSP,mod,,,,+libjpeg +@PACKAGE_liblzma)) # ~/conf
 $(eval $(call BuildPlugin,speex,Speex codec,mod,,,,))
 $(eval $(call BuildPlugin,spidermonkey,JavaScript,vanilla,,,,@BROKEN)) # fails in js
 $(eval $(call BuildPlugin,spidermonkey-core_db,JavaScript DB,vanilla,,,,@BROKEN))