From 3ee497693e85e797f0239771a91c6c84a9b5d7c1 Mon Sep 17 00:00:00 2001 From: Mazi Lo Date: Sat, 9 Aug 2014 00:35:50 -0400 Subject: [PATCH] FreeSWITCH: 1. Bump to git HEAD e3e84a7820954195e8311be783a3e0cf9c1ba2ad. 2. mod_enum and mod_erlang flagged as BROKEN (lacking dependencies). 3. Fix ticket #17410 (error: recursive dependency detected!). Signed-off-by: Mazi Lo --- net/freeswitch/Makefile | 12 ++++++------ net/freeswitch/patches/0000010-configure_ac.patch | 13 +++++++++++-- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index f5b7a2a..6a79836 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -18,7 +18,7 @@ PKG_VERSION:=1.5.13b # The latest FS git hash in PKG_SOURCE_VERSION can be obtained from # http://fisheye.freeswitch.org # -FS_WITH_DEFAULT_HEAD:=c411f8c7a99ea535bac661fb70676cebd1acfac5 +FS_WITH_DEFAULT_HEAD:=e3e84a7820954195e8311be783a3e0cf9c1ba2ad 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) @@ -238,7 +238,7 @@ endef define Package/$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) TITLE:=FreeSWITCH open source telephony platform ($(PKG_SOURCE_VERSION_SHORT)) - DEPENDS:=+FS_WITH_CORE_LIBEDIT_SUPPORT:libedit +FS_WITH_OPENSSL:libopenssl +libcurl +libdb47 +libgdbm +libiconv-full +libintl-full +libjpeg +libncurses +PACKAGE_$(PKG_NAME)-mod-ldap:libopenldap +libpcre +libpthread +librt +libspeex +libspeexdsp +FS_WITH_SQLITE3:libsqlite3 +FS_WITH_SRTP:libsrtp +SSP_SUPPORT:libssp +libstdcpp +libuuid + 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 endef @@ -997,8 +997,8 @@ $(eval $(call BuildPlugin,directory,Search By Name Directory IVR,vanilla,,,,)) $(eval $(call BuildPlugin,distributor,Simple Robin-Round Load,vanilla,,,,)) $(eval $(call BuildPlugin,dptools,Dialplan Tools,vanilla,,,,)) $(eval $(call BuildPlugin,easyroute,Simple DID Routing,vanilla,,,,)) -$(eval $(call BuildPlugin,enum,ENUM Routing,,,,,+libldns)) -$(eval $(call BuildPlugin,erlang-event,Erlang Event Handler,vanilla,,,,+erlang)) +$(eval $(call BuildPlugin,enum,ENUM Routing,,,,,+libldns @BROKEN)) +$(eval $(call BuildPlugin,erlang-event,Erlang Event Handler,vanilla,,,,+erlang @BROKEN)) $(eval $(call BuildPlugin,esf,Extra SIP Functionality,vanilla,,,,)) $(eval $(call BuildPlugin,event-multicast,Multicast Event Handler,vanilla,,,,)) $(eval $(call BuildPlugin,event-socket,Socket Event Handler,vanilla,,,,)) @@ -1023,7 +1023,7 @@ $(eval $(call BuildPlugin,ilbc,ILBC Codec,vanilla,,,,)) $(eval $(call BuildPlugin,isac,iSAC Codec,vanilla,,,,)) $(eval $(call BuildPlugin,java,Java Language Interface,vanilla,,,,@BROKEN)) # needs java $(eval $(call BuildPlugin,json-cdr,JSon-CDR Interface,mod,,,,+libcurl)) -$(eval $(call BuildPlugin,ldap,LDAP interface,vanilla,,,,+libsasl2)) +$(eval $(call BuildPlugin,ldap,LDAP interface,vanilla,,,,+libopenldap)) $(eval $(call BuildPlugin,lcr,Least Cost Routing,vanilla,,,,)) $(eval $(call BuildPlugin,local-stream,Multi-Channel On Same Stream,vanilla,,,,)) $(eval $(call BuildPlugin,logfile,File Logger,vanilla,,,,)) @@ -1098,7 +1098,7 @@ $(eval $(call BuildPlugin,voicemail-ivr,VoiceMail IVR,vanilla,,,,)) $(eval $(call BuildPlugin,vp8,VP8 Video Codec,vanilla,,,,)) $(eval $(call BuildPlugin,xml-cdr,XML-CDR Handler,vanilla,,,,+libcurl)) $(eval $(call BuildPlugin,xml-curl,XML-Curl Gateway,vanilla,,,,+libcurl)) -$(eval $(call BuildPlugin,xml-ldap,LDAP-XML Gateway,vanilla,,,,+libsasl2 +PACKAGE_$(PKG_NAME)-mod-ldap:libopenldap)) +$(eval $(call BuildPlugin,xml-ldap,LDAP-XML Gateway,vanilla,,,,+PACKAGE_$(PKG_NAME)-mod-ldap:libopenldap)) $(eval $(call BuildPlugin,xml-rpc,XML-RPC Interface,vanilla,,,,)) $(eval $(call BuildPlugin,xml-radius,Radius authentication and authorization,vanilla,,,,+freeradius-client @BROKEN)) # freeradius-client isn't yet supported by OpenWRT. $(eval $(call BuildPlugin,xml-scgi,SCGI XML Gateway,vanilla,,,,)) diff --git a/net/freeswitch/patches/0000010-configure_ac.patch b/net/freeswitch/patches/0000010-configure_ac.patch index d70e3fa..f490b99 100644 --- a/net/freeswitch/patches/0000010-configure_ac.patch +++ b/net/freeswitch/patches/0000010-configure_ac.patch @@ -1,6 +1,15 @@ --- a/configure.ac +++ b/configure.ac -@@ -810,7 +810,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa +@@ -360,7 +360,7 @@ elif test "x${ax_cv_c_compiler_vendor}" + elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then + APR_ADDTO(SWITCH_AM_CFLAGS, -fPIC) + APR_ADDTO(SWITCH_AM_CXXFLAGS, -fPIC) +- APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) ++# APR_ADDTO(SWITCH_AM_CFLAGS, -Werror) + if test "${enable_64}" = "yes"; then + case "$host" in + *darwin12.*|*darwin11.*|*darwin10.*|*darwin9.*|*darwin8.*) +@@ -811,7 +811,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) @@ -8,7 +17,7 @@ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])]) AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[ -@@ -1240,36 +1239,43 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun +@@ -1241,36 +1240,43 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun # perl checks # -- 2.11.0