removed dependencies on GNUTLs for mod_dingaling and minor fixes on sound packages.

SVN-Revision: 35556

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 0245c986ecc1d6e6ce5c668bd4ab570b420e3149..c81c978487a8de68703d1dae47efcff2af190418 100644 (file)
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -18,7 +18,7 @@ PKG_VERSION:=1.3.13b
 #
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
-FS_DEFAULT_HEAD:=a55a9b39155856224bc8e81e9abaff1d8235834c
+FS_DEFAULT_HEAD:=475c235df44abe956ccfff050ec04f1f4578e6c1
 FS_LATEST_HEAD:=$(shell git ls-remote $(PKG_SOURCE_URL) HEAD | cut -f1)
 PKG_SOURCE_VERSION:=$(if $(CONFIG_FS_SOFIA_WITH_PULL_CURRENT),$(FS_LATEST_HEAD),$(FS_DEFAULT_HEAD))
 PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7)
@@ -184,14 +184,14 @@ define Package/$(PKG_NAME)/Default
   CATEGORY:=Network
   SUBMENU:=Telephony
   URL:=http://www.$(PKG_NAME).org/
-  MAINTAINER:=Mazilo <OpenWRT@slickdeals.endjunk.com>
+  MAINTAINER:=Mazilo <openwrt.forum.mazilo@recursor.net>
 endef
 
 
 define Package/$(PKG_NAME)
 $(call Package/$(PKG_NAME)/Default)
   TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT))
-  DEPENDS:=+libcurl +libjpeg +libncurses +libpq +libpthread +librt +libstdcpp
+  DEPENDS:=+libcurl +libiconv-full +libjpeg +libncurses +libpq +libpthread +librt +libstdcpp
   MENU:=1
 endef
 

diff --git a/net/freeswitch/patches/002-configure_in.patch b/net/freeswitch/patches/002-configure_in.patch
index b33098124faf5b6ed7e5f094fd41a2f5341208e2..326112c3b2a09372d60b805faeac9b5423ce2400 100644 (file)
--- a/net/freeswitch/patches/002-configure_in.patch
+++ b/net/freeswitch/patches/002-configure_in.patch
@@ -1,5 +1,14 @@
 --- a/configure.in
 +++ b/configure.in
+@@ -152,7 +152,7 @@ if test "${enable_optimizer}" = "yes" ;
+         AX_CC_MAXOPT
+ fi
+ 
+-AX_PATH_LIBGNUTLS()
++#AX_PATH_LIBGNUTLS()
+ 
+ # set defaults for use on all platforms
+ SWITCH_AM_CFLAGS="-I${switch_srcdir}/src/include -I${switch_builddir}/src/include -I${switch_srcdir}/libs/libteletone/src -I${switch_srcdir}/libs/stfu"
 @@ -581,7 +581,7 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
  
  AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))

diff --git a/net/freeswitch/patches/210-src-mod-endpoints-mod_dingaling-Makefile.patch b/net/freeswitch/patches/210-src-mod-endpoints-mod_dingaling-Makefile.patch
new file mode 100644 (file)
index 0000000..0b56586
--- /dev/null
+++ b/net/freeswitch/patches/210-src-mod-endpoints-mod_dingaling-Makefile.patch
@@ -0,0 +1,10 @@
+--- a/src/mod/endpoints/mod_dingaling/Makefile
++++ b/src/mod/endpoints/mod_dingaling/Makefile
+@@ -10,7 +10,6 @@ DING_DIR=$(BASE)/libs/libdingaling
+ LOCAL_CFLAGS += -I$(DING_DIR)/src -I$(BASE)/libs/iksemel/include
+ LOCAL_OBJS=$(DING_DIR)/src/libdingaling.o $(DING_DIR)/src/sha1.o $(IKS_LA)
+ LOCAL_SOURCES=$(DING_DIR)/src/libdingaling.c $(DING_DIR)/src/sha1.c $(DING_DIR)/src/libdingaling.h
+-LOCAL_LDFLAGS=$(LIBGNUTLS_LIBS)
+ include $(BASE)/build/modmake.rules
+ 
+