Commit Graph

57 Commits

Author SHA1 Message Date
0d7c47a47b #13891: Make TLS an optional feature in configure.ac 2012-07-26 14:25:51 -04:00
6a372a4caf #13882: Make speexdsp and noise suppression and optional dependency 2012-07-26 13:55:49 -04:00
59eb25603c #13726: Makes sdes an optional feature at build time for sflphone daemon 2012-07-20 14:03:09 -04:00
5d1cd79bc6 #13722: Makes instant messaging optional a build time for sflphone daemon 2012-07-20 12:38:44 -04:00
10319d9101 Merge branch 'master' into pcre-optional 2012-07-17 16:09:15 -04:00
8b1897886c * #12475: gnome: started migrating video to new shm backend 2012-06-19 17:37:31 -04:00
0a827bbc51 #12322: Remove libpcre as a sflphone dependency 2012-06-11 13:22:32 -04:00
4ee40e13c3 #12071: Lower expat dependency version 2012-06-07 14:57:18 -04:00
2308a70d32 #12071: Make pulseaudio optional at configuration time 2012-06-07 11:21:47 -04:00
1b5f331e38 #12070: Add --without-pulse option 2012-06-06 19:41:11 -04:00
7f1d6c40a0 Merge branch 'master' of http://git.sflphone.org/sflphone into video_preview
Resolved Conflicts:
	daemon/src/sip/sdp.cpp
	gnome/src/main.c
2012-06-01 11:03:40 -04:00
4860ceea87 * #11813: daemon configure should fail if expat is not installed 2012-05-30 15:52:59 -04:00
f251b90b21 * 11480: video: disabled by default 2012-05-24 17:04:42 -04:00
9963c8ff47 * #11269: merged master into video 2012-05-18 17:28:25 -04:00
83286ef0b7 * #11208: bump version numbers for release 1.1.0 2012-05-17 15:58:08 -04:00
fa4617b222 Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview
Resolved Conflicts:
	daemon/src/account.h
	daemon/src/audio/codecs/celtcodec.cpp
	daemon/src/audio/pulseaudio/pulselayer.cpp
	daemon/src/config/sfl_config.cpp
	daemon/src/config/yamlemitter.cpp
	daemon/src/config/yamlemitter.h
	daemon/src/config/yamlparser.cpp
	daemon/src/main.cpp
	daemon/src/preferences.cpp
	daemon/src/preferences.h
	daemon/src/sip/sdp.cpp
	daemon/src/sip/sdp.h
	daemon/src/sip/sipaccount.cpp
	daemon/src/sip/sipvoiplink.cpp
	daemon/test/audiolayertest.h
	daemon/test/gaincontroltest.cpp
	daemon/test/sdptest.cpp
	gnome/configure.ac
	gnome/src/dbus/dbus.c
2012-04-24 11:59:25 -04:00
77f5ef3c20 * #8977: removed unnecessary AC_CANONICAL macros from configure.ac
We don't test against build, host or target so there's no need for these.
2012-04-13 14:07:22 -04:00
a6ded7ab10 * #9778: removed AC_CHECK_FUNCS calls 2012-04-12 15:29:17 -04:00
195430dd2f * #9779: dropped CELT support 2012-04-11 18:15:17 -04:00
1c9d7cabbd * #9736: restored command line options to daemon
Also added -v/--version flag
2012-04-10 13:59:10 -04:00
eae6e24bb5 * #9730: builds against libccrtp1 2012-04-09 12:15:55 -04:00
35b9db5427 * #9572: fixed threading issues with ccrtp2 2012-04-05 17:12:59 -04:00
0246b0da37 Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into upgrade_to_ccrtp2 2012-04-05 12:08:43 -04:00
412a0b8978 * #9572: Replace utilspp singleton implementation 2012-04-04 15:56:05 -04:00
9dbf157589 #9572: make sflphone compile with libccrtp 2 2012-03-28 16:38:10 -04:00
a4312b037d Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview
Resolved Conflicts:
	daemon/configure.ac
	daemon/src/dbus/callmanager.cpp
	daemon/src/global.h
	gnome/src/Makefile.am
	gnome/src/actions.c
	gnome/src/config/accountconfigdialog.c
	gnome/src/config/audioconf.c
	gnome/src/config/preferencesdialog.c
	gnome/src/dbus/dbus.c
	gnome/tests/Makefile.am
2012-03-21 14:30:09 -04:00
72c3cfe6c6 * #9381: YAML_LIBS must be explicitly set in AC_SEARCH_LIBS macro 2012-03-21 07:34:07 -04:00
ea984db8c5 * #9381: reverted yaml check
yaml-0.1 pkg-config file is fairly new, might not be present
2012-03-20 18:28:14 -04:00
0f4362e7a4 * #9381: fix celt plugin compilation on fedora 2012-03-20 16:46:44 -04:00
cd5a216a37 * #9381: use PKG_CHECK_MODULES to test for yaml 2012-03-20 14:46:58 -04:00
ae6da5767c * #9381: use autoconf macros and AC_SEARCH_LIBS 2012-03-20 14:30:18 -04:00
35e61223a4 * #9381: use AC_SEARCH_LIBS, AC_CHECK_LIB 2012-03-20 12:35:21 -04:00
f535842f52 Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview 2012-02-08 15:08:05 -05:00
f0c23e62b2 #8449: Update version 1.0.2 2012-02-08 12:34:46 -05:00
6d42a0af6d * #8357: added disable video option to client 2012-02-02 17:42:09 -05:00
80d4ae8d68 * #8357: daemon now builds with video enabled 2012-01-26 18:58:53 -05:00
9af1770d35 * #8357: create a DBus handler for video only.
Doesn't build yet
2012-01-24 17:57:14 -05:00
295097b867 Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview 2012-01-24 14:43:53 -05:00
4f2d75f91c configure: cleanup, updated copyright year 2012-01-24 14:41:55 -05:00
754210ed3b Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone into video_preview 2011-11-18 12:21:59 -05:00
c83e3441b3 * #7242: updated version numbers for release 1.0.1 2011-11-18 11:40:08 -05:00
82aab7b1f2 Merge branch 'master' into video_preview
Resolved Conflicts:
	daemon/README
	daemon/configure.ac
	daemon/src/account.cpp
	daemon/src/audio/codecs/audiocodec.cpp
	daemon/src/call.cpp
	daemon/src/config/yamlemitter.cpp
	daemon/src/config/yamlemitter.h
	daemon/src/config/yamlparser.cpp
	daemon/src/config/yamlparser.h
	daemon/src/dbus/configurationmanager.h
	daemon/src/managerimpl.h
	daemon/src/noncopyable.h
	daemon/src/preferences.cpp
	daemon/src/sip/sdp.cpp
	daemon/src/sip/sdp.h
2011-11-16 16:06:07 -05:00
e976366ce8 * #7842: fixed Weffc++ warnings/uninitialized variables 2011-11-15 19:46:36 -05:00
3165a0a0a9 * #7842: use NON_COPYABLE macro 2011-11-15 14:51:55 -05:00
f08e3518ac * #7250: Removed -Werror flag 2011-10-21 11:05:11 -04:00
f71da8ae49 * #7242: fix warnings in daemon
Check return codes of calls to system
2011-10-19 16:10:54 -04:00
6dc6f34793 Merge branch 'master' into video_preview
Resolved Conflicts:
	daemon/src/Makefile.am
	daemon/src/account.cpp
	daemon/src/account.h
	daemon/src/audio/audiortp/audio_rtp_session.h
	daemon/src/audio/codecs/audiocodec.cpp
	daemon/src/audio/codecs/audiocodecfactory.cpp
	daemon/src/audio/pulseaudio/pulselayer.cpp
	daemon/src/audio/pulseaudio/pulselayer.h
	daemon/src/call.cpp
	daemon/src/call.h
	daemon/src/config/yamlemitter.cpp
	daemon/src/config/yamlemitter.h
	daemon/src/config/yamlparser.cpp
	daemon/src/config/yamlparser.h
	daemon/src/dbus/callmanager.h
	daemon/src/dbus/configurationmanager.cpp
	daemon/src/dbus/configurationmanager.h
	daemon/src/main.cpp
	daemon/src/managerimpl.cpp
	daemon/src/preferences.cpp
	daemon/src/preferences.h
	daemon/src/sip/sdp.cpp
	daemon/src/sip/sdp.h
	daemon/src/sip/sipaccount.cpp
	daemon/src/sip/sipcall.cpp
	daemon/src/sip/sipcall.h
	daemon/src/sip/sipvoiplink.cpp
	daemon/test/sdptest.cpp
	gnome/src/actions.c
	gnome/src/callable_obj.c
	gnome/src/codeclist.c
	gnome/src/config/accountconfigdialog.c
	gnome/src/config/accountlistconfigdialog.c
	gnome/src/config/audioconf.c
	gnome/src/config/preferencesdialog.c
	gnome/src/config/shortcuts-config.c
	gnome/src/config/tlsadvanceddialog.c
	gnome/src/contacts/calltree.c
	gnome/src/contacts/searchbar.c
	gnome/src/dbus/dbus.c
	gnome/src/eel-gconf-extensions.c
	gnome/src/icons/icon_factory.c
	gnome/src/imwindow.c
	gnome/src/main.c
	gnome/src/mainwindow.c
	gnome/src/sflnotify.c
	gnome/src/shortcuts.c
	gnome/src/sliders.c
	gnome/src/statusicon.c
	gnome/src/uimanager.c
	gnome/src/widget/gtkscrollbook.c
2011-10-19 13:45:40 -04:00
2f15047cd1 * #7150: remove unused pluginmanager 2011-10-12 13:40:41 -04:00
6603ef1355 Merge branch 'master' into video_preview 2011-10-04 10:55:34 -04:00
416fee0bf6 Bump version to 1.0.0 2011-09-30 09:27:16 -04:00