Difuse/telephony
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #169 from micmac1/master

Browse source 
freeswitch-stable: new PR
This commit is contained in:
Jiri Slachta 2017-07-19 23:28:38 +02:00 committed by GitHub
commit 1dc4faadaf
10 changed files with 133 additions and 159 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
net/freeswitch-stable/Config.in
View file

@ -66,6 +66,17 @@ config FS_STABLE_WITH_V8
If you want mod_v8 to become available, select 'y'. If you want mod_v8 to become available, select 'y'.
config FS_STABLE_WITH_V8_SNAPSHOT
bool "Include heap snapshot"
depends on FS_STABLE_WITH_V8
default n
help
V8 can be built with a heap snapshot for faster initialization. Default
is 'n' because of seemingly random segmentation faults observed when
generating the snapshot.
Only select 'y' if you know what you are doing.
config FS_STABLE_WITH_VPX config FS_STABLE_WITH_VPX
bool "Compile with VPx support" bool "Compile with VPx support"
depends on FS_STABLE_WITH_LIBYUV depends on FS_STABLE_WITH_LIBYUV

15
net/freeswitch-stable/Makefile
View file

@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
PRG_NAME:=freeswitch PRG_NAME:=freeswitch
PKG_NAME:=$(PRG_NAME)-stable PKG_NAME:=$(PRG_NAME)-stable
PKG_VERSION:=1.6.18 PKG_VERSION:=1.6.19
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net> PKG_MAINTAINER:=Sebastian Kemper <sebastian_ml@gmx.net>
PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE:=$(PRG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME) PKG_SOURCE_URL:=https://files.$(PRG_NAME).org/releases/$(PRG_NAME)
PKG_HASH:=ac1b32f61e5c35680c5a2d6f145bc480cf26e6527af07d8b8b9fa2d5280252cd PKG_HASH:=e8d271a0d876ba4cca551682af0a4f5047bfd79438fcebdcc17d00711c04a8ff
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PRG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PRG_NAME)-$(PKG_VERSION)
@ -253,6 +253,8 @@ PKG_CONFIG_DEPENDS:= \
CONFIG_FS_STABLE_WITH_PGSQL \ CONFIG_FS_STABLE_WITH_PGSQL \
CONFIG_FS_STABLE_WITH_PNG \ CONFIG_FS_STABLE_WITH_PNG \
CONFIG_FS_STABLE_WITH_SRTP \ CONFIG_FS_STABLE_WITH_SRTP \
CONFIG_FS_STABLE_WITH_V8 \
CONFIG_FS_STABLE_WITH_V8_SNAPSHOT \
CONFIG_FS_STABLE_WITH_VPX \ CONFIG_FS_STABLE_WITH_VPX \
CONFIG_FS_STABLE_WITH_ZRTP \ CONFIG_FS_STABLE_WITH_ZRTP \
CONFIG_LIBC \ CONFIG_LIBC \
@ -262,8 +264,8 @@ include $(INCLUDE_DIR)/package.mk
FS_STABLE_PERL_FEED:=$(TOPDIR)/feeds/packages/lang/perl FS_STABLE_PERL_FEED:=$(TOPDIR)/feeds/packages/lang/perl
include $(FS_STABLE_PERL_FEED)/perlmod.mk
$(call include_mk, python-host.mk) $(call include_mk, python-host.mk)
include $(FS_STABLE_PERL_FEED)/perlmod.mk
FS_STABLE_PERL_LIBS:=$(shell grep "^libs=" \ FS_STABLE_PERL_LIBS:=$(shell grep "^libs=" \
$(FS_STABLE_PERL_FEED)/files/base.config | \ $(FS_STABLE_PERL_FEED)/files/base.config | \
@ -684,7 +686,8 @@ endif
ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-v8),) ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-v8),)
CONFIGURE_ARGS+= \ CONFIGURE_ARGS+= \
--enable-static-v8 --enable-static-v8 \
$(if $(CONFIG_FS_STABLE_WITH_V8_SNAPSHOT),,--disable-snapshot-v8)
endif endif
# Make mod_spandsp use fixed point math when soft float support is # Make mod_spandsp use fixed point math when soft float support is
@ -1053,7 +1056,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,abstraction,API abstraction,This module
$(eval $(call Package/$(PKG_NAME)/Module,alsa,ALSA endpoint,ALSA endpoint module.,+alsa-lib)) $(eval $(call Package/$(PKG_NAME)/Module,alsa,ALSA endpoint,ALSA endpoint module.,+alsa-lib))
$(eval $(call Package/$(PKG_NAME)/Module,amr,AMR passthrough,Passthrough AMR codec support.,)) $(eval $(call Package/$(PKG_NAME)/Module,amr,AMR passthrough,Passthrough AMR codec support.,))
$(eval $(call Package/$(PKG_NAME)/Module,amrwb,AMR wideband passthrough,Passthrough AMR wideband codec support.,)) $(eval $(call Package/$(PKG_NAME)/Module,amrwb,AMR wideband passthrough,Passthrough AMR wideband codec support.,))
$(eval $(call Package/$(PKG_NAME)/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @BROKEN)) # libffmpeg-full doesn't provide avresample $(eval $(call Package/$(PKG_NAME)/Module,av,AV,Video codec and format support via FFmpeg.,+libffmpeg-full @i386||x86_64))
$(eval $(call Package/$(PKG_NAME)/Module,avmd,Voicemail detection,This module attempts to determine when a voicemail system has answered\nthe call.,)) $(eval $(call Package/$(PKG_NAME)/Module,avmd,Voicemail detection,This module attempts to determine when a voicemail system has answered\nthe call.,))
$(eval $(call Package/$(PKG_NAME)/Module,b64,Base64,Transfers data Base64 encoded.,)) $(eval $(call Package/$(PKG_NAME)/Module,b64,Base64,Transfers data Base64 encoded.,))
$(eval $(call Package/$(PKG_NAME)/Module,basic,BASIC,BASIC module for FreeSWITCH.,)) $(eval $(call Package/$(PKG_NAME)/Module,basic,BASIC,BASIC module for FreeSWITCH.,))
@ -1119,7 +1122,7 @@ $(eval $(call Package/$(PKG_NAME)/Module,odbc_cdr,ODBC CDR,ODBC Call Detail Reco
$(eval $(call Package/$(PKG_NAME)/Module,opus,Opus,Opus codec support.,+libopus)) $(eval $(call Package/$(PKG_NAME)/Module,opus,Opus,Opus codec support.,+libopus))
$(eval $(call Package/$(PKG_NAME)/Module,oreka,Oreka,This module provides media recording with the Oreka cross-platform\naudio stream recording and retrieval system.,)) $(eval $(call Package/$(PKG_NAME)/Module,oreka,Oreka,This module provides media recording with the Oreka cross-platform\naudio stream recording and retrieval system.,))
$(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,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,png,PNG,Allows playback of video using PNG files.,@FS_STABLE_WITH_PNG))
$(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,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,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,portaudio_stream,Portaudio streaming,Stream from an external audio source for Music on Hold.,+portaudio))

11
net/freeswitch-stable/patches/003-modmake-fix.diff Normal file
View file

@ -0,0 +1,11 @@
--- a/build/modmake.rulesam
+++ b/build/modmake.rulesam
@@ -2,7 +2,7 @@ AUTOMAKE_OPTIONS = foreign subdir-object
AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
AM_CPPFLAGS = $(SWITCH_AM_CXXFLAGS)
AM_LDFLAGS = $(SWITCH_AM_LDFLAGS)
-DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
+DEFAULT_VARS = CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" CC="$(CC)" CXX="$(CXX)"
DEFAULT_ARGS = --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)" --disable-shared --with-pic
moddir=@modulesdir@

187
net/freeswitch-stable/patches/120-fix-copts.diff
View file

@ -1,226 +1,157 @@
--- a/configure.ac --- a/configure.ac
+++ b/configure.ac +++ b/configure.ac
@@ -1941,7 +1941,13 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS) @@ -1941,7 +1941,12 @@ AC_SUBST(OUR_DISABLED_INSTALL_MODS)
AC_SUBST(OUR_DISABLED_UNINSTALL_MODS) AC_SUBST(OUR_DISABLED_UNINSTALL_MODS)
AC_SUBST(AM_MAKEFLAGS) AC_SUBST(AM_MAKEFLAGS)
-ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' " -ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' "
+ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir}" +APR_ADDTO(CONFIGURE_CFLAGS, [$CFLAGS])
+APR_ADDTO(CONFIGURE_CPPFLAGS, [$CPPFLAGS])
+APR_ADDTO(CONFIGURE_CXXFLAGS, [$CXXFLAGS])
+APR_ADDTO(CONFIGURE_LDFLAGS, [$LDFLAGS])
+ +
+case $host in +ac_configure_args="$ac_configure_args --with-modinstdir=${modulesdir} CONFIGURE_CFLAGS='$CONFIGURE_CFLAGS' CONFIGURE_CPPFLAGS='$CONFIGURE_CPPFLAGS' CONFIGURE_CXXFLAGS='$CONFIGURE_CXXFLAGS' CONFIGURE_LDFLAGS='$CONFIGURE_LDFLAGS' "
+ *-darwin*)
+ ac_configure_args="$ac_configure_args CONFIGURE_CFLAGS='$CFLAGS $CPPFLAGS' CONFIGURE_CXXFLAGS='$CXXFLAGS $CPPFLAGS' CONFIGURE_LDFLAGS='$LDFLAGS' "
+ ;;
+esac
# --prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \ # --prefix='$prefix' --exec_prefix='$exec_prefix' --libdir='$libdir' --libexecdir='$libexecdir' --bindir='$bindir' --sbindir='$sbindir' \
# --localstatedir='$localstatedir' --datadir='$datadir'" # --localstatedir='$localstatedir' --datadir='$datadir'"
--- a/libs/apr-util/configure.ac --- a/libs/apr-util/configure.ac
+++ b/libs/apr-util/configure.ac +++ b/libs/apr-util/configure.ac
@@ -20,9 +20,13 @@ dnl Generate ./config.nice for reproduci @@ -20,9 +20,10 @@ dnl Generate ./config.nice for reproduci
dnl dnl
APR_CONFIG_NICE(config.nice) APR_CONFIG_NICE(config.nice)
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
+ *-darwin*) +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+ ;;
+esac
dnl # Some initial steps for configuration. We setup the default directory dnl # Some initial steps for configuration. We setup the default directory
dnl # and which files are to be configured. dnl # and which files are to be configured.
--- a/libs/apr/configure.ac --- a/libs/apr/configure.ac
+++ b/libs/apr/configure.ac +++ b/libs/apr/configure.ac
@@ -20,9 +20,13 @@ sinclude(build/apr_hints.m4) @@ -20,9 +20,10 @@ sinclude(build/apr_hints.m4)
sinclude(build/libtool.m4) sinclude(build/libtool.m4)
sinclude(build/ltsugar.m4) sinclude(build/ltsugar.m4)
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
+ *-darwin*) +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+ ;;
+esac
dnl Hard-coded inclusion at the tail end of apr_private.h: dnl Hard-coded inclusion at the tail end of apr_private.h:
AH_BOTTOM([ AH_BOTTOM([
--- a/libs/broadvoice/configure.ac
+++ b/libs/broadvoice/configure.ac
@@ -22,9 +22,13 @@
AC_INIT([broadvoice],[0.1.0])
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in
+ *-darwin*)
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+ ;;
+esac
m4_include(config/ax_compiler_vendor.m4)
m4_include(config/ax_check_real_file.m4)
--- a/libs/iksemel/configure.ac --- a/libs/iksemel/configure.ac
+++ b/libs/iksemel/configure.ac +++ b/libs/iksemel/configure.ac
@@ -6,9 +6,13 @@ AC_CONFIG_SRCDIR([configure.ac]) @@ -6,9 +6,12 @@ AC_CONFIG_SRCDIR([configure.ac])
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
AC_CONFIG_HEADERS(include/config.h) AC_CONFIG_HEADERS(include/config.h)
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in +m4_include(../apr/build/apr_common.m4)
+ *-darwin*) +
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
+ ;; +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
+esac
AC_CANONICAL_HOST AC_CANONICAL_HOST
--- a/libs/ilbc/configure.ac
+++ b/libs/ilbc/configure.ac
@@ -22,9 +22,13 @@
AC_INIT([ilbc], [0.0.1])
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in
+ *-darwin*)
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+ ;;
+esac
AC_DEFUN([AX_COMPILER_VENDOR],
[
--- a/libs/libdingaling/configure.ac --- a/libs/libdingaling/configure.ac
+++ b/libs/libdingaling/configure.ac +++ b/libs/libdingaling/configure.ac
@@ -8,9 +8,13 @@ AM_INIT_AUTOMAKE @@ -8,9 +8,12 @@ AM_INIT_AUTOMAKE
AC_CONFIG_SRCDIR([src]) AC_CONFIG_SRCDIR([src])
AC_CONFIG_HEADERS([src/config.h]) AC_CONFIG_HEADERS([src/config.h])
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in +m4_include(../apr/build/apr_common.m4)
+ *-darwin*) +
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
+ ;; +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
+esac
#Set default language #Set default language
AC_LANG_C AC_LANG_C
--- a/libs/libsndfile/configure.ac
+++ b/libs/libsndfile/configure.ac
@@ -15,9 +15,13 @@ AC_CANONICAL_TARGET([])
AC_CONFIG_MACRO_DIR([M4])
AC_CONFIG_HEADERS([src/config.h])
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in
+ *-darwin*)
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+ ;;
+esac
AM_INIT_AUTOMAKE
AC_SUBST(ACLOCAL_AMFLAGS, "-I M4")
--- a/libs/sofia-sip/configure.ac --- a/libs/sofia-sip/configure.ac
+++ b/libs/sofia-sip/configure.ac +++ b/libs/sofia-sip/configure.ac
@@ -13,9 +13,13 @@ dnl --------------------------- @@ -13,9 +13,12 @@ dnl ---------------------------
dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR dnl update both the version for AC_INIT and the LIBSOFIA_SIP_UA_MAJOR_MINOR
AC_INIT([sofia-sip], [1.12.10devel]) AC_INIT([sofia-sip], [1.12.10devel])
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in +m4_include(../apr/build/apr_common.m4)
+ *-darwin*) +
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
+ ;; +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
+esac
AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h]) AC_CONFIG_SRCDIR([libsofia-sip-ua/sip/sofia-sip/sip.h])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
--- a/libs/spandsp/configure.ac --- a/libs/spandsp/configure.ac
+++ b/libs/spandsp/configure.ac +++ b/libs/spandsp/configure.ac
@@ -21,9 +21,13 @@ @@ -21,9 +21,12 @@
AC_PREREQ([2.59]) AC_PREREQ([2.59])
AC_INIT([spandsp], [1.99.0]) AC_INIT([spandsp], [1.99.0])
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in +m4_include(../apr/build/apr_common.m4)
+ *-darwin*) +
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
+ ;; +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
+esac
SPANDSP_LT_CURRENT=3 SPANDSP_LT_CURRENT=3
SPANDSP_LT_REVISION=0 SPANDSP_LT_REVISION=0
--- a/libs/srtp/configure.ac --- a/libs/srtp/configure.ac
+++ b/libs/srtp/configure.ac +++ b/libs/srtp/configure.ac
@@ -3,9 +3,13 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com) @@ -3,9 +3,12 @@ AC_INIT(srtp, 1.4.2, mcgrew@cisco.com)
AC_CONFIG_AUX_DIR(build) AC_CONFIG_AUX_DIR(build)
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in +m4_include(../apr/build/apr_common.m4)
+ *-darwin*) +
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
+ ;; +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
+esac
#Set default language #Set default language
AC_LANG_C AC_LANG_C
--- a/libs/tiff-4.0.2/configure.ac --- a/libs/tiff-4.0.2/configure.ac
+++ b/libs/tiff-4.0.2/configure.ac +++ b/libs/tiff-4.0.2/configure.ac
@@ -32,9 +32,13 @@ AC_LANG(C) @@ -30,11 +30,13 @@ AC_CONFIG_AUX_DIR(config)
AC_CONFIG_MACRO_DIR(m4)
AC_LANG(C)
AC_PROG_LIBTOOL AC_PROG_LIBTOOL
+m4_include(../apr/build/apr_common.m4)
m4_include(m4/acinclude.m4) m4_include(m4/acinclude.m4)
-CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" -CFLAGS="$CFLAGS $CONFIGURE_CFLAGS"
-CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" -CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS"
-LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS" -LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+case $host in +APR_ADDTO(CFLAGS, [$CONFIGURE_CFLAGS])
+ *-darwin*) +APR_ADDTO(CPPFLAGS, [$CONFIGURE_CPPFLAGS])
+ CFLAGS="$CFLAGS $CONFIGURE_CFLAGS" +APR_ADDTO(CXXFLAGS, [$CONFIGURE_CXXFLAGS])
+ CXXFLAGS="$CXXFLAGS $CONFIGURE_CXXFLAGS" +APR_ADDTO(LDFLAGS, [$CONFIGURE_LDFLAGS])
+ LDFLAGS="$LDFLAGS $CONFIGURE_LDFLAGS"
+ ;;
+esac
dnl Compute the canonical host (run-time) system type variable dnl Compute the canonical host (run-time) system type variable
AC_CANONICAL_HOST AC_CANONICAL_HOST

11
net/freeswitch-stable/patches/160-mod_av.patch
View file

@ -1,11 +0,0 @@
--- a/src/mod/applications/mod_av/Makefile.am
+++ b/src/mod/applications/mod_av/Makefile.am
@@ -5,7 +5,7 @@ if HAVE_AVFORMAT
mod_LTLIBRARIES = mod_av.la
mod_av_la_SOURCES = mod_av.c avformat.c avcodec.c
-mod_av_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(AVRESAMPLE_CFALGS)
+mod_av_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(AVCODEC_CFLAGS) $(SWSCALE_CFLAGS) $(AVUTIL_CFLAGS) $(AVRESAMPLE_CFLAGS) -Wno-deprecated-declarations
mod_av_la_LIBADD = $(switch_builddir)/libfreeswitch.la $(AVFORMAT_LIBS) $(AVCODEC_LIBS) $(SWSCALE_LIBS) $(AVUTIL_LIBS) $(AVRESAMPLE_LIBS)
mod_av_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lm -lz

4
net/freeswitch-stable/patches/190-mod_pocketsphinx.patch
View file

@ -5,7 +5,7 @@
$(SPHINXBASE_BUILDDIR)/Makefile: $(SPHINXBASE_DIR) $(SPHINXBASE_BUILDDIR)/Makefile: $(SPHINXBASE_DIR)
mkdir -p $(SPHINXBASE_BUILDDIR) mkdir -p $(SPHINXBASE_BUILDDIR)
- (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=) - (cd $(SPHINXBASE_BUILDDIR) && $(DEFAULT_VARS) $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python CFLAGS=)
+ (cd $(SPHINXBASE_BUILDDIR) && sed -i 's|$$(srcdir)/||g' test/regression/Makefile.am && autoreconf -v -f -i -s && $(DEFAULT_VARS) CPPFLAGS="" ac_cv_header_alsa_asoundlib_h=no ac_cv_header_jack_jack_h=no ac_cv_header_pulse_pulseaudio_h=no $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python $(FS_STABLE_USE_FIXED_POINT)) + (cd $(SPHINXBASE_BUILDDIR) && sed -i 's|$$(srcdir)/||g' test/regression/Makefile.am && autoreconf -v -f -i -s && $(DEFAULT_VARS) ac_cv_header_alsa_asoundlib_h=no ac_cv_header_jack_jack_h=no ac_cv_header_pulse_pulseaudio_h=no $(SPHINXBASE_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(SPHINXBASE_DIR) --without-python $(FS_STABLE_USE_FIXED_POINT))
$(TOUCH_TARGET) $(TOUCH_TARGET)
$(SPHINXBASE_BUILDDIR)/buildstamp: $(SPHINXBASE_BUILDDIR)/Makefile $(SPHINXBASE_BUILDDIR)/buildstamp: $(SPHINXBASE_BUILDDIR)/Makefile
@ -14,7 +14,7 @@
$(POCKETSPHINX_BUILDDIR)/Makefile: $(POCKETSPHINX_DIR) $(SPHINXBASE_LA) $(SPHINXBASE_LA2) $(POCKETSPHINX_BUILDDIR)/Makefile: $(POCKETSPHINX_DIR) $(SPHINXBASE_LA) $(SPHINXBASE_LA2)
mkdir -p $(POCKETSPHINX_BUILDDIR) mkdir -p $(POCKETSPHINX_BUILDDIR)
- (cd $(POCKETSPHINX_BUILDDIR) && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR) CFLAGS=-Wno-return-type) - (cd $(POCKETSPHINX_BUILDDIR) && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR) CFLAGS=-Wno-return-type)
+ (cd $(POCKETSPHINX_BUILDDIR) && autoreconf -v -f -i -s && $(DEFAULT_VARS) CPPFLAGS="" $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR)) + (cd $(POCKETSPHINX_BUILDDIR) && autoreconf -v -f -i -s && $(DEFAULT_VARS) $(POCKETSPHINX_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(POCKETSPHINX_DIR) --without-python --with-sphinxbase=$(SPHINXBASE_DIR) --with-sphinxbase-build=$(SPHINXBASE_BUILDDIR))
$(TOUCH_TARGET) $(TOUCH_TARGET)
$(POCKETSPHINX_BUILDDIR)/buildstamp: $(POCKETSPHINX_BUILDDIR)/Makefile $(POCKETSPHINX_BUILDDIR)/buildstamp: $(POCKETSPHINX_BUILDDIR)/Makefile

2
net/freeswitch-stable/patches/220-esl-python.patch
View file

@ -9,7 +9,7 @@
all: _ESL.so all: _ESL.so
@@ -8,10 +6,10 @@ esl_wrap.cpp: @@ -8,10 +6,10 @@ esl_wrap.cpp:
swig2.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i swig3.0 -module ESL -classic -python -c++ -DMULTIPLICITY -threads -I../src/include -o esl_wrap.cpp ../ESL.i
esl_wrap.o: esl_wrap.cpp esl_wrap.o: esl_wrap.cpp
- $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o - $(CXX) $(CXX_CFLAGS) $(CXXFLAGS) $(LOCAL_CFLAGS) -c esl_wrap.cpp -o esl_wrap.o

9
net/freeswitch-stable/patches/230-mod_radius_cdr.diff
View file

@ -1,19 +1,14 @@
--- a/src/mod/event_handlers/mod_radius_cdr/Makefile.am --- a/src/mod/event_handlers/mod_radius_cdr/Makefile.am
+++ b/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): @@ -20,7 +20,7 @@ $(RADCLIENT_DIR):
$(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR) $(RADCLIENT_BUILDDIR)/Makefile: $(RADCLIENT_DIR)
mkdir -p $(RADCLIENT_BUILDDIR) mkdir -p $(RADCLIENT_BUILDDIR)
- cd $(RADCLIENT_BUILDDIR) && $(DEFAULT_VARS) $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR) - 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) + 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) CFLAGS+="-Wno-cpp" $(RADCLIENT_DIR)/configure $(DEFAULT_ARGS) --srcdir=$(RADCLIENT_DIR)
$(TOUCH_TARGET) $(TOUCH_TARGET)
$(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile $(RADCLIENT_LA): $(RADCLIENT_BUILDDIR)/Makefile
- cd $(RADCLIENT_BUILDDIR) && CFLAGS="$(CFLAGS)" $(MAKE)
+ cd $(RADCLIENT_BUILDDIR) && $(MAKE)
$(TOUCH_TARGET)
--- /dev/null --- /dev/null
+++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff +++ b/src/mod/event_handlers/mod_radius_cdr/freeradius-client-1.1.6-configure-in.diff
@@ -0,0 +1,32 @@ @@ -0,0 +1,32 @@

32
net/freeswitch-stable/patches/240-mod_v8.patch
View file

@ -1,6 +1,6 @@
--- a/src/mod/languages/mod_v8/Makefile.am --- a/src/mod/languages/mod_v8/Makefile.am
+++ b/src/mod/languages/mod_v8/Makefile.am +++ b/src/mod/languages/mod_v8/Makefile.am
@@ -15,7 +15,7 @@ V8_LIBEXT=dylib @@ -15,12 +15,17 @@ V8_LIBEXT=dylib
V8_BUILDPARAMS=snapshot=off i18nsupport=off V8_BUILDPARAMS=snapshot=off i18nsupport=off
V8_SNAPSHOT=nosnapshot V8_SNAPSHOT=nosnapshot
else else
@ -9,7 +9,17 @@
V8_LIBEXT=so V8_LIBEXT=so
# Some gcc versions report warnings incorrectly # Some gcc versions report warnings incorrectly
V8_BUILDPARAMS=strictaliasing=off werror=no i18nsupport=off V8_BUILDPARAMS=strictaliasing=off werror=no i18nsupport=off
@@ -29,8 +29,8 @@ V8_STATIC_DIR=$(V8_BUILDDIR)/out/native +if DISABLE_SNAPSHOT_V8
+V8_BUILDPARAMS+=snapshot=off
+V8_SNAPSHOT=nosnapshot
+else
V8_SNAPSHOT=snapshot
endif
+endif
if ENABLE_STATIC_V8
# Build the static lib version of V8
@@ -29,8 +34,8 @@ V8_STATIC_DIR=$(V8_BUILDDIR)/out/native
V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native V8_ICU_STATIC_DIR=$(V8_BUILDDIR)/out/native
V8_CXXFLAGS = V8_CXXFLAGS =
else else
@ -20,7 +30,7 @@
V8_CXXFLAGS = -fPIC V8_CXXFLAGS = -fPIC
endif endif
V8LIB=$(V8_STATIC_DIR)/libv8_base*.a V8LIB=$(V8_STATIC_DIR)/libv8_base*.a
@@ -46,11 +46,6 @@ else @@ -46,11 +51,6 @@ else
V8_EXTRA_BUILD_PARAMS=--no-parallel V8_EXTRA_BUILD_PARAMS=--no-parallel
endif endif
@ -32,7 +42,7 @@
MODNAME=mod_v8 MODNAME=mod_v8
AM_CFLAGS += -I. -I./include -I$(switch_srcdir)/src/mod/languages/mod_v8/include -I$(V8_DIR)/include 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) @@ -121,21 +121,13 @@ $(V8_DIR)/.stamp-patch: $(V8_DIR)
$(V8LIB): $(V8_DIR) $(V8_DIR)/.stamp-patch $(V8LIB): $(V8_DIR) $(V8_DIR)/.stamp-patch
mkdir -p $(V8_BUILDDIR) mkdir -p $(V8_BUILDDIR)
@ -61,3 +71,17 @@
if ENABLE_STATIC_V8 if ENABLE_STATIC_V8
install-exec-local: $(V8LIB) install-exec-local: $(V8LIB)
--- a/configure.ac
+++ b/configure.ac
@@ -1519,6 +1519,11 @@ AC_ARG_ENABLE(parallel-build-v8,
[AS_HELP_STRING([--disable-parallel-build-v8], [Disable parallel build of V8])], [enable_parallel_build_v8="$enableval"], [enable_parallel_build_v8="yes"])
AM_CONDITIONAL([ENABLE_PARALLEL_BUILD_V8],[test "x$enable_parallel_build_v8" != "xno"])
+# Option to force heap snapshot generation of Google's V8 to off
+AC_ARG_ENABLE(snapshot-v8,
+[AS_HELP_STRING([--disable-snapshot-v8], [Disable heap snapshot generation of V8])], [enable_snapshot_v8="$enableval"], [enable_snapshot_v8="yes"])
+AM_CONDITIONAL([DISABLE_SNAPSHOT_V8],[test "x$enable_snapshot_v8" != "xyes"])
+
AM_CONDITIONAL([HAVE_ODBC],[test "x$enable_core_odbc_support" != "xno"])
AM_CONDITIONAL([HAVE_MYSQL],[test "$found_mysql" = "yes"])

10
net/freeswitch-stable/patches/260-mod_event_zmq-fix-build-with-fortify-headers.diff Normal file
View file

@ -0,0 +1,10 @@
--- a/src/mod/event_handlers/mod_event_zmq/Makefile.am
+++ b/src/mod/event_handlers/mod_event_zmq/Makefile.am
@@ -22,6 +22,7 @@ $(ZMQ_DIR):
$(GETLIB) $(ZMQ_BASEURL) $(ZMQ).tar.gz || $(GETLIB) $(ZMQ_BASEURL_ALT) $(ZMQ).tar.gz
sed -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' $(ZMQ_DIR)/configure.in > $(ZMQ_DIR)/configure.in.tmp && \
mv $(ZMQ_DIR)/configure.in.tmp $(ZMQ_DIR)/configure.in
+ sed -i '/^libzmq_pedantic="yes"/s/yes/no/' $(ZMQ_DIR)/configure.in
cd $(ZMQ_DIR) && ./autogen.sh
$(ZMQ_BUILDDIR)/Makefile: $(ZMQ_DIR)