FreeSWITCH: FS git hash f7210b2402488ec8f9be97cc79921fa605bbb7a4

1. Fix issue with perl package dependency.
2. Fix issue with building mod-erlang.
3. Suspend unused boot() function in files/freeswitch.init.
3. Add mod-bert.
4. Update sound/moh packages to v1.0.50

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

diff --git a/net/freeswitch/Config.in b/net/freeswitch/Config.in
index 9a315dd11ae1af6e08c859ecd1c1e659d9881d10..ecc0c8c7167ecb7f5e32f8c99efb8afb0ea3ade4 100644 (file)
--- a/net/freeswitch/Config.in
+++ b/net/freeswitch/Config.in
@@ -96,6 +96,34 @@ menu "Configuration"
     help
        Compile with API visibility support.
 
+  config FS_WITH_APR_CONFIG_SWITCHES
+    bool "Enable APR configuration switches"
+    default y
+    help
+       Enable some configure switches in libs/apr.
+
+  config FS_WITH_APR_IPV6
+    depends on FS_WITH_APR_CONFIG_SWITCHES
+    bool "Enable IPV6 support in APR"
+    default y
+    help
+       Compile libs/apr package with IPV6 support.
+
+  config FS_WITH_APR_SCTP
+    depends on FS_WITH_APR_CONFIG_SWITCHES
+    bool "Enable SCTP support in APR"
+    default y
+    help
+       Compile with SCTP (Stream Control Transfer Protocol)
+       support in lib APR.
+
+  config FS_WITH_APR_THREADS
+    depends on FS_WITH_APR_CONFIG_SWITCHES
+    bool "Enable threading support in APR"
+    default y
+    help
+       Compile with threads support in libs/apr.
+
   config FS_WITH_BUILTIN_ZRTP
     bool "Enable built-in ZRTP"
     default y
@@ -122,13 +150,6 @@ menu "Configuration"
        Build FreeSWITCH to comply with FHS when placing 
        files and directories.
 
-
-  config FS_WITH_IPV6
-    bool "Enable IPV6 support in APR"
-    default y
-    help
-       Compile libs/apr package with IPV6 support.
-
   config FS_WITH_LZMA
     bool "Enable liblzma usage in libtiff"
     default y
@@ -159,12 +180,6 @@ menu "Configuration"
        Compile with optimization flag enabled. This
        will add max optimising compiler flags
 
-  config FS_WITH_SCTP
-    bool "Enable SCTP (Stream Control Transfer Protocol) support in APR"
-    default y
-    help
-       Compile with SCTP support in lib APR.
-
   config FS_WITH_SRTP
     bool "Enable SRTP"
     default y
@@ -192,12 +207,6 @@ menu "Configuration"
     help
        Use OpenSSL crypto primitives.
 
-  config FS_WITH_THREADS
-    bool "Enable threading support in APR"
-    default y
-    help
-       Compile with threads support in libs/apr.
-
   config FS_WITH_ERLANG
     depends on PACKAGE_freeswitch-mod-erlang-event
     string

diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile
index 2a9e30e4176afd9cdc557be6ab7dda4734715706..7c1ef5ba5491c460197f9923db78eff3fd3bd0c7 100644 (file)
--- a/net/freeswitch/Makefile
+++ b/net/freeswitch/Makefile
@@ -43,7 +43,7 @@ PKG_BUILD_DEPENDS:= \
        FS_WITH_MYSQL:libmysqlclient \
        FS_WITH_POSTGRESQL:libpq \
        FS_WITH_SQLITE3:libsqlite3 \
-       FS_WITH_SCTP:sctp \
+       FS_WITH_APR_SCTP:sctp \
 
 
 TAR_OPTIONS+= --strip-components=1 -C $(PKG_BUILD_DIR)
@@ -56,6 +56,7 @@ FS_MOD_AVAILABLE:= \
        amrwb \
        avmd \
        basic \
+       bert \
        blacklist \
        bv \
        callcenter \
@@ -193,13 +194,16 @@ FS_MOD_AVAILABLE:= \
 
 PKG_CONFIG_DEPENDS:= \
        CONFIG_FS_WITH_ALSA \
+       CONFIG_FS_WITH_APR_CONFIG_SWITCHES \
+       CONFIG_FS_WITH_APR_IPV6 \
+       CONFIG_FS_WITH_APR_SCTP \
+       CONFIG_FS_WITH_APR_THREADS \
        CONFIG_FS_WITH_BUILTIN_ZRTP \
        CONFIG_FS_WITH_CORE_LIBEDIT_SUPPORT \
        CONFIG_FS_WITH_DEFAULT_HEAD \
        CONFIG_FS_WITH_ERLANG \
        CONFIG_FS_WITH_FHS \
        CONFIG_FS_WITH_FIXED_POINT \
-       CONFIG_FS_WITH_IPV6 \
        CONFIG_FS_WITH_LATEST_HEAD \
        CONFIG_FS_WITH_LOCAL_SOURCE \
        CONFIG_FS_WITH_LZMA \
@@ -211,12 +215,10 @@ PKG_CONFIG_DEPENDS:= \
        CONFIG_FS_WITH_OPT \
        CONFIG_FS_WITH_POSTGRESQL \
        CONFIG_FS_WITH_SQLITE3 \
-       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 \
        $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \
 
@@ -487,49 +489,49 @@ endif
 
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-08KHz),)
- $(eval $(call Download/files,sounds-en-08KHz,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.25.tar.gz,1140efad453ed1a72259d799f7fef0fc,,,))
+ $(eval $(call Download/files,sounds-en-08KHz,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.50.tar.gz,5742984287ec6f05b001fa53817b4c32,,,))
        MAKE_INSTALL_TARGETS+= sounds-install
 endif
 
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-16KHz),)
- $(eval $(call Download/files,sounds-en-16KHz,$(PKG_NAME)-sounds-en-us-callie-16000-1.0.25.tar.gz,20b9bf1b1637be2abe838113fb675c41,,,))
+ $(eval $(call Download/files,sounds-en-16KHz,$(PKG_NAME)-sounds-en-us-callie-16000-1.0.50.tar.gz,0c0bda571e61251a8b86121913543b36,,,))
        MAKE_INSTALL_TARGETS+= hd-sounds-install
 endif
 
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-32KHz),)
- $(eval $(call Download/files,sounds-en-32KHz,$(PKG_NAME)-sounds-en-us-callie-32000-1.0.25.tar.gz,977d453d8ffa9a5b0fadee8408e84f60,,,))
+ $(eval $(call Download/files,sounds-en-32KHz,$(PKG_NAME)-sounds-en-us-callie-32000-1.0.50.tar.gz,42e5dd920ed7454eadcad71d80ee8900,,,))
        MAKE_INSTALL_TARGETS+= uhd-sounds-install
 endif
 
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en-48KHz),)
- $(eval $(call Download/files,sounds-en-48KHz,$(PKG_NAME)-sounds-en-us-callie-48000-1.0.25.tar.gz,96ec0df908eb1c535063fdc8580626d2,,,))
+ $(eval $(call Download/files,sounds-en-48KHz,$(PKG_NAME)-sounds-en-us-callie-48000-1.0.50.tar.gz,8776597979257d10009052df06251051,,,))
        MAKE_INSTALL_TARGETS+= cd-sounds-install
 endif
 
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-08KHz),)
- $(eval $(call Download/files,sounds-moh-08KHz,$(PKG_NAME)-sounds-music-8000-1.0.8.tar.gz,f63ef3cc3507af079ae5c7b8b8a01e42,,,))
+ $(eval $(call Download/files,sounds-moh-08KHz,$(PKG_NAME)-sounds-music-8000-1.0.50.tar.gz,c1f62dc26360f39f8eb442d5efd0a3aa,,,))
        MAKE_INSTALL_TARGETS+= moh-install
 endif
 
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-16KHz),)
- $(eval $(call Download/files,sounds-moh-16KHz,$(PKG_NAME)-sounds-music-16000-1.0.8.tar.gz,7fd0ca9a9e3878783baa39b8187743bf,,,))
+ $(eval $(call Download/files,sounds-moh-16KHz,$(PKG_NAME)-sounds-music-16000-1.0.50.tar.gz,d253e26baa85e0e2e727a1cb1cca898e,,,))
        MAKE_INSTALL_TARGETS+= hd-moh-install
 endif
 
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-32KHz),)
- $(eval $(call Download/files,sounds-moh-32KHz,$(PKG_NAME)-sounds-music-32000-1.0.8.tar.gz,7e03932ea81b8d0bf6d686f838b060b4,,,))
+ $(eval $(call Download/files,sounds-moh-32KHz,$(PKG_NAME)-sounds-music-32000-1.0.50.tar.gz,0e3ee69cb4ba2813ed0d3f7811332b63,,,))
        MAKE_INSTALL_TARGETS+= uhd-moh-install
 endif
 
 
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh-48KHz),)
- $(eval $(call Download/files,sounds-moh-48KHz,$(PKG_NAME)-sounds-music-48000-1.0.8.tar.gz,d06cd2a80379f224affab21f5180e4c6,,,))
+ $(eval $(call Download/files,sounds-moh-48KHz,$(PKG_NAME)-sounds-music-48000-1.0.50.tar.gz,873a62df1ab3be4191eb2488156ec2c2,,,))
        MAKE_INSTALL_TARGETS+= cd-moh-install
 endif
 
@@ -555,8 +557,8 @@ FS_TARGET_CXXFLAGS:= $(TARGET_CXXFLAGS)
 FS_TARGET_CPPFLAGS:= -I. -I./lua $(TARGET_CPPFLAGS) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) -I`ls -d $(PKG_BUILD_DIR)/libs/*|grep tiff`/libtiff -I$(PKG_BUILD_DIR)/libs/spandsp/src
 
 
-MAKE_FLAGS += \
-       OPT_FLAGS+="$(TARGET_CFLAGS)"
+#MAKE_FLAGS += \
+#      OPT_FLAGS+="$(TARGET_CFLAGS)"
 
 
 MAKE_VARS += \
@@ -580,7 +582,7 @@ CONFIGURE_ARGS+= \
        $(call autoconf_bool,CONFIG_FS_WITH_BUILTIN_ZRTP,zrtp) \
        $(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_APR_IPV6,ipv6) \
        $(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) \
@@ -590,22 +592,22 @@ CONFIGURE_ARGS+= \
        $(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_APR_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) \
        $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \
        $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-timerfd,timerfd-wrapper) \
-       $(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),--with-ogg="$(STAGING_DIR)/usr") \
-       $(if $(CONFIG_FS_WITH_OPENSSL),--with,--without)-openssl \
-       $(if $(CONFIG_FS_WITH_POSTGRESQL),--with,--without)-pgsql \
-       $(if $(CONFIG_FS_WITH_SQLITE3),--with,--without)-sqlite3 \
        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),--with-ogg="$(STAGING_DIR)/usr",--without-ogg) \
        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),--with-erlang="$(CONFIG_FS_WITH_ERLANG)",--without-erlang) \
        $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \
        $(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \
+       --with$(if $(CONFIG_FS_WITH_MYSQL),,out)-mysql \
+       --with$(if $(CONFIG_FS_WITH_OPENSSL),,out)-openssl \
+       --with$(if $(CONFIG_FS_WITH_POSTGRESQL),,out)-pgsql \
+       --with$(if $(CONFIG_FS_WITH_SQLITE3),,out)-sqlite3 \
 
 
 ifeq ($(ARCH),arm)
@@ -621,13 +623,12 @@ CONFIGURE_VARS+= \
        config_TARGET_CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \
        config_TARGET_CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \
        config_TARGET_READLINE_INC="$(FS_TARGET_CPPFLAGS)" \
-       config_TARGET_READLINE_LIBS="$(TARGET_LDFLAGS) -lreadline -lncurses" \
-       config_TARGET_LIBS="$(TARGET_LDFLAGS) -lpthread -ldl" \
+       config_TARGET_READLINE_LIBS="-lreadline -lncurses" \
+       config_TARGET_LIBS="-lpthread -ldl" \
        config_BUILD_CC="$(HOSTCC)" \
        CC_FOR_BUILD="$(HOSTCC)" \
        BUILDTOOL_CC="$(HOSTCC)" \
        BUILDTOOL_CCLD="$(HOSTCC)" \
-       LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \
        CC="$(TOOLCHAIN_DIR)/bin/$(TARGET_CC)" \
        CXX="$(TOOLCHAIN_DIR)/bin/$(TARGET_CXX)" \
        AR="$(TOOLCHAIN_DIR)/bin/$(TARGET_CROSS)ar" \
@@ -635,26 +636,11 @@ CONFIGURE_VARS+= \
        CFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CFLAGS)" \
        CXXFLAGS="$(FS_TARGET_CPPFLAGS) $(FS_TARGET_CXXFLAGS)" \
        CPPFLAGS="$(FS_TARGET_CPPFLAGS)" \
-       LDFLAGS="$(TARGET_LDFLAGS) -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\" -Wl,-rpath,/usr/lib/perl5/5.20/CORE" \
+       LDFLAGS="-L$(STAGING_DIR)/usr/lib/perl5/5.20/CORE -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib\" -Wl,-rpath-link=\"$(STAGING_DIR)/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/5.20/CORE)\" -Wl,-rpath,/usr/lib -Wl,-rpath,/usr/lib$(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),/perl5/5.20/CORE -lperl -lpthread -lnsl -lgdbm -ldb -ldl -lm -lcrypt -lutil -lc)" \
        HOST_CC="/usr/bin/cc" \
        HOST_CXX="/usr/bin/g++" \
        CROSS_COMPILE="1" \
-       ax_cv_c_compiler_vendor="gnu" \
-       ac_cv_cflags_warn_all_ansi='-Wall -std=c99 -Wno-unused-variable' \
-       ac_cv_dev_urandom="yes" \
-       ac_cv_file_dbd_apr_dbd_mysql_c="no" \
-       ac_cv_file__dev_random="no" \
-       ac_cv_file__dev_urandom="yes" \
-       ac_cv_file___dev_urandom_="yes" \
-       ac_cv_func_mmap_fixed_mapped="yes" \
-       ac_cv_func_pthread_rwlock_init="yes" \
-       ac_cv_struct_rlimit="yes" \
-       apr_cv_mutex_recursive="yes" \
-       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") \
-       libzmq_cv_cxx_werror_flag="" \
+       $(if $(CONFIG_FS_WITH_APR_SCTP),ac_cv_header_netinet_sctp_h="yes") \
 
 
 define Build/Prepare
@@ -977,6 +963,7 @@ $(eval $(call BuildPlugin,amr,Adaptive Multi-Rate On Bandwidth Codec,vanilla,,,,
 $(eval $(call BuildPlugin,amrwb,Wide Band AMR,vanilla,,,,))
 $(eval $(call BuildPlugin,avmd,Advanced Voice Mail Detection,vanilla,,,,))
 $(eval $(call BuildPlugin,basic,BASIC,vanilla,,,,))
+$(eval $(call BuildPlugin,bert,Naive Bit Error Rate Tester,vanilla,,,,))
 $(eval $(call BuildPlugin,blacklist,Blacklist,vanilla,,,,))
 $(eval $(call BuildPlugin,bv,BroadVoice 16/32-bit Audio Codec,vanilla,,,,))
 $(eval $(call BuildPlugin,callcenter,Call Center,vanilla,,,,))
@@ -1004,7 +991,7 @@ $(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 @BROKEN))
-$(eval $(call BuildPlugin,erlang-event,Erlang Event Handler,vanilla,,,,+erlang @BROKEN))
+$(eval $(call BuildPlugin,erlang-event,Erlang Event Handler,vanilla,,,,+erlang))
 $(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,,,,))
@@ -1108,4 +1095,4 @@ $(eval $(call BuildPlugin,xml-ldap,LDAP-XML Gateway,vanilla,,,,+PACKAGE_$(PKG_NA
 $(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,,,,))
-$(eval $(call BuildPlugin,yaml,YAML langunage,vanilla,,,,+libyaml @BROKEN))
+$(eval $(call BuildPlugin,yaml,YAML langunage,vanilla,,,,+libyaml_hg))

diff --git a/net/freeswitch/files/freeswitch.init b/net/freeswitch/files/freeswitch.init
index 4476b47bd963f9ff14f950100eb5265d60ed3175..9329cfeae84dc24ab34efef8e473d52a9b356ddc 100644 (file)
--- a/net/freeswitch/files/freeswitch.init
+++ b/net/freeswitch/files/freeswitch.init
@@ -5,10 +5,10 @@ START=90
 DEFAULT=/etc/default/freeswitch
 OPTIONS=""
 
-boot() {
-       # Do nothing on boot
-       exit 0
-}
+#boot() {
+#      # Do nothing on boot
+#      exit 0
+#}
 
 start() {
        [ -f $DEFAULT ] && . $DEFAULT

diff --git a/net/freeswitch/patches/0000001-build-modules_conf_in.patch b/net/freeswitch/patches/0000001-build-modules_conf_in.patch
index 174098eff299736296e1c4e35951b6b3069ec800..26aad5b9d8480d2ff518bd74168c88546c87f7e2 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
-@@ -34,6 +34,7 @@ applications/mod_httapi
+@@ -35,6 +35,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 62dd11901e0bc21bfae26c6c2adc45e1ac50e050..ebf79b7b983273da27fc72acbc62e3d2b3661483 100644 (file)
--- a/net/freeswitch/patches/0000002-build-config-erlang_m4.patch
+++ b/net/freeswitch/patches/0000002-build-config-erlang_m4.patch
@@ -39,7 +39,7 @@
                AC_MSG_CHECKING([erlang libdir])
                if test -z "`echo $ERLANG_LIBDIR`" ; then
                        AC_MSG_ERROR([failed])
-@@ -42,9 +43,14 @@ then
+@@ -42,9 +43,16 @@ then
                        ERLANG_LDFLAGS="-L$ERLANG_LIBDIR $ERLANG_LDFLAGS"
                        LIBS="-L$ERLANG_LIBDIR $LIBS"
                fi
@@ -47,7 +47,9 @@
 +              #
 +              # Don't use the above ERLANG_LDFLAGS
 +              #
-+              ERLANG_LDFLAGS="-L${STAGING_DIR}/usr/lib"
++              ERLANG_LIBDIR="${STAGING_DIR}/usr/lib"
++              ERLANG_LDFLAGS="-L$ERLANG_LIBDIR"
++              LIBS="-L$ERLANG_LIBDIR $LIBS"
                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`
@@ -55,7 +57,7 @@
                AC_MSG_CHECKING([erlang incdir])
                if test -z "`echo $ERLANG_INCDIR`" ; then
                        AC_MSG_ERROR([failed])
-@@ -58,10 +64,11 @@ then
+@@ -58,10 +66,11 @@ then
  
                ERLANG_LIB="ei"
  
@@ -69,7 +71,7 @@
  
                if test "$has_libei" = "no" ; then
                        AS_IF([test "$with_erlang" = "try"],
-@@ -75,7 +82,7 @@ then
+@@ -75,7 +84,7 @@ then
                        )
                else
                        ERLANG_LDFLAGS="$ERLANG_LDFLAGS -lei"
@@ -78,7 +80,7 @@
                        AC_SUBST([ERLANG_CFLAGS],  [$ERLANG_CFLAGS])
                        AC_SUBST([ERLANG_LDFLAGS], [$ERLANG_LDFLAGS])
                fi
-@@ -85,12 +92,12 @@ then
+@@ -85,12 +94,12 @@ then
  
        else
                AS_IF([test "$with_erlang" = "try"],

diff --git a/net/freeswitch/patches/0000010-configure_ac.patch b/net/freeswitch/patches/0000010-configure_ac.patch
index 0cf76ebf6ec5f7d55b2eb9e6409364971dce9453..2df16ff0900d0093188ae3506413cd722bb7c887 100644 (file)
--- 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
-@@ -834,7 +834,6 @@ AC_CHECK_LIB(pthread, pthread_setschedpa
+@@ -229,7 +229,7 @@ AX_COMPILER_VENDOR
+ if test "x${cross_compiling}" = "xyes"; then
+     CC_FOR_BUILD=${CC_FOR_BUILD-gcc}
+     case "$host" in
+-       arm*-linux-gnueabi*|arm*-*-linux-gnueabi*)
++       arm*-linux-gnueabi*|arm*-*-linux-*)
+               # spandsp modem
+               ac_cv_file__dev_ptmx=yes
+               # libjs
+@@ -839,7 +839,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],,,[
-@@ -1158,14 +1157,14 @@ case $host in
+@@ -1163,14 +1162,14 @@ case $host in
         ;;
  esac
  
@@ -29,7 +38,7 @@
  
  module_enabled() {
    grep -v -e "\#" -e "^\$" modules.conf | sed -e "s|^.*/||" | grep "^${1}\$" >/dev/null
-@@ -1186,7 +1185,7 @@ PKG_CHECK_MODULES([LDNS], [libldns >= 1.
+@@ -1191,7 +1190,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
@@ -38,7 +47,7 @@
      else
        AC_MSG_RESULT([no]); AM_CONDITIONAL([HAVE_LDNS],[false])
      fi],[
-@@ -1264,36 +1263,43 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
+@@ -1269,36 +1268,39 @@ AM_CONDITIONAL([HAVE_MYSQL],[test "$foun
  # perl checks
  #
  
@@ -56,18 +65,14 @@
 -   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 "
++   PERL_LDFLAGS="${LDFLAGS} -lpthread ${PERL_LIBS}"
  
     save_CFLAGS="$CFLAGS"
 -   CFLAGS="$PERL_CFLAGS"
@@ -80,8 +85,7 @@
 -   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"
+    LDFLAGS="$save_LDFLAGS"
  
 -   AC_SUBST(PERL_SITEDIR)
 -   AC_SUBST(PERL_LIBDIR)

diff --git a/net/freeswitch/patches/0000011-Makefile.am.patch b/net/freeswitch/patches/0000011-Makefile.am.patch
index bb18ac6a16f21d41e02e31afe96f30021f2e0eaa..f9f99c96005a12642bc80ff22a4ddbd26dd8c60b 100644 (file)
--- a/net/freeswitch/patches/0000011-Makefile.am.patch
+++ b/net/freeswitch/patches/0000011-Makefile.am.patch
@@ -8,7 +8,7 @@
  EXTRA_DIST =
  SUBDIRS = . src build
  AUTOMAKE_OPTIONS = foreign subdir-objects
-@@ -171,7 +175,6 @@ ZRTP_LIBS = -lbn -lzrtp
+@@ -172,7 +176,6 @@ ZRTP_LIBS = -lbn -lzrtp
  libfreeswitch_la_LDFLAGS += $(ZRTP_LDFLAGS)
  libfreeswitch_la_LIBADD += $(ZRTP_LIBS)
  CORE_LIBS += libs/libzrtp/libzrtp.a
@@ -16,7 +16,7 @@
  endif
  
  library_includedir      = $(includedir)
-@@ -310,7 +313,7 @@ endif
+@@ -311,7 +314,7 @@ endif
  $(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/modules.conf  
  
  src/include/switch_swigable_cpp.h: $(switch_srcdir)/src/include/switch_cpp.h
@@ -25,24 +25,33 @@
  #     $(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:
+@@ -374,7 +377,7 @@ fs_ivrd_LDFLAGS = $(AM_LDFLAGS) -lpthrea
+ nodist_freeswitch_SOURCES = src/include/switch_version.h
+ freeswitch_SOURCES = src/switch.c
+ freeswitch_CFLAGS  = $(AM_CFLAGS) $(CORE_CFLAGS)
+-freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread -rpath $(libdir)
++freeswitch_LDFLAGS = $(AM_LDFLAGS) -lpthread
+ freeswitch_LDADD   = libfreeswitch.la libs/apr/libapr-1.la
+ 
+ if HAVE_ODBC
+@@ -633,7 +636,9 @@ sndfile-reconf:
  
  tiff-reconf:
        cd libs/tiff-4.0.2 && autoreconf -fi
--      cd libs/tiff-4.0.2 && sh ./configure.gnu
-+      cd libs/tiff-4.0.2 && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr"
+-      cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS)
++      cd libs/tiff-4.0.2 && sh ./configure.gnu $(MY_DEFAULT_ARGS) --host="$(GNU_TARGET_NAME)" --prefix="/usr"
 +      cd libs/spandsp && autoreconf -fi
 +      cd libs/spandsp && sh ./configure.gnu --host="$(GNU_TARGET_NAME)" --prefix="/usr"
        cd libs/tiff-4.0.2 && make
  
  python-reconf:
-@@ -649,9 +654,6 @@ iks-reconf:
+@@ -653,9 +658,6 @@ iks-reconf:
        $(MAKE) mod_dingaling-clean
  
  spandsp-reconf: tiff-reconf
 -      cd libs/spandsp && $(MAKE) clean || echo
 -      cd libs/spandsp && autoreconf -fi
--      cd libs/spandsp && sh ./configure.gnu --prefix=$(prefix)
+-      cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS)
        cd libs/spandsp && $(MAKE)
  
  sofia-reconf:

diff --git a/net/freeswitch/patches/1304150-src-mod-codecs-mod_opus-Makefile_am.patch b/net/freeswitch/patches/1304150-src-mod-codecs-mod_opus-Makefile_am.patch
index dc5ab0db7fff765ee38dd5625ba846cd9365be89..bedf1dfe0053631226161406247dde020d6ceeca 100644 (file)
--- a/net/freeswitch/patches/1304150-src-mod-codecs-mod_opus-Makefile_am.patch
+++ b/net/freeswitch/patches/1304150-src-mod-codecs-mod_opus-Makefile_am.patch
@@ -1,11 +1,11 @@
 --- a/src/mod/codecs/mod_opus/Makefile.am
 +++ b/src/mod/codecs/mod_opus/Makefile.am
-@@ -17,7 +17,7 @@ $(OPUS_DIR)/configure:
+@@ -19,7 +19,7 @@ $(OPUS_DIR)/configure:
  
  $(OPUS_BUILDDIR)/Makefile: $(OPUS_DIR)/configure
        mkdir -p $(OPUS_BUILDDIR)
--      cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --disable-shared --with-pic --srcdir=$(OPUS_DIR)
-+      cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure --host=$(host) --disable-shared --with-pic --srcdir=$(OPUS_DIR)
+-      cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure $(MY_DEFAULT_ARGS)
++      cd $(OPUS_BUILDDIR) && $(DEFAULT_VARS) $(OPUS_DIR)/configure $(MY_DEFAULT_ARGS) --host=$(host) --disable-shared --with-pic --srcdir=$(OPUS_DIR)
        $(TOUCH_TARGET)
  
  $(OPUS_LA): $(OPUS_BUILDDIR)/Makefile

diff --git a/net/freeswitch/patches/1306000-src-mod-directories-mod_ldap-Makefile_am.patch b/net/freeswitch/patches/1306000-src-mod-directories-mod_ldap-Makefile_am.patch
index 5aff08807d214467f83137e03f6165a466f83f63..06bc418ecada078c50a0e43705eac9b8db35ef2f 100644 (file)
--- a/net/freeswitch/patches/1306000-src-mod-directories-mod_ldap-Makefile_am.patch
+++ b/net/freeswitch/patches/1306000-src-mod-directories-mod_ldap-Makefile_am.patch
@@ -4,8 +4,8 @@
  mod_ldap_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(LDAPLA) $(LIBLBERLA)
  mod_ldap_la_LDFLAGS  = -avoid-version -module -no-undefined -shared
  
--MY_DEFAULT_ARGS= --disable-slapd --disable-bdb --disable-hdb
-+MY_DEFAULT_ARGS=--host=$(host) --with-yielding_select=yes --disable-slapd --disable-bdb --disable-hdb
+-MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-slapd --disable-bdb --disable-hdb
++MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --host=$(host) --with-yielding_select=yes --disable-slapd --disable-bdb --disable-hdb
  
  $(MODNAME).lo: $(LDAPLA) $(LIBLBERLA)