Let's try again. Previous commit wasn't completed

Signed-off-by: Mazi Lo <openwrt.mazilo@recursor.net>

diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in
index 21486c352c9e7e72a5726bf4ef85af16e4493012..66407ab1c87c99f310023ae39c5e5e0a6287f6c5 100644 (file)
--- a/net/freeswitch/Config.in
+++ b/net/freeswitch/Config.in
@@ -1,8 +1,7 @@
 menu "Configuration"
-       depends on PACKAGE_freeswitch
+  depends on PACKAGE_freeswitch && DEVEL
 
   choice
-    depends on DEVEL
     prompt "Git HEAD version to use"
     default FS_WITH_DEFAULT_HEAD
     help
@@ -165,13 +164,6 @@ menu "Configuration"
     help
        Compile with SRTP support.
 
-  config FS_WITH_KERNEL_LINUX
-    depends on FS_WITH_SRTP
-    bool "Build library to run in Linux kernel context"
-    default n
-    help
-       Build library to run in Linux kernel context.
-
   config FS_WITH_SRTP_GENERIC_AESICM
     depends on FS_WITH_SRTP
     bool "Compile in changes for ISMAcryp"
@@ -186,6 +178,13 @@ menu "Configuration"
     help
        Build library to run in Linux kernel context.
 
+  config FS_WITH_SRTP_OPENSSL
+    depends on FS_WITH_SRTP
+    bool "Use OpenSSL crypto primitives to build SRTP"
+    default y
+    help
+       Use OpenSSL crypto primitives.
+
   config FS_WITH_THREADS
     bool "Enable threading support in APR"
     default y
@@ -196,8 +195,15 @@ menu "Configuration"
     depends on PACKAGE_freeswitch-mod-erlang-event
     string
     prompt "path to erlang installed directory"
-    default "$(STAGING_DIR)/usr"
+    default "$$(STAGING_DIR_HOST)/lib/erlang"
     help
        Specify the path to erlang libraries.
 
+  config FS_WITH_OGG_INCLUDES
+    string
+    prompt "OGG include HEADER path"
+    default "$$(STAGING_DIR)/usr/include"
+    help
+       Specify the include header path for OGG library.
+
 endmenu

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 47edccc4321bd87178995fe0dfa6a7ecc609109c..d28f91934c62bb330683cbf92fc26a661e7dc45c 100644 (file)
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -18,8 +18,8 @@ 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:=757b7440104e34cf57ab30a411e081470ce2e180
-PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git
+FS_WITH_DEFAULT_HEAD:=3d5d8163b329f86aafed087815a51494ce50ce1a
+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)
 PKG_SOURCE_VERSION_SHORT:=$(shell echo $(PKG_SOURCE_VERSION)|cut -b -7)
@@ -30,7 +30,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 
 PKG_FIXUP:=libtool autoreconf
-PKG_BUILD_PARALLEL:=1
+PKG_BUILD_PARALLEL:=0
 
 
 ifeq ($(CONFIG_DEVEL),y)
@@ -124,6 +124,7 @@ FS_MOD_AVAILABLE:= \
        nibblebill \
        opus \
        oreka \
+       perl \
        portaudio \
        portaudio-stream \
        posix-timer \
@@ -131,6 +132,7 @@ FS_MOD_AVAILABLE:= \
        rayo \
        redis \
        rss \
+       rtc \
        rtmp \
        sangoma-codec \
        say-de \
@@ -160,7 +162,6 @@ FS_MOD_AVAILABLE:= \
        sofia \
        sonar \
        spandsp \
-       speex \
        spidermonkey \
        spidermonkey-core-db \
        spidermonkey-curl \
@@ -176,6 +177,7 @@ FS_MOD_AVAILABLE:= \
        tts-commandline \
        unimrcp \
        valet-parking \
+       verto \
        vmd \
        voicemail \
        voicemail-ivr \
@@ -198,12 +200,12 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_FS_WITH_FHS \
        CONFIG_FS_WITH_FIXED_POINT \
        CONFIG_FS_WITH_IPV6 \
-       CONFIG_FS_WITH_KERNEL_LINUX \
        CONFIG_FS_WITH_LATEST_HEAD \
        CONFIG_FS_WITH_LOCAL_SOURCE \
        CONFIG_FS_WITH_LZMA \
        CONFIG_FS_WITH_MYSQL \
        CONFIG_FS_WITH_ODBC \
+       CONFIG_FS_WITH_OGG_INCLUDES \
        CONFIG_FS_WITH_OPENSSL \
        CONFIG_FS_WITH_OPENWRT_SOURCE \
        CONFIG_FS_WITH_OPT \
@@ -212,6 +214,7 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_FS_WITH_SCTP \
        CONFIG_FS_WITH_SRTP \
        CONFIG_FS_WITH_SRTP_GENERIC_AESICM \
+       CONFIG_FS_WITH_SRTP_KERNEL_LINUX \
        CONFIG_FS_WITH_SRTP_OPENSSL \
        CONFIG_FS_WITH_THREADS \
        CONFIG_FS_WITH_VISIBILITY \
@@ -228,14 +231,14 @@ define Package/$(PKG_NAME)/Default
   SUBMENU:=Telephony
   URL:=http://www.$(PKG_NAME).org/
   MAINTAINER:=Mazi Lo <openwrt.mazilo@recursor.net>
+  MENU:=1
 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 +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 +libstdcpp +libuuid
-  MENU:=1
+  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
 endef
 
 
@@ -328,7 +331,6 @@ $(call Package/$(PKG_NAME)/Default)
                +$(PKG_NAME)-mod-say-en \
                +$(PKG_NAME)-mod-sndfile \
                +$(PKG_NAME)-mod-sofia \
-               +$(PKG_NAME)-mod-speex \
                +$(PKG_NAME)-mod-syslog \
                +$(PKG_NAME)-mod-tone-stream \
                +$(PKG_NAME)-mod-xml-curl \
@@ -572,7 +574,6 @@ CONFIGURE_ARGS+= \
        $(call autoconf_bool,CONFIG_FS_WITH_CORE_LIBEDIT_SUPPORT,core-libedit-support) \
        $(call autoconf_bool,CONFIG_FS_WITH_FHS,fhs) \
        $(call autoconf_bool,CONFIG_FS_WITH_IPV6,ipv6) \
-       $(call autoconf_bool,CONFIG_FS_WITH_KERNEL_LINUX,kernel-linux) \
        $(call autoconf_bool,CONFIG_FS_WITH_LZMA,lzma) \
        $(call autoconf_bool,CONFIG_FS_WITH_ODBC,core-odbc-support) \
        $(call autoconf_bool,CONFIG_FS_WITH_OPT,optimization) \
@@ -580,6 +581,8 @@ CONFIGURE_ARGS+= \
        $(call autoconf_bool,CONFIG_FS_WITH_POSTGRESQL,core-pgsql-support) \
        $(call autoconf_bool,CONFIG_FS_WITH_SRTP,srtp) \
        $(call autoconf_bool,CONFIG_FS_WITH_SRTP_GENERIC_AESICM,generic-aesicm) \
+       $(call autoconf_bool,CONFIG_FS_WITH_SRTP_KERNEL_LINUX,kernel-linux) \
+       $(call autoconf_bool,CONFIG_FS_WITH_SRTP_OPENSSL,openssl) \
        $(call autoconf_bool,CONFIG_FS_WITH_THREADS,threads) \
        $(call autoconf_bool,CONFIG_FS_WITH_VISIBILITY,visibility) \
        $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp && CONFIG_FS_WITH_FIXED_POINT,fixed-point) \
@@ -588,6 +591,7 @@ CONFIGURE_ARGS+= \
        $(if $(CONFIG_FS_WITH_MYSQL),--with,--without)-mysql \
        $(if $(CONFIG_FS_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \
        $(if $(CONFIG_FS_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \
+       $(if $(CONFIG_FS_WITH_OGG_INCLUDES),--with-ogg-includes="$(STAGING_DIR)/usr/include") \
        $(if $(CONFIG_FS_WITH_OPENSSL),--with,--without)-openssl \
        $(if $(CONFIG_FS_WITH_POSTGRESQL),--with,--without)-pgsql \
        $(if $(CONFIG_FS_WITH_SQLITE3),--with,--without)-sqlite3 \
@@ -642,7 +646,7 @@ CONFIGURE_VARS+= \
        apr_cv_process_shared_works="no" \
        apr_cv_tcp_nodelay_with_cork="yes" \
        apr_cv_type_rwlock_t="yes" \
-       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),ac_cv_path_PERL="yes",) \
+       $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),ac_cv_path_PERL="yes") \
        libzmq_cv_cxx_werror_flag="" \
 
 
@@ -664,14 +668,14 @@ define Build/Prepare
        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-16KHz),$(call Prepare/sounds-moh-16KHz))
        $(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))
+endif
 endef
 
 
 define Build/Configure
-
-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))
-endif
        (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh)
        $(call Build/Configure/Default)
        $(foreach m,$(FS_MOD_AVAILABLE),
@@ -721,7 +725,7 @@ define Package/$(PKG_NAME)/install
        $(CP) $(PKG_INSTALL_DIR)/usr/include $(1)/usr/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME)* $(1)/usr/lib/
        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/$(PKG_NAME).pc $(1)/usr/lib/pkgconfig/
-       $(if $(1)/usr/lib/lib$(PKG_NAME).la,sed -i -e "s#-lcurl -lz\(.*\)/usr/lib/libexpat.la\(.*\)$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)\(.*\)#-L/usr/lib -lcurl -lz /usr/lib/libexpat.la\2/usr\3#g" $(1)/usr/lib/lib$(PKG_NAME).la)
+       $(if $(1)/usr/lib/lib$(PKG_NAME).la,$(STAGING_DIR_HOST)/bin/sed -i -re 's|$(STAGING_DIR)||g;s|$(TOOLCHAIN_DIR)||g;s|$(TARGET_CROSS)|usr|g;s|$(REAL_GNU_TARGET_NAME)|usr|g;s|-L$(PKG_BUILD_DIR)(.*)libzrtp ||g;:a;s|((-[IL]/\S+\s).*)\2|\1|;ta' $(1)/usr/lib/lib$(PKG_NAME).la)
 endef
 
 
@@ -894,35 +898,32 @@ define BuildPlugin
        #
        # mod_$(subst -,_,$(1)): Clean installed library control files from referencig to OpenWRT PATH.
        #
-       for f in `ls $$(1)/usr/lib/$(PKG_NAME)/*.la`; \
-       do \
-               sed -i -e "s#' \(.*\)/usr/lib/libexpat.la\(.*\)$(TOOLCHAIN_DIR)/$(REAL_GNU_TARGET_NAME)\(.*\)#' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib /usr/lib/lib$(PKG_NAME).la /usr/lib/libexpat.la\2/usr\3#g;s#' \(.*\)/usr/lib/libintl-full/lib#' -L/usr/lib -L/usr/lib/libiconv-full/lib -L/usr/lib/libintl-full/lib#g;s#-L\.\.##g;s#$(PKG_BUILD_DIR)\(.*\)/usr/lib/libtiff.la\(.*\)#/usr/lib/libtiff.la\2#g" $$$$$$$${f}; \
-       done
+       $(STAGING_DIR_HOST)/bin/sed -i -re 's|$(STAGING_DIR)||g;s|$(TOOLCHAIN_DIR)||g;s|$(TARGET_CROSS)|usr|g;s|$(REAL_GNU_TARGET_NAME)|usr|g;s|$(PKG_BUILD_DIR)(.*)libzrtp ||g;s|-L$(PKG_BUILD_DIR)(.*)libtiff ||g;:a;s|((-[IL]/\S+\s).*)\2|\1|;ta' $(foreach l,`find $$(1)/usr/lib -name "*.la" -print`,$(l));
 
        #
        # 1. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)))
        #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs)
+       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(STAGING_DIR_HOST) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
 
        #
        # 2. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)))
        #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs)
+       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/$(3)/$(1)/*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
 
        #
        # 3. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)))
        #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs)
+       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf/autoload_configs/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
 
        #
        # 4. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)))
        #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs)
+       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/conf*/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
 
        #
        # 5. mod_$(subst -,_,$(1)) XML configuration files from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)))
        #
-       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs)
+       $$$$(if $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)),[ -d $$(1)/etc/$(PKG_NAME)/autoload_configs ] || $(INSTALL_DIR) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(CP) $$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/src/$(3)/*/mod_$(subst -,_,$(1))/$(subst -,_,$(1)).conf.xml)) $$(1)/etc/$(PKG_NAME)/autoload_configs;$(SED) 's|/usr/local/lib|/usr/lib|g;s|/usr/local|/etc|g' $$(1)/etc/$(PKG_NAME)/autoload_configs/$(subst -,_,$(1)).conf.xml)
 
        #
        # 6. Additional configuration files for mod_$(subst -,_,$(1)) from: $$$$(patsubst $(PKG_BUILD_DIR)/%,%,$$$$(firstword $$$$(wildcard $(PKG_BUILD_DIR)/conf/$(3)/$(1)/*.$(1))))
@@ -987,7 +988,7 @@ $(eval $(call BuildPlugin,conference,Conference Room,vanilla,,,,))
 $(eval $(call BuildPlugin,console,Console Logger,vanilla,,,,))
 $(eval $(call BuildPlugin,curl,HTTP Request,vanilla,,,,+libcurl))
 $(eval $(call BuildPlugin,dahdi-codec,DAHDI Codecs,vanilla,,,,))
-$(eval $(call BuildPlugin,db,Database Backend,vanilla,,,,))
+$(eval $(call BuildPlugin,db,Database Backend,vanilla,,,,+libdb47))
 $(eval $(call BuildPlugin,dialplan-asterisk,Asterisk Dialplan Parser,vanilla,,,,))
 $(eval $(call BuildPlugin,dialplan-directory,Dialplan Directory,vanilla,,,,))
 $(eval $(call BuildPlugin,dialplan-xml,Dialplan-XML Interface,vanilla,,,,))
@@ -1030,20 +1031,22 @@ $(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,mongo,A Document-Oriented Database,vanilla,,,,))
+$(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,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,,,,))
 $(eval $(call BuildPlugin,opus,Opus CoDec,vanilla,,,,))
 $(eval $(call BuildPlugin,oreka,Media Recording with Oreka,vanilla,,,,))
-$(eval $(call BuildPlugin,portaudio,Portaudio To Sound Card Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA))
-$(eval $(call BuildPlugin,portaudio-stream,Portaudio Streaming Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA))
+$(eval $(call BuildPlugin,perl,Perl Language Interface,vanilla,,lib/perl5/5.20/$(PKG_NAME).la lib/perl5/5.20/$(PKG_NAME).pm lib/perl5/5.20/$(PKG_NAME).so,,+perl +libdb47 +libgdbm))
+$(eval $(call BuildPlugin,portaudio,Portaudio To Sound Card Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA @BROKEN)) # needs portaudio
+$(eval $(call BuildPlugin,portaudio-stream,Portaudio Streaming Interface,vanilla,,,alsa,+FS_WITH_ALSA:alsa-lib @FS_WITH_ALSA @BROKEN)) # needs portaudio
 $(eval $(call BuildPlugin,posix-timer,POSIX Compliant Soft Timer,vanilla,,,,))
 $(eval $(call BuildPlugin,radius-cdr,Radius-CDR interface,vanilla,,,,@BROKEN)) # fails in freeradius-client
 $(eval $(call BuildPlugin,rayo,Rayo server & node implementation,vanilla,,,,))
 $(eval $(call BuildPlugin,redis,Redis Limited Backend,vanilla,,,,))
 $(eval $(call BuildPlugin,rss,RRS Feeds via TTS,vanilla,,,,))
+$(eval $(call BuildPlugin,rtc,RTC endpoint,vanilla,,,,))
 $(eval $(call BuildPlugin,rtmp,RTMP Protocol Handler,vanilla,,,,))
 $(eval $(call BuildPlugin,sangoma-codec,Sangoma Codec,vanilla,,,,@BROKEN)) # Req. Sangoma CoDec source
 $(eval $(call BuildPlugin,say-de,German Say,vanilla,,,,))
@@ -1073,7 +1076,6 @@ $(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 +FS_WITH_LZMA:liblzma @FS_WITH_LZMA)) # ~/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))
 $(eval $(call BuildPlugin,spidermonkey-curl,JavaScript Curl,vanilla,,,,@BROKEN))
@@ -1089,6 +1091,7 @@ $(eval $(call BuildPlugin,tone-stream,Tone Generation Stream,vanilla,,,,))
 $(eval $(call BuildPlugin,tts-commandline,ASR TTS Command Interface,vanilla,,,,))
 $(eval $(call BuildPlugin,unimrcp,UniMRCP (MRCP Client),vanilla,,,,@BROKEN))
 $(eval $(call BuildPlugin,valet-parking,Valet Parking Application,vanilla,,,,))
+$(eval $(call BuildPlugin,verto,HTML5 Verto interface,vanilla,,lib/perl5/5.20/MCAST.so lib/perl5/5.20/MCAST.la lib/perl5/5.20/MCAST.pm,perl rtc,))
 $(eval $(call BuildPlugin,vmd,VoiceMail Beep Detection,vanilla,,,,))
 $(eval $(call BuildPlugin,voicemail,VoiceMail,vanilla,,,,))
 $(eval $(call BuildPlugin,voicemail-ivr,VoiceMail IVR,vanilla,,,,))

diff --git a/net/freeswitch/patches/0000001-build-modules_conf_in.patch b/net/freeswitch/patches/0000001-build-modules_conf_in.patch
index 7b57a6679ef2551bdc008f385302c0a859f43e11..174098eff299736296e1c4e35951b6b3069ec800 100644 (file)
--- a/net/freeswitch/patches/0000001-build-modules_conf_in.patch
+++ b/net/freeswitch/patches/0000001-build-modules_conf_in.patch
@@ -1,6 +1,6 @@
 --- a/build/modules.conf.in
 +++ b/build/modules.conf.in
-@@ -33,6 +33,7 @@ applications/mod_httapi
+@@ -34,6 +34,7 @@ applications/mod_httapi
  #applications/mod_rad_auth
  #applications/mod_redis
  #applications/mod_rss

diff --git a/net/freeswitch/patches/0000002-build-config-erlang_m4.patch b/net/freeswitch/patches/0000002-build-config-erlang_m4.patch
index 3a748b34abcd4c75b51a9eed64c7094c2df5ae70..62dd11901e0bc21bfae26c6c2adc45e1ac50e050 100644 (file)
--- a/net/freeswitch/patches/0000002-build-config-erlang_m4.patch
+++ b/net/freeswitch/patches/0000002-build-config-erlang_m4.patch
@@ -1,20 +1,24 @@
 --- a/build/config/erlang.m4
 +++ b/build/config/erlang.m4
-@@ -16,25 +16,26 @@ then
- 
-       if test "$with_erlang" != "yes" -a "$with_erlang" != "try" ; then
-               AC_MSG_CHECKING([for erlang])
--              if test ! -x "$with_erlang" ; then
-+              if test ! -x "$with_erlang/../../host/lib/erlang/bin" ; then
+@@ -1,6 +1,6 @@
+ AC_DEFUN([CHECK_ERLANG], [
+ #
+-# Erlang checks for mod_erlang_event
++# Erlang check
+ #
+ AC_ARG_WITH(
+       [erlang],
+@@ -19,22 +19,23 @@ then
+               if test ! -x "$with_erlang" ; then
                        AC_MSG_ERROR([Specified erlang does not exist or is not executable: $with_erlang])
                fi
 -              AC_MSG_RESULT([$with_erlang])
 -              AC_SUBST([ERLANG], ["$with_erlang"])
-+              AC_MSG_RESULT(["$with_erlang/../../host/lib/erlang/bin/erl"])
-+              AC_SUBST([ERL],["$with_erlang/../../host/lib/erlang/bin/erl"])
++              AC_MSG_RESULT(["$with_erlang/bin/erl"])
++              AC_SUBST([ERL],["$with_erlang/bin/erl"])
        else
 -              AC_PATH_PROG([ERLANG], ["erl"], ["no"], ["$PATH:/usr/bin:/usr/local/bin"])
-+              AC_ERLANG_NEED_ERL(["$with_erlang/../../host/lib/erlang/bin"])
++              AC_ERLANG_NEED_ERL(["$with_erlang/bin"])
        fi
  
 -      if test "$ERLANG" != "no" ; then
@@ -31,21 +35,32 @@
 -              AC_MSG_RESULT([$ERLANG_VER])
  
 -              ERLANG_LIBDIR=`$ERLANG -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+              ERLANG_LIBDIR="$with_erlang/lib"
++              ERLANG_LIBDIR=`$ERL -noshell -eval 'io:format("~n~s/lib~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
                AC_MSG_CHECKING([erlang libdir])
                if test -z "`echo $ERLANG_LIBDIR`" ; then
                        AC_MSG_ERROR([failed])
-@@ -44,7 +45,7 @@ then
+@@ -42,9 +43,14 @@ then
+                       ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
+                       LIBS="-L$ERLANG_LIBDIR $LIBS"
                fi
++
++              #
++              # Don't use the above ERLANG_LDFLAGS
++              #
++              ERLANG_LDFLAGS="-L${STAGING_DIR}/usr/lib"
                AC_MSG_RESULT([$ERLANG_LIBDIR])
  
 -              ERLANG_INCDIR=`$ERLANG -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
-+              ERLANG_INCDIR="$with_erlang/include"
++              ERLANG_INCDIR=`$ERL -noshell -eval 'io:format("~n~s/include~n", [[code:lib_dir("erl_interface")]]).' -s erlang halt | tail -n 1`
                AC_MSG_CHECKING([erlang incdir])
                if test -z "`echo $ERLANG_INCDIR`" ; then
                        AC_MSG_ERROR([failed])
-@@ -61,7 +62,8 @@ then
-               # check liei
+@@ -58,10 +64,11 @@ then
+ 
+               ERLANG_LIB="ei"
+ 
+-              # check liei
++              # check libei
                AC_CHECK_LIB([$ERLANG_LIB], [ei_encode_version], [has_libei="yes"], [has_libei="no"])
                # maybe someday ei will actually expose this?
 -              AC_CHECK_LIB([$ERLANG_LIB], [ei_link_unlink], [ERLANG_CFLAGS="$ERLANG_CFLAGS -DEI_LINK_UNLINK"])
@@ -54,3 +69,27 @@
  
                if test "$has_libei" = "no" ; then
                        AS_IF([test "$with_erlang" = "try"],
+@@ -75,7 +82,7 @@ then
+                       )
+               else
+                       ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei"
+-                      AC_MSG_NOTICE([Your erlang seems OK, do not forget to enable mod_erlang_event in modules.conf])
++                      AC_MSG_NOTICE([Your erlang seems OK. You can now use ErLang in your codes.])
+                       AC_SUBST([ERLANG_CFLAGS],  [$ERLANG_CFLAGS])
+                       AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS])
+               fi
+@@ -85,12 +92,12 @@ then
+ 
+       else
+               AS_IF([test "$with_erlang" = "try"],
+-                      [AC_MSG_WARN([Could not find erlang, mod_erlang_event will not build, use --with-erlang to specify the location])],
++                      [AC_MSG_WARN([Could not find erlang, codes depend on erlang will not build, use --with-erlang to specify the location])],
+                       [AC_MSG_ERROR([Could not find erlang, use --with-erlang to specify the location])]
+               )
+       fi
+ else
+-      AC_MSG_WARN([erlang support disabled, building mod_erlang_event will fail!])
++      AC_MSG_WARN([erlang support disabled!])
+ fi
+ 
+ ])

diff --git a/net/freeswitch/patches/0000010-configure_ac.patch b/net/freeswitch/patches/0000010-configure_ac.patch
index 2768a458b694a1715ff1a2ea37049c959a7a4f86..d70e3faaf73186da86b74de5904718b1d0b30f2d 100644 (file)
--- a/net/freeswitch/patches/0000010-configure_ac.patch
+++ b/net/freeswitch/patches/0000010-configure_ac.patch
@@ -1,6 +1,6 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -803,7 +803,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
+@@ -810,7 +810,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
  
  AC_CHECK_FUNC(socket, , AC_CHECK_LIB(socket, socket))
  
@@ -8,3 +8,64 @@
  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
+ # perl checks
+ #
+ 
+-AC_CHECK_PROG(PERL,perl,[ac_cv_have_perl=yes],[ac_cv_have_perl=no])
+-
+-# -a "x$ac_cv_have_EXTERN_h" != "xno"
++AC_CHECK_PROG([PERL],[perl],[ac_cv_have_perl=yes],[ac_cv_have_perl=no],[${STAGING_DIR}/../host/usr/bin])
+ 
+ if test "x$ac_cv_have_perl" != "xno"; then
+-   PERL=perl
+-   PERL_SITEDIR="`$PERL -MConfig -e 'print $Config{archlib}'`"
+-   PERL_LIBDIR="-L`$PERL -MConfig -e 'print $Config{archlib}'`/CORE"
+-   PERL_LIBS="`$PERL -MConfig -e 'print $Config{libs}'`"
+-   PERL_CFLAGS="-w -DMULTIPLICITY `$PERL -MExtUtils::Embed -e ccopts | sed -e 's|-arch x86_64 -arch i386||'` -DEMBED_PERL"
+-   PERL_LDFLAGS="`$PERL -MExtUtils::Embed -e ldopts| sed -e 's|-arch x86_64 -arch i386||'`"
+-   PERL_INC="`$PERL -MExtUtils::Embed -e perl_inc`"
++   PERL="${STAGING_DIR}/../host/usr/bin/perl"
++   #PERL_SITEDIR="`${PERL} -MConfig -e 'print $Config{installarchlib}'`"
++   PERL_SITELIB="/usr/lib/perl5/5.20"
++   PERL_SITEDIR="${STAGING_DIR}${PERL_SITELIB}"
++   PERL_COREDIR="${PERL_SITEDIR}/CORE"
++   PERL_INC="-I${PERL_COREDIR}"
++   #PERL_CFLAGS="-w -DMULTIPLICITY `${PERL} -MExtUtils::Embed -e ccopts` -DEMBED_PERL"
++   PERL_CFLAGS="-w -DMULTIPLICITY -fwrapv -fno-strict-aliasing -pipe -fstack-protector ${PERL_INC} -DEMBED_PERL"
++   PERL_LIBDIR="-L${PERL_COREDIR}"
++   #PERL_LIBS="${PERL_LIBDIR} -lpthread `${PERL} -MConfig -e 'print $Config{libs}' | sed -e 's| -lgdbm_compat||g'` "
++   #PERL_LDFLAGS="`${PERL} -MExtUtils::Embed -e ldopts | sed -e 's| -lgdbm_compat||g'` "
++   PERL_LIBS="-lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc "
++   PERL_LDFLAGS="${PERL_LIBDIR} -lpthread -lperl -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc -lrt "
+ 
+    save_CFLAGS="$CFLAGS"
+-   CFLAGS="$PERL_CFLAGS"
++   CFLAGS="${PERL_CFLAGS}"
+    AC_CHECK_HEADER([EXTERN.h], [ac_cv_have_EXTERN_h=yes], [ac_cv_have_EXTERN_h=no], [[#include <EXTERN.h>
+ # include <perl.h>]])
+    CFLAGS="$save_CFLAGS"
+ 
+    save_LDFLAGS="$LDFLAGS"
+-   LDFLAGS="$PERL_LDFLAGS"
++   LDFLAGS="${PERL_LDFLAGS}"
+    AC_CHECK_LIB([perl], [perl_alloc], ac_cv_use_libperl=yes, ac_cv_use_libperl=no)
+-   LDFLAGS="$save_LDFLAGS"
++   LDFLAGS+="$save_LDFLAGS"
+ 
+-   AC_SUBST(PERL_SITEDIR)
+-   AC_SUBST(PERL_LIBDIR)
+-   AC_SUBST(PERL_LIBS)
++   AC_SUBST(PERL)
+    AC_SUBST(PERL_CFLAGS)
+-   AC_SUBST(PERL_LDFLAGS)
++   AC_SUBST(PERL_COREDIR)
+    AC_SUBST(PERL_INC)
++   AC_SUBST(PERL_LDFLAGS)
++   AC_SUBST(PERL_LIBDIR)
++   AC_SUBST(PERL_LIBS)
++   AC_SUBST(PERL_SITEDIR)
++   AC_SUBST(PERL_SITELIB)
+ fi
+ 
+ AM_CONDITIONAL([HAVE_PERL],[test "x$ac_cv_have_perl" != "xno" -a "x$ac_cv_have_EXTERN_h" != "xno" -a "x$ac_cv_use_libperl" != "xno"])

diff --git a/net/freeswitch/patches/0000011-Makefile.am.patch b/net/freeswitch/patches/0000011-Makefile.am.patch
index df2a2266fd0f40795b8abdf2f5f5b5a11a9e61c8..bb18ac6a16f21d41e02e31afe96f30021f2e0eaa 100644 (file)
--- a/net/freeswitch/patches/0000011-Makefile.am.patch
+++ b/net/freeswitch/patches/0000011-Makefile.am.patch
@@ -16,7 +16,16 @@
  endif
  
  library_includedir      = $(includedir)
-@@ -630,7 +633,9 @@ sndfile-reconf:
+@@ -310,7 +313,7 @@ endif
+ $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/modules.conf  
+ 
+ src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h
+-      cat $(switch_srcdir)/src/include/switch_cpp.h | perl $(switch_srcdir)/build/strip.pl > $(switch_srcdir)/src/include/switch_swigable_cpp.h
++      cat $(switch_srcdir)/src/include/switch_cpp.h | $(STAGING_DIR_HOST)/usr/bin/perl $(switch_srcdir)/build/strip.pl > $(switch_srcdir)/src/include/switch_swigable_cpp.h
+ #     $(CC) -E $(switch_srcdir)/src/include/switch_cpp.h \
+ #             -I$(switch_srcdir)/src/include -I$(switch_srcdir)/libs/libteletone/src \
+ #             -DSWITCH_DECLARE_CLASS= -DSWITCH_DECLARE\(x\)=x -DSWITCH_DECLARE_CONSTRUCTOR= \
+@@ -629,7 +632,9 @@ sndfile-reconf:
  
  tiff-reconf:
        cd libs/tiff-4.0.2 && autoreconf -fi
@@ -27,7 +36,7 @@
        cd libs/tiff-4.0.2 && make
  
  python-reconf:
-@@ -653,9 +658,6 @@ iks-reconf:
+@@ -649,9 +654,6 @@ iks-reconf:
        $(MAKE) mod_dingaling-clean
  
  spandsp-reconf: tiff-reconf