Skip to content

Commit 133fc2c

Browse files
andywolkandywolk
committed
Merge branch 'master' into v1.10
2 parents 129de34 + 242ab07 commit 133fc2c

File tree

1,628 files changed

+11934
-556996
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,628 files changed

+11934
-556996
lines changed

‎.drone.yml

+46-19
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,43 @@
22
kind: pipeline
33
name: unit-tests
44

5-
node:
6-
freeswitch: public
7-
85
steps:
9-
- name: run-tests
6+
- name: bootstrap
107
image: signalwire/freeswitch-public-base
118
pull: true
129
commands:
1310
- cat /proc/sys/kernel/core_pattern
1411
- ./bootstrap.sh -j
12+
13+
- name: configure
14+
image: signalwire/freeswitch-public-base
15+
pull: true
16+
commands:
17+
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
1518
- echo "applications/mod_test" >> modules.conf
16-
- sed -i '/applications\/mod_http_cache/s/^#//g' modules.conf
17-
- sed -i '/event_handlers\/mod_rayo/s/^#//g' modules.conf
18-
- sed -i '/formats\/mod_opusfile/s/^#//g' modules.conf
19-
- sed -i '/languages\/mod_lua/s/^#//g' modules.conf
19+
- echo 'codecs/mod_openh264' >> modules.conf
20+
- sed -i '/applications\\/mod_http_cache/s/^#//g' modules.conf
21+
- sed -i '/event_handlers\\/mod_rayo/s/^#//g' modules.conf
22+
- sed -i '/formats\\/mod_opusfile/s/^#//g' modules.conf
23+
- sed -i '/languages\\/mod_lua/s/^#//g' modules.conf
2024
- export ASAN_OPTIONS=log_path=stdout:disable_coredump=0:unmap_shadow_on_exit=1;
2125
- ./configure --enable-address-sanitizer
22-
- echo "#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=\${PIPESTATUS[0]}\necho \$exitstatus > ./build-status.txt\nmake install\n" > build.sh
26+
27+
- name: build
28+
image: signalwire/freeswitch-public-base
29+
pull: true
30+
commands:
31+
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
32+
- echo '#!/bin/bash\nmake -j`nproc --all` |& tee ./unit-tests-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./build-status.txt\n' > build.sh
2333
- chmod +x build.sh
2434
- ./build.sh
35+
36+
- name: run-tests
37+
image: signalwire/freeswitch-public-base
38+
pull: true
39+
commands:
40+
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
41+
- make install || true
2542
- cd tests/unit
2643
- ./run-tests.sh
2744
- ls -la /cores
@@ -32,13 +49,13 @@ steps:
3249
- cd logs && ls -la
3350

3451
- name: notify
35-
image: signalwire/unit-tests-notify
52+
image: signalwire/public-unit-tests-notify
3653
pull: true
3754
environment:
3855
GITHUB_CI_APP_PEM:
3956
from_secret: github_ci_app_pem
4057
SSH_KEY:
41-
from_secret: ssh_key
58+
from_secret: public_artifacts_ssh_key
4259
SLACK_WEBHOOK_URL:
4360
from_secret: slack_webhook_url
4461
commands:
@@ -55,17 +72,21 @@ trigger:
5572
kind: pipeline
5673
name: scan-build
5774

58-
node:
59-
freeswitch: public
60-
6175
steps:
62-
- name: scan-build
76+
- name: bootstrap
6377
image: signalwire/freeswitch-public-base:stretch
6478
pull: true
6579
commands:
6680
- ./bootstrap.sh -j
81+
82+
- name: configure
83+
image: signalwire/freeswitch-public-base:stretch
84+
pull: true
85+
commands:
86+
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
6787
- cp build/modules.conf.most modules.conf
6888
#Enable/Uncomment mods
89+
- echo 'codecs/mod_openh264' >> modules.conf
6990
- sed -i "/mod_mariadb/s/^#//g" modules.conf
7091
- sed -i "/mod_v8/s/^#//g" modules.conf
7192
#Disable/Comment out mods
@@ -87,21 +108,27 @@ steps:
87108
- sed -i '/mod_unimrcp/s/^/#/g' modules.conf
88109
- sed -i '/mod_xml_rpc/s/^/#/g' modules.conf
89110
- ./configure
111+
112+
- name: scan-build
113+
image: signalwire/freeswitch-public-base:stretch
114+
pull: true
115+
commands:
116+
- apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -yq install libsofia-sip-ua-dev libspandsp-dev
90117
- mkdir -p scan-build
91-
- echo "#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=\${PIPESTATUS[0]}\necho \$exitstatus > ./scan-build-status.txt\n" > scan.sh
118+
- echo '#!/bin/bash\nscan-build-4.0 -o ./scan-build/ make -j`nproc --all` |& tee ./scan-build-result.txt\nexitstatus=$${PIPESTATUS[0]}\necho $$exitstatus > ./scan-build-status.txt\n' > scan.sh
92119
- chmod +x scan.sh
93120
- ./scan.sh
94121
- exitstatus=`cat ./scan-build-status.txt`
95122
- echo "*** Exit status is $exitstatus"
96123

97124
- name: notify
98-
image: signalwire/scan-build-notify
125+
image: signalwire/public-scan-build-notify
99126
pull: true
100127
environment:
101128
GITHUB_CI_APP_PEM:
102129
from_secret: github_ci_app_pem
103130
SSH_KEY:
104-
from_secret: ssh_key
131+
from_secret: public_artifacts_ssh_key
105132
SLACK_WEBHOOK_URL:
106133
from_secret: slack_webhook_url
107134
commands:
@@ -117,6 +144,6 @@ trigger:
117144

118145
---
119146
kind: signature
120-
hmac: d354f6d232ae6417b539fb9b40fc15765c3247ab58c87a5135a0ac6c448e1cd0
147+
hmac: c48137f0dee8c2825711979e2c490367a2467a92866d3dfa11cf340a113dbf53
121148

122149
...

‎.gitattributes

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*.c text eol=lf
77
*.cxx text eol=lf
88
*.cpp text eol=lf
9-
/libs/sofia-sip/libsofia-sip-ua/sip/sip_bad_mask text eol=lf
109
*.txt text eol=lf
1110
*.exe -diff binary executable windows dfsg-nonfree debian-ignore
1211
*.wav -diff binary sound

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ Release/
142142
/libs/libcodec2/unittest/Makefile
143143
/libs/libcodec2/unittest/Makefile.in
144144
/libs/mpg123-1.13.2/
145-
/libs/spandsp/src/cielab_luts.h
146145
/scripts/fsxs
147146
/scripts/gentls_cert
148147

@@ -260,6 +259,8 @@ libs/libsilk-*/
260259
libs/rabbitmq-c-*/
261260
libs/rabbitmq-c-*.zip
262261
libs/ffmpeg-*/
262+
libs/sofia-sip*/
263+
libs/sofia-sip*
263264

264265
src/mod/applications/mod_test/test/test_asr
265266
src/mod/event_handlers/mod_rayo/test/test_iks

‎Freeswitch.2017.sln

+7-7
Original file line numberDiff line numberDiff line change
@@ -342,9 +342,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_easyroute", "src\mod\ap
342342
EndProject
343343
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_lcr", "src\mod\applications\mod_lcr\mod_lcr.2017.vcxproj", "{1A3793D1-05D1-4B57-9B0F-5AF3E79DC439}"
344344
EndProject
345-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\spandsp\src\libtiff.2017.vcxproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"
345+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libtiff", "libs\win32\libtiff\libtiff.2017.vcxproj", "{401A40CD-5DB4-4E34-AC68-FA99E9FAC014}"
346346
EndProject
347-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\spandsp\src\libspandsp.2017.vcxproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
347+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspandsp", "libs\win32\spandsp\libspandsp.2017.vcxproj", "{1CBB0077-18C5-455F-801C-0A0CE7B0BBF5}"
348348
EndProject
349349
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspeex", "libs\win32\speex\libspeex.2017.vcxproj", "{E972C52F-9E85-4D65-B19C-031E511E9DB4}"
350350
EndProject
@@ -358,9 +358,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skinny", "src\mod\endpo
358358
EndProject
359359
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_rtmp", "src\mod\endpoints\mod_rtmp\mod_rtmp.2017.vcxproj", "{48414740-C693-4968-9846-EE058020C64F}"
360360
EndProject
361-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "libs\spandsp\src\msvc\make_at_dictionary.2017.vcxproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}"
361+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_at_dictionary", "libs\win32\spandsp\make_at_dictionary.2017.vcxproj", "{DEE932AB-5911-4700-9EEB-8C7090A0A330}"
362362
EndProject
363-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\spandsp\src\msvc\make_modem_filter.2017.vcxproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}"
363+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_modem_filter", "libs\win32\spandsp\make_modem_filter.2017.vcxproj", "{329A6FA0-0FCC-4435-A950-E670AEFA9838}"
364364
EndProject
365365
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_skel", "src\mod\applications\mod_skel\mod_skel.2017.vcxproj", "{11C9BC3D-45E9-46E3-BE84-B8CEE4685E39}"
366366
EndProject
@@ -484,11 +484,11 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xmltok", "libs\win32\xmlrpc
484484
EndProject
485485
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "Setup.2017", "w32\Setup\Setup.2017.wixproj", "{47213370-B933-487D-9F45-BCA26D7E2B6F}"
486486
EndProject
487-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\spandsp\src\msvc\make_math_fixed_tables.2017.vcxproj", "{2386B892-35F5-46CF-A0F0-10394D2FBF9B}"
487+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_math_fixed_tables", "libs\win32\spandsp\make_math_fixed_tables.2017.vcxproj", "{2386B892-35F5-46CF-A0F0-10394D2FBF9B}"
488488
EndProject
489489
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcbt", "libs\win32\libcbt\libcbt.2017.vcxproj", "{77BC1DD2-C9A1-44D7-BFFA-1320370CACB9}"
490490
EndProject
491-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\spandsp\src\msvc\make_cielab_luts.2017.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
491+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_cielab_luts", "libs\win32\spandsp\make_cielab_luts.2017.vcxproj", "{85F0CF8C-C7AB-48F6-BA19-CC94CF87F981}"
492492
EndProject
493493
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "opus", "opus", "{ED2CA8B5-8E91-4296-A120-02BB0B674652}"
494494
EndProject
@@ -504,7 +504,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "opus.silk_float", "libs\win
504504
EndProject
505505
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mod_opus", "src\mod\codecs\mod_opus\mod_opus.2017.vcxproj", "{64E99CCA-3C6F-4AEB-9FA3-CFAC711257BB}"
506506
EndProject
507-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", "libs\spandsp\src\msvc\make_t43_gray_code_tables.2017.vcxproj", "{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}"
507+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "make_t43_gray_code_tables", "libs\win32\spandsp\make_t43_gray_code_tables.2017.vcxproj", "{EDDB8AB9-C53E-44C0-A620-0E86C2CBD5D5}"
508508
EndProject
509509
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "winFailToBan", "src\mod\languages\mod_managed\managed\examples\winFailToBan\winFailToBan.csproj", "{5BA0D5BD-330D-4EE2-B959-CAFEA04E50E0}"
510510
EndProject

‎Freeswitch.2017.sln.bat

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@REM this script builds freeswitch using VS2017
1+
@REM this script builds freeswitch using the latest found Microsoft Visual Studio
22
@REM only one platform/configuration will be built
33
@REM runs (probably only) from the commandline
44
@REM usage: Freeswitch.2017.sln [[[.*]ebug] [[.*]elease] [[.*]64] [[.*]32]]
@@ -47,13 +47,13 @@
4747
@set procs=%NUMBER_OF_PROCESSORS%
4848
@set /a procs -= 1
4949

50-
@REM check and set VS2017 environment
50+
@REM check and set Visual Studio environment
5151
CALL msbuild.cmd
5252

5353
if exist %msbuild% (
54-
%msbuild% Freeswitch.2017.sln /m:%procs% /verbosity:normal /property:Configuration=%configuration% /property:Platform=%platform% /fl /flp:logfile=vs2017%platform%%configuration%.log;verbosity=normal
54+
%msbuild% Freeswitch.2017.sln /m:%procs% /verbosity:normal /property:Configuration=%configuration% /property:Platform=%platform% /fl /flp:logfile=vs%platform%%configuration%.log;verbosity=normal
5555
) ELSE (
56-
echo "echo ERROR: Cannot find msbuild. You need Visual Studio 2017 to compile this solution."
56+
echo "echo ERROR: Cannot find msbuild. You need Microsoft Visual Studio to compile this solution."
5757
)
5858
@pause
5959

‎Makefile.am

+5-31
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@ endif
3030
AM_CFLAGS = $(SWITCH_AM_CFLAGS) $(SWITCH_ANSI_CFLAGS)
3131
AM_CPPFLAGS =
3232
AM_CPPFLAGS += -I$(switch_srcdir)/libs/libvpx
33-
AM_CPPFLAGS += $(SWITCH_AM_CXXFLAGS) -I$(switch_srcdir)/libs/sofia-sip/libsofia-sip-ua/sdp
34-
AM_CPPFLAGS += -I$(switch_srcdir)/libs/sofia-sip/libsofia-sip-ua/su -I$(switch_builddir)/libs/sofia-sip/libsofia-sip-ua/su
35-
AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) $(AM_LIBAPR_LDFLAGS) $(AM_LIBAPU_LDFLAGS)
33+
AM_CPPFLAGS += $(SWITCH_AM_CXXFLAGS) $(SOFIA_SIP_CFLAGS)
34+
AM_LDFLAGS = $(SWITCH_AM_LDFLAGS) $(AM_LIBAPR_LDFLAGS) $(AM_LIBAPU_LDFLAGS) $(SOFIA_SIP_LIBS)
3635

3736
DEFAULT_SOUNDS=en-us-callie-8000
3837
MY_DEFAULT_ARGS= --build=$(build) --host=$(host) --target=$(target) --prefix="$(prefix)" --exec_prefix="$(exec_prefix)" --libdir="$(libdir)"
@@ -131,7 +130,7 @@ CORE_CFLAGS += -I$(switch_srcdir)/libs/libyuv/include
131130
CORE_CFLAGS += -DSWITCH_HAVE_YUV
132131
endif
133132
CORE_CFLAGS += -I$(switch_srcdir)/libs/srtp/crypto/include -Ilibs/srtp/crypto/include
134-
CORE_CFLAGS += -I$(switch_builddir)/libs/spandsp/src -I$(switch_srcdir)/libs/spandsp/src
133+
CORE_CFLAGS += $(SPANDSP_CFLAGS)
135134
if ENABLE_LIBVPX
136135
CORE_CFLAGS += -DSWITCH_HAVE_VPX
137136
endif
@@ -185,13 +184,10 @@ endif
185184
##
186185
## libfreeswitch
187186
##
188-
noinst_LTLIBRARIES = libfreeswitch_spandsp.la
187+
noinst_LTLIBRARIES =
189188
if ENABLE_LIBYUV
190189
noinst_LTLIBRARIES += libfreeswitch_libyuv.la
191190
endif
192-
libfreeswitch_spandsp_la_SOURCES = libs/spandsp/src/plc.c libs/spandsp/src/alloc.c libs/spandsp/src/bit_operations.c
193-
libfreeswitch_spandsp_la_CFLAGS = -Ilibs/spandsp/src $(CORE_CFLAGS) $(AM_CFLAGS)
194-
CORE_LIBS+=libfreeswitch_spandsp.la
195191

196192
if ENABLE_LIBYUV
197193
libfreeswitch_libyuv_la_SOURCES = \
@@ -252,7 +248,7 @@ endif
252248
lib_LTLIBRARIES = libfreeswitch.la
253249
libfreeswitch_la_CFLAGS = $(CORE_CFLAGS) $(SQLITE_CFLAGS) $(GUMBO_CFLAGS) $(FVAD_CFLAGS) $(FREETYPE_CFLAGS) $(CURL_CFLAGS) $(PCRE_CFLAGS) $(SPEEX_CFLAGS) $(LIBEDIT_CFLAGS) $(openssl_CFLAGS) $(AM_CFLAGS) $(TPL_CFLAGS)
254250
libfreeswitch_la_LDFLAGS = -version-info 1:0:0 $(AM_LDFLAGS) $(PLATFORM_CORE_LDFLAGS) -no-undefined
255-
libfreeswitch_la_LIBADD = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS)
251+
libfreeswitch_la_LIBADD = $(CORE_LIBS) $(APR_LIBS) $(SQLITE_LIBS) $(GUMBO_LIBS) $(FVAD_LIBS) $(FREETYPE_LIBS) $(CURL_LIBS) $(PCRE_LIBS) $(SPEEX_LIBS) $(LIBEDIT_LIBS) $(openssl_LIBS) $(PLATFORM_CORE_LIBS) $(TPL_LIBS) $(SPANDSP_LIBS)
256252
libfreeswitch_la_DEPENDENCIES = $(BUILT_SOURCES)
257253

258254
if HAVE_PNG
@@ -593,14 +589,6 @@ libs/libvpx/Makefile: libs/libvpx/.update
593589
libs/libvpx/libvpx.a: libs/libvpx/Makefile libs/libvpx/.update
594590
@cd libs/libvpx && $(MAKE)
595591

596-
libs/sofia-sip/Makefile:
597-
cd libs/sofia-sip && sh ./configure.gnu $(MY_DEFAULT_ARGS)
598-
599-
libs/sofia-sip/libsofia-sip-ua/sdp/.libs/libsdp.a libs/sofia-sip/libsofia-sip-ua/su/.libs/libsu.a: libs/sofia-sip/.update libs/sofia-sip/Makefile
600-
@cd libs/sofia-sip && $(MAKE) noop
601-
@cd libs/sofia-sip && $(MAKE) SOFIA_CFLAGS="$(SWITCH_AM_CFLAGS)"
602-
@$(TOUCH_TARGET)
603-
604592
libs/apr/Makefile: libs/apr/Makefile.in libs/apr/config.status libs/apr libs/apr/.update
605593
@cd libs/apr && ./config.status
606594
@$(TOUCH_TARGET)
@@ -722,9 +710,7 @@ core-install: core_install
722710

723711
clean_core: clean-libLTLIBRARIES
724712
rm -f $(libfreeswitch_la_OBJECTS)
725-
rm -f $(libfreeswitch_spandsp_la_OBJECTS)
726713
rm -f `echo $(libfreeswitch_la_OBJECTS) | sed -e's|.lo|.o|g'`
727-
rm -f `echo $(libfreeswitch_spandsp_la_OBJECTS) | sed -e's|.lo|.o|g'`
728714

729715
install_core: install-libLTLIBRARIES
730716

@@ -756,7 +742,6 @@ pristine:
756742
git reset --hard
757743

758744
update-clean: clean python-reconf
759-
cd libs/sofia-sip && $(MAKE) clean
760745
cd libs/esl && $(MAKE) clean
761746
cd libs/srtp && $(MAKE) clean
762747

@@ -790,17 +775,6 @@ iks-reconf:
790775
cd libs/iksemel && sh ./configure.gnu $(MY_DEFAULT_ARGS)
791776
$(MAKE) mod_dingaling-clean
792777

793-
spandsp-reconf:
794-
cd libs/spandsp && $(MAKE) clean || echo
795-
cd libs/spandsp && autoreconf -fi
796-
cd libs/spandsp && sh ./configure.gnu $(MY_DEFAULT_ARGS)
797-
cd libs/spandsp && $(MAKE)
798-
799-
sofia-reconf:
800-
cd libs/sofia-sip && sh ./autogen.sh
801-
cd libs/sofia-sip && $(MAKE) clean
802-
cd libs/sofia-sip && ./configure $(MY_DEFAULT_ARGS) --with-pic --with-glib=no --disable-shared
803-
804778
cluecon:
805779
@clear
806780
@echo Thank you for updating. This is going to take a while so relax.

‎acinclude.m4

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ m4_include([build/config/ax_check_java.m4])
99
m4_include([build/config/uuid.m4])
1010
m4_include([build/config/erlang.m4])
1111
m4_include([build/config/odbc.m4])
12+
m4_include([build/config/sac-pkg-config.m4])
13+
m4_include([build/config/sac-openssl.m4])
1214
m4_include([build/config/sched_setaffinity.m4])
1315
m4_include([libs/apr/build/apr_common.m4])
14-
m4_include([libs/sofia-sip/m4/sac-pkg-config.m4])
15-
m4_include([libs/sofia-sip/m4/sac-openssl.m4])
1616
m4_include([libs/iksemel/build/libgnutls.m4])

‎bootstrap.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ BGJOB=false
88
VERBOSE=false
99
BASEDIR=`pwd`;
1010
LIBDIR=${BASEDIR}/libs;
11-
SUBDIRS="apr libzrtp iksemel libdingaling sofia-sip srtp freetdm spandsp unimrcp fs";
11+
SUBDIRS="apr libzrtp iksemel libdingaling srtp freetdm unimrcp fs";
1212

1313
while getopts 'jhd:v' o; do
1414
case "$o" in

‎libs/sofia-sip/m4/sac-openssl.m4 renamed to ‎build/config/sac-openssl.m4

File renamed without changes.

‎libs/sofia-sip/m4/sac-pkg-config.m4 renamed to ‎build/config/sac-pkg-config.m4

File renamed without changes.

‎build/next-release.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.10.3-release
1+
1.10.4-release

‎build/standalone_module/freeswitch.pc.in

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
prefix=@prefix@
2+
exec_prefix=@exec_prefix@
3+
libdir=@switch_builddir@
4+
libexecdir=@libexecdir@
5+
includedir=@switch_srcdir@/src/include
6+
modulesdir=@modulesdir@
7+
runtimedir=@runtimedir@
8+
logfiledir=@logfiledir@
9+
sysconfdir=@sysconfdir@
10+
confdir=@confdir@
11+
dbdir=@dbdir@
12+
htdocsdir=@htdocsdir@
13+
localstatedir=@localstatedir@
14+
grammardir=@grammardir@
15+
soundsdir=@soundsdir@
16+
scriptdir=@scriptdir@
17+
recordingsdir=@recordingsdir@
18+
bindir=@bindir@
19+
20+
Name: freeswitch
21+
Version: @PACKAGE_VERSION@
22+
Description: FreeSWITCH open source telephony platform
23+
Libs: -L${libdir} -lfreeswitch
24+
Cflags: -I${includedir} -I@switch_builddir@/src/include -I@switch_srcdir@/libs/libteletone/src
25+

‎conf/vanilla/autoload_configs/tts_commandline.conf.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
${file}: output file (quoted, including .wav extension)
99
1010
Example commands can be found at:
11-
http://wiki.freeswitch.org/wiki/Mod_tts_commandline#Example_commands
11+
https://freeswitch.org/confluence/display/FREESWITCH/mod_tts_commandline#mod_tts_commandline-Examplecommands
1212
-->
1313
<param name="command" value="echo ${text} | text2wave -f ${rate} > ${file}"/>
1414
</settings>

0 commit comments

Comments
 (0)