freeswitch-stable: Add more modules

- Add mod_portaudio, mod_portaudio_stream, mod_radius_cdr and mod_v8.
- mod_v8 takes some time to build and it's quite large, so only build it
  for x86_64. Users can force it on via a symbol for targets arm, i386
  and mipsel as well.

Signed-off-by: Sebastian Kemper <sebastian_ml@gmx.net>

diff --git a/net/freeswitch-stable/Config.in b/net/freeswitch-stable/Config.in
index 7a7acfd78ab8cb8469ee2eb7f452a6945d2c2b74..556de49e476db5d2ce169ede224369e2c974ac4f 100644 (file)
--- a/net/freeswitch-stable/Config.in
+++ b/net/freeswitch-stable/Config.in
@@ -54,6 +54,18 @@ config FS_STABLE_WITH_SRTP
        help
          Compile with SRTP support.
 
+config FS_STABLE_WITH_V8
+       bool "Compile with V8 support"
+       depends on arm||i386||mipsel||x86_64
+       default y if x86_64
+       help
+         The sole purpose of this symbol is to prevent mod_v8 from being built
+         by the build bots. Currently the only exception is x86_64. The build is
+         time-consuming and the module is quite large, making it an unlikely
+         choice for devices with limited resources.
+
+         If you want mod_v8 to become available, select 'y'.
+
 config FS_STABLE_WITH_VPX
        bool "Compile with VPx support"
        depends on FS_STABLE_WITH_LIBYUV

diff --git a/net/freeswitch-stable/Makefile b/net/freeswitch-stable/Makefile
index 084a1800887a57056ee91ccd147b84224581a440..bae436bb8a7edb234d3279c80ca21519462090b0 100644 (file)
--- a/net/freeswitch-stable/Makefile
+++ b/net/freeswitch-stable/Makefile
@@ -145,9 +145,12 @@ FS_STABLE_MOD_AVAILABLE:= \
        perl \
        png \
        pocketsphinx \
+       portaudio \
+       portaudio_stream \
        posix_timer \
        prefix \
        python \
+       radius_cdr \
        random \
        rayo \
        redis \
@@ -192,6 +195,7 @@ FS_STABLE_MOD_AVAILABLE:= \
        translate \
        tts_commandline \
        unimrcp \
+       v8 \
        valet_parking \
        verto \
        vmd \
@@ -630,6 +634,11 @@ CONFIGURE_ARGS+= \
        --with-erlang=no
 endif
 
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-v8),)
+CONFIGURE_ARGS+= \
+       --enable-static-v8
+endif
+
 # Make mod_spandsp use fixed point math when soft float support is
 # enabled on target devices.
 ifeq ($(CONFIG_SOFT_FLOAT),y)
@@ -706,6 +715,89 @@ CONFIGURE_VARS+= \
        PYTHON_SITE_DIR="$(FS_STABLE_PYTHON_SITE_DIR)"
 endif
 
+# mod_radius_cdr runs configure in libs/freeradius-client. Let
+# freeradius-client know /dev/urandom is available on target devices.
+MAKE_VARS+= \
+       ac_cv_dev_urandom=yes
+
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-v8),)
+
+# arm
+ifeq ($(CONFIG_arm),y)
+  FS_STABLE_MYARCH:=arm
+  FS_STABLE_MYDEFINES:=v8_target_arch=arm
+  ifeq ($(CONFIG_arm_v6),y)
+    FS_STABLE_MYDEFINES+=arm_version=6
+  else
+    ifeq ($(CONFIG_arm_v7),y)
+      FS_STABLE_MYDEFINES+=arm_version=7
+    else
+      FS_STABLE_MYDEFINES+=arm_version=default
+    endif
+  endif
+  ifeq ($(CONFIG_VFP),y)
+    ifeq ($(CONFIG_VFPv3),y)
+      ifeq ($(CONFIG_NEON),y)
+        FS_STABLE_MYDEFINES+=arm_fpu=neon
+      else
+        FS_STABLE_MYDEFINES+=arm_fpu=vfpv3
+      endif
+    else
+      FS_STABLE_MYDEFINES+=arm_fpu=vfp
+    endif
+  else
+    FS_STABLE_MYDEFINES+=arm_fpu=default
+  endif
+  ifeq ($(CONFIG_SOFT_FLOAT),y)
+    FS_STABLE_MYDEFINES+=arm_float_abi=softfp
+  else
+    FS_STABLE_MYDEFINES+=arm_float_abi=hard
+  endif
+endif
+
+# i386
+ifeq ($(CONFIG_i386),y)
+  FS_STABLE_MYARCH:=ia32
+  FS_STABLE_MYDEFINES:=v8_target_arch=ia32
+endif
+
+# mipsel
+ifeq ($(CONFIG_mipsel),y)
+  FS_STABLE_MYARCH:=mipsel
+  FS_STABLE_MYDEFINES:=v8_target_arch=mipsel
+  ifeq ($(CONFIG_CPU_MIPS32),y)
+    ifeq ($(CONFIG_CPU_MIPS32_R2),y)
+      FS_STABLE_MYDEFINES+=mips_arch_variant=mips32r2
+    else
+      ifeq ($(CONFIG_CPU_MIPS32_R1),y)
+        FS_STABLE_MYDEFINES+=mips_arch_variant=mips32r1
+      endif
+    endif
+  endif
+  ifeq ($(CONFIG_SOFT_FLOAT),y)
+    FS_STABLE_MYDEFINES+=v8_use_mips_abi_hardfloat=false
+  else
+    FS_STABLE_MYDEFINES+=v8_use_mips_abi_hardfloat=true
+  endif
+endif
+
+# x86_64
+ifeq ($(CONFIG_x86_64),y)
+  FS_STABLE_MYARCH:=x64
+  FS_STABLE_MYDEFINES:=v8_target_arch=x64
+endif
+
+MAKE_VARS+= \
+       FS_STABLE_HOSTCC="$(HOSTCC)" \
+       FS_STABLE_HOSTCXX="$(HOSTCXX)" \
+       FS_STABLE_HOST_CFLAGS="$(HOST_CFLAGS)" \
+       FS_STABLE_HOST_LDFLAGS="$(HOST_LDFLAGS)" \
+       FS_STABLE_HOST_PYTHONPATH="$(HOST_PYTHONPATH)" \
+       FS_STABLE_MYARCH="$(FS_STABLE_MYARCH)" \
+       FS_STABLE_MYDEFINES="$(FS_STABLE_MYDEFINES)"
+
+endif
+
 # Make sphinxbase use fixed point math when soft float support is
 # enabled on target devices.
 ifeq ($(CONFIG_SOFT_FLOAT),y)
@@ -732,6 +824,14 @@ FS_STABLE_SPHINXBASE_HASH:=55708944872bab1015b8ae07b379bf463764f469163a8fd114cbb
 FS_STABLE_SPHINXMODEL_FILE:=communicator_semi_6000_20080321.tar.gz
 FS_STABLE_SPHINXMODEL_HASH:=dbb5e9fb85000a7cb97d6958a3ef8d77532dc55fc730ac6979705e8645cb0c18
 
+# mod_radius_cdr
+FS_STABLE_FREERADIUS_CLIENT_FILE:=freeradius-client-1.1.6.tar.gz
+FS_STABLE_FREERADIUS_CLIENT_HASH:=3fc609af328258e00345389d5478b099fe4ea3ad694d0472525ef3adab9cf053
+
+# mod_v8
+FS_STABLE_V8_FILE:=v8-3.24.14.tar.bz2
+FS_STABLE_V8_HASH:=395f4eaf5580b973b1e33fe0aa27f8d013ddf1b163ad76992c50dd91ff182828
+
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-event_zmq),)
 $(eval $(call Download/files,zmq,$(FS_STABLE_ZEROMQ_FILE),$(FS_STABLE_ZEROMQ_URL),$(FS_STABLE_ZEROMQ_HASH)))
 endif
@@ -742,6 +842,14 @@ $(eval $(call Download/files,sphinxbase,$(FS_STABLE_SPHINXBASE_FILE),$(FS_STABLE
 $(eval $(call Download/files,communicator,$(FS_STABLE_SPHINXMODEL_FILE),$(FS_STABLE_LIBS_URL),$(FS_STABLE_SPHINXMODEL_HASH)))
 endif
 
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-radius_cdr),)
+$(eval $(call Download/files,freeradius-client,$(FS_STABLE_FREERADIUS_CLIENT_FILE),$(FS_STABLE_LIBS_URL),$(FS_STABLE_FREERADIUS_CLIENT_HASH)))
+endif
+
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-v8),)
+$(eval $(call Download/files,v8,$(FS_STABLE_V8_FILE),$(FS_STABLE_LIBS_URL),$(FS_STABLE_V8_HASH)))
+endif
+
 # Need to update LDFLAGS for libs/unimrcp, otherwise it will try to link to a
 # different apr/apr-util if found.
 # FS_STABLE_ANCHOR: string in build/acmacros/apr.m4 that will be replaced
@@ -772,6 +880,14 @@ ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-pocketsphinx)$(CONFIG_PACKAGE_$(PKG_NAME
        $(CP) $(DL_DIR)/$(FS_STABLE_SPHINXMODEL_FILE) $(PKG_BUILD_DIR)/libs
 endif
 
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-radius_cdr),)
+       $(CP) $(DL_DIR)/$(FS_STABLE_FREERADIUS_CLIENT_FILE) $(PKG_BUILD_DIR)/libs
+endif
+
+ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-v8),)
+       $(CP) $(DL_DIR)/$(FS_STABLE_V8_FILE) $(PKG_BUILD_DIR)/libs
+endif
+
 # Hack for misc-grammar - needs mod_pocketsphinx to provide grammar files
 ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-misc-grammar),)
 ifeq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-pocketsphinx),)
@@ -957,9 +1073,12 @@ $(eval $(call Package/$(PKG_NAME)/Module,oreka,Oreka,This module provides media
 $(eval $(call Package/$(PKG_NAME)/Module,perl,Perl,This package contains mod_perl for FreeSWITCH.,+libdb47 +libgdbm +perlbase-essential @PERL_THREADS))
 $(eval $(call Package/$(PKG_NAME)/Module,png,PNG,Allows playback of video using PNG files.,))
 $(eval $(call Package/$(PKG_NAME)/Module,pocketsphinx,Pocketsphinx,This module allows speech recognition. You might want to install\n$(PKG_NAME)-misc-grammar as well.,+libsamplerate)) # When libsamplerate is found it'll be linked against, there is no switch to turn it off
+$(eval $(call Package/$(PKG_NAME)/Module,portaudio,Portaudio,Voice through a local soundcard.,+portaudio))
+$(eval $(call Package/$(PKG_NAME)/Module,portaudio_stream,Portaudio streaming,Stream from an external audio source for Music on Hold.,+portaudio))
 $(eval $(call Package/$(PKG_NAME)/Module,posix_timer,POSIX timer,Add POSIX timer support.,))
 $(eval $(call Package/$(PKG_NAME)/Module,prefix,Prefix match,This module provides a data store with fast lookups by the longest\nprefix match rule.,))
 $(eval $(call Package/$(PKG_NAME)/Module,python,Python,Python support module.,+python-light))
+$(eval $(call Package/$(PKG_NAME)/Module,radius_cdr,Radius CDR,Radius Call Detail Record handler.,))
 $(eval $(call Package/$(PKG_NAME)/Module,random,Entropy,This module extracts entropy from FreeSWITCH and feeds it into\n/dev/random.,))
 $(eval $(call Package/$(PKG_NAME)/Module,rayo,Rayo,Rayo/XMPP 3PCC server for FreeSWITCH.,+$(PKG_NAME)-mod-ssml))
 $(eval $(call Package/$(PKG_NAME)/Module,redis,Redis limit backend,This module provides a mechanism to use Redis as a limit backend data\nstore.,))
@@ -1004,6 +1123,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,tone_stream,Tone stream,Tone generation
 $(eval $(call Package/$(PKG_NAME)/Module,translate,Number translation,This module implements number translation.,))
 $(eval $(call Package/$(PKG_NAME)/Module,tts_commandline,TTS command-line,Run a command-line and play the output file.,))
 $(eval $(call Package/$(PKG_NAME)/Module,unimrcp,UniMRCP,Allows communication with Media Resource Control Protocol servers.,))
+$(eval $(call Package/$(PKG_NAME)/Module,v8,V8,This package contains mod_v8 for FreeSWITCH.,@FS_STABLE_WITH_V8 @arm||i386||mipsel||x86_64))
 $(eval $(call Package/$(PKG_NAME)/Module,valet_parking,Valet parking,This module implements the valet call parking strategy.,))
 $(eval $(call Package/$(PKG_NAME)/Module,verto,Verto,Verto signaling protocol.,))
 $(eval $(call Package/$(PKG_NAME)/Module,vmd,Voicemail detection,This module detects voicemail beeps.,))

diff --git a/net/freeswitch-stable/patches/230-mod_radius_cdr.diff b/net/freeswitch-stable/patches/230-mod_radius_cdr.diff
new file mode 100644 (file)
index 0000000..1327bcf
--- /dev/null
+++ b/net/freeswitch-stable/patches/230-mod_radius_cdr.diff
@@ -0,0 +1,51 @@
+--- a/src/mod/event_handlers/mod_radius_cdr/Makefile.am
++++ b/src/mod/event_handlers/mod_radius_cdr/Makefile.am
+@@ -20,11 +20,11 @@ $(RADCLIENT_DIR):
+ 
+ $(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
+       mkdir -p $(RADCLIENT_BUILDDIR)
+-      cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
++      cd $(RADCLIENT_BUILDDIR) && patch -p1 < ../../src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff && autoreconf -v -f -i -s && $(DEFAULT_VARS) CPPFLAGS="" CFLAGS+="-Wno-cpp" $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
+       $(TOUCH_TARGET)
+ 
+ $(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
+-      cd $(RADCLIENT_BUILDDIR) && CFLAGS="$(CFLAGS)" $(MAKE)
++      cd $(RADCLIENT_BUILDDIR) && $(MAKE)
+       $(TOUCH_TARGET)
+ 
+ 
+--- /dev/null
++++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff
+@@ -0,0 +1,32 @@
++diff --git a/configure.in b/configure.in
++index 4f194bd..647e9b9 100644
++--- a/configure.in
+++++ b/configure.in
++@@ -209,7 +209,7 @@ AC_CHECK_FUNCS(stricmp random rand snprintf vsnprintf)
++ if test "$ac_cv_func_uname" = 'yes'
++ then
++      AC_MSG_CHECKING([for field domainname in struct utsname])
++-     AC_TRY_RUN([
+++     AC_COMPILE_IFELSE([
++      #include <sys/utsname.h>
++      
++      main(int argc, char **argv)
++@@ -224,13 +224,11 @@ then
++      )
++ fi
++ 
++-AC_MSG_CHECKING([for /dev/urandom])
++-if test -c /dev/urandom
++-then
++-     AC_MSG_RESULT(yes)
++-     AC_DEFINE(HAVE_DEV_URANDOM)
++-else
++-     AC_MSG_RESULT(no)
+++AC_CACHE_CHECK([/dev/urandom], [ac_cv_dev_urandom],
+++  [ac_cv_dev_urandom=no
+++   if test -c /dev/urandom; then ac_cv_dev_urandom=yes; fi])
+++if test $ac_cv_dev_urandom = yes; then
+++  AC_DEFINE(HAVE_DEV_URANDOM)
++ fi
++ 
++ dnl Determine PATH setting

diff --git a/net/freeswitch-stable/patches/240-mod_v8.patch b/net/freeswitch-stable/patches/240-mod_v8.patch
new file mode 100644 (file)
index 0000000..c438bdb
--- /dev/null
+++ b/net/freeswitch-stable/patches/240-mod_v8.patch
@@ -0,0 +1,63 @@
+--- a/src/mod/languages/mod_v8/Makefile.am
++++ b/src/mod/languages/mod_v8/Makefile.am
+@@ -15,7 +15,7 @@ V8_LIBEXT=dylib
+ V8_BUILDPARAMS=snapshot=off i18nsupport=off
+ V8_SNAPSHOT=nosnapshot
+ else
+-V8_LIBDIR=$(V8_BUILDDIR)/out/native/lib.target
++V8_LIBDIR=$(V8_BUILDDIR)/out/$(FS_STABLE_MYARCH).release/lib.target
+ V8_LIBEXT=so
+ # Some gcc versions report warnings incorrectly
+ V8_BUILDPARAMS=strictaliasing=off werror=no i18nsupport=off
+@@ -29,8 +29,8 @@ V8_STATIC_DIR=$(V8_BUILDDIR)/out/native
+ V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native
+ V8_CXXFLAGS =
+ else
+-V8_STATIC_DIR=$(V8_BUILDDIR)/out/native/obj.target/tools/gyp
+-V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native/obj.target/third_party/icu
++V8_STATIC_DIR=$(V8_BUILDDIR)/out/$(FS_STABLE_MYARCH).release/obj.target/tools/gyp
++V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/$(FS_STABLE_MYARCH).release/obj.target/third_party/icu
+ V8_CXXFLAGS = -fPIC
+ endif
+ V8LIB=$(V8_STATIC_DIR)/libv8_base*.a
+@@ -46,11 +46,6 @@ else
+ V8_EXTRA_BUILD_PARAMS=--no-parallel
+ endif
+ 
+-# Try to find the target platform for our configured CXX compiler
+-# Parse the result one extra time to handle different i386 platforms (i386, i486 etc)
+-CXX_TARGET_PLATFORM := $(shell $(CXX) -v 2>&1 | grep Target | cut '-d:' -f2 | cut '-d-' -f1 | tr -d ' ')
+-CXX_TARGET_PLATFORM_I386 := $(shell echo "$(CXX_TARGET_PLATFORM)" | sed 's/^\(.\{1\}\)\(.\{1\}\)/\13/')
+-
+ MODNAME=mod_v8
+ 
+ AM_CFLAGS    += -I. -I./include -I$(switch_srcdir)/src/mod/languages/mod_v8/include -I$(V8_DIR)/include
+@@ -121,21 +116,13 @@ $(V8_DIR)/.stamp-patch: $(V8_DIR)
+ 
+ $(V8LIB): $(V8_DIR) $(V8_DIR)/.stamp-patch
+       mkdir -p $(V8_BUILDDIR)
+-      if test "$(CXX_TARGET_PLATFORM)" = "x86_64"; then \
+-         defines="v8_target_arch=x64 target_arch=x64"; \
+-      else \
+-         if test "$(CXX_TARGET_PLATFORM)" = "arm"; then \
+-            defines="v8_target_arch=arm target_arch=arm"; \
+-         else \
+-            if test "$(CXX_TARGET_PLATFORM_I386)" = "i386"; then \
+-               defines="v8_target_arch=ia32 target_arch=ia32"; \
+-            fi; \
+-         fi; \
+-      fi; \
+-      cd $(V8_BUILDDIR) && CFLAGS="$(V8_CXXFLAGS)" CXXFLAGS="$(V8_CXXFLAGS)" \
+-      LINK=@CXX@ CXX=@CXX@ GYPFLAGS="$(V8_EXTRA_BUILD_PARAMS)" GYP_DEFINES="$$defines" \
+-      OUTDIR=$(V8_BUILDDIR)/out \
+-      PYTHONPATH="$(V8_DIR)/build/gyp/pylib:$(PYTHONPATH)" $(MAKE) -C $(V8_DIR) $(V8_BUILDPARAMS) native
++      cd $(V8_BUILDDIR) && sed -i "/'want_separate_host_toolset': 0,/s/0/1/" build/standalone.gypi && \
++      $(DEFAULT_VARS) CFLAGS+="$(V8_CXXFLAGS)" CXXFLAGS+="$(V8_CXXFLAGS)" \
++      LINK=@CXX@ CXX=@CXX@ GYPFLAGS="$(V8_EXTRA_BUILD_PARAMS)" OUTDIR=./out/ \
++      PYTHONPATH="$(V8_DIR)/build/gyp/pylib:$(FS_STABLE_HOST_PYTHONPATH)" $(MAKE) -C $(V8_DIR) \
++      CC.host="$(FS_STABLE_HOSTCC)" CFLAGS.host="$(FS_STABLE_HOST_CFLAGS)" CXX.host="$(FS_STABLE_HOSTCXX)" \
++      CXXFLAGS.host="$(FS_STABLE_HOST_CFLAGS)" LDFLAGS.host="$(FS_STABLE_HOST_LDFLAGS)" \
++      $(V8_BUILDPARAMS) $(FS_STABLE_MYDEFINES) $(FS_STABLE_MYARCH).release
+ 
+ if ENABLE_STATIC_V8
+ install-exec-local: $(V8LIB)