25384 Commits

Author SHA1 Message Date
Jeff Lenk
4c92bc2bf6 Merge branch 'v1.2.stable' of ssh://git.freeswitch.org:222/freeswitch into v1.2.stable 2013-12-24 10:42:34 -06:00
Jeff Lenk
2783658405 FS-6052 --resolve 2013-12-24 10:42:02 -06:00
Michael Jerris
5bb1593798 .gitignore 2013-12-23 17:26:12 -05:00
Jeff Lenk
df05258438 vs2010 reswig 2013-12-23 15:31:20 -06:00
Anthony Minessale
9a1157078f FS-6061 swigall 2013-12-23 23:24:53 +05:00
Anthony Minessale
15df017f6c chage swig hack diff 2013-12-23 23:24:13 +05:00
Anthony Minessale
406ce3f881 FS-6061 --resolve 2013-12-23 22:43:21 +05:00
Ken Rice
5a01371d62 rev bump v1.2.17 2013-12-22 18:19:01 -06:00
Jeff Lenk
3687892e91 FS-6010 VS2013 build changes 2013-12-21 16:50:09 -06:00
Chris Rienzo
726981c5c8 FS-6051 added some logging to help troubleshoot mod_rayo crash 2013-12-20 09:56:25 -05:00
Jeff Lenk
8436a1231e FS-6055 --resolve 2013-12-19 22:38:48 -06:00
Anthony Minessale
7291d05cd6 FS-6056 --resolve this was already fixed in master 2013-12-20 00:12:08 +05:00
Chris Rienzo
fc2e8493ee rpmbuild: tweak to config-rayo.sh to play nice /w rpmbuilder.sh 2013-12-19 12:11:26 -05:00
Anthony Minessale
ee1b7c61ee FS-6054 2013-12-19 21:35:32 +05:00
Travis Cross
6968ef88fa Treat freeswitch-{sounds,music} as virtual packages only
Previously we were creating freeswitch-music, freeswitch-sounds,
freeswitch-sounds-en, and freeswitch-sounds-en-us metapackages and
also providing those names as virtual packages from the
freeswitch-{sounds,music} source packages.  This is unnecessarily
confusing and meant that freeswitch-all wasn't depending on any sounds
in actuality as it was also providing freeswitch-sounds.
2013-12-18 19:51:41 +00:00
Travis Cross
3ad333032b Fix freeswitch-all module provides/replaces/conflicts
We were generating freeswitch-mod-mod-* rather than freeswitch-mod-*.
2013-12-18 18:54:14 +00:00
Anthony Minessale
1ac6f16cd5 FS-6054 --resolve 2013-12-18 23:22:22 +05:00
Anthony Minessale
0f8f7e82bf add loops var durning looped execution 2013-12-18 03:20:16 +05:00
Ken Rice
fcd00cb32f bump opus rev for rpm builds 2013-12-16 16:41:13 -06:00
Anthony Minessale
b4ec1a08e3 update opus to 1.1
Conflicts:
	src/mod/codecs/mod_opus/Makefile
2013-12-16 16:39:40 -06:00
Travis Cross
967673d6e2 Follow bump to opus lib version for debian packaging 2013-12-16 21:14:06 +00:00
Seven Du
3bbb60ffaa debug all media type 2013-12-15 11:45:56 +08:00
Anthony Minessale
0586f49420 FS-5036 --resolve 2013-12-13 23:14:21 +05:00
Anthony Minessale
b209b3f087 FS-5987 pushing the patch now since no matter what its better than before
Conflicts:
	src/mod/endpoints/mod_sofia/sofia.c
2013-12-13 23:14:21 +05:00
Ken Rice
e0a0baf999 bump rev v1.2.16 2013-12-10 15:37:31 -06:00
Anthony Minessale
7bf439c33f FS-6006 2013-12-10 23:48:24 +05:00
Travis Cross
7abfa0d9c1 Cleanup whitespace 2013-12-10 18:19:36 +00:00
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