From 6c33bb006fab9e7fa2c650520cb4af414d5408ab Mon Sep 17 00:00:00 2001 From: Mazi Lo Date: Sat, 6 Sep 2014 14:13:44 -0400 Subject: [PATCH] FreeSWITCH: 1. Bump to version 1.5.14b with the FS git HEAD of 59cd3c77d84fac242683c5eb0b61c52f10bb2bb5 2. Remove mod-memcache due to lack of libmemcache support by OpenWRT. Signed-off-by: Mazi Lo --- net/asterisk-11.x/Makefile | 6 ++--- net/freeswitch/Makefile | 26 +++++++++---------- .../patches/0000010-configure_ac.patch | 19 ++++---------- 3 files changed, 21 insertions(+), 30 deletions(-) diff --git a/net/asterisk-11.x/Makefile b/net/asterisk-11.x/Makefile index d275014..a6e6eb7 100644 --- a/net/asterisk-11.x/Makefile +++ b/net/asterisk-11.x/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk11 -PKG_VERSION:=11.11.0 -PKG_RELEASE:=7 +PKG_VERSION:=11.12.0 +PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=2983e6ebf2892bdefd41a597873f433a +PKG_MD5SUM:=4bca7a1688f0e28fe3707994421899fe PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 0a1461c..2e93d95 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -11,14 +11,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch PKG_SOURCE_PROTO:=git PKG_DISTNAME:=$(PKG_NAME)_$(PKG_SOURCE_PROTO) -PKG_VERSION:=1.5.13b +PKG_VERSION:=1.5.14b # # The latest FS git hash in PKG_SOURCE_VERSION can be obtained from # http://fisheye.freeswitch.org # -FS_WITH_DEFAULT_HEAD:=5173471b06d88063ec7e2622c92c9674840ae4b1 +FS_WITH_DEFAULT_HEAD:=59cd3c77d84fac242683c5eb0b61c52f10bb2bb5 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) @@ -225,18 +225,24 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +ifneq ($(CONFIG_CCACHE),) +TARGET_CC=$(TARGET_CC_NOCACHE) +TARGET_CXX=$(TARGET_CXX_NOCACHE) +endif + + define Package/$(PKG_NAME)/Default SECTION:=net CATEGORY:=Network SUBMENU:=Telephony URL:=http://www.$(PKG_NAME).org/ MAINTAINER:=Mazi Lo - MENU:=1 endef 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 +SSP_SUPPORT:libssp +libstdcpp +libuuid +PACKAGE_$(PKG_NAME)-mod-perl:perl endef @@ -459,11 +465,6 @@ ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),) endif -ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-memcache),) - $(eval $(call Download/files,memcache,libmemcached-0.32.tar.gz,2f06059803737b6bf6135edfc86db4b3,,downloads/libs/,libs/)) -endif - - ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-mongo),) $(eval $(call Download/files,mongo,mongo-c-driver-0.92.2.tar.gz,afab25a33abd3f1e0ba79c5a9da92651,,downloads/libs/,libs/)) endif @@ -657,7 +658,6 @@ define Build/Prepare $(call Prepare/flite) $(call Prepare/json-cdr) $(call Prepare/ldap) - $(call Prepare/memcache) $(call Prepare/mongo) $(call Prepare/opus) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-08KHz),$(call Prepare/sounds-en-08KHz)) @@ -669,13 +669,13 @@ define Build/Prepare $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-32KHz),$(call Prepare/sounds-moh-32KHz)) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-48KHz),$(call Prepare/sounds-moh-48KHz)) ifeq ($(CONFIG_FS_WITH_LOCAL_SOURCE),y) - (cd $(PKG_BUILD_DIR); $(if $(CONFIG_FS_WITH_LATEST_HEAD),if $(QUILT_CMD) top > /dev/null 2>&1; then $(QUILT_CMD) pop -a; fi; git pull;) if $(QUILT_CMD) next > /dev/null 2>&1; then $(QUILT_CMD) push -a; fi) + (cd $(PKG_BUILD_DIR); $(if $(CONFIG_FS_WITH_LATEST_HEAD),if $(QUILT_CMD) top > /dev/null 2>&1 && [ -f $(PKG_BUILD_DIR)/patches/series ]; then $(QUILT_CMD) pop -a; fi; git pull;) if $(QUILT_CMD) next > /dev/null 2>&1; then $(QUILT_CMD) push -a; fi) endif endef define Build/Configure - (cd $(PKG_BUILD_DIR); $(if $(CONFIG_FS_WITH_LATEST_HEAD),if $(QUILT_CMD) top > /dev/null 2>&1; then $(QUILT_CMD) pop -a; fi; git pull;) if $(QUILT_CMD) next > /dev/null 2>&1; then $(QUILT_CMD) push -a; fi) + (cd $(PKG_BUILD_DIR); $(if $(CONFIG_FS_WITH_LATEST_HEAD),if $(QUILT_CMD) top > /dev/null 2>&1 && [ -f $(PKG_BUILD_DIR)/patches/series ]; then $(QUILT_CMD) pop -a; fi; git pull;) if $(QUILT_CMD) next > /dev/null 2>&1; then $(QUILT_CMD) push -a; fi) (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh) $(foreach m,$(FS_MOD_AVAILABLE), $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)), @@ -1030,9 +1030,9 @@ $(eval $(call BuildPlugin,logfile,File Logger,vanilla,,,,)) $(eval $(call BuildPlugin,loopback,Loopback to Dialplan Endpoint,vanilla,,,,)) $(eval $(call BuildPlugin,lua,LUA Language Interface,vanilla,,,,)) $(eval $(call BuildPlugin,managed,Media Switching Software Library,vanilla,,,,+glib2 @BROKEN)) # needs Mono -$(eval $(call BuildPlugin,memcache,MemCached Interface,vanilla,,,,+libmemcached @BROKEN)) # Req libmemcached +$(eval $(call BuildPlugin,memcache,MemCached Interface,vanilla,,,,+libmemcached @BROKEN)) # Req host libmemcached $(eval $(call BuildPlugin,mongo,A Document-Oriented Database,vanilla,,,,@BROKEN)) -$(eval $(call BuildPlugin,mp4,MP4 File Format Support For Video,vanilla,,,,@BROKEN)) # needs libmp4v2 +$(eval $(call BuildPlugin,mp4,MP4 File Format Support For Video,vanilla,,,,@BROKEN)) # needs host libmp4v2 $(eval $(call BuildPlugin,mp4v,MP4 CoDec Support For Video,vanilla,,,,)) $(eval $(call BuildPlugin,native-file,WAV Format Sound Player,vanilla,,,,)) $(eval $(call BuildPlugin,nibblebill,Credit / Debit Billing,vanilla,,,,)) diff --git a/net/freeswitch/patches/0000010-configure_ac.patch b/net/freeswitch/patches/0000010-configure_ac.patch index f9d3753..0cf76eb 100644 --- a/net/freeswitch/patches/0000010-configure_ac.patch +++ b/net/freeswitch/patches/0000010-configure_ac.patch @@ -1,15 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -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 +@@ -834,7 +834,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket)) @@ -17,7 +8,7 @@ AC_CHECK_LIB(util, openpty, [AC_DEFINE(HAVE_OPENPTY, 1, [Define if you have openpty()])]) AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[ -@@ -1135,14 +1134,14 @@ case $host in +@@ -1158,14 +1157,14 @@ case $host in ;; esac @@ -38,16 +29,16 @@ module_enabled() { grep -v -e "\#" -e "^\$" modules.conf | sed -e "s|^.*/||" | grep "^${1}\$" >/dev/null -@@ -1163,7 +1162,7 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1. +@@ -1186,7 +1185,7 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1. AC_CHECK_LIB([ldns], [ldns_str2rdf_a], [LDNS_LIBS=-lldns]) AS_IF([test -z "$LDNS_LIBS"],[ if module_enabled mod_enum; then - AC_MSG_ERROR([You need to either install libldns-dev or disable mod_enum in modules.conf]) -+ AC_MSG_ERROR([You need to install libldns or disable mod_enum in modules.conf]) ++ AC_MSG_ERROR([You need to either install libldns or disable mod_enum in modules.conf]) else AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false]) fi],[ -@@ -1241,36 +1240,43 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun +@@ -1264,36 +1263,43 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun # perl checks # -- 2.30.2