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

git-svn-id: svn://svn.openwrt.org/openwrt/packages@35556 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mazilo 2013-02-11 14:25:49 +00:00
parent 300ad457de
commit b952a66fcb
3 changed files with 22 additions and 3 deletions

View File

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

View File

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

View File

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