Commit Graph

25357 Commits

Author SHA1 Message Date
Chris Rienzo fa43a37a82 Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable 2013-12-10 12:15:29 -05:00
Chris Rienzo 5459d37f64 rpmbuild: update version of flite and lame 2013-12-10 12:14:59 -05:00
Travis Cross b1288520bc Cleanup whitespace in debian/ 2013-12-10 03:54:05 +00:00
Chris Rienzo 74af549179 rpmbuild: remove vp8 from freeswitch-rayo-config 2013-12-09 20:17:36 -05:00
Chris Rienzo 535ee10885 build: added freeswitch-config-rayo package and script to build it 2013-12-09 19:38:43 -05:00
Chris Rienzo e27b0a4a7e build: updated mod_rayo config, fixed RPM packaging in master, added mod_rayo and mod_ssml
Conflicts:

	freeswitch.spec
2013-12-09 19:35:59 -05:00
Jeff Lenk c318f6c782 Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable 2013-12-09 17:27:34 -06:00
Jeff Lenk f1a75695b6 windows spandsp fix part2 done 2013-12-09 17:26:47 -06:00
Travis Cross a5d007816d Deal correctly with spaces in SWITCH_VERSION_REVISION_HUMAN
This affects the set_fs_ver bash function and the
./build/set-fs-version.sh script.

Previously we were failing to quote the value of
SWITCH_VERSION_REVISION_HUMAN when inserting it into configure.in.
When it contains spaces, which it often does, this results in a
malformed line in the generated configure script, which results in the
define in src/include/switch_version.h.in being left unset.
2013-12-09 23:20:16 +00:00
Jeff Lenk d2f892fe67 Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable 2013-12-09 16:43:07 -06:00
Jeff Lenk e20ed84a8d fix spandsp compile for windows part 1 2013-12-09 16:42:32 -06:00
Anthony Minessale 0ab1837d5b FS-6033 --resolve 2013-12-10 03:42:27 +05:00
Anthony Minessale 3fcdee098c add lua-reconf 2013-12-10 03:33:36 +05:00
Anthony Minessale 8213a1a33c FS-6032 2013-12-10 01:02:35 +05:00
Anthony Minessale 848937bd31 FS-6032 2013-12-09 22:14:54 +05:00
Chris Rienzo 015f4e2ba6 mod_mongo: use lboost_thread by default 2013-12-09 11:14:39 -05:00
Chris Rienzo 7521254025 mod_mongo: use C++ driver pooling, added support for socket timeout 2013-12-09 11:10:05 -05:00
Nathan Neulinger c21cd495d8 mod_skinny: move hardwired ptime to a define so it's in one place 2013-12-09 09:01:28 -06:00
Nathan Neulinger 661a21423f FS-6024 --resolve 2013-12-09 08:55:41 -06:00
Travis Cross 5e344df304 Correct shlibs of freeswitch-all wrt libfreeswitch1
The freeswitch-all package provides libfreeswitch1, so any
shlibs-generated dependency should be for libfreeswitch1 rather than
freeswitch-all.

Because dh_shlibdeps / dpkg-shlibdeps searches for shlibs files in
debian/*/DEBIAN/ it was sometimes using freeswitch-all rather than
libfreeswitch1 to satisfy dependencies for freeswitch.so.1.

FS-6029 --resolve
2013-12-09 09:25:02 +00:00
Travis Cross cff204e823 Improve upgrade path to freeswitch-all
That is to say, declare all appropriate Provides/Conflicts/Replaces
for freeswitch-all and freeswitch-all-dbg by enumerating the binary
packages that we're going to produce during the build.

Conflicts is more appropriate than Breaks here as both packages will
continue to provide the same files on an ongoing basis and we would
like to force the removal of the other package.
2013-12-08 15:15:08 +00:00
Anthony Minessale 043b0667a5 comment 2013-12-08 07:10:09 +05:00
Anthony Minessale cb4a26af0d fix 2013-12-06 00:41:11 +05:00
Anthony Minessale 0ef1409456 merge in latest 2013-12-05 23:03:02 +05:00
Anthony Minessale d429d7fff1 sync spandsp 2013-12-05 22:58:12 +05:00
Anthony Minessale 156cb36820 FS-6026 --resolve 2013-12-05 11:35:53 -06:00
Chris Rienzo cb244aea1d mod_rayo: doh- fix adhearsionconf core dump 2013-12-04 20:18:41 -05:00
Anthony Minessale 48755d792f FS-5997 --resolve 2013-12-04 17:46:45 -06:00
Anthony Minessale 7646af351d swigall 2013-12-01 08:03:11 +05:00
Anthony Minessale 608df08d6a FS-6012 --resolve 2013-11-30 19:26:32 -06:00
Jeff Lenk 097f1b560b FS-5989 --resolve 2013-11-29 22:28:05 -06:00
Anthony Minessale 9bef22ba95 FS-6009 --resolve 2013-11-27 23:55:10 -06:00
Anthony Minessale 97f70aeb70 FS-6006 --resolve
Conflicts:
	src/switch_core_session.c
2013-11-27 23:44:30 +05:00
Anthony Minessale 76f30ae090 FS-6005 --resolve
Conflicts:
	libs/sofia-sip/.update
2013-11-27 21:21:45 +05:00
Anthony Minessale 0846195cd9 FS-4965 calling the variable playback_last_offset_pos instead 2013-11-25 16:09:23 -06:00
Anthony Minessale 1ddf632eef FS-6001 --resolve 2013-11-25 12:34:17 -06:00
Anthony Minessale 2b62309fb0 FS-5994 2013-11-23 20:12:15 -06:00
Anthony Minessale bf5ff90f7d fix compile
Conflicts:
	src/mod/applications/mod_fifo/mod_fifo.c
2013-11-24 06:26:19 +05:00
Anthony Minessale 9fa722fcbe fix typo that caused a seg in presesnce 2013-11-23 02:32:16 +05:00
Anthony Minessale 7a8680710a add nomux flag when playing to a member to block other audio 2013-11-23 01:12:36 +05:00
Anthony Minessale e771a00964 FS-5841 --resolve 2013-11-22 22:53:11 +05:00
Anthony Minessale 22d31ef55e update more fields on re-subscribe 2013-11-22 22:21:44 +05:00
Anthony Minessale ae6b75a0c2 fix build 2013-11-22 06:08:56 +05:00
Anthony Minessale 69c947f9e8 add polycom support to multicast paging, broadcast all formats at once to support most every popular phone at once
Conflicts:
	src/mod/applications/mod_esf/mod_esf.c
2013-11-22 05:00:26 +05:00
Anthony Minessale eed2a7aa86 fix regression from recent refactor that causes infinite loop on unexpected disconnect 2013-11-22 04:53:49 +05:00
Ken Rice 728722ce90 fix recursive build error 2013-11-20 14:56:50 -06:00
Anthony Minessale 27b28ae33a add execute_on_avmd_beep 2013-11-21 01:41:41 +05:00
William King e1cb330f22 This was in the wrong section. Should be setting it on the auth_invite, not the auth_registration. 2013-11-20 11:13:15 -08:00
Jeff Lenk 071fa4db65 FS-5986 --resolve fix download reference to windows libcelt 2013-11-20 07:36:57 -06:00
Travis Cross 376eb4333b Generate modules_.conf earlier in bootstrap 2013-11-20 01:28:20 +00:00